1271 files changed, 308785 insertions, 0 deletions

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/12_fix_compiler_warnings.diff/src/mgr/filemgr.cpp b/.pc/12_fix_compiler_warnings.diff/src/mgr/filemgr.cpp
new file mode 100644
index 0000000..d801aaa
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/src/mgr/filemgr.cpp
@@ -0,0 +1,585 @@
+/******************************************************************************
+ *
+ *  filemgr.cpp -	implementation of class FileMgr used for pooling file
+ *			handles
+ *
+ * $Id: filemgr.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <filemgr.h>
+#include <utilstr.h>
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <string.h>
+#include <swbuf.h>
+#if !defined(__GNUC__) && !defined(_WIN32_WCE)
+#include <io.h>
+#include <direct.h>
+#else
+#include <unistd.h>
+#endif
+
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+#ifndef S_IRGRP
+#define S_IRGRP 0
+#endif
+
+#ifndef S_IROTH
+#define S_IROTH 0
+#endif
+
+// Fix for VC6
+#ifndef S_IREAD
+#ifdef _S_IREAD
+#define S_IREAD _S_IREAD
+#define S_IWRITE _S_IWRITE
+#endif
+#endif
+// -----------
+
+// ------- if we still don't have something
+#ifndef S_IREAD
+#define S_IREAD 0400
+#endif
+#ifndef S_IWRITE
+#define S_IWRITE 0200
+#endif
+// -------
+
+
+SWORD_NAMESPACE_START
+
+
+int FileMgr::CREAT = O_CREAT;
+int FileMgr::APPEND = O_APPEND;
+int FileMgr::TRUNC = O_TRUNC;
+int FileMgr::RDONLY = O_RDONLY;
+int FileMgr::RDWR = O_RDWR;
+int FileMgr::WRONLY = O_WRONLY;
+int FileMgr::IREAD = S_IREAD;
+int FileMgr::IWRITE = S_IWRITE;
+
+
+// ---------------- statics -----------------
+FileMgr *FileMgr::systemFileMgr = 0;
+
+class __staticsystemFileMgr {
+public:
+	__staticsystemFileMgr() { }
+	~__staticsystemFileMgr() { delete FileMgr::systemFileMgr; }
+} _staticsystemFileMgr;
+
+
+FileMgr *FileMgr::getSystemFileMgr() {
+	if (!systemFileMgr)
+		systemFileMgr = new FileMgr();
+
+	return systemFileMgr;
+}
+
+
+void FileMgr::setSystemFileMgr(FileMgr *newFileMgr) {
+	if (systemFileMgr)
+		delete systemFileMgr;
+	systemFileMgr = newFileMgr;
+}
+
+// --------------- end statics --------------
+
+
+FileDesc::FileDesc(FileMgr *parent, const char *path, int mode, int perms, bool tryDowngrade) {
+	this->parent = parent;
+	this->path = 0;
+	stdstr(&this->path, path);
+	this->mode = mode;
+	this->perms = perms;
+	this->tryDowngrade = tryDowngrade;
+	offset = 0;
+	fd = -77;
+}
+
+
+FileDesc::~FileDesc() {
+	if (fd > 0)
+		close(fd);
+		
+	if (path)
+		delete [] path;
+}
+
+
+int FileDesc::getFd() {
+	if (fd == -77)
+		fd = parent->sysOpen(this);
+//	if ((fd < -1) && (fd != -77))  // kludge to hand ce
+//		return 777;
+	return fd;
+}
+
+
+long FileDesc::seek(long offset, int whence) {
+	return lseek(getFd(), offset, whence);
+}
+
+
+long FileDesc::read(void *buf, long count) {
+	return ::read(getFd(), buf, count);
+}
+
+
+long FileDesc::write(const void *buf, long count) {
+	return ::write(getFd(), buf, count);
+}
+
+
+FileMgr::FileMgr(int maxFiles) {
+	this->maxFiles = maxFiles;		// must be at least 2
+	files = 0;
+}
+
+
+FileMgr::~FileMgr() {
+	FileDesc *tmp;
+	
+	while(files) {
+		tmp = files->next;
+		delete files;
+		files = tmp;
+	}
+}
+
+
+FileDesc *FileMgr::open(const char *path, int mode, bool tryDowngrade) {
+	return open(path, mode, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH, tryDowngrade);
+}
+
+
+FileDesc *FileMgr::open(const char *path, int mode, int perms, bool tryDowngrade) {
+	FileDesc **tmp, *tmp2;
+	
+	for (tmp = &files; *tmp; tmp = &((*tmp)->next)) {
+		if ((*tmp)->fd < 0)		// insert as first non-system_open file
+			break;
+	}
+
+	tmp2 = new FileDesc(this, path, mode, perms, tryDowngrade);
+	tmp2->next = *tmp;
+	*tmp = tmp2;
+	
+	return tmp2;
+}
+
+
+void FileMgr::close(FileDesc *file) {
+	FileDesc **loop;
+	
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+		if (*loop == file) {
+			*loop = (*loop)->next;
+			delete file;
+			break;
+		}
+	}
+}
+
+
+int FileMgr::sysOpen(FileDesc *file) {
+	FileDesc **loop;
+	int openCount = 1;		// because we are presently opening 1 file, and we need to be sure to close files to accomodate, if necessary
+	
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+
+		if ((*loop)->fd > 0) {
+			if (++openCount > maxFiles) {
+				(*loop)->offset = lseek((*loop)->fd, 0, SEEK_CUR);
+				::close((*loop)->fd);
+				(*loop)->fd = -77;
+			}
+		}
+
+		if (*loop == file) {
+			if (*loop != files) {
+				*loop = (*loop)->next;
+				file->next = files;
+				files = file;
+			}
+			if ((!access(file->path, 04)) || ((file->mode & O_CREAT) == O_CREAT)) {	// check for at least file exists / read access before we try to open
+				char tries = (((file->mode & O_RDWR) == O_RDWR) && (file->tryDowngrade)) ? 2 : 1;  // try read/write if possible
+				for (int i = 0; i < tries; i++) {
+					if (i > 0) {
+						file->mode = (file->mode & ~O_RDWR);	// remove write access
+						file->mode = (file->mode | O_RDONLY);// add read access
+					}
+					file->fd = ::open(file->path, file->mode|O_BINARY, file->perms);
+
+					if (file->fd >= 0)
+						break;
+				}
+
+				if (file->fd >= 0)
+					lseek(file->fd, file->offset, SEEK_SET);
+			}
+			else file->fd = -1;
+			if (!*loop)
+				break;
+		}
+	}
+	return file->fd;
+}
+
+
+// to truncate a file at its current position
+// leaving byte at current possition intact
+// deleting everything afterward.
+signed char FileMgr::trunc(FileDesc *file) {
+
+	static const char *writeTest = "x";
+	long size = file->seek(1, SEEK_CUR);
+	if (size == 1) // was empty
+		size = 0;
+	char nibble [ 32767 ];
+	bool writable = file->write(writeTest, 1);
+	int bytes = 0;
+
+	if (writable) {
+		// get tmpfilename
+		char *buf = new char [ strlen(file->path) + 10 ];
+		int i;
+		for (i = 0; i < 9999; i++) {
+			sprintf(buf, "%stmp%.4d", file->path, i);
+			if (!existsFile(buf))
+				break;
+		}
+		if (i == 9999)
+			return -2;
+
+		int fd = ::open(buf, O_CREAT|O_RDWR, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+		if (fd < 0)
+			return -3;
+	
+		file->seek(0, SEEK_SET);
+		while (size > 0) {	 
+			bytes = file->read(nibble, 32767);
+			bytes = (bytes < size)?bytes:size;
+			if (write(fd, nibble, bytes) != bytes) { break; }
+			size -= bytes;
+		}
+		if (size < 1) {
+			// zero out the file
+			::close(file->fd);
+			file->fd = ::open(file->path, O_TRUNC, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+			::close(file->fd);
+			file->fd = -77;	// force file open by filemgr
+			// copy tmp file back (dumb, but must preserve file permissions)
+			lseek(fd, 0, SEEK_SET);
+			do {
+				bytes = read(fd, nibble, 32767);
+				file->write(nibble, bytes);
+			} while (bytes == 32767);
+		}
+		
+		::close(fd);
+		::close(file->fd);
+		removeFile(buf);		// remove our tmp file
+		file->fd = -77;	// causes file to be swapped out forcing open on next call to getFd()
+	}
+	else { // put offset back and return failure
+		file->seek(-1, SEEK_CUR);
+		return -1;
+	}
+	return 0;
+}
+
+
+signed char FileMgr::existsFile(const char *ipath, const char *ifileName)
+{
+	int len = strlen(ipath) + ((ifileName)?strlen(ifileName):0) + 3;
+	char *ch;
+	char *path = new char [ len ];
+	strcpy(path, ipath);
+	
+	if ((path[strlen(path)-1] == '\\') || (path[strlen(path)-1] == '/'))
+		path[strlen(path)-1] = 0;
+	
+	if (ifileName) {
+		ch = path + strlen(path);
+		sprintf(ch, "/%s", ifileName);
+	}
+	signed char retVal = !access(path, 04);
+	delete [] path;
+	return retVal;
+}
+
+
+signed char FileMgr::existsDir(const char *ipath, const char *idirName)
+{
+	char *ch;
+	int len = strlen(ipath) + ((idirName)?strlen(idirName):0) + 1;
+	if (idirName)
+		len +=  strlen(idirName);
+	char *path = new char [ len ];
+	strcpy(path, ipath);
+	
+	if ((path[strlen(path)-1] == '\\') || (path[strlen(path)-1] == '/'))
+		path[strlen(path)-1] = 0;
+	
+	if (idirName) {
+		ch = path + strlen(path);
+		sprintf(ch, "/%s", idirName);
+	}
+	signed char retVal = !access(path, 04);
+	delete [] path;
+	return retVal;
+}
+
+
+int FileMgr::createParent(const char *pName) {
+	char *buf = new char [ strlen(pName) + 1 ];
+	int retCode = 0;
+	
+	strcpy(buf, pName);
+	int end = strlen(buf) - 1;
+	while (end) {
+		if ((buf[end] == '/') || (buf[end] == '\\'))
+			break;
+		end--;
+	}
+	buf[end] = 0;
+	if (strlen(buf)>0) {
+		if (access(buf, 02)) {  // not exists with write access?
+			if ((retCode = mkdir(buf
+#ifndef WIN32
+					, 0755
+#endif
+					))) {
+				createParent(buf);
+				retCode = mkdir(buf
+#ifndef WIN32
+					, 0755
+#endif
+					);
+			}
+		}
+	}
+	else retCode = -1;
+	delete [] buf;
+	return retCode;
+}
+	
+
+int FileMgr::openFileReadOnly(const char *fName) {
+	int fd = ::open(fName, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+	return fd;
+}
+
+
+int FileMgr::createPathAndFile(const char *fName) {
+	int fd;
+	
+	fd = ::open(fName, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+	if (fd < 1) {
+		createParent(fName);
+		fd = ::open(fName, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+	}
+	return fd;
+}
+
+
+int FileMgr::copyFile(const char *sourceFile, const char *targetFile) {
+	int sfd, dfd, len;
+	char buf[4096];
+
+	if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1)
+		return -1;
+	if ((dfd = createPathAndFile(targetFile)) < 1)
+		return -1;
+
+	do {
+		len = read(sfd, buf, 4096);
+		if (write(dfd, buf, len) != len) break;
+	}
+	while(len == 4096);	
+	::close(dfd);
+	::close(sfd);
+	
+	return 0;
+}
+
+
+int FileMgr::removeFile(const char *fName) {
+	return ::remove(fName);
+}
+
+char FileMgr::getLine(FileDesc *fDesc, SWBuf &line) {
+	int len;
+	bool more = true;
+	char chunk[255];
+
+	line = "";
+
+	// assert we have a valid file handle
+	if (fDesc->getFd() < 1)
+		return 0;
+
+	while (more) {
+		more = false;
+		long index = fDesc->seek(0, SEEK_CUR);
+		len = fDesc->read(chunk, 254);
+
+		// assert we have a readable file (not a directory)
+		if (len < 1)
+			break;
+
+		int start = 0;
+		// clean up any preceding white space if we're at the beginning of line
+		if (!line.length()) {
+			for (;start < len; start++) {
+				if ((chunk[start] != 13) && (chunk[start] != ' ') && (chunk[start] != '\t'))
+					break;
+			}
+		}
+
+		// find the end
+		int end;
+		for (end = start; ((end < (len-1)) && (chunk[end] != 10)); end++);
+	
+		if ((chunk[end] != 10) && (len == 254)) {
+			more = true;
+		}
+		index += (end + 1);
+
+		// reposition to next valid place to read
+		fDesc->seek(index, SEEK_SET);
+
+		// clean up any trailing junk on line if we're at the end
+		if (!more) {
+			for (; end > start; end--) {
+				if ((chunk[end] != 10) && (chunk[end] != 13) && (chunk[end] != ' ') && (chunk[end] != '\t')) {
+					if (chunk[end] == '\\') {
+						more = true;
+						end--;
+					}
+					break;
+				}
+			}
+		}
+		
+		int size = (end - start) + 1;
+
+		if (size > 0) {
+			// line.appendFormatted("%.*s", size, chunk+start);
+			line.append(chunk+start, size);
+		}
+	}
+	return ((len > 0) || line.length());
+}
+
+
+char FileMgr::isDirectory(const char *path) {
+	struct stat stats;
+	if (stat(path, &stats))
+		return 0;
+	return ((stats.st_mode & S_IFDIR) == S_IFDIR);
+}
+
+
+int FileMgr::copyDir(const char *srcDir, const char *destDir) {
+	DIR *dir;
+	struct dirent *ent;
+	if ((dir = opendir(srcDir))) {
+		rewinddir(dir);
+		while ((ent = readdir(dir))) {
+			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+				SWBuf srcPath  = (SWBuf)srcDir  + (SWBuf)"/" + ent->d_name;
+				SWBuf destPath = (SWBuf)destDir + (SWBuf)"/" + ent->d_name;
+				if (!isDirectory(srcPath.c_str())) {
+					copyFile(srcPath.c_str(), destPath.c_str());
+				}
+				else {
+					copyDir(srcPath.c_str(), destPath.c_str());
+				}
+			}
+		}
+		closedir(dir);
+	}
+	return 0;
+}
+
+
+int FileMgr::removeDir(const char *targetDir) {
+	DIR *dir = opendir(targetDir);
+	struct dirent *ent;
+	if (dir) {
+		rewinddir(dir);
+		while ((ent = readdir(dir))) {
+			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+				SWBuf targetPath = (SWBuf)targetDir + (SWBuf)"/" + ent->d_name;
+				if (!isDirectory(targetPath.c_str())) {
+					FileMgr::removeFile(targetPath.c_str());
+				}
+				else {
+					FileMgr::removeDir(targetPath.c_str());
+				}
+			}
+		}
+		closedir(dir);
+		FileMgr::removeFile(targetDir);
+/*
+		int status = FileMgr::removeFile(targetDir);
+          int stuff = errno;
+          char *err = strerror(errno);
+          int x = stuff;
+*/
+	}
+	return 0;
+}
+
+
+void FileMgr::flush() {
+	FileDesc **loop;
+	
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+		if ((*loop)->fd > 0) {
+			(*loop)->offset = lseek((*loop)->fd, 0, SEEK_CUR);
+			::close((*loop)->fd);
+			(*loop)->fd = -77;
+		}
+	}
+}
+
+long FileMgr::resourceConsumption() {
+	long count = 0;
+	FileDesc **loop;
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+		if ((*loop)->fd > 0) {
+			count++;
+		}
+	}
+	return count;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/.pc/12_fix_compiler_warnings.diff/src/utilfuns/zlib/untgz.c b/.pc/12_fix_compiler_warnings.diff/src/utilfuns/zlib/untgz.c
new file mode 100644
index 0000000..a7b7164
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/src/utilfuns/zlib/untgz.c
@@ -0,0 +1,421 @@
+/*
+ * untgz.c -- Display contents and/or extract file from
+ * a gzip'd TAR file
+ * written by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+ * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+#ifdef unix
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#else
+# include <direct.h>
+# include <io.h>
+#endif
+
+#include "zlib.h"
+
+#ifdef WIN32
+# include <windows.h>
+#  ifndef F_OK
+#    define F_OK (0)
+#  endif
+#  ifdef _MSC_VER
+#    define mkdir(dirname,mode) _mkdir(dirname)
+#    define strdup(str)         _strdup(str)
+#    define unlink(fn)          _unlink(fn)
+#    define access(path,mode)   _access(path,mode)
+#  else
+#    define mkdir(dirname,mode) _mkdir(dirname)
+#  endif
+#else
+#  include <utime.h>
+#endif
+
+
+/* Values used in typeflag field.  */
+
+#define REGTYPE	 '0'		/* regular file */
+#define AREGTYPE '\0'		/* regular file */
+#define LNKTYPE  '1'		/* link */
+#define SYMTYPE  '2'		/* reserved */
+#define CHRTYPE  '3'		/* character special */
+#define BLKTYPE  '4'		/* block special */
+#define DIRTYPE  '5'		/* directory */
+#define FIFOTYPE '6'		/* FIFO special */
+#define CONTTYPE '7'		/* reserved */
+
+#define BLOCKSIZE 512
+
+struct tar_header
+{				/* byte offset */
+  char name[100];		/*   0 */
+  char mode[8];			/* 100 */
+  char uid[8];			/* 108 */
+  char gid[8];			/* 116 */
+  char size[12];		/* 124 */
+  char mtime[12];		/* 136 */
+  char chksum[8];		/* 148 */
+  char typeflag;		/* 156 */
+  char linkname[100];		/* 157 */
+  char magic[6];		/* 257 */
+  char version[2];		/* 263 */
+  char uname[32];		/* 265 */
+  char gname[32];		/* 297 */
+  char devmajor[8];		/* 329 */
+  char devminor[8];		/* 337 */
+  char prefix[155];		/* 345 */
+				/* 500 */
+};
+
+union tar_buffer {
+  char               buffer[BLOCKSIZE];
+  struct tar_header  header;
+};
+
+enum { TGZ_EXTRACT = 0, TGZ_LIST };
+
+void TGZnotfound	OF((const char *));
+
+int getoct		OF((char *, int));
+char *strtime		OF((time_t *));
+int ExprMatch		OF((char *,char *));
+
+int makedir		OF((char *));
+int matchname		OF((int,int,char **,char *));
+
+void error		OF((const char *));
+int  tar		OF((gzFile, int, int, int, char **));
+
+void help		OF((int));
+int main		OF((int, char **));
+
+char *prog;
+
+/* This will give a benign warning */
+
+static char *TGZprefix[] = { "\0", ".tgz", ".tar.gz", ".tar", NULL };
+
+/* Return the real name of the TGZ archive */
+/* or NULL if it does not exist. */
+
+/* error message for the filename */
+
+void TGZnotfound OF((const char *fname))
+{
+  int i;
+
+  fprintf(stderr,"%s : couldn't find ",prog);
+  for (i=0;TGZprefix[i];i++)
+    fprintf(stderr,(TGZprefix[i+1]) ? "%s%s, " : "or %s%s\n",
+            fname,
+            TGZprefix[i]);
+  exit(1);
+}
+
+
+/* help functions */
+
+int getoct(char *p,int width)
+{
+  int result = 0;
+  char c;
+  
+  while (width --)
+    {
+      c = *p++;
+      if (c == ' ')
+	continue;
+      if (c == 0)
+	break;
+      result = result * 8 + (c - '0');
+    }
+  return result;
+}
+
+char *strtime (time_t *t)
+{
+  struct tm   *local;
+  static char result[32];
+
+  local = localtime(t);
+  sprintf(result,"%2d/%02d/%4d %02d:%02d:%02d",
+	  local->tm_mday, local->tm_mon+1, local->tm_year+1900,
+	  local->tm_hour, local->tm_min,   local->tm_sec);
+  return result;
+}
+
+
+/* regular expression matching */
+
+#define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
+
+int ExprMatch(char *string,char *expr)
+{
+  while (1)
+    {
+      if (ISSPECIAL(*expr))
+	{
+	  if (*expr == '/')
+	    {
+	      if (*string != '\\' && *string != '/')
+		return 0;
+	      string ++; expr++;
+	    }
+	  else if (*expr == '*')
+	    {
+	      if (*expr ++ == 0)
+		return 1;
+	      while (*++string != *expr)
+		if (*string == 0)
+		  return 0;
+	    }
+	}
+      else
+	{
+	  if (*string != *expr)
+	    return 0;
+	  if (*expr++ == 0)
+	    return 1;
+	  string++;
+	}
+    }
+}
+
+/* recursive make directory */
+/* abort if you get an ENOENT errno somewhere in the middle */
+/* e.g. ignore error "mkdir on existing directory" */
+/* */
+/* return 1 if OK */
+/*        0 on error */
+
+int makedir (char *newdir)
+{
+  char *buffer = strdup(newdir);
+  char *p;
+  int  len = strlen(buffer);
+  
+  if (len <= 0) {
+    free(buffer);
+    return 0;
+  }
+  if (buffer[len-1] == '/') {
+    buffer[len-1] = '\0';
+  }
+  if (mkdir(buffer, 0775) == 0)
+    {
+      free(buffer);
+      return 1;
+    }
+
+  p = buffer+1;
+  while (1)
+    {
+      char hold;
+      
+      while(*p && *p != '\\' && *p != '/')
+	p++;
+      hold = *p;
+      *p = 0;
+      if ((mkdir(buffer, 0775) == -1) && (errno == ENOENT))
+	{
+	  fprintf(stderr,"%s: couldn't create directory %s\n",prog,buffer);
+	  free(buffer);
+	  return 0;
+	}
+      if (hold == 0)
+	break;
+      *p++ = hold;
+    }
+  free(buffer);
+  return 1;
+}
+
+int matchname (int arg,int argc,char **argv,char *fname)
+{
+  if (arg == argc)		/* no arguments given (untgz tgzarchive) */
+    return 1;
+
+  while (arg < argc)
+    if (ExprMatch(fname,argv[arg++]))
+	 return 1;
+
+  return 0; /* ignore this for the moment being */
+}
+
+
+/* Tar file list or extract */
+
+int untar (gzFile in, const char *dest) {
+	union  tar_buffer buffer;
+	int    len;
+	int    err;
+	int    getheader = 1;
+	int    remaining = 0;
+	FILE   *outfile = NULL;
+	char   fname[BLOCKSIZE];
+	time_t tartime;
+  
+	while (1) {
+		len = gzread(in, &buffer, BLOCKSIZE);
+		if (len < 0)
+			error (gzerror(in, &err));
+		/*
+		* Always expect complete blocks to process
+		* the tar information.
+		*/
+		if (len != BLOCKSIZE)
+			error("gzread: incomplete block read");
+	 
+		/*
+		* If we have to get a tar header
+		*/
+		if (getheader == 1) {
+			/*
+			* if we met the end of the tar
+			* or the end-of-tar block,
+			* we are done
+			*/
+			if ((len == 0)  || (buffer.header.name[0]== 0)) break;
+
+			tartime = (time_t)getoct(buffer.header.mtime,12);
+			strcpy(fname, dest);
+			if ((fname[strlen(fname)-1] != '/') && (fname[strlen(fname)-1] != '\\'))
+					strcat(fname, "/");
+			strcat(fname, buffer.header.name);
+	  
+			switch (buffer.header.typeflag) {
+			case DIRTYPE:
+				makedir(fname);
+				break;
+			case REGTYPE:
+			case AREGTYPE:
+				remaining = getoct(buffer.header.size,12);
+				if (remaining) {
+					outfile = fopen(fname,"wb");
+					if (outfile == NULL) {
+						// try creating directory
+						char *p = strrchr(fname, '/');
+						if (p != NULL) {
+							*p = '\0';
+							makedir(fname);
+							*p = '/';
+							outfile = fopen(fname,"wb");
+						}
+					}
+/*
+					fprintf(stderr,
+						"%s %s\n",
+						(outfile) ? "Extracting" : "Couldn't create",
+						fname);
+*/
+				}
+				else
+					outfile = NULL;
+				/*
+				* could have no contents
+				*/
+				getheader = (remaining) ? 0 : 1;
+				break;
+			default:
+				break;
+			}
+		}
+		else	{
+			unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
+
+			if (outfile != NULL) {
+				if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes) {
+					fprintf(stderr,"%s : error writing %s skipping...\n",prog,fname);
+					fclose(outfile);
+					unlink(fname);
+				}
+			}
+			remaining -= bytes;
+			if (remaining == 0) {
+				getheader = 1;
+				if (outfile != NULL) {
+#ifdef WIN32
+					HANDLE hFile;
+					FILETIME ftm,ftLocal;
+					SYSTEMTIME st;
+					struct tm localt;
+ 
+					fclose(outfile);
+
+					localt = *localtime(&tartime);
+
+					hFile = CreateFile(fname, GENERIC_READ | GENERIC_WRITE,
+					0, NULL, OPEN_EXISTING, 0, NULL);
+		  
+					st.wYear = (WORD)localt.tm_year+1900;
+					st.wMonth = (WORD)localt.tm_mon;
+					st.wDayOfWeek = (WORD)localt.tm_wday;
+					st.wDay = (WORD)localt.tm_mday;
+					st.wHour = (WORD)localt.tm_hour;
+					st.wMinute = (WORD)localt.tm_min;
+					st.wSecond = (WORD)localt.tm_sec;
+					st.wMilliseconds = 0;
+					SystemTimeToFileTime(&st,&ftLocal);
+					LocalFileTimeToFileTime(&ftLocal,&ftm);
+					SetFileTime(hFile,&ftm,NULL,&ftm);
+					CloseHandle(hFile);
+
+					outfile = NULL;
+#else
+					struct utimbuf settime;
+
+					settime.actime = settime.modtime = tartime;
+
+					fclose(outfile);
+					outfile = NULL;
+					utime(fname,&settime);
+#endif
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+
+/* =========================================================== */
+
+void help(int exitval)
+{
+  fprintf(stderr,
+	  "untgz v 0.1\n"
+	  " an sample application of zlib 1.0.4\n\n"
+		"Usage : untgz TGZfile            to extract all files\n"
+		"        untgz TGZfile fname ...  to extract selected files\n"
+		"        untgz -l TGZfile         to list archive contents\n"
+		"        untgz -h                 to display this help\n\n");
+  exit(exitval);
+}
+
+void error(const char *msg)
+{
+    fprintf(stderr, "%s: %s\n", prog, msg);
+//    exit(1); // don't exit on error
+}
+
+
+int untargz(int fd, const char *dest) {
+	gzFile	f;
+
+	f = gzdopen(fd, "rb");
+	if (f == NULL) {
+		fprintf(stderr,"%s: Couldn't gzopen file\n",	prog);
+		return 1;
+	}
+
+	return untar(f, dest);
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/tests/testblocks.cpp b/.pc/12_fix_compiler_warnings.diff/tests/testblocks.cpp
new file mode 100644
index 0000000..96e2253
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/tests/testblocks.cpp
@@ -0,0 +1,111 @@
+/******************************************************************************
+ *
+ *  testblocks.cpp -	
+ *
+ * $Id: testblocks.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <entriesblk.h>
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <stdlib.h>
+
+using namespace std;
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+void addEntry(EntriesBlock *eb) {
+	string input;
+	string body;
+	char line[1024];
+	std::cout << "\nEnter new Entry's text. '.' on an empty line to finish:\n";
+	do {
+		std::cout << "> ";
+		fgets(line, 1000, stdin);
+		input = line;
+		if (input.compare("."))
+			body.append(input);
+	}
+	while (input.compare("."));
+	std::cout << "Adding new entry.  Index is: " << eb->addEntry(body.c_str()) << "\n\n";
+}
+
+
+void printEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Contents of entry [" << index << "]:\n";
+		std::cout << eb->getEntry(index) << "\n";
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+void printSize(EntriesBlock *eb) {
+	unsigned long size;
+	eb->getRawData(&size);
+	std::cout << "Size of raw data: " << size << "\n\n";
+}
+
+
+void removeEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Removing entry [" << index << "]\n";
+		eb->removeEntry(index);
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	EntriesBlock *eb = new EntriesBlock();
+	string input;
+	char line[1024];
+
+	std::cout << "Initial entry count should be 0: " << eb->getCount() << "\n";
+
+	do {
+		std::cout << "[" << eb->getCount() << "] > ";
+		fgets(line, 1000, stdin);
+		input = line;
+		if (input.length() > 0) {
+			switch (input[0]) {
+				case 'a': addEntry(eb); break;
+				case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
+				case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
+				case 's': printSize(eb); break;
+				case 'q': break;
+				case '?':
+				default:
+					std::cout << "\n a - add a new entry\n";
+					std::cout << " p <entry_index> - print entry\n";
+					std::cout << " r <entry_index> - remove entry\n";
+					std::cout << " s - print size of raw data\n";
+					std::cout << " q - quit\n\n";
+					break;
+			}
+		}
+	}
+	while (input.compare("q"));
+
+	delete eb;
+
+	return 0;
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/cipherraw.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/cipherraw.cpp
new file mode 100644
index 0000000..a8de3e7
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/cipherraw.cpp
@@ -0,0 +1,131 @@
+/******************************************************************************
+ *
+ *  cipherraw.cpp -	Utility to encipher a raw (uncompressed) module
+ *
+ * $Id: cipherraw.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <swcipher.h>
+#include <versekey.h>
+#include <rawverse.h>
+#include <swbuf.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	SWCipher *zobj;
+	VerseKey key;
+	RawVerse *rawdrv;
+	int ofd[2], oxfd[2];
+	long tmpoff = 0, offset, loffset = 0, lzoffset = 0;
+	unsigned short size, lsize = 0, lzsize;
+	char *tmpbuf;
+	
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s <datapath> \"<key>\"\n", argv[0]);
+		exit(1);
+	}
+
+	rawdrv = new RawVerse(argv[1]);
+	zobj = new SWCipher((unsigned char *)argv[2]);
+
+	tmpbuf = new char [ strlen(argv[1]) + 11 ];
+	sprintf(tmpbuf, "%sot.zzz", argv[1]);
+	ofd[0] = FileMgr::createPathAndFile(tmpbuf);
+	sprintf(tmpbuf, "%sot.zzz.vss", argv[1]);
+	oxfd[0] = FileMgr::createPathAndFile(tmpbuf);
+	sprintf(tmpbuf, "%snt.zzz", argv[1]);
+	ofd[1] = FileMgr::createPathAndFile(tmpbuf);
+	sprintf(tmpbuf, "%snt.zzz.vss", argv[1]);
+	oxfd[1] = FileMgr::createPathAndFile(tmpbuf);
+
+	delete [] tmpbuf;
+
+	printf("\n");
+	write(oxfd[0], &lzoffset, 4);
+	write(oxfd[0], &lzsize, 2);
+	write(oxfd[1], &lzoffset, 4);
+	write(oxfd[1], &lzsize, 2);
+
+	key.setAutoNormalize(false);
+	key.setIntros(true);
+	for (key.setIndex(0); (!key.popError()); key++) {
+		rawdrv->findOffset(key.getTestament(), key.getIndex(), &offset, &size);
+		printf("%s: OLD offset: %ld; size: %d\n", (const char *)key, offset, size);
+
+		if ((offset == loffset) && (size == lsize)) {
+			printf("using previous offset,size %d\n", size);
+			offset = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
+			printf("%ld %ld %d \n", offset, lzoffset, lzsize);
+			write(oxfd[key.getTestament() - 1], &lzoffset, 4);
+			write(oxfd[key.getTestament() - 1], &lzsize, 2);
+		}
+		else {
+			lsize   = size;
+			loffset = offset;
+
+			if (size) {
+				SWBuf tmpbuf;
+				rawdrv->readText(key.getTestament(), offset, size, tmpbuf);
+				zobj->Buf(tmpbuf.c_str(), size);
+				unsigned long ulSize = size;
+				zobj->cipherBuf(&ulSize);
+				size = (unsigned int)ulSize;
+			}
+			offset = lseek(ofd[key.getTestament() - 1], 0, SEEK_CUR);
+			tmpoff = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
+			printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size);
+			write(oxfd[key.getTestament() - 1], &offset, 4);
+			unsigned long ulSize = size;
+			if (size) 
+				write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size);
+			size = (unsigned int)ulSize;
+			lzoffset = offset;
+			write(oxfd[key.getTestament() - 1], &size, 2);
+			lzsize = size;
+		}
+	}
+	delete zobj;
+	close(ofd[0]);
+	close(oxfd[0]);
+	close(ofd[1]);
+	close(oxfd[1]);
+	return 0;
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/gbfidx.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/gbfidx.cpp
new file mode 100644
index 0000000..8b1d1dd
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/gbfidx.cpp
@@ -0,0 +1,307 @@
+/*****************************************************************************
+ *
+ *  gbfidx.cpp -	This code reeks but works (at least for WEB).
+ *			Good luck!
+ *
+ * $Id: gbfidx.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <fcntl.h>
+#include <versekey.h>
+#include <filemgr.h>
+
+using namespace sword;
+
+void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
+char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
+void openfiles(char *fname);
+void checkparams(int argc, char **argv);
+
+
+VerseKey key1, key2, key3;
+int fp, vfp, cfp, bfp;
+long chapoffset;
+short chapsize;
+char testmnt;
+
+
+int main(int argc, char **argv)
+{
+	long pos, offset;
+	int num1, num2, rangemax;
+	char startflag = 0;
+	short size;
+
+	checkparams(argc, argv);
+
+	openfiles(argv[1]);
+
+	testmnt = key1.getTestament();
+	num1 = key1.getChapter();
+	num2 = key1.getVerse();
+	pos  = 0;
+	write(bfp, &pos, 4);  /* Book    offset for testament intros */
+	pos = 4;
+	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
+
+
+/*	Right now just zero out intros until parsing correctly */
+	pos = 0;
+	size = 0;
+	write(vfp, &pos, 4);  /* Module intro */
+	write(vfp, &size, 2);
+	write(vfp, &pos, 4);  /* Testament intro */
+	write(vfp, &size, 2);
+
+	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
+		if (!startflag) {
+			startflag = 1;
+		}
+		else {
+			if (num2 < key2.getVerse()) {            // new chapter
+				if (num1 <= key2.getChapter()) { // new book
+					key2.setVerse(1);
+					key2.setChapter(1);
+					key2.setBook(key2.getBook()+1);
+				}
+				printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2);
+				chapoffset = offset;
+				chapsize = size;
+//				continue;
+			}
+		}
+		key2.setVerse(1);
+		key2.setChapter(num1);
+		key2.setVerse(num2);
+
+		key3 = key2;
+//		key3 += (rangemax - key3.getVerse());
+
+		writeidx(key1, key2, key3, offset, size);
+	}
+	close(vfp);
+	close(cfp);
+	close(bfp);
+	close(fp);
+	return 0;
+}
+
+
+/**************************************************************************
+ * ENT:	key1	- current location of index
+ * 	key2	- minimum keyval for which this offset is valid
+ * 	key3	- maximum keyval for which this offset is valid
+ */
+
+void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
+{
+	long pos;
+	short tmp;
+
+	for (; ((key1 <= key3) && (key1.popError() != KEYERR_OUTOFBOUNDS) && (key1.getTestament() == testmnt)); key1+=1) {
+		if (key1.getVerse() == 1) {	// new chapter
+			if (key1.getChapter() == 1) {	// new book
+				pos = lseek(cfp, 0, SEEK_CUR);
+				write(bfp, &pos, 4);
+				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
+				write(cfp, &pos, 4);
+				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
+				write(vfp, &chapsize, 2);
+			}
+			pos = lseek(vfp, 0, SEEK_CUR);
+			write(cfp, &pos, 4);
+			write(vfp, &chapoffset, 4);  /* Chapter intro */
+			write(vfp, &chapsize, 2);
+		}
+		if (key1 >= key2) {
+			write(vfp, &offset, 4);
+			write(vfp, &size, 2);
+		}
+		else	{
+			pos = 0;
+			tmp = 0;
+			write(vfp, &pos, 4);
+			write(vfp, &tmp, 2);
+		}
+	}
+}
+
+
+char startchap(char *buf)
+{
+	if (buf[0] != '<')
+		return 0;
+	if (buf[1] != 'S')
+		return 0;
+	if (buf[2] != 'C')
+		return 0;
+/*
+	if (!isdigit(buf[2]))
+		return 0;
+	for (loop = 3; loop < 7; loop++) {
+		if (buf[loop] == ' ')
+			break;
+		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
+			return 0;
+	}
+*/
+	return 1;
+}
+
+
+char startentry(char *buf)
+{
+	if (buf[0] != '<')
+		return 0;
+	if (buf[1] != 'S')
+		return 0;
+	if (buf[2] != 'V')
+		return 0;
+/*
+	if (!isdigit(buf[2]))
+		return 0;
+	for (loop = 3; loop < 7; loop++) {
+		if (buf[loop] == ' ')
+			break;
+		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
+			return 0;
+	}
+*/
+	return 1;
+}
+
+
+char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
+{
+	char buf[7];
+	int loop;
+	long offset2;
+	int ch2, vs2, rm2;
+	bool flag;
+	long chapstart = 0; 
+	
+	memset(buf, ' ', 7);
+
+	while (1) {
+		if (startchap(buf)) {
+			chapstart = lseek(fp, 0, SEEK_CUR) - 7;
+			memset(buf, ' ', 3);
+			flag = false;
+			for (loop = 3; loop < 6; loop++) {
+				if (isdigit(buf[loop]))
+					flag = true;
+				else {
+					buf[loop] = 0;
+					break;
+				}
+			}
+			if (flag) 
+				*num1 = atoi(buf);
+			else	(*num1)++;
+		}
+		if (startentry(buf)) {
+			memset(buf, ' ', 3);
+			flag = false;
+			for (loop = 3; loop < 6; loop++) {
+				if (isdigit(buf[loop]))
+					flag = true;
+				else {
+					buf[loop] = 0;
+					break;
+				}
+			if (flag)
+				*num2 = atoi(buf);
+			else	(*num2)++;
+			}
+			loop++;
+			if (size)
+				*offset = lseek(fp, 0, SEEK_CUR) - (7 - loop);
+			else	*offset = (chapstart) ? chapstart : lseek(fp, 0, SEEK_CUR) - 7;
+			if (size) {
+				ch2 = *num1;
+				vs2 = *num2;
+				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
+					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
+				}
+				else {
+					if (vs2) {
+						*size = (offset2 - (*offset));
+					}
+				}
+				lseek(fp, *offset, SEEK_SET);
+			}
+			return 0;
+		}
+		memmove(buf, &buf[1], 6);
+		if (read(fp, &buf[6], 1) != 1)
+			return 1;
+	}
+}
+
+
+void openfiles(char *fname)
+{
+	SWBuf buf;
+
+	if ((fp = FileMgr::openFileReadOnly(fname)) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", fname);
+		exit(1);
+	}
+
+	buf.setFormatted("%s.vss", fname);
+	if ((vfp = FileMgr::createPathAndFile(buf.c_str())) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", buf.c_str());
+		exit(1);
+	}
+
+	buf.setFormatted("%s.cps", fname);
+	if ((cfp = FileMgr::createPathAndFile(buf.c_str())) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", buf.c_str());
+		exit(1);
+	}
+
+	buf.setFormatted("%s.bks", fname);
+	if ((bfp = FileMgr::createPathAndFile(buf.c_str())) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", buf.c_str());
+		exit(1);
+	}
+}
+
+
+void checkparams(int argc, char **argv)
+{
+	if (argc < 2) {
+		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);
+		exit(1);
+	}
+	if (argc == 3)
+		key1 = key2 = key3 = "Matthew 1:1";
+	else	key1 = key2 = key3 = "Genesis 1:1";
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/genbookutil.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/genbookutil.cpp
new file mode 100644
index 0000000..71363e3
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/genbookutil.cpp
@@ -0,0 +1,228 @@
+/******************************************************************************
+ *
+ *  genbookutil.cpp -	
+ *
+ * $Id: genbookutil.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <entriesblk.h>
+#include <iostream>
+#include <stdio.h>
+#include <treekeyidx.h>
+#include <rawgenbook.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) {
+	if (!target)
+		target = &treeKey;
+	
+	unsigned long currentOffset = target->getOffset();
+	std::cout << ((currentOffset == treeKey.getOffset()) ? "==>" : "");
+	for (int i = 0; i < level; i++) std::cout << "\t";
+	std::cout << treeKey.getLocalName() << "/\n";
+	if (treeKey.firstChild()) {
+		printTree(treeKey, target, level+1);
+		treeKey.parent();
+	}
+	if (treeKey.nextSibling())
+		printTree(treeKey, target, level);
+
+}
+
+
+void printLocalName(TreeKeyIdx *treeKey) {
+	std::cout << "locaName: " << treeKey->getLocalName() << "\n";
+}
+
+
+void setLocalName(TreeKeyIdx *treeKey) {
+	char buf[1023];
+	std::cout << "Enter New Node Name: ";
+	fgets(buf, 1000, stdin);
+	SWBuf name = buf;
+	treeKey->setLocalName(name.trim());
+	treeKey->save();
+}
+
+
+void gotoPath(TreeKeyIdx *treeKey) {
+	char buf[1023];
+	std::cout << "Enter Path: ";
+	fgets(buf, 1000, stdin);
+	SWBuf path = buf;
+	(*treeKey) = path.trim();
+}
+
+
+void assurePath(TreeKeyIdx *treeKey) {
+	char buf[1023];
+	std::cout << "Enter Path: ";
+	fgets(buf, 1000, stdin);
+	SWBuf path = buf;
+	treeKey->assureKeyPath(path.trim());
+}
+
+
+void viewEntryText(RawGenBook *book) {
+	std::cout << "\n";
+	std::cout << book->renderText();
+	std::cout << "\n";
+}
+
+
+void setEntryText(RawGenBook *book) {
+	SWBuf body;
+	TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+	if (treeKey->getOffset()) {
+		char buf[1023];
+		std::cout << "Enter New Entry Text ('.' on a line by itself to end): \n";
+		do {
+			fgets(buf, 1000, stdin);
+			SWBuf text = buf;
+			text.trim();
+			if ((text[0] == '.') && (text[1] == 0))
+				break;
+			body += text;
+			body += "\n";
+		} while (true);
+
+		(*book) << body.c_str();
+	}
+	else	std::cout << "Can't add entry text to root node\n";
+}
+
+
+void appendSibbling(TreeKeyIdx *treeKey) {
+	if (treeKey->getOffset()) {
+		char buf[1023];
+		std::cout << "Enter New Sibbling Name: ";
+		fgets(buf, 1000, stdin);
+		SWBuf name = buf;
+		treeKey->append();
+		treeKey->setLocalName(name.trim());
+		treeKey->save();
+	}
+	else	std::cout << "Can't add sibling to root node\n";
+}
+
+
+void appendChild(TreeKeyIdx *treeKey) {
+	char buf[1023];
+	std::cout << "Enter New Child Name: ";
+	fgets(buf, 1000, stdin);
+	SWBuf name = buf;
+	treeKey->appendChild();
+	treeKey->setLocalName(name.trim());
+	treeKey->save();
+}
+
+
+void deleteNode(TreeKeyIdx *treeKey) {
+	std::cout << "Removing entry [" << treeKey->getText() << "]\n";
+	treeKey->remove();
+}
+
+
+void removeEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Removing entry [" << index << "]\n";
+		eb->removeEntry(index);
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <tree/key/data/path>\n", *argv);
+		exit(-1);
+	}
+
+	TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]);
+
+	if (treeKey->popError()) {
+		RawGenBook::createModule(argv[1]);
+	}
+	delete treeKey;
+
+	RawGenBook *book = new RawGenBook(argv[1]);
+	TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book)));
+	treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+
+	SWBuf input;
+	char line[1024];
+
+	do {
+		std::cout << "[" << treeKey->getText() << "] > ";
+		fgets(line, 1000, stdin);
+		input = line;
+		input.trim();
+		if (input.length() > 0) {
+			switch (input[0]) {
+				case 'n': printLocalName(treeKey); break;
+				case 's': setLocalName(treeKey); break;
+				case 'g': gotoPath(treeKey); break;
+				case 'G': assurePath(treeKey); break;
+				case 'p':	root.root(); printTree(root, treeKey); break;
+				case 'a':	appendSibbling(treeKey); break;
+				case 'c':	appendChild(treeKey); break;
+				case 'd':	deleteNode(treeKey); break;
+				case 'j':	treeKey->nextSibling(); break;
+				case 'k':	treeKey->previousSibling(); break;
+				case 'h':	treeKey->parent(); break;
+				case 'l':	treeKey->firstChild(); break;
+				case 'r':	treeKey->root(); break;
+				case 't':	setEntryText(book); break;
+				case 'v':	viewEntryText(book); break;
+				case 'q': break;
+				case '?':
+				default:
+					std::cout << "\n p - print tree\n";
+					std::cout << " n - get local name\n";
+					std::cout << " s - set local name\n";
+					std::cout << " j - next sibbling\n";
+					std::cout << " k - previous sibbling\n";
+					std::cout << " h - parent\n";
+					std::cout << " l - first child\n";
+					std::cout << " r - root\n";
+					std::cout << " g - goto path\n";
+					std::cout << " G   goto path; create if it doesn't exist\n";
+					std::cout << " a - append sibbling\n";
+					std::cout << " c - append child\n";
+					std::cout << " d - delete node\n";
+					std::cout << " v - view entry text\n";
+					std::cout << " t - set entry text\n";
+					std::cout << " q - quit\n\n";
+					break;
+			}
+		}
+	}
+	while (input.compare("q"));
+
+	delete treeKey;
+
+	return 0;
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/installmgr.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/installmgr.cpp
new file mode 100644
index 0000000..b705c25
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/installmgr.cpp
@@ -0,0 +1,410 @@
+/******************************************************************************
+ *
+ *  installmgr.cpp -	commandline InstallMgr utility
+ *
+ * $Id: installmgr.cpp 2932 2013-07-31 14:07:01Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <swmgr.h>
+#include <installmgr.h>
+#include <remotetrans.h>
+#include <filemgr.h>
+#include <iostream>
+#include <map>
+#include <swmodule.h>
+#include <stdio.h>
+#include <swlog.h>
+
+using namespace sword;
+using std::cout;
+using std::cerr;
+using std::cin;
+using std::map;
+
+
+SWMgr *mgr = 0;
+InstallMgr *installMgr = 0;
+StatusReporter *statusReporter = 0;
+SWBuf baseDir;
+SWBuf confPath;
+
+void usage(const char *progName = 0, const char *error = 0);
+
+class MyInstallMgr : public InstallMgr {
+public:
+	MyInstallMgr(const char *privatePath = "./", StatusReporter *sr = 0) : InstallMgr(privatePath, sr) {}
+
+virtual bool isUserDisclaimerConfirmed() const {
+	static bool confirmed = false;
+        if (!confirmed) {
+		cout << "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
+		cout << "                -=+* WARNING *+=- -=+* WARNING *+=-\n\n\n";
+		cout << "Although Install Manager provides a convenient way for installing\n";
+		cout << "and upgrading SWORD components, it also uses a systematic method\n";
+		cout << "for accessing sites which gives packet sniffers a target to lock\n";
+		cout << "into for singling out users. \n\n\n";
+		cout << "IF YOU LIVE IN A PERSECUTED COUNTRY AND DO NOT WISH TO RISK DETECTION,\n";
+		cout << "YOU SHOULD *NOT* USE INSTALL MANAGER'S REMOTE SOURCE FEATURES.\n\n\n";
+		cout << "Also, Remote Sources other than CrossWire may contain less than\n";
+		cout << "quality modules, modules with unorthodox content, or even modules\n";
+		cout << "which are not legitimately distributable.  Many repositories\n";
+		cout << "contain wonderfully useful content.  These repositories simply\n";
+		cout << "are not reviewed or maintained by CrossWire and CrossWire\n";
+		cout << "cannot be held responsible for their content. CAVEAT EMPTOR.\n\n\n";
+		cout << "If you understand this and are willing to enable remote source features\n";
+		cout << "then type yes at the prompt\n\n";
+		cout << "enable? [no] ";
+
+		char prompt[10];
+		fgets(prompt, 9, stdin);
+		confirmed = (!strcmp(prompt, "yes\n"));
+		cout << "\n";
+	}
+	return confirmed;
+}
+
+};
+
+class MyStatusReporter : public StatusReporter {
+	int last;
+        virtual void update(unsigned long totalBytes, unsigned long completedBytes) {
+		int p = (totalBytes > 0) ? (int)(74.0 * ((double)completedBytes / (double)totalBytes)) : 0;
+		for (;last < p; ++last) {
+			if (!last) {
+				SWBuf output;
+				output.setFormatted("[ File Bytes: %ld", totalBytes);
+				while (output.size() < 75) output += " ";
+				output += "]";
+				cout << output.c_str() << "\n ";
+			}
+			cout << "-";
+		}
+		cout.flush();
+	}
+        virtual void preStatus(long totalBytes, long completedBytes, const char *message) {
+		SWBuf output;
+		output.setFormatted("[ Total Bytes: %ld; Completed Bytes: %ld", totalBytes, completedBytes);
+		while (output.size() < 75) output += " ";
+		output += "]";
+		cout << "\n" << output.c_str() << "\n ";
+		int p = (int)(74.0 * (double)completedBytes/totalBytes);
+		for (int i = 0; i < p; ++i) { cout << "="; }
+		cout << "\n\n" << message << "\n";
+		last = 0;
+	}
+};      
+
+
+void init() {
+	if (!mgr) {
+		mgr = new SWMgr();
+
+		if (!mgr->config)
+			usage(0, "ERROR: SWORD configuration not found.  Please configure SWORD before using this program.");
+
+		SWBuf baseDir = mgr->getHomeDir();
+		if (baseDir.length() < 1) baseDir = ".";
+		baseDir += "/.sword/InstallMgr";
+		confPath = baseDir + "/InstallMgr.conf";
+		statusReporter = new MyStatusReporter();
+		installMgr = new MyInstallMgr(baseDir, statusReporter);
+	}
+}
+
+
+// clean up and exit if status is 0 or negative error code
+void finish(int status) {
+	delete statusReporter;
+	delete installMgr;
+	delete mgr;
+
+	installMgr = 0;
+	mgr        = 0;
+
+	if (status < 1) {
+		cout << "\n";
+		exit(status);
+	}
+}
+
+
+void createBasicConfig(bool enableRemote, bool addCrossWire) {
+
+	FileMgr::createParent(confPath.c_str());
+	remove(confPath.c_str());
+
+	InstallSource is("FTP");
+	is.caption = "CrossWire";
+	is.source = "ftp.crosswire.org";
+	is.directory = "/pub/sword/raw";
+
+	SWConfig config(confPath.c_str());
+	config["General"]["PassiveFTP"] = "true";
+	if (enableRemote) {
+		config["Sources"]["FTPSource"] = is.getConfEnt();
+	}
+	config.Save();
+}
+
+
+void initConfig() {
+	init();
+
+	bool enable = installMgr->isUserDisclaimerConfirmed();
+
+	createBasicConfig(enable, true);
+
+	cout << "\n\nInitialized basic config file at [" << confPath << "]\n";
+	cout << "with remote source features " << ((enable) ? "ENABLED" : "DISABLED") << "\n";
+}
+
+
+void syncConfig() {
+	init();
+
+	if (!installMgr->isUserDisclaimerConfirmed()) {  // assert disclaimer is accepted
+		cout << "\n\nDisclaimer not accepted.  Aborting.";
+		return;
+	}
+
+	// be sure we have at least some config file already out there
+	if (!FileMgr::existsFile(confPath.c_str())) {
+		createBasicConfig(true, false);
+		finish(1); // cleanup and don't exit
+		init();    // re-init with InstallMgr which uses our new config
+	}
+
+	if (!installMgr->refreshRemoteSourceConfiguration()) 
+		cout << "\nSync'd config file with master remote source list.\n";
+	else cout << "\nFailed to sync config file with master remote source list.\n";
+}
+
+
+void uninstallModule(const char *modName) {
+	init();
+	SWModule *module;
+	ModMap::iterator it = mgr->Modules.find(modName);
+	if (it == mgr->Modules.end()) {
+		fprintf(stderr, "Couldn't find module [%s] to remove\n", modName);
+		finish(-2);
+	}
+	module = it->second;
+	installMgr->removeModule(mgr, module->getName());
+	cout << "Removed module: [" << modName << "]\n";
+}
+
+
+void listRemoteSources() {
+	init();
+	cout << "Remote Sources:\n\n";
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+		cout << "[" << it->second->caption << "]\n";
+		cout << "\tType     : " << it->second->type << "\n";
+		cout << "\tSource   : " << it->second->source << "\n";
+		cout << "\tDirectory: " << it->second->directory << "\n";
+	}
+}
+
+
+void refreshRemoteSource(const char *sourceName) {
+	init();
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
+		finish(-3);
+	}
+
+	if (!installMgr->refreshRemoteSource(source->second))
+		cout << "\nRemote Source Refreshed\n";
+	else	cerr << "\nError Refreshing Remote Source\n";
+}
+
+
+void listModules(SWMgr *otherMgr = 0, bool onlyNewAndUpdates = false) {
+	init();
+	SWModule *module;
+	if (!otherMgr) otherMgr = mgr;
+	std::map<SWModule *, int> mods = InstallMgr::getModuleStatus(*mgr, *otherMgr);
+	for (std::map<SWModule *, int>::iterator it = mods.begin(); it != mods.end(); it++) {
+		module = it->first;
+		SWBuf version = module->getConfigEntry("Version");
+		SWBuf status = " ";
+		if (it->second & InstallMgr::MODSTAT_NEW) status = "*";
+		if (it->second & InstallMgr::MODSTAT_OLDER) status = "-";
+		if (it->second & InstallMgr::MODSTAT_UPDATED) status = "+";
+
+		if (!onlyNewAndUpdates || status == "*" || status == "+") {
+			cout << status << "[" << module->getName() << "]  \t(" << version << ")  \t- " << module->getDescription() << "\n";
+		}
+	}
+}
+
+
+void remoteListModules(const char *sourceName, bool onlyNewAndUpdated = false) {
+	init();
+	cout << "Available Modules:\n(be sure to refresh remote source (-r) first for most current list)\n\n";
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
+		finish(-3);
+	}
+	listModules(source->second->getMgr(), onlyNewAndUpdated);
+}
+
+
+void localDirListModules(const char *dir) {
+	cout << "Available Modules:\n\n";
+	SWMgr mgr(dir);
+	listModules(&mgr);
+}
+
+
+void remoteInstallModule(const char *sourceName, const char *modName) {
+	init();
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
+		finish(-3);
+	}
+	InstallSource *is = source->second;
+	SWMgr *rmgr = is->getMgr();
+	SWModule *module;
+	ModMap::iterator it = rmgr->Modules.find(modName);
+	if (it == rmgr->Modules.end()) {
+		fprintf(stderr, "Remote source [%s] does not make available module [%s]\n", sourceName, modName);
+		finish(-4);
+	}
+	module = it->second;
+
+	int error = installMgr->installModule(mgr, 0, module->getName(), is);
+	if (error) {
+		cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n";
+	} else cout << "\nInstalled module: [" << module->getName() << "]\n";
+}
+
+
+void localDirInstallModule(const char *dir, const char *modName) {
+	init();
+	SWMgr lmgr(dir);
+	SWModule *module;
+	ModMap::iterator it = lmgr.Modules.find(modName);
+	if (it == lmgr.Modules.end()) {
+		fprintf(stderr, "Module [%s] not available at path [%s]\n", modName, dir);
+		finish(-4);
+	}
+	module = it->second;
+	int error = installMgr->installModule(mgr, dir, module->getName());
+	if (error) {
+		cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n";
+	} else cout << "\nInstalled module: [" << module->getName() << "]\n";
+}
+
+
+void usage(const char *progName, const char *error) {
+
+	if (error) fprintf(stderr, "\n%s: %s\n", (progName ? progName : "installmgr"), error);
+
+	fprintf(stderr, "\nusage: %s <command> [command ...]\n"
+		"\n  Commands (run in order they are passed):\n\n"
+		"\t-init\t\t\t\tcreate a basic user config file.\n"
+		"\t\t\t\t\t\tWARNING: overwrites existing.\n"
+		"\t-sc\t\t\t\tsync config with known remote repo list\n"
+		"\t\t\t\t\t\tNOTE: also creates if none exists\n"
+		"\t-s\t\t\t\tlist remote sources\n"
+		"\t-r  <remoteSrcName>\t\trefresh remote source\n"
+		"\t-rl <remoteSrcName>\t\tlist available modules from remote source\n"
+		"\t-rd <remoteSrcName>\t\tlist new/updated modules from remote source\n"
+		"\t-ri <remoteSrcName> <modName>\tinstall module from remote source\n"
+		"\t-l\t\t\t\tlist installed modules\n"
+		"\t-u <modName>\t\t\tuninstall module\n"
+		"\t-ll <path>\t\t\tlist available modules at local path\n"
+		"\t-li <path> <modName>\t\tinstall module from local path\n"
+		"\t-d\t\t\t\tturn debug output on\n"
+		, (progName ? progName : "installmgr"));
+	finish(-1);
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc < 2) usage(*argv);
+
+	for (int i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "-d")) {
+			SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
+		}
+		else if (!strcmp(argv[i], "-init")) {
+			initConfig();
+		}
+		else if (!strcmp(argv[i], "-l")) {	// list installed modules
+			cout << "Installed Modules:\n\n";
+			listModules();
+		}
+		else if (!strcmp(argv[i], "-ll")) {	// list from local directory
+			if (i+1 < argc) localDirListModules(argv[++i]);
+			else usage(*argv, "-ll requires <path>");
+		}
+		else if (!strcmp(argv[i], "-li")) {	// install from local directory
+			if (i+2 < argc) {
+				const char *path = argv[++i];
+				const char *modName = argv[++i];
+				localDirInstallModule(path, modName);
+			}
+			else usage(*argv, "-li requires <path> <modName>");
+		}
+		else if (!strcmp(argv[i], "-u")) {	// uninstall module
+			if (i+1 < argc) uninstallModule(argv[++i]);
+			else usage(*argv, "-u requires <modName>");
+		}
+		else if (!strcmp(argv[i], "-s")) {	// list sources
+			listRemoteSources();
+		}
+		else if (!strcmp(argv[i], "-sc")) {	// sync config with master
+			syncConfig();
+		}
+		else if (!strcmp(argv[i], "-r")) {	// refresh remote source
+			if (i+1 < argc) refreshRemoteSource(argv[++i]);
+			else usage(*argv, "-r requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-rl")) {	// list remote modules
+			if (i+1 < argc) remoteListModules(argv[++i]);
+			else usage(*argv, "-rl requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-rd")) {	// list differences between remote source and installed modules
+			if (i+1 < argc) remoteListModules(argv[++i], true);
+			else usage(*argv, "-rd requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-ri")) {	// install from remote directory
+			if (i+2 < argc) {
+				const char *source = argv[++i];
+				const char *modName = argv[++i];
+				remoteInstallModule(source, modName);
+			}
+			else usage(*argv, "-ri requires <remoteSrcName> <modName>");
+		}
+		else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
+	}
+
+	finish(0);
+
+	return 0;
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/lexdump.c b/.pc/12_fix_compiler_warnings.diff/utilities/lexdump.c
new file mode 100644
index 0000000..c55176e
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/lexdump.c
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
+ *  lexdump.c -	This utility outputs a specified ordinal entry from a lex
+ *
+ * $Id: lexdump.c 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+int main(int argc, char **argv) {
+	char *tmpbuf;
+	int idxfd, datfd;
+	long offset;
+	unsigned int size;
+	char datbuf[255];
+
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s <datapath/datafilebasename> <index>\n", argv[0]);
+		exit(1);
+	}
+
+	tmpbuf = calloc(strlen(argv[1]) + 11,1);
+	sprintf(tmpbuf, "%s.idx", argv[1]);
+	idxfd = open(tmpbuf, O_RDONLY|O_BINARY);
+	sprintf(tmpbuf, "%s.dat", argv[1]);
+	datfd = open(tmpbuf, O_RDONLY|O_BINARY);
+	free(tmpbuf);
+
+	offset = atoi(argv[2]) * 6;
+	lseek(idxfd, offset, SEEK_SET);
+	read(idxfd, &offset, 4);
+	read(idxfd, &size, 2);
+	printf("offset: %ld; size: %d\n", offset, size);
+	lseek(datfd, offset, SEEK_SET);
+	read(datfd, datbuf, 40);
+	datbuf[40] = 0;
+	printf("%s\n", datbuf);
+	close(datfd);
+	close(idxfd);
+	return 0;
+
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/step2vpl.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/step2vpl.cpp
new file mode 100644
index 0000000..a9c4a6d
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/step2vpl.cpp
@@ -0,0 +1,456 @@
+/******************************************************************************
+ *
+ *  step2vpl.cpp -	Utility to export a STEP module as VPL
+ *
+ * $Id: step2vpl.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <lzsscomprs.h>
+
+using namespace std;
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+long SECTIONSLEVELSTART = 38;
+long SECTIONSLEVELSIZE = 29;
+
+long VIEWABLEBLOCKSTART = 0;
+long VIEWABLEBLOCKSIZE = 0;
+
+typedef struct {
+	short versionRecordSize;
+	short publisherID;
+	short bookID;
+	short setID;
+	char conversionProgramVerMajor;
+	char conversionProgramVerMinor;
+	char leastCompatSTEPVerMajor;
+	char leastCompatSTEPVerMinor;
+	char encryptionType;
+	char editionID;
+	short modifiedBy;
+} Version;
+
+typedef struct {
+	short sectionsHeaderRecordSize;
+	long levelEntriesCount; // this is listed as nonGlossBlocksCount in spec!
+	long glossEntriesCount;
+	short levelEntriesSize;
+	long reserved;
+} SectionsHeader;
+
+typedef struct {
+	short viewableHeaderRecordSize;
+	long viewableBlocksCount; // this is listed as nonGlossBlocksCount in spec!
+	long glossBlocksCount;
+	char compressionType; // 0 - none; 1 - LZSS
+	char reserved1;
+	short blockEntriesSize;
+	short reserved2;
+} ViewableHeader;
+
+typedef struct {
+	short vSyncHeaderRecordSize;
+	short startBookNumber;
+	short endBookNumber;
+	short bookPointerEntriesSize;
+	short syncPointEntriesSize;
+	long reserved1_1;
+	short reserved1_2;
+} VSyncHeader;
+
+typedef struct {
+	long offset;
+	long uncompressedSize;
+	long size;
+} ViewableBlock;
+		
+typedef struct {
+	long offset;	// offset into VSYNC.IDX to first VSyncPoint
+	short count;	// number of VSyncPoints for this book
+} VSyncBooksInfo;
+		
+typedef struct {
+	short chapter;
+	short verse;
+	long offset;	// offset into SECTIONS.IDX
+} VSyncPoint;
+
+typedef struct {
+	long parentOffset; // many of these are 0 if glossary
+	long previousOffset; 
+	long nextOffset;
+	long viewableOffset;
+	short startLevel;
+	char level;
+	long nameOffset;
+	long outSync_1;
+	short outSync_2;
+} SectionLevelInfo;
+
+void readVersion(int fd, Version *versionRecord);
+void readHeaderControlWordAreaText(int fd, char **buf);
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord);
+void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord);
+void readVSyncBooksInfo(int fd, VSyncHeader *, VSyncBooksInfo **vSyncBooksInfo);
+void readViewableBlock(int fd, ViewableBlock *vb);
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf);
+void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord);
+void readSectionLevelInfo(int fd, SectionLevelInfo *sli);
+void readSectionName(int fd, SectionLevelInfo *sli, char **name);
+void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo);
+void extractVerseText(int fdviewable, int fdbook, SectionLevelInfo *sectionLevelInfo, char **verseText);
+void cleanBuf(char *buf);
+
+SWCompress *compress = 0;
+
+int main(int argc, char **argv) {
+
+	compress = new LZSSCompress();
+	char *buf;
+	Version versionRecord;
+	VSyncHeader vSyncHeaderRecord;
+	VSyncBooksInfo *vSyncBooksInfo;
+	SectionsHeader sectionsHeaderRecord;
+	ViewableHeader viewableHeaderRecord;
+	
+
+	if (argc < 2) {
+		cerr << "usage: "<< *argv << " <database to step module>\n";
+		exit (-1);
+	}
+
+	string bookpath = argv[1];
+	string fileName;
+
+	if ((argv[1][strlen(argv[1])-1] != '/') &&
+		(argv[1][strlen(argv[1])-1] != '\\'))
+		bookpath += "/";
+
+	fileName = bookpath + "Book.dat";
+	int fdbook = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdbook < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-2);
+	}
+
+	readVersion(fdbook, &versionRecord);
+	readHeaderControlWordAreaText(fdbook, &buf);
+	delete [] buf;
+
+
+	fileName = bookpath + "Viewable.idx";
+	int fdviewable = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdviewable < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-3);
+	}
+
+	readVersion(fdviewable, &versionRecord);
+	readViewableHeader(fdviewable, &viewableHeaderRecord);
+
+	VIEWABLEBLOCKSTART = lseek(fdviewable, 0, SEEK_CUR);
+	VIEWABLEBLOCKSIZE = viewableHeaderRecord.blockEntriesSize;
+
+
+	fileName = bookpath + "Vsync.idx";
+	int fdvsync = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdvsync < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-4);
+	}
+
+	fileName = bookpath + "Sections.idx";
+	int fdsections = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdsections < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-4);
+	}
+	readVersion(fdsections, &versionRecord);
+	readSectionsHeader(fdsections, &sectionsHeaderRecord);
+	SECTIONSLEVELSTART = lseek(fdsections, 0, SEEK_CUR);
+	SECTIONSLEVELSIZE = sectionsHeaderRecord.levelEntriesSize;
+
+	readVersion(fdvsync, &versionRecord);
+	readVSyncHeader(fdvsync, &vSyncHeaderRecord);
+	readVSyncBooksInfo(fdvsync, &vSyncHeaderRecord, &vSyncBooksInfo);
+	int bookCount = vSyncHeaderRecord.endBookNumber - vSyncHeaderRecord.startBookNumber;
+	for (int i = 0; i <= bookCount; i++) {
+		displayBook(fdbook, fdviewable, fdvsync, fdsections, &vSyncBooksInfo[i]);
+	}
+		
+	close(fdviewable);
+	close(fdvsync);
+	close(fdsections);
+	close(fdbook);
+
+}
+
+
+
+void readVersion(int fd, Version *versionRecord) {
+
+	read(fd, &(versionRecord->versionRecordSize), 2);
+	read(fd, &(versionRecord->publisherID), 2);
+	read(fd, &(versionRecord->bookID), 2);
+	read(fd, &(versionRecord->setID), 2);
+	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
+	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
+	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
+	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
+	read(fd, &(versionRecord->encryptionType), 1);
+	read(fd, &(versionRecord->editionID), 1);
+	read(fd, &(versionRecord->modifiedBy), 2);
+
+	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		read(fd, skipbuf, skip);
+		delete [] skipbuf;
+	}
+}
+
+
+void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord) {
+
+	read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
+	read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
+	read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
+	read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
+	read(fd, &(sectionsHeaderRecord->reserved), 4);
+
+	int skip = sectionsHeaderRecord->sectionsHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		read(fd, skipbuf, skip);
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
+
+	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
+	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
+	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
+	read(fd, &(viewableHeaderRecord->compressionType), 1);
+	read(fd, &(viewableHeaderRecord->reserved1), 1);
+	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
+	read(fd, &(viewableHeaderRecord->reserved2), 2);
+
+	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		read(fd, skipbuf, skip);
+		delete [] skipbuf;
+	}
+}
+
+
+void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord) {
+
+	read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
+	read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
+	read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
+	read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
+	read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
+	read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
+	read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
+
+	int skip = vSyncHeaderRecord->vSyncHeaderRecordSize - 16/*sizeof(VSyncHeader)*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		read(fd, skipbuf, skip);
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
+	unsigned long size = vb->size;
+
+	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+	lseek(fd, vb->offset, SEEK_SET);
+	read(fd, *buf, vb->size);
+
+	compress->zBuf(&size, *buf);
+	strcpy(*buf, compress->Buf());
+}
+
+
+void readViewableBlock(int fd, ViewableBlock *vb) {
+
+	read(fd, &(vb->offset), 4);
+	read(fd, &(vb->uncompressedSize), 4);
+	read(fd, &(vb->size), 4);
+}
+
+
+void readHeaderControlWordAreaText(int fd, char **buf) {
+	long headerControlWordAreaSize;
+	read(fd, &headerControlWordAreaSize, 4);
+
+	*buf = new char [headerControlWordAreaSize + 1];
+
+	read(fd, *buf, headerControlWordAreaSize);
+	(*buf)[headerControlWordAreaSize] = 0;
+
+}
+
+void readVSyncBooksInfo(int fd, VSyncHeader *vSyncHeaderRecord, VSyncBooksInfo **vSyncBooksInfo) {
+
+	int bookCount = vSyncHeaderRecord->endBookNumber - vSyncHeaderRecord->startBookNumber;
+	*vSyncBooksInfo = new VSyncBooksInfo[bookCount];
+	for (int i = 0; i <= bookCount; i++) {
+		read(fd, &(*vSyncBooksInfo)[i].offset, 4);
+		read(fd, &(*vSyncBooksInfo)[i].count, 2);
+	}
+}
+
+void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo) {
+	VSyncPoint vSyncPoint;
+
+	lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET);
+
+	for (int i = 0; i < vSyncBooksInfo->count; i++) {
+
+		SectionLevelInfo sectionLevelInfo;
+		char *sectionName;
+		char *verseText;
+
+		read(fdvsync, &(vSyncPoint.chapter), 2);
+		read(fdvsync, &(vSyncPoint.verse), 2);
+		read(fdvsync, &(vSyncPoint.offset), 4);
+		vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE);
+		lseek(fdsections, vSyncPoint.offset, SEEK_SET);
+		readSectionLevelInfo(fdsections, &sectionLevelInfo);
+		readSectionName(fdsections, &sectionLevelInfo, &sectionName);
+		cout << sectionName << " ";
+		delete [] sectionName;
+		extractVerseText(fdviewable, fdbook, &sectionLevelInfo, &verseText);
+		cleanBuf(verseText);
+		cout << verseText << "\n";
+		delete [] verseText;
+	}
+}
+
+
+void extractVerseText(int fdviewable, int fdbook, SectionLevelInfo *sectionLevelInfo, char **verseText) {
+	char numberBuf[16];
+	string startToken;
+	ViewableBlock vb;
+	int len = 0;
+	static long lastEntryOffset = -1;
+	static class FreeCachedEntryText {
+	public:
+		char *entryText;
+		FreeCachedEntryText() { entryText = 0; }
+		~FreeCachedEntryText() { if (entryText) delete [] entryText; }
+	} _freeCachedEntryText;
+
+	if (sectionLevelInfo->viewableOffset != lastEntryOffset) {
+		if (_freeCachedEntryText.entryText)
+			delete [] _freeCachedEntryText.entryText;
+	
+		lseek(fdviewable, sectionLevelInfo->viewableOffset, SEEK_SET);
+		readViewableBlock(fdviewable, &vb);
+		readViewableBlockText(fdbook, &vb, &(_freeCachedEntryText.entryText));
+		lastEntryOffset = sectionLevelInfo->viewableOffset;
+	}
+	sprintf(numberBuf, "%d", sectionLevelInfo->startLevel);
+	startToken = "\\stepstartlevel";
+	startToken += numberBuf;
+	char *start = strstr(_freeCachedEntryText.entryText, startToken.c_str());
+	if (start) {
+		start += strlen(startToken.c_str());
+		char *end = strstr(start, "\\stepstartlevel");
+		if (end)
+			len = end - start;
+		else len = strlen(start);
+	}
+	*verseText = new char [ len + 1 ];
+	strncpy(*verseText, start, len);
+	(*verseText)[len] = 0;
+}
+
+
+void readSectionName(int fd, SectionLevelInfo *sli, char **name) {
+	short size;
+	lseek(fd, sli->nameOffset, SEEK_SET);
+	read(fd, &size, 2);
+	*name = new char [ size + 1 ];
+	read(fd, *name, size);
+	(*name)[size] = 0;
+}
+
+void readSectionLevelInfo(int fd, SectionLevelInfo *sli) {
+
+	read(fd, &(sli->parentOffset), 4);
+	read(fd, &(sli->previousOffset), 4);
+	read(fd, &(sli->nextOffset), 4);
+	read(fd, &(sli->viewableOffset), 4);
+	sli->viewableOffset = VIEWABLEBLOCKSTART + (VIEWABLEBLOCKSIZE * sli->viewableOffset);
+	read(fd, &(sli->startLevel), 2);
+	read(fd, &(sli->level), 1);
+	read(fd, &(sli->nameOffset), 4);
+	read(fd, &(sli->outSync_1), 4);
+	read(fd, &(sli->outSync_2), 2);
+}
+
+void cleanBuf(char *buf) {
+	char *from = buf;
+	char *to = buf;
+
+	while (*from) {
+		if ((*from != 10) && (*from != 13)) {
+			*to++ = *from++;
+		}
+		else {
+			from++;
+		}
+	}
+	*to = 0;
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/stepdump.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/stepdump.cpp
new file mode 100644
index 0000000..3b9892e
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/stepdump.cpp
@@ -0,0 +1,282 @@
+/******************************************************************************
+ *
+ *  stepdump.cpp -	Utility to dump a STEP module
+ *
+ * $Id: stepdump.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#include <iostream>
+#include <string>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <lzsscomprs.h>
+
+using namespace std;
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+typedef struct {
+	short versionRecordSize;
+	short publisherID;
+	short bookID;
+	short setID;
+	char conversionProgramVerMajor;
+	char conversionProgramVerMinor;
+	char leastCompatSTEPVerMajor;
+	char leastCompatSTEPVerMinor;
+	char encryptionType;
+	char editionID;
+	short modifiedBy;
+} Version;
+
+typedef struct {
+	short viewableHeaderRecordSize;
+	long viewableBlocksCount; // this is listed as nonGlossBlocksCount in spec!
+	long glossBlocksCount;
+	char compressionType; // 0 - none; 1 - LZSS
+	char reserved1;
+	short blockEntriesSize;
+	short reserved2;
+} ViewableHeader;
+
+typedef struct {
+	long offset;
+	long uncompressedSize;
+	long size;
+} ViewableBlock;
+		
+void readVersion(int fd, Version *versionRecord);
+void readHeaderControlWordAreaText(int fd, char **buf);
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord);
+void readViewableBlock(int fd, ViewableBlock *vb);
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf);
+
+SWCompress *compress = 0;
+
+int main(int argc, char **argv) {
+
+	compress = new LZSSCompress();
+	char *buf;
+	Version versionRecord;
+	ViewableHeader viewableHeaderRecord;
+
+	if (argc < 2) {
+		cerr << "usage: "<< *argv << " <database to step module>\n";
+		exit (-1);
+	}
+
+	string bookpath = argv[1];
+	string fileName;
+
+	if ((argv[1][strlen(argv[1])-1] != '/') &&
+		(argv[1][strlen(argv[1])-1] != '\\'))
+		bookpath += "/";
+
+	fileName = bookpath + "Book.dat";
+	int fd = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fd < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-2);
+	}
+
+	readVersion(fd, &versionRecord);
+	readHeaderControlWordAreaText(fd, &buf);
+	delete [] buf;
+
+
+	fileName = bookpath + "Viewable.idx";
+	int fdv = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdv < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-3);
+	}
+
+	readVersion(fdv, &versionRecord);
+	readViewableHeader(fdv, &viewableHeaderRecord);
+
+	ViewableBlock vb;
+
+	cout << "\n\nReading special preface viewable BLOCK 0";
+
+	readViewableBlock(fdv, &vb);
+	readViewableBlockText(fd, &vb, &buf);
+	delete [] buf;
+	
+	int nonGlossBlocksCount = viewableHeaderRecord.viewableBlocksCount
+					    - viewableHeaderRecord.glossBlocksCount;
+
+	cout << "\n\nReading " << nonGlossBlocksCount << " non-glossary viewable blocks";
+	// 1 because we already read the first block above
+	for (int i = 1; i < nonGlossBlocksCount; i++) {
+		cout << "\nNon-Glossary viewable block: " << i;
+		readViewableBlock(fdv, &vb);
+		readViewableBlockText(fd, &vb, &buf);
+		delete [] buf;
+	}
+
+	cout << "\n\nReading " << viewableHeaderRecord.glossBlocksCount << " glossary viewable blocks";
+	for (int i = 0; i < viewableHeaderRecord.glossBlocksCount; i++) {
+		cout << "\nGlossary viewable block: " << i;
+		readViewableBlock(fdv, &vb);
+		readViewableBlockText(fd, &vb, &buf);
+		delete [] buf;
+	}
+
+	close(fdv);
+	close(fd);
+
+}
+
+
+
+void readVersion(int fd, Version *versionRecord) {
+
+	cout << "\n\nReading Version Record (" << 16/*sizeof(struct Version)*/ << " bytes)\n\n";
+// DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+//	read(fd, &versionRecord, sizeof(struct Version));
+
+	cout << "Version Record Information\n";
+	read(fd, &(versionRecord->versionRecordSize), 2);
+	cout << "\tversionRecordSize: " << versionRecord->versionRecordSize << "\n";
+	read(fd, &(versionRecord->publisherID), 2);
+	cout << "\tpublisherID: " << versionRecord->publisherID << "\n";
+	read(fd, &(versionRecord->bookID), 2);
+	cout << "\tbookID: " << versionRecord->bookID << "\n";
+	read(fd, &(versionRecord->setID), 2);
+	cout << "\tsetID: " << versionRecord->setID << "\n";
+	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
+	cout << "\tconversionProgramVerMajor: " << (int)versionRecord->conversionProgramVerMajor << "\n";
+	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
+	cout << "\tconversionProgramVerMinor: " << (int)versionRecord->conversionProgramVerMinor << "\n";
+	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
+	cout << "\tleastCompatSTEPVerMajor: " << (int)versionRecord->leastCompatSTEPVerMajor << "\n";
+	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
+	cout << "\tleastCompatSTEPVerMinor: " << (int)versionRecord->leastCompatSTEPVerMinor << "\n";
+	read(fd, &(versionRecord->encryptionType), 1);
+	cout << "\tencryptionType: " << (int)versionRecord->encryptionType << "\n";
+	read(fd, &(versionRecord->editionID), 1);
+	cout << "\teditionID: " << (int)versionRecord->editionID << "\n";
+	read(fd, &(versionRecord->modifiedBy), 2);
+	cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n";
+
+	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+
+	if (skip) {
+		cout << "\nSkipping " << skip << " unknown bytes.\n";
+		char *skipbuf = new char[skip];
+		read(fd, skipbuf, skip);
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
+
+	cout << "\n\nReading Viewable Header Record (" << 16/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+
+// DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+//	read(fd, &viewableHeaderRecord, sizeof(struct ViewableHeader));
+
+	cout << "Viewable Header Record Information\n";
+	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
+	cout << "\tviewableHeaderRecordSize: " << viewableHeaderRecord->viewableHeaderRecordSize << "\n";
+	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
+	cout << "\tviewableBlocksCount: " << viewableHeaderRecord->viewableBlocksCount << "\n";
+	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
+	cout << "\tglossBlocksCount: " << viewableHeaderRecord->glossBlocksCount << "\n";
+	read(fd, &(viewableHeaderRecord->compressionType), 1);
+	cout << "\tcompressionType: " << (int)viewableHeaderRecord->compressionType << "(0 - none; 1 - LZSS)\n";
+	read(fd, &(viewableHeaderRecord->reserved1), 1);
+	cout << "\treserved1: " << (int)viewableHeaderRecord->reserved1 << "\n";
+	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
+	cout << "\tblockEntriesSize: " << viewableHeaderRecord->blockEntriesSize << "\n";
+	read(fd, &(viewableHeaderRecord->reserved2), 2);
+	cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n";
+
+	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+
+	if (skip) {
+		cout << "\nSkipping " << skip << " unknown bytes.\n";
+		char *skipbuf = new char[skip];
+		read(fd, skipbuf, skip);
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
+	unsigned long size = vb->size;
+
+	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+	lseek(fd, vb->offset, SEEK_SET);
+	read(fd, *buf, vb->size);
+
+	compress->zBuf(&size, *buf);
+	strcpy(*buf, compress->Buf());
+	cout << "Viewable Block Text:\n";
+	cout << *buf << "\n\n";
+}
+
+
+void readViewableBlock(int fd, ViewableBlock *vb) {
+
+	cout << "\n\nReading Viewable Block (" << 12/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+
+// DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+//	read(fd, &vb, sizeof(struct ViewableBlock));
+
+	cout << "Viewable Block Information\n";
+	read(fd, &(vb->offset), 4);
+	cout << "\toffset: " << vb->offset << "\n";
+	read(fd, &(vb->uncompressedSize), 4);
+	cout << "\tuncompressedSize: " << vb->uncompressedSize << "\n";
+	read(fd, &(vb->size), 4);
+	cout << "\tsize: " << vb->size << "\n";
+}
+
+
+void readHeaderControlWordAreaText(int fd, char **buf) {
+	long headerControlWordAreaSize;
+	read(fd, &headerControlWordAreaSize, 4);
+	cout << "Reading Header Control Word Area (" << headerControlWordAreaSize << " bytes)\n\n";
+
+	*buf = new char [headerControlWordAreaSize + 1];
+
+	read(fd, *buf, headerControlWordAreaSize);
+	(*buf)[headerControlWordAreaSize] = 0;
+
+	cout << "headerControlWordArea:\n" << *buf << "\n";
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/treeidxutil.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/treeidxutil.cpp
new file mode 100644
index 0000000..abb9151
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/treeidxutil.cpp
@@ -0,0 +1,171 @@
+/******************************************************************************
+ *
+ *  treeidxutil.cpp -	
+ *
+ * $Id: treeidxutil.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <entriesblk.h>
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <treekeyidx.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) {
+	if (!target)
+		target = &treeKey;
+	
+	unsigned long currentOffset = target->getOffset();
+	std::cout << ((currentOffset == treeKey.getOffset()) ? "==>" : "");
+	for (int i = 0; i < level; i++) std::cout << "\t";
+	std::cout << treeKey.getLocalName() << std::endl;
+	if (treeKey.firstChild()) {
+		printTree(treeKey, target, level+1);
+		treeKey.parent();
+	}
+	if (treeKey.nextSibling())
+		printTree(treeKey, target, level);
+
+}
+
+
+void printLocalName(TreeKeyIdx *treeKey) {
+	std::cout << "locaName: " << treeKey->getLocalName() << std::endl;
+}
+
+
+void setLocalName(TreeKeyIdx *treeKey) {
+	char buf[1023];
+	std::cout << "Enter New Node Name: ";
+	fgets(buf, 1000, stdin);
+	treeKey->setLocalName(buf);
+	treeKey->save();
+}
+
+
+void assurePath(TreeKeyIdx *treeKey) {
+	char buf[1023];
+	std::cout << "Enter path: ";
+	fgets(buf, 1000, stdin);
+	treeKey->assureKeyPath(buf);
+}
+
+
+void appendSibbling(TreeKeyIdx *treeKey) {
+	if (treeKey->getOffset()) {
+		char buf[1023];
+		std::cout << "Enter New Sibbling Name: ";
+		fgets(buf, 1000, stdin);
+		treeKey->append();
+		treeKey->setLocalName(buf);
+		treeKey->save();
+	}
+	else	std::cout << "Can't add sibling to root node\n";
+}
+
+
+void appendChild(TreeKeyIdx *treeKey) {
+	char buf[1023];
+	std::cout << "Enter New Child Name: ";
+	fgets(buf, 1000, stdin);
+	treeKey->appendChild();
+	treeKey->setLocalName(buf);
+	treeKey->save();
+}
+
+
+void removeEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Removing entry [" << index << "]\n";
+		eb->removeEntry(index);
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <tree/key/data/path>\n", *argv);
+		exit(-1);
+	}
+
+	TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]);
+
+	if (treeKey->popError()) {
+		treeKey->create(argv[1]);
+		delete treeKey;
+		treeKey = new TreeKeyIdx(argv[1]);
+	}
+	TreeKeyIdx root = *treeKey;
+
+	std::string input;
+	char line[1024];
+
+	do {
+		std::cout << "[" << treeKey->getText() << "] > ";
+		fgets(line, 1000, stdin);
+		input = line;
+		if (input.length() > 0) {
+			switch (input[0]) {
+				case 'n': printLocalName(treeKey); break;
+				case 's': setLocalName(treeKey); break;
+				case 'p':	root.root(); printTree(root, treeKey); break;
+				case 'a':	appendSibbling(treeKey); break;
+				case 'c':	appendChild(treeKey); break;
+				case 'j':	treeKey->nextSibling(); break;
+				case 'g': assurePath(treeKey); break;
+				case 'k':	treeKey->previousSibling(); break;
+				case 'h':	treeKey->parent(); break;
+				case 'l':	treeKey->firstChild(); break;
+				case 'r':	treeKey->root(); break;
+				case 'q': break;
+				case '?':
+				default:
+					std::cout << "\n p - print tree\n";
+					std::cout << " n - get local name\n";
+					std::cout << " s - set local name\n";
+					std::cout << " j - next sibbling\n";
+					std::cout << " k - previous sibbling\n";
+					std::cout << " h - parent\n";
+					std::cout << " l - first child\n";
+					std::cout << " r - root\n";
+					std::cout << " a - append sibbling\n";
+					std::cout << " c - append child\n";
+					std::cout << " u - get user data\n";
+					std::cout << " d - set user data\n";
+					std::cout << " g - goto path; create if it doesn't exist\n";
+					std::cout << " q - quit\n\n";
+					break;
+			}
+		}
+	}
+	while (input.compare("q"));
+
+	delete treeKey;
+
+	return 0;
+}
diff --git a/.pc/12_fix_compiler_warnings.diff/utilities/vpl2mod.cpp b/.pc/12_fix_compiler_warnings.diff/utilities/vpl2mod.cpp
new file mode 100644
index 0000000..c696541
--- /dev/null
+++ b/.pc/12_fix_compiler_warnings.diff/utilities/vpl2mod.cpp
@@ -0,0 +1,290 @@
+/******************************************************************************
+ *
+ *  vpl2mod.cpp -	Utility to import VPL formatted modules
+ *
+ * $Id: vpl2mod.cpp 2921 2013-07-28 17:21:44Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <swmgr.h>
+#include <rawtext.h>
+#include <swbuf.h>
+#include <versekey.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::FileMgr;
+using sword::SWMgr;
+using sword::RawText;
+using sword::VerseKey;
+using sword::SWBuf;
+using sword::SW_POSITION;
+#endif
+
+
+char readline(int fd, char **buf) {
+	char ch;
+	if (*buf)
+		delete [] *buf;
+	*buf = 0;
+	int len;
+
+
+	long index = lseek(fd, 0, SEEK_CUR);
+	// clean up any preceding white space
+	while ((len = read(fd, &ch, 1)) == 1) {
+		if ((ch != 13) && (ch != ' ') && (ch != '\t'))
+			break;
+		else index++;
+	}
+
+
+	while (ch != 10) {
+        if ((len = read(fd, &ch, 1)) != 1)
+			break;
+	}
+	
+	int size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
+
+	*buf = new char [ size + 1 ];
+
+	if (size > 0) {
+		lseek(fd, index, SEEK_SET);
+		read(fd, *buf, size);
+		read(fd, &ch, 1);   //pop terminating char
+		(*buf)[size] = 0;
+
+		// clean up any trailing junk on buf
+		for (char *it = *buf+(strlen(*buf)-1); it > *buf; it--) {
+			if ((*it != 10) && (*it != 13) && (*it != ' ') && (*it != '\t'))
+				break;
+			else *it = 0;
+		}
+	}
+	else **buf = 0;
+	return !len;
+}
+
+
+char *parseVReg(char *buf) {
+	char stage = 0;
+
+	while (*buf) {
+		switch (stage) {
+		case 0:
+			if (isalpha(*buf))
+				stage++;
+			break;
+		case 1:
+			if (isdigit(*buf))
+				stage++;
+			break;
+		case 2:
+			if (*buf == ':')
+				stage++;
+			break;
+		case 3:
+			if (isdigit(*buf))
+				stage++;
+			break;
+	   case 4:
+			if (*buf == ' ') {
+				*buf = 0;
+				return ++buf;
+			}
+			break;
+		}
+		buf++;
+	}
+	return (stage == 4) ? buf : 0;  // if we got to stage 4 return after key buf, else return 0;
+}
+
+
+bool isKJVRef(const char *buf) {
+	VerseKey vk, test;
+	vk.setAutoNormalize(false);
+	vk.setIntros(true);	// turn on mod/testmnt/book/chap headings
+	vk.setPersist(true);
+	// lets do some tests on the verse --------------
+	vk = buf;
+	test = buf;
+
+	if (vk.getTestament() && vk.getBook() && vk.getChapter() && vk.getVerse()) { // if we're not a heading
+//		std::cerr << (const char*)vk << " == "  << (const char*)test << std::endl;
+		return (vk == test);
+	}
+	else return true;	// no check if we're a heading... Probably bad.
+}
+
+
+void fixText(char *text) {
+	char *to = text;
+	while(*text) {
+		*to++ = *text++;
+		*to++ = *text++;
+		if (!*text)
+			break;
+		if (*text != ' ')
+			std::cerr << "problem\n";
+		else	text++;
+	}
+	*to = 0;
+}
+
+int main(int argc, char **argv) {
+
+	// Let's test our command line arguments
+	if (argc < 2) {
+//		fprintf(stderr, "usage: %s <vpl_file> </path/to/mod> [0|1 - file includes prepended verse references]\n", argv[0]);
+		fprintf(stderr, "usage: %s <source_vpl_file> </path/to/output/mod/> [0|1 - prepended verse refs] [0|1 - NT only]\n\n", argv[0]);
+		fprintf(stderr, "\tWARNING: THIS IS CURRENTLY A KJV-VERSIFICATION-ONLY UTILITY\n");
+		fprintf(stderr, "\tWith no verse refs, source file must contain exactly 31102 lines.\n");
+		fprintf(stderr, "\tThis is KJV verse count plus headings for MODULE,\n");
+		fprintf(stderr, "\tTESTAMENT, BOOK, CHAPTER. An example snippet follows:\n\n");
+		fprintf(stderr, "\t\tMODULE HEADER\n");
+		fprintf(stderr, "\t\tOLD TESTAMENT HEADER\n");
+		fprintf(stderr, "\t\tGENESIS HEADER\n");
+		fprintf(stderr, "\t\tCHAPTER 1 HEADER\n");
+		fprintf(stderr, "\t\tIn the beginning...\n\n");
+		fprintf(stderr, "\t... implying there must also be a CHAPTER2 HEADER,\n");
+		fprintf(stderr, "\tEXODUS HEADER, NEW TESTAMENT HEADER, etc.  If there is no text for\n");
+		fprintf(stderr, "\tthe header, a blank line must, at least, hold place.\n\n");
+		fprintf(stderr, "\tWith verse refs, source file must simply contain any number of lines,\n");
+		fprintf(stderr, "\tthat begin with the verse reference for which it is an entry.  e.g.:\n\n");
+		fprintf(stderr, "\t\tgen 1:0 CHAPTER 1 HEADER\n");
+		fprintf(stderr, "\t\tgen 1:1 In the beginning...\n\n");
+		exit(-1);
+	}
+
+	// Let's see if we can open our input file
+	int fd = FileMgr::openFileReadOnly(argv[1]);
+	if (fd < 0) {
+		fprintf(stderr, "error: %s: couldn't open input file: %s \n", argv[0], argv[1]);
+		exit(-2);
+	}
+
+	// Try to initialize a default set of datafiles and indicies at our
+	// datapath location passed to us from the user.
+	if (RawText::createModule(argv[2])) {
+		fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[2]);
+		exit(-3);
+	}
+
+	// not used yet, but for future support of a vpl file with each line
+	// prepended with verse reference, eg. "Gen 1:1 In the beginning..."
+	bool vref = false;
+	if (argc > 3)
+		vref = (argv[3][0] == '0') ? false : true;
+
+	// if 'nt' is the 4th arg, our vpl file only has the NT
+	bool ntonly = false;
+	if (argc > 4)
+                ntonly = (argv[4][0] == '0') ? false : true;
+	
+	// Do some initialization stuff
+	char *buffer = 0;
+	RawText mod(argv[2]);	// open our datapath with our RawText driver.
+	VerseKey vk;
+	vk.setAutoNormalize(false);
+	vk.setIntros(true);	// turn on mod/testmnt/book/chap headings
+	vk.setPersist(true);
+
+	mod.setKey(vk);
+
+	// Loop through module from TOP to BOTTOM and set next line from
+	// input file as text for this entry in the module
+	mod = TOP;
+	if (ntonly) vk = "Matthew 1:1";
+	  
+	int successive = 0;  //part of hack below
+	while ((!mod.popError()) && (!readline(fd, &buffer))) {
+		if (*buffer == '|')	// comments, ignore line
+			continue;
+		if (vref) {
+			const char *verseText = parseVReg(buffer);
+			if (!verseText) {	// if we didn't find a valid verse ref
+				std::cerr << "No valid verse ref found on line: " << buffer << "\n";
+				exit(-4);
+			}
+
+			vk = buffer;
+			if (vk.popError()) {
+				std::cerr << "Error parsing key: " << buffer << "\n";
+				exit(-5);
+			}
+			SWBuf orig = mod.getRawEntry();
+
+			if (!isKJVRef(buffer)) {
+				VerseKey origVK = vk;
+				/* This block is functioning improperly -- problem with AutoNormalize???
+				do {
+					vk--;
+				}
+				while (!vk.popError() && !isKJVRef(vk)); */
+				//hack to replace above:
+				successive++;
+				vk -= successive;
+				orig = mod.getRawEntry();
+
+				std::cerr << "Not a valid KJV ref: " << origVK << "\n";
+				std::cerr << "appending to ref: " << vk << "\n";
+				orig += " [ (";
+				orig += origVK;
+				orig += ") ";
+				orig += verseText;
+				orig += " ] ";
+				verseText = orig;
+			}
+			else {
+			  successive = 0;
+			}
+
+			if (orig.length() > 1)
+				   std::cerr << "Warning, overwriting verse: " << vk << std::endl;
+			  
+			// ------------- End verse tests -----------------
+			mod << verseText;	// save text to module at current position
+		}
+		else {
+			fixText(buffer);
+			mod << buffer;	// save text to module at current position
+			mod++;	// increment module position
+		}
+	}
+
+	// clear up our buffer that readline might have allocated
+	if (buffer)
+		delete [] buffer;
+}
diff --git a/.pc/13_curl.diff/src/mgr/curlftpt.cpp b/.pc/13_curl.diff/src/mgr/curlftpt.cpp
new file mode 100644
index 0000000..63eacb1
--- /dev/null
+++ b/.pc/13_curl.diff/src/mgr/curlftpt.cpp
@@ -0,0 +1,202 @@
+/*****************************************************************************
+ *
+ *  curlftpt.cpp -	CURLFTPTransport
+ *
+ * $Id: curlftpt.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <curlftpt.h>
+
+#include <fcntl.h>
+
+#include <curl/curl.h>
+#include <curl/easy.h>
+
+#include <swlog.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	struct FtpFile {
+		const char *filename;
+		FILE *stream;
+		SWBuf *destBuf;
+	};
+
+
+	// initialize/cleanup SYSTEMWIDE library with life of this static.
+	static class CURLFTPTransport_init {
+	public:
+		CURLFTPTransport_init() {
+			curl_global_init(CURL_GLOBAL_DEFAULT);  // curl_easy_init automatically calls it if needed
+		}
+
+		~CURLFTPTransport_init() {
+			curl_global_cleanup();
+		}
+	} _curlFTPTransport_init;
+
+
+	static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
+		struct FtpFile *out=(struct FtpFile *)stream;
+		if (out && !out->stream && !out->destBuf) {
+			/* open file for writing */
+			out->stream=fopen(out->filename, "wb");
+			if (!out->stream)
+				return -1; /* failure, can't open file to write */
+		}
+		if (out->destBuf) {
+			int s = out->destBuf->size();
+			out->destBuf->size(s+(size*nmemb));
+			memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb);
+			return nmemb;
+		}
+		return fwrite(buffer, size, nmemb, out->stream);
+	}
+
+
+	struct MyProgressData {
+		StatusReporter *sr;
+		bool *term;
+	};
+
+
+	static int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) {
+		if (clientp) {
+			MyProgressData *pd = (MyProgressData *)clientp;
+			SWLog::getSystemLog()->logDebug("CURLFTPTransport report progress: totalSize: %ld; xfered: %ld\n", (long)dltotal, (long)dlnow);
+			if (pd->sr) {
+				if (dltotal < 0) dltotal = 0;
+				if (dlnow < 0) dlnow = 0;
+				if (dlnow > dltotal) dlnow = dltotal;
+				pd->sr->update(dltotal, dlnow);
+			}
+			if (*(pd->term)) return 1;
+		}
+		return 0;
+	}
+
+
+	static int my_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) {
+		SWBuf header;
+		(void)userp; /* prevent compiler warning */
+		(void)handle; /* prevent compiler warning */
+
+		switch (type) {
+		case CURLINFO_TEXT: header = "TEXT"; break;
+		case CURLINFO_HEADER_OUT: header = "=> Send header"; break;
+		case CURLINFO_HEADER_IN: header = "<= Recv header"; break;
+		
+		// these we don't want to log (HUGE)
+		case CURLINFO_DATA_OUT: header = "=> Send data";
+		case CURLINFO_SSL_DATA_OUT: header = "=> Send SSL data";
+		case CURLINFO_DATA_IN: header = "<= Recv data"; 
+		case CURLINFO_SSL_DATA_IN: header = "<= Recv SSL data";
+		default: /* in case a new one is introduced to shock us */
+			return 0;
+		}
+		
+		if (size > 120) size = 120;
+		SWBuf text;
+		text.size(size);
+		memcpy(text.getRawData(), data, size);
+		SWLog::getSystemLog()->logDebug("CURLFTPTransport: %s: %s", header.c_str(), text.c_str());
+		return 0;
+	}
+}
+
+
+CURLFTPTransport::CURLFTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) {
+	session = (CURL *)curl_easy_init();
+}
+
+
+CURLFTPTransport::~CURLFTPTransport() {
+	curl_easy_cleanup(session);
+}
+
+
+char CURLFTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) {
+	signed char retVal = 0;
+	struct FtpFile ftpfile = {destPath, 0, destBuf};
+
+	CURLcode res;
+	
+	if (session) {
+
+		struct MyProgressData pd;
+		pd.sr = statusReporter;
+		pd.term = &term;
+
+		curl_easy_setopt(session, CURLOPT_URL, sourceURL);
+	
+		SWBuf credentials = u + ":" + p;
+		curl_easy_setopt(session, CURLOPT_USERPWD, credentials.c_str());
+		curl_easy_setopt(session, CURLOPT_WRITEFUNCTION, my_fwrite);
+		if (!passive)
+			curl_easy_setopt(session, CURLOPT_FTPPORT, "-");
+		curl_easy_setopt(session, CURLOPT_NOPROGRESS, 0);
+		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, &pd);
+		curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, my_fprogress);
+		curl_easy_setopt(session, CURLOPT_DEBUGFUNCTION, my_trace);
+		/* Set a pointer to our struct to pass to the callback */
+		curl_easy_setopt(session, CURLOPT_FILE, &ftpfile);
+
+		/* Switch on full protocol/debug output */
+		curl_easy_setopt(session, CURLOPT_VERBOSE, true);
+		curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, 45);
+		
+		/* FTP connection settings */
+
+#if (LIBCURL_VERSION_MAJOR > 7) || \
+   ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR > 10)) || \
+   ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 10) && (LIBCURL_VERSION_PATCH >= 5))
+#      define EPRT_AVAILABLE 1
+#endif
+
+#ifdef EPRT_AVAILABLE
+		curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0);
+		SWLog::getSystemLog()->logDebug("***** using CURLOPT_FTP_USE_EPRT\n");
+#endif
+
+		
+		SWLog::getSystemLog()->logDebug("***** About to perform curl easy action. \n");
+		SWLog::getSystemLog()->logDebug("***** destPath: %s \n", destPath);
+		SWLog::getSystemLog()->logDebug("***** sourceURL: %s \n", sourceURL);
+		res = curl_easy_perform(session);
+		SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
+
+		// it seems CURL tries to use this option data later for some reason, so we unset here
+		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
+
+		if(CURLE_OK != res) {
+			retVal = -1;
+		}
+	}
+
+	if (ftpfile.stream)
+		fclose(ftpfile.stream); /* close the local file */
+
+	return retVal;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..6bc1e7e
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1,5 @@
+12_fix_compiler_warnings.diff
+13_curl.diff
+multiarch-clucene.patch
+no-included-zconf.h.diff
+dso-missing-shared.patch
diff --git a/.pc/dso-missing-shared.patch/CMakeLists.txt b/.pc/dso-missing-shared.patch/CMakeLists.txt
new file mode 100644
index 0000000..c82f15d
--- /dev/null
+++ b/.pc/dso-missing-shared.patch/CMakeLists.txt
@@ -0,0 +1,280 @@
+# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
+#       limit pkg-config version to >= 0.14, demo, utilities, doc, tests
+#
+# NOTES: Defaults to build type of Shared
+#        Forces out-of-source tree build
+#        
+#
+# This file started on 18 January 2010 by Gregory Hellings
+# It is ceded to The SWORD Library developers and CrossWire under the terms
+# of their own GPLv2 license and all copyright is transferred to them for
+# all posterity and eternity, wherever such transfer is possible.  Where it is
+# not, then this file is released under the GPLv2 by myself.
+#
+#
+# A CMake port of the SWORD build system... we hope
+PROJECT(libsword CXX C)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+SET(SWORD_VERSION 1.7.2)
+
+# Make sure it's an out-of-stream build
+IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+	MESSAGE(FATAL_ERROR "Please invoke CMake from a different directory than the source.")
+ENDIF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+
+MESSAGE(STATUS "Configuring your system to build libsword.")
+
+###########################################################################################
+# Here are some basic CMake variables we need to setup in order for things to work properly
+#
+# Our include directory, for our own internally created "FIND_PACKAGE" calls, like CLucene
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+# User options
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/options.cmake")
+# Source variables
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/sources.cmake")
+# Our local includes
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/include") # For swversion.h
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include") # For everything else
+
+###########################################################################################
+# This will look for various libraries that libsword builds against.  There is no REQUIRED
+# attribute added here, since all of the libraries here are not, in actuality, required.
+#
+MESSAGE(STATUS "\n-- SEARCHING FOR SYTEM PACKAGES")
+# Find our packages
+FIND_PACKAGE(ZLIB QUIET)
+FIND_PACKAGE(ICU QUIET)
+FIND_PACKAGE(CURL QUIET)
+FIND_PACKAGE(CLucene QUIET)
+FIND_PACKAGE(PkgConfig QUIET)
+FIND_PACKAGE(Regex QUIET)
+
+###########################################################################################
+# Based on user input and the results of the above tests, we may need to mux with the source
+# files to use an internal version of ZLib, cURL-like stuff, or CLucene replacements.  These
+# lines below will modify the source files directories so that the required files are only
+# included if the option is needed.
+#
+# Modify the source variables and set necessary definitions, this is a rather long segment,
+# so I have sorted it out into its own file
+INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/muxsources.cmake)
+
+################################################################################################
+# This actually creates the build target that is the libsword building target to be generated.
+# Most of the work for configuration is done above, already.
+#
+# I want to do this manually, there might be reason in the future
+IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+	ADD_LIBRARY(sword SHARED ${sword_SOURCES})
+	MESSAGE(STATUS "Building Shared library.")
+	SET(BUILDING_SHARED 1)
+	SET(SWORD_LINK_NAME sword)
+ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+
+IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+	ADD_LIBRARY(sword_static STATIC ${sword_SOURCES})
+	SET_TARGET_PROPERTIES(sword_static PROPERTIES COMPILE_FLAGS "-fPIC")
+	SET(BUILDING_STATIC 1)
+	# Defaults to linking against the shared if it is also being built
+	IF(NOT BUILDING_SHARED)
+		SET(SWORD_LINK_NAME sword_static)
+	ENDIF(NOT BUILDING_SHARED)
+	# With MSVC, the .dll files also create .lib files of the same name
+	# with the exported symbols.  Thus, we don't want the two to have the
+	# same exact name.  In other systems, the .a and .so suffixes suffice
+	# to keep them separate
+	IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+		SET_TARGET_PROPERTIES(sword_static PROPERTIES 
+			OUTPUT_NAME "sword")
+		#MESSAGE(STATUS "Building Static library with name sword")
+	ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+		#MESSAGE(STATUS "Building Static library with name
+		#sword_static")
+	ENDIF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+	MESSAGE(STATUS "Building Static library.")
+ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+
+################################################################################################
+# Some random user settings
+#
+
+IF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
+	ADD_DEFINITIONS(-DGLOBCONFPATH="${SWORD_GLOBAL_CONF_DIR}/sword.conf")
+ENDIF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
+
+
+###############################################################################################
+# This allows the user to set a SONAME for the library.  This allows packagers and those who
+# care about that sort of thing to be happy and have all their SONAMES set properly.
+#
+IF(NOT LIBSWORD_SOVERSION AND BUILDING_SHARED)
+        SET(SWORD_SOVERSION ${SWORD_VERSION})
+ELSE(NOT LIBSWORD_SOVERSION AND BUILDING_SHARED)
+        SET(SWORD_SOVERSION ${LIBSWORD_SOVERSION})
+ENDIF(NOT LIBSWORD_SOVERSION AND BUILDING_SHARED)
+
+IF(BUILDING_SHARED)
+	SET_TARGET_PROPERTIES(sword
+		PROPERTIES SOVERSION ${SWORD_SOVERSION})
+	MESSAGE(STATUS "Setting SOVERSION to ${SWORD_SOVERSION}")
+ENDIF(BUILDING_SHARED)
+
+###############################################################################################
+# The buildflags depend on the CMAKE_BUILD_TYPE supplied at the command line.
+# For a full lists of different flags see http://cmake.org/Wiki/CMake_Useful_Variables
+#
+# Cmake has sane defaults for None aka '', DEBUG, RELEASE, RELWITHDEBINFO for known compilers.
+#
+# You can override these variables on the command-line or here.
+# We provide our own defaults below
+#
+# Note the below two initialisations done for us by cmake:
+#
+#SET(CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS}"   or "$ENV{CFLAGS}" or "" )
+#SET(CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS}" or "$ENV{CXXFLAGS}" or "" )
+
+IF(SWORD_ENABLE_WARNINGS STREQUAL "Yes")
+	SET(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}")
+	SET(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
+ENDIF(SWORD_ENABLE_WARNINGS STREQUAL "Yes")
+
+IF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
+	SET(CMAKE_C_FLAGS   "-pg ${CMAKE_C_FLAGS}")
+	SET(CMAKE_CXX_FLAGS "-pg ${CMAKE_CXX_FLAGS}")
+ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
+
+IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
+	SET(CMAKE_C_FLAGS   "-g -finstrument-functions ${CMAKE_C_FLAGS}")
+	SET(CMAKE_CXX_FLAGS "-g -finstrument-functions ${CMAKE_CXX_FLAGS}")
+	TARGET_LINK_LIBRARIES(libsword fnccheck)
+ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
+
+SET(CMAKE_C_FLAGS_DEBUG            "-g3 -Wall -O0 ${CMAKE_C_FLAGS}")
+SET(CMAKE_C_FLAGS_RELEASE          "-O3 ${CMAKE_C_FLAGS}")
+SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O3 -g ${CMAKE_C_FLAGS}")
+SET(CMAKE_CXX_FLAGS_DEBUG          "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}")
+
+##############################################################################################
+# Setting libraries and includes
+#
+
+IF(WITH_ZLIB)
+	INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ZLIB_LIBRARY})
+ENDIF(WITH_ZLIB)
+IF(WITH_CURL)
+	FIND_PROGRAM(CURL_CONFIG curl-config
+		DOC "The curl-config executable path, used to determine SFTP support.")
+	# If we can find the config script, we will run it and attempt to parse out the
+	# availability of SFTP support. Otherwise, we will assume the library was built
+	# without it.
+	IF(CURL_CONFIG)
+		EXECUTE_PROCESS(
+			COMMAND ${CURL_CONFIG} --protocols
+			COMMAND grep SFTP
+			COMMAND wc -l
+			OUTPUT_VARIABLE CURL_CONFIG_OUTPUT
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		IF(CURL_CONFIG_OUTPUT STREQUAL "1")
+			ADD_DEFINITIONS(-DCURLSFTPAVAILABLE)
+			MESSAGE(STATUS "cURL SFTP Support: Yes")
+		ELSE(CURL_CONFIG_OUTPUT STREQUAL "1")
+			MESSAGE(STATUS "cURL SFTP Support: No")
+		ENDIF(CURL_CONFIG_OUTPUT STREQUAL "1")
+	ENDIF(CURL_CONFIG)
+	INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CURL_LIBRARY})
+ENDIF(WITH_CURL)
+IF(WITH_CLUCENE)
+	INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY})
+	LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR})
+	ADD_DEFINITIONS(-DUSELUCENE)
+	IF(CLUCENE2)
+		ADD_DEFINITIONS(-DCLUCENE2)
+	ENDIF(CLUCENE2)
+ENDIF(WITH_CLUCENE)
+IF(WITH_ICU)
+	INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
+	ADD_DEFINITIONS(${ICU_DEFINITIONS})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+ENDIF(WITH_ICU)
+IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
+ENDIF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+
+IF(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(sword ${SWORD_LINK_LIBRARIES})
+ENDIF(BUILDING_SHARED)
+
+IF(BUILDING_STATIC)
+	TARGET_LINK_LIBRARIES(sword_static ${SWORD_LINK_LIBRARIES})
+ENDIF(BUILDING_STATIC)
+
+MESSAGE(STATUS "Setting link libraries to ${SWORD_LINK_LIBRARIES}")
+
+##############################################################################################
+#########
+### TODO: Not sure about these...
+#########
+##############################################################################################
+ADD_DEFINITIONS(-D_FTPLIB_NO_COMPAT)
+
+#############################################################################################
+# Platform-specifc bits that I will eventually refactor out into their own files, once I am happy
+# with the stuff that is here.
+# 
+IF(APPLE OR iPhone)
+	ADD_DEFINITIONS(-Dunix)
+ENDIF(APPLE OR iPhone)
+
+##############################################################################################
+# Our build test
+#
+
+ADD_EXECUTABLE(buildtest buildtest.cpp)
+IF(BUILDING_STATIC)
+	TARGET_LINK_LIBRARIES(buildtest sword_static)
+ELSE(BUILDING_STATIC)
+	TARGET_LINK_LIBRARIES(buildtest sword)
+ENDIF(BUILDING_STATIC)
+
+##############################################################################################
+# Installing the library, headers, utilies, etc
+# 
+
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake")
+
+##############################################################################################
+# Bindings are good, right?
+#
+
+IF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS)
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/bindings")
+ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS)
+
+##############################################################################################
+# Utilities are hawt
+# 
+
+IF(NOT SWORD_BUILD_UTILS STREQUAL "No")
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/utilities")
+ENDIF(NOT SWORD_BUILD_UTILS STREQUAL "No")
+
+##############################################################################################
+# Demos are also hawt
+# 
+
+IF(SWORD_BUILD_EXAMPLES STREQUAL "Yes")
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/examples/cmdline")
+ENDIF(SWORD_BUILD_EXAMPLES STREQUAL "Yes")
+
+##############################################################################################
+# Tests, however, are not
+
+IF(SWORD_BUILD_TESTS STREQUAL "Yes")
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/tests")
+ENDIF(SWORD_BUILD_TESTS STREQUAL "Yes")
diff --git a/.pc/multiarch-clucene.patch/cmake/FindCLucene.cmake b/.pc/multiarch-clucene.patch/cmake/FindCLucene.cmake
new file mode 100644
index 0000000..00d2055
--- /dev/null
+++ b/.pc/multiarch-clucene.patch/cmake/FindCLucene.cmake
@@ -0,0 +1,122 @@
+#
+# SOURCE: http://websvn.kde.org/trunk/kdesupport/strigi/cmake/FindCLucene.cmake?view=log
+#
+# ONE FIX: /usr/lib64 added to work on Fedora
+#
+
+
+#
+# This module looks for clucene (http://clucene.sf.net) support
+# It will define the following values
+#
+# CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
+# CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
+# CLUCENE_LIBRARY      = the library to link against CLucene
+# CLUCENE_VERSION      = The CLucene version string
+# CLucene_FOUND        = set to 1 if clucene is found
+#
+
+INCLUDE(CheckSymbolExists)
+INCLUDE(FindLibraryWithDebug)
+
+if(NOT CLUCENE_MIN_VERSION)
+	set(CLUCENE_MIN_VERSION "0.9.19")
+endif(NOT CLUCENE_MIN_VERSION)
+
+IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+	INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
+ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+
+IF(MSVC)
+	IF(CMAKE_BUILD_TYPE STREQUAL "Release")
+		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/Release)
+	ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
+		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/debug)
+	ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
+	SET(WIN_CLUCENE_INCLUDE_PATH ../clucene-core/src)
+ELSE(MSVC)
+	SET(WIN_CLUCENE_SEARCH_PATH "")
+	SET(WIN_CLUCENE_INCLUDE_PATH "")
+ENDIF(MSVC)
+
+SET(TRIAL_LIBRARY_PATHS
+	$ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
+	${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+	/usr/local/lib${LIB_SUFFIX}
+	/opt/local/lib${LIB_SUFFIX}
+	/usr/lib${LIB_SUFFIX}
+	/usr/lib64
+	/sw/lib${LIB_SUFFIX}
+	/usr/pkg/lib${LIB_SUFFIX}
+	${WIN_CLUCENE_SEARCH_PATH}
+	)
+SET(TRIAL_INCLUDE_PATHS
+	$ENV{CLUCENE_HOME}/include
+	${CMAKE_INSTALL_PREFIX}/include
+	/usr/local/include
+	/usr/include
+	/sw/include
+	/usr/pkg/include
+	${WIN_CLUCENE_INCLUDE_PATH}
+	)
+FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
+	NAMES clucene clucene-core
+	PATHS ${TRIAL_LIBRARY_PATHS})
+FIND_PATH(CLUCENE_INCLUDE_DIR
+	NAMES CLucene.h
+	PATHS ${TRIAL_INCLUDE_PATHS}
+	ONLY_CMAKE_FIND_ROOT_PATH)
+
+IF(WIN32)
+	SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR})
+ENDIF(WIN32)
+
+SET(CLUCENE_GOOD_VERSION TRUE)
+
+FIND_PATH(CLUCENE_LIBRARY_DIR
+	NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+IF (CLUCENE_LIBRARY_DIR)
+	SET(CLUCENE_INCLUDE_DIR ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR})
+	#MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
+	FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
+	STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
+	IF (CLMATCH)
+		STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
+		IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
+			MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+			SET(CLUCENE_GOOD_VERSION FALSE)
+		ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
+		IF (CLUCENE_VERSION STREQUAL "0.9.17")
+			MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+			SET(CLUCENE_GOOD_VERSION FALSE)
+		ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+		IF (CLUCENE_VERSION VERSION_GREATER "2.0")
+			MESSAGE (STATUS "Found CLucene 2, enabling compatibility mode")
+			SET(CLUCENE2 TRUE)
+		ELSE (CLUCENE_VERSION VERSION_GREATER "2.0")
+			SET(CLUCENE2 FALSE)
+		ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0")
+	ENDIF (CLMATCH)
+ELSE (CLUCENE_LIBRARY_DIR)
+	#MESSAGE(STATUS "CLucene library dir not found.")
+ENDIF (CLUCENE_LIBRARY_DIR)
+
+IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+	SET(CLucene_FOUND TRUE)
+ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+
+IF(CLucene_FOUND)
+	IF(NOT CLucene_FIND_QUIETLY)
+		MESSAGE(STATUS "CLucene: Yes ${CLUCENE_LIBRARY}")
+	ENDIF(NOT CLucene_FIND_QUIETLY)
+ELSE(CLucene_FOUND)
+	IF(CLucene_FIND_REQUIRED)
+		MESSAGE(FATAL_ERROR "CLucene: No")
+	ENDIF(CLucene_FIND_REQUIRED)
+ENDIF(CLucene_FOUND)
+
+MARK_AS_ADVANCED(
+	CLUCENE_INCLUDE_DIR
+	CLUCENE_LIBRARY_DIR
+	CLUCENE_LIBRARY
+	)
diff --git a/.pc/no-included-zconf.h.diff/cmake/sources.cmake b/.pc/no-included-zconf.h.diff/cmake/sources.cmake
new file mode 100644
index 0000000..1be2264
--- /dev/null
+++ b/.pc/no-included-zconf.h.diff/cmake/sources.cmake
@@ -0,0 +1,421 @@
+# This file started on 18 January 2010 by Gregory Hellings
+# It is ceded to The SWORD Library developers and CrossWire under the terms
+# of their own GPLv2 license and all copyright is transferred to them for
+# all posterity and eternity, wherever such transfer is possible.  Where it is
+# not, then this file is released under the GPLv2 by myself.
+#
+#
+SET(sword_base_frontend_SOURCES
+	src/frontend/swdisp.cpp
+	src/frontend/swlog.cpp
+)
+SOURCE_GROUP("src\\frontend" FILES ${sword_base_frontend_SOURCES})
+
+SET(sword_base_keys_SOURCES
+	src/keys/swkey.cpp
+	src/keys/listkey.cpp
+	src/keys/strkey.cpp
+	src/keys/treekey.cpp
+	src/keys/treekeyidx.cpp
+	src/keys/versekey.cpp
+	src/keys/versetreekey.cpp
+)
+SOURCE_GROUP("src\\keys" FILES ${sword_base_keys_SOURCES})
+
+SET(sword_base_mgr_SOURCES
+	src/mgr/swconfig.cpp
+	src/mgr/swmgr.cpp
+	src/mgr/swfiltermgr.cpp
+	src/mgr/encfiltmgr.cpp
+	src/mgr/markupfiltmgr.cpp
+	src/mgr/filemgr.cpp
+	src/mgr/versificationmgr.cpp
+	src/mgr/remotetrans.cpp
+	src/mgr/swlocale.cpp
+	src/mgr/localemgr.cpp
+	src/mgr/swcacher.cpp
+	src/mgr/swsearchable.cpp
+	src/mgr/installmgr.cpp
+	src/mgr/stringmgr.cpp
+)
+SOURCE_GROUP("src\\mgr" FILES ${sword_base_mgr_SOURCES})
+
+SET(sword_base_module_SOURCES
+	src/modules/swmodule.cpp
+	src/modules/comments/swcom.cpp
+	src/modules/comments/hrefcom/hrefcom.cpp
+	src/modules/comments/rawcom/rawcom.cpp
+	src/modules/comments/rawcom4/rawcom4.cpp
+	src/modules/comments/rawfiles/rawfiles.cpp
+	src/modules/comments/zcom/zcom.cpp
+	src/modules/common/rawstr.cpp
+	src/modules/common/rawstr4.cpp
+	src/modules/common/swcomprs.cpp
+	src/modules/common/lzsscomprs.cpp
+	src/modules/common/rawverse.cpp
+	src/modules/common/rawverse4.cpp
+	src/modules/common/swcipher.cpp
+	src/modules/common/zverse.cpp
+	src/modules/common/zstr.cpp
+	src/modules/common/entriesblk.cpp
+	src/modules/common/sapphire.cpp
+	src/modules/filters/swbasicfilter.cpp
+	src/modules/filters/swoptfilter.cpp
+
+	src/modules/filters/gbfhtml.cpp
+	src/modules/filters/gbfxhtml.cpp
+	src/modules/filters/gbfhtmlhref.cpp
+	src/modules/filters/gbfwebif.cpp
+	src/modules/filters/gbfplain.cpp
+	src/modules/filters/gbfrtf.cpp
+	src/modules/filters/gbfstrongs.cpp
+	src/modules/filters/gbffootnotes.cpp
+	src/modules/filters/gbfheadings.cpp
+	src/modules/filters/gbfredletterwords.cpp
+	src/modules/filters/gbfmorph.cpp
+	src/modules/filters/gbfwordjs.cpp
+
+	src/modules/filters/thmlstrongs.cpp
+	src/modules/filters/thmlfootnotes.cpp
+	src/modules/filters/thmlheadings.cpp
+	src/modules/filters/thmlmorph.cpp
+	src/modules/filters/thmllemma.cpp
+	src/modules/filters/thmlscripref.cpp
+	src/modules/filters/thmlvariants.cpp
+	src/modules/filters/thmlgbf.cpp
+	src/modules/filters/thmlrtf.cpp
+	src/modules/filters/thmlhtml.cpp
+	src/modules/filters/thmlxhtml.cpp
+	src/modules/filters/thmlhtmlhref.cpp
+	src/modules/filters/thmlwebif.cpp
+	src/modules/filters/thmlwordjs.cpp
+
+	src/modules/filters/teiplain.cpp
+	src/modules/filters/teirtf.cpp
+	src/modules/filters/teixhtml.cpp
+	src/modules/filters/teihtmlhref.cpp
+
+	src/modules/filters/gbfthml.cpp
+	src/modules/filters/gbfosis.cpp
+	src/modules/filters/thmlosis.cpp
+	src/modules/filters/thmlplain.cpp
+	src/modules/filters/osisosis.cpp
+
+	src/modules/filters/osisenum.cpp 
+	src/modules/filters/osisglosses.cpp 
+	src/modules/filters/osisxlit.cpp 
+	src/modules/filters/osisheadings.cpp
+	src/modules/filters/osisfootnotes.cpp 
+	src/modules/filters/osishtmlhref.cpp
+	src/modules/filters/osisxhtml.cpp
+	src/modules/filters/osiswebif.cpp
+	src/modules/filters/osismorph.cpp
+	src/modules/filters/osisstrongs.cpp
+	src/modules/filters/osisplain.cpp
+	src/modules/filters/osisrtf.cpp
+	src/modules/filters/osislemma.cpp
+	src/modules/filters/osisredletterwords.cpp
+	src/modules/filters/osisscripref.cpp
+	src/modules/filters/osisvariants.cpp
+	src/modules/filters/osiswordjs.cpp
+	src/modules/filters/osismorphsegmentation.cpp
+	src/modules/filters/osisreferencelinks.cpp
+
+	src/modules/filters/latin1utf8.cpp
+	src/modules/filters/latin1utf16.cpp
+	src/modules/filters/utf8utf16.cpp
+	src/modules/filters/utf16utf8.cpp
+	src/modules/filters/utf8html.cpp
+	src/modules/filters/utf8latin1.cpp
+	src/modules/filters/unicodertf.cpp
+	src/modules/filters/scsuutf8.cpp
+
+	src/modules/filters/utf8cantillation.cpp
+	src/modules/filters/utf8hebrewpoints.cpp
+	src/modules/filters/utf8arabicpoints.cpp
+	src/modules/filters/utf8greekaccents.cpp
+
+	src/modules/filters/cipherfil.cpp
+
+	src/modules/filters/rtfhtml.cpp
+	src/modules/filters/greeklexattribs.cpp
+	src/modules/filters/papyriplain.cpp
+
+	src/modules/genbook/swgenbook.cpp
+	src/modules/genbook/rawgenbook/rawgenbook.cpp
+	
+	src/modules/lexdict/swld.cpp
+	src/modules/lexdict/rawld/rawld.cpp
+	src/modules/lexdict/rawld4/rawld4.cpp
+	src/modules/lexdict/zld/zld.cpp
+	
+	src/modules/texts/swtext.cpp
+	src/modules/texts/rawtext/rawtext.cpp
+	src/modules/texts/rawtext4/rawtext4.cpp
+	src/modules/texts/ztext/ztext.cpp
+)
+SOURCE_GROUP("src\\modules" FILES ${sword_base_module_SOURCES})
+
+SET(sword_base_utilfns_SOURCES
+	src/utilfuns/swobject.cpp
+	src/utilfuns/utilstr.cpp
+	src/utilfuns/utilxml.cpp
+	src/utilfuns/swversion.cpp
+	src/utilfuns/swbuf.cpp
+	src/utilfuns/ftpparse.c
+	src/utilfuns/url.cpp
+	src/utilfuns/roman.cpp
+)
+SOURCE_GROUP("src\\utilfns" FILES ${sword_base_utilfns_SOURCES})
+
+SET(sword_base_binding_SOURCES
+	bindings/flatapi.cpp
+)
+
+# Universal sources
+SET(sword_base_SOURCES
+	${sword_base_frontend_SOURCES}
+	${sword_base_keys_SOURCES}
+	${sword_base_mgr_SOURCES}
+	${sword_base_module_SOURCES}
+	${sword_base_utilfns_SOURCES}
+	${sword_base_binding_SOURCES}
+)
+
+# Sources relying on ZLib
+SET(sword_zlib_used_SOURCES
+	src/modules/common/zipcomprs.cpp
+	src/modules/common/bz2comprs.cpp
+	src/modules/common/xzcomprs.cpp
+	src/utilfuns/zlib/untgz.c
+)
+SET(sword_zlib_nofound_SOURCES
+	src/utilfuns/zlib/adler32.c
+	src/utilfuns/zlib/compress.c
+	src/utilfuns/zlib/crc32.c
+	src/utilfuns/zlib/deflate.c
+	src/utilfuns/zlib/gzclose.c
+	src/utilfuns/zlib/gzlib.c
+	src/utilfuns/zlib/gzread.c
+	src/utilfuns/zlib/gzwrite.c
+	src/utilfuns/zlib/infback.c
+	src/utilfuns/zlib/inftrees.c
+	src/utilfuns/zlib/inflate.c
+	src/utilfuns/zlib/inffast.c
+	src/utilfuns/zlib/trees.c
+	src/utilfuns/zlib/uncompr.c
+	src/utilfuns/zlib/zutil.c
+)
+
+# Sources relying on cURL
+SET(sword_curl_found_SOURCES
+	src/mgr/curlftpt.cpp
+	src/mgr/curlhttpt.cpp
+)
+SET(sword_curl_nofound_SOURCES
+	src/mgr/ftplibftpt.cpp
+	src/utilfuns/ftplib.c
+)
+
+# Sources relying on CLucene
+SET(sword_clucene_found_SOURCES)
+SET(sword_clucene_nofound_SOURCES)
+
+# Sources based on the regex stuff
+SET(sword_internal_regex_SOURCES
+	src/utilfuns/regex.c
+)
+SET(sword_external_regex_SOURCES)
+
+# Sources based on the ICU status
+SET(sword_icu_found_SOURCES
+	src/modules/filters/utf8transliterator.cpp
+	src/modules/filters/utf8nfc.cpp
+	src/modules/filters/utf8nfkd.cpp
+	src/modules/filters/utf8arshaping.cpp
+	src/modules/filters/utf8bidireorder.cpp
+)
+
+# Headers
+SET(SWORD_INSTALL_HEADERS
+	include/canon.h
+	include/canon_abbrevs.h
+	include/cipherfil.h
+	include/curlftpt.h
+	include/curlhttpt.h
+	include/defs.h
+	include/echomod.h
+	include/encfiltmgr.h
+	include/entriesblk.h
+	include/femain.h
+	include/filemgr.h
+	include/versificationmgr.h
+	include/flatapi.h
+	include/ftpparse.h
+	include/remotetrans.h
+	include/ftplibftpt.h
+	include/ftplib.h
+
+	include/gbffootnotes.h
+	include/gbfheadings.h
+	include/gbfhtml.h
+	include/gbfxhtml.h
+	include/gbfhtmlhref.h
+	include/gbfwebif.h
+	include/gbfmorph.h
+	include/gbfosis.h
+	include/gbfplain.h
+	include/gbfredletterwords.h
+	include/gbfrtf.h
+	include/gbfstrongs.h
+	include/gbfwordjs.h
+	include/gbfthml.h
+	include/greeklexattribs.h
+
+	include/hebrewmcim.h
+	include/hrefcom.h
+	include/installmgr.h
+	include/latin1utf16.h
+	include/latin1utf8.h
+	include/listkey.h
+	include/localemgr.h
+	include/lzsscomprs.h
+	include/markupfiltmgr.h
+	include/multimapwdef.h
+	include/nullim.h
+
+	include/osisenum.h
+	include/osisglosses.h
+	include/osisxlit.h
+	include/osisheadings.h
+	include/osishtmlhref.h
+	include/osisxhtml.h
+	include/osiswebif.h
+	include/osismorph.h
+	include/osismorphsegmentation.h
+	include/osisplain.h
+	include/osisrtf.h
+	include/osisosis.h
+	include/osisstrongs.h
+	include/osisfootnotes.h   
+	include/osislemma.h   
+	include/osisredletterwords.h   
+	include/osisscripref.h   
+	include/osiswordjs.h   
+	include/osisvariants.h   
+	include/osisreferencelinks.h   
+
+	include/papyriplain.h
+	include/rawcom.h
+	include/rawfiles.h
+	include/rawgenbook.h
+	include/rawld.h
+	include/rawld4.h
+	include/rawstr.h
+	include/rawstr4.h
+	include/rawtext.h
+	include/rawverse.h
+
+	include/roman.h
+	include/rtfhtml.h
+	include/sapphire.h
+	include/scsuutf8.h
+	include/strkey.h
+	include/swbasicfilter.h
+	include/swbuf.h
+	include/swcacher.h
+	include/swcipher.h
+	include/swcom.h
+	include/swcomprs.h
+	include/swconfig.h
+	include/swdisp.h
+	include/swfilter.h
+	include/swfiltermgr.h
+	include/swgenbook.h
+	include/swinputmeth.h
+	include/swkey.h
+	include/swld.h
+	include/swlocale.h
+	include/swlog.h
+	include/swmacs.h
+	include/swmgr.h
+	include/stringmgr.h
+	include/swmodule.h
+	include/swoptfilter.h
+	include/swobject.h
+	include/swsearchable.h
+	include/swtext.h
+    "${CMAKE_CURRENT_BINARY_DIR}/include/swversion.h"
+	include/sysdata.h
+
+	include/thmlfootnotes.h
+	include/thmlgbf.h
+	include/thmlheadings.h
+	include/thmlhtml.h
+	include/thmlxhtml.h
+	include/thmlhtmlhref.h
+	include/thmlwebif.h
+	include/thmllemma.h
+	include/thmlmorph.h
+	include/thmlosis.h
+	include/thmlplain.h
+	include/thmlrtf.h
+	include/thmlscripref.h
+	include/thmlstrongs.h
+	include/thmlvariants.h
+	include/thmlwordjs.h
+
+	include/teiplain.h
+	include/teirtf.h
+	include/teixhtml.h
+	include/teihtmlhref.h
+
+	include/treekey.h
+	include/treekeyidx.h
+	include/unicodertf.h
+	include/url.h
+	include/untgz.h
+	include/utf16utf8.h
+	include/utf8arshaping.h
+	include/utf8bidireorder.h
+	include/utf8cantillation.h
+	include/utf8greekaccents.h
+	include/utf8hebrewpoints.h
+	include/utf8arabicpoints.h
+	include/utf8html.h
+	include/utf8latin1.h
+	include/utf8nfc.h
+	include/utf8nfkd.h
+	include/utf8transliterator.h
+	include/utf8utf16.h
+	include/utilstr.h
+	include/utilxml.h
+
+	include/versekey.h
+	include/versetreekey.h
+	include/zcom.h
+	include/zconf.h
+	include/zipcomprs.h
+	include/zld.h
+	include/zstr.h
+	include/ztext.h
+	include/zverse.h
+
+	include/canon_kjva.h
+	include/canon_leningrad.h
+	include/canon_mt.h
+	include/canon_nrsv.h
+	include/canon_nrsva.h
+	include/canon_synodal.h
+	include/canon_vulg.h
+	include/canon_german.h
+	include/canon_luther.h
+	include/canon_null.h
+	include/canon_lxx.h
+	include/canon_orthodox.h
+	include/canon_synodalprot.h
+)
+
+SET(INTERNAL_REGEX_HEADER
+	include/internal/regex/regex.h
+)
diff --git a/.pc/no-included-zconf.h.diff/include/zconf.h b/.pc/no-included-zconf.h.diff/include/zconf.h
new file mode 100644
index 0000000..cb3b162
--- /dev/null
+++ b/.pc/no-included-zconf.h.diff/include/zconf.h
@@ -0,0 +1,279 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h 
+ */
+
+/* @(#) $Id: zconf.h 1688 2005-01-01 04:42:26Z scribe $ */
+
+#ifndef _ZCONF_H
+#define _ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ */
+#ifdef Z_PREFIX
+#  define deflateInit_	z_deflateInit_
+#  define deflate	z_deflate
+#  define deflateEnd	z_deflateEnd
+#  define inflateInit_ 	z_inflateInit_
+#  define inflate	z_inflate
+#  define inflateEnd	z_inflateEnd
+#  define deflateInit2_	z_deflateInit2_
+#  define deflateSetDictionary z_deflateSetDictionary
+#  define deflateCopy	z_deflateCopy
+#  define deflateReset	z_deflateReset
+#  define deflateParams	z_deflateParams
+#  define inflateInit2_	z_inflateInit2_
+#  define inflateSetDictionary z_inflateSetDictionary
+#  define inflateSync	z_inflateSync
+#  define inflateSyncPoint z_inflateSyncPoint
+#  define inflateReset	z_inflateReset
+#  define compress	z_compress
+#  define compress2	z_compress2
+#  define uncompress	z_uncompress
+#  define adler32	z_adler32
+#  define crc32		z_crc32
+#  define get_crc_table z_get_crc_table
+
+#  define Byte		z_Byte
+#  define uInt		z_uInt
+#  define uLong		z_uLong
+#  define Bytef	        z_Bytef
+#  define charf		z_charf
+#  define intf		z_intf
+#  define uIntf		z_uIntf
+#  define uLongf	z_uLongf
+#  define voidpf	z_voidpf
+#  define voidp		z_voidp
+#endif
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#  define WIN32
+#endif
+#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
+#  ifndef __32BIT__
+#    define __32BIT__
+#  endif
+#endif
+#if defined(__MSDOS__) && !defined(MSDOS)
+#  define MSDOS
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#if defined(MSDOS) && !defined(__32BIT__)
+#  define MAXSEG_64K
+#endif
+#ifdef MSDOS
+#  define UNALIGNED_OK
+#endif
+
+#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
+#  define STDC
+#endif
+#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
+#  ifndef STDC
+#    define STDC
+#  endif
+#endif
+
+#ifndef STDC
+#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+#    define const
+#  endif
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
+#  define NO_DUMMY_DECL
+#endif
+
+/* Old Borland C incorrectly complains about missing returns: */
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+#  define NEED_DUMMY_RETURN
+#endif
+
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+#  ifdef MAXSEG_64K
+#    define MAX_MEM_LEVEL 8
+#  else
+#    define MAX_MEM_LEVEL 9
+#  endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+#  define MAX_WBITS   15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+ that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+   The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+                        /* Type declarations */
+
+#ifndef OF /* function prototypes */
+#  ifdef STDC
+#    define OF(args)  args
+#  else
+#    define OF(args)  ()
+#  endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
+   /* MSC small or medium model */
+#  define SMALL_MEDIUM
+#  ifdef _MSC_VER
+#    define FAR _far
+#  else
+#    define FAR far
+#  endif
+#endif
+#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
+#  ifndef __32BIT__
+#    define SMALL_MEDIUM
+#    define FAR _far
+#  endif
+#endif
+
+/* Compile with -DZLIB_DLL for Windows DLL support */
+#if defined(ZLIB_DLL)
+#  if defined(_WINDOWS) || defined(WINDOWS)
+#    ifdef FAR
+#      undef FAR
+#    endif
+#    include <windows.h>
+#    define ZEXPORT  WINAPI
+#    ifdef WIN32
+#      define ZEXPORTVA  WINAPIV
+#    else
+#      define ZEXPORTVA  FAR _cdecl _export
+#    endif
+#  endif
+#  if defined (__BORLANDC__)
+#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
+#      include <windows.h>
+#      define ZEXPORT __declspec(dllexport) WINAPI
+#      define ZEXPORTRVA __declspec(dllexport) WINAPIV
+#    else
+#      if defined (_Windows) && defined (__DLL__)
+#        define ZEXPORT _export
+#        define ZEXPORTVA _export
+#      endif
+#    endif
+#  endif
+#endif
+
+#if defined (__BEOS__)
+#  if defined (ZLIB_DLL)
+#    define ZEXTERN extern __declspec(dllexport)
+#  else
+#    define ZEXTERN extern __declspec(dllimport)
+#  endif
+#endif
+
+#ifndef ZEXPORT
+#  define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+#  define ZEXPORTVA
+#endif
+#ifndef ZEXTERN
+#  define ZEXTERN extern
+#endif
+
+#ifndef FAR
+#   define FAR
+#endif
+
+#if !defined(MACOS) && !defined(TARGET_OS_MAC) && !defined(VCL)
+typedef unsigned char  Byte;  /* 8 bits */
+#endif
+typedef unsigned int   uInt;  /* 16 bits or more */
+typedef unsigned long  uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+#  define Bytef Byte FAR
+#else
+   typedef unsigned char FAR Bytef;
+#endif
+typedef char  FAR charf;
+typedef int   FAR intf;
+typedef uInt  FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+   typedef void FAR *voidpf;
+   typedef void     *voidp;
+#else
+   typedef Byte FAR *voidpf;
+   typedef Byte     *voidp;
+#endif
+
+#ifdef HAVE_UNISTD_H
+#  include <sys/types.h> /* for off_t */
+#  include <unistd.h>    /* for SEEK_* and off_t */
+#  define z_off_t  off_t
+#endif
+#ifndef SEEK_SET
+#  define SEEK_SET        0       /* Seek from beginning of file.  */
+#  define SEEK_CUR        1       /* Seek from current position.  */
+#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+#endif
+#ifndef z_off_t
+#  define  z_off_t long
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+#   pragma map(deflateInit_,"DEIN")
+#   pragma map(deflateInit2_,"DEIN2")
+#   pragma map(deflateEnd,"DEEND")
+#   pragma map(inflateInit_,"ININ")
+#   pragma map(inflateInit2_,"ININ2")
+#   pragma map(inflateEnd,"INEND")
+#   pragma map(inflateSync,"INSY")
+#   pragma map(inflateSetDictionary,"INSEDI")
+#   pragma map(inflate_blocks,"INBL")
+#   pragma map(inflate_blocks_new,"INBLNE")
+#   pragma map(inflate_blocks_free,"INBLFR")
+#   pragma map(inflate_blocks_reset,"INBLRE")
+#   pragma map(inflate_codes_free,"INCOFR")
+#   pragma map(inflate_codes,"INCO")
+#   pragma map(inflate_fast,"INFA")
+#   pragma map(inflate_flush,"INFLU")
+#   pragma map(inflate_mask,"INMA")
+#   pragma map(inflate_set_dictionary,"INSEDI2")
+#   pragma map(inflate_copyright,"INCOPY")
+#   pragma map(inflate_trees_bits,"INTRBI")
+#   pragma map(inflate_trees_dynamic,"INTRDY")
+#   pragma map(inflate_trees_fixed,"INTRFI")
+#   pragma map(inflate_trees_free,"INTRFR")
+#endif
+
+#endif /* _ZCONF_H */
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..4d960cb
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,2 @@
+Many individuals have contributed so much time and effort, but may God
+receive all the credit and glory.
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..d08ef0b
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,280 @@
+# TODO: write FindICU (icu-config only for 2.2 and up) -- currently taken from another CMake system
+#       limit pkg-config version to >= 0.14, demo, utilities, doc, tests
+#
+# NOTES: Defaults to build type of Shared
+#        Forces out-of-source tree build
+#        
+#
+# This file started on 18 January 2010 by Gregory Hellings
+# It is ceded to The SWORD Library developers and CrossWire under the terms
+# of their own GPLv2 license and all copyright is transferred to them for
+# all posterity and eternity, wherever such transfer is possible.  Where it is
+# not, then this file is released under the GPLv2 by myself.
+#
+#
+# A CMake port of the SWORD build system... we hope
+PROJECT(libsword CXX C)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
+SET(SWORD_VERSION 1.7.2)
+
+# Make sure it's an out-of-stream build
+IF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+	MESSAGE(FATAL_ERROR "Please invoke CMake from a different directory than the source.")
+ENDIF(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
+
+MESSAGE(STATUS "Configuring your system to build libsword.")
+
+###########################################################################################
+# Here are some basic CMake variables we need to setup in order for things to work properly
+#
+# Our include directory, for our own internally created "FIND_PACKAGE" calls, like CLucene
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+# User options
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/options.cmake")
+# Source variables
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/sources.cmake")
+# Our local includes
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/include") # For swversion.h
+INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/include") # For everything else
+
+###########################################################################################
+# This will look for various libraries that libsword builds against.  There is no REQUIRED
+# attribute added here, since all of the libraries here are not, in actuality, required.
+#
+MESSAGE(STATUS "\n-- SEARCHING FOR SYTEM PACKAGES")
+# Find our packages
+FIND_PACKAGE(ZLIB QUIET)
+FIND_PACKAGE(ICU QUIET)
+FIND_PACKAGE(CURL QUIET)
+FIND_PACKAGE(CLucene QUIET)
+FIND_PACKAGE(PkgConfig QUIET)
+FIND_PACKAGE(Regex QUIET)
+
+###########################################################################################
+# Based on user input and the results of the above tests, we may need to mux with the source
+# files to use an internal version of ZLib, cURL-like stuff, or CLucene replacements.  These
+# lines below will modify the source files directories so that the required files are only
+# included if the option is needed.
+#
+# Modify the source variables and set necessary definitions, this is a rather long segment,
+# so I have sorted it out into its own file
+INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/muxsources.cmake)
+
+################################################################################################
+# This actually creates the build target that is the libsword building target to be generated.
+# Most of the work for configuration is done above, already.
+#
+# I want to do this manually, there might be reason in the future
+IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+	ADD_LIBRARY(sword SHARED ${sword_SOURCES})
+	MESSAGE(STATUS "Building Shared library.")
+	SET(BUILDING_SHARED 1)
+	SET(SWORD_LINK_NAME sword)
+ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+
+IF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+	ADD_LIBRARY(sword_static STATIC ${sword_SOURCES})
+	SET_TARGET_PROPERTIES(sword_static PROPERTIES COMPILE_FLAGS "-fPIC")
+	SET(BUILDING_STATIC 1)
+	# Defaults to linking against the shared if it is also being built
+	IF(NOT BUILDING_SHARED)
+		SET(SWORD_LINK_NAME sword_static)
+	ENDIF(NOT BUILDING_SHARED)
+	# With MSVC, the .dll files also create .lib files of the same name
+	# with the exported symbols.  Thus, we don't want the two to have the
+	# same exact name.  In other systems, the .a and .so suffixes suffice
+	# to keep them separate
+	IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+		SET_TARGET_PROPERTIES(sword_static PROPERTIES 
+			OUTPUT_NAME "sword")
+		#MESSAGE(STATUS "Building Static library with name sword")
+	ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+		#MESSAGE(STATUS "Building Static library with name
+		#sword_static")
+	ENDIF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+	MESSAGE(STATUS "Building Static library.")
+ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+
+################################################################################################
+# Some random user settings
+#
+
+IF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
+	ADD_DEFINITIONS(-DGLOBCONFPATH="${SWORD_GLOBAL_CONF_DIR}/sword.conf")
+ENDIF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
+
+
+###############################################################################################
+# This allows the user to set a SONAME for the library.  This allows packagers and those who
+# care about that sort of thing to be happy and have all their SONAMES set properly.
+#
+IF(NOT LIBSWORD_SOVERSION AND BUILDING_SHARED)
+        SET(SWORD_SOVERSION ${SWORD_VERSION})
+ELSE(NOT LIBSWORD_SOVERSION AND BUILDING_SHARED)
+        SET(SWORD_SOVERSION ${LIBSWORD_SOVERSION})
+ENDIF(NOT LIBSWORD_SOVERSION AND BUILDING_SHARED)
+
+IF(BUILDING_SHARED)
+	SET_TARGET_PROPERTIES(sword
+		PROPERTIES SOVERSION ${SWORD_SOVERSION})
+	MESSAGE(STATUS "Setting SOVERSION to ${SWORD_SOVERSION}")
+ENDIF(BUILDING_SHARED)
+
+###############################################################################################
+# The buildflags depend on the CMAKE_BUILD_TYPE supplied at the command line.
+# For a full lists of different flags see http://cmake.org/Wiki/CMake_Useful_Variables
+#
+# Cmake has sane defaults for None aka '', DEBUG, RELEASE, RELWITHDEBINFO for known compilers.
+#
+# You can override these variables on the command-line or here.
+# We provide our own defaults below
+#
+# Note the below two initialisations done for us by cmake:
+#
+#SET(CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS}"   or "$ENV{CFLAGS}" or "" )
+#SET(CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS}" or "$ENV{CXXFLAGS}" or "" )
+
+IF(SWORD_ENABLE_WARNINGS STREQUAL "Yes")
+	SET(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}")
+	SET(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
+ENDIF(SWORD_ENABLE_WARNINGS STREQUAL "Yes")
+
+IF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
+	SET(CMAKE_C_FLAGS   "-pg ${CMAKE_C_FLAGS}")
+	SET(CMAKE_CXX_FLAGS "-pg ${CMAKE_CXX_FLAGS}")
+ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
+
+IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
+	SET(CMAKE_C_FLAGS   "-g -finstrument-functions ${CMAKE_C_FLAGS}")
+	SET(CMAKE_CXX_FLAGS "-g -finstrument-functions ${CMAKE_CXX_FLAGS}")
+	TARGET_LINK_LIBRARIES(libsword fnccheck)
+ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
+
+SET(CMAKE_C_FLAGS_DEBUG            "-g3 -Wall -O0 ${CMAKE_C_FLAGS}")
+SET(CMAKE_C_FLAGS_RELEASE          "-O3 ${CMAKE_C_FLAGS}")
+SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O3 -g ${CMAKE_C_FLAGS}")
+SET(CMAKE_CXX_FLAGS_DEBUG          "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 ${CMAKE_CXX_FLAGS}")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}")
+
+##############################################################################################
+# Setting libraries and includes
+#
+
+IF(WITH_ZLIB)
+	INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ZLIB_LIBRARY})
+ENDIF(WITH_ZLIB)
+IF(WITH_CURL)
+	FIND_PROGRAM(CURL_CONFIG curl-config
+		DOC "The curl-config executable path, used to determine SFTP support.")
+	# If we can find the config script, we will run it and attempt to parse out the
+	# availability of SFTP support. Otherwise, we will assume the library was built
+	# without it.
+	IF(CURL_CONFIG)
+		EXECUTE_PROCESS(
+			COMMAND ${CURL_CONFIG} --protocols
+			COMMAND grep SFTP
+			COMMAND wc -l
+			OUTPUT_VARIABLE CURL_CONFIG_OUTPUT
+			OUTPUT_STRIP_TRAILING_WHITESPACE)
+		IF(CURL_CONFIG_OUTPUT STREQUAL "1")
+			ADD_DEFINITIONS(-DCURLSFTPAVAILABLE)
+			MESSAGE(STATUS "cURL SFTP Support: Yes")
+		ELSE(CURL_CONFIG_OUTPUT STREQUAL "1")
+			MESSAGE(STATUS "cURL SFTP Support: No")
+		ENDIF(CURL_CONFIG_OUTPUT STREQUAL "1")
+	ENDIF(CURL_CONFIG)
+	INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CURL_LIBRARY})
+ENDIF(WITH_CURL)
+IF(WITH_CLUCENE)
+	INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY} -lclucene-shared)
+	LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR})
+	ADD_DEFINITIONS(-DUSELUCENE)
+	IF(CLUCENE2)
+		ADD_DEFINITIONS(-DCLUCENE2)
+	ENDIF(CLUCENE2)
+ENDIF(WITH_CLUCENE)
+IF(WITH_ICU)
+	INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
+	ADD_DEFINITIONS(${ICU_DEFINITIONS})
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+ENDIF(WITH_ICU)
+IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
+ENDIF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+
+IF(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(sword ${SWORD_LINK_LIBRARIES})
+ENDIF(BUILDING_SHARED)
+
+IF(BUILDING_STATIC)
+	TARGET_LINK_LIBRARIES(sword_static ${SWORD_LINK_LIBRARIES})
+ENDIF(BUILDING_STATIC)
+
+MESSAGE(STATUS "Setting link libraries to ${SWORD_LINK_LIBRARIES}")
+
+##############################################################################################
+#########
+### TODO: Not sure about these...
+#########
+##############################################################################################
+ADD_DEFINITIONS(-D_FTPLIB_NO_COMPAT)
+
+#############################################################################################
+# Platform-specifc bits that I will eventually refactor out into their own files, once I am happy
+# with the stuff that is here.
+# 
+IF(APPLE OR iPhone)
+	ADD_DEFINITIONS(-Dunix)
+ENDIF(APPLE OR iPhone)
+
+##############################################################################################
+# Our build test
+#
+
+ADD_EXECUTABLE(buildtest buildtest.cpp)
+IF(BUILDING_STATIC)
+	TARGET_LINK_LIBRARIES(buildtest sword_static)
+ELSE(BUILDING_STATIC)
+	TARGET_LINK_LIBRARIES(buildtest sword)
+ENDIF(BUILDING_STATIC)
+
+##############################################################################################
+# Installing the library, headers, utilies, etc
+# 
+
+INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake")
+
+##############################################################################################
+# Bindings are good, right?
+#
+
+IF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS)
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/bindings")
+ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS)
+
+##############################################################################################
+# Utilities are hawt
+# 
+
+IF(NOT SWORD_BUILD_UTILS STREQUAL "No")
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/utilities")
+ENDIF(NOT SWORD_BUILD_UTILS STREQUAL "No")
+
+##############################################################################################
+# Demos are also hawt
+# 
+
+IF(SWORD_BUILD_EXAMPLES STREQUAL "Yes")
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/examples/cmdline")
+ENDIF(SWORD_BUILD_EXAMPLES STREQUAL "Yes")
+
+##############################################################################################
+# Tests, however, are not
+
+IF(SWORD_BUILD_TESTS STREQUAL "Yes")
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/tests")
+ENDIF(SWORD_BUILD_TESTS STREQUAL "Yes")
diff --git a/CODINGSTYLE b/CODINGSTYLE
new file mode 100644
index 0000000..95adacc
--- /dev/null
+++ b/CODINGSTYLE
@@ -0,0 +1,81 @@
+recommended:
+	tab = 5
+	shiftwidth = 5
+
+required:
+	use tab character for indents
+
+	for (init; condition; increment) {
+		statement;
+	}
+
+	switch (variable) {
+	case 1:
+		statement;
+		statement;
+		break;
+	case 2: statement; break;
+	case 3: statement; break;
+	case 4:
+		statement;
+		break;
+	default:
+		statement;
+		break;
+	}
+
+	if (condition)
+		statement;
+	else	statement;
+
+	if (condition) {
+		statement;
+		statement;
+	}
+	else {
+		statement;
+		statement;
+	}
+
+	class ClassDef {
+	private:
+	protected:
+
+		/** This method does something
+		 * @param paramName1 the first parameter name
+		 * @param param2 the second parameter name
+		 * @return error status
+		 */
+		char methodName(int paramName1, char param2 = -1);
+
+		/** This method does something too
+		 */
+		void anotherMethodName() { someShortExpression; }
+
+	public:
+		ClassDef();
+	};
+
+	char ClassDef::methodName(int paramName1, char param2) {
+		char retVal = 0;
+		// do something;
+		return retVal;
+	}
+
+	ClassDef classDef;
+	classDef.methodName(1, '2');
+
+	if (((reallyLongCondition) && (moreLogic)) ||
+			(otherCondition)) {
+		expression;
+	}
+
+	int   varName1  = 1;
+	char *variable2 = "2";
+	int  &var3      = varName1;
+	int   variable4, variable5, var6, var7;
+
+	variable4 = 4;
+	variable5 = 5;
+	var6      = 6;
+	var7      = 7;
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..82a7111
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,2 @@
+Copy and use freely under the terms of the GNU General Public License
+as stated in the LICENSE file in this same directory
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..a8eeb32
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,1483 @@
+API ChangeLog
+
+
+* Release 1.7.0 *
+
+5-Oct-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Add a new Option filter, OSISReferenceLinks, based on work submitted
+		by "John Austin", which allows removal of references based on
+		a type/subtype combination. .conf usage is:
+		GlobalOptionFilter=OSISReferenceLinks|Option Name|Option Tip
+			|OSIS Reference Type|OSIS Reference SubType|Default Value
+		e.g,
+		GlobalOptionFilter=OSISReferenceLinks|Reference Material Links
+			|Hide or show links in the Biblical text to study helps|x-glossary
+			||On
+
+14-Aug-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Added new version macros in swversion.h and removed
+		config.h as a packaged and included entity 
+
+2-Aug-2013	Chris Little <chrislit@crosswire.org>
+	Added basic bibliography method to SWModule
+		(mostly from refdoc's patch)
+
+16-July-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Many classes have had class and method names normalized, including:
+		VerseMgr renamed to VersificationMgr
+		SWKey
+		ListKey
+		SWModule
+
+13-July-2013	Chris Little <chrislit@crosswire.org>
+	Added LXX & Orthodox versifications
+
+13-July-2013	Troy A. Griffitts <scribe@crosswire.org>
+	InstallMgr FTP now has a 45 second timeout
+
+11-July-2013	Troy A. Griffitts <scribe@crosswire.org>
+	SWIG bindings updated to build and work with autotools
+
+8-Jul-2013	Chris Little <chrislit@crosswire.org>
+	Applied submitted UTF8ArabicPoints code
+	Plugged Bzip2Compress & XzCompress into the API, though these
+		remain clones of the ZipCompress class and will not be
+		supported in 1.7.0
+
+6-July-2013	Jaak Ristioja <jaak@ristioja.ee>
+	InstallMgr HTTP transport, fix for buffer overrun in non-standard
+		Apache dir list output
+
+29-Jun=2013	Chris Little <chrislit@crosswire.org>
+	Removed PLAINHTML and PLAINFootnotes filters
+
+19-Jun-2013	Gregory S. Hellings <greg.hellings@gmail.com>
+	Introduced CMake options to specify exact install locations
+		of subcomponents
+
+11-Jun-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Changed SWBuf append methods to return *this, so they can be chained
+	Added a new method SWBuf::indexOf
+	New XHTML Filters based on HTMLHREF but now support:
+		tables, sub, and super elements, hi rend attribute for
+		overline of nom sac
+		better whitespace processing for:
+			block tags by supressing multiple vspace
+			poetry lines
+
+10-Jun-2013	Chris Little <chrislit@crosswire.org>
+	Added basic OSISEnum & OSISXlit filters
+	Renamed OSISRuby to the more general OSISGlosses
+
+7-Jun-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Enhanced regex searches to return result which cross a single
+		verse boundaries
+
+30-May-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Generalized Transport interface from 'FTP' to 'Remote' to better
+		accommodate HTTP, SFTP, etc.
+
+11-April-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Verse parser updates, including:
+		Fixed parsing of Ps.V
+		Added parsing of special 'inscriptio' and 'subscriptio' entries
+			resolving to special Book 0:0 and Book 1:0
+			respectively
+			e.g., Matt.Inscr -> Matt.0.0; Matt.Subscrip -> Matt.1.0
+		Better handling of verse suffix, e.g., John.1.3b
+		Handle comma verses properly after range which spans chapters,
+			e.g., jn.1.1-2.5,9
+
+12-Mar-2013	Troy A. Griffitts <scribe@crosswire.org>
+	More examples, including: show a chapter, verse range
+
+24-Feb-2013	Troy A. Griffitts <scribe@crosswire.org>
+	Greatly improved navigation with intros and normalization turned
+		on/off
+
+1-Feb-2013	Troy A. Griffitts <scribe@crosswire.org>
+	New .conf entries honored:
+		StrongsPadding=false, which turns off
+			logic to detect strongs numbers and add padding
+		CaseSensitiveKeys=true, which makes a lexicon case sensitive
+
+29-Jan-2013	Jaak Ristioja <jaak@ristioja.ee>
+	Removed warnings in header files for unused variables
+
+06-Jan-2013	Gregory S. Hellings <greg.hellings@gmail.com>
+	Added support to install from SFTP sources using username/password
+		authentication in places where cURL has SFTP support (no support
+		for public-key auth yet)
+
+19-Dec-2012	Manfred Bergmann <manfred.bergmann@me.com>
+	Added ObjC wrappers for the SWORD filter classes. Mainly because in
+		Eloquent project it is not possible to access any of the plain
+		C++ SWORD stuff. Wrappers are necessary
+	Added FilterProvider and FilterProviderFactory. They have been
+		created to add the possibility for application to override
+		the default filters (render/strip). To add a custom FilterProvider,
+		subclass DefaultFilterProvider and override the methods that are
+		required to return other filter instances. Then initialize the
+		Factory with this provider
+		+[FilterProviderFactory initWithImpl:<your impl>]
+
+07-Nov-2012	Chris Little <chrislit@crosswire.org>
+	Starting (very minimal) support for TEI in xml2gbs
+	Generalizing ruby as glosses (for use in non-Japanese texts or
+		even Japanese texts with non-ruby glosses)
+
+14-Sep-2012	Troy A. Griffitts <scribe@crosswire.org>
+	Changed default log level to WARN from INFO
+
+29-Aug-2012	Gregory S. Hellings <greg.hellings@gmail.com>
+	Swig bindings may now be built against shared or static libraries.
+	Cleaned up almost all gcc 4.7 warnings from the swig bindings and
+		eliminated errors which packagers had discovered.
+	Swig bindings are now installed by the normal 'make install' under
+		CMake
+
+11-Jul-2012	Troy A. Griffitts <scribe@crosswire.org>
+	New Lucene index field for searching 'morph' (lemma@morphology)
+
+21-Jun-2012 	Peter von Kaehne <refdoc@crosswire.org>
+	Added Pohnpeian language locale
+
+25-Apr-2012	Gregory S. Hellings <greg.hellings@gmail.com>
+	InstallMgr now supports HTTPS connections where cURL has support
+		for that transport
+
+24-Mar-2012	DM Smith <dmsmith@crosswire.org>
+	osis2mod: Allow comments to be in osis document and to be stripped out.
+		From John Zaitseff
+	osis2mod: Allow div in header of osis document. From John Zaitseff
+
+
+21-Feb-2012	Troy A. Griffitts <scribe@crosswire.org>
+	Added constants for module types:
+		SWMgr::MODTYPE_BIBLES, MODTYPE_COMMENTARIES, MODTYPE_LEXDICTS,
+		MODTYPE_GENBOOKS, MODTYPE_DAILYDEVOS
+
+14-Feb-2012	Gregory S. Hellings <greg.hellings@gmail.com>
+	Added cross-compile support to CMake, including sample Toolchain files.
+
+13-Feb-2012	Karl Kleinpaste <karl@kleinpaste.org>
+	Added ability for *HTML* wrappers to render n attribute from notes
+
+30-Jan-2012	Manfred Bergmann <manfred.bergmann@me.com>
+	Update to Lion Project. All SWORD utils are now in Xcode project and can
+		be built from there. They are however prepared to be used from with
+		Eloquent
+
+07-Dec-2011	Chris Little <chrislit@crosswire.org>
+	Removed SynodalP v11n from library
+
+12-Nov-2011	DM Smith <dmsmith@crosswire.org>
+	osis2mod: re-added the preverse div markers
+
+02-Nov-2011	Gregory S. Hellings <greg.hellings@gmail.com>
+	Improved handling of CLucene and included support for CLucene 2
+
+29-Oct-2011	Troy A. Griffitts <scribe@crosswire.org>
+	Added RTFHTML parsing of rtf \\number codes to facilitate .conf files
+	Adjusted abuser detection in SwordOrb and made orbs cycle when max is
+		reached for an IP (probably a server using us as a service)
+	Added translate and InstallMgr functions to orb
+
+29-Sep-2011	Troy A. Griffitts <scribe@crosswire.org>
+	Added sane parameter parsing to imp2ld
+	Added methods for utf8 / wchar conversion to help clucene
+
+07-Aug-2011	Manfred Bergmann <manfred.bergmann@me.com>
+	Added new Lion Xcode project where the SWORD stuff is compiled in Xcode
+		project. Changed -setClass: and instead added a protocol
+		implementation based setting of configuration
+	ObjC: Re-added ppc archiecture for Xcode project
+
+14-Jul-2011	Gregory S. Hellings <greg.hellings@gmail.com>
+	Added a sample Python script that demonstrates the bindings and compares
+		osisIDs in an XML file to known Versification schemes
+
+10-Jul-2011	Manfred Bergmann <manfred.bergmann@me.com>
+	ObjC: Fix and simplification for -
+		(id)attributeValueForParsedLinkData:(NSDictionary *)data
+		withTextRenderType:(TextPullType)textType
+
+10-Jul-2011	Manfred Bergmann <manfred.bergmann@me.com>
+	ObjC: Added option to retrieve texts for link data as rendered or
+		stripped.
+		Minor changes to SwordInstallSource and Controller.
+		Adaption of ModuleType "All" to modulesForType: method.
+		Added additional "All" enum ModuleType
+		Changed visibility of swordManager.
+		Added listModulesForType: method.
+		Added convenience constructor for SwordInstallSourceController.
+		SwordLocaleManager can be initialized with a given path to
+		locales.d. Swordbible decodeRef class method will now only pass back
+		values where not NULL was delivered.
+
+16-Mar-2011 Peter von Kaehne <refdoc@crosswire.org>
+	Introducing localised keys to imp2vs.cpp
+
+15-Mar-2011 Peter von Kaehne <refdoc@crosswire.org>
+	Faroese Locale
+
+10-Jul-2011	Manfred Bergmann <manfred.bergmann@me.com>
+	Module names are stored as lower case string in SwordManagers module
+		cache. -moduleForName: now als uses a lower case string to pull
+		the module from the cache
+
+
+
+* Release 1.6.2 *
+
+18-Oct-2010	Troy A. Griffitts <scribe@crosswire.org>
+	Fixed parsing book names containing the letter 'f'
+		from Ben Morgan
+	Fixed imp2vs not flushing cache before exiting when
+		creating compressed modules
+	Fixed LZSS compression
+
+14-Oct-2010	Troy A. Griffitts <scribe@crosswire.org>
+	Allow <hi> to be nested in any order in OSIS markup
+	Updates to allow hyphenated book names
+
+15-Aug-2010	Gregory S. Hellings <greg.hellings@gmail.com>
+	Added a file to SWIG bindings to enable compilation
+		of Perl bindings, which lacked stl_multimap.i
+	Added support for building Python and Perl with CMake
+	Updated demo Perl script to reflect new API changes
+
+25-Jun-2010	Troy A. Griffitts <scribe@crosswire.org>
+	Added CMake build system, contributed by GHellings
+
+29-Mar-2010	Troy A. Griffitts <scribe@crosswire.org>
+	Set verse to 1 when changing chapter and book in VerseKey
+	Fixed a bug where book designations ending in 'f' would
+		trigger the verse+'f'/'ff' feature.
+	Fixed curl bug which seems to hold on to progress
+		object even after scope of data retrival
+
+
+* Release 1.6.1 *
+
+01-Jan-2010	Troy A. Griffitts <scribe@crosswire.org>
+	Added locales.d/locales.conf - a special locale which
+		can be queried for localized and English lang names
+	New supported v11n systems: german kjva leningrad luther
+		mt nrsva nrsv synodal vulg <chrislit@crosswire.org>
+
+02-Dec-2009	Troy A. Griffitts <scribe@crosswire.org>
+	Updated installmgr util to allow multiple
+		commands and update dl progress
+	Added progress reporting to FtpLib transport
+	Added ability to cancel during file transport,
+		per Eeli's suggestion
+	Increased clucene buffer size - mwtalbert
+	On clucene index creation, error out on no
+		write perms - mwtalbert
+
+12-Oct-2009	Troy A. Griffitts <scribe@crosswire.org>
+	Added initial impl for CurlHTTPTransport submitted
+		by Nic Carter <niccarter@mac.com>
+	Added initial Android ifdefs to get things compiling
+		under the Android NDK
+	Added bindings/java-jni for Android development
+
+09-Aug-2009	Troy A. Griffitts <scribe@crosswire.org>
+	Added checks for Hebrew and Arabic when stripping
+		for searching
+
+
+* Release 1.6.0 *
+
+14-May-2009	Troy A. Griffitts <scribe@crosswire.org>
+	General cleanup and prep for release
+
+04-May-2009	Troy A. Griffitts <scribe@crosswire.org>
+	Added ability for (SWBuf("xxx") == (const char *)0) to
+		return false;
+	Added OSIS Header logic to accept:
+		<div subType="x-preverse" sID="xyz"/>
+	Added initial set of v11n schemes (Chris Little):
+		KJV, Leningrad, MT, KJVA, NRSV, NRSVA
+
+12-Apr-2009	Troy A. Griffitts <scribe@crosswire.org>
+	Added '.' feature for entryAttrib search, e.g,
+		Word//Lemma./G932/ will find in Lemma, Lemma.1, etc.
+	Added LocalePath feature in sword.conf
+
+06-Apr-2009	Joachim A. <jansorg@crosswire.org>
+	Added Maltese bookname translation prepared by C. S.
+
+30-Mar-2009	Ben Morgan
+	Added new methods to SWModule:
+		bool isLinked(SWKey *k1, SWKey *k2)
+			- are two entries linked
+		bool hasEntry(SWKey *k1)
+			- does an entry for the given key exist?
+	Added new methods to SWLD:
+		long getEntryCount()
+			- number of entries in the dictionary
+		getKeyForEntry(long entry)
+			- get the key for the nth entry
+		getEntryForKey(const char *key)
+			- get the index for the given key
+	Updated strongsPad to work with keys with a prefix of G or H
+	Fixed a bug in SWMgr which would load certain files in the
+		mods.d directory which shouldn't have been loaded.
+	Fix for divineName with non-ascii text in OSISHTMLHREF filter
+
+07-Feb-2009	Troy A. Griffitts <scribe@crosswire.org>
+	Added fallback checks for OS specific module
+		locations:
+			$ALLUSERSPROFILE/Application Data/sword
+
+			~ additionally looked for at:
+			$HOMEDRIVE$HOMEPATH/Application Data
+
+			added ~/sword (note the absense of '.')
+
+26-Dec-2008	Troy A. Griffitts <scribe@crosswire.org>
+	Added list support in OSIS HTML conversion (ghellings)
+
+23-Dec-2008	Troy A. Griffitts <scribe@crosswire.org>
+	Added ignore of comment lines starting with '#'
+		in SWConfig processing
+	Added requirement to call setUserDisclaimerConfirmed
+		in InstallMgr before remote functions operate
+	Added refreshRemoteSourceConfiguration to sync a
+		local InstallMgr.conf with a master remote list
+	Added ability for InstallMgr to use username/passwd
+		supplied by either .conf or globally in c-tor
+	Added VerseMgr to abstract versification scheme
+		functionality
+	Included 1 versification scheme: KJV
+	Added param on SWBuf::stripPrefix to allow use more
+		like a safe string tokenizer to replace strtok
+
+16-Dec-2008	Joachim A. <jansorg@crosswire.org>
+	Added two Chinese bookname translations provided by
+		F. Lee
+
+03-Sep-2008	Troy A. Griffitts <scribe@crosswire.org>
+	Added getOSISRefRangeText to SWKey- not yetimplemented
+		ideally or even correctly for all SWKey types
+
+* Release 1.5.11 *
+
+14-May-2008	Troy A. Griffitts <scribe@crosswire.org>
+	Added ability for lexicon drivers to accept
+		####![a-z] as strong number.
+
+13-May-2008	Chris Little <chrislit@crosswire.org>
+	Added basic TEIRTF filters
+	Added tei2mod utility
+	Added Japanese locale from http://bible.50webs.org/en/
+	Applied Ben Morgan's TEIHTMLHREF filter
+	Added TEIHTMLHREF filter to BCB5 project
+
+11-May-2008	Troy A. Griffitts <scribe@crosswire.org>
+	Applied patch to better handle x-refs in notes
+		-Ben Morgan <benpmorgan at gmail dot com>
+	Applied patch to better output OSIS in plaintext
+		-Ben Morgan <benpmorgan at gmail dot com>
+	Updated rawstr and rawstr4 to work consistently
+		with buffer sizes
+	Updated French locales and added french abbrev
+		locales from Dominique Corbex
+		<dominique dot corbex at gmail dot com>
+	Updated Farsi locales from Peter von Kaehne
+		<refdoc at gmx dot net>
+
+16-Oct-2007	Troy A. Griffitts <scribe@crosswire.org>
+	Implemented a basic TreeKeyIdx::remove() method
+
+* Release 1.5.10 *
+
+16-Oct-2007	Troy A. Griffitts <scribe@crosswire.org>
+	Added new vi-utf8.conf Vietnamese locale submitted
+		by Daniel Owens <dhowens at pmbx dot net>
+
+11-Oct-2007	Troy A. Griffitts <scribe@crosswire.org>
+	Added new FileMgr::openFileReadOnly to help centralize
+		all file io details
+
+11-Oct-2007	Troy A. Griffitts <scribe@crosswire.org>
+	Added new RawText4 and RawCom4 drivers which allow
+		for a 4 byte record size.  Patch submitted by
+		Doug Rintoul <doug_rintoul at sil dot org>
+
+6-Oct-2007	Troy A. Griffitts <scribe@crosswire.org>
+	Added SWBuf::stripPrefix method which works nice
+		for returning and stripping stuff like
+		'lemma' from "lemma:G1234"
+	Added part params to XMLTag::setAttribute
+	Changed OSISStrongs to only strip lemma parts with
+		strong prefix
+	Applied fix for newer version of gcc which errors if
+		create perms are not passed to ::open
+		(Deji Akingunola <dakingun at gmail dot com>)
+	Modified OSISLemma to only strip lemma parts with
+		lemma.* prefix or no prefix
+	Added UTF-8 processing for case insensitive unindexed
+		searching
+
+13-Sep-2007	Troy A. Griffitts <scribe@crosswire.org>
+	Added InstallMgr::getModuleStatus to return a list
+		of differences between the modules of two SWMgr
+		objects
+
+03-Mar-2007 	Joachim Ansorg <jansorg@crosswire.org>
+	Added osis morph segments filter include file to the dist
+	Fixed wrong stricmp in SWObject
+
+10-Dec-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Added example: examples/cmdline/verserangeparse.cpp
+
+2-Dec-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Added example: examples/cmdline/listoptions.cpp
+	Added entryAttributes processing for morph segs
+
+23-Nov-2006	Daniel Glassey <dglassey@crosswire.org>
+	Use acx_clucene.m4 from CLucene contribs to detect CLucene
+	apply Debian patch for flatapi for 64-bit portability
+
+20-Nov-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Moved treekey and genbook tests to utilities
+	Finished first stable version of rewrite of imp2gbs
+	Fixed bug in treekey where didn't break on found sibling
+	Added .trim to localName segments of genbook path,
+		e.g. /this / is/a/test/  - all spaces will be removed
+	Added recognition of additional greek accent ~
+		in UTF8GreekAccents filter
+	Fixed bug in RawGenBook::setText where default size
+		is < 0, not false
+	Changed lucene indexing to actually index the key field.  This
+		allows searching within key field (e.g. key:word)
+	Fixed divineName logic
+	Fixed & handling
+
+* Release 1.5.9 *
+
+21-Sep-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Clean up and package for 1.5.9
+	Added Thai Unicode locale coutesy of
+		Adrian Korten <adrian_korten@sil.org>
+
+29-Aug-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Added recognition for the sysConfig parameter in SWMgr c-tor
+		(allow passing path to sword.conf to use for config)
+	Updated CORBA server to allow option -sysConf /path/sword.conf
+
+16-Aug-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Added new module lookup options:
+		./sword.conf
+		../library/mods.d
+	Added fix to preserve markup in headings (charcoal)
+	Fixed non-UTF8 builds (thanks berkana)
+
+1-Aug-2006	DM Smith <dmsmith@crosswire.org>
+	Fixed divineName bug
+	Updated q handling to use quote stack
+	Update to fix RLT
+	Fixed a bug in osis2mod that duplicated a chapter title in the verse
+	Normalize whitespace in xml tags
+	Updated support for more OSIS markup, including q marker
+
+21-May-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Added SWBuf::startsWith, endsWith
+	Added entry attribute exposure of multipart words
+	Added beginnings of VerseKey subclass which uses TreeKey
+
+25-Apr-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Changed SWModule::search to fill result set up with more
+		specialized SWKey objects, instead of always SWKey
+	Changed SWModule::search to use CLucene better for
+		non-VerseKey modules
+	Added basic proximity searching with CLucene searches
+	Added ListKey::sort()
+
+14-Apr-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Added EntryAttribute support to SWIG bindings (from mreimer)
+
+29-Mar-2006	Joachim Ansorg <jansorg@crosswire.org>
+	Fixed lucene code to work with 0.9.x (tested with 0.9.10)
+
+31-Jan-2006	Troy A. Griffitts <scribe@crosswire.org>
+	Added support for OSIS variants
+	Added .NET support and update to swig bindings (from lefticus)
+
+28-Nov-2005	Troy A. Griffitts <scribe@crosswire.org>
+	Fixed ICUStringMgr toUpper method
+
+19-Nov-2005	Troy A. Griffitts <scribe@crosswire.org>
+	Cleaned up headers to remove unnecessary includes
+
+26-Oct-2005	Martin Gruner <mgruner@crosswire.org>
+	Added Arabic locale (from Mina Magdy).
+
+17-Oct-2005	Joachim Ansorg <jansorg@crosswire.org>
+	Fixed the dutch locale file
+
+21-Sep-2005	Martin Gruner <mgruner@crosswire.org>
+	Added Hebrew locale for both Tanach (OT) and
+	Berit Chadashah (NT).
+
+* Release 1.5.8 *
+
+27-May-2005	Troy A. Griffitts <scribe@crosswire.org>
+	Clean up and package for 1.5.8
+
+16-May-2005	Troy A. Griffitts <scribe@crosswire.org>
+	Changed Strongs to Lemma and added LemmaClass for
+		EntryAttributes
+	Made OSIS, GBF, and ThML filters parse lemma and
+		morph
+
+2-May-2005	Troy A. Griffitts <scribe@crosswire.org>
+	Removed many tools files and added them to
+		the sword-tools repository
+	Removed the need for many #if's throughout the code
+	Added seek, read, write, O_*, S_* to filemgr.cpp
+
+11-Apr-2005	Troy A. Griffitts <scribe@crosswire.org>
+	Cleaned up unused files in preparation for release
+	Updated pkg-config to report proper required libs
+
+1-Jan-2005	Troy A. Griffitts <scribe@crosswire.org>
+	Extended InstallMgr routines to recurse directories
+	Cleaned up InstallMgr code
+	Created FTPTransport base class used by InstallMgr
+		to allow for any FTP routines to be plugged
+		into InstallMgr by overriding a new
+		createFTPTransport method to return subclass
+		(Joachim's good idea)
+	Moved all CURL and FTPLib code into FTPTransport
+		subclasses CURLFTPTransport and FTPLibFTPTransport
+		classes respectively
+	Moved status reporting methods from InstallMgr to
+		StatusReporter in FTPTransport ftptrans.(h|cpp)
+	Added CopyDir, removeDir, and isDirectory methods
+		to FileMgr
+	Added SWMgr::deleteModule to allow deleting a
+		loaded module from an SWMgr class-- needed
+		before InstallMgr deletes files involved
+		so after destruction of SWModule, all files
+		will be closes (mostly for Windows, but good
+		on any platform).
+
+13-Aug-2004	Troy A. Griffitts <scribe@crosswire.org>
+	Migrated to SVN
+
+11-May-2004	Troy A. Griffitts <scribe@crosswire.org>
+	Updated to support ARM cross-compile, and that
+		without errors
+
+03-Apr-2004	Will Thimbleby <will@thimbleby.net>
+	Added SWBuf method setFormatted()
+	Altered all remaining uses of char[127]
+		for file names to use SWBufs.
+
+06-Jan-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Changed system[Log|File|Locale]Mgr to
+		*Mgr *[get|set]System*Mgr() per Daniel Glassey's
+		discovery of potential problems from order of
+		initializing statics.
+
+	Added new prefix recognition for OSIS lemma prefix
+		"strong:"
+
+* Release 1.5.7 *
+
+28-Dec-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Updated many filters
+	Split cvs, removing apps
+	Updated OSIS importer
+
+28-Aug-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Abstracted the search interface from SWModule
+	Added experimental implementation of fast
+		search framework to zText using
+		clucene
+
+* Release 1.5.6 *
+
+26-Aug-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Packaged up 1.5.6
+	Updated CORBA services to expose a little more
+		functionality for the OSIS webapp
+
+12-Aug-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added Enciphering code that works with SWBuf
+	Fixed appendFormatted to re-init var_args
+	Other small fixes to build on Opteron 64-bit
+
+07-Jul-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added enough functionality to remotely install
+		into installmgr, but Daniel Glassey needs
+		to fix the linux autobuild stuff :)
+	Added SWOptionFilter and made most option filters
+		extent this class.
+
+26-Jun-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Removed all std::string references from API and
+		mostly replaced with SWBuf
+	Added int max param to SWBuf::append
+	Added some file copy functions to FileMgr
+	Moved some more install stuff to installmgr
+
+18-Jun-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Joachim added OSISFootnotes.  Added entryAttributes
+		parsing in OSISFootnotes
+	Added = operator and empty constructor to XMLTag
+	Fixed OSISHeadings to passthru non x-preverse note
+		bodies
+
+10-Jun-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added tests/testsuite for building a good set
+		of regression tests
+	Fixed VerseKey parsing of "1. book" and osisRefs
+
+06-Jun-2003     Joachim Ansorg <junkmail@joachim.ansorgs.de>
+	Implemented encodeURL() function in utilweb.cpp
+	Converted ThMLHTML filter to XMLTag, removed handling
+		of scripRefs because this shouldn't be done
+		in FMT_HTML
+	Converted ThMLHTMLHREF to XMLTag. Fixed some things.
+	Simplified some small things in filters, nothing big.
+
+01-Jun-2003     Joachim Ansorg <junkmail@joachim.ansorgs.de>
+	Added WEBIF filters, based on HTMLHREF filters.
+	Added new utilweb stuff for working with urls etc.
+	Fixed SWORD_NAMESPACE_START and SWORD_NAMESPACE_END
+		in defs.h if NO_SWORD_NAMESPACE was defined
+
+30-May-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added utilities/installmgr to call some of the
+		basic functionality from engine install
+		routines.
+	Added removeModule to installmgr.cpp, copied from
+		Windows InstallMgr.
+
+26-May-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added first cut of osis2mod using the ESV as a
+		basic template.  Works with VerseKey mods
+		only and doesn't capture all data.
+	Improved verse reference parsing to include proper
+		parsing of osisRef attributes and other
+		misc. anomalies.
+	Returned canon.h back to previous state to
+		avoid locale key mismatches
+
+25-May-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added utilfuns/utilxml.cpp and test/xmltest which
+		include basic xml utility classes
+	Added comparison operators to SWBuf so it plays
+		nicely with stl containers
+
+19-Feb-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added utilfuns/swbuf.cpp and tests/swbuftest
+	Fixed make system to include osisrtf and osisplain
+	Started HUGE task of moving all char **buf over
+		to SWBuf &buf
+
+06-Feb-2003	Joachim Ansorg <joachim@ansorgs.de>
+	Added ro.conf (Romanian) in locales.d
+
+14-Jan-2003	Joachim Ansorg <joachim@ansorgs.de>
+	Added strip filter for the red letter words so users can
+		turn it off
+	Worked a bit on locales.d/de.conf to include some abbrevs
+
+10-Jan-2003	Terry Biggs <tbiggs@infinet.com>
+	Added new osisstrongs and osismorph support to gbfhtml*.
+
+08-Jan-2003	Troy A. Griffitts <scribe@crosswire.org>
+	Added new osisstrongs and osismorph option filters.
+	Hacked gbfrtf to support, for now:
+		the osis <w> tag,
+		Removed OSIS <note>...</note>,
+		Removed any empty strongs tags for the article.
+
+19-Dec-2002	Joachim Ansorg <joachim@ansorgs.de>
+	Removed old russian book locale file, because it wasn't
+		working in Linux AND Windows
+	Added book locale files (cp1251 and koi8-r) submitted by
+		Pavlo Bohmat bohm@ukr.net to support Windows
+		and Linux.
+
+30-Nov-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Added Finnish locale files contributed by Tero
+		Favorin <tero at favorin dot com>
+
+27-Nov-2002     Joachim Ansorg <joachim@ansorgs.de>
+	Worked on Swig bindings. They work now with latest CVS.
+
+25-Nov-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Added Chris' ThMLVariants option filter to SWMgr
+
+21-Nov-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Added support to ListKey to test for inclusion in
+		set. eg. listKey.setText("mat 2:2") will set
+		listKey.Error() to true if Matthew 2:2 is not
+		in the listkey set.  listKey will also be set
+		to the correct subKey and position if it IS
+		in the set.
+
+09-Nov-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Updated ICU headers and Thai transliterator per
+		Steven Loomis' recommendations.
+
+29-Oct-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Added SWModule *SWMgr::getModule(const char *modName);
+	Added Terry Biggs' patch to htmlref filters to
+		more consistently deal with strongs numbers
+
+23-Oct-2002	Daniel Glassey <dglassey@crosswire.org>
+	Some base work for installmgr on classes to
+		manage mods.d
+
+
+* Release 1.5.5 *
+
+22-Oct-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Updated hu locale submitted from Mentler Gyula
+	Fixed bug in Book parsing that took first matching
+		book, not best matching book.
+	Added VCL autoconf/automake files and updated to
+		compile on gcc 3.2
+
+21-Oct-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Fixed ListKey bugs dealing with TOP and BOTTOM and
+		added at least an attempt to position the
+		current element key on ListKey::setText
+
+20-Oct-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Added optimizations for ListKey persistent keys
+		in VerseKey drivers
+
+09-Oct-2002	Daniel Glassey <dglassey@crosswire.org>
+	Add debian directory so you can build debs from cvs
+
+* Release 1.5.4a *
+
+07-Oct-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Fixed rawFilter bug where entrySize was being passed
+		instead of maxBufferSize.  This problem caused
+		a number of problems with the engine.
+	Applied a few of Franklin Bratcher's critical patches
+		to diatheke.
+
+01-Oct-2002	Daniel Glassey <dglassey@crosswire.org>
+	Work on sword swig perl binding
+	Change sword to use a sword namespace
+	Fix to build with gcc3.2 again after yesterday
+
+30-Sep-2002	Daniel Glassey <dglassey@crosswire.org>
+	Remove using namespace std from all headers
+
+28-Sep-2002	Troy A. Griffitts <scribe@crosswire.org>
+	Added SWModule::Index and SWCom and SWText impls
+
+
+* Release 1.5.4 *
+
+25-Sep-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Fixed zverse zstr zcom ztext zld to work with cipher
+	Added cipher key to mod2zmod
+
+27-Aug-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added Nikolay Igotti's logic for improved non-western
+		locale functionality
+	Fixed mod2zmod to work properly with headings
+	Fixed cheatah to allow heading texts like 'Mat 0:0'
+
+08-Aug-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added support for new entry in /etc/sword.conf
+		[Install]
+			AugmentPath=/where/ever
+		multiple entries can exist.
+
+31-Jul-2002	Daniel Glassey <dglassey@crosswire.org>
+	Minor change to use iostream not iostream.h (more gcc3)
+
+31-Jul-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Fixed FileMgr::trunc if trunc should be empty was
+		leaving a 1 byte (null) file, instead of empty.
+
+30-Jul-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Fixed zLD link bug where resolving incorrectly
+		skipped IDXENTRYSIZE instead of 6 ("@LINK ").
+	Fixed RawLD link errors.
+	Allocate buffer for RawStr* drivers in readtext
+		to allow realloc if link
+
+29-Jul-2002     Victor Porton <porton@narod.ru>
+	Fixed RawLD and RawLD4 drivers not reporting errors in
+	getRawEntry()
+
+28-Jul-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added Gregor Anzelj's Slovenian (sl.conf) locale.
+
+27-Jul-2002     Troy A. Griffitts <scribe@crosswire.org>
+	lex/dict drivers use new toupperstr_utf8 to allow
+		keys to be encoded in utf8 (hopefully will
+		allow cedict to be built/work correctly.
+	Added toupperstr_utf8 to utilstr.cpp
+	Make all operators have real name methods
+	Isolated SWModule operators in define
+	Fixed RawLD and RawLD4 drivers where there was
+		a blank entry created at the beginning
+	Added test lextest
+	Consolidated setPosition for lexicons in SWLD
+
+16-Jul-2002	Daniel Glassey <dglassey@crosswire.org>
+	utf8transliterator now loads translators from local
+		sword ICU data on demand
+	SWMgr loads a UTF8Transliterator filter along with
+		other filters on Load
+
+11-Jul-2002	Daniel Glassey <dglassey@crosswire.org>
+	simple fixes to allow compiling with gcc 3.1
+	rename gettext to readtext as unobtrusively as
+		possible.
+	fix BGreek_Greek trans to work with icu2.1
+	add SWMgr::isICU for apps to check if ICU stuff is
+		available
+
+10-Jul-2002	Daniel Glassey <dglassey@crosswire.org>
+	Initial support for using sword transliterators
+	with offical ICU
+
+24-Jun-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added a few english abbrevs to better parse BW exported
+		texts.
+	Added Error() raised on improperly parsed VerseKey
+		text.
+
+22-Jun-2002	Daniel Glassey <dglassey@crosswire.org>
+	Fixes to allow compiling with gcc3
+	add configure support to libVCL and change X!/installmgr
+		to build it automatically
+	remove --enable-vcl from core sword
+
+13-Jun-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Fixed Module heading bug
+	Fixed SWConfig += bug again
+	Fixed SWModule size logic when getEntrySize returns -1
+
+06-Jun-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Fixed SWConfig += bug
+	Added Efata's Indonesian locale
+
+09-Jun-2002     Joachim Ansorg <jansorg@crosswire.org>
+       	Added Perl bindings by J. Kaiser to the CVS
+
+06-Jun-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added Dominique Corbex' fr locale updates
+	Added new resultBuffer protected member to SWBasicFilter
+
+04-Apr-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added VerseKey::getOSISRef()
+	Added the beginnings of ThMLOSIS filter
+
+02-Apr-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added gsoap bindings and test client.
+	Added gbfstrongs parsing of entry attributes
+
+30-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added mod2imp to export a sword module in 'imp'
+		format
+	Better entry attribute parsing in greekdef* and
+		thmlstrongs*
+
+22-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added Saulo Rodrigues e Silva's <saulo@jatai.ufg.br>
+		locale for pt_BR
+	Added entry attributes for Thayer and ThMLStrongs
+		(which includes morph also)
+
+
+* Release 1.5.3 *
+
+22-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Updated make system to display better user output
+	Updated 'readme'-type files
+	Added make install_config
+
+21-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Changed SWMgr::Load ONE MORE TIME (blame Osk) to return
+		signed char for mac ppc to work correctly
+
+19-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Changed SWMgr::Load to return char status to be more
+		consistent with rest of api.  Sorry guys.
+	Added Daniel Glassey's patch to build diatheke
+	Added new entryAttributes mechanism to SWModule
+	Added new LocalOptionFilter GreekLexAttribs
+
+18-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added chrislit's Diatheke, BibleCS, and InstallMgr updates
+	Fixed Joachim's bug report about TreeKeyIdx segfaulting
+		if no data at DataPath
+	Added Joachim's patch to remove throw in SWMgr::Load
+
+16-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added Martin Gruner's suggestion to swmgr to look
+		for global configuration in multiple location.
+		Set default to: /etc/sword.conf:/usr/local/etc/sword.conf
+	Added chrislit's msvc and diatheke patches
+
+15-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added SWCacher to lib and made SWModule impl it
+	Added SWModule::setSkipConsecutiveLinks
+	Fixed mod2zmod to catch links
+	Fixed TOP to position to first entry, not say Gen1:1
+	Fixed bug in rawverse in logic when index is out of bnds.
+	Added DTrotz' fix for CBuilder6
+
+14-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Changed all make system files to dglassey's ./configure
+		autotool system
+	Applied chrislit's patch for macosx
+
+12-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added new option to filemgr open to allow downgrade
+		of access from rdwr to rdonly.
+	Removed code that actually opens files from most
+		driver's constructors.
+	Changed isWritable to actually return true only if the user
+		has write permission to the files.
+
+11-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added David White's recommendation to cache strlen
+		in stdstr to improve performance.
+	Added Helmer Krämer's fix for case insensitive code
+		in SWBasicFilter
+
+04-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added new multimapwithdefault::has(K, V) method to allow
+		a call like module->getConfig().has("Feature", "HebrewDefs")
+	Fixed VerseKey parse bug that didn't work with a locale
+		other than the sysLocaleMgr locale.
+	Added VerseKey::getLocale()
+	Changed SWText subclasses to work like SWCom subclasses,
+		in that they increment to next valid entry on ++
+
+03-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added image support to thmlhtml and thmlhtmlhref
+		filters
+	Added dynamic entry "AbsoluteDataPath" to module config
+		information
+	Fixed an error in the new SWModule::getConfig*
+		methods that tbiggs pointed out with .sword
+
+01-Mar-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added Helmer Krämer's speed improvements to SWModule for
+	multiword searches
+	Fixed RawGenBook memory bugs
+	Isolated all byte swapping logic to sysdata.h
+	Changed BIGENDIAN to SWBIGENDIAN
+
+27-Feb-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Commited tbiggs' update to thmlhtmlhref.cpp
+	Commited dglassey's update to make system
+	Fixed SWModule to allow setting it's own key back to
+		itself
+
+26-Feb-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added chrislit's update imp2gbs and new imp2vs
+		and new imp2ld
+	Make mod2zmod work with modules other than verse
+		keyed modules
+	Fixed zLD
+	Added SWModule::getConfig and
+		SWModule::getConfigEntry and made SWMgr
+		call new SWModlue::setConfig
+
+25-Feb-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added chrislit's new gbs tools:
+		utilities/thml2gbs
+		utilities/imp2gbs
+
+18-Feb-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added dglassey's conditional reallocation of entrybuf to drivers
+	Added dglassey's update to makesystem for icu
+	Added other optimizations for prep of 1.5.3
+
+16-Feb-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added getBookName and getBookAbbrev to VerseKey along
+		with struct book :: prefAbbrev member and data
+
+24-Jan-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Added TreeKey and TreeKeyIdx decendants
+	Added SWGenBook, and RawGenBook general book support
+		and test programs
+
+04-Jan-2002     Troy A. Griffitts <scribe@crosswire.org>
+	Happy B-Day MOM!
+	Added new property in Makefile.cfg: globalconfdir
+		defaulted to /etc
+
+20-Dec-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Added first cut of zLD
+
+13-Dec-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Added __u16, __u32, and __u64 raw data types
+	Added byte swapping macros
+	Added standard swordtoarch and archtosword macros
+		in 16, 32, and 64 bit versions
+	Added remove to entriesblk
+	Added tests for byte swapping
+
+08-Dec-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Added new SWInputMethod class for keyboard mapping support.
+	Added null input method which returns what it gets
+	Added Hebrew Michigan-Claremont input method
+
+02-Sep-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Added new swbasicfilter.cpp that provides many common method needed
+		to make an swfilter implementation.
+	Changed ThMLHTML filter to extend SWBasicFilter to take advantage of
+		the new class.
+	Added new utilstr.cpp method toupperstr to convert a c_str to all
+		uppercase.
+	Added new methods to the key classes to provide non-operator methods
+		to access features to which there were non previously.  Makes
+		other language bindings much easier to produce.
+
+
+* Release 1.5.2 *
+
+26-Jul-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Applied Tom Wildsmith's patches to cheatah: cleaned up
+		displaying of marked up texts; added nice about
+		box with module about info; handled errors better
+		on startup
+
+27-Jun-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Added roman numeral support in VerseKey parsing
+	Fixed a number of memory bugs
+
+20-Jun-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Packaging up for 1.5.2
+	Fixed mod2zmod linking bug
+
+11-Jun-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Added limited unicode support
+	Added French locale from Dominique Corbex
+
+02-Jun-2001	Chris Little <chrislit@crosswire.org>
+	Added GBFMorph OptionFilter to handle <WT...> tags and adjusted
+		GBFStrongs & other filters to not handle <WTG/H...> as a
+		Strong's number
+
+20-May-2001	Joachim Ansorg <jansorg@gmx.de>
+	Updated the Czech translation of booknames (cs.conf)
+
+18-May-2001	Joachim Ansorg <jansorg@gmx.de>
+	Added polish translation of the booknames. It was created by Robert
+Kolatzek.
+
+06-May-2001	Chris Little <chrislit@crosswire.org>
+	Added GBFHeadings OptionFilter & support for <TS><Ts> tags to
+		all GBF filters
+	Added emptyvss utility to list empty verses in a module
+	Added warning to vpl2mod for cases where a verse is being
+		overwritten
+
+23-Mar-2001	Joachim Ansorg <jansorg@gmx.de>
+	Made some changes to the API documentation in the headers
+		(documented new classes).
+
+11-Mar-2001     Troy A. Griffitts <scribe@crosswire.org>
+	Added multimapwithdefault template and changed swconfig to use
+	Added operator [] to SWConfig
+	Added configtest
+
+25-Feb-2001     Chris Little <chirslit@crosswire.org>
+	Added roman.c for Roman Numeral conversion and made GBF to ThML
+		filter produce XML compliant text
+
+09-Feb-2001	Joachim Ansorg <jansorg@gmx.de>
+	Added beginnings of API documentation in doc/api-documemtation.
+        Formats are HTML and man
+
+08-Feb-2001     Chris Little <chrislit@crosswire.org>
+	Added embedded Visual C++ project to build DLL in
+		apps/windoze/wince/sword but it requires undistributable
+		libraries to build it currently.  MIPS, SH3, and ARM processors
+		are supported.
+
+08-Feb-2001     Chris Little <chrislit@crosswire.org>
+	Added Visual C++ 6.0 project to build DLL in apps/windoze/vc/Sword
+
+18-Jan-2001	Joachim Ansorg <jansorg@gmx.de>
+	RawText::Search: Do not check for a valid key if we don't use a
+		scope, this speeds up the normal search of indexed modules
+		(IMHO a lot for large result sets)
+	Updated examples/cmdline/threaded_search.cpp
+
+14-Jan-2001	Joachim Ansorg <jansorg@gmx.de>
+	Updated sk.conf
+
+13-Jan-2001	Chris Little <chrislit@crosswire.org>
+	Added arg to vpl2mod to work with NT-only translations
+
+30-Dec-2000	Chris Little <chrislit@crosswire.org>
+	Fixed prn2sword so that it should work with new OLBs
+
+22-Dec-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Added 'micros' a mini GUI for PDAs
+
+20-Dec-2000	Troy A. Griffitts <scribe@crosswire.org>
+    Added new compile target architecture: arm
+    Changed the simple lookup cmdline example to work with any
+        module.  Tested on iPaq SA1110.  Need to optimize
+        size/speed!
+
+15-Dec-2000	Troy A. Griffitts <scribe@crosswire.org>
+	zText compess driver working
+	Fixed ZipCompress
+	Optimized SWCompress
+	mod2zmod conversion utility working
+	Added support for zText modules in SWMgr with 2 new
+		parameters: BlockType=[VERSE|CHAPTER|BOOK]
+		CompressType=[LZSS|ZIP]
+
+10-Dec-2000     Chris Little <chrislit@crosswire.org>
+	Added addld utility for adding single entries to LD modules
+
+09-Dec-2000     Chris Little <chrislit@crosswire.org>
+	Added addvs utility for adding single verses to modules
+	Added Diatheke (and CGI/Tcl/PQA frontends to it) to source
+	        tree
+	ThML filters (all) fixed to support longer tag lengths and
+	        decode HTML ampersand codes (e.g. &nbsp;)
+	ThMLRTF filter fixed to avoid printing extra '>'s
+
+02-Dec-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Added write support for RawLD
+	Added new utility modwrite to call a write interface
+
+30-Nov-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Fixed memory leak in write methods of RawText
+	Added some initial support for writing to zText
+	Added a 'not working yet' mod2zmod utility
+
+20-Nov-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Added new utility, step2vpl, for dumping BSISG STEP module in
+		vpl format.
+	Added new make target: install_config to put a basic install on
+		a box.
+	Added a QUICKSTART section to INSTALL file
+
+17-Nov-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Added new utility, stepdump, for dumping BSISG STEP modules.
+
+11-Nov-2000	Joachim Ansorg <jansorg@crosswire.org>
+	Commited new version of the sk locale file.
+
+
+* Release 1.5.1a *
+
+06-Nov-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Added more debug for tests/mgrtest.cpp
+	Hardcoded VerseKey::NewIndex to KJV max index
+
+01-Nov-2000	Joachim Ansorg <jansorg@crosswire.org>
+	Added test program for indexes using VerseKey::NewIndex()
+
+31-Oct-2000	Joachim Ansorg <jansorg@crosswire.org>
+	Fixed vpl2mod to work correctly with headers and files without
+		references.
+
+30-Oct-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Hacked SWModule::Search to hardcode high index always to
+		32300 for now until we get NewIndex working properly.
+		This will be inaccurate for range searches but will
+		always return a value between 0-100
+	Made rawverse.cpp utility functions to not be so picky
+		about trailing '/' or '\' on path names.
+	Made vpl2mod work better when 'prepend verse ref' option
+		is turned on.  There seems to be no sense in outputting
+		blank entries in this scenerio.
+
+29-Oct-2000	Joachim Ansorg <jansorg@crosswire.org>
+	Reverted the patch from 23-Oct-2000
+	gbfhtml.cpp: Changed the HTML tag for new paragraph from <P> to <BR>
+		because it's bad HTML without a closing </P> tag.
+
+23-Oct-2000	Joachim Ansorg <jansorg@crosswire.org>
+	Changed the private section of versekey.h into a protected one
+	because we need the change for current BibleTime!
+
+15-Oct-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Normalized Writable interface to SWModule.
+	Fixed RawVerse settext to correctly append a dos nl.
+	Fixed vpl2mod to correctly strip 10s and 13s from input.
+	Added verse ref parsing functionality to vpl2mod.
+	Added new 'getRawEntry()' pure virtual to each driver.
+		Changed from operator char *().  Moved operator char *
+		to SWModule.
+	Created define FILTERPAD to replace hard coded padding in
+		each driver.
+	Added write link support in RawText.
+	Added new test introtest to test module intros.
+	Fixed abbrev parsing to see Phil as Php.
+
+05-Sep-2000	Joachim Ansorg <jansorg@gmx.de>
+	Fixed a problem in Makefile.cfg with profiler support and
+		non-debugging lib (-s removes the profiler support,
+		changed it)
+
+30-Aug-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Fixed mod2vpl to strip any existing \n's from data before
+		writing the data.
+	Added new utility which reads a verse per line (vpl) file
+		and creates a new module.
+	Fixed RawVerse::CreateModule.
+	Implimented write functionality in RawText with a call to
+		RawVerse::settext.
+	Changed write functionality in RawVerse driver which appends
+		the new entry to the end of the data file and resets
+		the index to this new location.
+
+28-Aug-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Added new utility to output a verse module one line per
+		verse (utilities/mod2vpl)
+
+22-Aug-2000	Joachim Ansorg <jansorg@gmx.de>
+	Added Slovak translation of booknames made by Zdeno <zdpo@post.sk>
+
+16-Aug-2000	Joachim Ansorg <jansorg@gmx.de>
+	Fixed utilities/mkfastmod.cpp
+	Added a template for translations of international booknames
+		(doc/translation-template.conf).
+
+14-Aug-2000	Troy A. Griffitts <scribe@crosswire.org>
+	Added beginnings of search framework support.
+	Added some optimized searches for RawText driver
+
+07-Apr-2000 	Joachim Ansorg <jansorg@crosswire.org>
+	Added the THML filters (thmlrtf,thmlplain,thmlhtml and thmlgbf)
+		to the Makefile.
+
+15-Mar-2000
+	Added buildvcl option to Makefile.cfg to allow exclusion of
+		the VCL libraries from the build.
+	Changed the install for the include directory to OBTAIN the
+		file list instead of specifying each include file
+	Included cs Czech locale submitted by Kri¹tof Petr
+	Included da Dutch locale submitted by Birger Langkjer
+
+13-Mar-2000
+	Added SWLocale and LocaleMgr classes to support localization
+	Made GBFPlain filter support plain text parsing of strongs
+		numbers to allow searching for such.
+	Added VCL library port to support porting of InstallMgr to gtk
+	Added basic InstallMgr gtk port.
+	Included Chris Little's initial cut of ThML filters
+	Added Torsten's Uhlmann's plainfootnotes, an option filter for
+		footnotes in plain format Biblical texts.
+	Added Torsten's rtfhtml filter (at the moment only usable for
+		the About comment)
+
+19-Jan-2000
+	Added zText, zVerse, etc. code utilizing Daniel Glassey's comp
+		drivers
+	Fixed alloc bug in RawLD
+
+25-Nov-1999
+	Fixed double // bug in swmgr
+	Fixed /./ bug in swmgr
+	Applied Joachim's patch to fix UpperBound bug
+	Fixed Makefile bugs
+
+17-Oct-1999
+	Fixed bug in rawstr.cpp that would overwrite buffer size if
+		idxkey info was larger than buffer size
+	Added sparc support
+	Enhanced and debugged build and install system
+	added spec file for building RPMs
+	Added updated GBFHTML and PLAINHTML filters from bibletime team
+	Fixed bug in SWMgr on exit when can't find any config info
+
+15-Oct-1999
+	Changed sig of ProcessText to include SWKey *, and calls approp.
+	Changed SWMgr::optionFilters security to protected
+
+05-Sep-1999
+	Why is it always the 5th?
+	Added RawFilters to facilitate on-the-fly deciphering of entries
+	Added SWCipher which uses Michael Paul Johnson's SapphireII cipher
+	Added CipherFilter which uses SWCipher and .conf CipherKey= entry
+
+05-Jul-1999
+	Added MAXCHAPTER and MAXVERSE as POSITIONs in VerseKey
+	Added Key() method for setting / getting key on SWModule
+	Added kludge to UpperBound for setting verse and chapter to max
+		values if not specified
+	Fixed bugs where error was not being set correctly for some
+		traversals of SWModule
+
+05-Jun-1999
+	Sorry for not keeping the ChangeLog current
+	Lots of other stuff I'm sure I forgot
+	New mods.d configuration
+	Begin phase out of RawGBF.  Move to RawText with SourceType=GBF
+	Added OptionFilters
+	Added scoped searches
+	More bug fixes, as always
+	Profiling to speed up some sections of code
+
+09-Jan-1999
+	Various API bug fixes.
+	Added navigation support for all module types
+	Added search support for all module types
+	Added standard mods.conf location lookups to SWMgr
+
+15-Dec-1999
+	Added cheatah, a simple lookup and search gtk GUI
+
+12-Nov-1998
+	1.3.1 release.
+	Started making entries in ChangeLog again! :)
+	Moved directory structure.
+	Added Luis Cortes' wxSword frontend to apps tree. GREAT START!
+	Fixed bug in canon.h that incorrectly assumed static structures were
+		allocated on the heap sequential if they were in the source
+		sequentially.
+	Changed SWModule::Search(char *... to SWModule::Search(const char *
+	Removed -Werror from Makefile.cfg to avoid problems with different
+		warnings that get displayed with different versions of egcs
+
+12-Dec-1997
+	Fixed typo in about box of BibleCS
+	Changed font copyright notice in n27u4
+
+09-Dec-1997
+	Fixed Search window in BibleCS to search currently focused Bible Text module
+		and report such in the title bar.
+	Added ALPHA website to the CD Loader
+	Added a full report of the About section of a module when installing. (BibleCS)
+	Renamed module n26u4 to n27u4.
+
+04-Dec-1997
+	Added DDE to BibleCS frontend.  Thanx to Franklin Bratcher for the idea.
+		Service = sword; Topic = Bible;
+		Item = [Lookup|Search]; Data = "<module name> <arg>".  E.g.:
+			sword Bible Lookup MHC "Matthew 1:1"
+			sword Bible Search WEB knee[ls]
+		WARNING: case sensitive module names
+		See ddetest program under BibleCS directory
+
+29-Nov-1997
+	Added SWFilter and modified appropriate modules to use these.
+	Added RawGBF class that automatically adds a GBFPlain filter to
+		strip GBF tags before searching.
+	Added sword/frontend/windoze/cbuilder/biblecs frontend.  To build, use cmdline
+		compiler: make -fsword  DO NOT OPEN sword.mak WITH C++BUILDER
+	Added sword/frontend/windoze/cbuilder/biblecs/cdstartup for autorun
+		CDROMs.
+	Made some functions const.
+	Added sword/install/complete for install.
+	Added module 'rwp' (Robertson's Word Pictures)
+	Added module 'kjv' (King James 1611 with some RTF)
+	Added module 'n26u4' (Nestle Aland 26th ed. / UBS 4th. ed. Greek NT)
+	Added module 'orthjbc' (Orthodox Jewish Brit Chadasha)
+	Added module 'sve' (Swedish Bible 1917 New Testament)
+	Added module 'vnt' (Valera 1858 Spanish New Testament Text)
+	Added module 'web' (The World English Bible)
+	Added swmgr class for module management.
+	Added swconfig class for .conf file manipulation.
+
+05-Oct-1997
+	Added regular expression functionality to SWModule.Search() Used GNU
+		regex.h and regex.c with slight modifications to #define's
+13-Jul-1996
+	Added .Search() method to SWModule
+	Added SWListKey key type to facilitate lists of verses (used by .Search)
+	Added .Headings() boolean method to VerseKey to allow incrementor to
+		work including or excluding headers (e.g. chapter/book/testm/mod)
+	Started z series of modules for compression access using the compression
+		algorithms in the STEP specs.  (These are either not done or
+		extremely unstable, be warned ;)
+	Added .Index() method to VerseKey
+	Changed VerseKey incrementors to use Index(Index() [+-] val) instead of
+		counting on Normalize();
+	Added checks and output appropriate in VerseKey.freshtext() for headings.
+		This also fixed some bugs when trying to display VerseKey when
+		indexed to a heading.
+	Added frontend/widoze/Delphi20/swtxtdsp: the beginings of a Delphi RTF
+		control.
+	Changed Makefiles slightly for more logical compiles.
+	Added search test program (currently at ./)
+	Added keytest test program (currently ./tests)
+	Various Delphi component changes.
+
+	once again.. probably many other things I forgot to list, but I'm
+		getting better! ;)  Sorry for the time lapse.
+
+8-Apr-1996
+	Fixed bug in VerseKey for old testament references!
+	Fixed VerseKey from crashing when set with text that it cannot parse.
+	Removed the need for Keys data files.  Added information instead to canon.h
+	Added procedural API (frontend/windoze/bcowl25/swordapi) and 16 & 32
+		bit DLLs for windoze (sword16.dll; sword32.dll).
+	Added Delphi components (frontend/windoze/delphi20/swordvc) and
+		examples (examples/windoze/delphi/multimo[1-3])
+
+14-Mar-1996
+	Renamed RawDrv to RawVerse
+	Moved RawVerse common index files and Index() to VerseKey
+	Added StrKey, a VerseKey counterpart that accepts a string for its
+		key information (for words, cities, people, etc.)
+	Added RawStr, a RawVerse counterpart that operates on a StrKey
+	Added SWLD- a lexicon/dictionary base class
+	Added raw lexicon/dictionary support with class RawLD and utilities
+		(modules/lexdict/rawld/rawld.cpp)
+	Added module 'eastons' (Easton's Bible Dictionary)
+	Added module 'vines' (Vine's Bible Dictionary)
+	Added executable demo 'lookup' that used RawLD and the 'eastons'and
+		'vines' modules to lookup argv[1] (module decided by argv[2])
+	Moved sword/frontend/windows/bcowl25 to examples/windoze/bcowl25/multimod
+		and added lexicon/dictionary support to demo. (Highligh a word and
+		right-click for menu)
+	Fixed VerseKey post-increment bug (operator ++(int))
+	... once again: probably more that I forgot ...
+
+15-Feb-1996
+	Many small changes.
+	Moved raw file support to RawDrv class (modules/common/rawdrv.cpp)
+	Added Module/Testament/Book/Chapter intro entries in RawDrv index
+		files.  This means that YOU WILL NEED TO DOWNLOAD NEW VERSIONS
+		OF THE RAW MODULES (or at least run the new 'makeidx' programs
+		against your old texts to re-index them (new versions save
+		some space so ideally the new copies are recommended).
+	Added size field into .vss RawDrv index files
+	Added logical comparison operators to VerseKey
+	Added Error() method to SWKey and return value KEYERR_OUTOFBOUNDS
+		This is set when VerseKey tries to increment or decrement
+		past valid canonical bounds (when Normalize() is attempted).
+	Added raw commentary support with class RawCom and utilities
+		(modules/comments/rawcom/rawcom.cpp)
+	Added module 'mhc' (Matthew Henry's Commentary on the Entire Bible)
+	Added AutoNormalize() method for toggling the automatic normalization
+		feature and moved normalize() to Normalize() (public).
+	Modified existing 'makeidx' utilities to support new format.
+	Removed ^M (0x0d) from RawDrv text files (sorry DOS users if this is
+		an inconvenience but it saves bandwidth for download time.
+		If you really feel the need to have them in your files, you
+		can always resave with most nonprogramming editors and it will
+		replace them, but be sure to run makeidx on 'ot' and 'nt' again
+		or your index files will be off.
+	Almost useful .exe in frontend/windoze/bcowl25/ (at least it shows an
+		example of coding direction for use of the API)
+	... probably more that I forgot ...
+
+22-Jan-1996
+	Added chapmax and versemax information (canon.h)
+	Made sword.cpp test program accept parameters:
+		usage: sword ["Book CH:VS"] [number of verses to display]
+	Enabled normalize function (try sword "Matthew 1:-7" 12)
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..f3cfb80
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,179 @@
+                       INSTALLATION NOTES
+
+
+QUICKSTART
+
+Either:
+	Obtain source via SVN with:
+		svn co http://crosswire.org/svn/sword/trunk sword
+		cd sword
+		./autogen.sh
+
+	or,
+		unpack a source package and change to that directory.
+
+Have a look at the OPTIONS in usrinst.sh to see if they suit your needs.
+Pay particular attention to libdir=/usr/lib64.  Ubuntu and many other
+systems store 64bit libraries simply in /usr/lib.  If you are building
+on a 32-bit machine, you'll almost certainly wish to change this to
+/usr/lib
+
+Then, try:
+
+	./usrinst.sh
+	make
+	sudo make install
+
+If you have never installed sword before and/or are happy with a default
+configuration, you may wish to type:
+
+	sudo make install_config
+
+for a basic configuration.  WARNING: THIS WILL OVERWRITE AN EXISTING
+CONFIGURATION.  It is OK to rerun this if you have not changed any
+parameters in /etc/sword.conf
+
+Now let's grab some content:
+
+	cd utilities/
+	sudo ./installmgr -sc
+	sudo ./installmgr -r CrossWire
+	sudo ./installmgr -ri CrossWire KJV
+
+Now lets try it out:
+
+	cd ../examples/cmdline
+	make
+	./lookup KJV Jn.3.16
+
+If the above steps do not work, or if you're particular about your
+configuration, please read on.
+
+________________________________________________________________
+
+BUILD CONFIGURATION
+
+What most people consider 'normal' user install options are saved in
+a script 'usrinst.sh', which you may run with the command './usrinst.sh'.
+You may want to have a look at the configuration options by typing
+./configure --help and also looking at what we consider 'normal'
+usage parameters by looking inside usrinst.sh
+to be sure everything is being built the way that you would like.
+
+
+BUILDING
+
+A 'make' at the top level directory of the SWORD package should build the
+libraries necessary for building any of the frontends.  The libraries will
+be built in the ./lib directory.
+
+After the libraries are built, one will probably wish to 'su' to root and
+'make install' to install the libraries systemwide.  One then may proceed to
+write and compile SWORD applications.
+
+
+MODULES
+
+To be useful the software needs to find SWORD 'modules' installed somewhere
+accessible.  These module plugins consist of Bible texts, commentaries,
+dictionaries, and the like.  New plugins are constantly being added.  They
+may be obtained from:
+http://www.crosswire.org or various mirrors.
+
+In a default SWORD configuration, the module install process may look like this:
+
+[download a module with your favourite client]
+su
+cd /usr/share/sword
+unzip ~/KJV.zip
+
+There is also an over-the-net install utility located at utilities/installmgr
+
+After modules are installed, you can create fast search indecies (if you have
+compiled with clucene support), with utilities/mkfastmod
+
+NOTE: sometimes clucene forgets to install some header files.  You might need to
+manually copy clucene-core-X/src/CLucene/clucene-config.h to your install prefix
+(e.g. /usr/local/include/CLucene/)
+
+If you want module configuration/installation details, read on...
+
+
+A directory named 'mods.d' contains all configuration information regarding
+the installed modules available to the API.  The format of a config file is
+fairly straight-forward, and most modules come with their own .conf file,
+of which the contents may be placed in the mods.d directory.
+
+
+MODULE INSTALLATION SCHEME
+
+For a recommended module configuration scheme
+On UN*X: create /etc/sword.conf with contents:
+[Install]
+DataPath=/usr/share/sword
+
+and unzip your modules to /usr/share/sword
+(or type: make install_config which should do the same)
+
+Windows users can simply unzip their modules where they installed their frontend.
+
+Otherwise, read on:
+
+
+DETAILS
+
+
+The API attempts to hunts down its primary module configuration in the
+following sequence, stopping at the first successful step:
+
+	o) ./sword.conf in the format:
+
+			[Install]
+			DataPath=/where/your/modules/are/installed
+
+		then the API will look for <DataPath>/mods.d/
+
+	o) ./mods.d
+	o) ../library/mods.d (don't ask)
+	o) $SWORD_PATH/mods.d
+	o) $HOME/.sword/sword.conf in the format:
+
+			[Install]
+			DataPath=/where/your/modules/are/installed
+
+		then the API will look for <DataPath>/mods.d/
+
+	o) /etc/sword.conf in the format:
+
+			[Install]
+			DataPath=/where/your/modules/are/installed
+
+		then the API will look for <DataPath>/mods.d/
+
+	o) $HOME/.sword/mods.d/
+
+
+In addition to the 'primary module configuration', SWORD will also
+include modules found in $HOME/.sword/mods.d/
+
+Also, when a sword.conf file is used, any number of:
+
+AugmentDataPath=/where/more/modules/are/installed
+
+entries may be included.  These are useful to tell sword to scan,
+for example, CDROM, SDCARD, or other removable media locations.
+
+
+
+LOCALE
+
+If you would like to include support for localization, you may copy the
+locales.d directory and any of the locale files contained therein into
+the directory where your mods.d exists
+(eg. to /usr/share/sword/locales.d/)
+but this is done with a 'normal' sword install.
+
+
+ENJOY!!!
+
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..c1bc4e5
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,350 @@
+The SWORD Project is (c) 1994-2006 The CrossWire Bible Society, under the
+terms of the GNU GPL, as stated below.
+
+NOTE: The text of the GNU GPL license is copyrighted by the Free Software
+Foundation, Inc., but The SWORD Project is copyrighted Corporately under:
+
+		CrossWire Bible Society
+		P. O. Box 2528
+		Tempe, AZ  85280-2528
+
+_________________________________________________________________
+		    GNU GENERAL PUBLIC LICENSE
+			  Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+					 675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+			END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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, or
+    (at your option) any later version.
+
+    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 General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..5d74eac
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,99 @@
+AUTOMAKE_OPTIONS = 1.6
+
+ACLOCAL_AMFLAGS = -I m4
+LDADD = $(top_builddir)/lib/libsword.la
+
+# Global config directory
+globalconfdir := @sysconfdir@
+
+SUBDIRS = lib .
+
+if BUILDTESTS
+TESTSDIR = tests
+else
+TESTSDIR =
+endif
+
+if BUILDUTILS
+UTILSDIR = utilities
+else
+UTILSDIR =
+endif
+
+if BUILDEXAMPLES
+EXAMPLESDIR = examples
+else
+EXAMPLESDIR =
+endif
+
+SUBDIRS += $(TESTSDIR) $(UTILSDIR) $(EXAMPLESDIR)
+
+EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh sword.pc.in
+
+if USE_PKGCONF
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = sword.pc
+
+$(pkgconfig_DATA): config.status
+endif
+
+if INSTCONF
+sysconf_DATA = sword.conf
+sword.conf:
+	@echo "[Install]" > sword.conf
+	@echo "DataPath=$(pkgdatadir)/" >> sword.conf
+
+clean-generic:
+	-rm -f sword.conf
+endif
+
+noinst_PROGRAMS = buildtest
+buildtest_SOURCES = buildtest.cpp
+
+
+include locales.d/Makefile.am
+include samples/Makefile.am
+include doc/Makefile.am
+
+restore:
+	cd $(top_srcdir) && ./scripts/restoremake.sh
+
+install: install-recursive
+	@echo ""
+	@echo "sword is installed."
+	@echo ""
+	@echo "if this is your first time, you may need a basic global"
+	@echo "configuration file.  one can be generated to $(DESTDIR)$(sysconfdir)/sword.conf"
+	@echo "by typing: \"make install_config\""
+	@echo ""
+	@echo "modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/"
+	@echo ""
+	@echo "type \"make register\" to help us keep track of how many"
+	@echo "people are using sword."
+	@echo "(you may consider exiting from 'root', first, to make this"
+	@echo "a little more personal)"
+	@echo ""
+
+
+
+install-data-am: installlocaleDATA installmodsDATA install-pkgconfigDATA
+
+uninstall-am: uninstall-info-am uninstalllocaleDATA \
+	uninstallmodsDATA uninstall-sysconfDATA uninstall-pkgconfigDATA
+
+register:
+	@echo ""
+	echo "(***) $$USER@$$HOSTNAME, $$(date), $$(uname -m -r -s), SWORD @VERSION@, ${pkgdatadir}" | mail sword.users@crosswire.org
+	@echo ""
+	@echo "The output of this command has been sent to CrossWire-- thank you.  Enjoy!"
+	@echo ""
+
+install_config: 
+	@echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf
+	@echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf
+	@echo "sword.conf generated"
+
+
+dist-hook:
+	(cd $(distdir) && ./autogen.sh)
+	rm -r $(distdir)/autom4te.cache
diff --git a/Makefile.cvs b/Makefile.cvs
new file mode 100644
index 0000000..c875706
--- /dev/null
+++ b/Makefile.cvs
@@ -0,0 +1,13 @@
+all: aclocal automake autoheader autoconf
+
+aclocal:
+	./autotools/bin/aclocal --acdir=./autotools/share/aclocal
+
+automake:
+	-./autotools/bin/automake --libdir=./autotools/share/automake
+
+autoheader:
+	./autotools/bin/autoheader -A ./autotools/share/autoconf
+
+autoconf:
+	./autotools/bin/autoconf -A ./autotools/share/autoconf
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..36b209e
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,1115 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+noinst_PROGRAMS = buildtest$(EXEEXT)
+DIST_COMMON = $(srcdir)/locales.d/Makefile.am \
+	$(srcdir)/samples/Makefile.am $(srcdir)/doc/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(top_srcdir)/include/config.h.in $(srcdir)/sword.pc.in \
+	$(top_srcdir)/include/swversion.h.in $(srcdir)/sword.spec.in \
+	depcomp AUTHORS COPYING ChangeLog INSTALL NEWS README \
+	config.guess config.sub install-sh missing ltmain.sh
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES = sword.pc include/swversion.h sword.spec
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_buildtest_OBJECTS = buildtest.$(OBJEXT)
+buildtest_OBJECTS = $(am_buildtest_OBJECTS)
+buildtest_LDADD = $(LDADD)
+buildtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(buildtest_SOURCES)
+DIST_SOURCES = $(buildtest_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(sysconfdir)"
+DATA = $(pkgconfig_DATA) $(sysconf_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = lib . tests utilities examples
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+AUTOMAKE_OPTIONS = 1.6
+ACLOCAL_AMFLAGS = -I m4
+LDADD = $(top_builddir)/lib/libsword.la
+
+# Global config directory
+globalconfdir := @sysconfdir@
+SUBDIRS = lib . $(TESTSDIR) $(UTILSDIR) $(EXAMPLESDIR)
+@BUILDTESTS_FALSE@TESTSDIR = 
+@BUILDTESTS_TRUE@TESTSDIR = tests
+@BUILDUTILS_FALSE@UTILSDIR = 
+@BUILDUTILS_TRUE@UTILSDIR = utilities
+@BUILDEXAMPLES_FALSE@EXAMPLESDIR = 
+@BUILDEXAMPLES_TRUE@EXAMPLESDIR = examples
+EXTRA_DIST = sword.spec sword.kdevprj sword.bmp usrinst.sh autogen.sh \
+	sword.pc.in $(localeDATA) samples/mods.d/globals.conf \
+	$(swdocdir)/translation-template.conf
+@USE_PKGCONF_TRUE@pkgconfigdir = $(libdir)/pkgconfig
+@USE_PKGCONF_TRUE@pkgconfig_DATA = sword.pc
+@INSTCONF_TRUE@sysconf_DATA = sword.conf
+buildtest_SOURCES = buildtest.cpp
+swlocaledir = $(top_srcdir)/locales.d
+localeDATA = $(swlocaledir)/*.conf
+localedatadir = $(pkgdatadir)/locales.d
+modsdatadir = $(pkgdatadir)/mods.d
+@INSTCONF_TRUE@modsDATA = samples/mods.d/globals.conf
+swdocdir = $(top_srcdir)/doc
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am $(srcdir)/doc/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/locales.d/Makefile.am $(srcdir)/samples/Makefile.am $(srcdir)/doc/Makefile.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+include/config.h: include/stamp-h1
+	@if test ! -f $@; then rm -f include/stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1; else :; fi
+
+include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
+	@rm -f include/stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
+$(top_srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f include/stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f include/config.h include/stamp-h1
+sword.pc: $(top_builddir)/config.status $(srcdir)/sword.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+include/swversion.h: $(top_builddir)/config.status $(top_srcdir)/include/swversion.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+sword.spec: $(top_builddir)/config.status $(srcdir)/sword.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+buildtest$(EXEEXT): $(buildtest_OBJECTS) $(buildtest_DEPENDENCIES) $(EXTRA_buildtest_DEPENDENCIES) 
+	@rm -f buildtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(buildtest_OBJECTS) $(buildtest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buildtest.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+install-pkgconfigDATA: $(pkgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+	done
+
+uninstall-pkgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-sysconfDATA: $(sysconf_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
+	done
+
+uninstall-sysconfDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS) $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(sysconfdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+@INSTCONF_FALSE@clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-sysconfDATA
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscope cscopelist-am ctags \
+	ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+	install-ps-am install-strip install-sysconfDATA installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-pkgconfigDATA \
+	uninstall-sysconfDATA
+
+
+@USE_PKGCONF_TRUE@$(pkgconfig_DATA): config.status
+@INSTCONF_TRUE@sword.conf:
+@INSTCONF_TRUE@	@echo "[Install]" > sword.conf
+@INSTCONF_TRUE@	@echo "DataPath=$(pkgdatadir)/" >> sword.conf
+
+@INSTCONF_TRUE@clean-generic:
+@INSTCONF_TRUE@	-rm -f sword.conf
+
+installlocaleDATA: $(localeDATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(localedatadir)
+	@list='$(localeDATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(localedatadir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(localedatadir)/$$f; \
+	done
+
+uninstalllocaleDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(localeDATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(localedatadir)/$$f"; \
+	  rm -f $(DESTDIR)$(localedatadir)/$$f; \
+	done
+
+@INSTCONF_TRUE@installmodsDATA: $(modsDATA)
+@INSTCONF_TRUE@	@$(NORMAL_INSTALL)
+@INSTCONF_TRUE@	$(mkinstalldirs) $(DESTDIR)$(modsdatadir)
+@INSTCONF_TRUE@	@list='$(modsDATA)'; for p in $$list; do \
+@INSTCONF_TRUE@	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+@INSTCONF_TRUE@	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+@INSTCONF_TRUE@	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(modsdatadir)/$$f"; \
+@INSTCONF_TRUE@	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(modsdatadir)/$$f; \
+@INSTCONF_TRUE@	done
+
+@INSTCONF_TRUE@uninstallmodsDATA:
+@INSTCONF_TRUE@	@$(NORMAL_UNINSTALL)
+@INSTCONF_TRUE@	@list='$(modsDATA)'; for p in $$list; do \
+@INSTCONF_TRUE@	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+@INSTCONF_TRUE@	  echo " rm -f $(DESTDIR)$(modsdatadir)/$$f"; \
+@INSTCONF_TRUE@	  rm -f $(DESTDIR)$(modsdatadir)/$$f; \
+@INSTCONF_TRUE@	done
+@INSTCONF_FALSE@installmodsDATA: 
+@INSTCONF_FALSE@	@$(NORMAL_INSTALL)
+@INSTCONF_FALSE@	$(mkinstalldirs) $(DESTDIR)$(modsdatadir) \
+@INSTCONF_FALSE@	done
+
+@INSTCONF_FALSE@uninstallmodsDATA:
+
+restore:
+	cd $(top_srcdir) && ./scripts/restoremake.sh
+
+install: install-recursive
+	@echo ""
+	@echo "sword is installed."
+	@echo ""
+	@echo "if this is your first time, you may need a basic global"
+	@echo "configuration file.  one can be generated to $(DESTDIR)$(sysconfdir)/sword.conf"
+	@echo "by typing: \"make install_config\""
+	@echo ""
+	@echo "modules (Bibles, etc.), may then be unzipped to $(pkgdatadir)/"
+	@echo ""
+	@echo "type \"make register\" to help us keep track of how many"
+	@echo "people are using sword."
+	@echo "(you may consider exiting from 'root', first, to make this"
+	@echo "a little more personal)"
+	@echo ""
+
+install-data-am: installlocaleDATA installmodsDATA install-pkgconfigDATA
+
+uninstall-am: uninstall-info-am uninstalllocaleDATA \
+	uninstallmodsDATA uninstall-sysconfDATA uninstall-pkgconfigDATA
+
+register:
+	@echo ""
+	echo "(***) $$USER@$$HOSTNAME, $$(date), $$(uname -m -r -s), SWORD @VERSION@, ${pkgdatadir}" | mail sword.users@crosswire.org
+	@echo ""
+	@echo "The output of this command has been sent to CrossWire-- thank you.  Enjoy!"
+	@echo ""
+
+install_config: 
+	@echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf
+	@echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf
+	@echo "sword.conf generated"
+
+dist-hook:
+	(cd $(distdir) && ./autogen.sh)
+	rm -r $(distdir)/autom4te.cache
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..58378c1
--- /dev/null
+++ b/NEWS
@@ -0,0 +1 @@
+See ChangeLog
diff --git a/README b/README
new file mode 100644
index 0000000..37a23f3
--- /dev/null
+++ b/README
@@ -0,0 +1,73 @@
+Be sure to read INSTALL for information on how to get the software
+built, configured, and running properly.
+___________________________________________________________________
+Get the latest source and info at:
+	http://www.crosswire.org
+
+UNIX DEVELOPERS
+	You can try a './configure' (or optionally './usrinst.sh'
+	for a useful development options configuration), then 'make' from
+	this directory.  This should compile everthing needed.  You may type
+	'./configure --help' to see a list of options.
+	If all compiles fine, a 'make install' (as root, probably) will
+	install libs to your system and you may begin using the library.
+	There are a few basic tests (tests/), start of a test suite
+	(tests/testsuite/), utilities (utilities/), and examples
+	(examples/), in the tree.
+
+	To install modules, have a look at utilities/installmgr
+
+	For some basic lookup and search utilities, see
+		examples/cmdline/search
+		examples/cmdline/lookup
+		utilities/diatheke/
+
+	If you are an end user looking for a nice SWORD, graphical Bible study
+	software suite, then you'll probably want to download one of the
+	many nice frontends found at
+
+	http://crosswire.org/applications.jsp
+
+	./buildtest.cpp compiles to the executable 'buildtest' as a test to
+	see if the libs have compiled and can be linked against successfully.
+	This is NOT the final target of the build, nor does anything useful.
+		:)
+
+CMAKE
+	Alternatively, you can try building with CMake.  CMake is an alternative
+	make system for muliple platforms.  You might have a great experience
+	using the CMake build system.  See:
+	cmake/README for more information
+
+
+LANGUAGE BINDINGS
+	Other language bindings can be found in the ./bindings directory:
+	flatapi.cpp is a useful extern "C" interface for making bindings easier.
+	Kylix bindings (and maybe Delphi bindings) may be found in sword/bindings/clx
+	CORBA (orbit-c++) bindings with Java example classes in /bindings/corba
+	Perl stuff in bindings/perl
+	SWIG stuff (Python, Perl) in bindings/swig
+
+
+C++BUILDER DEVELOPERS
+	You may find project files under lib/bcppmake
+
+VC DEVELOPERS
+	You may find project files under lib/vcppmake
+
+DELPHI DEVELOPERS
+	You will need to place sword32.dll in your winsys
+		directory or elsewhere in your path.  You can find source to
+		build the dll using ./bindings/flatapi.cpp
+		or a binary at: ftp://crosswire.org/pub/sword/utils/win32/bcdlls.zip
+		header file is include/SwordAPI.pas
+		CLX components can be found under bindings/clx/
+
+.NET DEVELOPERS
+	Have a look in bindings/swig/vstudio/
+	Binaries may be found at: ftp://crosswire.org/pub/sword/utils/win32/vcdlls.zip
+
+Enjoy!
+
+Please email any questions or comments to: sword-feedback@crosswire.org
+
diff --git a/README.svn b/README.svn
new file mode 100644
index 0000000..f2a7d66
--- /dev/null
+++ b/README.svn
@@ -0,0 +1,7 @@
+SVN trunk repository URL:
+
+https://crosswire.org/svn/sword/trunk/
+
+To generate the configure script you must run 
+
+./autogen.sh
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 0000000..fea5b70
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,1311 @@
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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, or
+# (at your option) any later version.
+#
+# 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 General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.13'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.13.4], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.13.4])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[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".
+  rm -rf conftest.dir
+  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_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # 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.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    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
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  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.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  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 "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# 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
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[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
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should simply use the 'AC][_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# 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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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" conftest.file`
+     fi
+     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".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# 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.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/acx_clucene.m4])
+m4_include([m4/cppunit.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
diff --git a/arminst.sh b/arminst.sh
new file mode 100755
index 0000000..e3db839
--- /dev/null
+++ b/arminst.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+#******************************************************************************
+# Convenience script specifying ARM options to ./configure
+#
+# $Id: arminst.sh 2327 2009-04-22 11:42:33Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+#
+
+
+OPTIONS="--host=arm-linux $OPTIONS"
+OPTIONS="--without-curl $OPTIONS"
+OPTIONS="--disable-shared $OPTIONS"
+OPTIONS="--without-lucene $OPTIONS"
+
+export PATH=$PATH:/usr/local/arm/2.95.3/bin/
+
+. ./usrinst.sh
+
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..0666417
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+echo "*** Sword build system generation"
+echo "*** Recreating libtool"
+if test -z "$LTIZE"; then
+LTIZE="$AUTODIR""libtoolize"
+fi
+echo "$LTIZE"
+	$LTIZE --force --copy;
+
+ACLOCAL="$AUTODIR""aclocal"
+echo "*** Recreating aclocal.m4"
+echo "$ACLOCAL"
+	$ACLOCAL -I m4;
+
+echo "*** Recreating configure"
+AUTOCONF="$AUTODIR""autoconf"
+AUTOHEAD="$AUTODIR""autoheader"
+	$AUTOHEAD ;
+	$AUTOCONF;
+	
+echo "*** Recreating the Makefile.in files"
+AUTOMAKE="$AUTODIR""automake"
+	$AUTOMAKE -a -c --foreign;
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
new file mode 100644
index 0000000..9caf6d6
--- /dev/null
+++ b/bindings/CMakeLists.txt
@@ -0,0 +1,5 @@
+IF(SWORD_BINDINGS MATCHES ".*Python.*"
+   OR SWORD_BINDINGS MATCHES ".*Perl.*")
+	ADD_SUBDIRECTORY("${CMAKE_CURRENT_SOURCE_DIR}/swig")
+ENDIF(SWORD_BINDINGS MATCHES ".*Python.*"
+      OR SWORD_BINDINGS MATCHES ".*Perl.*")
diff --git a/bindings/README b/bindings/README
new file mode 100644
index 0000000..66b6790
--- /dev/null
+++ b/bindings/README
@@ -0,0 +1,44 @@
+Building Perl or Python (through swig)
+-------------
+
+Using autotools
+---------------
+See swig/packages/README
+
+Using CMake
+-----------
+Building the SWIG (Perl, Python) bindings with the CMake toolchain requires installing
+the CMake application appropriate to your operating system (most Linux distributions
+will have this as an existing package as CMake is integral to building many popular
+applications).
+
+Additionally you will need the development packages for the language you are targeting
+and the swig application itself. All of these should be directly available through your
+distribution's package system.
+
+Python: In Fedora you can get this with a 'yum install python-devel' and a similar call
+to apt-get in Debian/Ubuntu/etc.
+Perl: In Fedora you're looking for 'yum install perl-devel' and the equivalent package
+in Debian/Ubuntu/etc.
+
+After this, you need to add the argument -DSWORD_BINDINGS="Python" or
+-DSWORD_BINDINGS="Perl" when you invoke CMake. If you wish to build both bindings then
+just call -DSWORD_BINDINGS="Python Perl" instead. This needs to be done at the level of
+the whole SWORD library and not just here within the bindings directory. The files will
+be installed to their standard system-wide location when you run 'make install' with
+the rest of the library.
+
+If you wish to install the Python bindings to another directory instead you can specify
+the option -DSWORD_PYTHON_INSTALL_DIR="/some/other/path" at configure time. No comparable
+option is currently available for the Perl bindings because the maintainer is unaware
+of how to implement it.
+
+Building java
+-------------
+
+The source can be built with sun java (javac) or with GNU Classpath (jikes-classpath)
+GJC does not yet work, corba is expected to work with gcj 4.1
+
+set the JAVAC environment variable to whichever you wish to build with
+
+e.g. JAVAC=javac ./configure
diff --git a/bindings/bcppmake/MainCLXTest.cpp b/bindings/bcppmake/MainCLXTest.cpp
new file mode 100644
index 0000000..98de24c
--- /dev/null
+++ b/bindings/bcppmake/MainCLXTest.cpp
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ *  MainCLXTest.cpp -	This is part of a program to test CLX bindings
+ *
+ * $Id: MainCLXTest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+
+#include "MainCLXTest.h"
+//---------------------------------------------------------------------------
+#pragma package(smart_init)
+#pragma resource "*.dfm"
+TForm2 *Form2;
+//---------------------------------------------------------------------------
+__fastcall TForm2::TForm2(TComponent* Owner)
+	: TForm(Owner)
+{
+}
+//---------------------------------------------------------------------------
diff --git a/bindings/bcppmake/MainCLXTest.dfm b/bindings/bcppmake/MainCLXTest.dfm
new file mode 100644
index 0000000..3d5e63c
--- /dev/null
+++ b/bindings/bcppmake/MainCLXTest.dfm
@@ -0,0 +1,16 @@
+object Form2: TForm2
+  Left = 346
+  Top = 107
+  Width = 870
+  Height = 600
+  Caption = 'Form2'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  PixelsPerInch = 96
+  TextHeight = 13
+end
diff --git a/bindings/bcppmake/MainCLXTest.h b/bindings/bcppmake/MainCLXTest.h
new file mode 100644
index 0000000..1fe2501
--- /dev/null
+++ b/bindings/bcppmake/MainCLXTest.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ *  MainCLXTest.h -	This is part of a program to test CLX bindings
+ *
+ * $Id: MainCLXTest.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+
+#ifndef MainCLXTestH
+#define MainCLXTestH
+//---------------------------------------------------------------------------
+#include <Classes.hpp>
+#include <Controls.hpp>
+#include <StdCtrls.hpp>
+#include <Forms.hpp>
+//---------------------------------------------------------------------------
+class TForm2 : public TForm
+{
+__published:	// IDE-managed Components
+private:	// User declarations
+public:		// User declarations
+	__fastcall TForm2(TComponent* Owner);
+};
+//---------------------------------------------------------------------------
+extern PACKAGE TForm2 *Form2;
+//---------------------------------------------------------------------------
+#endif
diff --git a/bindings/bcppmake/MainTest.cpp b/bindings/bcppmake/MainTest.cpp
new file mode 100644
index 0000000..c3e4009
--- /dev/null
+++ b/bindings/bcppmake/MainTest.cpp
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *
+ *  MainTest.cpp -	This is part of a program to test CLX bindings
+ *
+ * $Id: MainTest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+
+#include "MainTest.h"
+extern "C" {
+#include <flatapi.h>
+}
+//using namespace sword;
+//---------------------------------------------------------------------------
+#pragma package(smart_init)
+#pragma resource "*.dfm"
+TForm1 *Form1;
+//---------------------------------------------------------------------------
+__fastcall TForm1::TForm1(TComponent* Owner)
+	: TForm(Owner)
+{
+}
+//---------------------------------------------------------------------------
+void __fastcall TForm1::FormShow(TObject *Sender)
+{
+	SWHANDLE mgr = SWMgr_new();
+	SWHANDLE it = SWMgr_getModulesIterator(mgr);
+	SWHANDLE module = 0;
+	String modlist;
+	do {
+		module = ModList_iterator_val(it);
+		if (module) {
+			modlist += SWModule_getName(module) + (String)"\r\n";
+			ModList_iterator_next(it);
+		}
+	} while (module);
+	Memo1->Text = modlist;
+	SWMgr_delete(mgr);
+}
+//---------------------------------------------------------------------------
diff --git a/bindings/bcppmake/MainTest.dfm b/bindings/bcppmake/MainTest.dfm
new file mode 100644
index 0000000..ffb3c5a
--- /dev/null
+++ b/bindings/bcppmake/MainTest.dfm
@@ -0,0 +1,36 @@
+object Form1: TForm1
+  Left = 346
+  Top = 234
+  Width = 446
+  Height = 265
+  Caption = 'Form1'
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'MS Sans Serif'
+  Font.Style = []
+  OldCreateOrder = False
+  OnShow = FormShow
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Memo1: TMemo
+    Left = 0
+    Top = 0
+    Width = 438
+    Height = 197
+    Align = alClient
+    Lines.Strings = (
+      'Memo1')
+    TabOrder = 0
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 197
+    Width = 438
+    Height = 41
+    Align = alBottom
+    Caption = 'Panel1'
+    TabOrder = 1
+  end
+end
diff --git a/bindings/bcppmake/MainTest.h b/bindings/bcppmake/MainTest.h
new file mode 100644
index 0000000..ffc7566
--- /dev/null
+++ b/bindings/bcppmake/MainTest.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ *  MainTest.h -	This is part of a program to test CLX bindings
+ *
+ * $Id: MainTest.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+
+#ifndef MainTestH
+#define MainTestH
+//---------------------------------------------------------------------------
+#include <Classes.hpp>
+#include <Controls.hpp>
+#include <StdCtrls.hpp>
+#include <Forms.hpp>
+#include <ExtCtrls.hpp>
+//---------------------------------------------------------------------------
+class TForm1 : public TForm
+{
+__published:	// IDE-managed Components
+	TMemo *Memo1;
+	TPanel *Panel1;
+	void __fastcall FormShow(TObject *Sender);
+private:	// User declarations
+public:		// User declarations
+	__fastcall TForm1(TComponent* Owner);
+};
+//---------------------------------------------------------------------------
+extern PACKAGE TForm1 *Form1;
+//---------------------------------------------------------------------------
+#endif
diff --git a/bindings/bcppmake/Makefile.am b/bindings/bcppmake/Makefile.am
new file mode 100644
index 0000000..0e34fea
--- /dev/null
+++ b/bindings/bcppmake/Makefile.am
@@ -0,0 +1,16 @@
+swbcppmakedir = $(top_srcdir)/bindings/bcppmake
+
+EXTRA_DIST += $(swbcppmakedir)/MainCLXTest.dfm
+EXTRA_DIST += $(swbcppmakedir)/MainTest.cpp
+EXTRA_DIST += $(swbcppmakedir)/MainTest.h
+EXTRA_DIST += $(swbcppmakedir)/clxtest.bpr
+EXTRA_DIST += $(swbcppmakedir)/sword.bpf
+EXTRA_DIST += $(swbcppmakedir)/sword.c
+EXTRA_DIST += $(swbcppmakedir)/test.cpp
+EXTRA_DIST += $(swbcppmakedir)/MainCLXTest.cpp
+EXTRA_DIST += $(swbcppmakedir)/MainCLXTest.h
+EXTRA_DIST += $(swbcppmakedir)/MainTest.dfm
+EXTRA_DIST += $(swbcppmakedir)/Makefile.am
+EXTRA_DIST += $(swbcppmakedir)/clxtest.cpp
+EXTRA_DIST += $(swbcppmakedir)/sword.bpr
+EXTRA_DIST += $(swbcppmakedir)/sworddll.bpg
diff --git a/bindings/bcppmake/clxtest.bpr b/bindings/bcppmake/clxtest.bpr
new file mode 100644
index 0000000..0231ee9
--- /dev/null
+++ b/bindings/bcppmake/clxtest.bpr
@@ -0,0 +1,93 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="clxtest.exe"/>
+    <OBJFILES value="..\clx\Sword.obj clxtest.obj MainCLXTest.obj"/>
+    <RESFILES value="clxtest.res"/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES) MainCLXTest.dfm"/>
+    <LIBFILES value="sword.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value="Vcl50.lib"/>
+    <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi 
+      ibsmp50.bpi vcldbx50.bpi TeeUI50.bpi TeeDB50.bpi Tee50.bpi TeeQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi vclie50.bpi Inetdb50.bpi Inet50.bpi NMFast50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;"/>
+    <PATHPAS value=".;..\clx"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
+    <MAINSOURCE value="clxtest.cpp"/>
+    <INCLUDEPATH value="..\clx;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\clx;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c 
+      -tW -tWM"/>
+    <PFLAGS value="-$YD -$W -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zd"/>
+    <LFLAGS value="-D&quot;&quot; -aa -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0w32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mti.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/bindings/bcppmake/clxtest.cpp b/bindings/bcppmake/clxtest.cpp
new file mode 100644
index 0000000..210c582
--- /dev/null
+++ b/bindings/bcppmake/clxtest.cpp
@@ -0,0 +1,46 @@
+/******************************************************************************
+ *
+ *  clxtest.cpp -	This is part of a program to test CLX bindings
+ *
+ * $Id: clxtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+USERES("clxtest.res");
+USEFORM("MainCLXTest.cpp", Form2);
+USEUNIT("..\clx\Sword.pas");
+USELIB("sword.lib");
+//---------------------------------------------------------------------------
+WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+	try
+	{
+		Application->Initialize();
+		Application->CreateForm(__classid(TForm2), &Form2);
+		Application->Run();
+	}
+	catch (Exception &exception)
+	{
+		Application->ShowException(&exception);
+	}
+	return 0;
+}
+//---------------------------------------------------------------------------
diff --git a/bindings/bcppmake/sword.bpf b/bindings/bcppmake/sword.bpf
new file mode 100644
index 0000000..b3caae1
--- /dev/null
+++ b/bindings/bcppmake/sword.bpf
@@ -0,0 +1,11 @@
+USEUNIT("sword.c");
+USEUNIT("..\flatapi.cpp");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icui18n.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icucommon.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+DllEntryPoint
\ No newline at end of file
diff --git a/bindings/bcppmake/sword.bpr b/bindings/bcppmake/sword.bpr
new file mode 100644
index 0000000..092cb6f
--- /dev/null
+++ b/bindings/bcppmake/sword.bpr
@@ -0,0 +1,111 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="sword.dll"/>
+    <OBJFILES value="sword.obj ..\flatapi.obj"/>
+    <RESFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icui18n.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icucommon.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="Vcl50.bpi Vclx50.bpi bcbsmp50.bpi Qrpt50.bpi Vcldb50.bpi Vclbde50.bpi 
+      ibsmp50.bpi vcldbx50.bpi TeeUI50.bpi TeeDB50.bpi Tee50.bpi TeeQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi vclie50.bpi Inetdb50.bpi Inet50.bpi NMFast50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_DEBUG;SWMAKINGDLL"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="sword.bpf"/>
+    <INCLUDEPATH value="..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-WD -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- 
+      -tWD -tWM -c"/>
+    <PFLAGS value="-$YD -$W -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -aa -Tpd -x -Gn -Gi -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0d32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=2
+Item0=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_DEBUG;SWMAKINGDLL
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/bindings/bcppmake/sword.c b/bindings/bcppmake/sword.c
new file mode 100644
index 0000000..2aca988
--- /dev/null
+++ b/bindings/bcppmake/sword.c
@@ -0,0 +1,53 @@
+/******************************************************************************
+ *
+ *  sword.c -	This is part of a program to test CLX bindings
+ *
+ * $Id: sword.c 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+
+#include <windows.h>
+//---------------------------------------------------------------------------
+//   Important note about DLL memory management when your DLL uses the
+//   static version of the RunTime Library:
+//
+//   If your DLL exports any functions that pass String objects (or structs/
+//   classes containing nested Strings) as parameter or function results,
+//   you will need to add the library MEMMGR.LIB to both the DLL project and
+//   any other projects that use the DLL.  You will also need to use MEMMGR.LIB
+//   if any other projects which use the DLL will be performing new or delete
+//   operations on any non-TObject-derived classes which are exported from the
+//   DLL. Adding MEMMGR.LIB to your project will change the DLL and its calling
+//   EXE's to use the BORLNDMM.DLL as their memory manager.  In these cases,
+//   the file BORLNDMM.DLL should be deployed along with your DLL.
+//
+//   To avoid using BORLNDMM.DLL, pass string information using "char *" or
+//   ShortString parameters.
+//
+//   If your DLL uses the dynamic version of the RTL, you do not need to
+//   explicitly add MEMMGR.LIB as this will be done implicitly for you
+//---------------------------------------------------------------------------
+
+#pragma argsused
+int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void* lpReserved)
+{
+	return 1;
+}
+//---------------------------------------------------------------------------
+ 
diff --git a/bindings/bcppmake/sworddll.bpg b/bindings/bcppmake/sworddll.bpg
new file mode 100644
index 0000000..7f3c269
--- /dev/null
+++ b/bindings/bcppmake/sworddll.bpg
@@ -0,0 +1,33 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = libsword.lib sword.dll test.exe clxtest.exe
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+libsword.lib: ..\..\lib\bcppmake\libsword.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+sword.dll: sword.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+test.exe: test.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+clxtest.exe: clxtest.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+
diff --git a/bindings/bcppmake/test.cpp b/bindings/bcppmake/test.cpp
new file mode 100644
index 0000000..64c552e
--- /dev/null
+++ b/bindings/bcppmake/test.cpp
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  test.cpp -	This is part of a program to test CLX bindings
+ *
+ * $Id: test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+USERES("test.res");
+USEFORM("MainTest.cpp", Form1);
+USELIB("sword.lib");
+//---------------------------------------------------------------------------
+WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+	try
+	{
+		Application->Initialize();
+		Application->CreateForm(__classid(TForm1), &Form1);
+		Application->Run();
+	}
+	catch (Exception &exception)
+	{
+		Application->ShowException(&exception);
+	}
+	return 0;
+}
+//---------------------------------------------------------------------------
diff --git a/bindings/clx/Sword.pas b/bindings/clx/Sword.pas
new file mode 100644
index 0000000..9fecc17
--- /dev/null
+++ b/bindings/clx/Sword.pas
@@ -0,0 +1,213 @@
+unit Sword;
+
+   
+interface
+   const LIBNAME = 'sword.dll';
+   function  SWMgr_getPrefixPath(h: integer): PChar; cdecl; external libname;
+   function  SWMgr_new: integer; cdecl; external LIBNAME;
+   procedure SWMgr_delete(h: integer); cdecl; external LIBNAME;
+   function  SWMgr_getModulesIterator(h: integer) : integer; cdecl; external LIBNAME;
+   function  SWMgr_getModuleByName(h: integer; name: PChar) : integer; cdecl; external LIBNAME;
+
+   procedure ModList_iterator_next(h: integer); cdecl; external LIBNAME;
+   function  ModList_iterator_val(h: integer) : integer; cdecl; external LIBNAME;
+
+   function  SWModule_getType(h: integer) : PChar; cdecl; external LIBNAME;
+   function  SWModule_getName(h: integer) : PChar; cdecl; external LIBNAME;
+   function  SWModule_getDescription(h: integer) : PChar; cdecl; external LIBNAME;
+   function  SWModule_getStripText(h: integer) : PChar; cdecl; external LIBNAME;
+   function  SWModule_getRenderText(h: integer) : PChar; cdecl; external LIBNAME;
+   function  SWModule_getKeyText(h: integer) : PChar; cdecl; external LIBNAME;
+   procedure SWModule_setKeyText(h: integer; key: PChar); cdecl; external LIBNAME;
+   procedure SWModule_begin(h: integer); cdecl; external LIBNAME;
+   procedure SWModule_next(h: integer); cdecl; external LIBNAME;
+   procedure SWModule_previous(h: integer); cdecl; external LIBNAME;
+type
+
+   SWModule = class(TObject)
+   private
+      handle : integer;
+   public
+      constructor Create(handle : integer);
+      function getType : String;
+      function getName : String;
+      function getDescription : String;
+      function getStripText : String;                
+      function getRenderText : WideString;                
+      function getKeyText : String;                
+      procedure setKeyText(keyText : String);
+      procedure modBegin;
+      procedure modNext;
+      procedure modPrevious;
+   end;
+
+   
+   ModIterator = class(TObject)
+   private
+      handle : integer;
+   public
+      constructor Create(handle : integer);
+      procedure next;
+      function getValue : SWModule;
+   end;
+  
+
+   SWMgr = class(TObject)
+   private
+      handle : integer;
+   public
+      constructor Create;
+      destructor Destroy; override;
+      function getPrefixPath : String;
+      function getModulesIterator : ModIterator;
+      function getModuleByName(name: String) : SWModule;
+  end;
+
+implementation
+
+constructor SWMgr.Create;
+var
+   yohan : integer;
+begin
+   yohan := SWMgr_new;
+   handle := yohan;
+end;
+
+
+destructor SWMgr.Destroy;
+begin
+   SWMgr_delete(handle);
+end;
+
+
+function SWMgr.getPrefixPath() : String;
+var
+   stuff : String;
+   pstuff : PChar;
+begin
+   pstuff := SWMgr_getPrefixPath(handle);
+   stuff := String(pstuff);
+   Result := stuff;
+end;
+
+
+function SWMgr.getModulesIterator : ModIterator;
+begin
+   Result := ModIterator.Create(SWMgr_getModulesIterator(handle));
+end;
+
+function SWMgr.getModuleByName(name: String) : SWModule;
+var
+   modHandle : Integer;
+   
+begin
+   modHandle := SWMgr_getModuleByName(handle, PChar(name));
+   if (modHandle <> 0) then
+      Result := SWModule.Create(modHandle)
+   else Result := nil;
+end;
+
+
+
+
+{ ModIterator methods --------------------------------------------- }
+
+
+constructor ModIterator.Create(handle : integer);
+begin
+   Self.handle := handle;
+end;
+
+
+procedure ModIterator.next;
+begin
+   ModList_iterator_next(handle);
+end;
+
+
+function ModIterator.getValue : SWModule;
+var
+   modHandle : Integer;
+   
+begin
+   modHandle := ModList_iterator_val(handle);
+   if (modHandle <> 0) then
+      Result := SWModule.Create(modHandle)
+   else Result := nil;
+end;
+
+
+
+
+
+{ SWModule methods --------------------------------------------- }
+
+
+constructor SWModule.Create(handle : integer);
+begin
+   Self.handle := handle;
+end;
+
+
+function SWModule.getType : String;
+begin
+   Result := String(SWModule_getType(handle));
+end;
+
+
+function SWModule.getName : String;
+begin
+   Result := String(SWModule_getName(handle));
+end;
+
+
+function SWModule.getDescription : String;
+begin
+   Result := String(SWModule_getDescription(handle));
+end;
+
+
+function SWModule.getStripText : String;
+begin
+   Result := String(SWModule_getStripText(handle));
+end;
+
+
+function SWModule.getRenderText : WideString;
+begin
+   Result := WideString(SWModule_getRenderText(handle));
+end;
+
+
+function SWModule.getKeyText : String;
+begin
+   Result := String(SWModule_getKeyText(handle));
+end;
+
+
+procedure SWModule.setKeyText(keyText: String);
+begin
+   SWModule_setKeyText(handle, PChar(keyText));
+end;
+
+
+procedure SWModule.modBegin;
+begin
+   SWModule_begin(handle);
+end; 
+
+
+procedure SWModule.modNext;
+begin
+   SWModule_next(handle);
+end; 
+
+
+procedure SWModule.modPrevious;
+begin
+   SWModule_previous(handle);
+end;
+
+end.
+
+
diff --git a/bindings/clx/test1/MainFrm.pas b/bindings/clx/test1/MainFrm.pas
new file mode 100644
index 0000000..2d28a7f
--- /dev/null
+++ b/bindings/clx/test1/MainFrm.pas
@@ -0,0 +1,116 @@
+unit MainFrm;
+
+interface
+
+uses
+  SysUtils, Types, Classes, Variants, QGraphics, QControls, QForms, QDialogs,
+  QStdCtrls, QComCtrls, QExtCtrls, Sword;
+
+type
+  TForm1 = class(TForm)
+    Panel1: TPanel;
+    Panel2: TPanel;
+    Panel3: TPanel;
+    TreeView1: TTreeView;
+    Button1: TButton;
+    Edit1: TEdit;
+    Label1: TLabel;
+    TextBrowser1: TTextBrowser;
+    procedure Edit1Change(Sender: TObject);
+    procedure TreeView1Change(Sender: TObject; Node: TTreeNode);
+    procedure Button1Click(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+  private
+    procedure lookup();
+  public
+    { Public declarations }
+  end;
+
+var
+   Form1: TForm1;
+   mgr : SWMgr;
+   
+implementation
+
+{$R *.xfm}
+
+procedure TForm1.Edit1Change(Sender: TObject);
+begin
+   lookup();
+end;
+
+procedure TForm1.lookup();
+var
+   module : SWModule;
+   node : TTreeNode;
+   
+begin
+   node := TreeView1.Selected;
+   if (node <> nil) then
+   begin
+      module := mgr.getModuleByName(node.Text);
+      if (module <> nil) then
+      begin
+         module.setKeyText(Edit1.Text);
+
+         TextBrowser1.Text := 
+            '<HTML><BODY>' +
+               '<small><b>' + module.getKeyText() + '<b></small> ' +
+               module.getRenderText() +
+            '</BODY></HTML>';
+            
+         Label1.Caption := ': ' + module.getKeyText();
+      end;
+   end;
+end;
+
+procedure TForm1.TreeView1Change(Sender: TObject; Node: TTreeNode);
+begin
+        lookup();
+end;
+
+procedure TForm1.Button1Click(Sender: TObject);
+begin
+   Application.Terminate;
+end;
+
+procedure TForm1.FormCreate(Sender: TObject);
+begin
+   mgr := SWMgr.Create;
+end;
+
+procedure TForm1.FormShow(Sender: TObject);
+var
+   root, node : TTreeNode;
+   module : SWModule;
+   modIt : ModIterator;
+   found : Boolean;
+   
+begin
+//   root := TreeView1.TopItem;
+//   root := TreeView1.Items.AddChild(TreeView1.TopItem, 'Modules');
+
+   modIt := mgr.getModulesIterator;
+   module := modIt.getValue;
+   while (module <> nil) do
+   begin
+        node := TreeView1.Items.GetFirstNode;
+        found := false;
+        while ((node <> nil) AND (NOT found)) do
+        begin
+           if (node.Text = module.getType) then
+                found := true
+           else node := node.getNextSibling;
+        end;
+        if (node = nil) then
+           node := TreeView1.Items.AddChild(TreeView1.TopItem, module.GetType());
+
+        TreeView1.Items.AddChild(node, module.GetName());
+        
+        modIt.Next;
+        module := modIt.getValue;
+   end;
+end;
+
+end.
diff --git a/bindings/clx/test1/MainFrm.xfm b/bindings/clx/test1/MainFrm.xfm
new file mode 100644
index 0000000..ce77f46
--- /dev/null
+++ b/bindings/clx/test1/MainFrm.xfm
@@ -0,0 +1,90 @@
+object Form1: TForm1
+  Left = 260
+  Top = 148
+  Width = 592
+  Height = 487
+  HorzScrollBar.Range = 185
+  VertScrollBar.Range = 41
+  Caption = 'Form1'
+  Color = clBackground
+  OnCreate = FormCreate
+  OnShow = FormShow
+  PixelsPerInch = 108
+  TextHeight = 20
+  TextWidth = 8
+  object Panel1: TPanel
+    Left = 0
+    Top = 41
+    Width = 185
+    Height = 446
+    Align = alLeft
+    Caption = 'Panel1'
+    TabOrder = 0
+    object TreeView1: TTreeView
+      Left = 1
+      Top = 1
+      Width = 183
+      Height = 444
+      Align = alClient
+      Columns = <>
+      TabOrder = 0
+      OnChange = TreeView1Change
+    end
+  end
+  object Panel2: TPanel
+    Left = 185
+    Top = 41
+    Width = 407
+    Height = 446
+    Align = alClient
+    Caption = 'Panel2'
+    TabOrder = 1
+    object TextBrowser1: TTextBrowser
+      Left = 1
+      Top = 1
+      Width = 405
+      Height = 444
+      Align = alClient
+      TabOrder = 0
+      TextFormat = tfText
+    end
+  end
+  object Panel3: TPanel
+    Left = 0
+    Top = 0
+    Width = 592
+    Height = 41
+    Align = alTop
+    TabOrder = 2
+    object Button1: TButton
+      Left = 509
+      Top = 8
+      Width = 75
+      Height = 25
+      Anchors = [akTop, akRight]
+      Caption = 'Exit'
+      TabOrder = 0
+      OnClick = Button1Click
+    end
+    object Edit1: TEdit
+      Left = 136
+      Top = 8
+      Width = 177
+      Height = 28
+      TabOrder = 1
+      OnChange = Edit1Change
+    end
+    object Label1: TLabel
+      Left = 328
+      Top = 12
+      Width = 1
+      Height = 20
+      Font.Color = clBlack
+      Font.Height = 17
+      Font.Name = 'Helvetica'
+      Font.Pitch = fpVariable
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+  end
+end
diff --git a/bindings/clx/test1/test1.conf b/bindings/clx/test1/test1.conf
new file mode 100644
index 0000000..b6fb6e7
--- /dev/null
+++ b/bindings/clx/test1/test1.conf
@@ -0,0 +1,36 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O+
+-$P+
+-$Q-
+-$R-
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-U"../"
+-O"../"
+-I"../"
+-R"../"
diff --git a/bindings/clx/test1/test1.dpr b/bindings/clx/test1/test1.dpr
new file mode 100644
index 0000000..7b18af9
--- /dev/null
+++ b/bindings/clx/test1/test1.dpr
@@ -0,0 +1,14 @@
+program test1;
+
+uses
+  QForms,
+  MainFrm in 'MainFrm.pas' {Form1},
+  Sword in '../Sword.pas';
+
+{$R *.res}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TForm1, Form1);
+  Application.Run;
+end.
diff --git a/bindings/clx/test1/test1.kof b/bindings/clx/test1/test1.kof
new file mode 100644
index 0000000..99b034e
--- /dev/null
+++ b/bindings/clx/test1/test1.kof
@@ -0,0 +1,61 @@
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=1
+P=1
+Q=0
+R=0
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=
+
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=0
+RemoteSymbols=0
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+DynamicLoader=/lib/ld-linux.so.2
+
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=../
+Packages=baseclx:visualclx
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=/usr/X11R6/bin/xterm -T KylixDebuggerOutput -e bash -i -c %debuggee%
+UseLauncher=0
+DebugCWD=
+
diff --git a/bindings/clx/test1/test1.res b/bindings/clx/test1/test1.res
new file mode 100644
index 0000000..36f26e2
--- /dev/null
+++ b/bindings/clx/test1/test1.res
diff --git a/bindings/clx/test1/test1g.bpg b/bindings/clx/test1/test1g.bpg
new file mode 100644
index 0000000..db19a61
--- /dev/null
+++ b/bindings/clx/test1/test1g.bpg
@@ -0,0 +1,15 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.02.5
+#------------------------------------------------------------------------------
+MAKE = make -$(MAKEFLAGS) -f$**
+DCC =dcc $<
+#------------------------------------------------------------------------------
+PROJECTS = test1
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+test1: test1.dpr
+								$(DCC)
+
+
diff --git a/bindings/clx/test2/MainFrm.pas b/bindings/clx/test2/MainFrm.pas
new file mode 100644
index 0000000..a60385e
--- /dev/null
+++ b/bindings/clx/test2/MainFrm.pas
@@ -0,0 +1,417 @@
+unit MainFrm;
+
+interface
+
+uses
+  SysUtils, StrUtils, Types, Classes, Variants, QGraphics, QControls, QForms, QDialogs,
+  QStdCtrls, QComCtrls, QExtCtrls, Sword, QButtons, QImgList, QMenus,
+  QTypes;
+
+type
+  TForm1 = class(TForm)
+    Panel1: TPanel;
+    TreeView1: TTreeView;
+    ImageList1: TImageList;
+    Splitter1: TSplitter;
+    Panel3: TPanel;
+    Splitter2: TSplitter;
+    Panel4: TPanel;
+    TextBrowser2: TTextBrowser;
+    Panel5: TPanel;
+    ListView: TListView;
+    Splitter3: TSplitter;
+    Panel6: TPanel;
+    Edit2: TEdit;
+    StatusBar1: TStatusBar;
+    ColorDialog1: TColorDialog;
+    FontDialog1: TFontDialog;
+    Panel8: TPanel;
+    Splitter4: TSplitter;
+    Panel7: TPanel;
+    TextBrowser3: TTextBrowser;
+    Panel2: TPanel;
+    TextBrowser1: TTextBrowser;
+    ToolBar2: TToolBar;
+    Edit1: TEdit;
+    ComboBox1: TComboBox;
+    SpinEdit1: TSpinEdit;
+    SpinEdit2: TSpinEdit;
+    ToolButton4: TToolButton;
+    Label2: TLabel;
+    btnBTFollow: TToolButton;
+    btnCMFollow: TToolButton;
+    ImageList2: TImageList;
+    MainMenu1: TMainMenu;
+    File1: TMenuItem;
+    Exit1: TMenuItem;
+    Options1: TMenuItem;
+    Strongs1: TMenuItem;
+    MorphTags1: TMenuItem;
+    Footnotes1: TMenuItem;
+    ChangeTextFont1: TMenuItem;
+    CurrentVerseColor1: TMenuItem;
+    procedure Edit1Change(Sender: TObject);
+    procedure TreeView1Change(Sender: TObject; Node: TTreeNode);
+    procedure Button1Click(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure ToolButton1Click(Sender: TObject);
+    procedure Edit2Change(Sender: TObject);
+    procedure ListViewItemClick(Sender: TObject; Button: TMouseButton;
+      Item: TListItem; const Pt: TPoint; ColIndex: Integer);
+    procedure SpinEdit2Changed(Sender: TObject; NewValue: Integer);
+    procedure SpinEdit1Changed(Sender: TObject; NewValue: Integer);
+    procedure ComboBox1Change(Sender: TObject);
+    procedure CurrentVerseColor1Click(Sender: TObject);
+  private
+    fontName: string;
+    fontSize: integer;
+    doOnChange: boolean;
+    procedure setBookCombo(ref: String);
+    procedure lookup();
+    procedure lookupLD();
+    function getChapter(key: String): integer; 
+    function getVerse(key: String): integer;
+    procedure FillDictKeys(key: String);
+  public
+    { Public declarations }
+    curModBT: String;
+    curModCM: String;
+    curModLD: String;
+  end;
+
+var
+   Form1: TForm1;
+   mgr : SWMgr;
+   
+implementation
+
+{$R *.xfm}
+
+procedure TForm1.Edit1Change(Sender: TObject);
+begin
+	if (doOnChange) then
+   		lookup();
+end;
+
+procedure TForm1.setBookCombo(ref: string);
+var
+    pos: integer;
+    bookname: string;
+
+begin
+     pos := LastDelimiter(' ',ref);
+     bookname := LeftStr(ref,pos);
+     ComboBox1.Text := bookname;
+end;
+
+function TForm1.getChapter(key: String): integer;
+var
+   len:     integer;
+   pos:     integer;
+   j:	    integer;
+   tmpbuf:  String;
+begin
+       //len := Length(key);
+       pos := LastDelimiter(':',key);
+       tmpbuf := '000';
+       j := 3;
+       for len := pos-1 downto 0 do
+       begin
+           if(key[len] <> ' ') then
+           begin
+           	tmpbuf[j] := key[len];
+                j := j -1;
+           end
+           else break;
+       end;
+       Result := StrToInt(tmpbuf);
+end;
+
+
+function TForm1.getVerse(key: String): integer;
+var
+   len:     integer;
+   pos:     integer;
+   j:	    integer;
+   i:       integer;
+   tmpbuf:  String;
+begin
+       len := Length(key);
+       pos := LastDelimiter(':',key);
+       tmpbuf := '    ';
+       j := 1;
+       for i := pos+1 to len do
+       begin
+           if(key[i] <> '') then
+           begin
+           	tmpbuf[j] := key[i];
+                j := j + 1;
+           end
+           else break;
+       end;
+       tmpbuf := TrimRight(tmpbuf);
+       Result := StrToInt(tmpbuf);
+end;
+
+
+procedure TForm1.lookup();
+var
+   module 	: SWModule;
+   chapter	: integer;
+   buf		: string;
+   currentVerse : string;
+   text		: string;
+   key 		: string;
+   verse	: integer;
+   j		: integer;
+begin
+      module := mgr.getModuleByName(curModBT);
+      if (module <> nil) then
+      begin
+         module.setKeyText(Edit1.Text);
+         currentVerse :=  module.getKeyText;
+         chapter := getChapter(currentVerse);
+         verse := getVerse(currentVerse);
+
+         doOnChange := false;
+         setBookCombo(currentVerse);
+         SpinEdit1.Value := chapter;
+         SpinEdit2.Value := verse;
+         doOnChange := true;
+         
+         buf := '                                           ';
+         key := module.getKeyText;
+         j := 1;
+         if(AnsiContainsText(key,':')) then
+         begin
+       		while key[j] <> ':' do
+       		begin
+       			buf[j] := key[j];
+        		j := j + 1;
+       		end;
+         end;
+         buf := TrimRight(buf);
+         buf := buf + ':1';
+         module.setKeyText(buf);
+         text := '<html><body>';
+         while(chapter =  getChapter(module.getKeyText)) do
+         begin
+                if(currentVerse = module.getKeyText) then
+                	text := text + '<small><b><font  color="blue">' +
+                        	module.getKeyText() +
+                                '</font><b></small> ' +
+                	       '<A NAME="cv"><font face="' + fontName +
+                               '" size="' + IntToStr(fontSize) +
+                        	'"color="forest green">'   +
+                               module.getRenderText() +  '</font></a><br>'
+                else
+                    	text := text + '<small><b><font color="blue">' +
+                        	module.getKeyText() +
+                                '</font><b></small> ' + '<font face="' +
+                                fontName +   '" size="' + IntToStr(fontSize) + '">' +
+                		module.getRenderText() +  '</font><br>';
+               	//buf := IntToStr(chapter);
+                //Label1.Caption := IntToStr(chapter) + ':' + IntToStr(verse);
+         	module.modNext;
+         end;
+          text := text + '</body></html>';
+          TextBrowser1.Text := text;
+          TextBrowser1.ScrollToAnchor('cv');
+          StatusBar1.SimpleText := currentVerse;
+      end;
+   //end;
+
+
+   if(btnCMFollow.Down)  then
+   begin
+      module := mgr.getModuleByName(curModCM);
+      if (module <> nil) then
+      begin
+               module.setKeyText(Edit1.Text);
+                TextBrowser3.Text :=
+                '<HTML><BODY>' +
+                        '<font  color="blue"><small><b>[' +
+                        module.getName + '] ' +
+                        module.getKeyText() +
+                        '<b></small></font> ' +
+                module.getRenderText() +
+                '</BODY></HTML>';
+
+                //Label1.Caption := ': ' + module.getKeyText();
+      end;
+   end;
+end;
+
+procedure TForm1.lookupLD();
+var
+   module : SWModule;
+begin
+     module := mgr.getModuleByName(curModLD);
+      if (module <> nil) then
+      begin
+           module.setKeyText(Edit2.Text);
+                TextBrowser2.Text :=
+                '<HTML><BODY>' +
+                        '<font  color="blue"><small><b>[' +
+                        module.getName + '] ' + module.getKeyText() +
+                        '<b></small></font> ' +
+                module.getRenderText() +
+                '</BODY></HTML>';
+      end;
+      FillDictKeys(module.getKeyText);
+
+
+end;
+
+procedure TForm1.TreeView1Change(Sender: TObject; Node: TTreeNode);
+var
+   module : SWModule;
+
+begin
+        module := mgr.getModuleByName(Node.Text);
+        if (module <> nil) then
+        begin
+                if(module.getType = 'Biblical Texts') then
+                begin
+                        curModBT := Node.Text;  
+        		lookup();
+                end;
+
+                if(module.getType = 'Commentaries') then
+                begin
+                        curModCM := Node.Text;
+        		lookup();
+                end;    
+
+                if(module.getType = 'Lexicons / Dictionaries') then
+                begin
+                        curModLD := Node.Text;
+                        lookupLD;
+                end;
+        end;
+end;
+
+procedure TForm1.Button1Click(Sender: TObject);
+begin
+   Application.Terminate;
+end;
+
+procedure TForm1.FormCreate(Sender: TObject);
+begin
+   mgr := SWMgr.Create;
+end;
+
+procedure TForm1.FormShow(Sender: TObject);
+var
+   node : TTreeNode;
+   module : SWModule;
+   modIt : ModIterator;
+   found : Boolean;
+
+begin
+   doOnChange := true;
+   fontName := '';
+   fontSize := 3;   // html font size
+
+   modIt := mgr.getModulesIterator;
+   module := modIt.getValue;
+   while (module <> nil) do
+   begin
+        node := TreeView1.Items.GetFirstNode;
+        found := false;
+        while ((node <> nil) AND (NOT found)) do
+        begin
+           if (node.Text = module.getType) then
+                found := true
+           else node := node.getNextSibling;
+        end;
+        if (node = nil) then
+           node := TreeView1.Items.AddChild(TreeView1.TopItem, module.GetType());
+
+        TreeView1.Items.AddChild(node, module.GetName());
+        
+        modIt.Next;
+        module := modIt.getValue;
+   end;
+end;
+
+procedure TForm1.ToolButton1Click(Sender: TObject);
+begin
+	FontDialog1.Execute;
+        fontName := FontDialog1.Font.Name;
+        fontSize := FontDialog1.Font.Size;
+        if (fontSize > 18) then fontSize := 7
+        else if (fontSize < 8) then fontSize := 1
+        else if (fontSize = 8) then fontSize := 1
+        else if (fontSize = 9) then fontSize := 1
+        else if (fontSize = 10) then fontSize := 2
+        else if (fontSize = 11) then fontSize := 3
+        else if (fontSize = 12) then fontSize := 3
+        else if (fontSize = 13) then fontSize := 4
+        else if (fontSize = 14) then fontSize := 5
+        else if (fontSize = 15) then fontSize := 5
+        else if (fontSize = 16) then fontSize := 6
+        else if (fontSize = 17) then fontSize := 6
+        else if (fontSize = 18) then fontSize := 7;
+
+        lookup;
+end;
+
+procedure TForm1.Edit2Change(Sender: TObject);
+begin
+	lookupLD();
+end;
+
+
+procedure TForm1.FillDictKeys(key: string);
+var
+        module : SWModule;
+        count  : integer;
+        i      : integer;
+        ListItem: TListItem;
+begin
+        module := mgr.getModuleByName(curModLD);
+        count := (ListView.Height div (ListView.Font.Height + 8));
+        ListView.Items.Clear;
+        for i := 0 to (count div 2) do
+        	module.modNext;	//-- get equal number of keys before and after our starting key(saveKey)
+        for i := 0 to count - 1 do
+        	module.modPrevious;
+        for i := 0 to count do
+        begin
+                ListItem := ListView.Items.Add;
+                ListItem.Caption := module.getKeyText;
+                module.modNext;
+        end;
+        module.setKeyText(key);
+end;
+
+procedure TForm1.ListViewItemClick(Sender: TObject; Button: TMouseButton;
+  Item: TListItem; const Pt: TPoint; ColIndex: Integer);
+begin
+	Edit2.Text := Item.Caption;
+end;
+
+procedure TForm1.SpinEdit2Changed(Sender: TObject; NewValue: Integer);
+begin
+     	Edit1.Text := ComboBox1.Text + ' ' + SpinEdit1.Text + ':' + SpinEdit2.Text;
+end;
+
+procedure TForm1.SpinEdit1Changed(Sender: TObject; NewValue: Integer);
+begin
+     	Edit1.Text := ComboBox1.Text + ' ' + SpinEdit1.Text + ':1';
+end;
+
+procedure TForm1.ComboBox1Change(Sender: TObject);
+begin
+       	Edit1.Text := ComboBox1.Text + ' ' + '1:1';
+end;
+
+procedure TForm1.CurrentVerseColor1Click(Sender: TObject);
+begin
+	ColorDialog1.Execute
+        //ColorDialog1.Color
+end;
+
+end.
diff --git a/bindings/clx/test2/MainFrm.xfm b/bindings/clx/test2/MainFrm.xfm
new file mode 100644
index 0000000..180fac1
--- /dev/null
+++ b/bindings/clx/test2/MainFrm.xfm
@@ -0,0 +1,753 @@
+object Form1: TForm1
+  Left = 331
+  Top = 273
+  Width = 608
+  Height = 407
+  HorzScrollBar.Range = 118
+  VertScrollBar.Range = 19
+  ActiveControl = TreeView1
+  Caption = 'KylixSWORD'
+  Color = clBackground
+  Menu = MainMenu1
+  OnCreate = FormCreate
+  OnShow = FormShow
+  PixelsPerInch = 108
+  TextHeight = 15
+  TextWidth = 7
+  object Splitter1: TSplitter
+    Left = 113
+    Top = 0
+    Width = 5
+    Height = 363
+    Beveled = True
+  end
+  object Panel1: TPanel
+    Left = 0
+    Top = 0
+    Width = 113
+    Height = 363
+    Align = alLeft
+    Caption = 'Panel1'
+    TabOrder = 0
+    object TreeView1: TTreeView
+      Left = 1
+      Top = 1
+      Width = 111
+      Height = 361
+      Align = alClient
+      Color = clLight
+      Columns = <>
+      TabOrder = 0
+      OnChange = TreeView1Change
+    end
+  end
+  object Panel3: TPanel
+    Left = 118
+    Top = 0
+    Width = 490
+    Height = 363
+    Align = alClient
+    Caption = 'Panel3'
+    TabOrder = 1
+    object Splitter2: TSplitter
+      Left = 1
+      Top = 231
+      Width = 488
+      Height = 5
+      Cursor = crVSplit
+      Align = alBottom
+    end
+    object Panel4: TPanel
+      Left = 1
+      Top = 236
+      Width = 488
+      Height = 126
+      Align = alBottom
+      TabOrder = 0
+      object Splitter3: TSplitter
+        Left = 283
+        Top = 1
+        Width = 5
+        Height = 124
+        Align = alRight
+      end
+      object TextBrowser2: TTextBrowser
+        Left = 1
+        Top = 1
+        Width = 282
+        Height = 124
+        Align = alClient
+        TabOrder = 0
+      end
+      object Panel5: TPanel
+        Left = 288
+        Top = 1
+        Width = 199
+        Height = 124
+        Align = alRight
+        TabOrder = 1
+        object ListView: TListView
+          Left = 1
+          Top = 25
+          Width = 197
+          Height = 98
+          Align = alClient
+          Columns = <>
+          TabOrder = 0
+          OnItemClick = ListViewItemClick
+        end
+        object Panel6: TPanel
+          Left = 1
+          Top = 1
+          Width = 197
+          Height = 24
+          Align = alTop
+          Caption = 'Panel6'
+          TabOrder = 1
+          object Edit2: TEdit
+            Left = 2
+            Top = 1
+            Width = 193
+            Height = 22
+            AutoSize = False
+            Font.CharSet = fcsUnicode
+            Font.Color = clBlack
+            Font.Height = 13
+            Font.Name = 'arial unicode ms'
+            Font.Pitch = fpVariable
+            Font.Style = []
+            ParentFont = False
+            TabOrder = 0
+            Text = 'GRACE'
+            OnChange = Edit2Change
+          end
+        end
+      end
+    end
+    object Panel8: TPanel
+      Left = 1
+      Top = 28
+      Width = 488
+      Height = 203
+      Align = alClient
+      Caption = 'Panel8'
+      TabOrder = 1
+      object Splitter4: TSplitter
+        Left = 249
+        Top = 1
+        Width = 5
+        Height = 201
+        Align = alRight
+      end
+      object Panel7: TPanel
+        Left = 254
+        Top = 1
+        Width = 233
+        Height = 201
+        Align = alRight
+        Caption = 'Panel7'
+        TabOrder = 0
+        object TextBrowser3: TTextBrowser
+          Left = 1
+          Top = 1
+          Width = 231
+          Height = 199
+          Align = alClient
+          TabOrder = 0
+        end
+      end
+      object Panel2: TPanel
+        Left = 1
+        Top = 1
+        Width = 248
+        Height = 201
+        Align = alClient
+        Caption = 'Panel2'
+        TabOrder = 1
+        object TextBrowser1: TTextBrowser
+          Left = 1
+          Top = 1
+          Width = 246
+          Height = 199
+          Align = alClient
+          TabOrder = 0
+        end
+      end
+    end
+    object ToolBar2: TToolBar
+      Left = 1
+      Top = 1
+      Width = 488
+      Height = 27
+      ButtonHeight = 23
+      Caption = 'ToolBar2'
+      Images = ImageList2
+      TabOrder = 2
+      object Edit1: TEdit
+        Left = 51
+        Top = 4
+        Width = 166
+        Height = 23
+        AutoSize = False
+        Font.CharSet = fcsUnicode
+        Font.Color = clBlack
+        Font.Height = 13
+        Font.Name = 'arial unicode ms'
+        Font.Pitch = fpVariable
+        Font.Style = []
+        ParentFont = False
+        TabOrder = 0
+        Text = 'Genesis 1:1'
+        OnChange = Edit1Change
+      end
+      object ComboBox1: TComboBox
+        Left = 225
+        Top = 4
+        Width = 120
+        Height = 23
+        ItemHeight = 17
+        Items.Strings = (
+          'Genesis'
+          'Exodus'
+          'Leviticus'
+          'Numbers'
+          'Deuteronomy'
+          'Joshua'
+          'Judges'
+          'Ruth'
+          'I Samuel'
+          'II Samuel'
+          'I Kings'
+          'II Kings'
+          'I Chronicles'
+          'II Chronicles'
+          'Ezra'
+          'Nehemiah'
+          'Esther'
+          'Job'
+          'Psalms'
+          'Proverbs'
+          'Ecclesiastes'
+          'Song of Solomon'
+          'Isaiah'
+          'Jeremiah'
+          'Lamentations'
+          'Ezekiel'
+          'Daniel'
+          'Hosea'
+          'Joel'
+          'Amos'
+          'Obadiah'
+          'Jonah'
+          'Micah'
+          'Nahum'
+          'Habakkuk'
+          'Zephaniah'
+          'Haggai'
+          'Zechariah'
+          'Malachi'
+          'Matthew'
+          'Mark'
+          'Luke'
+          'John'
+          'Acts'
+          'Romans'
+          'I Corinthians'
+          'II Corinthians'
+          'Galatians'
+          'Ephesians'
+          'Philippians'
+          'Colossians'
+          'I Thessalonians'
+          'II Thessalonians'
+          'I Timothy'
+          'II Timothy'
+          'Titus'
+          'Philemon'
+          'Hebrews'
+          'James'
+          'I Peter'
+          'II Peter'
+          'I John'
+          'II John'
+          'III John'
+          'Jude'
+          'Revelation of John')
+        ItemIndex = 0
+        TabOrder = 1
+        Text = 'Genesis'
+        OnChange = ComboBox1Change
+      end
+      object SpinEdit1: TSpinEdit
+        Left = 345
+        Top = 4
+        Width = 45
+        Height = 23
+        Align = alCustom
+        TabOrder = 2
+        OnChanged = SpinEdit1Changed
+      end
+      object SpinEdit2: TSpinEdit
+        Left = 390
+        Top = 4
+        Width = 45
+        Height = 23
+        Align = alCustom
+        TabOrder = 3
+        OnChanged = SpinEdit2Changed
+      end
+      object ToolButton4: TToolButton
+        Left = 217
+        Top = 4
+        Width = 8
+        Height = 23
+        Style = tbsSeparator
+        Caption = 'ToolButton4'
+      end
+      object Label2: TLabel
+        Left = 1
+        Top = 4
+        Width = 50
+        Height = 20
+        Align = alLeft
+        Alignment = taCenter
+        AutoSize = False
+        Caption = 'KJV'
+        Layout = tlCenter
+      end
+      object btnBTFollow: TToolButton
+        Tag = 2
+        Left = 435
+        Top = 4
+        Height = 23
+        Style = tbsCheck
+        Caption = 'btnBTFollow'
+        Down = True
+        ImageIndex = 1
+      end
+      object btnCMFollow: TToolButton
+        Tag = 2
+        Left = 458
+        Top = 4
+        Height = 23
+        Style = tbsCheck
+        Caption = 'CM'
+        Down = True
+        ImageIndex = 0
+      end
+    end
+  end
+  object StatusBar1: TStatusBar
+    Left = 0
+    Top = 363
+    Width = 608
+    Height = 19
+    Panels = <>
+    SimplePanel = True
+    SimpleText = 'Genesis 1:1'
+  end
+  object ImageList1: TImageList
+    Height = 24
+    Width = 24
+    Left = 472
+    Top = 72
+    Bitmap = {
+      494D474C01000100180000001800000004000000424D361B0000000000003600
+      00002800000030000000300000000100180000000000001B0000120B0000120B
+      00000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFF89B7DB88B6DB6E97B91E2C38FFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF97BFDF88B6DB77A2C5
+      54779510181FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5445495445495445495445492B1918
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFF9CC2E188B6DB88B6DB6C95B74C6B863F586E0E161CFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF4F3D3F737482432B2A3516103516103516106158607A7E
+      8FA2BBD8A2BBD8A2BBD87E8597281A1A11090AFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFF000000000000000000FFFFFFFFFFFF698EABB0CEE785B3D7
+      8DB9DC7FACD05779924F6F8716232DFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF35161097AAC4A2BBD895
+      A7C092A3BB92A3BB92A3BB9BB1CCA2BBD8A2BBD8A2BBD8A2BBD890A0B772798A
+      09070BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFF
+      FFFFFFFFFFFFFF2D4A53B6D2E9A3C7E291BCDAB7D3E584B1D66D95B548667F43
+      565CFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFF351610A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BB
+      D8A2BBD8A2BBD8A2BBD87E85975A5259110A0BFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFF9595959EC0DCCADDEE
+      BAD4E988B6DBB5D0E76A8FAD83AFD245627B1F241FFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6A6772A2BBD8A2
+      BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD87678864E3E41
+      160B0BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
+      00000000000000FFFFFF7F97ABB7D3E8ACCCE6B3D0E7729DBD88B5DA5C809E0C
+      101225271FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFF737482A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BB
+      D8A2BBD8A2BBD8A2BBD890A0B7838C9F515460040509FFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFF0000000000005C748787A7C0
+      BBD3E877A1C389AFCF678EAF495252536E81FFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF737482A2
+      BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD88793A7737482
+      73748221232AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000
+      00000000000000000000FFFFFF9FB6C7AFCDE5688FAE7FA0B65D73843850631D
+      211FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFF737482A2BBD8A2BBD8A2BBD8A2BBD899AEC88CA1
+      BA8BA1BA8BA1BA8BA1BA8BA1BA8BA1BA8BA1BA28303AFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF608198
+      607C8E8CB8DC48657D5050503C3C3C324A5BFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF737482A2
+      BBD8A2BBD8A2BBD8A2BBD8645D660C0709000307000307000307000307000307
+      000307000307FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5E5E5E8EABC16C95B54B5C5B4242420F
+      0F0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF33354495A7C0A2BBD8A2BBD8A2BBD8A2BBD8645D66FFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFF5656568DB4D45C809AFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF33394AA2BBD8A2
+      BBD8A2BBD8A2BBD8A2BBD8A2BBD8202332FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000
+      00000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF56565688B1D148627600
+      0000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF33394AA2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD82023
+      32FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF7F9DB3678DAD2A2A2AFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF33394AA2BBD8A2
+      BBD8A2BBD8A2BBD8A2BBD8A2BBD8202332FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
+      00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6788A348
+      6783FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF33394AA2BBD8A2BBD8A2BBD8A2BBD8A2BBD8A2BBD82023
+      32FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000FFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFF2D2F1B678AA42E2E2E000000000000FFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF33394AA2BBD8A2
+      BBD8A2BBD8FFFFFFA2BBD8A2BBD8202332FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
+      00000000FFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF42
+      4242000000FFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFF000000FFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000FFFFFFFFFFFF000000FFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000
+      00000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00
+      0000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12
+      E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E
+      12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E5
+      4E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12
+      E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFF
+      FFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFF
+      FFFFFFFFFF4E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFF4E12E5FFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFF4E12E54E12E5FFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFE0141BE0141BFF
+      FFFFFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E5FFFFFF4E12E5
+      4E12E5FFFFFFE0141BE0141BE0141BE0141BFFFFFFFFFFFFFFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFF4E12E54E
+      12E54E12E54E12E5FFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      E0141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFE0141BFFFFFFFFFFFFE014
+      1BFFFFFFFFFFFF4E12E5FFFFFF4E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFF
+      FFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E54E12E54E12E5FFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0141BFFFFFFE0141BFFFFFFFFFFFFE0
+      141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E54E12E54E12E5
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFF4E
+      12E54E12E54E12E5FFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      E0141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFE0141BFFFFFFFFFFFFE014
+      1BFFFFFFFFFFFF4E12E54E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFF
+      FFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E54E12E54E12E5FFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0141BFFFFFFE0141BFFFFFFFFFFFFE0
+      141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E54E12E54E12E5
+      FFFFFFFFFFFFFFFFFFE0141BE0141BE0141BE0141BFFFFFFFFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFE0141BE0141BE0141BE0141BFFFFFFFFFFFFFFFFFF4E
+      12E54E12E54E12E5FFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      E0141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFE0141BE0141BE0141BFFFF
+      FFFFFFFFFFFFFF4E12E54E12E54E12E5FFFFFFFFFFFFE0141BFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFF
+      FFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E54E12E54E12E5FFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0141BFFFFFFE0141BFFFFFFFFFFFFE0
+      141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E54E12E54E12E5
+      FFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE014
+      1BFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFF4E
+      12E54E12E54E12E5FFFFFFFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFFFFFFF
+      E0141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFE0141BFFFFFFFFFFFFE014
+      1BFFFFFFFFFFFF4E12E5FFFFFF4E12E5FFFFFFFFFFFFE0141BFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFE0141BFFFFFFFFFFFFFFFFFFE0141BFFFFFF
+      FFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E54E12E54E12E5FFFFFFFFFFFFE014
+      1BFFFFFFE0141BFFFFFFE0141BFFFFFFE0141BFFFFFFE0141BFFFFFFFFFFFFE0
+      141BFFFFFFE0141BFFFFFFFFFFFFE0141BFFFFFFFFFFFF4E12E5FFFFFF4E12E5
+      4E12E5FFFFFFFFFFFFE0141BE0141BE0141BE0141BFFFFFFE0141BE0141BE014
+      1BE0141BE0141BFFFFFFE0141BE0141BE0141BE0141BFFFFFFFFFFFF4E12E54E
+      12E54E12E54E12E5FFFFFFFFFFFFE0141BE0141BFFFFFFFFFFFFFFFFFFE0141B
+      E0141BFFFFFFFFFFFFE0141BE0141BFFFFFFFFFFFFE0141BE0141BE0141BFFFF
+      FFFFFFFFFFFFFF4E12E5FFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFF4E12E54E12E5FFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E5FFFFFFFFFFFF
+      FFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFF
+      FFFFFFFFFF4E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFF4E12E5FFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E
+      12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E5
+      4E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12
+      E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12E5FFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF4E12E54E12
+      E5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFF424DBE010000000000003E0000002800000030000000
+      30000000010001000000000080010000120B0000120B00000200000002000000
+      FFFFFF0000000000000000000000FF00000000000000FF00000000000000D010
+      0000000000000000000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000000000000000000000000000000000000000
+      0000000000000000000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000FF00000000000000FF00000000000000FF00
+      000000000000FF00000000000000000000000000000000000000000000000000
+      0000000000000000}
+  end
+  object ColorDialog1: TColorDialog
+    Color = clTeal
+    Left = 440
+    Top = 72
+  end
+  object FontDialog1: TFontDialog
+    Font.CharSet = fcsUnicode
+    Font.Color = clBlack
+    Font.Height = 15
+    Font.Name = 'arial unicode ms'
+    Font.Pitch = fpVariable
+    Font.Style = []
+    Left = 408
+    Top = 72
+  end
+  object ImageList2: TImageList
+    Left = 504
+    Top = 72
+    Bitmap = {
+      494D474C01000100100000001000000003000000424D360C0000000000003600
+      00002800000020000000200000000100180000000000000C0000120B0000120B
+      00000000000000000000FFFFFFFFFFFF00000000000000000000000000000000
+      0000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000FFFF00FFFF00FFFF00
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000FFFF00FFFF00
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000FFFF00
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000FFFF00
+      000000FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000008000008000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000080FFFF0000008000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000080FFFF00FFFF0000000000
+      FFFF00FFFF00FFFF00FFFF00FFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
+      0000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000
+      0000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF000000000000000000000000000000FFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000BFBFBFBFBFBF7F
+      7F7F7F7F7F7F7F7F000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFF000000000000BFBFBFBFBFBF7F7F7F7F7F7F7F7F7F000000000000FFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000BFBFBFBFBFBF7F7F7F00000000
+      00000000007F7F7F7F7F7F7F7F7F000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      000000BFBFBFBFBFBF7F7F7F0000000000000000007F7F7F7F7F7F7F7F7F0000
+      00FFFFFFFFFFFFFFFFFFFFFFFF000000BFBFBFBFBFBF000000FFFFFF0000FFFF
+      FFFF0000FFFFFFFF0000007F7F7F7F7F7F000000FFFFFFFFFFFFFFFFFF000000
+      BFBFBFBFBFBF000000FFFFFF00FF00FFFFFF00FF00FFFFFF0000007F7F7F7F7F
+      7F000000FFFFFFFFFFFFFFFFFF000000BFBFBF000000FFFFFF00000000000000
+      0000000000000000FFFFFF0000007F7F7F000000FFFFFFFFFFFFFFFFFF000000
+      BFBFBF000000FFFFFF000000000000000000000000000000FFFFFF0000007F7F
+      7F000000FFFFFFFFFFFF000000BFBFBF7F7F7FFFFFFF0000000000000000FF00
+      0080000080000000000000FFFFFF7F7F7F7F7F7F000000FFFFFF000000BFBFBF
+      7F7F7FFFFFFF00000000000000FF00008000008000000000000000FFFFFF7F7F
+      7F7F7F7F000000FFFFFF000000BFBFBF0000000000FF0000000000FF00008000
+      00FF0000800000800000000000FF0000007F7F7F000000FFFFFF000000BFBFBF
+      00000000FF0000000000FF0000800000FF0000800000800000000000FF000000
+      007F7F7F000000FFFFFF000000FFFFFF000000FFFFFF0000000000FF0000FF00
+      00FF0000FF000080000000FFFFFF0000007F7F7F000000FFFFFF000000FFFFFF
+      000000FFFFFF00000000FF0000FF0000FF0000FF00008000000000FFFFFF0000
+      007F7F7F000000FFFFFF000000FFFFFF0000000000FF000000FFFFFF0000FF00
+      00FF0000800000FF0000000000FF000000BFBFBF000000FFFFFF000000FFFFFF
+      00000000FF00000000FFFFFF00FF0000FF0000800000FF0000000000FF000000
+      00BFBFBF000000FFFFFF000000FFFFFF7F7F7FFFFFFF000000000000FFFFFFFF
+      FFFF0000FF000000000000FFFFFF7F7F7FBFBFBF000000FFFFFF000000FFFFFF
+      7F7F7FFFFFFF000000000000FFFFFFFFFFFF00FF00000000000000FFFFFF7F7F
+      7FBFBFBF000000FFFFFFFFFFFF000000BFBFBF000000FFFFFF00000000000000
+      0000000000000000FFFFFF000000BFBFBF000000FFFFFFFFFFFFFFFFFF000000
+      BFBFBF000000FFFFFF000000000000000000000000000000FFFFFF000000BFBF
+      BF000000FFFFFFFFFFFFFFFFFF000000FFFFFFBFBFBF000000FFFFFF0000FFFF
+      FFFF0000FFFFFFFF000000BFBFBFBFBFBF000000FFFFFFFFFFFFFFFFFF000000
+      FFFFFFBFBFBF000000FFFFFF00FF00FFFFFF00FF00FFFFFF000000BFBFBFBFBF
+      BF000000FFFFFFFFFFFFFFFFFFFFFFFF000000FFFFFFBFBFBF7F7F7F00000000
+      00000000007F7F7FBFBFBFBFBFBF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      000000FFFFFFBFBFBF7F7F7F0000000000000000007F7F7FBFBFBFBFBFBF0000
+      00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000FFFFFFFFFFFFFF
+      FFFFBFBFBFBFBFBF000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFF000000000000FFFFFFFFFFFFFFFFFFBFBFBFBFBFBF000000000000FFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000
+      0000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFF000000000000000000000000000000FFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFF424DBE000000000000003E0000002800000020000000
+      20000000010001000000000080000000120B0000120B00000200000002000000
+      FFFFFF00000000000000FFFD0000DFBF0000FFF700007D7A0000A75D0000DBFF
+      0000FFFD0000D7A700007ADB0000BFFB0000BF9F0000FAF500004DBD0000FFBF
+      0000F57B0000AFAD000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000}
+  end
+  object MainMenu1: TMainMenu
+    Images = ImageList1
+    Left = 536
+    Top = 72
+    object File1: TMenuItem
+      Caption = 'File'
+      object Exit1: TMenuItem
+        Caption = 'Exit'
+        OnClick = Button1Click
+      end
+    end
+    object Options1: TMenuItem
+      Caption = 'Options'
+      object Strongs1: TMenuItem
+        Caption = 'Strongs Numbers'
+        Enabled = False
+        ImageIndex = 0
+      end
+      object MorphTags1: TMenuItem
+        Caption = 'Morph Tags'
+        Enabled = False
+        ImageIndex = 1
+      end
+      object Footnotes1: TMenuItem
+        Caption = 'Footnotes'
+        Enabled = False
+        ImageIndex = 2
+      end
+      object ChangeTextFont1: TMenuItem
+        Caption = 'Change Text Font'
+        ImageIndex = 3
+        OnClick = ToolButton1Click
+      end
+      object CurrentVerseColor1: TMenuItem
+        Caption = 'Current Verse Color'
+        OnClick = CurrentVerseColor1Click
+      end
+    end
+  end
+end
diff --git a/bindings/clx/test2/test2.conf b/bindings/clx/test2/test2.conf
new file mode 100644
index 0000000..6b9045c
--- /dev/null
+++ b/bindings/clx/test2/test2.conf
@@ -0,0 +1,38 @@
+-$A8
+-$B-
+-$C+
+-$D+
+-$E-
+-$F-
+-$G+
+-$H+
+-$I+
+-$J-
+-$K-
+-$L+
+-$M-
+-$N+
+-$O-
+-$P+
+-$Q+
+-$R+
+-$S-
+-$T-
+-$U-
+-$V+
+-$W-
+-$X+
+-$YD
+-$Z1
+-cg
+-vn
+-vr
+-H+
+-W+
+-M
+-$M16384,1048576
+-K$00400000
+-U"/home/tbiggs/kylix2/lib/debug:../"
+-O"/home/tbiggs/kylix2/lib/debug:../"
+-I"/home/tbiggs/kylix2/lib/debug:../"
+-R"/home/tbiggs/kylix2/lib/debug:../"
diff --git a/bindings/clx/test2/test2.dpr b/bindings/clx/test2/test2.dpr
new file mode 100644
index 0000000..ec160ef
--- /dev/null
+++ b/bindings/clx/test2/test2.dpr
@@ -0,0 +1,14 @@
+program test2;
+
+uses
+  QForms,
+  MainFrm in 'MainFrm.pas' {Form1},
+  Sword in '../Sword.pas';
+
+{$R *.res}
+
+begin
+  Application.Initialize;
+  Application.CreateForm(TForm1, Form1);
+  Application.Run;
+end.
diff --git a/bindings/clx/test2/test2.kof b/bindings/clx/test2/test2.kof
new file mode 100644
index 0000000..b5fdd24
--- /dev/null
+++ b/bindings/clx/test2/test2.kof
@@ -0,0 +1,61 @@
+[Compiler]
+A=8
+B=0
+C=1
+D=1
+E=0
+F=0
+G=1
+H=1
+I=1
+J=0
+K=0
+L=1
+M=0
+N=1
+O=0
+P=1
+Q=1
+R=1
+S=0
+T=0
+U=0
+V=1
+W=0
+X=1
+Y=1
+Z=1
+ShowHints=1
+ShowWarnings=1
+UnitAliases=
+
+[Linker]
+MapFile=0
+OutputObjs=0
+ConsoleApp=1
+DebugInfo=1
+RemoteSymbols=1
+MinStackSize=16384
+MaxStackSize=1048576
+ImageBase=4194304
+ExeDescription=
+DynamicLoader=/lib/ld-linux.so.2
+
+[Directories]
+OutputDir=
+UnitOutputDir=
+PackageDLLOutputDir=
+PackageDCPOutputDir=
+SearchPath=/home/tbiggs/kylix2/lib/debug:../
+Packages=baseclx:visualclx
+Conditionals=
+DebugSourceDirs=
+UsePackages=0
+
+[Parameters]
+RunParams=
+HostApplication=
+Launcher=/usr/X11R6/bin/xterm -T KylixDebuggerOutput -e bash -i -c %debuggee%
+UseLauncher=0
+DebugCWD=
+
diff --git a/bindings/clx/test2/test2.res b/bindings/clx/test2/test2.res
new file mode 100644
index 0000000..36f26e2
--- /dev/null
+++ b/bindings/clx/test2/test2.res
diff --git a/bindings/corba/java/Makefile b/bindings/corba/java/Makefile
new file mode 100644
index 0000000..8b32da1
--- /dev/null
+++ b/bindings/corba/java/Makefile
@@ -0,0 +1,34 @@
+#CHANGE THESE TO MATCH YOUR SYSTEM
+TOMCAT_HOME=/opt/tomcat
+#instdir=${TOMCAT_HOME}/webapps/swordweb
+
+# Typically you'll point this to your home directory, e.g.
+instdir=/home/swordweb/livehtml/webapp
+#instdir=/home/sword/html
+#instdir=/home/scribe/src/swordweb/webapp
+
+SERVLET_LIB=${TOMCAT_HOME}/lib/servlet-api.jar
+
+# Older tomcat uses this path
+#SERVLET_LIB=${TOMCAT_HOME}/common/lib/servlet-api.jar
+
+
+all: src/org/crosswire/sword/orb/SWMgr.java classes/org/crosswire/sword/orb/SwordOrb.class
+
+src/org/crosswire/sword/orb/SWMgr.java: ../swordorb.idl
+	idlj -pkgTranslate swordorb org.crosswire.sword.orb -td src ../swordorb.idl
+
+classes/org/crosswire/sword/orb/SwordOrb.class: src/org/crosswire/sword/orb/SwordOrb.java
+	javac -classpath ${SERVLET_LIB} -d classes -sourcepath src src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java
+
+
+clean:
+	rm -f src/org/crosswire/sword/orb/SW*.java
+	rm -f src/org/crosswire/sword/orb/_SW*.java
+	rm -f src/org/crosswire/sword/orb/Mod*.java
+	rm -f src/org/crosswire/sword/orb/Search*.java
+	rm -f src/org/crosswire/sword/orb/String*.java
+	rm -rf classes/*
+
+install:
+	cp -r classes/org/ ${instdir}/WEB-INF/classes/
diff --git a/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java b/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java
new file mode 100644
index 0000000..aab6001
--- /dev/null
+++ b/bindings/corba/java/src/org/crosswire/sword/orb/SwordOrb.java
@@ -0,0 +1,311 @@
+/******************************************************************************
+ *
+ *  SwordOrb.java -	
+ *
+ * $Id: SwordOrb.java 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+package org.crosswire.sword.orb;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+import java.io.StringWriter;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionBindingEvent;
+import java.util.Vector;
+import java.util.Hashtable;
+import java.util.Date;
+import java.util.Properties;
+
+public class SwordOrb extends Object implements HttpSessionBindingListener {
+	public static Properties config = null;
+	public static String ORBEXE = "swordorbserver";
+	public static final int MAX_REMOTE_ADDR_CONNECTIONS = 10;
+	public static final int MAX_ACCESS_COUNT_PER_INTERVAL = 50;
+	public static final long MAX_ACCESS_COUNT_INTERVAL = 50 * 1000;	// milliseconds
+	public static final long BLACKLIST_DURATION = 10 * 60 * 1000;	// milliseconds
+	public static final String BIBLES = "Biblical Texts";
+	public static final String COMMENTARIES = "Commentaries";
+	public static final String LEXDICTS = "Lexicons / Dictionaries";
+	public static final String GENBOOKS = "Generic Books";
+	public static final String DAILYDEVOS = "Daily Devotional";
+
+
+	public static final int DEBUG   = 9;
+	public static final int INFO    = 7;
+	public static final int WARN    = 5;
+	public static final int ERROR   = 2;
+	public static final int NONE    = 0;
+
+	// set this to your desired debug output level
+	public static int debugLevel = WARN;
+
+
+	static void log(int level, String message, Throwable e) {
+		if (debugLevel >= level) {
+			System.err.println(new Date() + " | " + message);
+			// some warnings give a stackstrace, but we don't want to
+			// see the stacktrace part unless our current run level is set to DEBUG
+			if (debugLevel >= DEBUG && e != null) {
+				System.err.println(e);
+				e.printStackTrace(System.err);
+			}
+		}
+	}
+
+
+
+	static java.util.Properties p = new java.util.Properties();
+	static {
+		p.setProperty("com.sun.CORBA.codeset.charsets", "0x05010001, 0x00010109");    // UTF-8, UTF-16
+		p.setProperty("com.sun.CORBA.codeset.wcharsets", "0x00010109, 0x05010001");    // UTF-16, UTF-8
+	}
+
+	static org.omg.CORBA.ORB orb = org.omg.CORBA_2_3.ORB.init(new String[]{}, p);
+	static Hashtable<String, Vector<SwordOrb>> clients = new Hashtable<String, Vector<SwordOrb>>();
+	String ior = null;
+	String remoteAddr = null;
+	String localeName = null;
+	long   lastAccessed = 0;
+	int    intervalCount = 0;
+	long   intervalStamp = 0;
+	long   blacklistTill = 0;
+
+	private SWMgr attach() {
+
+		// assert IOR has been set
+		if (ior == null)
+			return null;
+
+		SWMgr retVal = null;
+		try {
+log(INFO, "attaching...", null);
+			org.omg.CORBA.Object obj = orb.string_to_object(ior);
+			retVal = SWMgrHelper.narrow(obj);
+log(INFO, "calling testConnection", null);
+			try {
+				retVal.testConnection();
+log(INFO, "testConnection successful", null);
+			}
+			catch (Throwable e) {
+log(WARN, "We lost our ORB service.  No worries, it was likely just reaped by a cron to killall ORB services. We'll respawn another...", e);
+				retVal = null;
+			}
+		}
+		catch(Throwable e) {
+			retVal = null;
+log(ERROR, "failed in attach", e);
+		}
+		return retVal;
+	}
+
+	public SwordOrb(String remoteAddr) {
+		this.remoteAddr = remoteAddr;
+	}
+
+
+//	this doesn't seem to work.  Never seems to get called for me
+	public void finalize () throws Throwable {
+		// shut down external process
+		try {
+log(INFO, "calling finalize.", null);
+			getSWMgrInstance().terminate();
+		}
+		catch (Exception e) {}	// we know this doesn't return property cuz we killed the orb! :)
+
+	}
+
+
+	public void valueBound(HttpSessionBindingEvent httpSessionBindingEvent) {}
+
+	public void valueUnbound(HttpSessionBindingEvent httpSessionBindingEvent) {
+		try {
+//			throw new Exception("value unbound; showing stacktrace");
+			Vector orbs = (Vector)clients.get(remoteAddr);
+int size = -1;
+			if (orbs != null) {
+size = orbs.size();
+				orbs.remove(this);
+			}
+log(INFO, "calling valueUnbound. size before: " + size + "; size after: "+orbs.size(), null);
+			getSWMgrInstance().terminate();
+		}
+		catch (Exception e) {}	// we know this doesn't return properly cuz we killed the orb! :)
+//		catch (Exception e) {e.printStackTrace();}	// we know this doesn't return properly cuz we killed the orb! :)
+	}
+
+	private static void loadConfig(HttpServletRequest request) {
+		try {
+			config = new Properties();
+			File propName = new File(request.getSession().getServletContext().getRealPath("/WEB-INF/swordweb.properties"));
+			if (propName.exists()) {
+				FileInputStream propFile = new FileInputStream(propName);
+				config.load(propFile);
+				propFile.close();
+			}
+		}
+		catch (Exception e) { e.printStackTrace(); }
+		ORBEXE = config.getProperty("orbexe", "swordorbserver");
+	}
+
+	private void startOrb() {
+		try {
+			// start external process
+			java.lang.Process p = Runtime.getRuntime().exec(ORBEXE);
+			InputStream is = p.getInputStream();
+			InputStreamReader isr = new InputStreamReader(is);
+			BufferedReader input = new BufferedReader(isr);
+
+			String line;
+			line = input.readLine();
+//		retVal = p.waitFor();
+			ior = line;
+log(INFO, "Launched ORB, IOR: " + ior, null);
+		}
+		catch (Exception e) {e.printStackTrace();}
+	}
+
+	void checkAccessAbuse() throws Exception {
+		if ((blacklistTill > 0) && (System.currentTimeMillis() < blacklistTill)) {
+			throw new Exception("You're an abuser and have been blacklisted till " + new Date(blacklistTill));
+		}
+		if (++intervalCount > MAX_ACCESS_COUNT_PER_INTERVAL) {
+			if (System.currentTimeMillis() < intervalStamp + MAX_ACCESS_COUNT_INTERVAL) {
+				// abuser
+				blacklistTill = System.currentTimeMillis() + BLACKLIST_DURATION;
+			}
+			intervalStamp = System.currentTimeMillis();
+			intervalCount = 0;
+		}
+	}
+
+	public SWMgr getSWMgrInstance() throws Exception {
+		lastAccessed = System.currentTimeMillis();
+		checkAccessAbuse();
+		SWMgr retVal = null;
+		try {
+log(INFO, "trying to see if we have and attach to a running ORB", null);
+			retVal = attach();
+		}
+		catch(Exception e) {
+log(ERROR, "exception attaching to running ORB", e);
+			retVal = null;
+		}
+		if (retVal == null) {
+			try {
+log(INFO, "no ORB running; trying to launch", null);
+				startOrb();
+log(INFO, "trying to attach to newly launched ORB", null);
+				retVal = attach();
+				if (retVal != null) {
+					if (localeName != null) {
+						retVal.setDefaultLocale(localeName);
+					}
+				}
+			}
+			catch(org.omg.CORBA.SystemException e) {
+				e.printStackTrace();
+			}
+		}
+		return retVal;
+	}
+
+	public static void setSessionLocale(String localeName, HttpServletRequest request) throws Exception {
+		request.getSession().setAttribute("SwordOrbLocale", localeName);
+		SWMgr mgr = getSWMgrInstance(request);
+		if (mgr != null) {
+			mgr.setDefaultLocale(localeName);
+		}
+	}
+
+	public static SwordOrb getSessionOrb(HttpServletRequest request) throws Exception {
+		if (config == null) loadConfig(request);
+		HttpSession session = request.getSession();
+		SwordOrb orb = (SwordOrb)session.getAttribute("SwordOrb");
+		String remoteAddr = request.getRemoteAddr();
+		if (orb == null) {
+log(INFO, "No ORB found in session; constructing a new instance", null);
+
+			Vector<SwordOrb> orbs = clients.get(remoteAddr);
+			if (orbs == null) {
+				orbs = new Vector<SwordOrb>();
+				clients.put(remoteAddr, orbs);
+			}
+			if (orbs.size() < MAX_REMOTE_ADDR_CONNECTIONS) {
+				orb = new SwordOrb(remoteAddr);
+				orbs.add(orb);
+
+				String locName = (String)session.getAttribute("SwordOrbLocale");
+				if (locName != null)
+					orb.localeName = locName;
+
+				session.setAttribute("SwordOrb", orb);
+			}
+			else {
+				// recycle oldest orb
+				orb = orbs.remove(0);
+				orbs.add(orb);
+			}
+		}
+		else {
+log(INFO, "ORB found in session", null);
+		}
+		return orb;
+	}
+
+	public static SWMgr getSWMgrInstance(HttpServletRequest request) throws Exception {
+		SwordOrb orb = getSessionOrb(request);
+		SWMgr mgr = orb.getSWMgrInstance();
+		return mgr;
+	}
+
+
+	public static void main(String args[]) throws Exception {
+		SWMgr mgr = new SwordOrb("127.0.0.1").getSWMgrInstance();
+
+		System.out.println("PrefixPath: " + mgr.getPrefixPath());
+		System.out.println("ConfigPath: " + mgr.getConfigPath());
+		ModInfo[] modInfoList = mgr.getModInfoList();
+		System.out.println("sequence size: " + modInfoList.length);
+		SWModule module;
+		for (int i = 0; i < modInfoList.length; i++) {
+			System.out.println(modInfoList[i].name + ": " + modInfoList[i].category + ": " + modInfoList[i].language + ": " + modInfoList[i].description);
+/*
+			module = mgr.getModuleByName(modInfoList[i].name);
+			module.setKeyText("jas1:19");
+			System.out.println(module.getRenderText());
+*/
+		}
+/*
+		module = mgr.getModuleByName("WHNU");
+		module.setKeyText("rev.22.21");
+		System.out.println(module.getRawEntry());
+/*
+		boolean lucene = module.hasSearchFramework();
+		SearchHit[] searchResults = module.search("God love world", (lucene)?SearchType.LUCENE:SearchType.MULTIWORD, 0, "");
+		for (int i = 0; i < searchResults.length; i++)
+			System.out.println(searchResults[i].key);
+
+*/
+	}
+}
diff --git a/bindings/corba/java/src/org/crosswire/util/Base64.java b/bindings/corba/java/src/org/crosswire/util/Base64.java
new file mode 100644
index 0000000..a4eabbc
--- /dev/null
+++ b/bindings/corba/java/src/org/crosswire/util/Base64.java
@@ -0,0 +1,1066 @@
+package org.crosswire.util;
+
+/**
+ * <p>
+ * I am placing this code in the Public Domain. Do with it as you will.
+ * This software comes with no guarantees or warranties but with
+ * plenty of well-wishing instead!
+ * Please visit <a href="http://iharder.net/xmlizable">http://iharder.net/xmlizable</a>
+ * periodically to check for updates or to contribute improvements.
+ * </p>
+ *
+ * @author Robert Harder
+ * @author rob@iharder.net
+ * @version 1.3.4
+ * Changed last char from '/' to '-' because cookies can't use '/' so we're not really a BASE64
+ * standard encoder anymore
+ * Changed package name.  --crosswire.
+ * Thanks to Robert Harder for placing this code into the public domain
+ *
+ * Encodes and decodes to and from Base64 notation.
+ *
+ * <p>
+ * Change Log:
+ * </p>
+ * <ul>
+ *  <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
+ *      where last buffer being read, if not completely full, was not returned.</li>
+ *  <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
+ *  <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
+ * </ul>
+ *
+ */
+public class Base64
+{
+    
+    /** Specify encoding (value is <tt>true</tt>). */
+    public final static boolean ENCODE = true;
+    
+    
+    /** Specify decoding (value is <tt>false</tt>). */
+    public final static boolean DECODE = false;
+    
+    
+    /** Maximum line length (76) of Base64 output. */
+    private final static int MAX_LINE_LENGTH = java.lang.Integer.MAX_VALUE;
+    
+    
+    /** The equals sign (=) as a byte. */
+    private final static byte EQUALS_SIGN = (byte)'=';
+    
+    
+    /** The new line character (\n) as a byte. */
+    private final static byte NEW_LINE = (byte)'\n';
+    
+    
+    /** The 64 valid Base64 values. */
+    private final static byte[] ALPHABET =
+    {
+        (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
+        (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
+        (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', 
+        (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
+        (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
+        (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
+        (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u', 
+        (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
+        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', 
+        (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'-'  // changed last char from '/' to '-' because cookies can't use '/'
+    };
+    
+    /** 
+     * Translates a Base64 value to either its 6-bit reconstruction value
+     * or a negative number indicating some other meaning.
+     **/
+    private final static byte[] DECODABET =
+    {   
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,                 // Decimal  0 -  8
+        -5,-5,                                      // Whitespace: Tab and Linefeed
+        -9,-9,                                      // Decimal 11 - 12
+        -5,                                         // Whitespace: Carriage Return
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 14 - 26
+        -9,-9,-9,-9,-9,                             // Decimal 27 - 31
+        -5,                                         // Whitespace: Space
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,              // Decimal 33 - 42
+        62,                                         // Plus sign at decimal 43
+        -9,-9,-9,                                   // Decimal 44 - 46
+        63,                                         // Slash at decimal 47
+        52,53,54,55,56,57,58,59,60,61,              // Numbers zero through nine
+        -9,-9,-9,                                   // Decimal 58 - 60
+        -1,                                         // Equals sign at decimal 61
+        -9,-9,-9,                                      // Decimal 62 - 64
+        0,1,2,3,4,5,6,7,8,9,10,11,12,13,            // Letters 'A' through 'N'
+        14,15,16,17,18,19,20,21,22,23,24,25,        // Letters 'O' through 'Z'
+        -9,-9,-9,-9,-9,-9,                          // Decimal 91 - 96
+        26,27,28,29,30,31,32,33,34,35,36,37,38,     // Letters 'a' through 'm'
+        39,40,41,42,43,44,45,46,47,48,49,50,51,     // Letters 'n' through 'z'
+        -9,-9,-9,-9                                 // Decimal 123 - 126
+        /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 127 - 139
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 140 - 152
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 153 - 165
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 166 - 178
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 179 - 191
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 192 - 204
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 205 - 217
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 218 - 230
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,     // Decimal 231 - 243
+        -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9         // Decimal 244 - 255 */
+    };
+    
+    private final static byte BAD_ENCODING    = -9; // Indicates error in encoding
+    private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
+    private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
+
+    
+    /** Defeats instantiation. */
+    private Base64(){}
+    
+    
+    
+/* ********  E N C O D I N G   M E T H O D S  ******** */    
+    
+    
+    /**
+     * Encodes the first three bytes of array <var>threeBytes</var>
+     * and returns a four-byte array in Base64 notation.
+     *
+     * @param threeBytes the array to convert
+     * @return four byte array in Base64 notation.
+     * @since 1.3
+     */
+    private static byte[] encode3to4( byte[] threeBytes )
+    {   return encode3to4( threeBytes, 3 );
+    }   // end encodeToBytes
+    
+    
+    
+    /**
+     * Encodes up to the first three bytes of array <var>threeBytes</var>
+     * and returns a four-byte array in Base64 notation.
+     * The actual number of significant bytes in your array is
+     * given by <var>numSigBytes</var>.
+     * The array <var>threeBytes</var> needs only be as big as
+     * <var>numSigBytes</var>.
+     *
+     * @param threeBytes the array to convert
+     * @param numSigBytes the number of significant bytes in your array
+     * @return four byte array in Base64 notation.
+     * @since 1.3
+     */
+    private static byte[] encode3to4( byte[] threeBytes, int numSigBytes )
+    {   byte[] dest = new byte[4];
+        encode3to4( threeBytes, 0, numSigBytes, dest, 0 );
+        return dest;
+    }
+    
+    
+    
+    /**
+     * Encodes up to three bytes of the array <var>source</var>
+     * and writes the resulting four Base64 bytes to <var>destination</var>.
+     * The source and destination arrays can be manipulated
+     * anywhere along their length by specifying 
+     * <var>srcOffset</var> and <var>destOffset</var>.
+     * This method does not check to make sure your arrays
+     * are large enough to accomodate <var>srcOffset</var> + 3 for
+     * the <var>source</var> array or <var>destOffset</var> + 4 for
+     * the <var>destination</var> array.
+     * The actual number of significant bytes in your array is
+     * given by <var>numSigBytes</var>.
+     *
+     * @param source the array to convert
+     * @param srcOffset the index where conversion begins
+     * @param numSigBytes the number of significant bytes in your array
+     * @param destination the array to hold the conversion
+     * @param destOffset the index where output will be put
+     * @return the <var>destination</var> array
+     * @since 1.3
+     */
+    private static byte[] encode3to4( 
+     byte[] source, int srcOffset, int numSigBytes,
+     byte[] destination, int destOffset )
+    {
+        //           1         2         3  
+        // 01234567890123456789012345678901 Bit position
+        // --------000000001111111122222222 Array position from threeBytes
+        // --------|    ||    ||    ||    | Six bit groups to index ALPHABET
+        //          >>18  >>12  >> 6  >> 0  Right shift necessary
+        //                0x3f  0x3f  0x3f  Additional AND
+        
+        // Create buffer with zero-padding if there are only one or two
+        // significant bytes passed in the array.
+        // We have to shift left 24 in order to flush out the 1's that appear
+        // when Java treats a value as negative that is cast from a byte to an int.
+        int inBuff =   ( numSigBytes > 0 ? ((source[ srcOffset     ] << 24) >>>  8) : 0 )
+                     | ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
+                     | ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
+
+        switch( numSigBytes )
+        {
+            case 3:
+                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
+                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
+                destination[ destOffset + 3 ] = ALPHABET[ (inBuff       ) & 0x3f ];
+                return destination;
+                
+            case 2:
+                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
+                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+                destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>>  6) & 0x3f ];
+                destination[ destOffset + 3 ] = EQUALS_SIGN;
+                return destination;
+                
+            case 1:
+                destination[ destOffset     ] = ALPHABET[ (inBuff >>> 18)        ];
+                destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+                destination[ destOffset + 2 ] = EQUALS_SIGN;
+                destination[ destOffset + 3 ] = EQUALS_SIGN;
+                return destination;
+                
+            default:
+                return destination;
+        }   // end switch
+    }   // end encode3to4
+    
+    /**
+     * Serializes an object and returns the Base64-encoded
+     * version of that serialized object. If the object
+     * cannot be serialized or there is another error,
+     * the method will return <tt>null</tt>.
+     *
+     * @param serializableObject The object to encode
+     * @return The Base64-encoded object
+     * @since 1.4
+     */
+    public static String encodeObject( java.io.Serializable serializableObject )
+    {
+        return encodeObject( serializableObject, true );
+    }   // end encodeObject
+    
+    /**
+     * Serializes an object and returns the Base64-encoded
+     * version of that serialized object. If the object
+     * cannot be serialized or there is another error,
+     * the method will return <tt>null</tt>.
+     *
+     * @param serializableObject The object to encode
+     * @param breakLines Break lines at 80 characters or less.
+     * @return The Base64-encoded object
+     * @since 1.4
+     */
+    public static String encodeObject( java.io.Serializable serializableObject, boolean breakLines )
+    {
+        java.io.ByteArrayOutputStream baos  = null; 
+        java.io.OutputStream          b64os = null; 
+        java.io.ObjectOutputStream    oos   = null; 
+        
+        try
+        {
+            baos  = new java.io.ByteArrayOutputStream();
+            b64os = new Base64.OutputStream( baos, Base64.ENCODE, breakLines );
+            oos   = new java.io.ObjectOutputStream( b64os );
+            
+            oos.writeObject( serializableObject );
+        }   // end try
+        catch( java.io.IOException e )
+        {
+            e.printStackTrace();
+            return null;
+        }   // end catch
+        finally
+        {
+            try{ oos.close();   } catch( Exception e ){}
+            try{ b64os.close(); } catch( Exception e ){}
+            try{ baos.close();  } catch( Exception e ){}
+        }   // end finally
+        
+        return new String( baos.toByteArray() );
+    }   // end encode
+    
+    
+    /**
+     * Encodes a byte array into Base64 notation.
+     * Equivalen to calling
+     * <code>encodeBytes( source, 0, source.length )</code>
+     *
+     * @param source The data to convert
+     * @since 1.4
+     */
+    public static String encodeBytes( byte[] source )
+    {
+        return encodeBytes( source, true );
+    }   // end encodeBytes
+    
+    /**
+     * Encodes a byte array into Base64 notation.
+     * Equivalen to calling
+     * <code>encodeBytes( source, 0, source.length )</code>
+     *
+     * @param source The data to convert
+     * @param breakLines Break lines at 80 characters or less.
+     * @since 1.4
+     */
+    public static String encodeBytes( byte[] source, boolean breakLines )
+    {   
+        return encodeBytes( source, 0, source.length, breakLines );
+    }   // end encodeBytes
+    
+    
+    /**
+     * Encodes a byte array into Base64 notation.
+     *
+     * @param source The data to convert
+     * @param off Offset in array where conversion should begin
+     * @param len Length of data to convert
+     * @since 1.4
+     */
+    public static String encodeBytes( byte[] source, int off, int len )
+    {
+        return encodeBytes( source, off, len, true );
+    }   // end encodeBytes
+    
+    
+    /**
+     * Encodes a byte array into Base64 notation.
+     *
+     * @param source The data to convert
+     * @param off Offset in array where conversion should begin
+     * @param len Length of data to convert
+     * @param breakLines Break lines at 80 characters or less.
+     * @since 1.4
+     */
+    public static String encodeBytes( byte[] source, int off, int len, boolean breakLines )
+    {
+        int    len43   = len * 4 / 3;
+        byte[] outBuff = new byte[   ( len43 )                      // Main 4:3
+                                   + ( (len % 3) > 0 ? 4 : 0 )      // Account for padding
+                                   + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines      
+        int d = 0;
+        int e = 0;
+        int len2 = len - 2;
+        int lineLength = 0;
+        for( ; d < len2; d+=3, e+=4 )
+        {
+            encode3to4( source, d+off, 3, outBuff, e );
+            
+            lineLength += 4;
+            if( breakLines && lineLength == MAX_LINE_LENGTH )
+            {   
+                outBuff[e+4] = NEW_LINE;
+                e++;
+                lineLength = 0;
+            }   // end if: end of line
+        }   // en dfor: each piece of array
+        
+        if( d < len )
+        {
+            encode3to4( source, d+off, len - d, outBuff, e );
+            e += 4;
+        }   // end if: some padding needed
+        
+        return new String( outBuff, 0, e );
+    }   // end encodeBytes
+    
+    
+    /**
+     * Encodes a string in Base64 notation with line breaks
+     * after every 75 Base64 characters.
+     *
+     * @param s the string to encode
+     * @return the encoded string
+     * @since 1.3
+     */
+    public static String encodeString( String s )
+    {
+        return encodeString( s, true );
+    }   // end encodeString
+    
+    /**
+     * Encodes a string in Base64 notation with line breaks
+     * after every 75 Base64 characters.
+     *
+     * @param s the string to encode
+     * @param breakLines Break lines at 80 characters or less.
+     * @return the encoded string
+     * @since 1.3
+     */
+    public static String encodeString( String s, boolean breakLines )
+    {   
+        return encodeBytes( s.getBytes(), breakLines );
+    }   // end encodeString
+    
+    
+    
+    
+/* ********  D E C O D I N G   M E T H O D S  ******** */
+    
+    
+    /**
+     * Decodes the first four bytes of array <var>fourBytes</var>
+     * and returns an array up to three bytes long with the
+     * decoded values.
+     *
+     * @param fourBytes the array with Base64 content
+     * @return array with decoded values
+     * @since 1.3
+     */
+    private static byte[] decode4to3( byte[] fourBytes )
+    {
+        byte[] outBuff1 = new byte[3];
+        int    count    = decode4to3( fourBytes, 0, outBuff1, 0 );
+        byte[] outBuff2 = new byte[ count ];
+        
+        for( int i = 0; i < count; i++ )
+            outBuff2[i] = outBuff1[i];
+        
+        return outBuff2;
+    }
+    
+    
+    
+    
+    /**
+     * Decodes four bytes from array <var>source</var>
+     * and writes the resulting bytes (up to three of them)
+     * to <var>destination</var>.
+     * The source and destination arrays can be manipulated
+     * anywhere along their length by specifying 
+     * <var>srcOffset</var> and <var>destOffset</var>.
+     * This method does not check to make sure your arrays
+     * are large enough to accomodate <var>srcOffset</var> + 4 for
+     * the <var>source</var> array or <var>destOffset</var> + 3 for
+     * the <var>destination</var> array.
+     * This method returns the actual number of bytes that 
+     * were converted from the Base64 encoding.
+     * 
+     *
+     * @param source the array to convert
+     * @param srcOffset the index where conversion begins
+     * @param destination the array to hold the conversion
+     * @param destOffset the index where output will be put
+     * @return the number of decoded bytes converted
+     * @since 1.3
+     */
+    private static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset )
+    {
+        // Example: Dk==
+        if( source[ srcOffset + 2] == EQUALS_SIGN )
+        {
+            // Two ways to do the same thing. Don't know which way I like best.
+            //int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] << 24 ) >>>  6 )
+            //              | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
+            int outBuff =   ( ( DECODABET[ source[ srcOffset    ] ] & 0xFF ) << 18 )
+                          | ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
+            
+            destination[ destOffset ] = (byte)( outBuff >>> 16 );
+            return 1;
+        }
+        
+        // Example: DkL=
+        else if( source[ srcOffset + 3 ] == EQUALS_SIGN )
+        {
+            // Two ways to do the same thing. Don't know which way I like best.
+            //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
+            //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+            //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
+            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
+                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
+                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6 );
+            
+            destination[ destOffset     ] = (byte)( outBuff >>> 16 );
+            destination[ destOffset + 1 ] = (byte)( outBuff >>>  8 );
+            return 2;
+        }
+        
+        // Example: DkLE
+        else
+        {
+            try{
+            // Two ways to do the same thing. Don't know which way I like best.
+            //int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] << 24 ) >>>  6 )
+            //              | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+            //              | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
+            //              | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
+            int outBuff =   ( ( DECODABET[ source[ srcOffset     ] ] & 0xFF ) << 18 )
+                          | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
+                          | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) <<  6)
+                          | ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF )      );
+
+            
+            destination[ destOffset     ] = (byte)( outBuff >> 16 );
+            destination[ destOffset + 1 ] = (byte)( outBuff >>  8 );
+            destination[ destOffset + 2 ] = (byte)( outBuff       );
+
+            return 3;
+            }catch( Exception e){
+                System.out.println(""+source[srcOffset]+ ": " + ( DECODABET[ source[ srcOffset     ] ]  ) );
+                System.out.println(""+source[srcOffset+1]+  ": " + ( DECODABET[ source[ srcOffset + 1 ] ]  ) );
+                System.out.println(""+source[srcOffset+2]+  ": " + ( DECODABET[ source[ srcOffset + 2 ] ]  ) );
+                System.out.println(""+source[srcOffset+3]+  ": " + ( DECODABET[ source[ srcOffset + 3 ] ]  ) );
+                return -1;
+            }   //e nd catch
+        }
+    }   // end decodeToBytes
+    
+    
+    
+    /**
+     * Decodes data from Base64 notation.
+     *
+     * @param s the string to decode
+     * @return the decoded data
+     * @since 1.4
+     */
+    public static byte[] decode( String s )
+    {   
+        byte[] bytes = s.getBytes();
+        return decode( bytes, 0, bytes.length );
+    }   // end decode
+    
+    
+    /**
+     * Decodes data from Base64 notation and
+     * returns it as a string.
+     * Equivlaent to calling
+     * <code>new String( decode( s ) )</code>
+     *
+     * @param s the strind to decode
+     * @return The data as a string
+     * @since 1.4
+     */
+    public static String decodeToString( String s )
+    {   return new String( decode( s ) );
+    }   // end decodeToString
+    
+    
+    /**
+     * Attempts to decode Base64 data and deserialize a Java
+     * Object within. Returns <tt>null if there was an error.
+     *
+     * @param encodedObject The Base64 data to decode
+     * @return The decoded and deserialized object
+     * @since 1.4
+     */
+    public static Object decodeToObject( String encodedObject )
+    {
+        byte[] objBytes = decode( encodedObject );
+        
+        java.io.ByteArrayInputStream bais = null;
+        java.io.ObjectInputStream    ois  = null;
+        
+        try
+        {
+            bais = new java.io.ByteArrayInputStream( objBytes );
+            ois  = new java.io.ObjectInputStream( bais );
+        
+            return ois.readObject();
+        }   // end try
+        catch( java.io.IOException e )
+        {
+            e.printStackTrace();
+            return null;
+        }   // end catch
+        catch( java.lang.ClassNotFoundException e )
+        {
+            e.printStackTrace();
+            return null;
+        }   // end catch
+        finally
+        {
+            try{ bais.close(); } catch( Exception e ){}
+            try{ ois.close();  } catch( Exception e ){}
+        }   // end finally
+    }   // end decodeObject
+    
+    
+    /**
+     * Decodes Base64 content in byte array format and returns
+     * the decoded byte array.
+     *
+     * @param source The Base64 encoded data
+     * @param off    The offset of where to begin decoding
+     * @param len    The length of characters to decode
+     * @return decoded data
+     * @since 1.3
+     */
+    public static byte[] decode( byte[] source, int off, int len )
+    {
+        int    len34   = len * 3 / 4;
+        byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
+        int    outBuffPosn = 0;
+        
+        byte[] b4        = new byte[4];
+        int    b4Posn    = 0;
+        int    i         = 0;
+        byte   sbiCrop   = 0;
+        byte   sbiDecode = 0;
+        for( i = 0; i < len; i++ )
+        {
+            sbiCrop = (byte)(source[i] & 0x7f); // Only the low seven bits
+            sbiDecode = DECODABET[ sbiCrop ];
+            
+            if( sbiDecode >= WHITE_SPACE_ENC ) // White space, Equals sign or better
+            {
+                if( sbiDecode >= EQUALS_SIGN_ENC )
+                {
+                    b4[ b4Posn++ ] = sbiCrop;
+                    if( b4Posn > 3 )
+                    {
+                        outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn );
+                        b4Posn = 0;
+                        
+                        // If that was the equals sign, break out of 'for' loop
+                        if( sbiCrop == EQUALS_SIGN )
+                            break;
+                    }   // end if: quartet built
+                    
+                }   // end if: equals sign or better
+                
+            }   // end if: white space, equals sign or better
+            else
+            {
+                System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
+                return null;
+            }   // end else: 
+        }   // each input character
+                                   
+        byte[] out = new byte[ outBuffPosn ];
+        System.arraycopy( outBuff, 0, out, 0, outBuffPosn ); 
+        return out;
+    }   // end decode
+    
+    
+    
+    
+    /* ********  I N N E R   C L A S S   I N P U T S T R E A M  ******** */
+    
+    
+    
+    /**
+     * A {@link Base64#InputStream} will read data from another
+     * {@link java.io.InputStream}, given in the constructor,
+     * and encode/decode to/from Base64 notation on the fly.
+     *
+     * @see Base64
+     * @see java.io.FilterInputStream
+     * @since 1.3
+     */
+    public static class InputStream extends java.io.FilterInputStream
+    {
+        private boolean encode;         // Encoding or decoding
+        private int     position;       // Current position in the buffer
+        private byte[]  buffer;         // Small buffer holding converted data
+        private int     bufferLength;   // Length of buffer (3 or 4)
+        private int     numSigBytes;    // Number of meaningful bytes in the buffer
+        private int     lineLength;
+        private boolean breakLines;     // Break lines at less than 80 characters
+        
+        
+        /**
+         * Constructs a {@link Base64#InputStream} in DECODE mode.
+         *
+         * @param in the {@link java.io.InputStream} from which to read data.
+         * @since 1.3
+         */
+        public InputStream( java.io.InputStream in )
+        {   
+            this( in, Base64.DECODE );
+        }   // end constructor
+        
+        
+        /**
+         * Constructs a {@link Base64#InputStream} in
+         * either ENCODE or DECODE mode.
+         *
+         * @param in the {@link java.io.InputStream} from which to read data.
+         * @param encode Conversion direction
+         * @see Base64#ENCODE
+         * @see Base64#DECODE
+         * @since 1.3
+         */
+        public InputStream( java.io.InputStream in, boolean encode )
+        {
+            this( in, encode, true );
+        }   // end constructor
+        
+        
+        /**
+         * Constructs a {@link Base64#InputStream} in
+         * either ENCODE or DECODE mode.
+         *
+         * @param in the {@link java.io.InputStream} from which to read data.
+         * @param encode Conversion direction
+         * @param breakLines Break lines at less than 80 characters.
+         * @see Base64#ENCODE
+         * @see Base64#DECODE
+         * @since 1.3
+         */
+        public InputStream( java.io.InputStream in, boolean encode, boolean breakLines )
+        {   
+            super( in );
+            this.breakLines = breakLines;
+            this.encode = encode;
+            this.bufferLength = encode ? 4 : 3;
+            this.buffer   = new byte[ bufferLength ];
+            this.position = -1;
+            this.lineLength = 0;
+        }   // end constructor
+        
+        /**
+         * Reads enough of the input stream to convert
+         * to/from Base64 and returns the next byte.
+         *
+         * @return next byte
+         * @since 1.3
+         */
+        public int read() throws java.io.IOException 
+        { 
+            // Do we need to get data?
+            if( position < 0 )
+            {
+                if( encode )
+                {
+                    byte[] b3 = new byte[3];
+                    int numBinaryBytes = 0;
+                    for( int i = 0; i < 3; i++ )
+                    {
+                        try
+                        { 
+                            int b = in.read();
+                            
+                            // If end of stream, b is -1.
+                            if( b >= 0 )
+                            {
+                                b3[i] = (byte)b;
+                                numBinaryBytes++;
+                            }   // end if: not end of stream
+                            
+                        }   // end try: read
+                        catch( java.io.IOException e )
+                        {   
+                            // Only a problem if we got no data at all.
+                            if( i == 0 )
+                                throw e;
+                            
+                        }   // end catch
+                    }   // end for: each needed input byte
+                    
+                    if( numBinaryBytes > 0 )
+                    {
+                        encode3to4( b3, 0, numBinaryBytes, buffer, 0 );
+                        position = 0;
+                        numSigBytes = 4;
+                    }   // end if: got data
+                    else
+                    {
+                        return -1;
+                    }   // end else
+                }   // end if: encoding
+                
+                // Else decoding
+                else
+                {
+                    byte[] b4 = new byte[4];
+                    int i = 0;
+                    for( i = 0; i < 4; i++ )
+                    {
+                        // Read four "meaningful" bytes:
+                        int b = 0;
+                        do{ b = in.read(); }
+                        while( b >= 0 && DECODABET[ b & 0x7f ] <= WHITE_SPACE_ENC );
+                        
+                        if( b < 0 )
+                            break; // Reads a -1 if end of stream
+                        
+                        b4[i] = (byte)b;
+                    }   // end for: each needed input byte
+                    
+                    if( i == 4 )
+                    {
+                        numSigBytes = decode4to3( b4, 0, buffer, 0 );
+                        position = 0;
+                    }   // end if: got four characters
+                    else if( i == 0 ){
+                        return -1;
+                    }   // end else if: also padded correctly
+                    else
+                    {
+                        // Must have broken out from above.
+                        throw new java.io.IOException( "Improperly padded Base64 input." );
+                    }   // end 
+                    
+                }   // end else: decode
+            }   // end else: get data
+            
+            // Got data?
+            if( position >= 0 )
+            {
+                // End of relevant data?
+                if( /*!encode &&*/ position >= numSigBytes )
+                    return -1;
+                
+                if( encode && breakLines && lineLength >= MAX_LINE_LENGTH )
+                {
+                    lineLength = 0;
+                    return '\n';
+                }   // end if
+                else
+                {
+                    lineLength++;   // This isn't important when decoding
+                                    // but throwing an extra "if" seems
+                                    // just as wasteful.
+                    
+                    int b = buffer[ position++ ];
+
+                    if( position >= bufferLength )
+                        position = -1;
+
+                    return b & 0xFF; // This is how you "cast" a byte that's
+                                     // intended to be unsigned.
+                }   // end else
+            }   // end if: position >= 0
+            
+            // Else error
+            else
+            {   
+                // When JDK1.4 is more accepted, use an assertion here.
+                throw new java.io.IOException( "Error in Base64 code reading stream." );
+            }   // end else
+        }   // end read
+        
+        
+        /**
+         * Calls {@link #read} repeatedly until the end of stream
+         * is reached or <var>len</var> bytes are read.
+         * Returns number of bytes read into array or -1 if
+         * end of stream is encountered.
+         *
+         * @param dest array to hold values
+         * @param off offset for array
+         * @param len max number of bytes to read into array
+         * @return bytes read into array or -1 if end of stream is encountered.
+         * @since 1.3
+         */
+        public int read( byte[] dest, int off, int len ) throws java.io.IOException
+        {
+            int i;
+            int b;
+            for( i = 0; i < len; i++ )
+            {
+                b = read();
+                
+                //if( b < 0 && i == 0 )
+                //    return -1;
+                
+                if( b >= 0 )
+                    dest[off + i] = (byte)b;
+                else if( i == 0 )
+                    return -1;
+                else
+                    break; // Out of 'for' loop
+            }   // end for: each byte read
+            return i;
+        }   // end read
+        
+    }   // end inner class InputStream
+    
+    
+    
+    
+    
+    
+    /* ********  I N N E R   C L A S S   O U T P U T S T R E A M  ******** */
+    
+    
+    
+    /**
+     * A {@link Base64#OutputStream} will write data to another
+     * {@link java.io.OutputStream}, given in the constructor,
+     * and encode/decode to/from Base64 notation on the fly.
+     *
+     * @see Base64
+     * @see java.io.FilterOutputStream
+     * @since 1.3
+     */
+    public static class OutputStream extends java.io.FilterOutputStream
+    {
+        private boolean encode;
+        private int     position;
+        private byte[]  buffer;
+        private int     bufferLength;
+        private int     lineLength;
+        private boolean breakLines;
+        
+        
+        /**
+         * Constructs a {@link Base64#OutputStream} in ENCODE mode.
+         *
+         * @param out the {@link java.io.OutputStream} to which data will be written.
+         * @since 1.3
+         */
+        public OutputStream( java.io.OutputStream out )
+        {   
+            this( out, Base64.ENCODE );
+        }   // end constructor
+        
+        
+        /**
+         * Constructs a {@link Base64#OutputStream} in
+         * either ENCODE or DECODE mode.
+         *
+         * @param out the {@link java.io.OutputStream} to which data will be written.
+         * @param encode Conversion direction
+         * @see Base64#ENCODE
+         * @see Base64#DECODE
+         * @since 1.3
+         */
+        public OutputStream( java.io.OutputStream out, boolean encode )
+        {
+            this( out, encode, true );
+        }   // end constructor
+        
+        
+        /**
+         * Constructs a {@link Base64#OutputStream} in
+         * either ENCODE or DECODE mode.
+         *
+         * @param out the {@link java.io.OutputStream} to which data will be written.
+         * @param encode Conversion direction
+         * @param breakLines Break lines to be less than 80 characters.
+         * @see Base64#ENCODE
+         * @see Base64#DECODE
+         * @since 1.3
+         */
+        public OutputStream( java.io.OutputStream out, boolean encode, boolean breakLines )
+        {   
+            super( out );
+            this.breakLines   = breakLines;
+            this.encode       = encode;
+            this.bufferLength = encode ? 3 : 4;
+            this.buffer       = new byte[ bufferLength ];
+            this.position     = 0;
+            this.lineLength   = 0;
+        }   // end constructor
+        
+        
+        /**
+         * Writes the byte to the output stream after
+         * converting to/from Base64 notation.
+         * When encoding, bytes are buffered three
+         * at a time before the output stream actually
+         * gets a write() call.
+         * When decoding, bytes are buffered four
+         * at a time.
+         *
+         * @param theByte the byte to write
+         * @since 1.3
+         */
+        public void write(int theByte) throws java.io.IOException 
+        {
+            if( encode )
+            {
+                buffer[ position++ ] = (byte)theByte;
+                if( position >= bufferLength )  // Enough to encode.
+                {   
+                    out.write( Base64.encode3to4( buffer, bufferLength ) );
+                    
+                    lineLength += 4;
+                    if( breakLines && lineLength >= MAX_LINE_LENGTH )
+                    {
+                        out.write( NEW_LINE );
+                        lineLength = 0;
+                    }   // end if: end of line
+                    
+                    position = 0;
+                }   // end if: enough to output
+            }   // end if: encoding
+            
+            // Else, Decoding
+            else 
+            {
+                // Meaningful Base64 character?
+                if( DECODABET[ theByte & 0x7f ] > WHITE_SPACE_ENC )
+                {
+                    buffer[ position++ ] = (byte)theByte;
+                    if( position >= bufferLength )  // Enough to output.
+                    {   
+                        out.write( Base64.decode4to3( buffer ) );
+                        position = 0;
+                    }   // end if: enough to output
+                }   // end if: meaningful base64 character
+                else if( DECODABET[ theByte & 0x7f ] != WHITE_SPACE_ENC )
+                {
+                    throw new java.io.IOException( "Invalid character in Base64 data." );
+                }   // end else: not white space either
+            }   // end else: decoding
+        }   // end write
+        
+        
+        
+        /**
+         * Calls {@link #write} repeatedly until <var>len</var> 
+         * bytes are written.
+         *
+         * @param theBytes array from which to read bytes
+         * @param off offset for array
+         * @param len max number of bytes to read into array
+         * @since 1.3
+         */
+        public void write( byte[] theBytes, int off, int len ) throws java.io.IOException
+        {
+            for( int i = 0; i < len; i++ )
+            {
+                write( theBytes[ off + i ] );
+            }   // end for: each byte written
+            
+        }   // end write
+        
+        
+        /**
+         * Appropriately pads Base64 notation when encoding
+         * or throws an exception if Base64 input is not
+         * properly padded when decoding.
+         *
+         * @since 1.3
+         */
+        public void flush() throws java.io.IOException
+        {
+            super.flush();
+            
+            if( position > 0 )
+            {
+                if( encode )
+                {
+                    out.write( Base64.encode3to4( buffer, position ) );
+                }   // end if: encoding
+                else
+                {   
+                    throw new java.io.IOException( "Base64 input not properly padded." );
+                }   // end else: decoding
+            }   // end if: buffer partially full
+            
+            out.flush();
+        }   // end flush
+        
+        
+        /** 
+         * Flushes and closes stream. 
+         *
+         * @since 1.3
+         */
+        public void close() throws java.io.IOException
+        {
+            super.close();
+            //this.flush();
+            
+            out.close();
+            
+            buffer = null;
+            out    = null;
+        }   // end close
+        
+    }   // end inner class OutputStream
+    
+    
+}   // end class Base64
diff --git a/bindings/corba/java/swordorb.jpx b/bindings/corba/java/swordorb.jpx
new file mode 100644
index 0000000..34642c6
--- /dev/null
+++ b/bindings/corba/java/swordorb.jpx
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--JBuilder XML Project-->
+<project>
+  <property category="debug.0" name="SmartStepRedefineClasses" value="0"/>
+  <property category="debug.0" name="SmartStepSkipStaticInitializers" value="0"/>
+  <property category="debug.0" name="SmartStepSkipSynthetics" value="0"/>
+  <property category="runtime" name="DefaultConfiguration" value="-1"/>
+  <property category="runtime.0" name="BuildTargetOnRun" value="com.borland.jbuilder.build.ProjectBuilder$ProjectBuildAction;make"/>
+  <property category="runtime.0" name="ConfigurationName" value="Untitled Runtime Configuration1"/>
+  <property category="runtime.0" name="RunnableType" value="com.borland.jbuilder.runtime.ApplicationRunner"/>
+  <property category="runtime.0" name="application.class" value="org.crosswire.sword.orb.SwordOrb"/>
+  <property category="serverservices" name="single.server.name" value="Tomcat 4.0"/>
+  <property category="sys" name="AuthorLabel" value="@author"/>
+  <property category="sys" name="BackupPath" value="bak"/>
+  <property category="sys" name="CheckStable" value="1"/>
+  <property category="sys" name="Company" value=""/>
+  <property category="sys" name="CompanyLabel" value="Company:"/>
+  <property category="sys" name="Copyright" value="Copyright (c) 2003"/>
+  <property category="sys" name="CopyrightLabel" value="Copyright:"/>
+  <property category="sys" name="DefaultPath" value="src"/>
+  <property category="sys" name="Description" value=""/>
+  <property category="sys" name="DescriptionLabel" value="Description:"/>
+  <property category="sys" name="DocPath" value="doc"/>
+  <property category="sys" name="ExcludeClassEnabled" value="0"/>
+  <property category="sys" name="IncludeTestPath" value="1"/>
+  <property category="sys" name="InstanceVisibility" value="2"/>
+  <property category="sys" name="JDK" value="java 1.3.1-b24"/>
+  <property category="sys" name="LastTag" value="0"/>
+  <property category="sys" name="Libraries" value="tomcat-common"/>
+  <property category="sys" name="MakeStable" value="0"/>
+  <property category="sys" name="OutPath" value="classes"/>
+  <property category="sys" name="SourcePath" value="src;test"/>
+  <property category="sys" name="TestPath" value="test"/>
+  <property category="sys" name="Title" value=""/>
+  <property category="sys" name="TitleLabel" value="Title:"/>
+  <property category="sys" name="Version" value="1.0"/>
+  <property category="sys" name="VersionLabel" value="@version"/>
+  <property category="sys" name="WorkingDirectory" value="."/>
+  <node name="org.crosswire.sword.orb" type="Package"/>
+  <file path="../swordorb.idl"/>
+</project>
diff --git a/bindings/corba/java/swordorb.jpx.local b/bindings/corba/java/swordorb.jpx.local
new file mode 100644
index 0000000..3303b21
--- /dev/null
+++ b/bindings/corba/java/swordorb.jpx.local
@@ -0,0 +1,10 @@
+debug.Breakpoints.1[0]=1  023 hellomodule.HelloClient32 src/hellomodule/HelloClient.java1  81  10  1  10  1  10  1  0 -1
+debug.Breakpoints.2[0]=1  032 org.crosswire.sword.orb.SwordOrb41 src/org/crosswire/sword/orb/SwordOrb.java2  991  10  1  10  1  10  1  0 -1
+debug.NoTracingClasses.1[0]=16 java.lang.Object1  1 -1
+debug.NoTracingClasses.2[0]=21 java.lang.ClassLoader1  1 -1
+debug.NoTracingClasses.3[0]=16 java.lang.String1  1 -1
+debug.SplitThreadsAndDataView[0]=0
+import.optimize.legacyPropertiesRead[0]=1
+sys.Author[0]=
+sys.DefaultPackage[0]=org.crosswire.sword.orb
+wizard.package.package_history.1[0]=helloworld
diff --git a/bindings/corba/java/testclient b/bindings/corba/java/testclient
new file mode 100755
index 0000000..c7a623f
--- /dev/null
+++ b/bindings/corba/java/testclient
@@ -0,0 +1,6 @@
+#!/bin/sh
+TOMCAT_HOME=/opt/tomcat
+#SERVLET_LIB=${TOMCAT_HOME}/common/lib/servlet-api.jar
+SERVLET_LIB=${TOMCAT_HOME}/lib/servlet-api.jar
+TOMCAT_HOME=/usr/local/tomcat
+java -cp $SERVLET_LIB:classes org.crosswire.sword.orb.SwordOrb $*
diff --git a/bindings/corba/omniorbcpp/Makefile b/bindings/corba/omniorbcpp/Makefile
new file mode 100644
index 0000000..5385fb5
--- /dev/null
+++ b/bindings/corba/omniorbcpp/Makefile
@@ -0,0 +1,46 @@
+all: server testclient
+
+PREFIX = $(shell grep ^prefix ../../../Makefile|cut -f3 -d' ')
+
+#sword stuff
+CXXFLAGS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --cflags sword)
+CFLAGS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --cflags sword)
+LIBS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --libs sword)
+
+#orbit stuff
+CFLAGS += $(shell orbit2-config --cflags)
+CFLAGS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --cflags omniORB4)
+CXXFLAGS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --cflags omniORB4)
+LIBS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --libs omniORB4)
+
+LIBS += -L/usr/lib64 
+
+#comment out for release
+#CXXFLAGS += -g -O0
+#CFLAGS += -g -O0
+#LDFLAGS += -g -O0
+#-----------------------------------------------------------------------------
+
+
+server: server.cpp swordorb-impl.o swordorb-stubs.o 
+	$(CXX) $(CXXFLAGS) -I. -o server server.cpp swordorb-impl.o swordorb-stubs.o $(LIBS)
+
+testclient: testclient.cpp swordorb-impl.cpp swordorb-stubs.o 
+	$(CXX) $(CXXFLAGS) -I. -o testclient testclient.cpp swordorb-stubs.o $(LIBS)
+
+swordorb-impl.o: swordorb.h swordorb-impl.cpp 
+	$(CXX) $(CXXFLAGS) -I. -c swordorb-impl.cpp
+
+
+swordorb.h: ./../swordorb.idl
+	omniidl -bcxx -Wbh=.h -Wbs=-stubs.cpp ./../swordorb.idl
+
+swordorb-stubs.o: swordorb-stubs.cpp
+	$(CC) $(CFLAGS) -I. -c swordorb-stubs.cpp
+
+clean:
+	rm -f *.h *-stubs.cpp *.cc *.o *.c server testclient
+
+install:
+	mkdir -p $(PREFIX)/bin
+	cp -f server $(PREFIX)/bin/swordorbserver
diff --git a/bindings/corba/omniorbcpp/server.cpp b/bindings/corba/omniorbcpp/server.cpp
new file mode 100644
index 0000000..b6f0ff5
--- /dev/null
+++ b/bindings/corba/omniorbcpp/server.cpp
@@ -0,0 +1,122 @@
+/******************************************************************************
+ *
+ *  server.cpp -	
+ *
+ * $Id: server.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include "swordorb-impl.hpp"
+#include <iostream>
+#include <swmgr.h>
+#include "../orbitcpp/webmgr.hpp"
+
+SWConfig *sysConf = 0;
+WebMgr *swordMgr = 0;
+
+class CleanStatics {
+public:
+	CleanStatics() {}
+	~CleanStatics() {
+		if (swordMgr)
+			delete swordMgr;
+
+		if (sysConf)
+			delete sysConf;
+	}
+} cleanStatics;
+
+
+
+
+int main (int argc, char** argv)
+{
+  try {
+
+	for (int i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "-sysConf")) {
+			if ((i+1) < argc)
+				sysConf = new SWConfig(argv[i+1]);
+		}
+	}
+
+	swordMgr = new WebMgr(sysConf);
+
+
+	const char* options[][2] = {
+		{ "nativeCharCodeSet", "UTF-8" }
+	   , { 0, 0 }
+     };
+
+
+    // Initialise the ORB.
+    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB4", options);
+
+    // Obtain a reference to the root POA.
+    CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
+    PortableServer::POA_var poa = PortableServer::POA::_narrow(obj);
+
+    // We allocate the objects on the heap.  Since these are reference
+    // counted objects, they will be deleted by the POA when they are no
+    // longer needed.
+//    swordorb_SWModule_i* myswordorb_SWModule_i = new swordorb_SWModule_i();
+    swordorb_SWMgr_i* myswordorb_SWMgr_i = new swordorb_SWMgr_i(swordMgr);
+
+
+    // Activate the objects.  This tells the POA that the objects are
+    // ready to accept requests.
+ //   PortableServer::ObjectId_var myswordorb_SWModule_iid = poa->activate_object(myswordorb_SWModule_i);
+    PortableServer::ObjectId_var myswordorb_SWMgr_iid = poa->activate_object(myswordorb_SWMgr_i);
+
+
+    {
+      // IDL interface: swordorb::SWMgr
+      CORBA::Object_var ref = myswordorb_SWMgr_i->_this();
+      CORBA::String_var sior(orb->object_to_string(ref));
+      std::cout << (char*)sior << std::endl;
+    }
+
+
+
+    // Obtain a POAManager, and tell the POA to start accepting
+    // requests on its objects.
+    PortableServer::POAManager_var pman = poa->the_POAManager();
+    pman->activate();
+
+    orb->run();
+    orb->destroy();
+  }
+  catch(CORBA::TRANSIENT&) {
+    std::cerr << "Caught system exception TRANSIENT -- unable to contact the "
+         << "server." << std::endl;
+  }
+  catch(CORBA::SystemException& ex) {
+    std::cerr << "Caught a CORBA::" << ex._name() << std::endl;
+  }
+  catch(CORBA::Exception& ex) {
+    std::cerr << "Caught CORBA::Exception: " << ex._name() << std::endl;
+  }
+  catch(omniORB::fatalException& fe) {
+    std::cerr << "Caught omniORB::fatalException:" << std::endl;
+    std::cerr << "  file: " << fe.file() << std::endl;
+    std::cerr << "  line: " << fe.line() << std::endl;
+    std::cerr << "  mesg: " << fe.errmsg() << std::endl;
+  }
+  return 0;
+}
+
diff --git a/bindings/corba/omniorbcpp/swordorb-impl.cpp b/bindings/corba/omniorbcpp/swordorb-impl.cpp
new file mode 100644
index 0000000..a6572ac
--- /dev/null
+++ b/bindings/corba/omniorbcpp/swordorb-impl.cpp
@@ -0,0 +1,536 @@
+/******************************************************************************
+ *
+ *  swordorb-impl.cpp -	omniorb bindings
+ *
+ * $Id: swordorb-impl.cpp 2967 2013-08-18 16:15:46Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <vector>
+
+#include <swordorb-impl.hpp>
+
+#include <swmgr.h>
+#include <installmgr.h>
+#include <versekey.h>
+#include <treekeyidx.h>
+#include <swbuf.h>
+#include <localemgr.h>
+#include <utilstr.h>
+
+
+using sword::VerseKey;
+using sword::SWBuf;
+using sword::TreeKeyIdx;
+
+
+sword::RawText NULLMod("/dev/null", SWNULL, SWNULL);
+
+
+
+
+swordorb_SWModule_i::swordorb_SWModule_i(sword::SWModule *delegate)
+{
+	this->delegate = delegate;
+}
+
+void swordorb_SWModule_i::terminateSearch() {
+	delegate->terminateSearch = true;
+}
+
+swordorb::SearchHitList* swordorb_SWModule_i::search(const char* istr, swordorb::SearchType srchType, ::CORBA::Long flags, const char* scope) {
+	int stype = 2;
+	sword::ListKey lscope;
+	if (srchType == swordorb::REGEX) stype = 0;
+	if (srchType == swordorb::PHRASE) stype = -1;
+	if (srchType == swordorb::MULTIWORD) stype = -2;
+	if (srchType == swordorb::ENTRYATTR) stype = -3;
+	if (srchType == swordorb::LUCENE) stype = -4;
+	sword::ListKey result;
+
+	if ((scope) && (strlen(scope)) > 0) {
+		sword::SWKey *p = delegate->createKey();
+        	sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
+	        if (!parser) {
+        		delete p;
+	                parser = new VerseKey();
+	        }
+	        *parser = delegate->getKeyText();
+		lscope = parser->parseVerseList(scope, *parser, true);
+		result = delegate->search(istr, stype, flags, &lscope);
+                delete parser;
+	}
+	else	result = delegate->search(istr, stype, flags);
+
+	swordorb::SearchHitList *retVal = new swordorb::SearchHitList;
+	int count = 0;
+	for (result = sword::TOP; !result.popError(); result++) count++;
+	retVal->length(count);
+	int i = 0;
+
+	// if we're sorted by score, let's re-sort by verse, because Java can always re-sort by score
+	result = sword::TOP;
+	if ((count) && (long)result.getElement()->userData)
+		result.sort();
+
+	for (result = sword::TOP; !result.popError(); result++) {
+		(*retVal)[i].modName = CORBA::string_dup(assureValidUTF8(delegate->getName()));
+		(*retVal)[i].key = CORBA::string_dup(assureValidUTF8((const char *)result));
+		(*retVal)[i++].score = (long)result.getElement()->userData;
+	}
+
+	return retVal;
+}
+
+::CORBA::Char swordorb_SWModule_i::error() {
+	return delegate->popError();
+}
+
+::CORBA::Long swordorb_SWModule_i::getEntrySize(){
+	return delegate->getEntrySize();
+}
+
+swordorb::StringList* swordorb_SWModule_i::getEntryAttribute(const char* level1, const char* level2, const char* level3, ::CORBA::Boolean filtered){
+	delegate->renderText();	// force parse
+	std::vector<SWBuf> results;
+	swordorb::StringList *retVal = new swordorb::StringList;
+
+	sword::AttributeTypeList &entryAttribs = delegate->getEntryAttributes();
+	sword::AttributeTypeList::iterator i1Start, i1End;
+	sword::AttributeList::iterator i2Start, i2End;
+	sword::AttributeValue::iterator i3Start, i3End;
+
+	if ((level1) && (*level1)) {
+		i1Start = entryAttribs.find(level1);
+		i1End = i1Start;
+		if (i1End != entryAttribs.end())
+			++i1End;
+	}
+	else {
+		i1Start = entryAttribs.begin();
+		i1End   = entryAttribs.end();
+	}
+	for (;i1Start != i1End; ++i1Start) {
+		if ((level2) && (*level2)) {
+			i2Start = i1Start->second.find(level2);
+			i2End = i2Start;
+			if (i2End != i1Start->second.end())
+				++i2End;
+		}
+		else {
+			i2Start = i1Start->second.begin();
+			i2End   = i1Start->second.end();
+		}
+		for (;i2Start != i2End; ++i2Start) {
+			if ((level3) && (*level3)) {
+				i3Start = i2Start->second.find(level3);
+				i3End = i3Start;
+				if (i3End != i2Start->second.end())
+					++i3End;
+			}
+			else {
+				i3Start = i2Start->second.begin();
+				i3End   = i2Start->second.end();
+			}
+			for (;i3Start != i3End; ++i3Start) {
+				results.push_back(i3Start->second);
+			}
+			if (i3Start != i3End)
+				break;
+		}
+		if (i2Start != i2End)
+			break;
+	}
+
+	retVal->length(results.size());
+	for (int i = 0; i < results.size(); i++) {
+		if (filtered) {
+			(*retVal)[i] = CORBA::string_dup(assureValidUTF8(delegate->renderText(results[i].c_str())));
+		}
+		else {
+			(*retVal)[i] = CORBA::string_dup(assureValidUTF8(results[i].c_str()));
+		}
+	}
+
+	return retVal;
+}
+
+swordorb::StringList* swordorb_SWModule_i::parseKeyList(const char* keyText){
+	sword::VerseKey *parser = dynamic_cast<VerseKey *>(delegate->getKey());
+	swordorb::StringList *retVal = new swordorb::StringList;
+	if (parser) {
+		sword::ListKey result;
+		result = parser->parseVerseList(keyText, *parser, true);
+		int count = 0;
+		for (result = sword::TOP; !result.popError(); result++) {
+			count++;
+		}
+		retVal->length(count);
+		count = 0;
+		for (result = sword::TOP; !result.popError(); result++) {
+			(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(VerseKey(result).getOSISRef()));
+		}
+	}
+	else	{
+		retVal->length(1);
+		(*retVal)[0] = CORBA::string_dup(assureValidUTF8(keyText));
+	}
+
+	return retVal;
+}
+
+void swordorb_SWModule_i::setKeyText(const char* keyText) {
+	sword::SWKey *key = delegate->getKey();
+	sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+	if (vkey) {
+		if ((*keyText=='+' || *keyText=='-')) {
+			if (!stricmp(keyText+1, "book")) {
+				vkey->setBook(vkey->getBook() + ((*keyText=='+')?1:-1));
+				return;
+			}
+			else if (!stricmp(keyText+1, "chapter")) {
+				vkey->setChapter(vkey->getChapter() + ((*keyText=='+')?1:-1));
+				return;
+			}
+		}
+		else if (*keyText=='=') {
+			vkey->setIntros(true);
+			vkey->setAutoNormalize(false);
+			vkey->setText(keyText+1);
+			return;
+		}
+	}
+
+	delegate->setKey(keyText);
+}
+
+char* swordorb_SWModule_i::getKeyText(){
+	return CORBA::string_dup(assureValidUTF8((char *)delegate->getKeyText()));
+}
+
+::CORBA::Boolean swordorb_SWModule_i::hasKeyChildren(){
+	sword::SWKey *key = delegate->getKey();
+	bool retVal = false;
+
+	TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+	if (tkey) {
+		retVal = tkey->hasChildren();
+	}
+	return retVal;
+}
+
+
+swordorb::StringList* swordorb_SWModule_i::getKeyChildren(){
+	sword::SWKey *key = delegate->getKey();
+	swordorb::StringList *retVal = new swordorb::StringList;
+	int count = 0;
+
+	sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+	if (vkey) {
+		retVal->length(8);
+		SWBuf num;
+		num.appendFormatted("%d", vkey->getTestament());
+		(*retVal)[0] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getBook());
+		(*retVal)[1] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getChapter());
+		(*retVal)[2] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getVerse());
+		(*retVal)[3] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getChapterMax());
+		(*retVal)[4] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getVerseMax());
+		(*retVal)[5] = CORBA::string_dup(num.c_str());
+		(*retVal)[6] = CORBA::string_dup(vkey->getBookName());
+		(*retVal)[7] = CORBA::string_dup(vkey->getOSISRef());
+	}
+	else {
+		TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+		if (tkey) {
+			if (tkey->firstChild()) {
+				do {
+					count++;
+				}
+				while (tkey->nextSibling());
+				tkey->parent();
+			}
+			retVal->length(count);
+			count = 0;
+			if (tkey->firstChild()) {
+				do {
+					(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(tkey->getLocalName()));
+				}
+				while (tkey->nextSibling());
+				tkey->parent();
+			}
+		}
+	}
+	return retVal;
+}
+
+char* swordorb_SWModule_i::getKeyParent(){
+	sword::SWKey *key = delegate->getKey();
+	SWBuf retVal = "";
+
+	TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+	if (tkey) {
+		if (tkey->parent()) {
+			retVal = tkey->getText();
+		}
+	}
+	return CORBA::string_dup(assureValidUTF8((const char *)retVal));
+}
+
+char* swordorb_SWModule_i::getName(){
+	return CORBA::string_dup(assureValidUTF8((char *)delegate->getName()));
+}
+
+char* swordorb_SWModule_i::getDescription(){
+	return CORBA::string_dup(assureValidUTF8((char *)delegate->getDescription()));
+}
+
+char* swordorb_SWModule_i::getCategory(){
+	SWBuf type = delegate->getType();
+	SWBuf cat = delegate->getConfigEntry("Category");
+	if (cat.length() > 0)
+		type = cat;
+	return CORBA::string_dup(assureValidUTF8((char *)type.c_str()));
+}
+
+void swordorb_SWModule_i::previous(){
+	delegate->decrement();
+}
+
+void swordorb_SWModule_i::next(){
+	delegate->increment();
+}
+
+void swordorb_SWModule_i::begin(){
+	delegate->setPosition(sword::TOP);
+}
+
+char* swordorb_SWModule_i::getStripText(){
+	return CORBA::string_dup(assureValidUTF8((const char *)delegate->stripText()));
+}
+
+char* swordorb_SWModule_i::getRenderText(){
+	return CORBA::string_dup(assureValidUTF8((const char *)delegate->renderText()));
+}
+
+char* swordorb_SWModule_i::getRenderHeader(){
+	return CORBA::string_dup(assureValidUTF8(((const char *)(delegate->getRenderHeader() ? delegate->getRenderHeader():""))));
+}
+
+char* swordorb_SWModule_i::getRawEntry(){
+	return CORBA::string_dup(assureValidUTF8((const char *)delegate->getRawEntry()));
+}
+
+void swordorb_SWModule_i::setRawEntry(const char* entryBuffer){
+	delegate->setEntry(entryBuffer);
+}
+
+char* swordorb_SWModule_i::getConfigEntry(const char* key){
+	return CORBA::string_dup(assureValidUTF8(((char *)delegate->getConfigEntry(key)) ? (char *)delegate->getConfigEntry(key):SWNULL));
+}
+
+void swordorb_SWModule_i::deleteSearchFramework(){
+	delegate->deleteSearchFramework(); 
+}
+
+::CORBA::Boolean swordorb_SWModule_i::hasSearchFramework(){
+	return (delegate->hasSearchFramework() && delegate->isSearchOptimallySupported("God", -4, 0, 0));
+}
+
+
+// -------------------------------------------------------------------------
+
+
+swordorb_SWMgr_i::swordorb_SWMgr_i(WebMgr *delegate)
+{
+	this->delegate = delegate;
+}
+
+//   Methods corresponding to IDL attributes and operations
+swordorb::ModInfoList* swordorb_SWMgr_i::getModInfoList() {
+
+	swordorb::ModInfoList *milist = new swordorb::ModInfoList;
+	sword::SWModule *module = 0;
+
+	int size = 0;
+	for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
+		if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey"))))
+			size++;
+	}
+
+//	if (size > 183) size = 183;
+	milist->length(size);
+	int i = 0;
+	for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
+		module = it->second;
+		if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) {
+			SWBuf type = module->getType();
+			SWBuf cat = module->getConfigEntry("Category");
+			if (cat.length() > 0)
+				type = cat;
+			(*milist)[i].name = CORBA::string_dup(assureValidUTF8(module->getName()));
+			(*milist)[i].description = CORBA::string_dup(assureValidUTF8(module->getDescription()));
+			(*milist)[i].category = CORBA::string_dup(assureValidUTF8(type.c_str()));
+			(*milist)[i++].language = CORBA::string_dup(assureValidUTF8(module->getLanguage()));
+			if (i >= size) break;
+		}
+	}
+	return milist;
+}
+
+swordorb::SWModule_ptr swordorb_SWMgr_i::getModuleByName(const char* name){
+	SWModuleMap::iterator it;
+	swordorb::SWModule_ptr retVal;
+	sword::SWModule *mod = delegate->Modules[name];
+	it = moduleImpls.find((mod)?name:SWNULL);
+	if (it == moduleImpls.end()) {
+		moduleImpls[(mod)?name:SWNULL] = new swordorb_SWModule_i((mod)?mod:&NULLMod);
+		it = moduleImpls.find((mod)?name:SWNULL);
+	}
+	if (it != moduleImpls.end()) {
+		retVal = it->second->_this();
+	}
+	return swordorb::SWModule::_duplicate(retVal);
+}
+
+char* swordorb_SWMgr_i::getPrefixPath(){
+	return CORBA::string_dup(assureValidUTF8(delegate->prefixPath));
+}
+
+char* swordorb_SWMgr_i::getConfigPath(){
+	return CORBA::string_dup(assureValidUTF8(delegate->configPath));
+}
+
+void swordorb_SWMgr_i::setGlobalOption(const char* option, const char* value){
+	delegate->setGlobalOption(option, value);
+}
+
+char* swordorb_SWMgr_i::getGlobalOption(const char* option){
+	return CORBA::string_dup(assureValidUTF8((char *)delegate->getGlobalOption(option)));
+}
+
+char* swordorb_SWMgr_i::getGlobalOptionTip(const char* option){
+	return CORBA::string_dup(assureValidUTF8((char *)delegate->getGlobalOptionTip(option)));
+}
+
+char* swordorb_SWMgr_i::filterText(const char* filterName, const char* text){
+	SWBuf buf = text;
+	delegate->setGlobalOption("Greek Accents", "Off");
+	char errStatus = delegate->filterText(filterName, buf);
+	return CORBA::string_dup(assureValidUTF8((char *)buf.c_str()));
+}
+
+swordorb::StringList* swordorb_SWMgr_i::getGlobalOptions(){
+	sword::StringList options = delegate->getGlobalOptions();
+	swordorb::StringList *retVal = new swordorb::StringList;
+	int count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str()));
+	}
+	return retVal;
+}
+
+swordorb::StringList* swordorb_SWMgr_i::getGlobalOptionValues(const char* option){
+	sword::StringList options = delegate->getGlobalOptionValues(option);
+	swordorb::StringList *retVal = new swordorb::StringList;
+	int count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str()));
+	}
+	return retVal;
+}
+
+void swordorb_SWMgr_i::setCipherKey(const char* modName, const char* key){
+	delegate->setCipherKey(modName, key);
+}
+
+void swordorb_SWMgr_i::terminate(){
+	exit(0);
+}
+
+::CORBA::Boolean swordorb_SWMgr_i::testConnection(){
+	return true;
+}
+
+void swordorb_SWMgr_i::setJavascript(::CORBA::Boolean val){
+	delegate->setJavascript(val);
+}
+
+swordorb::StringList* swordorb_SWMgr_i::getAvailableLocales(){
+	sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
+	swordorb::StringList *retVal = new swordorb::StringList;
+	int count = 0;
+	for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->c_str()));
+	}
+	return retVal;
+}
+
+void swordorb_SWMgr_i::setDefaultLocale(const char* name){
+	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(name);
+}
+
+
+char* swordorb_SWMgr_i::translate(const char* text, const char* localeName) {
+	return CORBA::string_dup(LocaleMgr::getSystemLocaleMgr()->translate(text, localeName));
+}
+
+swordorb::StringList* swordorb_SWMgr_i::getRepos() {
+	swordorb::StringList *retVal = new swordorb::StringList;
+	int count = 0;
+	sword::InstallMgr *installMgr = new sword::InstallMgr();
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->second->caption.c_str()));
+	}
+	delete installMgr;
+	return retVal;
+}
+
+// Don't call me yet
+swordorb::_objref_SWMgr* swordorb_SWMgr_i::getShadowMgr(const char*) {
+	return 0;
+}
diff --git a/bindings/corba/omniorbcpp/swordorb-impl.hpp b/bindings/corba/omniorbcpp/swordorb-impl.hpp
new file mode 100644
index 0000000..fc9468a
--- /dev/null
+++ b/bindings/corba/omniorbcpp/swordorb-impl.hpp
@@ -0,0 +1,124 @@
+/******************************************************************************
+ *
+ *  swordorb-impl.hpp -	
+ *
+ * $Id: swordorb-impl.hpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWORDORB_IMPL_H
+#define SWORDORB_IMPL_H
+
+#include "swordorb.h"
+#include "../orbitcpp/webmgr.hpp"
+#include <swmodule.h>
+#include <swmgr.h>
+#include <rawtext.h>
+#include <string>
+#include <map>
+
+
+static const char *SWNULL = "<SWNULL>";
+extern sword::RawText NULLMod;
+
+
+class swordorb_SWModule_i: public POA_swordorb::SWModule {
+private:
+	sword::SWModule *delegate;
+  // Make sure all instances are built on the heap by making the
+  // destructor non-public
+  //virtual ~swordorb_SWModule_i();
+public:
+  // standard constructor
+  swordorb_SWModule_i(sword::SWModule *delegate);
+  virtual ~swordorb_SWModule_i() {}
+
+  // methods corresponding to defined IDL attributes and operations
+  void terminateSearch();
+  swordorb::SearchHitList* search(const char* istr, swordorb::SearchType srchType, ::CORBA::Long flags, const char* scope);
+  ::CORBA::Char error();
+  ::CORBA::Long getEntrySize();
+  swordorb::StringList* getEntryAttribute(const char* level1, const char* level2, const char* level3, ::CORBA::Boolean filtered);
+  swordorb::StringList* parseKeyList(const char* keyText);
+  void setKeyText(const char* key);
+  char* getKeyText();
+  ::CORBA::Boolean hasKeyChildren();
+  swordorb::StringList* getKeyChildren();
+  char* getKeyParent();
+  char* getName();
+  char* getDescription();
+  char* getCategory();
+  void previous();
+  void next();
+  void begin();
+  char* getStripText();
+  char* getRenderText();
+  char* getRenderHeader();
+  char* getRawEntry();
+  void setRawEntry(const char* entryBuffer);
+  char* getConfigEntry(const char* key);
+  char* translate(const char* text, const char* localeName);
+  void deleteSearchFramework();
+  ::CORBA::Boolean hasSearchFramework();
+
+};
+
+
+// ----------------------------------------------------------------------------------
+
+typedef std::map<std::string, swordorb_SWModule_i *> SWModuleMap;
+
+// ----------------------------------------------------------------------------------
+
+
+class swordorb_SWMgr_i: public POA_swordorb::SWMgr {
+private:
+	WebMgr *delegate;
+	SWModuleMap moduleImpls;
+  // Make sure all instances are built on the heap by making the
+  // destructor non-public
+  //virtual ~swordorb_SWMgr_i();
+public:
+  // standard constructor
+  swordorb_SWMgr_i(WebMgr *delegate);
+  virtual ~swordorb_SWMgr_i() {};
+
+  // methods corresponding to defined IDL attributes and operations
+  swordorb::ModInfoList* getModInfoList();
+  swordorb::SWModule_ptr getModuleByName(const char* name);
+  char* getPrefixPath();
+  char* getConfigPath();
+  void setGlobalOption(const char* option, const char* value);
+  char* getGlobalOption(const char* option);
+  char* getGlobalOptionTip(const char* option);
+  char* filterText(const char* filterName, const char* text);
+  swordorb::StringList* getGlobalOptions();
+  swordorb::StringList* getGlobalOptionValues(const char* option);
+  void setCipherKey(const char* modName, const char* key);
+  void terminate();
+  ::CORBA::Boolean testConnection();
+  void setJavascript(::CORBA::Boolean val);
+  swordorb::StringList* getAvailableLocales();
+  void setDefaultLocale(const char* name);
+  char* translate(const char* text, const char* localeName);
+  swordorb::StringList* getRepos();
+  swordorb::_objref_SWMgr* getShadowMgr(const char*);
+
+};
+
+
+#endif
diff --git a/bindings/corba/omniorbcpp/testclient.cpp b/bindings/corba/omniorbcpp/testclient.cpp
new file mode 100644
index 0000000..4adff99
--- /dev/null
+++ b/bindings/corba/omniorbcpp/testclient.cpp
@@ -0,0 +1,119 @@
+/******************************************************************************
+ *
+ *  testclient.cpp -	
+ *
+ * $Id: testclient.cpp 2973 2013-09-10 11:53:43Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include "swordorb.h"
+#include <iostream>
+#include <swbuf.h>
+	
+int main (int argc, char *argv[])
+{
+	if (argc != 2)
+	{
+		std::cerr << "Usage:" << std::endl
+				  << "  " << argv[0] << " IOR" << std::endl
+				  << std::endl;
+		return -1;
+	}
+	
+	try {
+
+
+		const char* options[][2] = {
+			{ "nativeCharCodeSet", "UTF-8" }
+		   , { 0, 0 }
+		};
+
+
+	     // Initialise the ORB.
+	     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB4", options);
+//	     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "omniORB4");
+
+		// Get a reference to the server from the IOR passed on the
+		// command line
+		CORBA::Object_var obj = orb->string_to_object(argv[1]);
+		swordorb::SWMgr_var mgr = swordorb::SWMgr::_narrow(obj);
+
+		swordorb::SWModule_ptr module;
+		swordorb::ModInfoList *modInfoList;
+
+		std::cout << "Connected: "  << mgr->testConnection() << "\n";
+		std::cout << "PrefixPath: " << mgr->getPrefixPath() << "\n";
+		std::cout << "ConfigPath: " << mgr->getConfigPath() << "\n";
+		modInfoList = mgr->getModInfoList();
+		std::cout << "sequence length: " << modInfoList->length() << "\n";
+		for (int i = 0; i < modInfoList->length(); i++) {
+			std::cout << (*modInfoList)[i].name << ": " << (*modInfoList)[i].category << ": " << (*modInfoList)[i].language << "\n";
+/*
+			if (!strncmp((*modInfoList)[i].category, "Bibl", 4)) {
+				module = mgr->getModuleByName((*modInfoList)[i].name);
+				module->setKeyText("jas1:19");
+				std::cout << module->getRenderText() << "\n";
+			}
+			std::cout << "\n";
+*/
+		}
+/*
+		swordorb::StringList *localeNames = mgr->getAvailableLocales();
+		for (int i = 0; i < localeNames->length(); i++) {
+			std::cout << (*localeNames)[i] << "\n";
+		}
+*/
+		std::cout << "filterText: " << mgr->filterText("OSISPlain", "this should be <abbr type=\"nomSac\"><hi rend=\"ol\">overlined</hi></abbr>") << "\n";
+		mgr->setDefaultLocale("de");
+		mgr->setJavascript(true);
+		mgr->setGlobalOption("Textual Variants", "Secondary Reading");
+		mgr->setGlobalOption("Footnotes", "On");
+		module = mgr->getModuleByName("NASB");
+/*
+		module->setKeyText("jas.1.19");
+		swordorb::StringList *attr = module->getEntryAttribute("Footnote", "", "body", true);
+		std::cout << "length: " << attr->length() << "\n";
+		for (int i = 0; i < attr->length(); i++) {
+			std::cout << (*attr)[i] << "\n";
+		}
+*/
+		int i = 0;
+		for (module->setKeyText("gen.2.8"); !module->error() && i < 3; module->next(), i++) {
+			std::cout << "KeyText: " << module->getKeyText() << "\n";
+			std::cout << "Text: " << module->getRenderText() << "\n";
+		}
+		std::cout << "RenderHeader:\n" << module->getRenderHeader() << "\n";
+/*
+		swordorb::SearchHitList *searchResults;
+		bool lucene = module->hasSearchFramework();
+		searchResults = module->search("David", (lucene)?swordorb::LUCENE:swordorb::MULTIWORD, 0, "");
+		for (int i = 0; i < searchResults->length(); i++) {
+			std::cout << (*searchResults)[i].key << "\n";
+		}
+
+		mgr->setGlobalOption("Greek Accents", "Off");
+		std::cout << "\nFiltered text: " << mgr->filterText("Greek Accents", "� θεὸς") << "\n";
+*/
+
+		
+	} catch(const CORBA::Exception& ex) {
+		std::cout << "exception: " << ex._name() << std::endl;
+	}
+	
+	return 0;
+}
diff --git a/bindings/corba/orbitcpp/Makefile b/bindings/corba/orbitcpp/Makefile
new file mode 100644
index 0000000..c7a48a7
--- /dev/null
+++ b/bindings/corba/orbitcpp/Makefile
@@ -0,0 +1,66 @@
+all: server testclient
+
+PREFIX = $(shell grep ^prefix ../../../Makefile|cut -f3 -d' ')
+
+#sword stuff
+CXXFLAGS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --cflags sword)
+CFLAGS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --cflags sword)
+LIBS += $(shell PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig pkg-config --libs sword)
+
+#orbit stuff
+CFLAGS += $(shell orbit2-config --cflags)
+CXXFLAGS += $(shell orbit2-config --cflags)
+LIBS += $(shell orbit2-config --libs)
+
+#orbitcpp stuff-- this is silly.  Is there really NOT a way to derive this?
+CFLAGS += -I/usr/include/orbitcpp-2.0
+CXXFLAGS += -I/usr/include/orbitcpp-2.0
+LIBS += -L/usr/lib64 -lORBit-2-cpp
+
+#comment out for release
+#CXXFLAGS += -g -O0
+#CFLAGS += -g -O0
+#LDFLAGS += -g -O0
+#-----------------------------------------------------------------------------
+
+
+server: swordorb-common.o server.cpp swordorb-impl.o swordorb-cpp.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o swordorb-cpp.o
+	$(CXX) $(CXXFLAGS) -I. -o server server.cpp swordorb-impl.o swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o $(LIBS)
+
+testclient: testclient.cpp swordorb-impl.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o
+	$(CXX) $(CXXFLAGS) -I. -o testclient testclient.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o $(LIBS)
+
+swordorb-cpp.o: swordorb-cpp.cc
+	$(CXX) $(CXXFLAGS) -I. -c swordorb-cpp.cc
+
+swordorb-impl.o: swordorb-impl.cpp
+	$(CXX) $(CXXFLAGS) -I. -c swordorb-impl.cpp
+
+swordorb-common.o: swordorb-common.c
+	$(CC) $(CFLAGS) -I. -c swordorb-common.c
+
+swordorb-common.c: ./../swordorb.idl
+	orbit-idl-2 -l c ./../swordorb.idl
+	orbit-idl-2 -l cpp ./../swordorb.idl
+
+swordorb-cpp-common.o: swordorb-cpp-common.cc
+	$(CXX) $(CXXFLAGS) -I. -c swordorb-cpp-common.cc
+
+swordorb-stubs.o: swordorb-stubs.c
+	$(CC) $(CFLAGS) -I. -c swordorb-stubs.c
+
+swordorb-cpp-stubs.o: swordorb-cpp-stubs.cc
+	$(CXX) $(CXXFLAGS) -I. -c swordorb-cpp-stubs.cc
+
+swordorb-skels.o: swordorb-skels.c
+	$(CC) $(CFLAGS) -I. -c swordorb-skels.c
+
+swordorb-cpp-skels.o: swordorb-cpp-skels.cc
+	$(CXX) $(CXXFLAGS) -I. -c swordorb-cpp-skels.cc
+
+clean:
+	rm -f *.h *.cc *.o *.c server testclient
+
+install:
+	mkdir -p $(PREFIX)/bin
+	cp -f server $(PREFIX)/bin/swordorbserver
diff --git a/bindings/corba/orbitcpp/Makefile.am b/bindings/corba/orbitcpp/Makefile.am
new file mode 100644
index 0000000..2d36ddf
--- /dev/null
+++ b/bindings/corba/orbitcpp/Makefile.am
@@ -0,0 +1,40 @@
+bin_PROGRAMS = swordorbserver
+
+noinst_PROGRAMS = testclient
+
+swordorbserver_SOURCES =  server.cpp
+swordorbserver_SOURCES += swordorb-common.c
+swordorbserver_SOURCES += swordorb-impl.cpp
+swordorbserver_SOURCES += swordorb-cpp-common.cc
+swordorbserver_SOURCES += swordorb-stubs.c
+swordorbserver_SOURCES += swordorb-cpp-stubs.cc
+swordorbserver_SOURCES += swordorb-skels.c
+swordorbserver_SOURCES += swordorb-cpp-skels.cc
+
+swordorbserver_CFLAGS = $(SWORD_CFLAGS) $(ORBIT_CFLAGS)
+swordorbserver_CXXFLAGS = $(SWORD_CFLAGS) $(ORBIT_CXXFLAGS)
+swordorbserver_LDADD = $(SWORD_LIBS) $(ORBIT_LIBS)
+
+testclient_SOURCES =  testclient.cpp
+testclient_SOURCES += swordorb-common.c
+testclient_SOURCES += swordorb-impl.cpp
+testclient_SOURCES += swordorb-cpp-common.cc
+testclient_SOURCES += swordorb-stubs.c
+testclient_SOURCES += swordorb-cpp-stubs.cc
+testclient_SOURCES += swordorb-skels.c
+testclient_SOURCES += swordorb-cpp-skels.cc
+
+testclient_CFLAGS = $(SWORD_CFLAGS) $(ORBIT_CFLAGS)
+testclient_CXXFLAGS = $(SWORD_CFLAGS) $(ORBIT_CXXFLAGS)
+testclient_LDADD = $(SWORD_LIBS) $(ORBIT_LIBS)
+
+BUILT_SOURCES = swordorb-common.c
+
+swordorb-common.c: $(top_srcdir)/corba/swordorb.idl
+	orbit-idl-2 -l c $(top_srcdir)/corba/swordorb.idl
+	orbit-idl-2 -l cpp $(top_srcdir)/corba/swordorb.idl
+
+clean:
+	rm -f *.h *.cc *.o *.c server testclient
+
+
diff --git a/bindings/corba/orbitcpp/server.cpp b/bindings/corba/orbitcpp/server.cpp
new file mode 100644
index 0000000..4f86500
--- /dev/null
+++ b/bindings/corba/orbitcpp/server.cpp
@@ -0,0 +1,92 @@
+/******************************************************************************
+ *
+ *  server.cpp -	
+ *
+ * $Id: server.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include "swordorb-impl.hpp"
+#include <iostream>
+#include <swmgr.h>
+#include "webmgr.hpp"
+
+SWConfig *sysConf = 0;
+WebMgr *swordMgr = 0;
+
+class CleanStatics {
+public:
+	CleanStatics() {}
+	~CleanStatics() {
+		if (swordMgr)
+			delete swordMgr;
+
+		if (sysConf)
+			delete sysConf;
+	}
+} cleanStatics;
+
+
+
+
+int main (int argc, char* argv[]) {
+  try {
+
+	for (int i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "-sysConf")) {
+			if ((i+1) < argc)
+				sysConf = new SWConfig(argv[i+1]);
+		}
+	}
+
+	swordMgr = new WebMgr(sysConf);
+
+ 	  // Initialize the CORBA orb
+ 	  CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv);
+	
+ 	  // Get the root POA
+ 	  CORBA::Object_var pfobj = orb->resolve_initial_references("RootPOA");
+
+ 	  PortableServer::POA_var rootPOA =
+         PortableServer::POA::_narrow(pfobj);
+
+ 	  // Activate the root POA's manager
+ 	  PortableServer::POAManager_var mgr = rootPOA->the_POAManager();
+
+ 	  mgr->activate();
+
+ 	  // Create a Servant and explicitly create a CORBA object
+ 	  swordorb::SWMgr_impl servant(swordMgr);
+ 	  CORBA::Object_var object = servant._this();
+
+ 	  // Here we get the IOR for the Hello server object.
+ 	  // Our "client" will use the IOR to find the object to connect to
+ 	  CORBA::String_var ref = orb->object_to_string( object );
+
+ 	  // print out the IOR
+ 	  std::cout << ref << std::endl;
+
+ 	  // run the server event loop
+ 	  orb->run();
+  }
+  catch(const CORBA::Exception& ex)
+  {
+    std::cout << "Exception caught." << std::endl;
+  }
+
+}
diff --git a/bindings/corba/orbitcpp/swordorb-impl.cpp b/bindings/corba/orbitcpp/swordorb-impl.cpp
new file mode 100644
index 0000000..4d40727
--- /dev/null
+++ b/bindings/corba/orbitcpp/swordorb-impl.cpp
@@ -0,0 +1,443 @@
+/******************************************************************************
+ *
+ *  swordorb-impl.cpp -	
+ *
+ * $Id: swordorb-impl.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include "swordorb-impl.hpp"
+#include <iostream>
+#include <swmgr.h>
+#include <installmgr.h>
+#include <versekey.h>
+#include <treekeyidx.h>
+#include <swbuf.h>
+#include <localemgr.h>
+#include <vector>
+
+/*
+char* swordorb::SWModule_impl::helloWorld(const char* greeting) throw(CORBA::SystemException) {
+  std::cout << "Server: Greeting was \"" << greeting << "\"" << std::endl;
+  return CORBA::string_dup("Hello client, from server!");
+}
+*/
+
+using sword::VerseKey;
+using sword::SWBuf;
+using sword::TreeKeyIdx;
+
+namespace swordorb {
+
+sword::RawText NULLMod("/dev/null", SWNULL, SWNULL);
+
+ModInfoList *SWMgr_impl::getModInfoList() throw(CORBA::SystemException) {
+
+	ModInfoList *milist = new ModInfoList;
+	sword::SWModule *module = 0;
+	int size = 0;
+	for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
+		if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey"))))
+			size++;
+	}
+	milist->length(size);
+	int i = 0;
+	for (sword::ModMap::iterator it = delegate->Modules.begin(); it != delegate->Modules.end(); ++it) {
+		module = it->second;
+		if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) {
+			SWBuf type = module->Type();
+			SWBuf cat = module->getConfigEntry("Category");
+			if (cat.length() > 0)
+				type = cat;
+			(*milist)[i].name = CORBA::string_dup(module->Name());
+			(*milist)[i].description = CORBA::string_dup(module->Description());
+			(*milist)[i].category = CORBA::string_dup(type.c_str());
+			(*milist)[i++].language = CORBA::string_dup(module->Lang());
+		}
+	}
+	return milist;
+}
+
+
+
+SWModule_ptr SWMgr_impl::getModuleByName(const char *name) throw(CORBA::SystemException) {
+	SWModuleMap::iterator it;
+	SWModule_ptr retVal;
+	sword::SWModule *mod = delegate->Modules[name];
+	it = moduleImpls.find((mod)?name:SWNULL);
+	if (it == moduleImpls.end()) {
+		moduleImpls[(mod)?name:SWNULL] = new SWModule_impl((mod)?mod:&NULLMod);
+		it = moduleImpls.find((mod)?name:SWNULL);
+	}
+	if (it != moduleImpls.end()) {
+		retVal = it->second->_this();
+	}
+	return ::swordorb::SWModule::_duplicate(retVal);
+}
+
+
+StringList *SWMgr_impl::getGlobalOptions() throw(CORBA::SystemException) {
+	sword::StringList options = delegate->getGlobalOptions();
+	StringList *retVal = new StringList;
+	int count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(it->c_str());
+	}
+	return retVal;
+}
+
+
+StringList *SWMgr_impl::getGlobalOptionValues(const char *option) throw(CORBA::SystemException) {
+	sword::StringList options = delegate->getGlobalOptionValues(option);
+	StringList *retVal = new StringList;
+	int count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(it->c_str());
+	}
+	return retVal;
+}
+
+void SWMgr_impl::terminate() throw(CORBA::SystemException) {
+	exit(0);
+}
+
+
+CORBA::Boolean SWMgr_impl::testConnection() throw(CORBA::SystemException) {
+	return true;
+}
+
+void SWMgr_impl::setJavascript(CORBA::Boolean val) throw(CORBA::SystemException) {
+	delegate->setJavascript(val);
+}
+
+char *SWMgr_impl::filterText(const char *filterName, const char *text) throw(CORBA::SystemException) {
+	SWBuf buf = text;
+	delegate->setGlobalOption("Greek Accents", "Off");
+	char errStatus = delegate->filterText(filterName, buf);
+	return CORBA::string_dup((char *)buf.c_str());
+}
+
+
+
+
+// ------------------------------------------------------------------------
+
+
+
+
+char *SWModule_impl::getCategory() throw(CORBA::SystemException) {
+	SWBuf type = delegate->Type();
+	SWBuf cat = delegate->getConfigEntry("Category");
+	if (cat.length() > 0)
+		type = cat;
+	return CORBA::string_dup((char *)type.c_str());
+}
+
+
+StringList *SWModule_impl::parseKeyList(const char *keyText) throw(CORBA::SystemException) {
+	sword::VerseKey *parser = dynamic_cast<VerseKey *>(delegate->getKey());
+	StringList *retVal = new StringList;
+	if (parser) {
+		sword::ListKey result;
+		result = parser->ParseVerseList(keyText, *parser, true);
+		int count = 0;
+		for (result = sword::TOP; !result.Error(); result++) {
+			count++;
+		}
+		retVal->length(count);
+		count = 0;
+		for (result = sword::TOP; !result.Error(); result++) {
+			(*retVal)[count++] = CORBA::string_dup((const char *)result);
+		}
+	}
+	else	{
+		retVal->length(1);
+		(*retVal)[0] = CORBA::string_dup(keyText);
+	}
+
+	return retVal;
+}
+
+
+SearchHitList *SWModule_impl::search(const char *istr, SearchType searchType, CORBA::Long flags, const char *scope) throw(CORBA::SystemException) {
+	int stype = 2;
+	sword::ListKey lscope;
+	if (searchType == REGEX) stype = 0;
+	if (searchType == PHRASE) stype = -1;
+	if (searchType == MULTIWORD) stype = -2;
+	if (searchType == ENTRYATTR) stype = -3;
+	if (searchType == LUCENE) stype = -4;
+	sword::ListKey result;
+
+	if ((scope) && (strlen(scope)) > 0) {
+		sword::SWKey *p = delegate->CreateKey();
+        	sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
+	        if (!parser) {
+        		delete p;
+	                parser = new VerseKey();
+	        }
+	        *parser = delegate->getKeyText();
+		lscope = parser->ParseVerseList(scope, *parser, true);
+		result = delegate->Search(istr, stype, flags, &lscope);
+                delete parser;
+	}
+	else	result = delegate->Search(istr, stype, flags);
+
+	SearchHitList *retVal = new SearchHitList;
+	int count = 0;
+	for (result = sword::TOP; !result.Error(); result++) count++;
+	retVal->length(count);
+	int i = 0;
+
+	// if we're sorted by score, let's re-sort by verse, because Java can always re-sort by score
+	result = sword::TOP;
+	if ((count) && (long)result.getElement()->userData)
+		result.sort();
+
+	for (result = sword::TOP; !result.Error(); result++) {
+		(*retVal)[i].modName = CORBA::string_dup(delegate->Name());
+		(*retVal)[i].key = CORBA::string_dup((const char *)result);
+		(*retVal)[i++].score = (long)result.getElement()->userData;
+	}
+
+	return retVal;
+}
+
+
+StringList *SWModule_impl::getEntryAttribute(const char *level1, const char *level2, const char *level3, CORBA::Boolean filtered) throw(CORBA::SystemException) {
+	delegate->RenderText();	// force parse
+	std::vector<SWBuf> results;
+	StringList *retVal = new StringList;
+
+	sword::AttributeTypeList &entryAttribs = delegate->getEntryAttributes();
+	sword::AttributeTypeList::iterator i1Start, i1End;
+	sword::AttributeList::iterator i2Start, i2End;
+	sword::AttributeValue::iterator i3Start, i3End;
+
+	if ((level1) && (*level1)) {
+		i1Start = entryAttribs.find(level1);
+		i1End = i1Start;
+		if (i1End != entryAttribs.end())
+			++i1End;
+	}
+	else {
+		i1Start = entryAttribs.begin();
+		i1End   = entryAttribs.end();
+	}
+	for (;i1Start != i1End; ++i1Start) {
+		if ((level2) && (*level2)) {
+			i2Start = i1Start->second.find(level2);
+			i2End = i2Start;
+			if (i2End != i1Start->second.end())
+				++i2End;
+		}
+		else {
+			i2Start = i1Start->second.begin();
+			i2End   = i1Start->second.end();
+		}
+		for (;i2Start != i2End; ++i2Start) {
+			if ((level3) && (*level3)) {
+				i3Start = i2Start->second.find(level3);
+				i3End = i3Start;
+				if (i3End != i2Start->second.end())
+					++i3End;
+			}
+			else {
+				i3Start = i2Start->second.begin();
+				i3End   = i2Start->second.end();
+			}
+			for (;i3Start != i3End; ++i3Start) {
+				results.push_back(i3Start->second);
+			}
+			if (i3Start != i3End)
+				break;
+		}
+		if (i2Start != i2End)
+			break;
+	}
+
+	retVal->length(results.size());
+	for (int i = 0; i < results.size(); i++) {
+		if (filtered) {
+			(*retVal)[i] = CORBA::string_dup(delegate->RenderText(results[i].c_str()));
+		}
+		else {
+			(*retVal)[i] = CORBA::string_dup(results[i].c_str());
+		}
+	}
+
+	return retVal;
+}
+
+void SWModule_impl::setKeyText(const char *keyText) throw(CORBA::SystemException) {
+	sword::SWKey *key = delegate->getKey();
+	sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+	if (vkey) {
+		if ((*keyText=='+' || *keyText=='-')) {
+			if (!stricmp(keyText+1, "book")) {
+				vkey->setBook(vkey->getBook() + ((*keyText=='+')?1:-1));
+				return;
+			}
+			else if (!stricmp(keyText+1, "chapter")) {
+				vkey->setChapter(vkey->getChapter() + ((*keyText=='+')?1:-1));
+				return;
+			}
+		}
+		else if (*keyText=='=') {
+			vkey->Headings(true);
+			vkey->AutoNormalize(false);
+			vkey->setText(keyText+1);
+			return;
+		}
+	}
+
+	delegate->KeyText(keyText);
+}
+
+StringList *SWModule_impl::getKeyChildren() throw(CORBA::SystemException) {
+	sword::SWKey *key = delegate->getKey();
+	StringList *retVal = new StringList;
+	int count = 0;
+
+	sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+	if (vkey) {
+		retVal->length(7);
+		SWBuf num;
+		num.appendFormatted("%d", vkey->getTestament());
+		(*retVal)[0] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getBook());
+		(*retVal)[1] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getChapter());
+		(*retVal)[2] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getVerse());
+		(*retVal)[3] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getChapterMax());
+		(*retVal)[4] = CORBA::string_dup(num.c_str());
+		num = "";
+		num.appendFormatted("%d", vkey->getVerseMax());
+		(*retVal)[5] = CORBA::string_dup(num.c_str());
+		(*retVal)[6] = CORBA::string_dup(vkey->getBookName());
+	}
+	else {
+		TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+		if (tkey) {
+			if (tkey->firstChild()) {
+				do {
+					count++;
+				}
+				while (tkey->nextSibling());
+				tkey->parent();
+			}
+			retVal->length(count);
+			count = 0;
+			if (tkey->firstChild()) {
+				do {
+					(*retVal)[count++] = CORBA::string_dup(tkey->getLocalName());
+				}
+				while (tkey->nextSibling());
+				tkey->parent();
+			}
+		}
+	}
+	return retVal;
+}
+
+CORBA::Boolean SWModule_impl::hasKeyChildren() throw(CORBA::SystemException) {
+	sword::SWKey *key = delegate->getKey();
+	bool retVal = false;
+
+	TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+	if (tkey) {
+		retVal = tkey->hasChildren();
+	}
+	return retVal;
+}
+
+
+char *SWModule_impl::getKeyParent() throw(CORBA::SystemException) {
+	sword::SWKey *key = delegate->getKey();
+	SWBuf retVal = "";
+
+	TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+	if (tkey) {
+		if (tkey->parent()) {
+			retVal = tkey->getText();
+		}
+	}
+	return CORBA::string_dup((const char *)retVal);
+}
+
+
+StringList *SWMgr_impl::getAvailableLocales() throw(CORBA::SystemException) {
+	sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
+	StringList *retVal = new StringList;
+	int count = 0;
+	for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(it->c_str());
+	}
+	return retVal;
+}
+
+
+void SWMgr_impl::setDefaultLocale(const char *name) throw(CORBA::SystemException) {
+	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(name);
+}
+
+char* SWMgr_impl::translate(const char* text, const char* localeName) throw(CORBA::SystemException) {
+	return CORBA::string_dup(LocaleMgr::getSystemLocaleMgr()->translate(text, localeName));
+}
+
+swordorb::StringList *SWMgr_impl::getRepos() throw(CORBA::SystemException) {
+	swordorb::StringList *retVal = new swordorb::StringList;
+	int count = 0;
+	sword::InstallMgr *installMgr = new sword::InstallMgr();
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
+		count++;
+	}
+	retVal->length(count);
+	count = 0;
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
+		(*retVal)[count++] = CORBA::string_dup(assureValidUTF8(it->second->caption.c_str()));
+	}
+	delete installMgr;
+	return retVal;
+}
+
+// Don't call me yet
+swordorb::SWMgr_ptr SWMgr_impl::getShadowMgr (CORBA_char const *repoName) throw (CORBA::SystemException) {
+	return 0;
+}
+}
diff --git a/bindings/corba/orbitcpp/swordorb-impl.hpp b/bindings/corba/orbitcpp/swordorb-impl.hpp
new file mode 100644
index 0000000..4960f9a
--- /dev/null
+++ b/bindings/corba/orbitcpp/swordorb-impl.hpp
@@ -0,0 +1,110 @@
+/******************************************************************************
+ *
+ *  swordorb-impl.hpp -	
+ *
+ * $Id: swordorb-impl.hpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef _ORBIT_CPP_IDL_sword_IMPL_HH
+#define _ORBIT_CPP_IDL_sword_IMPL_HH
+
+#include "swordorb-cpp-skels.h"
+#include "webmgr.hpp"
+#include <swmodule.h>
+#include <swmgr.h>
+#include <rawtext.h>
+#include <map>
+
+
+namespace swordorb {
+
+static const char *SWNULL = "<SWNULL>";
+extern sword::RawText NULLMod;
+
+
+//Inherit from abstract Skeleton:
+class SWModule_impl : public POA_swordorb::SWModule {
+	sword::SWModule *delegate;
+public:
+	SWModule_impl(sword::SWModule *delegate)  { this->delegate = delegate; }
+
+	SearchHitList *search(const char *istr, SearchType searchType, CORBA::Long flags, const char *scope) throw(CORBA::SystemException);
+	StringList *parseKeyList(const char *keyText) throw(CORBA::SystemException);
+	void  terminateSearch() throw(CORBA::SystemException) { delegate->terminateSearch = true; }
+	char  error() throw(CORBA::SystemException) { return delegate->Error(); }
+	CORBA::Long getEntrySize() throw(CORBA::SystemException) { return delegate->getEntrySize(); }
+	void  setKeyText(const char *key) throw(CORBA::SystemException);
+	char *getKeyText() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->KeyText()); }
+	StringList *getKeyChildren() throw(CORBA::SystemException);
+	char *getKeyParent() throw(CORBA::SystemException);
+	CORBA::Boolean hasKeyChildren() throw(CORBA::SystemException);
+	char *getName() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->Name()); }
+	char *getDescription() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->Description()); }
+	char *getCategory() throw(CORBA::SystemException);
+	void  previous() throw(CORBA::SystemException) { delegate->decrement(); }
+	void  next() throw(CORBA::SystemException) { delegate->increment(); }
+	void  begin() throw(CORBA::SystemException) { delegate->setPosition(sword::TOP); }
+	char *getStripText() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->StripText()); }
+	StringList *getEntryAttribute(const char *level1, const char *level2, const char *level3, CORBA::Boolean filtered) throw(CORBA::SystemException);
+	char *getRenderText() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->RenderText()); }
+	char *getRenderHeader() throw(CORBA::SystemException) { return CORBA::string_dup((char *)((delegate->getRenderHeader()?delegate->getRenderHeader():""))); }
+	char *getRawEntry() throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->getRawEntry()); }
+	void  setRawEntry(const char *entryBuffer) throw(CORBA::SystemException) { delegate->setEntry(entryBuffer); }
+	char *getConfigEntry(const char *key) throw(CORBA::SystemException) { return CORBA::string_dup(((char *)delegate->getConfigEntry(key)) ? (char *)delegate->getConfigEntry(key):SWNULL); }
+	void deleteSearchFramework() throw(CORBA::SystemException) { delegate->deleteSearchFramework(); }
+	CORBA::Boolean hasSearchFramework() throw(CORBA::SystemException) { return (delegate->hasSearchFramework() && delegate->isSearchOptimallySupported("God", -4, 0, 0)); }
+
+};
+
+// ----------------------------------------------------------------------------------
+
+typedef std::map<std::string, SWModule_impl *> SWModuleMap;
+
+// ----------------------------------------------------------------------------------
+
+class SWMgr_impl : public POA_swordorb::SWMgr {
+	WebMgr *delegate;
+	SWModuleMap moduleImpls;
+public:
+	SWMgr_impl(WebMgr *delegate)  { this->delegate = delegate; }
+
+	ModInfoList *getModInfoList() throw(CORBA::SystemException);
+	SWModule_ptr getModuleByName(const char *name) throw(CORBA::SystemException);
+	char *filterText(const char *filterName, const char *text) throw(CORBA::SystemException);
+	char *getPrefixPath() throw(CORBA::SystemException) { return CORBA::string_dup(delegate->prefixPath); }
+	char *getConfigPath() throw(CORBA::SystemException) { return CORBA::string_dup(delegate->configPath); }
+	void  setGlobalOption(const char *option, const char *value) throw(CORBA::SystemException) { delegate->setGlobalOption(option, value); }
+	char *getGlobalOption(const char *option) throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->getGlobalOption(option)); }
+	char *getGlobalOptionTip(const char *option) throw(CORBA::SystemException) { return CORBA::string_dup((char *)delegate->getGlobalOptionTip(option)); }
+	StringList *getGlobalOptions() throw(CORBA::SystemException);
+	StringList *getGlobalOptionValues(const char *option) throw(CORBA::SystemException);
+	void     setCipherKey(const char *modName, const char *key) throw(CORBA::SystemException) { delegate->setCipherKey(modName, key); }
+	void     terminate() throw(CORBA::SystemException);
+	CORBA::Boolean     testConnection() throw(CORBA::SystemException);
+	void setJavascript(CORBA::Boolean) throw(CORBA::SystemException);
+	StringList *getAvailableLocales() throw(CORBA::SystemException);
+	void setDefaultLocale(const char *name) throw(CORBA::SystemException);
+	char *translate(const char *text, const char *locale) throw(CORBA::SystemException);
+	StringList *getRepos() throw(CORBA::SystemException);
+	swordorb::SWMgr_ptr getShadowMgr (CORBA_char const *repoName) throw (CORBA::SystemException);
+
+};
+};
+
+
+#endif
diff --git a/bindings/corba/orbitcpp/testclient.cpp b/bindings/corba/orbitcpp/testclient.cpp
new file mode 100644
index 0000000..c1b358a
--- /dev/null
+++ b/bindings/corba/orbitcpp/testclient.cpp
@@ -0,0 +1,108 @@
+/******************************************************************************
+ *
+ *  testclient.cpp -	
+ *
+ * $Id: testclient.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ * 	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include "swordorb-cpp-stubs.h"
+#include "swordorb-cpp-common.h"
+#include <iostream>
+#include <swbuf.h>
+	
+int main (int argc, char *argv[])
+{
+	if (argc != 2)
+	{
+		std::cerr << "Usage:" << std::endl
+				  << "  " << argv[0] << " IOR" << std::endl
+				  << std::endl;
+		return -1;
+	}
+	
+	try
+	{
+		// Initialize ORBit
+		CORBA::ORB_ptr orb = CORBA::ORB_init(argc, argv, "orbit-local-orb");
+
+		// Get a reference to the server from the IOR passed on the
+		// command line
+		CORBA::Object_var obj = orb->string_to_object(argv[1]);
+		swordorb::SWMgr_var mgr = swordorb::SWMgr::_narrow(obj);
+
+		swordorb::SWModule_ptr module;
+		swordorb::ModInfoList *modInfoList;
+
+		std::cout << "Connected: "  << mgr->testConnection() << "\n";
+		std::cout << "PrefixPath: " << mgr->getPrefixPath() << "\n";
+		std::cout << "ConfigPath: " << mgr->getConfigPath() << "\n";
+//		modInfoList = mgr->getModInfoList();
+//		std::cout << "sequence length: " << modInfoList->length() << "\n";
+/*
+		for (int i = 0; i < modInfoList->length(); i++) {
+			std::cout << (*modInfoList)[i].name << ": " << (*modInfoList)[i].category << ": " << (*modInfoList)[i].language << "\n";
+			if (!strncmp((*modInfoList)[i].category, "Bibl", 4)) {
+				module = mgr->getModuleByName((*modInfoList)[i].name);
+				module->setKeyText("jas1:19");
+				std::cout << module->getRenderText() << "\n";
+			}
+			std::cout << "\n";
+		}
+		swordorb::StringList *localeNames = mgr->getAvailableLocales();
+		for (int i = 0; i < localeNames->length(); i++) {
+			std::cout << (*localeNames)[i] << "\n";
+		}
+		mgr->setDefaultLocale("de");
+*/
+		mgr->setJavascript(true);
+		mgr->setGlobalOption("Textual Variants", "Secondary Reading");
+		mgr->setGlobalOption("Footnotes", "On");
+		module = mgr->getModuleByName("NASB");
+/*
+		module->setKeyText("jas.1.19");
+		swordorb::StringList *attr = module->getEntryAttribute("Footnote", "", "body", true);
+		std::cout << "length: " << attr->length() << "\n";
+		for (int i = 0; i < attr->length(); i++) {
+			std::cout << (*attr)[i] << "\n";
+		}
+*/
+		int i = 0;
+		for (module->setKeyText("gen.2.8"); !module->error() && i < 3; module->next(), i++) {
+			std::cout << "KeyText: " << module->getKeyText() << "\n";
+			std::cout << "Text: " << module->getRenderText() << "\n";
+		}
+/*
+		swordorb::SearchHitList *searchResults;
+		bool lucene = module->hasSearchFramework();
+		searchResults = module->search("David", (lucene)?swordorb::LUCENE:swordorb::MULTIWORD, 0, "");
+		for (int i = 0; i < searchResults->length(); i++) {
+			std::cout << (*searchResults)[i].key << "\n";
+		}
+
+		mgr->setGlobalOption("Greek Accents", "Off");
+		std::cout << "\nFiltered text: " << mgr->filterText("Greek Accents", "� θεὸς") << "\n";
+*/
+
+		
+	} catch(const CORBA::Exception& ex) {
+		std::cout << "Exception caught. Maybe the server is not running, or the IOR is wrong." << std::endl;
+	}
+	
+	return 0;
+}
diff --git a/bindings/corba/orbitcpp/webmgr.hpp b/bindings/corba/orbitcpp/webmgr.hpp
new file mode 100644
index 0000000..048882c
--- /dev/null
+++ b/bindings/corba/orbitcpp/webmgr.hpp
@@ -0,0 +1,119 @@
+/******************************************************************************
+ *
+ *  webmgr.cpp -	
+ *
+ * $Id: webmgr.hpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef WEBMGR_HPP
+#define WEBMGR_HPP
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <swfilter.h>
+#include <markupfiltmgr.h>
+#include <osiswordjs.h>
+#include <thmlwordjs.h>
+#include <gbfwordjs.h>
+
+using namespace sword;
+
+class WebMgr : public SWMgr {
+	OSISWordJS *osisWordJS;
+	ThMLWordJS *thmlWordJS;
+	GBFWordJS *gbfWordJS;
+	SWModule *defaultGreekLex;
+	SWModule *defaultHebLex;
+	SWModule *defaultGreekParse;
+	SWModule *defaultHebParse;
+
+public:
+	WebMgr(SWConfig *sysConf) : SWMgr(0, sysConf, false, new MarkupFilterMgr(FMT_WEBIF)) {
+		defaultGreekLex   = 0;
+		defaultHebLex     = 0;
+		defaultGreekParse = 0;
+		defaultHebParse   = 0;
+
+		osisWordJS = new OSISWordJS();
+		thmlWordJS = new ThMLWordJS();
+		gbfWordJS = new GBFWordJS();
+		Load();
+		osisWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse);
+		thmlWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse);
+		gbfWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse);
+		osisWordJS->setMgr(this);
+		thmlWordJS->setMgr(this);
+		gbfWordJS->setMgr(this);
+		setGlobalOption("Textual Variants", "Primary Reading");
+	}
+
+	~WebMgr() {
+		delete osisWordJS;
+		delete thmlWordJS;
+		delete gbfWordJS;
+	}
+
+
+	void AddGlobalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
+
+		// ThML word stuff needs to process before strongs strip
+		if (module->getMarkup() == FMT_THML) {
+			module->addOptionFilter(thmlWordJS);
+		}
+
+		if (module->getMarkup() == FMT_GBF) {
+			module->addOptionFilter(gbfWordJS);
+		}
+
+		// add other module filters
+		SWMgr::AddGlobalOptions(module, section, start, end);
+
+		// add our special filters
+		if (module->getConfig().has("Feature", "GreekDef")) {
+			defaultGreekLex = module;
+		}
+		if (module->getConfig().has("Feature", "HebrewDef")) {
+			defaultHebLex = module;
+		}
+		if (module->getConfig().has("Feature", "GreekParse")) {
+			defaultGreekParse = module;
+		}
+		if (module->getConfig().has("Feature", "HebrewParse")) {
+			defaultHebParse = module;
+		}
+		if (module->getConfig().has("GlobalOptionFilter", "ThMLVariants")) {
+			OptionFilterMap::iterator it = optionFilters.find("ThMLVariants");
+			if (it != optionFilters.end()) {
+				module->addOptionFilter((*it).second);	// add filter to module and option as a valid option
+			}
+		}
+
+		if (module->getMarkup() == FMT_OSIS) {
+			module->addOptionFilter(osisWordJS);
+		}
+	}
+
+
+	void setJavascript(bool val) {
+		osisWordJS->setOptionValue((val)?"On":"Off");
+		thmlWordJS->setOptionValue((val)?"On":"Off");
+		gbfWordJS->setOptionValue((val)?"On":"Off");
+	}
+};
+
+#endif
diff --git a/bindings/corba/swordorb.idl b/bindings/corba/swordorb.idl
new file mode 100644
index 0000000..e72bf56
--- /dev/null
+++ b/bindings/corba/swordorb.idl
@@ -0,0 +1,127 @@
+/******************************************************************************
+ *	sword.idl	- This file contains a simple idl for accessing sword
+ *
+ *
+ * Copyright 2009 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#ifndef SWORDORB_IDL
+#define SWORDORB_IDL
+
+module swordorb {
+
+typedef sequence<string> StringList;
+
+struct ModInfo {
+	string name;
+	string description;
+	string category;
+	string language;
+};
+
+typedef sequence<ModInfo> ModInfoList;
+
+struct SearchHit {
+	string modName;
+	string key;
+	long   score;
+};
+
+typedef sequence<SearchHit> SearchHitList;
+//-----------------------------------------------------------------
+// SWModule methods
+
+	enum SearchType {
+		REGEX,
+		PHRASE,
+		MULTIWORD,
+		ENTRYATTR,
+		LUCENE
+	};
+
+
+interface SWModule {
+	void          terminateSearch();
+	SearchHitList search(in string istr, in SearchType srchType, in long flags, in string scope);
+	char          error();
+	long          getEntrySize();
+	StringList    getEntryAttribute(in string level1, in string level2, in string level3, in boolean filtered);
+	StringList    parseKeyList(in string keyText);
+
+	// Special values handled for VerseKey modules:
+	//	[+-][book|chapter]	- [de|in]crement by chapter or book
+	//	(e.g.	"+chapter" will increment the VerseKey 1 chapter)
+	//	[=][key]		- position absolutely and don't normalize
+	//	(e.g.	"jn.1.0" for John Chapter 1 intro; "jn.0.0" For Book of John Intro)
+	void          setKeyText(in string key);
+
+	string        getKeyText();
+	boolean       hasKeyChildren();
+
+	// This method returns child nodes for a genbook,
+	// but has special handling if called on a VerseKey module:
+	//  [0..7] [testament, book, chapter, verse, chapterMax, verseMax, bookName, osisRef]
+	StringList    getKeyChildren();
+
+	string        getKeyParent();
+	string        getName();
+	string        getDescription();
+	string        getCategory();
+	void          previous();
+	void          next();
+	void          begin();
+	string        getStripText();
+	string        getRenderText();
+	// CSS styles associated with this text
+	string        getRenderHeader();
+	string        getRawEntry();
+	void          setRawEntry(in string entryBuffer);
+	string        getConfigEntry(in string key);
+	void          deleteSearchFramework();
+	boolean       hasSearchFramework();
+};
+
+
+//-----------------------------------------------------------------
+// SWMgr methods
+//
+interface SWMgr {
+	ModInfoList getModInfoList();
+	SWModule    getModuleByName(in string name);
+	string      getPrefixPath();
+	string      getConfigPath();
+	void        setGlobalOption(in string option, in string value);
+	string      getGlobalOption(in string option);
+	string      getGlobalOptionTip(in string option);
+	string      filterText(in string filterName, in string text);
+	StringList  getGlobalOptions();
+	StringList  getGlobalOptionValues(in string option);
+	void        setCipherKey(in string modName, in string key);
+	void        terminate();
+	boolean     testConnection();
+	void        setJavascript(in boolean val);
+	StringList  getAvailableLocales();
+	void        setDefaultLocale(in string name);
+	string      translate(in string text, in string localeName);
+	StringList  getRepos();
+	SWMgr	  getShadowMgr(in string repoName);
+};
+
+};
+
+#endif
diff --git a/bindings/flatapi.cpp b/bindings/flatapi.cpp
new file mode 100644
index 0000000..55cf083
--- /dev/null
+++ b/bindings/flatapi.cpp
@@ -0,0 +1,381 @@
+/******************************************************************************
+ *
+ *  flatapi.cpp -	This file contains an api usable by non-C++
+ *			environments
+ *
+ * $Id: flatapi.cpp 2921 2013-07-28 17:21:44Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+ 
+#include <rawtext.h>
+#include <rawcom.h>
+#include <rawld.h>
+#include <strkey.h>
+#include <listkey.h>
+#include <versekey.h>
+#include <swmgr.h>
+#include <markupfiltmgr.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+extern "C" {
+#include "flatapi.h"
+}
+
+typedef struct {
+	ModMap::iterator it;
+//	void *it;
+	ModMap::iterator end;
+//	void *end;
+} ModItType;
+
+
+//-----------------------------------------------------------------
+// SWMgr methods
+//
+extern "C" SWHANDLE SWMgr_new(char filterType) { 
+	return (SWHANDLE) new SWMgr(new MarkupFilterMgr(filterType));
+}
+
+
+// SWConfig *, SWConfig *, bool, SWFilterMgr *
+SWHANDLE SWMgr_newEx(SWHANDLE hiconfig, SWHANDLE hisysconfig, char autoload, SWHANDLE hfilterMgr) {
+	SWConfig *iconfig = (SWConfig *)hiconfig;
+	SWConfig *isysconfig = (SWConfig *)hisysconfig;
+	SWFilterMgr *filterMgr = (SWFilterMgr *)hfilterMgr;
+	
+	return (SWHANDLE) new SWMgr(iconfig, isysconfig, autoload, filterMgr);
+}
+
+
+void SWMgr_delete(SWHANDLE hmgr) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	if (mgr)
+		delete mgr;
+}
+
+
+SWHANDLE SWMgr_getConfig(SWHANDLE hmgr) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	return (mgr) ? (SWHANDLE)mgr->config : 0;
+}
+
+
+SWHANDLE SWMgr_getModulesIterator(SWHANDLE hmgr) {
+	static ModItType it;
+
+	SWMgr *mgr = (SWMgr *)hmgr;
+	if (mgr) {
+	    it.it = mgr->Modules.begin();
+	    it.end = mgr->Modules.end();
+	}
+	return (SWHANDLE)&it;
+}
+
+
+SWHANDLE SWMgr_getModuleByName(SWHANDLE hmgr, const char *name) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	return (mgr) ? (SWHANDLE) mgr->Modules[name] : 0;
+}
+
+
+const char *SWMgr_getPrefixPath(SWHANDLE hmgr) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	return (mgr) ? mgr->prefixPath : 0;
+}
+
+
+const char *SWMgr_getConfigPath(SWHANDLE hmgr) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	return (mgr) ? mgr->configPath : 0;
+}
+
+
+void SWMgr_setGlobalOption(SWHANDLE hmgr, const char *option, const char *value) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	if (mgr)
+		mgr->setGlobalOption(option, value);
+}
+
+
+const char *SWMgr_getGlobalOption(SWHANDLE hmgr, const char *option) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	return (mgr) ? (const char *)mgr->getGlobalOption(option) : 0;
+}
+
+
+const char *SWMgr_getGlobalOptionTip(SWHANDLE hmgr, const char *option) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	return (mgr) ? (const char *)mgr->getGlobalOptionTip(option) : 0;
+}
+
+
+// ret: forward_iterator
+SWHANDLE SWMgr_getGlobalOptionsIterator(SWHANDLE hmgr) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	static StringList::iterator it;
+	static StringList optionslist;
+	if (mgr) {
+		optionslist = mgr->getGlobalOptions();
+		it = optionslist.begin();
+	}
+	return (SWHANDLE)&it;
+}
+
+
+// ret: forward_iterator
+SWHANDLE SWMgr_getGlobalOptionValuesIterator(SWHANDLE hmgr, const char *option) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	static StringList::iterator it;
+	
+	if (mgr) 
+		it = mgr->getGlobalOptionValues(option).begin();
+	return (SWHANDLE)&it;
+}
+
+
+void SWMgr_setCipherKey(SWHANDLE hmgr, const char *modName, const char *key) {
+	SWMgr *mgr = (SWMgr *)hmgr;
+	if (mgr)
+		mgr->setCipherKey(modName, key);
+}
+
+
+//-----------------------------------------------------------------
+// SWModule methods
+
+// static void nullPercent (char percent, void *userData);
+void SWModule_terminateSearch(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	if (module)
+		module->terminateSearch = true;
+}
+
+// SWModule (const const char *imodname = 0, const const char *imoddesc = 0, SWDisplay * idisp = 0, const char *imodtype = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* modlang = 0);
+// virtual ~ SWModule ();
+
+SWHANDLE SWModule_doSearch(SWHANDLE hmodule, const char *searchString, int type, int params ,void (*percent) (char, void *), void *percentUserData) {
+	
+	static ListKey results;
+	SWKey * scope = 0;
+	SWModule *module = (SWModule *)hmodule;
+	if (!module) 	
+		return -1;
+	
+	results.clear();
+	results = module->search(searchString, type, params, scope, 0, percent, (void *) &percentUserData);
+	
+	return (SWHANDLE)&results;
+}
+  /** Gets and clears error status
+  *
+  * @return error status
+  */
+char SWModule_error(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (module) ? module->popError() : 0;
+}
+
+
+int SWModule_getEntrySize(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (module) ? module->getEntrySize() : 0;
+}
+
+
+void SWModule_setKeyText(SWHANDLE hmodule, const char *key) {
+	SWModule *module = (SWModule *)hmodule;
+	if (module)
+		module->setKey(key);
+}
+
+//  virtual char setKey (const SWKey &ikey);
+//  virtual SWKey & Key () const {
+  
+const char *SWModule_getKeyText(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (const char *)((module) ? module->getKeyText() : 0);
+}
+  
+
+//  virtual char Display ();
+//  virtual SWDisplay *Disp (SWDisplay * idisp = 0);
+  
+const char *SWModule_getName(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (const char *)((module) ? module->getName() : 0);
+}
+  
+
+const char *SWModule_getDescription(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (const char *)((module) ? module->getDescription() : 0);
+}
+
+
+const char *SWModule_getType(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (const char *)((module) ? module->getType() : 0);
+}
+
+
+void SWModule_previous(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	if (module)
+		(*module)--;
+}
+
+
+void SWModule_next(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	if (module)
+		(*module)++;
+}
+
+
+void SWModule_begin(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	if (module)
+		(*module) = TOP;
+}
+  
+  
+const char *SWModule_getStripText(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (const char *)((module) ? module->stripText() : 0);
+}
+  
+  
+const char *SWModule_getRenderText(SWHANDLE hmodule) {
+	SWModule *module = (SWModule *)hmodule;
+	return (const char *)((module) ? module->renderText().c_str() : 0);
+}
+
+const char *SWModule_getEntryAttributes(SWHANDLE hmodule, const char *level1, const char *level2, const char *level3) {
+	SWModule *module = (SWModule *)hmodule;
+	static SWBuf retval;	
+	module->renderText();                 	
+	retval = module->getEntryAttributes()[level1][level2][level3].c_str();
+	return (retval.length()) ? (const char*)retval.c_str() : NULL;
+}
+
+const char *SWModule_getPreverseHeader(SWHANDLE hmodule, const char *key, int pvHeading) {
+	SWModule *module = (SWModule *)hmodule;
+	static SWBuf preverseHeading;
+	char buf[12];	
+	sprintf(buf, "%i", pvHeading);  
+	module->setKey(key);	
+	module->renderText();                 	
+	preverseHeading = module->getEntryAttributes()["Heading"]["Preverse"][buf].c_str();
+	return (preverseHeading.length()) ? (const char*)preverseHeading.c_str() : NULL;
+}
+
+const char *SWModule_getFootnoteType(SWHANDLE hmodule, const char *key, const char *note) {
+	SWModule *module = (SWModule *)hmodule;
+	static SWBuf type;
+	module->popError();
+	module->setKey(key);
+	module->renderText();	
+	type = module->getEntryAttributes()["Footnote"][note]["type"].c_str();
+	return (type) ? (const char*)type.c_str() : NULL;
+}
+
+const char *SWModule_getFootnoteBody(SWHANDLE hmodule, const char *key, const char *note) {
+	SWModule *module = (SWModule *)hmodule;
+	static SWBuf body;
+	module->popError();
+	module->setKey(key);
+	module->renderText();
+	body = module->getEntryAttributes()["Footnote"][note]["body"].c_str();
+	SWKey *keybuf = module->getKey();;
+	module->renderFilter(body, keybuf);
+	return (body) ? (const char*)body.c_str() : NULL;
+}
+
+const char *SWModule_getFootnoteRefList(SWHANDLE hmodule, const char *key, const char *note) {
+	SWModule *module = (SWModule *)hmodule;
+	static SWBuf refList;
+	module->popError();
+	module->setKey(key);
+	module->renderText();	
+	refList = module->getEntryAttributes()["Footnote"][note]["refList"].c_str();
+	return (refList) ? (const char*)refList.c_str() : NULL;
+}
+
+
+
+SWHANDLE listkey_getVerselistIterator(const char *list, const char *key, const char *v11n) {
+	VerseKey versekey;
+        versekey.setVersificationSystem(v11n);
+	static ListKey verses;
+	
+	versekey.setText(key);
+	verses.clear();
+	verses = versekey.parseVerseList(list, versekey);
+	return (SWHANDLE)&verses;
+}
+
+//-----------------------------------------------------------------
+// stringlist_iterator methods
+
+void stringlist_iterator_next(SWHANDLE hsli) {
+	StringList::iterator *sli = (StringList::iterator *)hsli;
+	(*sli)++;
+}
+
+
+const char *stringlist_iterator_val(SWHANDLE hsli) {
+	StringList::iterator *sli = (StringList::iterator *)hsli;
+	return (const char *)(*sli)->c_str();
+}
+
+
+
+//-----------------------------------------------------------------
+// listkey_iterator methods
+
+void listkey_iterator_next(SWHANDLE lki) {
+	ListKey *lk = (ListKey*)lki;
+	(*lk)++;
+}
+
+
+const char *listkey_iterator_val(SWHANDLE lki) {	
+	ListKey *lk = (ListKey*)lki;
+	if(!lk->popError())
+		return (const char *) lk->getText();
+	return NULL;
+}
+
+
+
+//-----------------------------------------------------------------
+// modmap methods
+
+void ModList_iterator_next(SWHANDLE hmmi) {
+	ModItType *it  = (ModItType *)hmmi;
+	if (it->it != it->end)
+		it->it++;
+}
+
+
+SWHANDLE ModList_iterator_val(SWHANDLE hmmi) {
+	ModItType *it  = (ModItType *)hmmi;
+	return (it->it != it->end) ? (SWHANDLE)it->it->second : 0;
+}
diff --git a/bindings/gsoap/Makefile b/bindings/gsoap/Makefile
new file mode 100644
index 0000000..639634a
--- /dev/null
+++ b/bindings/gsoap/Makefile
@@ -0,0 +1,12 @@
+all: gsoapsword testclient
+
+gsoapsword:	gsoapsword.h gsoapsword.cpp stdsoap.o
+	./soapcpp gsoapsword.h
+	g++ -g -ggdb -I/usr/include/sword -I./include -o gsoapsword gsoapsword.cpp yoyo.cpp stdsoap.o soapC.cpp soapServer.cpp -lsword -lz
+
+testclient:	gsoapsword.h testclient.cpp stdsoap.o
+	./soapcpp gsoapsword.h
+	g++ -I./include -o testclient testclient.cpp stdsoap.o soapC.cpp soapClient.cpp
+
+clean:
+	rm gsoapsword testclient soapC.cpp soapServer.cpp soapClient.cpp soapH.h soapStub.h sword.xsd sword.nsmap sword.wsdl
diff --git a/bindings/gsoap/Makefile.am b/bindings/gsoap/Makefile.am
new file mode 100644
index 0000000..0d05ed6
--- /dev/null
+++ b/bindings/gsoap/Makefile.am
@@ -0,0 +1,8 @@
+swgsoapdir = $(top_srcdir)/bindings/gsoap
+
+EXTRA_DIST += $(swgsoapdir)/gsoapsword.cpp
+EXTRA_DIST += $(swgsoapdir)/gsoapsword.h
+EXTRA_DIST += $(swgsoapdir)/include/stdsoap.h
+EXTRA_DIST += $(swgsoapdir)/testclient.cpp
+EXTRA_DIST += $(swgsoapdir)/Makefile.am
+
diff --git a/bindings/gsoap/gsoapsword.cpp b/bindings/gsoap/gsoapsword.cpp
new file mode 100644
index 0000000..4fe933d
--- /dev/null
+++ b/bindings/gsoap/gsoapsword.cpp
@@ -0,0 +1,164 @@
+/******************************************************************************
+ *
+ *  gsoapsword.cpp -	
+ *
+ * $Id: gsoapsword.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include "soapH.h"
+#include <flatapi.h>
+#include <swmgr.h>
+#include <markupfiltmgr.h>
+
+
+SWMgr *mgr;
+
+int sword__ModList_iterator_next(xsd__int hmmi, xsd__int &noop) {
+	ModList_iterator_next(hmmi);
+	return SOAP_OK;
+}
+
+int sword__ModList_iterator_val(xsd__int hmmi, xsd__int &hmodule) {
+	hmodule = ModList_iterator_val(hmmi);
+	return SOAP_OK;
+}
+
+int sword__SWMgr_new(xsd__int &retVal) {
+	retVal = SWMgr_new();
+	return SOAP_OK;
+}
+
+int sword__SWMgr_delete(xsd__int hmgr, xsd__int &noop) {
+	SWMgr_delete(hmgr);
+	return SOAP_OK;
+}
+
+int sword__SWMgr_getModulesIterator(xsd__int hmgr, xsd__int &hmodIterator) {
+	hmodIterator = SWMgr_getModulesIterator(hmgr);
+	return SOAP_OK;
+}
+
+int sword__SWMgr_getModuleByName(xsd__int hmgr, xsd__string name, xsd__int &hmodule) {
+	hmodule = SWMgr_getModuleByName(hmodule, name);
+	return SOAP_OK;
+}
+
+
+
+int sword__SWModule_getName(xsd__int hmodule, xsd__string &name) {
+	name = (char *)SWModule_getName(hmodule);
+	return SOAP_OK;
+}
+
+int sword__SWModule_getDescription(xsd__int hmodule, xsd__string &description) {
+	description = (char *)SWModule_getDescription(hmodule);
+	return SOAP_OK;
+}
+
+
+int sword__Quick_getModuleRawEntry(xsd__string modName, xsd__string modKey, xsd__string &modText) {
+	SWModule *mod = mgr->Modules[modName];
+	if (mod) {
+		mod->setKey(modKey);
+		modText = mod->getRawEntry();
+	}
+	return SOAP_OK;
+}
+
+
+int sword__Quick_setModuleRawEntry(xsd__string modName, xsd__string modKey, xsd__string modText, xsd__int &noop) {
+	SWModule *mod = mgr->Modules[modName];
+	if (mod) {
+		mod->setKey(modKey);
+		(*mod) << modText;
+	}
+	return SOAP_OK;
+}
+
+
+int sword__Quick_getModuleRenderText(xsd__string modName, xsd__string modKey, xsd__string &modText) {
+	SWModule *mod = mgr->Modules[modName];
+	if (mod) {
+		mod->setKey(modKey);
+		modText = (char *)mod->RenderText();
+	}
+	return SOAP_OK;
+}
+
+
+int sword__Quick_getJScriptAttribArray(xsd__string modName, xsd__string modKey, xsd__string &arrayText) {
+	SWModule *mod = mgr->Modules[modName];
+	if (mod) {
+		mod->setKey(modKey);
+		AttributeTypeList::iterator i1;
+		AttributeList::iterator i2;
+		AttributeValue::iterator i3;
+		int l1, l2, l3;
+		char lbuf1[20], lbuf2[20], lbuf3[20];
+		static string retVal = "";
+		retVal = "var entryAttribs = new Array();\n";
+		string l1keys = "entryAttribs[0] = new Array(";
+		for (l1=0,i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); ++i1,++l1) {
+			sprintf(lbuf1, "%d", l1+1);
+			retVal += "entryAttribs["+lbuf1+"] = new Array();\n";
+			string l2keys = "entryAttribs["+lbuf1+"][0] = new Array(";
+			cout << "[ " << i1->first << " ]\n";
+			for (l2=0,i2 = i1->second.begin(); i2 != i1->second.end(); ++i2,++l2) {
+				sprintf(lbuf2, "%d", l2+1);
+				retVal += "entryAttribs["+lbuf1+"]["+lbuf2+"][0] = new Array();\n";
+				string l3keys = "entryAttribs["+lbuf1+"]["+lbuf2+"][0] = new Array(";
+				cout << "\t[ " << i2->first << " ]\n";
+				for (l3=0,i3 = i2->second.begin(); i3 != i2->second.end(); ++i3,++l3) {
+					cout << "\t\t" << i3->first << " = " << i3->second << "\n";
+				}
+			}
+		}
+	}
+	return SOAP_OK;
+}
+
+
+
+
+main() {
+
+
+	int m, s;
+	mgr = new SWMgr(new MarkupFilterMgr());
+     m = soap_bind("localhost", 18083, 100);
+	if (m < 0) {
+		soap_print_fault(stderr);
+		exit(-1);
+	}
+	fprintf(stderr, "Socket connection successful: master socket = %d\n", m);
+	for (int i = 1; ; i++) {
+		s = soap_accept();
+		if (s < 0) {
+			soap_print_fault(stderr);
+			exit(-1);
+		}
+		fprintf(stderr, "%d: accepted connection from IP = %d.%d.%d.%d socket = %d", i, (soap_ip<<24)&0xFF, (soap_ip<<16)&0xFF, (soap_ip<<8)&0xFF, soap_ip&0xFF, s);
+		soap_serve(); // process RPC skeletons
+		fprintf(stderr, "request served\n");
+		soap_end(); // clean up everything and close socket
+	}
+	delete mgr;
+}
+
+#include "sword.nsmap"
+
diff --git a/bindings/gsoap/gsoapsword.h b/bindings/gsoap/gsoapsword.h
new file mode 100644
index 0000000..a62da72
--- /dev/null
+++ b/bindings/gsoap/gsoapsword.h
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
+ *  gsoapsword.h -	
+ *
+ * $Id: gsoapsword.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GSOAPAPI_H
+#define GSOAPAPI_H
+
+typedef long xsd__int;
+typedef char * xsd__string;
+
+//-----------------------------------------------------------------
+// stringlist_iterator methods
+
+//int sword__stringlist_iterator_next(xsd__int hsli char **);
+//int sword__stringlist_iterator_val(xsd__int hsli, char **);
+
+
+//-----------------------------------------------------------------
+// modmap methods
+//
+int sword__ModList_iterator_next(xsd__int hmmi, xsd__int &noop);
+int sword__ModList_iterator_val(xsd__int hmmi, xsd__int &hmodule);
+
+
+//-----------------------------------------------------------------
+// SWMgr methods
+//
+int sword__SWMgr_new(xsd__int &retVal);
+// SWConfig *, SWConfig *, bool, SWFilterMgr *
+//xsd__int sword__SWMgr_newEx(xsd__int hiconfig, xsd__int hisysconfig, char autoload, xsd__int hfilterMgr);
+int sword__SWMgr_delete(xsd__int hmgr, xsd__int &noop);
+//xsd__int sword__SWMgr_getConfig(xsd__int hmgr);
+int sword__SWMgr_getModulesIterator(xsd__int hmgr, xsd__int &hmodIterator);
+int sword__SWMgr_getModuleByName(xsd__int hmgr, xsd__string name, xsd__int &hmodule);
+//char *   sword__SWMgr_getPrefixPath(xsd__int hmgr);
+//char *   sword__SWMgr_getConfigPath(xsd__int hmgr);
+//void     sword__SWMgr_setGlobalOption(xsd__int hmgr, char *option, char *value);
+//char *   sword__SWMgr_getGlobalOption(xsd__int hmgr, char *option);
+//char *   sword__SWMgr_getGlobalOptionTip(xsd__int hmgr, char *option);
+// ret: forward_iterator
+//xsd__int sword__SWMgr_getGlobalOptionsIterator(xsd__int hmgr);
+// ret: forward_iterator
+//xsd__int sword__SWMgr_getGlobalOptionValuesIterator(xsd__int hmgr, char *option);
+//void     sword__SWMgr_setCipherKey(xsd__int hmgr, char *modName, char *key);
+
+
+//-----------------------------------------------------------------
+// SWModule methods
+
+//void  sword__SWModule_terminateSearch(xsd__int hmodule);
+//char  sword__SWModule_error(xsd__int hmodule);
+//int   sword__SWModule_getEntrySize(xsd__int hmodule);
+//void  sword__SWModule_setKeyText(xsd__int hmodule, char *key);
+//char *sword__SWModule_getKeyText(xsd__int hmodule);
+int sword__SWModule_getName(xsd__int hmodule, xsd__string &name);
+int sword__SWModule_getDescription(xsd__int hmodule, xsd__string &description);
+//char *sword__SWModule_getType(xsd__int hmodule);
+//void  sword__SWModule_previous(xsd__int hmodule);
+//void  sword__SWModule_next(xsd__int hmodule);
+//void  sword__SWModule_begin(xsd__int hmodule);
+//char *sword__SWModule_getStripText(xsd__int hmodule);
+//char *sword__SWModule_getRenderText(xsd__int hmodule);
+
+
+int sword__Quick_getModuleRawEntry(xsd__string modName, xsd__string modKey, xsd__string &modText);
+int sword__Quick_setModuleRawEntry(xsd__string modName, xsd__string modKey, xsd__string modText, xsd__int &noop);
+int sword__Quick_getModuleRenderText(xsd__string modName, xsd__string modKey, xsd__string &modText);
+int sword__Quick_getJScriptAttribArray(xsd__string modName, xsd__string modKey, xsd__string &arrayText);
+#endif
diff --git a/bindings/gsoap/testclient.cpp b/bindings/gsoap/testclient.cpp
new file mode 100644
index 0000000..7b0c8a7
--- /dev/null
+++ b/bindings/gsoap/testclient.cpp
@@ -0,0 +1,98 @@
+/******************************************************************************
+ *
+ *  testclient.cpp -	
+ *
+ * $Id: testclient.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include "soapH.h"
+#include <iostream.h>
+
+char server[] = "http://localhost:18083";
+
+int main(int argc, char **argv) {
+	xsd__int mgr;
+	xsd__int noop;
+
+	if (soap_call_sword__SWMgr_new(server, NULL, mgr)) {
+		soap_print_fault(stderr);
+		soap_print_fault_location(stderr);
+		exit(-1);
+	}
+
+	xsd__int modIt;
+	if (soap_call_sword__SWMgr_getModulesIterator(server, NULL, mgr, modIt)) {
+		soap_print_fault(stderr);
+		soap_print_fault_location(stderr);
+		exit(-1);
+	}
+
+	xsd__int module;
+	do {
+		if (soap_call_sword__ModList_iterator_val(server, NULL, modIt, module)) {
+			soap_print_fault(stderr);
+			soap_print_fault_location(stderr);
+			exit(-1);
+		}
+
+
+		if (module) {
+			char *name;
+			char *desc;
+			if (soap_call_sword__SWModule_getName(server, NULL, module, name)) {
+				soap_print_fault(stderr);
+				soap_print_fault_location(stderr);
+				exit(-1);
+			}
+			if (soap_call_sword__SWModule_getDescription(server, NULL, module, desc)) {
+				soap_print_fault(stderr);
+				soap_print_fault_location(stderr);
+				exit(-1);
+			}
+
+			cout << "[" << name << "] " << desc << endl;
+
+			if (soap_call_sword__ModList_iterator_next(server, NULL, modIt, noop)) {
+				soap_print_fault(stderr);
+				soap_print_fault_location(stderr);
+				exit(-1);
+			}
+		}
+
+		
+	} while (module);
+
+	if (soap_call_sword__SWMgr_delete(server, NULL, mgr, noop)) {
+		soap_print_fault(stderr);
+		soap_print_fault_location(stderr);
+		exit(-1);
+	}
+	char *text;
+	if (soap_call_sword__Quick_getModuleRenderText(server, NULL, "KJV", "jas1:19", text)) {
+		soap_print_fault(stderr);
+		soap_print_fault_location(stderr);
+		exit(-1);
+	}
+	cout << text << endl;
+
+	printf("success: %d\n", mgr);
+	soap_free();
+	return 0;
+}
+
+#include "sword.nsmap"
diff --git a/bindings/java-jni/Makefile b/bindings/java-jni/Makefile
new file mode 100644
index 0000000..1fd3743
--- /dev/null
+++ b/bindings/java-jni/Makefile
@@ -0,0 +1,15 @@
+all:
+	mkdir -p classes
+	javac -d classes src/org/crosswire/android/sword/*.java
+	javah -d jni -classpath classes -jni org.crosswire.android.sword.SWMgr
+	javah -d jni -classpath classes -jni org.crosswire.android.sword.SWModule
+	javah -d jni -classpath classes -jni org.crosswire.android.sword.InstallMgr
+	javap -s -classpath classes/ org.crosswire.android.sword.SWMgr > SWMgr.txt
+	javap -s -classpath classes/ org.crosswire.android.sword.SWMgr.ModInfo > ModInfo.txt
+	javap -s -classpath classes/ org.crosswire.android.sword.SWModule > SWModule.txt
+	javap -s -classpath classes/ org.crosswire.android.sword.SWModule.SearchHit > SearchHit.txt
+	javap -s -classpath classes/ org.crosswire.android.sword.SWModule.SearchProgressReporter > SearchProgressReporter.txt
+	javap -s -classpath classes/ org.crosswire.android.sword.InstallMgr > InstallMgr.txt
+	cp src/org/crosswire/android/sword/*.java /home/scribe/src/bishop/src/org/crosswire/android/sword/
+
+
diff --git a/bindings/java-jni/README b/bindings/java-jni/README
new file mode 100644
index 0000000..80c256a
--- /dev/null
+++ b/bindings/java-jni/README
@@ -0,0 +1,27 @@
+Android Build Instructions
+
+You'll need the Android NDK.
+
+Then link the sword/bindings/java-jni folder to your project's /jni folder.
+I have a symlink:
+
+~/src/bishop/jni -> ~/src/sword/bindings/java-jni/jni/
+
+~/src/sword is simply a checkout of the current sword svn repository.
+(svn co https://crosswire.org/svn/sword/trunk ~/src/sword)
+
+
+So, since my $HOME directly is /home/scribe, my configuration looks like this:
+
+/home/scribe/src/sword/
+/home/scribe/src/bishop/
+/home/scribe/android-ndk-r8e/
+
+with:
+
+APP_PROJECT_PATH := $(call my-dir)/../../../src/bishop
+APP_MODULES      := sword swordcore
+APP_PLATFORM     := android-3
+
+
+Hope this helps get you started.  Let me know your progress!
diff --git a/bindings/java-jni/jni/Android.mk b/bindings/java-jni/jni/Android.mk
new file mode 100644
index 0000000..5d793a0
--- /dev/null
+++ b/bindings/java-jni/jni/Android.mk
@@ -0,0 +1,209 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# the purpose of this sample is to demonstrate how one can
+# generate two distinct shared libraries and have them both
+# uploaded in
+#
+
+
+LOCAL_PATH:= $(call my-dir)
+
+# first lib, which will be built statically
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := libswordcore
+LOCAL_C_INCLUDES := ../sword/include ../sword/include/internal/regex
+LOCAL_CFLAGS	+= -D__unix__ \
+		   -DSTDC_HEADERS \
+	 	   -Dunix \
+		   -D_FTPLIB_NO_COMPAT \
+		   -DANDROID \
+		   -DOS_ANDROID
+LOCAL_SRC_FILES := ../../../src/modules/comments/zcom/zcom.cpp \
+../../../src/modules/comments/rawfiles/rawfiles.cpp \
+../../../src/modules/comments/rawcom4/rawcom4.cpp \
+../../../src/modules/comments/rawcom/rawcom.cpp \
+../../../src/modules/comments/swcom.cpp \
+../../../src/modules/comments/hrefcom/hrefcom.cpp \
+../../../src/modules/swmodule.cpp \
+../../../src/modules/tests/echomod.cpp \
+../../../src/modules/genbook/swgenbook.cpp \
+../../../src/modules/genbook/rawgenbook/rawgenbook.cpp \
+../../../src/modules/lexdict/swld.cpp \
+../../../src/modules/lexdict/rawld4/rawld4.cpp \
+../../../src/modules/lexdict/zld/zld.cpp \
+../../../src/modules/lexdict/rawld/rawld.cpp \
+../../../src/modules/texts/rawtext/rawtext.cpp \
+../../../src/modules/texts/rawtext4/rawtext4.cpp \
+../../../src/modules/texts/swtext.cpp \
+../../../src/modules/texts/ztext/ztext.cpp \
+../../../src/modules/common/rawstr4.cpp \
+../../../src/modules/common/lzsscomprs.cpp \
+../../../src/modules/common/zipcomprs.cpp \
+../../../src/modules/common/bz2comprs.cpp \
+../../../src/modules/common/xzcomprs.cpp \
+../../../src/modules/common/rawverse4.cpp \
+../../../src/modules/common/swcipher.cpp \
+../../../src/modules/common/swcomprs.cpp \
+../../../src/modules/common/rawverse.cpp \
+../../../src/modules/common/sapphire.cpp \
+../../../src/modules/common/zstr.cpp \
+../../../src/modules/common/entriesblk.cpp \
+../../../src/modules/common/zverse.cpp \
+../../../src/modules/common/rawstr.cpp \
+../../../src/modules/filters/gbfwordjs.cpp \
+../../../src/modules/filters/utf8latin1.cpp \
+../../../src/modules/filters/utf8greekaccents.cpp \
+../../../src/modules/filters/utf16utf8.cpp \
+../../../src/modules/filters/gbfwebif.cpp \
+../../../src/modules/filters/utf8transliterator.cpp \
+../../../src/modules/filters/gbfstrongs.cpp \
+../../../src/modules/filters/thmlhtmlhref.cpp \
+../../../src/modules/filters/thmlxhtml.cpp \
+../../../src/modules/filters/thmlgbf.cpp \
+../../../src/modules/filters/utf8utf16.cpp \
+../../../src/modules/filters/utf8cantillation.cpp \
+../../../src/modules/filters/utf8arshaping.cpp \
+../../../src/modules/filters/cipherfil.cpp \
+../../../src/modules/filters/thmlheadings.cpp \
+../../../src/modules/filters/thmlscripref.cpp \
+../../../src/modules/filters/latin1utf8.cpp \
+../../../src/modules/filters/gbfhtml.cpp \
+../../../src/modules/filters/thmlosis.cpp \
+../../../src/modules/filters/utf8nfkd.cpp \
+../../../src/modules/filters/thmlstrongs.cpp \
+../../../src/modules/filters/osisenum.cpp \
+../../../src/modules/filters/osisfootnotes.cpp \
+../../../src/modules/filters/osisglosses.cpp \
+../../../src/modules/filters/osisheadings.cpp \
+../../../src/modules/filters/osishtmlhref.cpp \
+../../../src/modules/filters/osislemma.cpp \
+../../../src/modules/filters/osismorph.cpp \
+../../../src/modules/filters/osismorphsegmentation.cpp \
+../../../src/modules/filters/osisosis.cpp \
+../../../src/modules/filters/osisplain.cpp \
+../../../src/modules/filters/osisredletterwords.cpp \
+../../../src/modules/filters/osisrtf.cpp \
+../../../src/modules/filters/osisscripref.cpp \
+../../../src/modules/filters/osisstrongs.cpp \
+../../../src/modules/filters/osisvariants.cpp \
+../../../src/modules/filters/osiswebif.cpp \
+../../../src/modules/filters/osiswordjs.cpp \
+../../../src/modules/filters/osisxhtml.cpp \
+../../../src/modules/filters/osisxlit.cpp \
+../../../src/modules/filters/osisreferencelinks.cpp \
+../../../src/modules/filters/thmlmorph.cpp \
+../../../src/modules/filters/gbfplain.cpp \
+../../../src/modules/filters/gbfhtmlhref.cpp \
+../../../src/modules/filters/gbfxhtml.cpp \
+../../../src/modules/filters/utf8html.cpp \
+../../../src/modules/filters/utf8nfc.cpp \
+../../../src/modules/filters/rtfhtml.cpp \
+../../../src/modules/filters/gbfredletterwords.cpp \
+../../../src/modules/filters/latin1utf16.cpp \
+../../../src/modules/filters/thmlhtml.cpp \
+../../../src/modules/filters/gbfthml.cpp \
+../../../src/modules/filters/teihtmlhref.cpp \
+../../../src/modules/filters/teixhtml.cpp \
+../../../src/modules/filters/gbfrtf.cpp \
+../../../src/modules/filters/gbfosis.cpp \
+../../../src/modules/filters/teirtf.cpp \
+../../../src/modules/filters/thmlwordjs.cpp \
+../../../src/modules/filters/papyriplain.cpp \
+../../../src/modules/filters/utf8bidireorder.cpp \
+../../../src/modules/filters/gbfheadings.cpp \
+../../../src/modules/filters/thmlrtf.cpp \
+../../../src/modules/filters/swoptfilter.cpp \
+../../../src/modules/filters/utf8arabicpoints.cpp \
+../../../src/modules/filters/unicodertf.cpp \
+../../../src/modules/filters/gbffootnotes.cpp \
+../../../src/modules/filters/greeklexattribs.cpp \
+../../../src/modules/filters/thmlfootnotes.cpp \
+../../../src/modules/filters/thmlplain.cpp \
+../../../src/modules/filters/utf8hebrewpoints.cpp \
+../../../src/modules/filters/thmlwebif.cpp \
+../../../src/modules/filters/thmlvariants.cpp \
+../../../src/modules/filters/thmllemma.cpp \
+../../../src/modules/filters/gbfmorph.cpp \
+../../../src/modules/filters/teiplain.cpp \
+../../../src/modules/filters/swbasicfilter.cpp \
+../../../src/modules/filters/scsuutf8.cpp \
+../../../src/mgr/stringmgr.cpp \
+../../../src/mgr/swmgr.cpp \
+../../../src/mgr/swsearchable.cpp \
+../../../src/mgr/localemgr.cpp \
+../../../src/mgr/swconfig.cpp \
+../../../src/mgr/markupfiltmgr.cpp \
+../../../src/mgr/encfiltmgr.cpp \
+../../../src/mgr/swfiltermgr.cpp \
+../../../src/mgr/swcacher.cpp \
+../../../src/mgr/installmgr.cpp \
+../../../src/mgr/swlocale.cpp \
+../../../src/mgr/filemgr.cpp \
+../../../src/mgr/versificationmgr.cpp \
+../../../src/mgr/remotetrans.cpp \
+../../../src/mgr/ftplibftpt.cpp \
+../../../src/utilfuns/swobject.cpp \
+../../../src/utilfuns/roman.cpp \
+../../../src/utilfuns/swbuf.cpp \
+../../../src/utilfuns/utilstr.cpp \
+../../../src/utilfuns/ftplib.c \
+../../../src/utilfuns/ftpparse.c \
+../../../src/utilfuns/url.cpp \
+../../../src/utilfuns/swversion.cpp \
+../../../src/utilfuns/utilxml.cpp \
+../../../src/utilfuns/regex.c \
+../../../src/keys/swkey.cpp \
+../../../src/keys/versetreekey.cpp \
+../../../src/keys/treekeyidx.cpp \
+../../../src/keys/versekey.cpp \
+../../../src/keys/strkey.cpp \
+../../../src/keys/treekey.cpp \
+../../../src/keys/listkey.cpp \
+../../../src/frontend/swdisp.cpp \
+../../../src/frontend/swlog.cpp \
+../../../src/utilfuns/zlib/untgz.c
+
+#../../../../../sword/src/mgr/curlftpt.cpp \
+#../../../../../sword/src/mgr/curlhttpt.cpp \
+#../../../../../sword/src/utilfuns/win32/dirent.cpp \
+#../../../../../sword/src/frontend/framework/femain.cpp \
+#../../../../../sword/src/frontend/im/nullim.cpp \
+#../../../../../sword/src/frontend/im/swinputmeth.cpp \
+#../../../../../sword/src/frontend/im/hebrewmcim.cpp \
+
+include $(BUILD_STATIC_LIBRARY)
+
+# second lib, which will depend on and include the first one
+#
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := libsword
+LOCAL_C_INCLUDES := ../sword/include ../sword/include/internal/regex
+LOCAL_CFLAGS	+= -D__unix__ \
+		   -Dunix \
+		   -D_FTPLIB_NO_COMPAT \
+		   -DANDROID \
+		   -DOS_ANDROID
+
+LOCAL_LDLIBS	+= -lz -llog
+
+LOCAL_SRC_FILES := swordstub.cpp
+
+LOCAL_STATIC_LIBRARIES := libswordcore
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/bindings/java-jni/jni/Application.mk b/bindings/java-jni/jni/Application.mk
new file mode 100644
index 0000000..528042e
--- /dev/null
+++ b/bindings/java-jni/jni/Application.mk
@@ -0,0 +1 @@
+APP_STL                 := stlport_static
diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_InstallMgr.h b/bindings/java-jni/jni/org_crosswire_android_sword_InstallMgr.h
new file mode 100644
index 0000000..b80243b
--- /dev/null
+++ b/bindings/java-jni/jni/org_crosswire_android_sword_InstallMgr.h
@@ -0,0 +1,85 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_crosswire_android_sword_InstallMgr */
+
+#ifndef _Included_org_crosswire_android_sword_InstallMgr
+#define _Included_org_crosswire_android_sword_InstallMgr
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    reInit
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_reInit
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    setUserDisclaimerConfirmed
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_setUserDisclaimerConfirmed
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    syncConfig
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_syncConfig
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    uninstallModule
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_uninstallModule
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    getRemoteSources
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteSources
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    refreshRemoteSource
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_refreshRemoteSource
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    getRemoteModInfoList
+ * Signature: (Ljava/lang/String;)[Lorg/crosswire/android/sword/SWMgr/ModInfo;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModInfoList
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    remoteInstallModule
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_remoteInstallModule
+  (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    getRemoteModuleByName
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule;
+ */
+JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModuleByName
+  (JNIEnv *, jobject, jstring, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr.h
new file mode 100644
index 0000000..a95cf8e
--- /dev/null
+++ b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr.h
@@ -0,0 +1,141 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_crosswire_android_sword_SWMgr */
+
+#ifndef _Included_org_crosswire_android_sword_SWMgr
+#define _Included_org_crosswire_android_sword_SWMgr
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    version
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_version
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    reInit
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_reInit
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getModInfoList
+ * Signature: ()[Lorg/crosswire/android/sword/SWMgr/ModInfo;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getModInfoList
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getModuleByName
+ * Signature: (Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule;
+ */
+JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_SWMgr_getModuleByName
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getPrefixPath
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getPrefixPath
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getConfigPath
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getConfigPath
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setGlobalOption
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setGlobalOption
+  (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOption
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOption
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOptionTip
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionTip
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    filterText
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_filterText
+  (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOptions
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptions
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOptionValues
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionValues
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setCipherKey
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setCipherKey
+  (JNIEnv *, jobject, jstring, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setJavascript
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setJavascript
+  (JNIEnv *, jobject, jboolean);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getAvailableLocales
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getAvailableLocales
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setDefaultLocale
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setDefaultLocale
+  (JNIEnv *, jobject, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_ModInfo.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_ModInfo.h
new file mode 100644
index 0000000..f3b8fd6
--- /dev/null
+++ b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_ModInfo.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_crosswire_android_sword_SWMgr_ModInfo */
+
+#ifndef _Included_org_crosswire_android_sword_SWMgr_ModInfo
+#define _Included_org_crosswire_android_sword_SWMgr_ModInfo
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_SearchHit.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_SearchHit.h
new file mode 100644
index 0000000..062c579
--- /dev/null
+++ b/bindings/java-jni/jni/org_crosswire_android_sword_SWMgr_SearchHit.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_crosswire_android_sword_SWMgr_SearchHit */
+
+#ifndef _Included_org_crosswire_android_sword_SWMgr_SearchHit
+#define _Included_org_crosswire_android_sword_SWMgr_SearchHit
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule.h
new file mode 100644
index 0000000..15b1ad0
--- /dev/null
+++ b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule.h
@@ -0,0 +1,191 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_crosswire_android_sword_SWModule */
+
+#ifndef _Included_org_crosswire_android_sword_SWModule
+#define _Included_org_crosswire_android_sword_SWModule
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_REGEX
+#define org_crosswire_android_sword_SWModule_SEARCHTYPE_REGEX 1L
+#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_PHRASE
+#define org_crosswire_android_sword_SWModule_SEARCHTYPE_PHRASE -1L
+#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_MULTIWORD
+#define org_crosswire_android_sword_SWModule_SEARCHTYPE_MULTIWORD -2L
+#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_ENTRYATTR
+#define org_crosswire_android_sword_SWModule_SEARCHTYPE_ENTRYATTR -3L
+#undef org_crosswire_android_sword_SWModule_SEARCHTYPE_LUCENE
+#define org_crosswire_android_sword_SWModule_SEARCHTYPE_LUCENE -4L
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    terminateSearch
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_terminateSearch
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    search
+ * Signature: (Ljava/lang/String;IJLjava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)[Lorg/crosswire/android/sword/SWModule/SearchHit;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search
+  (JNIEnv *, jobject, jstring, jint, jlong, jstring, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    error
+ * Signature: ()C
+ */
+JNIEXPORT jchar JNICALL Java_org_crosswire_android_sword_SWModule_error
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getEntrySize
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_org_crosswire_android_sword_SWModule_getEntrySize
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getEntryAttribute
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntryAttribute
+  (JNIEnv *, jobject, jstring, jstring, jstring, jboolean);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    parseKeyList
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_parseKeyList
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    setKeyText
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setKeyText
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getKeyText
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyText
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    hasKeyChildren
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasKeyChildren
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getKeyChildren
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyChildren
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getKeyParent
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyParent
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    previous
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_previous
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    next
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_next
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    begin
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_begin
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getStripText
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getStripText
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getRenderText
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRenderText
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getRawEntry
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRawEntry
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    setRawEntry
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setRawEntry
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getConfigEntry
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getConfigEntry
+  (JNIEnv *, jobject, jstring);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    deleteSearchFramework
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_deleteSearchFramework
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    hasSearchFramework
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasSearchFramework
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchHit.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchHit.h
new file mode 100644
index 0000000..e79c8fd
--- /dev/null
+++ b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchHit.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_crosswire_android_sword_SWModule_SearchHit */
+
+#ifndef _Included_org_crosswire_android_sword_SWModule_SearchHit
+#define _Included_org_crosswire_android_sword_SWModule_SearchHit
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchProgressReporter.h b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchProgressReporter.h
new file mode 100644
index 0000000..1f7de09
--- /dev/null
+++ b/bindings/java-jni/jni/org_crosswire_android_sword_SWModule_SearchProgressReporter.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_crosswire_android_sword_SWModule_SearchProgressReporter */
+
+#ifndef _Included_org_crosswire_android_sword_SWModule_SearchProgressReporter
+#define _Included_org_crosswire_android_sword_SWModule_SearchProgressReporter
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/bindings/java-jni/jni/swordstub.cpp b/bindings/java-jni/jni/swordstub.cpp
new file mode 100644
index 0000000..a8ddb16
--- /dev/null
+++ b/bindings/java-jni/jni/swordstub.cpp
@@ -0,0 +1,1479 @@
+/******************************************************************************
+ *
+ *  swordstub.cpp -	JNI bindings
+ *
+ * $Id: swordstub.cpp 2894 2013-07-16 04:38:43Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <vector>
+#include <map>
+
+#include <jni.h>
+#include <android/log.h>
+
+#include <utilstr.h>
+#include <swversion.h>
+#include <swmgr.h>
+#include <swlog.h>
+#include <filemgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <localemgr.h>
+#include <treekeyidx.h>
+#include <installmgr.h>
+
+#include "webmgr.hpp"
+#include "org_crosswire_android_sword_SWMgr.h"
+#include "org_crosswire_android_sword_SWModule.h"
+#include "org_crosswire_android_sword_InstallMgr.h"
+
+
+using std::cerr;
+using std::map;
+using std::vector;
+
+using namespace sword;
+
+
+WebMgr *mgr = 0;
+InstallMgr *installMgr = 0;
+
+class AndroidLogger : public SWLog {
+	vector<int> levelMapping;
+public:
+	AndroidLogger() {
+		levelMapping.resize(10, 0);
+		levelMapping[SWLog::LOG_ERROR] = ANDROID_LOG_ERROR;
+		levelMapping[SWLog::LOG_WARN] = ANDROID_LOG_WARN;
+		levelMapping[SWLog::LOG_INFO] = ANDROID_LOG_INFO;
+		levelMapping[SWLog::LOG_TIMEDINFO] = ANDROID_LOG_INFO;
+		levelMapping[SWLog::LOG_DEBUG] = ANDROID_LOG_DEBUG;
+	}
+	virtual void logMessage(const char *message, int level) const {
+		SWBuf msg = message;
+		if (msg.size() > 512) msg.setSize(512);
+		__android_log_write(levelMapping[level], "libsword.so", msg.c_str());
+	}
+};
+
+
+static void init() {
+	if (!mgr) {
+		SWLog::setSystemLog(new AndroidLogger());
+		SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
+		SWBuf baseDir  = "/sdcard/sword";
+		SWBuf confPath = baseDir + "/mods.d/globals.conf";
+		// be sure we have at least some config file already out there
+		if (!FileMgr::existsFile(confPath.c_str())) {
+			FileMgr::createParent(confPath.c_str());
+			remove(confPath.c_str());
+
+			SWConfig config(confPath.c_str());
+			config["Globals"]["HiAndroid"] = "weeee";
+			config.Save();
+		}
+		mgr = new WebMgr("/sdcard/sword");
+	}
+}
+
+
+static void initInstall() {
+
+	if (!installMgr) {
+		SWBuf baseDir  = "/sdcard/sword/InstallMgr";
+		SWBuf confPath = baseDir + "/InstallMgr.conf";
+		// be sure we have at least some config file already out there
+		if (!FileMgr::existsFile(confPath.c_str())) {
+			FileMgr::createParent(confPath.c_str());
+			remove(confPath.c_str());
+
+			SWConfig config(confPath.c_str());
+			config["General"]["PassiveFTP"] = "true";
+			config.Save();
+		}
+		installMgr = new InstallMgr(baseDir);
+	}
+}
+
+
+
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_version
+  (JNIEnv *env, jobject me) {
+
+	init();
+
+	SWVersion v;
+	return env->NewStringUTF(v.currentVersion);
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    reInit
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_reInit
+  (JNIEnv *, jobject) {
+
+	delete mgr;
+	mgr = 0;
+}
+
+
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getPrefixPath
+  (JNIEnv *env, jobject me) {
+
+	init();
+
+	return env->NewStringUTF(mgr->prefixPath);
+}
+
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getConfigPath
+  (JNIEnv *env, jobject me) {
+
+	init();
+
+	return env->NewStringUTF(mgr->configPath);
+}
+
+
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getModInfoList
+  (JNIEnv *env, jobject) {
+
+	init();
+
+	int size = 0;
+	for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); ++it) {
+		if ((!(it->second->getConfigEntry("CipherKey"))) || (*(it->second->getConfigEntry("CipherKey"))))
+			size++;
+	}
+
+SWLog::getSystemLog()->logDebug("getModInfoList returning %d length array\n", size);
+
+	jclass clazzModInfo = env->FindClass("org/crosswire/android/sword/SWMgr$ModInfo");
+	jfieldID nameID     = env->GetFieldID(clazzModInfo, "name",        "Ljava/lang/String;");
+	jfieldID descID     = env->GetFieldID(clazzModInfo, "description", "Ljava/lang/String;");
+	jfieldID catID      = env->GetFieldID(clazzModInfo, "category",    "Ljava/lang/String;");
+	jfieldID langID     = env->GetFieldID(clazzModInfo, "language",    "Ljava/lang/String;");
+	jfieldID versionID  = env->GetFieldID(clazzModInfo, "version",     "Ljava/lang/String;");
+	jfieldID deltaID    = env->GetFieldID(clazzModInfo, "delta",       "Ljava/lang/String;");
+
+	jobjectArray ret = (jobjectArray) env->NewObjectArray(size, clazzModInfo, NULL);
+
+	int i = 0;
+	for (sword::ModMap::iterator it = mgr->Modules.begin(); it != mgr->Modules.end(); ++it) {
+		SWModule *module = it->second;
+
+		if ((!(module->getConfigEntry("CipherKey"))) || (*(module->getConfigEntry("CipherKey")))) {
+			SWBuf type = module->getType();
+			SWBuf cat = module->getConfigEntry("Category");
+			SWBuf version = module->getConfigEntry("Version");
+			if (cat.length() > 0) type = cat;
+
+			jobject modInfo = env->AllocObject(clazzModInfo); 
+
+			jstring val;
+			val = env->NewStringUTF(assureValidUTF8(module->getName()));        env->SetObjectField(modInfo, nameID   , val); env->DeleteLocalRef(val);
+			val = env->NewStringUTF(assureValidUTF8(module->getDescription())); env->SetObjectField(modInfo, descID   , val); env->DeleteLocalRef(val);
+			val = env->NewStringUTF(assureValidUTF8(type.c_str()));          env->SetObjectField(modInfo, catID    , val); env->DeleteLocalRef(val);
+			val = env->NewStringUTF(assureValidUTF8(module->getLanguage()));        env->SetObjectField(modInfo, langID   , val); env->DeleteLocalRef(val);
+			val = env->NewStringUTF(assureValidUTF8(version.c_str()));       env->SetObjectField(modInfo, versionID, val); env->DeleteLocalRef(val);
+			val = env->NewStringUTF(assureValidUTF8(""));                    env->SetObjectField(modInfo, deltaID  , val); env->DeleteLocalRef(val);
+
+			env->SetObjectArrayElement(ret, i++, modInfo);
+
+			env->DeleteLocalRef(modInfo);
+
+		}
+	}
+	return ret;
+}
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getModuleByName
+ * Signature: (Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule;
+ */
+JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_SWMgr_getModuleByName
+  (JNIEnv *env, jobject me, jstring modNameJS) {
+
+	init();
+
+	jobject retVal = 0;
+
+     const char *modName = env->GetStringUTFChars(modNameJS, NULL);
+	sword::SWModule *module = mgr->getModule(modName);
+     env->ReleaseStringUTFChars(modNameJS, modName);
+
+	if (module) {
+		SWBuf type = module->getType();
+		SWBuf cat = module->getConfigEntry("Category");
+		if (cat.length() > 0) type = cat;
+		jfieldID fieldID;
+		jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule");
+		retVal = env->AllocObject(clazzSWModule); 
+		fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getName())));
+		fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getDescription())));
+		fieldID = env->GetFieldID(clazzSWModule, "category", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(type.c_str())));
+	}
+	return retVal;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setGlobalOption
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setGlobalOption
+  (JNIEnv *env, jobject me, jstring optionJS, jstring valueJS) {
+
+	init();
+
+     const char *option = env->GetStringUTFChars(optionJS, NULL);
+     const char *value  = env->GetStringUTFChars(valueJS, NULL);
+
+	mgr->setGlobalOption(option, value);
+
+     env->ReleaseStringUTFChars(valueJS, value);
+     env->ReleaseStringUTFChars(optionJS, option);
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOption
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOption
+  (JNIEnv *env, jobject me, jstring optionJS) {
+
+	init();
+
+     const char *option = env->GetStringUTFChars(optionJS, NULL);
+
+	SWBuf value = mgr->getGlobalOption(option);
+
+     env->ReleaseStringUTFChars(optionJS, option);
+
+	return env->NewStringUTF(assureValidUTF8(value));
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOptionTip
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionTip
+  (JNIEnv *env, jobject me, jstring optionJS) {
+
+	init();
+
+     const char *option = env->GetStringUTFChars(optionJS, NULL);
+
+	SWBuf value = mgr->getGlobalOptionTip(option);
+
+     env->ReleaseStringUTFChars(optionJS, option);
+
+	return env->NewStringUTF(assureValidUTF8(value));
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    filterText
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWMgr_filterText
+  (JNIEnv *env, jobject me, jstring filterNameJS, jstring textJS) {
+
+	init();
+
+     const char *filterName = env->GetStringUTFChars(filterNameJS, NULL);
+     const char *text  = env->GetStringUTFChars(textJS, NULL);
+
+	SWBuf buf = text;
+	// hmmm, in the future, provide a param to specify filter value maybe?
+	mgr->setGlobalOption("Greek Accents", "Off");
+	char errStatus = mgr->filterText(filterName, buf);
+
+     env->ReleaseStringUTFChars(textJS, text);
+     env->ReleaseStringUTFChars(filterNameJS, filterName);
+
+	return env->NewStringUTF(assureValidUTF8(buf));
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOptions
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptions
+  (JNIEnv *env, jobject me) {
+
+	init();
+
+	sword::StringList options = mgr->getGlobalOptions();
+	int count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		count++;
+	}
+
+	jclass clazzString = env->FindClass("java/lang/String");
+	jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
+
+	count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it)));
+	}
+
+	return ret;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getGlobalOptionValues
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getGlobalOptionValues
+  (JNIEnv *env, jobject me, jstring optionJS) {
+
+	init();
+
+     const char *option = env->GetStringUTFChars(optionJS, NULL);
+
+	sword::StringList options = mgr->getGlobalOptionValues(option);
+
+     env->ReleaseStringUTFChars(optionJS, option);
+
+	int count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		count++;
+	}
+	jclass clazzString = env->FindClass("java/lang/String");
+	jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
+
+	count = 0;
+	for (sword::StringList::iterator it = options.begin(); it != options.end(); ++it) {
+		env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it)));
+	}
+
+	return ret;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setCipherKey
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setCipherKey
+  (JNIEnv *env, jobject me , jstring modNameJS, jstring keyJS) {
+
+	init();
+
+     const char *modName = env->GetStringUTFChars(modNameJS, NULL);
+     const char *key     = env->GetStringUTFChars(keyJS, NULL);
+
+	mgr->setCipherKey(modName, key);
+
+     env->ReleaseStringUTFChars(keyJS, key);
+     env->ReleaseStringUTFChars(modNameJS, modName);
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setJavascript
+ * Signature: (Z)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setJavascript
+  (JNIEnv *env, jobject me, jboolean val) {
+
+	init();
+
+	mgr->setJavascript(val == JNI_TRUE);
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    getAvailableLocales
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWMgr_getAvailableLocales
+  (JNIEnv *env, jobject me) {
+
+	init();
+
+	sword::StringList localeNames = LocaleMgr::getSystemLocaleMgr()->getAvailableLocales();
+	int count = 0;
+	for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
+		count++;
+	}
+
+	jclass clazzString = env->FindClass("java/lang/String");
+	jobjectArray ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
+
+	count = 0;
+	for (sword::StringList::iterator it = localeNames.begin(); it != localeNames.end(); ++it) {
+		env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(*it)));
+	}
+	return ret;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWMgr
+ * Method:    setDefaultLocale
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWMgr_setDefaultLocale
+  (JNIEnv *env, jobject me, jstring localeNameJS) {
+
+	init();
+
+     const char *localeName = env->GetStringUTFChars(localeNameJS, NULL);
+
+	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(localeName);
+
+     env->ReleaseStringUTFChars(localeNameJS, localeName);
+}
+
+
+
+// SWModule methods ----------------------------------------------------------------------------------
+
+
+SWModule *getModule(JNIEnv *env, jobject me) {
+
+	init(); 
+
+	SWModule *module = 0;
+	jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule");
+	jfieldID fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;");
+	jfieldID sourceFieldID = env->GetFieldID(clazzSWModule, "remoteSourceName", "Ljava/lang/String;");
+	jstring modNameJS = (jstring)env->GetObjectField(me, fieldID);
+	jstring sourceNameJS = (jstring)env->GetObjectField(me, sourceFieldID);
+     const char *modName = (modNameJS?env->GetStringUTFChars(modNameJS, NULL):0);
+     const char *sourceName = (sourceNameJS?env->GetStringUTFChars(sourceNameJS, NULL):0);
+	if (sourceName && *sourceName) {
+		initInstall();
+		InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+		if (source == installMgr->sources.end()) {
+			SWMgr *mgr = source->second->getMgr();
+			module = mgr->getModule(modName);
+		}
+	}
+	else module = mgr->getModule(modName);
+     if (modName) env->ReleaseStringUTFChars(modNameJS, modName);
+     if (sourceName) env->ReleaseStringUTFChars(sourceNameJS, sourceName);
+	return module;
+}
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    setKeyText
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setKeyText
+  (JNIEnv *env, jobject me, jstring keyTextJS) {
+
+	init();
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		const char *keyText = env->GetStringUTFChars(keyTextJS, NULL);
+SWLog::getSystemLog()->logDebug("setKeyText(%s, %s)", module->getName(), keyText);
+		sword::SWKey *key = module->getKey();
+		sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+		if (vkey && (*keyText=='+' ||*keyText=='-')) {
+			if (!stricmp(keyText+1, "book")) {
+				vkey->setBook(vkey->getBook() + ((*keyText=='+')?1:-1));
+				env->ReleaseStringUTFChars(keyTextJS, keyText);
+				return;
+			}
+			else if (!stricmp(keyText+1, "chapter")) {
+				vkey->setChapter(vkey->getChapter() + ((*keyText=='+')?1:-1));
+				env->ReleaseStringUTFChars(keyTextJS, keyText);
+				return;
+			}
+		}
+
+		module->setKey(keyText);
+		env->ReleaseStringUTFChars(keyTextJS, keyText);
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getKeyText
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyText
+  (JNIEnv *env, jobject me) {
+
+	init();
+
+	SWModule *module = getModule(env, me);
+
+	jstring retVal = 0;
+	if (module) {
+		retVal = env->NewStringUTF(assureValidUTF8(module->getKeyText()));
+	}
+	return retVal;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getRenderText
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRenderText
+  (JNIEnv *env, jobject me) {
+
+	init();
+
+	SWModule *module = getModule(env, me);
+
+	jstring retVal = 0;
+	if (module) {
+		retVal = env->NewStringUTF(assureValidUTF8(module->renderText()));
+	}
+	return retVal;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    terminateSearch
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_terminateSearch
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		module->terminateSearch = true;
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    error
+ * Signature: ()C
+ */
+JNIEXPORT jchar JNICALL Java_org_crosswire_android_sword_SWModule_error
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+	SWModule *module = getModule(env, me);
+	
+	return (module) ? module->popError() : -99;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getEntrySize
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_org_crosswire_android_sword_SWModule_getEntrySize
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+	SWModule *module = getModule(env, me);
+
+	return (module) ? module->getEntrySize() : 0;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getEntryAttribute
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getEntryAttribute
+  (JNIEnv *env, jobject me, jstring level1JS, jstring level2JS, jstring level3JS, jboolean filteredJS) {
+
+	init(); 
+
+	const char *level1 = env->GetStringUTFChars(level1JS, NULL);
+	const char *level2 = env->GetStringUTFChars(level2JS, NULL);
+	const char *level3 = env->GetStringUTFChars(level3JS, NULL);
+	bool filtered = (filteredJS == JNI_TRUE);
+
+	jclass clazzString = env->FindClass("java/lang/String");
+	jobjectArray ret = 0;
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+
+		module->renderText();	// force parse
+		vector<SWBuf> results;
+
+		sword::AttributeTypeList &entryAttribs = module->getEntryAttributes();
+		sword::AttributeTypeList::iterator i1Start, i1End;
+		sword::AttributeList::iterator i2Start, i2End;
+		sword::AttributeValue::iterator i3Start, i3End;
+
+		if ((level1) && (*level1)) {
+			i1Start = entryAttribs.find(level1);
+			i1End = i1Start;
+			if (i1End != entryAttribs.end())
+				++i1End;
+		}
+		else {
+			i1Start = entryAttribs.begin();
+			i1End   = entryAttribs.end();
+		}
+		for (;i1Start != i1End; ++i1Start) {
+			if ((level2) && (*level2)) {
+				i2Start = i1Start->second.find(level2);
+				i2End = i2Start;
+				if (i2End != i1Start->second.end())
+					++i2End;
+			}
+			else {
+				i2Start = i1Start->second.begin();
+				i2End   = i1Start->second.end();
+			}
+			for (;i2Start != i2End; ++i2Start) {
+				if ((level3) && (*level3)) {
+					i3Start = i2Start->second.find(level3);
+					i3End = i3Start;
+					if (i3End != i2Start->second.end())
+						++i3End;
+				}
+				else {
+					i3Start = i2Start->second.begin();
+					i3End   = i2Start->second.end();
+				}
+				for (;i3Start != i3End; ++i3Start) {
+					results.push_back(i3Start->second);
+				}
+				if (i3Start != i3End)
+					break;
+			}
+			if (i2Start != i2End)
+				break;
+		}
+
+		ret = (jobjectArray) env->NewObjectArray(results.size(), clazzString, NULL);
+
+SWLog::getSystemLog()->logDebug("getEntryAttributes: size returned: %d", results.size());
+
+		for (int i = 0; i < results.size(); i++) {
+			if (filtered) {
+				env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(module->renderText(results[i].c_str()))));
+			}
+			else {
+				env->SetObjectArrayElement(ret, i, env->NewStringUTF(assureValidUTF8(results[i].c_str())));
+			}
+		}
+	}
+
+	env->ReleaseStringUTFChars(level3JS, level3);
+	env->ReleaseStringUTFChars(level2JS, level2);
+	env->ReleaseStringUTFChars(level1JS, level1);
+
+	return (ret) ? ret : (jobjectArray) env->NewObjectArray(0, clazzString, NULL);
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    parseKeyList
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_parseKeyList
+  (JNIEnv *env, jobject me, jstring keyListTextJS) {
+
+	init(); 
+
+	const char *keyListText = env->GetStringUTFChars(keyListTextJS, NULL);
+
+	SWModule *module = getModule(env, me);
+	jclass clazzString = env->FindClass("java/lang/String");
+	jobjectArray ret;
+
+	if (module) {
+		sword::SWKey *k = module->getKey();
+		sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, k);
+		if (parser) {
+			sword::ListKey result;
+			result = parser->parseVerseList(keyListText, *parser, true);
+			int count = 0;
+			for (result = sword::TOP; !result.popError(); result++) {
+				count++;
+			}
+			ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
+
+			count = 0;
+			for (result = sword::TOP; !result.popError(); result++) {
+				env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8((const char *)result)));
+			}
+		}
+		else	{
+			ret = (jobjectArray) env->NewObjectArray(1, clazzString, NULL);
+			env->SetObjectArrayElement(ret, 0, env->NewStringUTF(assureValidUTF8(keyListText)));
+		}
+	}
+
+	env->ReleaseStringUTFChars(keyListTextJS, keyListText);
+
+	return ret;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    hasKeyChildren
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasKeyChildren
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWModule *module = getModule(env, me);
+	jboolean retVal = JNI_FALSE;
+
+	if (module) {
+		sword::SWKey *key = module->getKey();
+
+		TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+		if (tkey) {
+			retVal = (tkey->hasChildren())?JNI_TRUE:JNI_FALSE;
+		}
+	}
+	return retVal;
+}
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getKeyChildren
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_getKeyChildren
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	jclass clazzString = env->FindClass("java/lang/String");
+	jobjectArray ret;
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		sword::SWKey *key = module->getKey();
+		int count = 0;
+
+		sword::VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+		if (vkey) {
+			ret = (jobjectArray) env->NewObjectArray(7, clazzString, NULL);
+			SWBuf num;
+			num.appendFormatted("%d", vkey->getTestament());
+			env->SetObjectArrayElement(ret, 0, env->NewStringUTF(assureValidUTF8(num.c_str())));
+			num = "";
+			num.appendFormatted("%d", vkey->getBook());
+			env->SetObjectArrayElement(ret, 1, env->NewStringUTF(assureValidUTF8(num.c_str())));
+			num = "";
+			num.appendFormatted("%d", vkey->getChapter());
+			env->SetObjectArrayElement(ret, 2, env->NewStringUTF(assureValidUTF8(num.c_str())));
+			num = "";
+			num.appendFormatted("%d", vkey->getVerse());
+			env->SetObjectArrayElement(ret, 3, env->NewStringUTF(assureValidUTF8(num.c_str())));
+			num = "";
+			num.appendFormatted("%d", vkey->getChapterMax());
+			env->SetObjectArrayElement(ret, 4, env->NewStringUTF(assureValidUTF8(num.c_str())));
+			num = "";
+			num.appendFormatted("%d", vkey->getVerseMax());
+			env->SetObjectArrayElement(ret, 5, env->NewStringUTF(assureValidUTF8(num.c_str())));
+			env->SetObjectArrayElement(ret, 6, env->NewStringUTF(assureValidUTF8(vkey->getBookName())));
+		}
+		else {
+			TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+			if (tkey) {
+				if (tkey->firstChild()) {
+					do {
+						count++;
+					}
+					while (tkey->nextSibling());
+					tkey->parent();
+				}
+				ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
+				count = 0;
+				if (tkey->firstChild()) {
+					do {
+						env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(tkey->getLocalName())));
+					}
+					while (tkey->nextSibling());
+					tkey->parent();
+				}
+			}
+		}
+		return ret;
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getKeyParent
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getKeyParent
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWBuf retVal = "";
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+
+		sword::SWKey *key = module->getKey();
+
+		TreeKeyIdx *tkey = SWDYNAMIC_CAST(TreeKeyIdx, key);
+		if (tkey) {
+			if (tkey->parent()) {
+				retVal = tkey->getText();
+			}
+		}
+	}
+	return env->NewStringUTF(assureValidUTF8(retVal));
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    previous
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_previous
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		module->decrement();
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    next
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_next
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		module->increment();
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    begin
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_begin
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		module->setPosition(sword::TOP);
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getStripText
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getStripText
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWBuf retVal = "";
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		retVal = module->stripText();
+	}
+
+	return env->NewStringUTF(assureValidUTF8(retVal));
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getRawEntry
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getRawEntry
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWBuf retVal = "";
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		retVal = module->getRawEntry();
+	}
+
+	return env->NewStringUTF(assureValidUTF8(retVal));
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    setRawEntry
+ * Signature: (Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_setRawEntry
+  (JNIEnv *env, jobject me, jstring newEntryTextJS) {
+
+	init(); 
+
+
+	const char *newEntryText = env->GetStringUTFChars(newEntryTextJS, NULL);
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		module->setEntry(newEntryText);
+	}
+
+	env->ReleaseStringUTFChars(newEntryTextJS, newEntryText);
+}
+
+
+jstring newBigString(JNIEnv *env, const char *buf) {
+	SWBuf str = assureValidUTF8(buf);
+     jclass stringClass = env->FindClass("java/lang/String");
+     jmethodID ctorID = env->GetMethodID(stringClass, "<init>", "([B)V");
+
+	jstring result;
+SWLog::getSystemLog()->logDebug("newBigString: making byte array size: %d", str.size());
+	jbyteArray bytes = env->NewByteArray(str.size());
+SWLog::getSystemLog()->logDebug("newBigString: setting array region");
+
+	env->SetByteArrayRegion(bytes, 0, str.size(), (jbyte *)str.c_str());
+SWLog::getSystemLog()->logDebug("newBigString: newing string");
+	result = (jstring)env->NewObject(stringClass, ctorID, bytes);
+	env->DeleteLocalRef(bytes);
+SWLog::getSystemLog()->logDebug("newBigString: returning");
+	return result;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    getConfigEntry
+ * Signature: (Ljava/lang/String;)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_org_crosswire_android_sword_SWModule_getConfigEntry
+  (JNIEnv *env, jobject me, jstring configKeyJS) {
+
+	init(); 
+
+
+	jstring retVal = 0;
+
+	const char *configKey = env->GetStringUTFChars(configKeyJS, NULL);
+SWLog::getSystemLog()->logDebug("getConfigEntry(%s)\n", configKey);
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		SWBuf about = module->getConfigEntry(configKey);
+		SWBuf assuredBuf = assureValidUTF8(about.c_str());
+		retVal = env->NewStringUTF(assuredBuf.c_str());
+	}
+
+	env->ReleaseStringUTFChars(configKeyJS, configKey);
+
+	return retVal;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    deleteSearchFramework
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_SWModule_deleteSearchFramework
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWModule *module = getModule(env, me);
+
+	if (module) {
+		module->deleteSearchFramework();
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    hasSearchFramework
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_crosswire_android_sword_SWModule_hasSearchFramework
+  (JNIEnv *env, jobject me) {
+
+	init(); 
+
+
+	SWModule *module = getModule(env, me);
+
+	return (module && module->hasSearchFramework()) ? JNI_TRUE : JNI_FALSE;
+}
+
+
+struct pu {
+	pu(JNIEnv *env, jobject pr) : env(env), progressReporter(pr), last(0) {}
+	JNIEnv *env;
+	jobject progressReporter;
+	char last;
+};
+
+
+void percentUpdate(char percent, void *userData) {
+	struct pu *p = (struct pu *)userData;
+
+	if (percent != p->last) {
+		p->last = percent;
+		jclass cls = p->env->GetObjectClass(p->progressReporter);
+		jmethodID mid = p->env->GetMethodID(cls, "progressReport", "(I)V");
+		if (mid != 0) {
+			p->env->CallVoidMethod(p->progressReporter, mid, (jint)percent);
+		}
+	}
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_SWModule
+ * Method:    search
+ * Signature: (Ljava/lang/String;IJLjava/lang/String;Lorg/crosswire/android/sword/SWModule/SearchProgressReporter;)[Lorg/crosswire/android/sword/SWModule/SearchHit;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_SWModule_search
+  (JNIEnv *env, jobject me, jstring expressionJS, jint srchType, jlong flags, jstring scopeJS, jobject progressReporter) {
+
+	init(); 
+
+	const int MAX_RETURN_COUNT = 999999;
+
+	const char *expression = env->GetStringUTFChars(expressionJS, NULL);
+	const char *scope = env->GetStringUTFChars(scopeJS, NULL);
+
+	jclass clazzSearchHit = env->FindClass("org/crosswire/android/sword/SWModule$SearchHit");
+	jobjectArray ret = 0;
+
+	SWModule *module = getModule(env, me);
+
+	struct pu peeuuu(env, progressReporter);
+
+	if (module) {
+		sword::ListKey lscope;
+		sword::ListKey result;
+
+		if ((scope) && (strlen(scope)) > 0) {
+			sword::SWKey *p = module->createKey();
+			sword::VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
+			if (!parser) {
+				delete p;
+				parser = new VerseKey();
+			}
+			*parser = module->getKeyText();
+			lscope = parser->parseVerseList(scope, *parser, true);
+			result = module->search(expression, srchType, flags, &lscope, 0, &percentUpdate, &peeuuu);
+			delete parser;
+		}
+		else	result = module->search(expression, srchType, flags, 0, 0, &percentUpdate, &peeuuu);
+
+		int count = 0;
+		for (result = sword::TOP; !result.popError(); result++) count++;
+
+		if (count > MAX_RETURN_COUNT) count = MAX_RETURN_COUNT;
+
+		ret = (jobjectArray) env->NewObjectArray(count, clazzSearchHit, NULL);
+
+		// if we're sorted by score, let's re-sort by verse, because Java can always re-sort by score
+		result = sword::TOP;
+		if ((count) && (long)result.getElement()->userData)
+			result.sort();
+
+		int i = 0;
+		jstring modName = env->NewStringUTF(assureValidUTF8(module->getName()));
+		jfieldID fieldIDModName = env->GetFieldID(clazzSearchHit, "modName", "Ljava/lang/String;");
+		jfieldID fieldIDKey     = env->GetFieldID(clazzSearchHit, "key"    , "Ljava/lang/String;");
+		jfieldID fieldIDScore   = env->GetFieldID(clazzSearchHit, "score"  , "J");
+		for (result = sword::TOP; !result.popError(); result++) {
+			jfieldID fieldID;
+			jobject searchHit = env->AllocObject(clazzSearchHit); 
+
+			env->SetObjectField(searchHit, fieldIDModName, modName);
+			jstring key = env->NewStringUTF(assureValidUTF8((const char *)result));
+			env->SetObjectField(searchHit, fieldIDKey, key);
+			env->DeleteLocalRef(key);
+			env->SetLongField(searchHit, fieldIDScore, (long)result.getElement()->userData);
+
+			env->SetObjectArrayElement(ret, i++, searchHit);
+			env->DeleteLocalRef(searchHit);
+			if (i >= MAX_RETURN_COUNT) break;
+		}
+		env->DeleteLocalRef(modName);
+	}
+
+	env->ReleaseStringUTFChars(scopeJS, scope);
+	env->ReleaseStringUTFChars(expressionJS, expression);
+
+	return (ret) ? ret : (jobjectArray) env->NewObjectArray(0, clazzSearchHit, NULL);
+}
+
+
+
+// InstallMgr methods ----------------------------------------------------------------------------------
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    reInit
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_reInit
+  (JNIEnv *env, jobject me) {
+
+	delete installMgr;
+	installMgr = 0;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    syncConfig
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_syncConfig
+  (JNIEnv *env, jobject me) {
+
+	initInstall();
+
+	return installMgr->refreshRemoteSourceConfiguration();
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    uninstallModule
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_uninstallModule
+  (JNIEnv *env, jobject me, jstring modNameJS) {
+
+	init();
+	initInstall();
+
+	const char *modName = env->GetStringUTFChars(modNameJS, NULL);
+
+SWLog::getSystemLog()->logDebug("uninstallModule %s\n", modName);
+
+	SWModule *module;
+	ModMap::iterator it = mgr->Modules.find(modName);
+	if (it == mgr->Modules.end()) {
+		return -2;
+	}
+	module = it->second;
+	installMgr->removeModule(mgr, module->getName());
+
+	env->ReleaseStringUTFChars(modNameJS, modName);
+
+	return 0;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    getRemoteSources
+ * Signature: ()[Ljava/lang/String;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteSources
+  (JNIEnv *env, jobject me) {
+
+	initInstall();
+
+	jclass clazzString = env->FindClass("java/lang/String");
+	jobjectArray ret;
+
+	int count = 0;
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
+		count++;
+	}
+	ret = (jobjectArray) env->NewObjectArray(count, clazzString, NULL);
+	count = 0;
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); ++it) {
+		env->SetObjectArrayElement(ret, count++, env->NewStringUTF(assureValidUTF8(it->second->caption.c_str())));
+	}
+
+	return ret;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    refreshRemoteSource
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_refreshRemoteSource
+  (JNIEnv *env, jobject me, jstring sourceNameJS) {
+
+	initInstall();
+
+	const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL);
+
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+		return -3;
+	}
+
+	env->ReleaseStringUTFChars(sourceNameJS, sourceName);
+
+	return installMgr->refreshRemoteSource(source->second);
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    getRemoteModInfoList
+ * Signature: (Ljava/lang/String;)[Lorg/crosswire/android/sword/SWMgr/ModInfo;
+ */
+JNIEXPORT jobjectArray JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModInfoList
+  (JNIEnv *env, jobject me, jstring sourceNameJS) {
+
+SWLog::getSystemLog()->logDebug("getRemoteModInfoList\n");
+	init();
+	initInstall();
+
+	const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL);
+SWLog::getSystemLog()->logDebug("sourceName: %s\n", sourceName);
+
+	jclass clazzModInfo = env->FindClass("org/crosswire/android/sword/SWMgr$ModInfo");
+	jfieldID nameID     = env->GetFieldID(clazzModInfo, "name",        "Ljava/lang/String;");
+	jfieldID descID     = env->GetFieldID(clazzModInfo, "description", "Ljava/lang/String;");
+	jfieldID catID      = env->GetFieldID(clazzModInfo, "category",    "Ljava/lang/String;");
+	jfieldID langID     = env->GetFieldID(clazzModInfo, "language",    "Ljava/lang/String;");
+	jfieldID versionID  = env->GetFieldID(clazzModInfo, "version",     "Ljava/lang/String;");
+	jfieldID deltaID    = env->GetFieldID(clazzModInfo, "delta",       "Ljava/lang/String;");
+
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+SWLog::getSystemLog()->logDebug("remoteListModules returning 0 length array\n");
+		return (jobjectArray) env->NewObjectArray(0, clazzModInfo, NULL);
+	}
+SWLog::getSystemLog()->logDebug("found source: %s\n", sourceName);
+
+	map<SWModule *, int> modStats = installMgr->getModuleStatus(*mgr, *source->second->getMgr());
+
+	int size = 0;
+	for (map<SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); ++it) {
+		size++;
+	}
+
+SWLog::getSystemLog()->logDebug("remoteListModules returning %d length array\n", size);
+	jobjectArray ret = (jobjectArray) env->NewObjectArray(size, clazzModInfo, NULL);
+
+	int i = 0;
+	for (map<SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); ++it) {
+		SWModule *module = it->first;
+		int status = it->second;
+
+		SWBuf version = module->getConfigEntry("Version");
+		SWBuf statusString = " ";
+		if (it->second & InstallMgr::MODSTAT_NEW) statusString = "*";
+		if (it->second & InstallMgr::MODSTAT_OLDER) statusString = "-";
+		if (it->second & InstallMgr::MODSTAT_UPDATED) statusString = "+";
+
+		SWBuf type = module->getType();
+		SWBuf cat = module->getConfigEntry("Category");
+		if (cat.length() > 0) type = cat;
+		jobject modInfo = env->AllocObject(clazzModInfo); 
+
+		jstring val;
+		val = env->NewStringUTF(assureValidUTF8(module->getName()));        env->SetObjectField(modInfo, nameID   , val); env->DeleteLocalRef(val);
+		val = env->NewStringUTF(assureValidUTF8(module->getDescription())); env->SetObjectField(modInfo, descID   , val); env->DeleteLocalRef(val);
+		val = env->NewStringUTF(assureValidUTF8(type.c_str()));          env->SetObjectField(modInfo, catID    , val); env->DeleteLocalRef(val);
+		val = env->NewStringUTF(assureValidUTF8(module->getLanguage()));        env->SetObjectField(modInfo, langID   , val); env->DeleteLocalRef(val);
+		val = env->NewStringUTF(assureValidUTF8(version.c_str()));       env->SetObjectField(modInfo, versionID, val); env->DeleteLocalRef(val);
+		val = env->NewStringUTF(assureValidUTF8(statusString.c_str()));  env->SetObjectField(modInfo, deltaID  , val); env->DeleteLocalRef(val);
+
+		env->SetObjectArrayElement(ret, i++, modInfo);
+
+		env->DeleteLocalRef(modInfo);
+	}
+
+	env->ReleaseStringUTFChars(sourceNameJS, sourceName);
+
+	return ret;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    remoteInstallModule
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_crosswire_android_sword_InstallMgr_remoteInstallModule
+  (JNIEnv *env, jobject me, jstring sourceNameJS, jstring modNameJS) {
+
+	initInstall();
+
+	const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL);
+SWLog::getSystemLog()->logDebug("remoteInstallModule: sourceName: %s\n", sourceName);
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	env->ReleaseStringUTFChars(sourceNameJS, sourceName);
+
+	if (source == installMgr->sources.end()) {
+		return -3;
+	}
+
+	InstallSource *is = source->second;
+	SWMgr *rmgr = is->getMgr();
+	SWModule *module;
+
+	const char *modName = env->GetStringUTFChars(modNameJS, NULL);
+SWLog::getSystemLog()->logDebug("remoteInstallModule: modName: %s\n", modName);
+	ModMap::iterator it = rmgr->Modules.find(modName);
+	env->ReleaseStringUTFChars(modNameJS, modName);
+
+	if (it == rmgr->Modules.end()) {
+		return -4;
+	}
+
+	module = it->second;
+
+	int error = installMgr->installModule(mgr, 0, module->getName(), is);
+
+	return error;
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    getRemoteModuleByName
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Lorg/crosswire/android/sword/SWModule;
+ */
+JNIEXPORT jobject JNICALL Java_org_crosswire_android_sword_InstallMgr_getRemoteModuleByName
+  (JNIEnv *env, jobject me, jstring sourceNameJS, jstring modNameJS) {
+
+	jobject retVal = 0;
+
+	initInstall();
+
+	const char *sourceName = env->GetStringUTFChars(sourceNameJS, NULL);
+SWLog::getSystemLog()->logDebug("getRemoteModuleByName: sourceName: %s\n", sourceName);
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	env->ReleaseStringUTFChars(sourceNameJS, sourceName);
+
+	if (source == installMgr->sources.end()) {
+SWLog::getSystemLog()->logDebug("Couldn't find remote source [%s]\n", sourceName);
+		return 0;
+	}
+
+	SWMgr *mgr = source->second->getMgr();
+
+     const char *modName = env->GetStringUTFChars(modNameJS, NULL);
+	sword::SWModule *module = mgr->getModule(modName);
+     env->ReleaseStringUTFChars(modNameJS, modName);
+
+	if (module) {
+		SWBuf type = module->getType();
+		SWBuf cat = module->getConfigEntry("Category");
+		if (cat.length() > 0) type = cat;
+		jfieldID fieldID;
+		jclass clazzSWModule = env->FindClass("org/crosswire/android/sword/SWModule");
+		retVal = env->AllocObject(clazzSWModule); 
+		fieldID = env->GetFieldID(clazzSWModule, "name", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getName())));
+		fieldID = env->GetFieldID(clazzSWModule, "description", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(module->getDescription())));
+		fieldID = env->GetFieldID(clazzSWModule, "category", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, env->NewStringUTF(assureValidUTF8(type.c_str())));
+		fieldID = env->GetFieldID(clazzSWModule, "remoteSourceName", "Ljava/lang/String;"); env->SetObjectField(retVal, fieldID, sourceNameJS);
+	}
+
+	return retVal;
+
+}
+
+
+/*
+ * Class:     org_crosswire_android_sword_InstallMgr
+ * Method:    setUserDisclaimerConfirmed
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_org_crosswire_android_sword_InstallMgr_setUserDisclaimerConfirmed
+  (JNIEnv *env, jobject me) {
+
+	initInstall();
+
+	installMgr->setUserDisclaimerConfirmed(true);
+}
+
diff --git a/bindings/java-jni/jni/webmgr.hpp b/bindings/java-jni/jni/webmgr.hpp
new file mode 100644
index 0000000..e70adbf
--- /dev/null
+++ b/bindings/java-jni/jni/webmgr.hpp
@@ -0,0 +1,120 @@
+/******************************************************************************
+ *
+ *  webmgr.cpp -	
+ *
+ * $Id: webmgr.hpp 2894 2013-07-16 04:38:43Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef WEBMGR_HPP
+#define WEBMGR_HPP
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <swfilter.h>
+#include <markupfiltmgr.h>
+#include <osiswordjs.h>
+#include <thmlwordjs.h>
+#include <gbfwordjs.h>
+
+using namespace sword;
+
+class WebMgr : public SWMgr {
+	OSISWordJS *osisWordJS;
+	ThMLWordJS *thmlWordJS;
+	GBFWordJS *gbfWordJS;
+	SWModule *defaultGreekLex;
+	SWModule *defaultHebLex;
+	SWModule *defaultGreekParse;
+	SWModule *defaultHebParse;
+
+public:
+//	WebMgr(SWConfig *sysConf) : SWMgr(0, sysConf, false, new MarkupFilterMgr(FMT_WEBIF)) {
+	WebMgr(const char *path) : SWMgr(path, false, new MarkupFilterMgr(FMT_WEBIF)) {
+		defaultGreekLex   = 0;
+		defaultHebLex     = 0;
+		defaultGreekParse = 0;
+		defaultHebParse   = 0;
+
+		osisWordJS = new OSISWordJS();
+		thmlWordJS = new ThMLWordJS();
+		gbfWordJS = new GBFWordJS();
+		Load();
+		osisWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse);
+		thmlWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse);
+		gbfWordJS->setDefaultModules(defaultGreekLex, defaultHebLex, defaultGreekParse, defaultHebParse);
+		osisWordJS->setMgr(this);
+		thmlWordJS->setMgr(this);
+		gbfWordJS->setMgr(this);
+		setGlobalOption("Textual Variants", "Primary Reading");
+	}
+
+	~WebMgr() {
+		delete osisWordJS;
+		delete thmlWordJS;
+		delete gbfWordJS;
+	}
+
+
+	void AddGlobalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
+
+		// ThML word stuff needs to process before strongs strip
+		if (module->getMarkup() == FMT_THML) {
+			module->addOptionFilter(thmlWordJS);
+		}
+
+		if (module->getMarkup() == FMT_GBF) {
+			module->addOptionFilter(gbfWordJS);
+		}
+
+		// add other module filters
+		SWMgr::AddGlobalOptions(module, section, start, end);
+
+		// add our special filters
+		if (module->getConfig().has("Feature", "GreekDef")) {
+			defaultGreekLex = module;
+		}
+		if (module->getConfig().has("Feature", "HebrewDef")) {
+			defaultHebLex = module;
+		}
+		if (module->getConfig().has("Feature", "GreekParse")) {
+			defaultGreekParse = module;
+		}
+		if (module->getConfig().has("Feature", "HebrewParse")) {
+			defaultHebParse = module;
+		}
+		if (module->getConfig().has("GlobalOptionFilter", "ThMLVariants")) {
+			OptionFilterMap::iterator it = optionFilters.find("ThMLVariants");
+			if (it != optionFilters.end()) {
+				module->addOptionFilter((*it).second);	// add filter to module and option as a valid option
+			}
+		}
+
+		if (module->getMarkup() == FMT_OSIS) {
+			module->addOptionFilter(osisWordJS);
+		}
+	}
+
+
+	void setJavascript(bool val) {
+		osisWordJS->setOptionValue((val)?"On":"Off");
+		thmlWordJS->setOptionValue((val)?"On":"Off");
+		gbfWordJS->setOptionValue((val)?"On":"Off");
+	}
+};
+
+#endif
diff --git a/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java b/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java
new file mode 100644
index 0000000..3edbd58
--- /dev/null
+++ b/bindings/java-jni/src/org/crosswire/android/sword/InstallMgr.java
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  InstallMgr.java -	
+ *
+ * $Id: InstallMgr.java 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+package org.crosswire.android.sword;
+
+public class InstallMgr {
+
+	public native void reInit();
+
+	public native void             setUserDisclaimerConfirmed();
+	public native int              syncConfig();
+	public native int              uninstallModule(String modName);
+	public native String []        getRemoteSources();
+	public native int              refreshRemoteSource(String sourceName);
+	public native SWMgr.ModInfo [] getRemoteModInfoList(String sourceName);
+	public native int              remoteInstallModule(String sourceName, String modName);
+	public native SWModule         getRemoteModuleByName(String source, String name);
+
+}
+
diff --git a/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java b/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java
new file mode 100644
index 0000000..2ae2e01
--- /dev/null
+++ b/bindings/java-jni/src/org/crosswire/android/sword/SWMgr.java
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ *  SWMgr.java -	
+ *
+ * $Id: SWMgr.java 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+package org.crosswire.android.sword;
+
+public class SWMgr {
+	
+	static {
+		System.loadLibrary("sword");
+	}
+
+	public static class ModInfo {
+		public String name;
+		public String description;
+		public String category;
+		public String language;
+		public String version;
+		public String delta;
+	}
+
+
+	public native String version();
+	public native void reInit();
+
+	public native ModInfo[]   getModInfoList();
+	public native SWModule    getModuleByName(String name);
+	public native String      getPrefixPath();
+	public native String      getConfigPath();
+	public native void        setGlobalOption(String option, String value);
+	public native String      getGlobalOption(String option);
+	public native String      getGlobalOptionTip(String option);
+	public native String      filterText(String filterName, String text);
+	public native String[]    getGlobalOptions();
+	public native String[]    getGlobalOptionValues(String option);
+	public native void        setCipherKey(String modName, String key);
+	public native void        setJavascript(boolean val);
+	public native String[]    getAvailableLocales();
+	public native void        setDefaultLocale(String name);
+}
+
+
diff --git a/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java b/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java
new file mode 100644
index 0000000..c7d4707
--- /dev/null
+++ b/bindings/java-jni/src/org/crosswire/android/sword/SWModule.java
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
+ *  SWModule.java -	
+ *
+ * $Id: SWModule.java 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+package org.crosswire.android.sword;
+
+public class SWModule {
+
+	private String name;
+	private String description;
+	private String category;
+	
+	// if this is a shell module from a remote source...
+	private String remoteSourceName;
+
+
+	public static final int SEARCHTYPE_REGEX     =  1;
+	public static final int SEARCHTYPE_PHRASE    = -1;
+	public static final int SEARCHTYPE_MULTIWORD = -2;
+	public static final int SEARCHTYPE_ENTRYATTR = -3;
+	public static final int SEARCHTYPE_LUCENE    = -4;
+
+	private SWModule() {}	// don't allow allocation, instead use factory method SWMgr.getModuleByName to retrieve an instance
+
+	public static class SearchHit {
+		public String modName;
+		public String key;
+		public long   score;
+	}
+	
+	public static interface SearchProgressReporter {
+		public void progressReport(int percent);
+	}
+
+	public native void          terminateSearch();
+	public native SearchHit[]   search(String expression, int searchType, long flags, String scope, SearchProgressReporter progressReporter);
+	public SearchHit[]          search(String expression) { return search(expression, SEARCHTYPE_MULTIWORD, 0, "", null); }
+	public native char          error();
+	public native long          getEntrySize();
+	public native String[]      getEntryAttribute(String level1, String level2, String level3, boolean filtered);
+	public native String[]      parseKeyList(String keyText);
+
+	// Special values handled for VerseKey modules: [+-][book|chapter]
+	//	(e.g.	"+chapter" will increment the VerseKey 1 chapter)
+	public native void          setKeyText(String key);
+
+	public native String        getKeyText();
+	public native boolean       hasKeyChildren();
+
+	// This method returns child nodes for a genbook,
+	// but has special handling if called on a VerseKey module:
+	//  [0..6] [testament, book, chapter, verse, chapterMax, verseMax, bookName]
+	public native String[]      getKeyChildren();
+
+	public native String        getKeyParent();
+	public String               getName()		{ return name; }
+	public String               getDescription()	{ return description; }
+	public String               getCategory()	{ return category; }
+	public native void          previous();
+	public native void          next();
+	public native void          begin();
+	public native String        getStripText();
+	public native String        getRenderText();
+	public native String        getRawEntry();
+	public native void          setRawEntry(String entryBuffer);
+	public native String        getConfigEntry(String key);
+	public native void          deleteSearchFramework();
+	public native boolean       hasSearchFramework();
+}
diff --git a/bindings/objc/English.lproj/InfoPlist.strings b/bindings/objc/English.lproj/InfoPlist.strings
new file mode 100644
index 0000000..88f65cf
--- /dev/null
+++ b/bindings/objc/English.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/bindings/objc/Info copy.plist b/bindings/objc/Info copy.plist
new file mode 100644
index 0000000..3172915
--- /dev/null
+++ b/bindings/objc/Info copy.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>org.crosswire.ObjCSword</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/bindings/objc/Info.plist b/bindings/objc/Info.plist
new file mode 100644
index 0000000..214f4b2
--- /dev/null
+++ b/bindings/objc/Info.plist
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>org.crosswire.ObjCSword</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/bindings/objc/ObjCSword.h b/bindings/objc/ObjCSword.h
new file mode 100644
index 0000000..5f2f5ce
--- /dev/null
+++ b/bindings/objc/ObjCSword.h
@@ -0,0 +1,31 @@
+/*
+ *  ObjCSword.h
+ *  ObjCSword
+ *
+ *  Created by Manfred Bergmann on 15.06.10.
+ *  Copyright 2010 Software by MABE. All rights reserved.
+ *
+ */
+
+#import <ObjCSword/SwordManager.h>
+#import <ObjCSword/SwordLocaleManager.h>
+#import <ObjCSword/SwordVerseManager.h>
+#import <ObjCSword/SwordModule.h>
+#import <ObjCSword/SwordBible.h>
+#import <ObjCSword/SwordCommentary.h>
+#import <ObjCSword/SwordDictionary.h>
+#import <ObjCSword/SwordBook.h>
+#import <ObjCSword/SwordKey.h>
+#import <ObjCSword/SwordVerseKey.h>
+#import <ObjCSword/SwordListKey.h>
+#import <ObjCSword/SwordBibleBook.h>
+#import <ObjCSword/SwordBibleChapter.h>
+#import <ObjCSword/SwordBibleTextEntry.h>
+#import <ObjCSword/SwordVerseManager.h>
+#import <ObjCSword/SwordInstallSource.h>
+#import <ObjCSword/SwordInstallSourceManager.h>
+#import <ObjCSword/SwordModuleTextEntry.h>
+#import <ObjCSword/SwordModuleTreeEntry.h>
+#import <ObjCSword/VerseEnumerator.h>
+#import <ObjCSword/Configuration.h>
+#import <ObjCSword/OSXConfiguration.h>
diff --git a/bindings/objc/ObjCSword.xcodeproj/project.pbxproj b/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..8598424
--- /dev/null
+++ b/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
@@ -0,0 +1,5049 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		A9D271FA14D7193300DA8926 /* Utilities */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = A9D271FB14D7193300DA8926 /* Build configuration list for PBXAggregateTarget "Utilities" */;
+			buildPhases = (
+			);
+			dependencies = (
+				A9D271FF14D7193A00DA8926 /* PBXTargetDependency */,
+				A9D2720114D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2720314D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2720514D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2720714D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2720914D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2720B14D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2720D14D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2720F14D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721114D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721314D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721514D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721714D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721914D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721B14D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721D14D7194E00DA8926 /* PBXTargetDependency */,
+				A9D2721F14D7194E00DA8926 /* PBXTargetDependency */,
+			);
+			name = Utilities;
+			productName = Utilities;
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		8C92C31DC92DF0671FCEB5B3 /* SwordFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */; };
+		8C92CC7B68FDCDFFFB8B4A31 /* DefaultFilterProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */; };
+		8C92CE0B19FBB659FB8F8B71 /* FilterProviderFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */; };
+		8C92CE39E231FF9CAAB5308B /* SwordUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C291C40A77060C12A21B /* SwordUtil.m */; };
+		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
+		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
+		A917AF2616B1BE38006367FC /* Tests-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A917AF2516B1BE38006367FC /* Tests-Info.plist */; };
+		A91C8B6817523609008702B9 /* versificationmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A91C8B66175233F3008702B9 /* versificationmgr.cpp */; };
+		A929619C16B1BA240094E5BE /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */; };
+		A929619D16B1BA240094E5BE /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619716B1BA240094E5BE /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A929619E16B1BA240094E5BE /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A929619816B1BA240094E5BE /* SwordKey.mm */; };
+		A929619F16B1BA240094E5BE /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619916B1BA240094E5BE /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A92961A016B1BA240094E5BE /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A929619A16B1BA240094E5BE /* SwordListKey.mm */; };
+		A92961A116B1BA240094E5BE /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619B16B1BA240094E5BE /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC0B117B28920018B06F /* SwordBible.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE3117B28910018B06F /* SwordBible.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE4117B28910018B06F /* SwordBible.mm */; };
+		A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE5117B28920018B06F /* SwordBibleBook.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE6117B28920018B06F /* SwordBibleBook.mm */; };
+		A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE7117B28920018B06F /* SwordBibleChapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE8117B28920018B06F /* SwordBibleChapter.m */; };
+		A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC13117B28920018B06F /* SwordBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEB117B28920018B06F /* SwordBook.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC14117B28920018B06F /* SwordBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEC117B28920018B06F /* SwordBook.mm */; };
+		A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABED117B28920018B06F /* SwordCommentary.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEE117B28920018B06F /* SwordCommentary.mm */; };
+		A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEF117B28920018B06F /* SwordDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF0117B28920018B06F /* SwordDictionary.mm */; };
+		A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF1117B28920018B06F /* SwordInstallSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF2117B28920018B06F /* SwordInstallSource.mm */; };
+		A94EAC1B117B28920018B06F /* SwordInstallSourceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF3117B28920018B06F /* SwordInstallSourceManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC1C117B28920018B06F /* SwordInstallSourceManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF4117B28920018B06F /* SwordInstallSourceManager.mm */; };
+		A94EAC21117B28920018B06F /* SwordManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF9117B28920018B06F /* SwordManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC22117B28920018B06F /* SwordManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFA117B28920018B06F /* SwordManager.mm */; };
+		A94EAC25117B28920018B06F /* SwordModule.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFD117B28920018B06F /* SwordModule.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC26117B28920018B06F /* SwordModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFE117B28920018B06F /* SwordModule.mm */; };
+		A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */; };
+		A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */; };
+		A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC06117B28920018B06F /* SwordVerseKey.mm */; };
+		A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC07117B28920018B06F /* SwordVerseManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC08117B28920018B06F /* SwordVerseManager.mm */; };
+		A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC09117B28920018B06F /* VerseEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC0A117B28920018B06F /* VerseEnumerator.mm */; };
+		A954ABCB13EE9E460094E3FE /* AnalysisHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */; };
+		A954ABCC13EE9E460094E3FE /* Analyzers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */; };
+		A954ABCD13EE9E470094E3FE /* StandardAnalyzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9E913EE9A2B0094E3FE /* StandardAnalyzer.cpp */; };
+		A954ABCE13EE9E470094E3FE /* StandardFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9EB13EE9A2B0094E3FE /* StandardFilter.cpp */; };
+		A954ABCF13EE9E470094E3FE /* StandardTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9ED13EE9A2B0094E3FE /* StandardTokenizer.cpp */; };
+		A954ABD013EE9E470094E3FE /* gunichartables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9F913EE9A2B0094E3FE /* gunichartables.cpp */; };
+		A954ABD113EE9E470094E3FE /* repl_lltot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A9FE13EE9A2B0094E3FE /* repl_lltot.cpp */; };
+		A954ABD213EE9E470094E3FE /* repl_tcscasecmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0013EE9A2B0094E3FE /* repl_tcscasecmp.cpp */; };
+		A954ABD313EE9E470094E3FE /* repl_tcslwr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0113EE9A2B0094E3FE /* repl_tcslwr.cpp */; };
+		A954ABD413EE9E470094E3FE /* repl_tcstod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0213EE9A2B0094E3FE /* repl_tcstod.cpp */; };
+		A954ABD513EE9E470094E3FE /* repl_tcstoll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0313EE9A2B0094E3FE /* repl_tcstoll.cpp */; };
+		A954ABD613EE9E470094E3FE /* repl_tprintf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0413EE9A2B0094E3FE /* repl_tprintf.cpp */; };
+		A954ABD713EE9E470094E3FE /* threads.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0813EE9A2B0094E3FE /* threads.cpp */; };
+		A954ABD813EE9E470094E3FE /* utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0913EE9A2B0094E3FE /* utf8.cpp */; };
+		A954ABD913EE9E470094E3FE /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0B13EE9A2B0094E3FE /* condition.cpp */; };
+		A954ABDA13EE9E470094E3FE /* error.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA0D13EE9A2B0094E3FE /* error.cpp */; };
+		A954ABDB13EE9E470094E3FE /* memtracking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1113EE9A2B0094E3FE /* memtracking.cpp */; };
+		A954ABDC13EE9E470094E3FE /* DateField.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1313EE9A2B0094E3FE /* DateField.cpp */; };
+		A954ABDD13EE9E470094E3FE /* Document.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1513EE9A2B0094E3FE /* Document.cpp */; };
+		A954ABDE13EE9E470094E3FE /* Field.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1713EE9A2B0094E3FE /* Field.cpp */; };
+		A954ABDF13EE9E470094E3FE /* CompoundFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1A13EE9A2B0094E3FE /* CompoundFile.cpp */; };
+		A954ABE013EE9E470094E3FE /* DocumentWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1C13EE9A2B0094E3FE /* DocumentWriter.cpp */; };
+		A954ABE113EE9E470094E3FE /* FieldInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA1F13EE9A2B0094E3FE /* FieldInfos.cpp */; };
+		A954ABE213EE9E470094E3FE /* FieldsReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2113EE9A2B0094E3FE /* FieldsReader.cpp */; };
+		A954ABE313EE9E470094E3FE /* FieldsWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2313EE9A2B0094E3FE /* FieldsWriter.cpp */; };
+		A954ABE413EE9E470094E3FE /* IndexModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2513EE9A2B0094E3FE /* IndexModifier.cpp */; };
+		A954ABE513EE9E470094E3FE /* IndexReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2713EE9A2B0094E3FE /* IndexReader.cpp */; };
+		A954ABE613EE9E470094E3FE /* IndexWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2913EE9A2B0094E3FE /* IndexWriter.cpp */; };
+		A954ABE713EE9E470094E3FE /* MultiReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2B13EE9A2B0094E3FE /* MultiReader.cpp */; };
+		A954ABE813EE9E470094E3FE /* SegmentInfos.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA2E13EE9A2B0094E3FE /* SegmentInfos.cpp */; };
+		A954ABE913EE9E470094E3FE /* SegmentMergeInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3013EE9A2B0094E3FE /* SegmentMergeInfo.cpp */; };
+		A954ABEA13EE9E470094E3FE /* SegmentMergeQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3213EE9A2B0094E3FE /* SegmentMergeQueue.cpp */; };
+		A954ABEB13EE9E470094E3FE /* SegmentMerger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3413EE9A2B0094E3FE /* SegmentMerger.cpp */; };
+		A954ABEC13EE9E470094E3FE /* SegmentReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3613EE9A2B0094E3FE /* SegmentReader.cpp */; };
+		A954ABED13EE9E470094E3FE /* SegmentTermDocs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3713EE9A2B0094E3FE /* SegmentTermDocs.cpp */; };
+		A954ABEE13EE9E470094E3FE /* SegmentTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3813EE9A2B0094E3FE /* SegmentTermEnum.cpp */; };
+		A954ABEF13EE9E470094E3FE /* SegmentTermPositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3A13EE9A2B0094E3FE /* SegmentTermPositions.cpp */; };
+		A954ABF013EE9E470094E3FE /* SegmentTermVector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3B13EE9A2B0094E3FE /* SegmentTermVector.cpp */; };
+		A954ABF113EE9E470094E3FE /* Term.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3C13EE9A2B0094E3FE /* Term.cpp */; };
+		A954ABF213EE9E470094E3FE /* TermInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA3E13EE9A2B0094E3FE /* TermInfo.cpp */; };
+		A954ABF313EE9E470094E3FE /* TermInfosReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4013EE9A2B0094E3FE /* TermInfosReader.cpp */; };
+		A954ABF413EE9E470094E3FE /* TermInfosWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4213EE9A2B0094E3FE /* TermInfosWriter.cpp */; };
+		A954ABF513EE9E470094E3FE /* TermVectorReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4613EE9A2B0094E3FE /* TermVectorReader.cpp */; };
+		A954ABF613EE9E470094E3FE /* TermVectorWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4713EE9A2B0094E3FE /* TermVectorWriter.cpp */; };
+		A954ABF713EE9E470094E3FE /* Lexer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4A13EE9A2B0094E3FE /* Lexer.cpp */; };
+		A954ABF813EE9E470094E3FE /* MultiFieldQueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4C13EE9A2B0094E3FE /* MultiFieldQueryParser.cpp */; };
+		A954ABF913EE9E470094E3FE /* QueryParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA4E13EE9A2B0094E3FE /* QueryParser.cpp */; };
+		A954ABFA13EE9E470094E3FE /* QueryParserBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5013EE9A2B0094E3FE /* QueryParserBase.cpp */; };
+		A954ABFB13EE9E470094E3FE /* QueryToken.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5213EE9A2B0094E3FE /* QueryToken.cpp */; };
+		A954ABFC13EE9E470094E3FE /* TokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5413EE9A2B0094E3FE /* TokenList.cpp */; };
+		A954ABFD13EE9E470094E3FE /* BooleanQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5813EE9A2B0094E3FE /* BooleanQuery.cpp */; };
+		A954ABFE13EE9E470094E3FE /* BooleanScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5A13EE9A2B0094E3FE /* BooleanScorer.cpp */; };
+		A954ABFF13EE9E470094E3FE /* CachingWrapperFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5C13EE9A2B0094E3FE /* CachingWrapperFilter.cpp */; };
+		A954AC0013EE9E470094E3FE /* ChainedFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA5E13EE9A2B0094E3FE /* ChainedFilter.cpp */; };
+		A954AC0113EE9E470094E3FE /* ConjunctionScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6113EE9A2B0094E3FE /* ConjunctionScorer.cpp */; };
+		A954AC0213EE9E470094E3FE /* DateFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6313EE9A2B0094E3FE /* DateFilter.cpp */; };
+		A954AC0313EE9E470094E3FE /* ExactPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6513EE9A2B0094E3FE /* ExactPhraseScorer.cpp */; };
+		A954AC0413EE9E470094E3FE /* Explanation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6713EE9A2B0094E3FE /* Explanation.cpp */; };
+		A954AC0513EE9E470094E3FE /* FieldCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6913EE9A2B0094E3FE /* FieldCache.cpp */; };
+		A954AC0613EE9E470094E3FE /* FieldCacheImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6B13EE9A2B0094E3FE /* FieldCacheImpl.cpp */; };
+		A954AC0713EE9E470094E3FE /* FieldDocSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA6E13EE9A2B0094E3FE /* FieldDocSortedHitQueue.cpp */; };
+		A954AC0813EE9E470094E3FE /* FieldSortedHitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7013EE9A2B0094E3FE /* FieldSortedHitQueue.cpp */; };
+		A954AC0913EE9E470094E3FE /* FilteredTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7313EE9A2B0094E3FE /* FilteredTermEnum.cpp */; };
+		A954AC0A13EE9E470094E3FE /* FuzzyQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7513EE9A2B0094E3FE /* FuzzyQuery.cpp */; };
+		A954AC0B13EE9E470094E3FE /* HitQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7713EE9A2B0094E3FE /* HitQueue.cpp */; };
+		A954AC0C13EE9E470094E3FE /* Hits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7913EE9A2B0094E3FE /* Hits.cpp */; };
+		A954AC0D13EE9E470094E3FE /* IndexSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7A13EE9A2B0094E3FE /* IndexSearcher.cpp */; };
+		A954AC0E13EE9E470094E3FE /* MultiSearcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7C13EE9A2B0094E3FE /* MultiSearcher.cpp */; };
+		A954AC0F13EE9E470094E3FE /* MultiTermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA7E13EE9A2B0094E3FE /* MultiTermQuery.cpp */; };
+		A954AC1013EE9E470094E3FE /* PhrasePositions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8013EE9A2B0094E3FE /* PhrasePositions.cpp */; };
+		A954AC1113EE9E470094E3FE /* PhraseQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8213EE9A2B0094E3FE /* PhraseQuery.cpp */; };
+		A954AC1213EE9E470094E3FE /* PhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8513EE9A2B0094E3FE /* PhraseScorer.cpp */; };
+		A954AC1313EE9E470094E3FE /* PrefixQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8713EE9A2B0094E3FE /* PrefixQuery.cpp */; };
+		A954AC1413EE9E470094E3FE /* QueryFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8913EE9A2B0094E3FE /* QueryFilter.cpp */; };
+		A954AC1513EE9E470094E3FE /* RangeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8B13EE9A2B0094E3FE /* RangeFilter.cpp */; };
+		A954AC1613EE9E470094E3FE /* RangeQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA8D13EE9A2B0094E3FE /* RangeQuery.cpp */; };
+		A954AC1713EE9E470094E3FE /* SearchHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9013EE9A2B0094E3FE /* SearchHeader.cpp */; };
+		A954AC1813EE9E470094E3FE /* Similarity.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9213EE9A2B0094E3FE /* Similarity.cpp */; };
+		A954AC1913EE9E470094E3FE /* SloppyPhraseScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9413EE9A2B0094E3FE /* SloppyPhraseScorer.cpp */; };
+		A954AC1A13EE9E470094E3FE /* Sort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9613EE9A2B0094E3FE /* Sort.cpp */; };
+		A954AC1B13EE9E470094E3FE /* TermQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9813EE9A2B0094E3FE /* TermQuery.cpp */; };
+		A954AC1C13EE9E470094E3FE /* TermScorer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9A13EE9A2B0094E3FE /* TermScorer.cpp */; };
+		A954AC1D13EE9E470094E3FE /* WildcardQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9C13EE9A2B0094E3FE /* WildcardQuery.cpp */; };
+		A954AC1E13EE9E470094E3FE /* WildcardTermEnum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AA9E13EE9A2B0094E3FE /* WildcardTermEnum.cpp */; };
+		A954AC1F13EE9E470094E3FE /* StdHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA013EE9A2B0094E3FE /* StdHeader.cpp */; };
+		A954AC2013EE9E470094E3FE /* FSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA413EE9A2B0094E3FE /* FSDirectory.cpp */; };
+		A954AC2113EE9E470094E3FE /* IndexInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA613EE9A2B0094E3FE /* IndexInput.cpp */; };
+		A954AC2213EE9E470094E3FE /* IndexOutput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAA813EE9A2B0094E3FE /* IndexOutput.cpp */; };
+		A954AC2313EE9E470094E3FE /* Lock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAB13EE9A2B0094E3FE /* Lock.cpp */; };
+		A954AC2413EE9E470094E3FE /* MMapInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAD13EE9A2B0094E3FE /* MMapInput.cpp */; };
+		A954AC2513EE9E470094E3FE /* RAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAAF13EE9A2B0094E3FE /* RAMDirectory.cpp */; };
+		A954AC2613EE9E470094E3FE /* TransactionalRAMDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB113EE9A2B0094E3FE /* TransactionalRAMDirectory.cpp */; };
+		A954AC2713EE9E470094E3FE /* BitSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB513EE9A2B0094E3FE /* BitSet.cpp */; };
+		A954AC2813EE9E470094E3FE /* dirent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAB813EE9A2B0094E3FE /* dirent.cpp */; };
+		A954AC2913EE9E470094E3FE /* Equators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABA13EE9A2B0094E3FE /* Equators.cpp */; };
+		A954AC2A13EE9E470094E3FE /* FastCharStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABC13EE9A2B0094E3FE /* FastCharStream.cpp */; };
+		A954AC2B13EE9E470094E3FE /* fileinputstream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AABE13EE9A2B0094E3FE /* fileinputstream.cpp */; };
+		A954AC2C13EE9E470094E3FE /* MD5Digester.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC313EE9A2B0094E3FE /* MD5Digester.cpp */; };
+		A954AC2D13EE9E470094E3FE /* Misc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC513EE9A2B0094E3FE /* Misc.cpp */; };
+		A954AC2E13EE9E470094E3FE /* Reader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAC813EE9A2B0094E3FE /* Reader.cpp */; };
+		A954AC2F13EE9E470094E3FE /* StringBuffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AACB13EE9A2B0094E3FE /* StringBuffer.cpp */; };
+		A954AC3013EE9E470094E3FE /* StringIntern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AACD13EE9A2B0094E3FE /* StringIntern.cpp */; };
+		A954AC3113EE9E470094E3FE /* ThreadLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954AAD113EE9A2B0094E3FE /* ThreadLocal.cpp */; };
+		A954AC3313EE9F620094E3FE /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3213EE9F620094E3FE /* libcurl.dylib */; };
+		A954AC3713EE9FA10094E3FE /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3413EE9FA10094E3FE /* libicucore.dylib */; };
+		A954AC3813EE9FA10094E3FE /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3513EE9FA10094E3FE /* libstdc++.dylib */; };
+		A954AC3913EE9FA10094E3FE /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954AC3613EE9FA10094E3FE /* libz.dylib */; };
+		A954AC3A13EEA0C10094E3FE /* swdisp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80113EE98B30094E3FE /* swdisp.cpp */; };
+		A954AC3B13EEA0C10094E3FE /* swlog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80213EE98B30094E3FE /* swlog.cpp */; };
+		A954AC3C13EEA0C10094E3FE /* listkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A80913EE98B30094E3FE /* listkey.cpp */; };
+		A954AC3D13EEA0C10094E3FE /* strkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81013EE98B30094E3FE /* strkey.cpp */; };
+		A954AC3E13EEA0C10094E3FE /* swkey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81113EE98B30094E3FE /* swkey.cpp */; };
+		A954AC3F13EEA0C10094E3FE /* treekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81213EE98B30094E3FE /* treekey.cpp */; };
+		A954AC4013EEA0C10094E3FE /* treekeyidx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81313EE98B30094E3FE /* treekeyidx.cpp */; };
+		A954AC4113EEA0C10094E3FE /* versekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81413EE98B30094E3FE /* versekey.cpp */; };
+		A954AC4213EEA0C10094E3FE /* versetreekey.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81513EE98B30094E3FE /* versetreekey.cpp */; };
+		A954AC4313EEA0C10094E3FE /* curlftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81813EE98B30094E3FE /* curlftpt.cpp */; };
+		A954AC4413EEA0C10094E3FE /* curlhttpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81913EE98B30094E3FE /* curlhttpt.cpp */; };
+		A954AC4513EEA0C10094E3FE /* encfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */; };
+		A954AC4613EEA0C10094E3FE /* filemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81B13EE98B30094E3FE /* filemgr.cpp */; };
+		A954AC4713EEA0C10094E3FE /* ftplibftpt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */; };
+		A954AC4913EEA0C10094E3FE /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81E13EE98B30094E3FE /* installmgr.cpp */; };
+		A954AC4A13EEA0C10094E3FE /* localemgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A81F13EE98B30094E3FE /* localemgr.cpp */; };
+		A954AC4B13EEA0C10094E3FE /* markupfiltmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */; };
+		A954AC4C13EEA0C10094E3FE /* stringmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82313EE98B30094E3FE /* stringmgr.cpp */; };
+		A954AC4D13EEA0C10094E3FE /* swcacher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82413EE98B30094E3FE /* swcacher.cpp */; };
+		A954AC4E13EEA0C10094E3FE /* swconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82513EE98B30094E3FE /* swconfig.cpp */; };
+		A954AC4F13EEA0C10094E3FE /* swfiltermgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82613EE98B30094E3FE /* swfiltermgr.cpp */; };
+		A954AC5013EEA0C10094E3FE /* swlocale.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82713EE98B30094E3FE /* swlocale.cpp */; };
+		A954AC5113EEA0C10094E3FE /* swmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82813EE98B30094E3FE /* swmgr.cpp */; };
+		A954AC5213EEA0C10094E3FE /* swsearchable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82913EE98B30094E3FE /* swsearchable.cpp */; };
+		A954AC5413EEA0C10094E3FE /* hrefcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A82E13EE98B30094E3FE /* hrefcom.cpp */; };
+		A954AC5513EEA0C10094E3FE /* rawcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83613EE98B30094E3FE /* rawcom.cpp */; };
+		A954AC5613EEA0C10094E3FE /* rawcom4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83913EE98B30094E3FE /* rawcom4.cpp */; };
+		A954AC5713EEA0C10094E3FE /* rawfiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83D13EE98B30094E3FE /* rawfiles.cpp */; };
+		A954AC5813EEA0C10094E3FE /* swcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A83E13EE98B30094E3FE /* swcom.cpp */; };
+		A954AC5913EEA0C10094E3FE /* zcom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84213EE98B30094E3FE /* zcom.cpp */; };
+		A954AC5A13EEA0C10094E3FE /* entriesblk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84513EE98B30094E3FE /* entriesblk.cpp */; };
+		A954AC5B13EEA0C10094E3FE /* lzsscomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84613EE98B30094E3FE /* lzsscomprs.cpp */; };
+		A954AC5C13EEA0C10094E3FE /* rawstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84913EE98B30094E3FE /* rawstr.cpp */; };
+		A954AC5D13EEA0C10094E3FE /* rawstr4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84A13EE98B30094E3FE /* rawstr4.cpp */; };
+		A954AC5E13EEA0C10094E3FE /* rawverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84B13EE98B30094E3FE /* rawverse.cpp */; };
+		A954AC5F13EEA0C10094E3FE /* rawverse4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84C13EE98B30094E3FE /* rawverse4.cpp */; };
+		A954AC6013EEA0C10094E3FE /* sapphire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84D13EE98B30094E3FE /* sapphire.cpp */; };
+		A954AC6113EEA0C10094E3FE /* swcipher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84E13EE98B30094E3FE /* swcipher.cpp */; };
+		A954AC6213EEA0C10094E3FE /* swcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A84F13EE98B30094E3FE /* swcomprs.cpp */; };
+		A954AC6313EEA0C10094E3FE /* zipcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85113EE98B30094E3FE /* zipcomprs.cpp */; };
+		A954AC6413EEA0C10094E3FE /* zstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85213EE98B30094E3FE /* zstr.cpp */; };
+		A954AC6513EEA0C10094E3FE /* zverse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85313EE98B30094E3FE /* zverse.cpp */; };
+		A954AC6613EEA0C10094E3FE /* cipherfil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85513EE98B30094E3FE /* cipherfil.cpp */; };
+		A954AC6713EEA0C10094E3FE /* gbffootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85613EE98B30094E3FE /* gbffootnotes.cpp */; };
+		A954AC6813EEA0C10094E3FE /* gbfheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85713EE98B30094E3FE /* gbfheadings.cpp */; };
+		A954AC6913EEA0C10094E3FE /* gbfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85813EE98B30094E3FE /* gbfhtml.cpp */; };
+		A954AC6A13EEA0C10094E3FE /* gbfhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */; };
+		A954AC6B13EEA0C10094E3FE /* gbfmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85A13EE98B30094E3FE /* gbfmorph.cpp */; };
+		A954AC6C13EEA0C10094E3FE /* gbfosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85B13EE98B30094E3FE /* gbfosis.cpp */; };
+		A954AC6D13EEA0C10094E3FE /* gbfplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85C13EE98B30094E3FE /* gbfplain.cpp */; };
+		A954AC6E13EEA0C10094E3FE /* gbfredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */; };
+		A954AC6F13EEA0C10094E3FE /* gbfrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85E13EE98B30094E3FE /* gbfrtf.cpp */; };
+		A954AC7013EEA0C10094E3FE /* gbfstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */; };
+		A954AC7113EEA0C10094E3FE /* gbfthml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86013EE98B30094E3FE /* gbfthml.cpp */; };
+		A954AC7213EEA0C10094E3FE /* gbfwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86113EE98B30094E3FE /* gbfwebif.cpp */; };
+		A954AC7313EEA0C10094E3FE /* gbfwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86213EE98B30094E3FE /* gbfwordjs.cpp */; };
+		A954AC7413EEA0C10094E3FE /* gbfxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86313EE98B30094E3FE /* gbfxhtml.cpp */; };
+		A954AC7513EEA0C10094E3FE /* greeklexattribs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86413EE98B30094E3FE /* greeklexattribs.cpp */; };
+		A954AC7613EEA0C10094E3FE /* latin1utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86513EE98B30094E3FE /* latin1utf16.cpp */; };
+		A954AC7713EEA0C10094E3FE /* latin1utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86613EE98B30094E3FE /* latin1utf8.cpp */; };
+		A954AC7813EEA0C10094E3FE /* osisfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86913EE98B30094E3FE /* osisfootnotes.cpp */; };
+		A954AC7913EEA0C10094E3FE /* osisheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86A13EE98B30094E3FE /* osisheadings.cpp */; };
+		A954AC7A13EEA0C10094E3FE /* osishtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */; };
+		A954AC7B13EEA0C10094E3FE /* osislemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86C13EE98B30094E3FE /* osislemma.cpp */; };
+		A954AC7C13EEA0C10094E3FE /* osismorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86D13EE98B30094E3FE /* osismorph.cpp */; };
+		A954AC7D13EEA0C10094E3FE /* osismorphsegmentation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */; };
+		A954AC7E13EEA0C10094E3FE /* osisosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A86F13EE98B30094E3FE /* osisosis.cpp */; };
+		A954AC7F13EEA0C10094E3FE /* osisplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87013EE98B30094E3FE /* osisplain.cpp */; };
+		A954AC8013EEA0C10094E3FE /* osisredletterwords.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87113EE98B30094E3FE /* osisredletterwords.cpp */; };
+		A954AC8113EEA0C10094E3FE /* osisrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87213EE98B30094E3FE /* osisrtf.cpp */; };
+		A954AC8313EEA0C10094E3FE /* osisscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87413EE98B30094E3FE /* osisscripref.cpp */; };
+		A954AC8413EEA0C10094E3FE /* osisstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87513EE98B30094E3FE /* osisstrongs.cpp */; };
+		A954AC8513EEA0C10094E3FE /* osisvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87613EE98B30094E3FE /* osisvariants.cpp */; };
+		A954AC8613EEA0C10094E3FE /* osiswebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87713EE98B30094E3FE /* osiswebif.cpp */; };
+		A954AC8713EEA0C10094E3FE /* osiswordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87813EE98B30094E3FE /* osiswordjs.cpp */; };
+		A954AC8813EEA0C10094E3FE /* osisxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87913EE98B30094E3FE /* osisxhtml.cpp */; };
+		A954AC8913EEA0C10094E3FE /* papyriplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87A13EE98B30094E3FE /* papyriplain.cpp */; };
+		A954AC8C13EEA0C10094E3FE /* rtfhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87D13EE98B30094E3FE /* rtfhtml.cpp */; };
+		A954AC8D13EEA0C10094E3FE /* swbasicfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */; };
+		A954AC8E13EEA0C10094E3FE /* swoptfilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A87F13EE98B30094E3FE /* swoptfilter.cpp */; };
+		A954AC8F13EEA0C10094E3FE /* teihtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88013EE98B30094E3FE /* teihtmlhref.cpp */; };
+		A954AC9013EEA0C10094E3FE /* teiplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88113EE98B30094E3FE /* teiplain.cpp */; };
+		A954AC9113EEA0C10094E3FE /* teirtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88213EE98B30094E3FE /* teirtf.cpp */; };
+		A954AC9213EEA0C10094E3FE /* thmlfootnotes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */; };
+		A954AC9313EEA0C10094E3FE /* thmlgbf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88413EE98B30094E3FE /* thmlgbf.cpp */; };
+		A954AC9413EEA0C10094E3FE /* thmlheadings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88513EE98B30094E3FE /* thmlheadings.cpp */; };
+		A954AC9513EEA0C10094E3FE /* thmlhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88613EE98B30094E3FE /* thmlhtml.cpp */; };
+		A954AC9613EEA0C10094E3FE /* thmlhtmlhref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */; };
+		A954AC9713EEA0C10094E3FE /* thmllemma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88813EE98B30094E3FE /* thmllemma.cpp */; };
+		A954AC9813EEA0C10094E3FE /* thmlmorph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88913EE98B30094E3FE /* thmlmorph.cpp */; };
+		A954AC9913EEA0C10094E3FE /* thmlosis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88A13EE98B30094E3FE /* thmlosis.cpp */; };
+		A954AC9A13EEA0C10094E3FE /* thmlplain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88B13EE98B30094E3FE /* thmlplain.cpp */; };
+		A954AC9B13EEA0C10094E3FE /* thmlrtf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88C13EE98B30094E3FE /* thmlrtf.cpp */; };
+		A954AC9C13EEA0C10094E3FE /* thmlscripref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88D13EE98B30094E3FE /* thmlscripref.cpp */; };
+		A954AC9D13EEA0C10094E3FE /* thmlstrongs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */; };
+		A954AC9E13EEA0C10094E3FE /* thmlvariants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A88F13EE98B30094E3FE /* thmlvariants.cpp */; };
+		A954AC9F13EEA0C10094E3FE /* thmlwebif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89013EE98B30094E3FE /* thmlwebif.cpp */; };
+		A954ACA013EEA0C10094E3FE /* thmlwordjs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89113EE98B30094E3FE /* thmlwordjs.cpp */; };
+		A954ACA113EEA0C10094E3FE /* thmlxhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89213EE98B30094E3FE /* thmlxhtml.cpp */; };
+		A954ACA213EEA0C10094E3FE /* unicodertf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89313EE98B30094E3FE /* unicodertf.cpp */; };
+		A954ACA313EEA0C10094E3FE /* utf16utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89413EE98B30094E3FE /* utf16utf8.cpp */; };
+		A954ACA413EEA0C10094E3FE /* utf8arabicpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */; };
+		A954ACA513EEA0C10094E3FE /* utf8arshaping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89613EE98B30094E3FE /* utf8arshaping.cpp */; };
+		A954ACA613EEA0C10094E3FE /* utf8bidireorder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */; };
+		A954ACA713EEA0C10094E3FE /* utf8cantillation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89813EE98B30094E3FE /* utf8cantillation.cpp */; };
+		A954ACA813EEA0C10094E3FE /* utf8greekaccents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */; };
+		A954ACA913EEA0C10094E3FE /* utf8hebrewpoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */; };
+		A954ACAA13EEA0C10094E3FE /* utf8html.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89B13EE98B30094E3FE /* utf8html.cpp */; };
+		A954ACAB13EEA0C10094E3FE /* utf8latin1.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89C13EE98B30094E3FE /* utf8latin1.cpp */; };
+		A954ACAC13EEA0C10094E3FE /* utf8nfc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89D13EE98B30094E3FE /* utf8nfc.cpp */; };
+		A954ACAD13EEA0C10094E3FE /* utf8nfkd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */; };
+		A954ACAE13EEA0C10094E3FE /* utf8transliterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */; };
+		A954ACAF13EEA0C10094E3FE /* utf8utf16.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A013EE98B30094E3FE /* utf8utf16.cpp */; };
+		A954ACB013EEA0C10094E3FE /* rawgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A713EE98B30094E3FE /* rawgenbook.cpp */; };
+		A954ACB113EEA0C10094E3FE /* swgenbook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8A813EE98B30094E3FE /* swgenbook.cpp */; };
+		A954ACB213EEA0C10094E3FE /* rawld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8AF13EE98B30094E3FE /* rawld.cpp */; };
+		A954ACB313EEA0C10094E3FE /* rawld4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B313EE98B30094E3FE /* rawld4.cpp */; };
+		A954ACB413EEA0C10094E3FE /* swld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B413EE98B30094E3FE /* swld.cpp */; };
+		A954ACB513EEA0C10094E3FE /* zld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8B813EE98B30094E3FE /* zld.cpp */; };
+		A954ACB613EEA0C10094E3FE /* swmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8BC13EE98B30094E3FE /* swmodule.cpp */; };
+		A954ACB713EEA0C10094E3FE /* rawtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C613EE98B30094E3FE /* rawtext.cpp */; };
+		A954ACB813EEA0C10094E3FE /* rawtext4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8C913EE98B30094E3FE /* rawtext4.cpp */; };
+		A954ACB913EEA0C10094E3FE /* swtext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CA13EE98B30094E3FE /* swtext.cpp */; };
+		A954ACBA13EEA0C10094E3FE /* ztext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8CE13EE98B30094E3FE /* ztext.cpp */; };
+		A954ACBB13EEA0C10094E3FE /* roman.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D513EE98B30094E3FE /* roman.cpp */; };
+		A954ACBC13EEA0C10094E3FE /* swbuf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D613EE98B30094E3FE /* swbuf.cpp */; };
+		A954ACBD13EEA0C10094E3FE /* swobject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D713EE98B30094E3FE /* swobject.cpp */; };
+		A954ACBF13EEA0C10094E3FE /* swversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D913EE98B30094E3FE /* swversion.cpp */; };
+		A954ACC013EEA0C10094E3FE /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DA13EE98B30094E3FE /* url.cpp */; };
+		A954ACC113EEA0C10094E3FE /* utilstr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DB13EE98B30094E3FE /* utilstr.cpp */; };
+		A954ACC213EEA0C10094E3FE /* utilxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A954A8DC13EE98B30094E3FE /* utilxml.cpp */; };
+		A954ACCA13EEA5340094E3FE /* ftplib.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D013EE98B30094E3FE /* ftplib.c */; };
+		A954ACCB13EEA5340094E3FE /* ftpparse.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8D113EE98B30094E3FE /* ftpparse.c */; };
+		A954ACCD13EEA5340094E3FE /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E113EE98B30094E3FE /* adler32.c */; };
+		A954ACCE13EEA5340094E3FE /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E213EE98B30094E3FE /* compress.c */; };
+		A954ACCF13EEA5340094E3FE /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E313EE98B30094E3FE /* crc32.c */; };
+		A954ACD013EEA5340094E3FE /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8E413EE98B30094E3FE /* deflate.c */; };
+		A954ACD413EEA5340094E3FE /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EB13EE98B30094E3FE /* inffast.c */; };
+		A954ACD513EEA5340094E3FE /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EE13EE98B30094E3FE /* inflate.c */; };
+		A954ACD613EEA5340094E3FE /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8EF13EE98B30094E3FE /* inftrees.c */; };
+		A954ACD913EEA5340094E3FE /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F413EE98B30094E3FE /* trees.c */; };
+		A954ACDA13EEA5340094E3FE /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F613EE98B30094E3FE /* uncompr.c */; };
+		A954ACDB13EEA5340094E3FE /* untgz.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F713EE98B30094E3FE /* untgz.c */; };
+		A954ACDC13EEA5340094E3FE /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = A954A8F813EE98B30094E3FE /* zutil.c */; };
+		A954ACDD13EEA6780094E3FE /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A967FB5616806B16004ED73C /* teixhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */; };
+		A96C2359176AFA3C008D714B /* remotetrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2351176AF188008D714B /* remotetrans.cpp */; };
+		A96C235A176AFA3C008D714B /* osisenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2353176AF19C008D714B /* osisenum.cpp */; };
+		A96C235B176AFA3C008D714B /* osisglosses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2354176AF19C008D714B /* osisglosses.cpp */; };
+		A96C235C176AFA3C008D714B /* osisxlit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisxlit.cpp */; };
+		A96C235C176AFA3C008D714B /* osisreferencelinks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2355176AF19C008D714B /* osisreferencelinks.cpp */; };
+		A96C235D176AFA3C008D714B /* gzclose.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C233E176AF139008D714B /* gzclose.c */; };
+		A96C235E176AFA3C008D714B /* gzlib.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2340176AF139008D714B /* gzlib.c */; };
+		A96C235F176AFA3C008D714B /* gzread.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2341176AF139008D714B /* gzread.c */; };
+		A96C2360176AFA3C008D714B /* gzwrite.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2342176AF139008D714B /* gzwrite.c */; };
+		A96C2361176AFA3C008D714B /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = A96C2343176AF139008D714B /* infback.c */; };
+		A975EAC511C77862007C1532 /* ObjCSword.h in Headers */ = {isa = PBXBuildFile; fileRef = A975EAC411C77862007C1532 /* ObjCSword.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAC11C7925C007C1532 /* mod2osis.cpp */; };
+		A999FF3F17951CCE00E65919 /* bz2comprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3917951C8900E65919 /* bz2comprs.cpp */; };
+		A999FF4017951CCE00E65919 /* xzcomprs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3A17951C8900E65919 /* xzcomprs.cpp */; };
+		A999FF4117951CCE00E65919 /* scsuutf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A999FF3D17951CA000E65919 /* scsuutf8.cpp */; };
+		A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A2C17C118D9D3D0002873D /* Notifications.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9A7EEAF14D5D4C300B76B6A /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9A7EEBE14D5D64C00B76B6A /* osis2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB111C7925C007C1532 /* osis2mod.cpp */; };
+		A9A7EEBF14D5D65900B76B6A /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; };
+		A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; };
+		A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; };
+		A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; };
+		A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */; };
+		A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; };
+		A9BFB0A513EDF51100032679 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A413EDF51000032679 /* SenTestingKit.framework */; };
+		A9BFB0A713EDF51100032679 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A613EDF51100032679 /* Cocoa.framework */; };
+		A9BFB0BC13EDF5C900032679 /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; };
+		A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; };
+		A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; };
+		A9BFB0BF13EDF5D500032679 /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; };
+		A9C2856F11C446B700803CB5 /* Configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2856D11C446B700803CB5 /* Configuration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2857111C4471400803CB5 /* OSXConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2857211C4471400803CB5 /* OSXConfiguration.m */; };
+		A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2858211C44A0A00803CB5 /* Configuration.m */; };
+		A9D2714A14D717D800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9D2715014D717F600DA8926 /* imp2gbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9811C7925C007C1532 /* imp2gbs.cpp */; };
+		A9D2715714D717FD00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9D2715D14D7180F00DA8926 /* imp2ld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9911C7925C007C1532 /* imp2ld.cpp */; };
+		A9D2716414D7181200DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9D2716A14D7182100DA8926 /* imp2vs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9A11C7925C007C1532 /* imp2vs.cpp */; };
+		A9D2717114D7182300DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9D2717714D7183700DA8926 /* installmgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975ED9B11C7925C007C1532 /* installmgr.cpp */; };
+		A9D2717E14D7183B00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9D2718414D7184E00DA8926 /* mod2imp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAB11C7925C007C1532 /* mod2imp.cpp */; };
+		A9D2718B14D7185800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9D2719114D7186800DA8926 /* mod2vpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAD11C7925C007C1532 /* mod2vpl.cpp */; };
+		A9D2719814D7186A00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9D2719E14D7187A00DA8926 /* mod2zmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAE11C7925C007C1532 /* mod2zmod.cpp */; };
+		A9D271A514D7187E00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9D271AB14D7189100DA8926 /* step2vpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB811C7925C007C1532 /* step2vpl.cpp */; };
+		A9D271B214D7189300DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9D271B814D718A300DA8926 /* stepdump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDB911C7925C007C1532 /* stepdump.cpp */; };
+		A9D271BF14D718A400DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9D271C514D718B700DA8926 /* tei2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDBB11C7925C007C1532 /* tei2mod.cpp */; };
+		A9D271CC14D718B800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9D271D214D718C600DA8926 /* vpl2mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDD811C7925C007C1532 /* vpl2mod.cpp */; };
+		A9D271D914D718C800DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9D271DF14D718DE00DA8926 /* vs2osisref.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDD911C7925C007C1532 /* vs2osisref.cpp */; };
+		A9D271E614D718DF00DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9D271EC14D718F400DA8926 /* vs2osisreftxt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */; };
+		A9D271F314D718F500DA8926 /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
+		A9D271F914D7190400DA8926 /* xml2gbs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDDB11C7925C007C1532 /* xml2gbs.cpp */; };
+		A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */; };
+		A9D4382311C52947007AFE83 /* locales.d in Resources */ = {isa = PBXBuildFile; fileRef = A9D437CE11C52947007AFE83 /* locales.d */; };
+		A9D9FA0B13EEE5CF00EA9DEB /* libsword.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
+		A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9EF1414120595650078A27C /* SwordLocaleManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9EF1415120595650078A27C /* SwordLocaleManager.mm */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		A954ABC913EE9D0F0094E3FE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9A7EEAD14D5D4BB00B76B6A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9A7EEC014D5D66400B76B6A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = ObjCSword;
+		};
+		A9BFB0BA13EDF5B600032679 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = ObjCSword;
+		};
+		A9D2714614D717D800DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D2715314D717FD00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D2716014D7181200DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D2716D14D7182300DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D2717A14D7183B00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D2718714D7185800DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D2719414D7186A00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271A114D7187E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271AE14D7189300DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271BB14D718A400DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271C814D718B800DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271D514D718C800DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271E214D718DF00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271EF14D718F500DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D271FE14D7193A00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A954ABC213EE9AB00094E3FE;
+			remoteInfo = sword;
+		};
+		A9D2720014D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2714414D717D800DA8926;
+			remoteInfo = imp2gbs;
+		};
+		A9D2720214D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2715114D717FD00DA8926;
+			remoteInfo = imp2ld;
+		};
+		A9D2720414D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2715E14D7181200DA8926;
+			remoteInfo = imp2vs;
+		};
+		A9D2720614D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2716B14D7182300DA8926;
+			remoteInfo = installmgr;
+		};
+		A9D2720814D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2717814D7183B00DA8926;
+			remoteInfo = mod2imp;
+		};
+		A9D2720A14D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A975EED811C792B9007C1532;
+			remoteInfo = mod2osis;
+		};
+		A9D2720C14D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2718514D7185800DA8926;
+			remoteInfo = mod2vpl;
+		};
+		A9D2720E14D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2719214D7186A00DA8926;
+			remoteInfo = mod2zmod;
+		};
+		A9D2721014D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9A7EEB314D5D61700B76B6A;
+			remoteInfo = osis2mod;
+		};
+		A9D2721214D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D2719F14D7187E00DA8926;
+			remoteInfo = step2vpl;
+		};
+		A9D2721414D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D271AC14D7189300DA8926;
+			remoteInfo = stepdump;
+		};
+		A9D2721614D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D271B914D718A400DA8926;
+			remoteInfo = tei2mod;
+		};
+		A9D2721814D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D271C614D718B800DA8926;
+			remoteInfo = vpl2mod;
+		};
+		A9D2721A14D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D271D314D718C800DA8926;
+			remoteInfo = vs2osisref;
+		};
+		A9D2721C14D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D271E014D718DF00DA8926;
+			remoteInfo = vs2osisreftxt;
+		};
+		A9D2721E14D7194E00DA8926 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A9D271ED14D718F500DA8926;
+			remoteInfo = xml2gbs;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		A9A5050211C75C4B00EB6EA5 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				A9D9FA0B13EEE5CF00EA9DEB /* libsword.dylib in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword_Prefix.pch; sourceTree = "<group>"; };
+		8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DefaultFilterProvider.mm; path = src/DefaultFilterProvider.mm; sourceTree = "<group>"; };
+		8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordFilter.h; path = src/SwordFilter.h; sourceTree = "<group>"; };
+		8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FilterProviderFactory.mm; path = src/FilterProviderFactory.mm; sourceTree = "<group>"; };
+		8C92C291C40A77060C12A21B /* SwordUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordUtil.m; path = src/SwordUtil.m; sourceTree = "<group>"; };
+		8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FilterProviderFactory.h; path = src/FilterProviderFactory.h; sourceTree = "<group>"; };
+		8C92C7B2EB245D47FEB5E3B0 /* SwordUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordUtil.h; path = src/SwordUtil.h; sourceTree = "<group>"; };
+		8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultFilterProvider.h; path = src/DefaultFilterProvider.h; sourceTree = "<group>"; };
+		8C92CC111DC521DE0C054C60 /* SwordFilter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordFilter.mm; path = src/SwordFilter.mm; sourceTree = "<group>"; };
+		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8DC2EF5B0486A6940098B216 /* ObjCSword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A917AF2516B1BE38006367FC /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
+		A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = ../test/SwordModuleTest.h; sourceTree = "<group>"; };
+		A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = ../test/SwordModuleTest.m; sourceTree = "<group>"; };
+		A91C8B66175233F3008702B9 /* versificationmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versificationmgr.cpp; sourceTree = "<group>"; };
+		A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleTextEntry.m; path = src/SwordBibleTextEntry.m; sourceTree = "<group>"; };
+		A929619716B1BA240094E5BE /* SwordKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordKey.h; path = src/SwordKey.h; sourceTree = "<group>"; };
+		A929619816B1BA240094E5BE /* SwordKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordKey.mm; path = src/SwordKey.mm; sourceTree = "<group>"; };
+		A929619916B1BA240094E5BE /* SwordListKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKey.h; path = src/SwordListKey.h; sourceTree = "<group>"; };
+		A929619A16B1BA240094E5BE /* SwordListKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordListKey.mm; path = src/SwordListKey.mm; sourceTree = "<group>"; };
+		A929619B16B1BA240094E5BE /* SwordVerseKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseKey.h; path = src/SwordVerseKey.h; sourceTree = "<group>"; };
+		A94EABE3117B28910018B06F /* SwordBible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBible.h; path = src/SwordBible.h; sourceTree = "<group>"; };
+		A94EABE4117B28910018B06F /* SwordBible.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBible.mm; path = src/SwordBible.mm; sourceTree = "<group>"; };
+		A94EABE5117B28920018B06F /* SwordBibleBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleBook.h; path = src/SwordBibleBook.h; sourceTree = "<group>"; };
+		A94EABE6117B28920018B06F /* SwordBibleBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBibleBook.mm; path = src/SwordBibleBook.mm; sourceTree = "<group>"; };
+		A94EABE7117B28920018B06F /* SwordBibleChapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleChapter.h; path = src/SwordBibleChapter.h; sourceTree = "<group>"; };
+		A94EABE8117B28920018B06F /* SwordBibleChapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleChapter.m; path = src/SwordBibleChapter.m; sourceTree = "<group>"; };
+		A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleTextEntry.h; path = src/SwordBibleTextEntry.h; sourceTree = "<group>"; };
+		A94EABEB117B28920018B06F /* SwordBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBook.h; path = src/SwordBook.h; sourceTree = "<group>"; };
+		A94EABEC117B28920018B06F /* SwordBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBook.mm; path = src/SwordBook.mm; sourceTree = "<group>"; };
+		A94EABED117B28920018B06F /* SwordCommentary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordCommentary.h; path = src/SwordCommentary.h; sourceTree = "<group>"; };
+		A94EABEE117B28920018B06F /* SwordCommentary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordCommentary.mm; path = src/SwordCommentary.mm; sourceTree = "<group>"; };
+		A94EABEF117B28920018B06F /* SwordDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordDictionary.h; path = src/SwordDictionary.h; sourceTree = "<group>"; };
+		A94EABF0117B28920018B06F /* SwordDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordDictionary.mm; path = src/SwordDictionary.mm; sourceTree = "<group>"; };
+		A94EABF1117B28920018B06F /* SwordInstallSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSource.h; path = src/SwordInstallSource.h; sourceTree = "<group>"; };
+		A94EABF2117B28920018B06F /* SwordInstallSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSource.mm; path = src/SwordInstallSource.mm; sourceTree = "<group>"; };
+		A94EABF3117B28920018B06F /* SwordInstallSourceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSourceManager.h; path = src/SwordInstallSourceManager.h; sourceTree = "<group>"; };
+		A94EABF4117B28920018B06F /* SwordInstallSourceManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSourceManager.mm; path = src/SwordInstallSourceManager.mm; sourceTree = "<group>"; };
+		A94EABF9117B28920018B06F /* SwordManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManager.h; path = src/SwordManager.h; sourceTree = "<group>"; };
+		A94EABFA117B28920018B06F /* SwordManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordManager.mm; path = src/SwordManager.mm; sourceTree = "<group>"; };
+		A94EABFD117B28920018B06F /* SwordModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModule.h; path = src/SwordModule.h; sourceTree = "<group>"; };
+		A94EABFE117B28920018B06F /* SwordModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModule.mm; path = src/SwordModule.mm; sourceTree = "<group>"; };
+		A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTextEntry.h; path = src/SwordModuleTextEntry.h; sourceTree = "<group>"; };
+		A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTextEntry.m; path = src/SwordModuleTextEntry.m; sourceTree = "<group>"; };
+		A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTreeEntry.h; path = src/SwordModuleTreeEntry.h; sourceTree = "<group>"; };
+		A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTreeEntry.m; path = src/SwordModuleTreeEntry.m; sourceTree = "<group>"; };
+		A94EAC06117B28920018B06F /* SwordVerseKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseKey.mm; path = src/SwordVerseKey.mm; sourceTree = "<group>"; };
+		A94EAC07117B28920018B06F /* SwordVerseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseManager.h; path = src/SwordVerseManager.h; sourceTree = "<group>"; };
+		A94EAC08117B28920018B06F /* SwordVerseManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseManager.mm; path = src/SwordVerseManager.mm; sourceTree = "<group>"; };
+		A94EAC09117B28920018B06F /* VerseEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VerseEnumerator.h; path = src/VerseEnumerator.h; sourceTree = "<group>"; };
+		A94EAC0A117B28920018B06F /* VerseEnumerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VerseEnumerator.mm; path = src/VerseEnumerator.mm; sourceTree = "<group>"; };
+		A954A80113EE98B30094E3FE /* swdisp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swdisp.cpp; sourceTree = "<group>"; };
+		A954A80213EE98B30094E3FE /* swlog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swlog.cpp; sourceTree = "<group>"; };
+		A954A80913EE98B30094E3FE /* listkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = listkey.cpp; sourceTree = "<group>"; };
+		A954A81013EE98B30094E3FE /* strkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strkey.cpp; sourceTree = "<group>"; };
+		A954A81113EE98B30094E3FE /* swkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swkey.cpp; sourceTree = "<group>"; };
+		A954A81213EE98B30094E3FE /* treekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = treekey.cpp; sourceTree = "<group>"; };
+		A954A81313EE98B30094E3FE /* treekeyidx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = treekeyidx.cpp; sourceTree = "<group>"; };
+		A954A81413EE98B30094E3FE /* versekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versekey.cpp; sourceTree = "<group>"; };
+		A954A81513EE98B30094E3FE /* versetreekey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = versetreekey.cpp; sourceTree = "<group>"; };
+		A954A81813EE98B30094E3FE /* curlftpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curlftpt.cpp; sourceTree = "<group>"; };
+		A954A81913EE98B30094E3FE /* curlhttpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = curlhttpt.cpp; sourceTree = "<group>"; };
+		A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = encfiltmgr.cpp; sourceTree = "<group>"; };
+		A954A81B13EE98B30094E3FE /* filemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filemgr.cpp; sourceTree = "<group>"; };
+		A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ftplibftpt.cpp; sourceTree = "<group>"; };
+		A954A81E13EE98B30094E3FE /* installmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = installmgr.cpp; sourceTree = "<group>"; };
+		A954A81F13EE98B30094E3FE /* localemgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = localemgr.cpp; sourceTree = "<group>"; };
+		A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = markupfiltmgr.cpp; sourceTree = "<group>"; };
+		A954A82313EE98B30094E3FE /* stringmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stringmgr.cpp; sourceTree = "<group>"; };
+		A954A82413EE98B30094E3FE /* swcacher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcacher.cpp; sourceTree = "<group>"; };
+		A954A82513EE98B30094E3FE /* swconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swconfig.cpp; sourceTree = "<group>"; };
+		A954A82613EE98B30094E3FE /* swfiltermgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swfiltermgr.cpp; sourceTree = "<group>"; };
+		A954A82713EE98B30094E3FE /* swlocale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swlocale.cpp; sourceTree = "<group>"; };
+		A954A82813EE98B30094E3FE /* swmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swmgr.cpp; sourceTree = "<group>"; };
+		A954A82913EE98B30094E3FE /* swsearchable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swsearchable.cpp; sourceTree = "<group>"; };
+		A954A82E13EE98B30094E3FE /* hrefcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hrefcom.cpp; sourceTree = "<group>"; };
+		A954A83613EE98B30094E3FE /* rawcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawcom.cpp; sourceTree = "<group>"; };
+		A954A83913EE98B30094E3FE /* rawcom4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawcom4.cpp; sourceTree = "<group>"; };
+		A954A83D13EE98B30094E3FE /* rawfiles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawfiles.cpp; sourceTree = "<group>"; };
+		A954A83E13EE98B30094E3FE /* swcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcom.cpp; sourceTree = "<group>"; };
+		A954A84013EE98B30094E3FE /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		A954A84113EE98B30094E3FE /* Makefile.am */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.am; sourceTree = "<group>"; };
+		A954A84213EE98B30094E3FE /* zcom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zcom.cpp; sourceTree = "<group>"; };
+		A954A84513EE98B30094E3FE /* entriesblk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entriesblk.cpp; sourceTree = "<group>"; };
+		A954A84613EE98B30094E3FE /* lzsscomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lzsscomprs.cpp; sourceTree = "<group>"; };
+		A954A84913EE98B30094E3FE /* rawstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawstr.cpp; sourceTree = "<group>"; };
+		A954A84A13EE98B30094E3FE /* rawstr4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawstr4.cpp; sourceTree = "<group>"; };
+		A954A84B13EE98B30094E3FE /* rawverse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawverse.cpp; sourceTree = "<group>"; };
+		A954A84C13EE98B30094E3FE /* rawverse4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawverse4.cpp; sourceTree = "<group>"; };
+		A954A84D13EE98B30094E3FE /* sapphire.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sapphire.cpp; sourceTree = "<group>"; };
+		A954A84E13EE98B30094E3FE /* swcipher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcipher.cpp; sourceTree = "<group>"; };
+		A954A84F13EE98B30094E3FE /* swcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swcomprs.cpp; sourceTree = "<group>"; };
+		A954A85113EE98B30094E3FE /* zipcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zipcomprs.cpp; sourceTree = "<group>"; };
+		A954A85213EE98B30094E3FE /* zstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zstr.cpp; sourceTree = "<group>"; };
+		A954A85313EE98B30094E3FE /* zverse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zverse.cpp; sourceTree = "<group>"; };
+		A954A85513EE98B30094E3FE /* cipherfil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cipherfil.cpp; sourceTree = "<group>"; };
+		A954A85613EE98B30094E3FE /* gbffootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbffootnotes.cpp; sourceTree = "<group>"; };
+		A954A85713EE98B30094E3FE /* gbfheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfheadings.cpp; sourceTree = "<group>"; };
+		A954A85813EE98B30094E3FE /* gbfhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfhtml.cpp; sourceTree = "<group>"; };
+		A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfhtmlhref.cpp; sourceTree = "<group>"; };
+		A954A85A13EE98B30094E3FE /* gbfmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfmorph.cpp; sourceTree = "<group>"; };
+		A954A85B13EE98B30094E3FE /* gbfosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfosis.cpp; sourceTree = "<group>"; };
+		A954A85C13EE98B30094E3FE /* gbfplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfplain.cpp; sourceTree = "<group>"; };
+		A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfredletterwords.cpp; sourceTree = "<group>"; };
+		A954A85E13EE98B30094E3FE /* gbfrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfrtf.cpp; sourceTree = "<group>"; };
+		A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfstrongs.cpp; sourceTree = "<group>"; };
+		A954A86013EE98B30094E3FE /* gbfthml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfthml.cpp; sourceTree = "<group>"; };
+		A954A86113EE98B30094E3FE /* gbfwebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfwebif.cpp; sourceTree = "<group>"; };
+		A954A86213EE98B30094E3FE /* gbfwordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfwordjs.cpp; sourceTree = "<group>"; };
+		A954A86313EE98B30094E3FE /* gbfxhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gbfxhtml.cpp; sourceTree = "<group>"; };
+		A954A86413EE98B30094E3FE /* greeklexattribs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = greeklexattribs.cpp; sourceTree = "<group>"; };
+		A954A86513EE98B30094E3FE /* latin1utf16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latin1utf16.cpp; sourceTree = "<group>"; };
+		A954A86613EE98B30094E3FE /* latin1utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latin1utf8.cpp; sourceTree = "<group>"; };
+		A954A86913EE98B30094E3FE /* osisfootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisfootnotes.cpp; sourceTree = "<group>"; };
+		A954A86A13EE98B30094E3FE /* osisheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisheadings.cpp; sourceTree = "<group>"; };
+		A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osishtmlhref.cpp; sourceTree = "<group>"; };
+		A954A86C13EE98B30094E3FE /* osislemma.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osislemma.cpp; sourceTree = "<group>"; };
+		A954A86D13EE98B30094E3FE /* osismorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osismorph.cpp; sourceTree = "<group>"; };
+		A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osismorphsegmentation.cpp; sourceTree = "<group>"; };
+		A954A86F13EE98B30094E3FE /* osisosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisosis.cpp; sourceTree = "<group>"; };
+		A954A87013EE98B30094E3FE /* osisplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisplain.cpp; sourceTree = "<group>"; };
+		A954A87113EE98B30094E3FE /* osisredletterwords.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisredletterwords.cpp; sourceTree = "<group>"; };
+		A954A87213EE98B30094E3FE /* osisrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisrtf.cpp; sourceTree = "<group>"; };
+		A954A87413EE98B30094E3FE /* osisscripref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisscripref.cpp; sourceTree = "<group>"; };
+		A954A87513EE98B30094E3FE /* osisstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisstrongs.cpp; sourceTree = "<group>"; };
+		A954A87613EE98B30094E3FE /* osisvariants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisvariants.cpp; sourceTree = "<group>"; };
+		A954A87713EE98B30094E3FE /* osiswebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osiswebif.cpp; sourceTree = "<group>"; };
+		A954A87813EE98B30094E3FE /* osiswordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osiswordjs.cpp; sourceTree = "<group>"; };
+		A954A87913EE98B30094E3FE /* osisxhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisxhtml.cpp; sourceTree = "<group>"; };
+		A954A87A13EE98B30094E3FE /* papyriplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = papyriplain.cpp; sourceTree = "<group>"; };
+		A954A87D13EE98B30094E3FE /* rtfhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rtfhtml.cpp; sourceTree = "<group>"; };
+		A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swbasicfilter.cpp; sourceTree = "<group>"; };
+		A954A87F13EE98B30094E3FE /* swoptfilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swoptfilter.cpp; sourceTree = "<group>"; };
+		A954A88013EE98B30094E3FE /* teihtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teihtmlhref.cpp; sourceTree = "<group>"; };
+		A954A88113EE98B30094E3FE /* teiplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teiplain.cpp; sourceTree = "<group>"; };
+		A954A88213EE98B30094E3FE /* teirtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teirtf.cpp; sourceTree = "<group>"; };
+		A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlfootnotes.cpp; sourceTree = "<group>"; };
+		A954A88413EE98B30094E3FE /* thmlgbf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlgbf.cpp; sourceTree = "<group>"; };
+		A954A88513EE98B30094E3FE /* thmlheadings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlheadings.cpp; sourceTree = "<group>"; };
+		A954A88613EE98B30094E3FE /* thmlhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlhtml.cpp; sourceTree = "<group>"; };
+		A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlhtmlhref.cpp; sourceTree = "<group>"; };
+		A954A88813EE98B30094E3FE /* thmllemma.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmllemma.cpp; sourceTree = "<group>"; };
+		A954A88913EE98B30094E3FE /* thmlmorph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlmorph.cpp; sourceTree = "<group>"; };
+		A954A88A13EE98B30094E3FE /* thmlosis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlosis.cpp; sourceTree = "<group>"; };
+		A954A88B13EE98B30094E3FE /* thmlplain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlplain.cpp; sourceTree = "<group>"; };
+		A954A88C13EE98B30094E3FE /* thmlrtf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlrtf.cpp; sourceTree = "<group>"; };
+		A954A88D13EE98B30094E3FE /* thmlscripref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlscripref.cpp; sourceTree = "<group>"; };
+		A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlstrongs.cpp; sourceTree = "<group>"; };
+		A954A88F13EE98B30094E3FE /* thmlvariants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlvariants.cpp; sourceTree = "<group>"; };
+		A954A89013EE98B30094E3FE /* thmlwebif.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlwebif.cpp; sourceTree = "<group>"; };
+		A954A89113EE98B30094E3FE /* thmlwordjs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlwordjs.cpp; sourceTree = "<group>"; };
+		A954A89213EE98B30094E3FE /* thmlxhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thmlxhtml.cpp; sourceTree = "<group>"; };
+		A954A89313EE98B30094E3FE /* unicodertf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unicodertf.cpp; sourceTree = "<group>"; };
+		A954A89413EE98B30094E3FE /* utf16utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf16utf8.cpp; sourceTree = "<group>"; };
+		A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8arabicpoints.cpp; sourceTree = "<group>"; };
+		A954A89613EE98B30094E3FE /* utf8arshaping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8arshaping.cpp; sourceTree = "<group>"; };
+		A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8bidireorder.cpp; sourceTree = "<group>"; };
+		A954A89813EE98B30094E3FE /* utf8cantillation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8cantillation.cpp; sourceTree = "<group>"; };
+		A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8greekaccents.cpp; sourceTree = "<group>"; };
+		A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8hebrewpoints.cpp; sourceTree = "<group>"; };
+		A954A89B13EE98B30094E3FE /* utf8html.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8html.cpp; sourceTree = "<group>"; };
+		A954A89C13EE98B30094E3FE /* utf8latin1.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8latin1.cpp; sourceTree = "<group>"; };
+		A954A89D13EE98B30094E3FE /* utf8nfc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8nfc.cpp; sourceTree = "<group>"; };
+		A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8nfkd.cpp; sourceTree = "<group>"; };
+		A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8transliterator.cpp; sourceTree = "<group>"; };
+		A954A8A013EE98B30094E3FE /* utf8utf16.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8utf16.cpp; sourceTree = "<group>"; };
+		A954A8A713EE98B30094E3FE /* rawgenbook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawgenbook.cpp; sourceTree = "<group>"; };
+		A954A8A813EE98B30094E3FE /* swgenbook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swgenbook.cpp; sourceTree = "<group>"; };
+		A954A8AF13EE98B30094E3FE /* rawld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawld.cpp; sourceTree = "<group>"; };
+		A954A8B313EE98B30094E3FE /* rawld4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawld4.cpp; sourceTree = "<group>"; };
+		A954A8B413EE98B30094E3FE /* swld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swld.cpp; sourceTree = "<group>"; };
+		A954A8B813EE98B30094E3FE /* zld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zld.cpp; sourceTree = "<group>"; };
+		A954A8BC13EE98B30094E3FE /* swmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swmodule.cpp; sourceTree = "<group>"; };
+		A954A8BE13EE98B30094E3FE /* echomod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = echomod.cpp; sourceTree = "<group>"; };
+		A954A8C613EE98B30094E3FE /* rawtext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawtext.cpp; sourceTree = "<group>"; };
+		A954A8C913EE98B30094E3FE /* rawtext4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rawtext4.cpp; sourceTree = "<group>"; };
+		A954A8CA13EE98B30094E3FE /* swtext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swtext.cpp; sourceTree = "<group>"; };
+		A954A8CE13EE98B30094E3FE /* ztext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ztext.cpp; sourceTree = "<group>"; };
+		A954A8D013EE98B30094E3FE /* ftplib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftplib.c; sourceTree = "<group>"; };
+		A954A8D113EE98B30094E3FE /* ftpparse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ftpparse.c; sourceTree = "<group>"; };
+		A954A8D413EE98B30094E3FE /* regex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = regex.c; sourceTree = "<group>"; };
+		A954A8D513EE98B30094E3FE /* roman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = roman.cpp; sourceTree = "<group>"; };
+		A954A8D613EE98B30094E3FE /* swbuf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swbuf.cpp; sourceTree = "<group>"; };
+		A954A8D713EE98B30094E3FE /* swobject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swobject.cpp; sourceTree = "<group>"; };
+		A954A8D913EE98B30094E3FE /* swversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swversion.cpp; sourceTree = "<group>"; };
+		A954A8DA13EE98B30094E3FE /* url.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = url.cpp; sourceTree = "<group>"; };
+		A954A8DB13EE98B30094E3FE /* utilstr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilstr.cpp; sourceTree = "<group>"; };
+		A954A8DC13EE98B30094E3FE /* utilxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utilxml.cpp; sourceTree = "<group>"; };
+		A954A8E113EE98B30094E3FE /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; };
+		A954A8E213EE98B30094E3FE /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; };
+		A954A8E313EE98B30094E3FE /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = "<group>"; };
+		A954A8E413EE98B30094E3FE /* deflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = deflate.c; sourceTree = "<group>"; };
+		A954A8EB13EE98B30094E3FE /* inffast.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inffast.c; sourceTree = "<group>"; };
+		A954A8EE13EE98B30094E3FE /* inflate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inflate.c; sourceTree = "<group>"; };
+		A954A8EF13EE98B30094E3FE /* inftrees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = inftrees.c; sourceTree = "<group>"; };
+		A954A8F413EE98B30094E3FE /* trees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = trees.c; sourceTree = "<group>"; };
+		A954A8F613EE98B30094E3FE /* uncompr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uncompr.c; sourceTree = "<group>"; };
+		A954A8F713EE98B30094E3FE /* untgz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = untgz.c; sourceTree = "<group>"; };
+		A954A8F813EE98B30094E3FE /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
+		A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnalysisHeader.cpp; sourceTree = "<group>"; };
+		A954A9E513EE9A2B0094E3FE /* AnalysisHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnalysisHeader.h; sourceTree = "<group>"; };
+		A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Analyzers.cpp; sourceTree = "<group>"; };
+		A954A9E713EE9A2B0094E3FE /* Analyzers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Analyzers.h; sourceTree = "<group>"; };
+		A954A9E913EE9A2B0094E3FE /* StandardAnalyzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardAnalyzer.cpp; sourceTree = "<group>"; };
+		A954A9EA13EE9A2B0094E3FE /* StandardAnalyzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardAnalyzer.h; sourceTree = "<group>"; };
+		A954A9EB13EE9A2B0094E3FE /* StandardFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardFilter.cpp; sourceTree = "<group>"; };
+		A954A9EC13EE9A2B0094E3FE /* StandardFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardFilter.h; sourceTree = "<group>"; };
+		A954A9ED13EE9A2B0094E3FE /* StandardTokenizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StandardTokenizer.cpp; sourceTree = "<group>"; };
+		A954A9EE13EE9A2B0094E3FE /* StandardTokenizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardTokenizer.h; sourceTree = "<group>"; };
+		A954A9EF13EE9A2B0094E3FE /* StandardTokenizerConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandardTokenizerConstants.h; sourceTree = "<group>"; };
+		A954A9F013EE9A2B0094E3FE /* CLBackwards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLBackwards.h; sourceTree = "<group>"; };
+		A954A9F113EE9A2B0094E3FE /* CLConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLConfig.h; sourceTree = "<group>"; };
+		A954A9F213EE9A2B0094E3FE /* clucene-config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "clucene-config.h"; sourceTree = "<group>"; };
+		A954A9F413EE9A2B0094E3FE /* compiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compiler.h; sourceTree = "<group>"; };
+		A954A9F513EE9A2B0094E3FE /* CompilerBcb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerBcb.h; sourceTree = "<group>"; };
+		A954A9F613EE9A2B0094E3FE /* CompilerGcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerGcc.h; sourceTree = "<group>"; };
+		A954A9F713EE9A2B0094E3FE /* CompilerMsvc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompilerMsvc.h; sourceTree = "<group>"; };
+		A954A9F813EE9A2B0094E3FE /* define_std.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = define_std.h; sourceTree = "<group>"; };
+		A954A9F913EE9A2B0094E3FE /* gunichartables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gunichartables.cpp; sourceTree = "<group>"; };
+		A954A9FA13EE9A2B0094E3FE /* gunichartables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gunichartables.h; sourceTree = "<group>"; };
+		A954A9FB13EE9A2B0094E3FE /* PlatformMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformMac.h; sourceTree = "<group>"; };
+		A954A9FC13EE9A2B0094E3FE /* PlatformUnix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformUnix.h; sourceTree = "<group>"; };
+		A954A9FD13EE9A2B0094E3FE /* PlatformWin32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformWin32.h; sourceTree = "<group>"; };
+		A954A9FE13EE9A2B0094E3FE /* repl_lltot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_lltot.cpp; sourceTree = "<group>"; };
+		A954A9FF13EE9A2B0094E3FE /* repl_tchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repl_tchar.h; sourceTree = "<group>"; };
+		A954AA0013EE9A2B0094E3FE /* repl_tcscasecmp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcscasecmp.cpp; sourceTree = "<group>"; };
+		A954AA0113EE9A2B0094E3FE /* repl_tcslwr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcslwr.cpp; sourceTree = "<group>"; };
+		A954AA0213EE9A2B0094E3FE /* repl_tcstod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcstod.cpp; sourceTree = "<group>"; };
+		A954AA0313EE9A2B0094E3FE /* repl_tcstoll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tcstoll.cpp; sourceTree = "<group>"; };
+		A954AA0413EE9A2B0094E3FE /* repl_tprintf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = repl_tprintf.cpp; sourceTree = "<group>"; };
+		A954AA0513EE9A2B0094E3FE /* repl_wchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = repl_wchar.h; sourceTree = "<group>"; };
+		A954AA0613EE9A2B0094E3FE /* threadCSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threadCSection.h; sourceTree = "<group>"; };
+		A954AA0713EE9A2B0094E3FE /* threadPthread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = threadPthread.h; sourceTree = "<group>"; };
+		A954AA0813EE9A2B0094E3FE /* threads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = threads.cpp; sourceTree = "<group>"; };
+		A954AA0913EE9A2B0094E3FE /* utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utf8.cpp; sourceTree = "<group>"; };
+		A954AA0B13EE9A2B0094E3FE /* condition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = condition.cpp; sourceTree = "<group>"; };
+		A954AA0C13EE9A2B0094E3FE /* condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = condition.h; sourceTree = "<group>"; };
+		A954AA0D13EE9A2B0094E3FE /* error.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = error.cpp; sourceTree = "<group>"; };
+		A954AA0E13EE9A2B0094E3FE /* error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = error.h; sourceTree = "<group>"; };
+		A954AA0F13EE9A2B0094E3FE /* lucenebase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lucenebase.h; sourceTree = "<group>"; };
+		A954AA1013EE9A2B0094E3FE /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem.h; sourceTree = "<group>"; };
+		A954AA1113EE9A2B0094E3FE /* memtracking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memtracking.cpp; sourceTree = "<group>"; };
+		A954AA1313EE9A2B0094E3FE /* DateField.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateField.cpp; sourceTree = "<group>"; };
+		A954AA1413EE9A2B0094E3FE /* DateField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateField.h; sourceTree = "<group>"; };
+		A954AA1513EE9A2B0094E3FE /* Document.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Document.cpp; sourceTree = "<group>"; };
+		A954AA1613EE9A2B0094E3FE /* Document.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Document.h; sourceTree = "<group>"; };
+		A954AA1713EE9A2B0094E3FE /* Field.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Field.cpp; sourceTree = "<group>"; };
+		A954AA1813EE9A2B0094E3FE /* Field.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Field.h; sourceTree = "<group>"; };
+		A954AA1A13EE9A2B0094E3FE /* CompoundFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompoundFile.cpp; sourceTree = "<group>"; };
+		A954AA1B13EE9A2B0094E3FE /* CompoundFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompoundFile.h; sourceTree = "<group>"; };
+		A954AA1C13EE9A2B0094E3FE /* DocumentWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentWriter.cpp; sourceTree = "<group>"; };
+		A954AA1D13EE9A2B0094E3FE /* DocumentWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentWriter.h; sourceTree = "<group>"; };
+		A954AA1E13EE9A2B0094E3FE /* FieldInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldInfo.h; sourceTree = "<group>"; };
+		A954AA1F13EE9A2B0094E3FE /* FieldInfos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldInfos.cpp; sourceTree = "<group>"; };
+		A954AA2013EE9A2B0094E3FE /* FieldInfos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldInfos.h; sourceTree = "<group>"; };
+		A954AA2113EE9A2B0094E3FE /* FieldsReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldsReader.cpp; sourceTree = "<group>"; };
+		A954AA2213EE9A2B0094E3FE /* FieldsReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldsReader.h; sourceTree = "<group>"; };
+		A954AA2313EE9A2B0094E3FE /* FieldsWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldsWriter.cpp; sourceTree = "<group>"; };
+		A954AA2413EE9A2B0094E3FE /* FieldsWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldsWriter.h; sourceTree = "<group>"; };
+		A954AA2513EE9A2B0094E3FE /* IndexModifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexModifier.cpp; sourceTree = "<group>"; };
+		A954AA2613EE9A2B0094E3FE /* IndexModifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexModifier.h; sourceTree = "<group>"; };
+		A954AA2713EE9A2B0094E3FE /* IndexReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexReader.cpp; sourceTree = "<group>"; };
+		A954AA2813EE9A2B0094E3FE /* IndexReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexReader.h; sourceTree = "<group>"; };
+		A954AA2913EE9A2B0094E3FE /* IndexWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexWriter.cpp; sourceTree = "<group>"; };
+		A954AA2A13EE9A2B0094E3FE /* IndexWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexWriter.h; sourceTree = "<group>"; };
+		A954AA2B13EE9A2B0094E3FE /* MultiReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiReader.cpp; sourceTree = "<group>"; };
+		A954AA2C13EE9A2B0094E3FE /* MultiReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiReader.h; sourceTree = "<group>"; };
+		A954AA2D13EE9A2B0094E3FE /* SegmentHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentHeader.h; sourceTree = "<group>"; };
+		A954AA2E13EE9A2B0094E3FE /* SegmentInfos.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentInfos.cpp; sourceTree = "<group>"; };
+		A954AA2F13EE9A2B0094E3FE /* SegmentInfos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentInfos.h; sourceTree = "<group>"; };
+		A954AA3013EE9A2B0094E3FE /* SegmentMergeInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMergeInfo.cpp; sourceTree = "<group>"; };
+		A954AA3113EE9A2B0094E3FE /* SegmentMergeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMergeInfo.h; sourceTree = "<group>"; };
+		A954AA3213EE9A2B0094E3FE /* SegmentMergeQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMergeQueue.cpp; sourceTree = "<group>"; };
+		A954AA3313EE9A2B0094E3FE /* SegmentMergeQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMergeQueue.h; sourceTree = "<group>"; };
+		A954AA3413EE9A2B0094E3FE /* SegmentMerger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentMerger.cpp; sourceTree = "<group>"; };
+		A954AA3513EE9A2B0094E3FE /* SegmentMerger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentMerger.h; sourceTree = "<group>"; };
+		A954AA3613EE9A2B0094E3FE /* SegmentReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentReader.cpp; sourceTree = "<group>"; };
+		A954AA3713EE9A2B0094E3FE /* SegmentTermDocs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermDocs.cpp; sourceTree = "<group>"; };
+		A954AA3813EE9A2B0094E3FE /* SegmentTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermEnum.cpp; sourceTree = "<group>"; };
+		A954AA3913EE9A2B0094E3FE /* SegmentTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SegmentTermEnum.h; sourceTree = "<group>"; };
+		A954AA3A13EE9A2B0094E3FE /* SegmentTermPositions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermPositions.cpp; sourceTree = "<group>"; };
+		A954AA3B13EE9A2B0094E3FE /* SegmentTermVector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SegmentTermVector.cpp; sourceTree = "<group>"; };
+		A954AA3C13EE9A2B0094E3FE /* Term.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Term.cpp; sourceTree = "<group>"; };
+		A954AA3D13EE9A2B0094E3FE /* Term.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Term.h; sourceTree = "<group>"; };
+		A954AA3E13EE9A2B0094E3FE /* TermInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfo.cpp; sourceTree = "<group>"; };
+		A954AA3F13EE9A2B0094E3FE /* TermInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfo.h; sourceTree = "<group>"; };
+		A954AA4013EE9A2B0094E3FE /* TermInfosReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfosReader.cpp; sourceTree = "<group>"; };
+		A954AA4113EE9A2B0094E3FE /* TermInfosReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfosReader.h; sourceTree = "<group>"; };
+		A954AA4213EE9A2B0094E3FE /* TermInfosWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermInfosWriter.cpp; sourceTree = "<group>"; };
+		A954AA4313EE9A2B0094E3FE /* TermInfosWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermInfosWriter.h; sourceTree = "<group>"; };
+		A954AA4413EE9A2B0094E3FE /* Terms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Terms.h; sourceTree = "<group>"; };
+		A954AA4513EE9A2B0094E3FE /* TermVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermVector.h; sourceTree = "<group>"; };
+		A954AA4613EE9A2B0094E3FE /* TermVectorReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermVectorReader.cpp; sourceTree = "<group>"; };
+		A954AA4713EE9A2B0094E3FE /* TermVectorWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermVectorWriter.cpp; sourceTree = "<group>"; };
+		A954AA4813EE9A2B0094E3FE /* LuceneThreads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LuceneThreads.h; sourceTree = "<group>"; };
+		A954AA4A13EE9A2B0094E3FE /* Lexer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lexer.cpp; sourceTree = "<group>"; };
+		A954AA4B13EE9A2B0094E3FE /* Lexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lexer.h; sourceTree = "<group>"; };
+		A954AA4C13EE9A2B0094E3FE /* MultiFieldQueryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiFieldQueryParser.cpp; sourceTree = "<group>"; };
+		A954AA4D13EE9A2B0094E3FE /* MultiFieldQueryParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiFieldQueryParser.h; sourceTree = "<group>"; };
+		A954AA4E13EE9A2B0094E3FE /* QueryParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryParser.cpp; sourceTree = "<group>"; };
+		A954AA4F13EE9A2B0094E3FE /* QueryParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryParser.h; sourceTree = "<group>"; };
+		A954AA5013EE9A2B0094E3FE /* QueryParserBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryParserBase.cpp; sourceTree = "<group>"; };
+		A954AA5113EE9A2B0094E3FE /* QueryParserBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryParserBase.h; sourceTree = "<group>"; };
+		A954AA5213EE9A2B0094E3FE /* QueryToken.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryToken.cpp; sourceTree = "<group>"; };
+		A954AA5313EE9A2B0094E3FE /* QueryToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryToken.h; sourceTree = "<group>"; };
+		A954AA5413EE9A2B0094E3FE /* TokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TokenList.cpp; sourceTree = "<group>"; };
+		A954AA5513EE9A2B0094E3FE /* TokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TokenList.h; sourceTree = "<group>"; };
+		A954AA5713EE9A2B0094E3FE /* BooleanClause.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanClause.h; sourceTree = "<group>"; };
+		A954AA5813EE9A2B0094E3FE /* BooleanQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanQuery.cpp; sourceTree = "<group>"; };
+		A954AA5913EE9A2B0094E3FE /* BooleanQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanQuery.h; sourceTree = "<group>"; };
+		A954AA5A13EE9A2B0094E3FE /* BooleanScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BooleanScorer.cpp; sourceTree = "<group>"; };
+		A954AA5B13EE9A2B0094E3FE /* BooleanScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BooleanScorer.h; sourceTree = "<group>"; };
+		A954AA5C13EE9A2B0094E3FE /* CachingWrapperFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CachingWrapperFilter.cpp; sourceTree = "<group>"; };
+		A954AA5D13EE9A2B0094E3FE /* CachingWrapperFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachingWrapperFilter.h; sourceTree = "<group>"; };
+		A954AA5E13EE9A2B0094E3FE /* ChainedFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ChainedFilter.cpp; sourceTree = "<group>"; };
+		A954AA5F13EE9A2B0094E3FE /* ChainedFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChainedFilter.h; sourceTree = "<group>"; };
+		A954AA6013EE9A2B0094E3FE /* Compare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Compare.h; sourceTree = "<group>"; };
+		A954AA6113EE9A2B0094E3FE /* ConjunctionScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConjunctionScorer.cpp; sourceTree = "<group>"; };
+		A954AA6213EE9A2B0094E3FE /* ConjunctionScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConjunctionScorer.h; sourceTree = "<group>"; };
+		A954AA6313EE9A2B0094E3FE /* DateFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateFilter.cpp; sourceTree = "<group>"; };
+		A954AA6413EE9A2B0094E3FE /* DateFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateFilter.h; sourceTree = "<group>"; };
+		A954AA6513EE9A2B0094E3FE /* ExactPhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExactPhraseScorer.cpp; sourceTree = "<group>"; };
+		A954AA6613EE9A2B0094E3FE /* ExactPhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExactPhraseScorer.h; sourceTree = "<group>"; };
+		A954AA6713EE9A2B0094E3FE /* Explanation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Explanation.cpp; sourceTree = "<group>"; };
+		A954AA6813EE9A2B0094E3FE /* Explanation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Explanation.h; sourceTree = "<group>"; };
+		A954AA6913EE9A2B0094E3FE /* FieldCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldCache.cpp; sourceTree = "<group>"; };
+		A954AA6A13EE9A2B0094E3FE /* FieldCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldCache.h; sourceTree = "<group>"; };
+		A954AA6B13EE9A2B0094E3FE /* FieldCacheImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldCacheImpl.cpp; sourceTree = "<group>"; };
+		A954AA6C13EE9A2B0094E3FE /* FieldCacheImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldCacheImpl.h; sourceTree = "<group>"; };
+		A954AA6D13EE9A2B0094E3FE /* FieldDoc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldDoc.h; sourceTree = "<group>"; };
+		A954AA6E13EE9A2B0094E3FE /* FieldDocSortedHitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldDocSortedHitQueue.cpp; sourceTree = "<group>"; };
+		A954AA6F13EE9A2B0094E3FE /* FieldDocSortedHitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldDocSortedHitQueue.h; sourceTree = "<group>"; };
+		A954AA7013EE9A2B0094E3FE /* FieldSortedHitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FieldSortedHitQueue.cpp; sourceTree = "<group>"; };
+		A954AA7113EE9A2B0094E3FE /* FieldSortedHitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FieldSortedHitQueue.h; sourceTree = "<group>"; };
+		A954AA7213EE9A2B0094E3FE /* Filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Filter.h; sourceTree = "<group>"; };
+		A954AA7313EE9A2B0094E3FE /* FilteredTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilteredTermEnum.cpp; sourceTree = "<group>"; };
+		A954AA7413EE9A2B0094E3FE /* FilteredTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilteredTermEnum.h; sourceTree = "<group>"; };
+		A954AA7513EE9A2B0094E3FE /* FuzzyQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FuzzyQuery.cpp; sourceTree = "<group>"; };
+		A954AA7613EE9A2B0094E3FE /* FuzzyQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FuzzyQuery.h; sourceTree = "<group>"; };
+		A954AA7713EE9A2B0094E3FE /* HitQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HitQueue.cpp; sourceTree = "<group>"; };
+		A954AA7813EE9A2B0094E3FE /* HitQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HitQueue.h; sourceTree = "<group>"; };
+		A954AA7913EE9A2B0094E3FE /* Hits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Hits.cpp; sourceTree = "<group>"; };
+		A954AA7A13EE9A2B0094E3FE /* IndexSearcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexSearcher.cpp; sourceTree = "<group>"; };
+		A954AA7B13EE9A2B0094E3FE /* IndexSearcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexSearcher.h; sourceTree = "<group>"; };
+		A954AA7C13EE9A2B0094E3FE /* MultiSearcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiSearcher.cpp; sourceTree = "<group>"; };
+		A954AA7D13EE9A2B0094E3FE /* MultiSearcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiSearcher.h; sourceTree = "<group>"; };
+		A954AA7E13EE9A2B0094E3FE /* MultiTermQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiTermQuery.cpp; sourceTree = "<group>"; };
+		A954AA7F13EE9A2B0094E3FE /* MultiTermQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MultiTermQuery.h; sourceTree = "<group>"; };
+		A954AA8013EE9A2B0094E3FE /* PhrasePositions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhrasePositions.cpp; sourceTree = "<group>"; };
+		A954AA8113EE9A2B0094E3FE /* PhrasePositions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhrasePositions.h; sourceTree = "<group>"; };
+		A954AA8213EE9A2B0094E3FE /* PhraseQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhraseQuery.cpp; sourceTree = "<group>"; };
+		A954AA8313EE9A2B0094E3FE /* PhraseQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseQuery.h; sourceTree = "<group>"; };
+		A954AA8413EE9A2B0094E3FE /* PhraseQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseQueue.h; sourceTree = "<group>"; };
+		A954AA8513EE9A2B0094E3FE /* PhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PhraseScorer.cpp; sourceTree = "<group>"; };
+		A954AA8613EE9A2B0094E3FE /* PhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PhraseScorer.h; sourceTree = "<group>"; };
+		A954AA8713EE9A2B0094E3FE /* PrefixQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrefixQuery.cpp; sourceTree = "<group>"; };
+		A954AA8813EE9A2B0094E3FE /* PrefixQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixQuery.h; sourceTree = "<group>"; };
+		A954AA8913EE9A2B0094E3FE /* QueryFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QueryFilter.cpp; sourceTree = "<group>"; };
+		A954AA8A13EE9A2B0094E3FE /* QueryFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QueryFilter.h; sourceTree = "<group>"; };
+		A954AA8B13EE9A2B0094E3FE /* RangeFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RangeFilter.cpp; sourceTree = "<group>"; };
+		A954AA8C13EE9A2B0094E3FE /* RangeFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeFilter.h; sourceTree = "<group>"; };
+		A954AA8D13EE9A2B0094E3FE /* RangeQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RangeQuery.cpp; sourceTree = "<group>"; };
+		A954AA8E13EE9A2B0094E3FE /* RangeQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RangeQuery.h; sourceTree = "<group>"; };
+		A954AA8F13EE9A2B0094E3FE /* Scorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scorer.h; sourceTree = "<group>"; };
+		A954AA9013EE9A2B0094E3FE /* SearchHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SearchHeader.cpp; sourceTree = "<group>"; };
+		A954AA9113EE9A2B0094E3FE /* SearchHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchHeader.h; sourceTree = "<group>"; };
+		A954AA9213EE9A2B0094E3FE /* Similarity.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Similarity.cpp; sourceTree = "<group>"; };
+		A954AA9313EE9A2B0094E3FE /* Similarity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Similarity.h; sourceTree = "<group>"; };
+		A954AA9413EE9A2B0094E3FE /* SloppyPhraseScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SloppyPhraseScorer.cpp; sourceTree = "<group>"; };
+		A954AA9513EE9A2B0094E3FE /* SloppyPhraseScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SloppyPhraseScorer.h; sourceTree = "<group>"; };
+		A954AA9613EE9A2B0094E3FE /* Sort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Sort.cpp; sourceTree = "<group>"; };
+		A954AA9713EE9A2B0094E3FE /* Sort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sort.h; sourceTree = "<group>"; };
+		A954AA9813EE9A2B0094E3FE /* TermQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermQuery.cpp; sourceTree = "<group>"; };
+		A954AA9913EE9A2B0094E3FE /* TermQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermQuery.h; sourceTree = "<group>"; };
+		A954AA9A13EE9A2B0094E3FE /* TermScorer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TermScorer.cpp; sourceTree = "<group>"; };
+		A954AA9B13EE9A2B0094E3FE /* TermScorer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TermScorer.h; sourceTree = "<group>"; };
+		A954AA9C13EE9A2B0094E3FE /* WildcardQuery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WildcardQuery.cpp; sourceTree = "<group>"; };
+		A954AA9D13EE9A2B0094E3FE /* WildcardQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WildcardQuery.h; sourceTree = "<group>"; };
+		A954AA9E13EE9A2B0094E3FE /* WildcardTermEnum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WildcardTermEnum.cpp; sourceTree = "<group>"; };
+		A954AA9F13EE9A2B0094E3FE /* WildcardTermEnum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WildcardTermEnum.h; sourceTree = "<group>"; };
+		A954AAA013EE9A2B0094E3FE /* StdHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StdHeader.cpp; sourceTree = "<group>"; };
+		A954AAA113EE9A2B0094E3FE /* StdHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StdHeader.h; sourceTree = "<group>"; };
+		A954AAA313EE9A2B0094E3FE /* Directory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Directory.h; sourceTree = "<group>"; };
+		A954AAA413EE9A2B0094E3FE /* FSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FSDirectory.cpp; sourceTree = "<group>"; };
+		A954AAA513EE9A2B0094E3FE /* FSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSDirectory.h; sourceTree = "<group>"; };
+		A954AAA613EE9A2B0094E3FE /* IndexInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexInput.cpp; sourceTree = "<group>"; };
+		A954AAA713EE9A2B0094E3FE /* IndexInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexInput.h; sourceTree = "<group>"; };
+		A954AAA813EE9A2B0094E3FE /* IndexOutput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexOutput.cpp; sourceTree = "<group>"; };
+		A954AAA913EE9A2B0094E3FE /* IndexOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IndexOutput.h; sourceTree = "<group>"; };
+		A954AAAA13EE9A2B0094E3FE /* InputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputStream.h; sourceTree = "<group>"; };
+		A954AAAB13EE9A2B0094E3FE /* Lock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lock.cpp; sourceTree = "<group>"; };
+		A954AAAC13EE9A2B0094E3FE /* Lock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Lock.h; sourceTree = "<group>"; };
+		A954AAAD13EE9A2B0094E3FE /* MMapInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MMapInput.cpp; sourceTree = "<group>"; };
+		A954AAAE13EE9A2B0094E3FE /* OutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutputStream.h; sourceTree = "<group>"; };
+		A954AAAF13EE9A2B0094E3FE /* RAMDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RAMDirectory.cpp; sourceTree = "<group>"; };
+		A954AAB013EE9A2B0094E3FE /* RAMDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAMDirectory.h; sourceTree = "<group>"; };
+		A954AAB113EE9A2B0094E3FE /* TransactionalRAMDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TransactionalRAMDirectory.cpp; sourceTree = "<group>"; };
+		A954AAB213EE9A2B0094E3FE /* TransactionalRAMDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransactionalRAMDirectory.h; sourceTree = "<group>"; };
+		A954AAB413EE9A2B0094E3FE /* Arrays.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Arrays.h; sourceTree = "<group>"; };
+		A954AAB513EE9A2B0094E3FE /* BitSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BitSet.cpp; sourceTree = "<group>"; };
+		A954AAB613EE9A2B0094E3FE /* BitSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitSet.h; sourceTree = "<group>"; };
+		A954AAB713EE9A2B0094E3FE /* bufferedstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bufferedstream.h; sourceTree = "<group>"; };
+		A954AAB813EE9A2B0094E3FE /* dirent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dirent.cpp; sourceTree = "<group>"; };
+		A954AAB913EE9A2B0094E3FE /* dirent2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dirent2.h; sourceTree = "<group>"; };
+		A954AABA13EE9A2B0094E3FE /* Equators.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Equators.cpp; sourceTree = "<group>"; };
+		A954AABB13EE9A2B0094E3FE /* Equators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Equators.h; sourceTree = "<group>"; };
+		A954AABC13EE9A2B0094E3FE /* FastCharStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FastCharStream.cpp; sourceTree = "<group>"; };
+		A954AABD13EE9A2B0094E3FE /* FastCharStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FastCharStream.h; sourceTree = "<group>"; };
+		A954AABE13EE9A2B0094E3FE /* fileinputstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fileinputstream.cpp; sourceTree = "<group>"; };
+		A954AABF13EE9A2B0094E3FE /* fileinputstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fileinputstream.h; sourceTree = "<group>"; };
+		A954AAC013EE9A2B0094E3FE /* googlesparsemap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = googlesparsemap.h; sourceTree = "<group>"; };
+		A954AAC113EE9A2B0094E3FE /* inputstreambuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputstreambuffer.h; sourceTree = "<group>"; };
+		A954AAC213EE9A2B0094E3FE /* jstreamsconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = jstreamsconfig.h; sourceTree = "<group>"; };
+		A954AAC313EE9A2B0094E3FE /* MD5Digester.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MD5Digester.cpp; sourceTree = "<group>"; };
+		A954AAC413EE9A2B0094E3FE /* MD5Digester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MD5Digester.h; sourceTree = "<group>"; };
+		A954AAC513EE9A2B0094E3FE /* Misc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Misc.cpp; sourceTree = "<group>"; };
+		A954AAC613EE9A2B0094E3FE /* Misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Misc.h; sourceTree = "<group>"; };
+		A954AAC713EE9A2B0094E3FE /* PriorityQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriorityQueue.h; sourceTree = "<group>"; };
+		A954AAC813EE9A2B0094E3FE /* Reader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Reader.cpp; sourceTree = "<group>"; };
+		A954AAC913EE9A2B0094E3FE /* Reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reader.h; sourceTree = "<group>"; };
+		A954AACA13EE9A2B0094E3FE /* streambase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = streambase.h; sourceTree = "<group>"; };
+		A954AACB13EE9A2B0094E3FE /* StringBuffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringBuffer.cpp; sourceTree = "<group>"; };
+		A954AACC13EE9A2B0094E3FE /* StringBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringBuffer.h; sourceTree = "<group>"; };
+		A954AACD13EE9A2B0094E3FE /* StringIntern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StringIntern.cpp; sourceTree = "<group>"; };
+		A954AACE13EE9A2B0094E3FE /* StringIntern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringIntern.h; sourceTree = "<group>"; };
+		A954AACF13EE9A2B0094E3FE /* stringreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stringreader.h; sourceTree = "<group>"; };
+		A954AAD013EE9A2B0094E3FE /* subinputstream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = subinputstream.h; sourceTree = "<group>"; };
+		A954AAD113EE9A2B0094E3FE /* ThreadLocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadLocal.cpp; sourceTree = "<group>"; };
+		A954AAD213EE9A2B0094E3FE /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
+		A954AAD313EE9A2B0094E3FE /* VoidList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidList.h; sourceTree = "<group>"; };
+		A954AAD413EE9A2B0094E3FE /* VoidMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VoidMap.h; sourceTree = "<group>"; };
+		A954AAD513EE9A2B0094E3FE /* CLucene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CLucene.h; sourceTree = "<group>"; };
+		A954ABC313EE9AB00094E3FE /* libsword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libsword.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		A954AC3213EE9F620094E3FE /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libcurl.dylib; sourceTree = DEVELOPER_DIR; };
+		A954AC3413EE9FA10094E3FE /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libicucore.dylib; sourceTree = DEVELOPER_DIR; };
+		A954AC3513EE9FA10094E3FE /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "SDKs/MacOSX10.7.sdk/usr/lib/libstdc++.dylib"; sourceTree = DEVELOPER_DIR; };
+		A954AC3613EE9FA10094E3FE /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
+		A964658011C663E200640FAC /* SwordManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManagerTest.h; path = ../test/SwordManagerTest.h; sourceTree = "<group>"; };
+		A964658111C663E200640FAC /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordManagerTest.m; path = ../test/SwordManagerTest.m; sourceTree = "<group>"; };
+		A96C233E176AF139008D714B /* gzclose.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzclose.c; sourceTree = "<group>"; };
+		A96C2340176AF139008D714B /* gzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzlib.c; sourceTree = "<group>"; };
+		A96C2341176AF139008D714B /* gzread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzread.c; sourceTree = "<group>"; };
+		A96C2342176AF139008D714B /* gzwrite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gzwrite.c; sourceTree = "<group>"; };
+		A96C2343176AF139008D714B /* infback.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = infback.c; sourceTree = "<group>"; };
+		A96C2351176AF188008D714B /* remotetrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remotetrans.cpp; sourceTree = "<group>"; };
+		A96C2353176AF19C008D714B /* osisenum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisenum.cpp; sourceTree = "<group>"; };
+		A96C2354176AF19C008D714B /* osisglosses.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisglosses.cpp; sourceTree = "<group>"; };
+		A96C2355176AF19C008D714B /* osisxlit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisxlit.cpp; sourceTree = "<group>"; };
+		A96C2355176AF19C008D714B /* osisreferencelinks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisreferencelinks.cpp; sourceTree = "<group>"; };
+		A975EAC411C77862007C1532 /* ObjCSword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword.h; sourceTree = "<group>"; };
+		A975ED9811C7925C007C1532 /* imp2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2gbs.cpp; sourceTree = "<group>"; };
+		A975ED9911C7925C007C1532 /* imp2ld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2ld.cpp; sourceTree = "<group>"; };
+		A975ED9A11C7925C007C1532 /* imp2vs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2vs.cpp; sourceTree = "<group>"; };
+		A975ED9B11C7925C007C1532 /* installmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = installmgr.cpp; sourceTree = "<group>"; };
+		A975EDAB11C7925C007C1532 /* mod2imp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2imp.cpp; sourceTree = "<group>"; };
+		A975EDAC11C7925C007C1532 /* mod2osis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2osis.cpp; sourceTree = "<group>"; };
+		A975EDAD11C7925C007C1532 /* mod2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2vpl.cpp; sourceTree = "<group>"; };
+		A975EDAE11C7925C007C1532 /* mod2zmod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2zmod.cpp; sourceTree = "<group>"; };
+		A975EDB111C7925C007C1532 /* osis2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osis2mod.cpp; sourceTree = "<group>"; };
+		A975EDB811C7925C007C1532 /* step2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = step2vpl.cpp; sourceTree = "<group>"; };
+		A975EDB911C7925C007C1532 /* stepdump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stepdump.cpp; sourceTree = "<group>"; };
+		A975EDBB11C7925C007C1532 /* tei2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tei2mod.cpp; sourceTree = "<group>"; };
+		A975EDD811C7925C007C1532 /* vpl2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vpl2mod.cpp; sourceTree = "<group>"; };
+		A975EDD911C7925C007C1532 /* vs2osisref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisref.cpp; sourceTree = "<group>"; };
+		A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisreftxt.cpp; sourceTree = "<group>"; };
+		A975EDDB11C7925C007C1532 /* xml2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml2gbs.cpp; sourceTree = "<group>"; };
+		A975EED911C792B9007C1532 /* mod2osis */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2osis; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9921A1911FD9CA8002DAA72 /* libSword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSword.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		A999FF3917951C8900E65919 /* bz2comprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bz2comprs.cpp; sourceTree = "<group>"; };
+		A999FF3A17951C8900E65919 /* xzcomprs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xzcomprs.cpp; sourceTree = "<group>"; };
+		A999FF3D17951CA000E65919 /* scsuutf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scsuutf8.cpp; sourceTree = "<group>"; };
+		A9A2C17C118D9D3D0002873D /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = src/Notifications.h; sourceTree = "<group>"; };
+		A9A7EEB414D5D61700B76B6A /* osis2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = osis2mod; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9BDFA6B1207F9870067ED5B /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = ../test/SwordListKeyTest.h; sourceTree = "<group>"; };
+		A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = ../test/SwordListKeyTest.m; sourceTree = "<group>"; };
+		A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = ../test/SwordModuleLongRunTest.h; sourceTree = "<group>"; };
+		A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModuleLongRunTest.mm; path = ../test/SwordModuleLongRunTest.mm; sourceTree = "<group>"; };
+		A9BFB0A213EDF51000032679 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9BFB0A413EDF51000032679 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
+		A9BFB0A613EDF51100032679 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; };
+		A9BFB0A913EDF51100032679 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		A9BFB0AA13EDF51100032679 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+		A9BFB0AB13EDF51100032679 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
+		A9C2856D11C446B700803CB5 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configuration.h; path = src/services/Configuration.h; sourceTree = "<group>"; };
+		A9C2857111C4471400803CB5 /* OSXConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSXConfiguration.h; path = src/services/OSXConfiguration.h; sourceTree = "<group>"; };
+		A9C2857211C4471400803CB5 /* OSXConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OSXConfiguration.m; path = src/services/OSXConfiguration.m; sourceTree = "<group>"; };
+		A9C2858211C44A0A00803CB5 /* Configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Configuration.m; path = src/services/Configuration.m; sourceTree = "<group>"; };
+		A9D2714E14D717D800DA8926 /* imp2gbs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = imp2gbs; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D2715B14D717FD00DA8926 /* imp2ld */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = imp2ld; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D2716814D7181200DA8926 /* imp2vs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = imp2vs; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D2717514D7182300DA8926 /* installmgr */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = installmgr; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D2718214D7183B00DA8926 /* mod2imp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2imp; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D2718F14D7185800DA8926 /* mod2vpl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2vpl; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D2719C14D7186A00DA8926 /* mod2zmod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2zmod; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D271A914D7187E00DA8926 /* step2vpl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = step2vpl; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D271B614D7189300DA8926 /* stepdump */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = stepdump; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D271C314D718A400DA8926 /* tei2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tei2mod; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D271D014D718B800DA8926 /* vpl2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vpl2mod; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D271DD14D718C800DA8926 /* vs2osisref */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vs2osisref; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D271EA14D718DF00DA8926 /* vs2osisreftxt */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vs2osisreftxt; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D271F714D718F500DA8926 /* xml2gbs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = xml2gbs; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SwordModule+Index.h"; path = "src/SwordModule+Index.h"; sourceTree = "<group>"; };
+		A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SwordModule+Index.mm"; path = "src/SwordModule+Index.mm"; sourceTree = "<group>"; };
+		A9D437CE11C52947007AFE83 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = ../../locales.d; sourceTree = SOURCE_ROOT; };
+		A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = teixhtml.cpp; sourceTree = "<group>"; };
+		A9EF1414120595650078A27C /* SwordLocaleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordLocaleManager.h; path = src/SwordLocaleManager.h; sourceTree = "<group>"; };
+		A9EF1415120595650078A27C /* SwordLocaleManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordLocaleManager.mm; path = src/SwordLocaleManager.mm; sourceTree = "<group>"; };
+		D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8DC2EF560486A6940098B216 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A954ACDD13EEA6780094E3FE /* libsword.dylib in Frameworks */,
+				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A954ABC013EE9AB00094E3FE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A954AC3713EE9FA10094E3FE /* libicucore.dylib in Frameworks */,
+				A954AC3813EE9FA10094E3FE /* libstdc++.dylib in Frameworks */,
+				A954AC3913EE9FA10094E3FE /* libz.dylib in Frameworks */,
+				A954AC3313EE9F620094E3FE /* libcurl.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A975EED711C792B9007C1532 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9A7EEAF14D5D4C300B76B6A /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9A7EEB114D5D61700B76B6A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9A7EEBF14D5D65900B76B6A /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA611207F9870067ED5B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */,
+				A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BFB09E13EDF51000032679 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BFB0BF13EDF5D500032679 /* ObjCSword.framework in Frameworks */,
+				A9BFB0A513EDF51100032679 /* SenTestingKit.framework in Frameworks */,
+				A9BFB0A713EDF51100032679 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2714914D717D800DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2714A14D717D800DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2715614D717FD00DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2715714D717FD00DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2716314D7181200DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2716414D7181200DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2717014D7182300DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2717114D7182300DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2717D14D7183B00DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2717E14D7183B00DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2718A14D7185800DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2718B14D7185800DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2719714D7186A00DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2719814D7186A00DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271A414D7187E00DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271A514D7187E00DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271B114D7189300DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271B214D7189300DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271BE14D718A400DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271BF14D718A400DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271CB14D718B800DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271CC14D718B800DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271D814D718C800DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271D914D718C800DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271E514D718DF00DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271E614D718DF00DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271F214D718F500DA8926 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271F314D718F500DA8926 /* libsword.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DFFF38A50411DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8DC2EF5B0486A6940098B216 /* ObjCSword.framework */,
+				A975EED911C792B9007C1532 /* mod2osis */,
+				A9921A1911FD9CA8002DAA72 /* libSword.dylib */,
+				A9BDFA6B1207F9870067ED5B /* Tests.octest */,
+				A9BFB0A213EDF51000032679 /* Tests.octest */,
+				A954ABC313EE9AB00094E3FE /* libsword.dylib */,
+				A9A7EEB414D5D61700B76B6A /* osis2mod */,
+				A9D2714E14D717D800DA8926 /* imp2gbs */,
+				A9D2715B14D717FD00DA8926 /* imp2ld */,
+				A9D2716814D7181200DA8926 /* imp2vs */,
+				A9D2717514D7182300DA8926 /* installmgr */,
+				A9D2718214D7183B00DA8926 /* mod2imp */,
+				A9D2718F14D7185800DA8926 /* mod2vpl */,
+				A9D2719C14D7186A00DA8926 /* mod2zmod */,
+				A9D271A914D7187E00DA8926 /* step2vpl */,
+				A9D271B614D7189300DA8926 /* stepdump */,
+				A9D271C314D718A400DA8926 /* tei2mod */,
+				A9D271D014D718B800DA8926 /* vpl2mod */,
+				A9D271DD14D718C800DA8926 /* vs2osisref */,
+				A9D271EA14D718DF00DA8926 /* vs2osisreftxt */,
+				A9D271F714D718F500DA8926 /* xml2gbs */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 /* ObjCSword */ = {
+			isa = PBXGroup;
+			children = (
+				A954A7EB13EE96FC0094E3FE /* Sword */,
+				A975ECD211C7925B007C1532 /* Utilities */,
+				A94EAE72117B32AF0018B06F /* Services */,
+				08FB77AEFE84172EC02AAC07 /* SwordWrapper */,
+				32C88DFF0371C24200C91783 /* Other Sources */,
+				089C1665FE841158C02AAC07 /* Resources */,
+				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
+				A9BFB0AC13EDF51100032679 /* Tests */,
+				A9BFB0A313EDF51000032679 /* Frameworks */,
+				034768DFFF38A50411DB9C8B /* Products */,
+			);
+			name = ObjCSword;
+			sourceTree = "<group>";
+		};
+		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */,
+				1058C7B2FEA5585E11CA2CBB /* Other Frameworks */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		089C1665FE841158C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				A9D437CE11C52947007AFE83 /* locales.d */,
+				8DC2EF5A0486A6940098B216 /* Info.plist */,
+				089C1666FE841158C02AAC07 /* InfoPlist.strings */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77AEFE84172EC02AAC07 /* SwordWrapper */ = {
+			isa = PBXGroup;
+			children = (
+				A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */,
+				A929619716B1BA240094E5BE /* SwordKey.h */,
+				A929619816B1BA240094E5BE /* SwordKey.mm */,
+				A929619916B1BA240094E5BE /* SwordListKey.h */,
+				A929619A16B1BA240094E5BE /* SwordListKey.mm */,
+				A929619B16B1BA240094E5BE /* SwordVerseKey.h */,
+				A9EF1414120595650078A27C /* SwordLocaleManager.h */,
+				A9EF1415120595650078A27C /* SwordLocaleManager.mm */,
+				A94EABF9117B28920018B06F /* SwordManager.h */,
+				A94EABFA117B28920018B06F /* SwordManager.mm */,
+				A94EAC07117B28920018B06F /* SwordVerseManager.h */,
+				A94EAC08117B28920018B06F /* SwordVerseManager.mm */,
+				A94EABFD117B28920018B06F /* SwordModule.h */,
+				A94EABFE117B28920018B06F /* SwordModule.mm */,
+				A94EABE3117B28910018B06F /* SwordBible.h */,
+				A94EABE4117B28910018B06F /* SwordBible.mm */,
+				A94EABEB117B28920018B06F /* SwordBook.h */,
+				A94EABEC117B28920018B06F /* SwordBook.mm */,
+				A94EABED117B28920018B06F /* SwordCommentary.h */,
+				A94EABEE117B28920018B06F /* SwordCommentary.mm */,
+				A94EABEF117B28920018B06F /* SwordDictionary.h */,
+				A94EABF0117B28920018B06F /* SwordDictionary.mm */,
+				A94EABE5117B28920018B06F /* SwordBibleBook.h */,
+				A94EABE6117B28920018B06F /* SwordBibleBook.mm */,
+				A94EABE7117B28920018B06F /* SwordBibleChapter.h */,
+				A94EABE8117B28920018B06F /* SwordBibleChapter.m */,
+				A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */,
+				A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */,
+				A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */,
+				A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */,
+				A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */,
+				A94EABE7117B28920018B06F /* SwordBibleChapter.h */,
+				A94EABE8117B28920018B06F /* SwordBibleChapter.m */,
+				A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */,
+				A94EAC06117B28920018B06F /* SwordVerseKey.mm */,
+				A94EAC09117B28920018B06F /* VerseEnumerator.h */,
+				A94EAC0A117B28920018B06F /* VerseEnumerator.mm */,
+				A94EABF1117B28920018B06F /* SwordInstallSource.h */,
+				A94EABF2117B28920018B06F /* SwordInstallSource.mm */,
+				A94EABF3117B28920018B06F /* SwordInstallSourceManager.h */,
+				A94EABF4117B28920018B06F /* SwordInstallSourceManager.mm */,
+				A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */,
+				A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */,
+				8C92C291C40A77060C12A21B /* SwordUtil.m */,
+				8C92C7B2EB245D47FEB5E3B0 /* SwordUtil.h */,
+				8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */,
+				8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */,
+				8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */,
+				8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */,
+				8C92CC111DC521DE0C054C60 /* SwordFilter.mm */,
+				8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */,
+			);
+			name = SwordWrapper;
+			sourceTree = "<group>";
+		};
+		1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				A954AC3413EE9FA10094E3FE /* libicucore.dylib */,
+				A954AC3513EE9FA10094E3FE /* libstdc++.dylib */,
+				A954AC3613EE9FA10094E3FE /* libz.dylib */,
+				A954AC3213EE9F620094E3FE /* libcurl.dylib */,
+				1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7B2FEA5585E11CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				0867D6A5FE840307C02AAC07 /* AppKit.framework */,
+				D2F7E79907B2D74100F64583 /* CoreData.framework */,
+				0867D69BFE84028FC02AAC07 /* Foundation.framework */,
+				A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		32C88DFF0371C24200C91783 /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				A9A2C17C118D9D3D0002873D /* Notifications.h */,
+				32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */,
+				A975EAC411C77862007C1532 /* ObjCSword.h */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		A94EAE72117B32AF0018B06F /* Services */ = {
+			isa = PBXGroup;
+			children = (
+				A9C2856D11C446B700803CB5 /* Configuration.h */,
+				A9C2858211C44A0A00803CB5 /* Configuration.m */,
+				A9C2857111C4471400803CB5 /* OSXConfiguration.h */,
+				A9C2857211C4471400803CB5 /* OSXConfiguration.m */,
+			);
+			name = Services;
+			sourceTree = "<group>";
+		};
+		A954A7EB13EE96FC0094E3FE /* Sword */ = {
+			isa = PBXGroup;
+			children = (
+				A954A7F313EE98570094E3FE /* Deps */,
+				A954A7F513EE98B30094E3FE /* src */,
+			);
+			name = Sword;
+			sourceTree = "<group>";
+		};
+		A954A7F313EE98570094E3FE /* Deps */ = {
+			isa = PBXGroup;
+			children = (
+				A954A9E013EE9A2B0094E3FE /* clucene */,
+			);
+			name = Deps;
+			sourceTree = "<group>";
+		};
+		A954A7F513EE98B30094E3FE /* src */ = {
+			isa = PBXGroup;
+			children = (
+				A954A7F613EE98B30094E3FE /* frontend */,
+				A954A80713EE98B30094E3FE /* keys */,
+				A954A81713EE98B30094E3FE /* mgr */,
+				A954A82B13EE98B30094E3FE /* modules */,
+				A954A8CF13EE98B30094E3FE /* utilfuns */,
+			);
+			name = src;
+			path = ../../src;
+			sourceTree = "<group>";
+		};
+		A954A7F613EE98B30094E3FE /* frontend */ = {
+			isa = PBXGroup;
+			children = (
+				A954A80113EE98B30094E3FE /* swdisp.cpp */,
+				A954A80213EE98B30094E3FE /* swlog.cpp */,
+			);
+			path = frontend;
+			sourceTree = "<group>";
+		};
+		A954A80713EE98B30094E3FE /* keys */ = {
+			isa = PBXGroup;
+			children = (
+				A954A80913EE98B30094E3FE /* listkey.cpp */,
+				A954A81013EE98B30094E3FE /* strkey.cpp */,
+				A954A81113EE98B30094E3FE /* swkey.cpp */,
+				A954A81213EE98B30094E3FE /* treekey.cpp */,
+				A954A81313EE98B30094E3FE /* treekeyidx.cpp */,
+				A954A81413EE98B30094E3FE /* versekey.cpp */,
+				A954A81513EE98B30094E3FE /* versetreekey.cpp */,
+			);
+			path = keys;
+			sourceTree = "<group>";
+		};
+		A954A81713EE98B30094E3FE /* mgr */ = {
+			isa = PBXGroup;
+			children = (
+				A96C2351176AF188008D714B /* remotetrans.cpp */,
+				A91C8B66175233F3008702B9 /* versificationmgr.cpp */,
+				A954A81813EE98B30094E3FE /* curlftpt.cpp */,
+				A954A81913EE98B30094E3FE /* curlhttpt.cpp */,
+				A954A81A13EE98B30094E3FE /* encfiltmgr.cpp */,
+				A954A81B13EE98B30094E3FE /* filemgr.cpp */,
+				A954A81C13EE98B30094E3FE /* ftplibftpt.cpp */,
+				A954A81E13EE98B30094E3FE /* installmgr.cpp */,
+				A954A81F13EE98B30094E3FE /* localemgr.cpp */,
+				A954A82213EE98B30094E3FE /* markupfiltmgr.cpp */,
+				A954A82313EE98B30094E3FE /* stringmgr.cpp */,
+				A954A82413EE98B30094E3FE /* swcacher.cpp */,
+				A954A82513EE98B30094E3FE /* swconfig.cpp */,
+				A954A82613EE98B30094E3FE /* swfiltermgr.cpp */,
+				A954A82713EE98B30094E3FE /* swlocale.cpp */,
+				A954A82813EE98B30094E3FE /* swmgr.cpp */,
+				A954A82913EE98B30094E3FE /* swsearchable.cpp */,
+			);
+			path = mgr;
+			sourceTree = "<group>";
+		};
+		A954A82B13EE98B30094E3FE /* modules */ = {
+			isa = PBXGroup;
+			children = (
+				A954A82C13EE98B30094E3FE /* comments */,
+				A954A84313EE98B30094E3FE /* common */,
+				A954A85413EE98B30094E3FE /* filters */,
+				A954A8A113EE98B30094E3FE /* genbook */,
+				A954A8A913EE98B30094E3FE /* lexdict */,
+				A954A8BC13EE98B30094E3FE /* swmodule.cpp */,
+				A954A8BD13EE98B30094E3FE /* tests */,
+				A954A8C013EE98B30094E3FE /* texts */,
+			);
+			path = modules;
+			sourceTree = "<group>";
+		};
+		A954A82C13EE98B30094E3FE /* comments */ = {
+			isa = PBXGroup;
+			children = (
+				A954A82D13EE98B30094E3FE /* hrefcom */,
+				A954A83313EE98B30094E3FE /* rawcom */,
+				A954A83713EE98B30094E3FE /* rawcom4 */,
+				A954A83A13EE98B30094E3FE /* rawfiles */,
+				A954A83E13EE98B30094E3FE /* swcom.cpp */,
+				A954A83F13EE98B30094E3FE /* zcom */,
+			);
+			path = comments;
+			sourceTree = "<group>";
+		};
+		A954A82D13EE98B30094E3FE /* hrefcom */ = {
+			isa = PBXGroup;
+			children = (
+				A954A82E13EE98B30094E3FE /* hrefcom.cpp */,
+			);
+			path = hrefcom;
+			sourceTree = "<group>";
+		};
+		A954A83313EE98B30094E3FE /* rawcom */ = {
+			isa = PBXGroup;
+			children = (
+				A954A83613EE98B30094E3FE /* rawcom.cpp */,
+			);
+			path = rawcom;
+			sourceTree = "<group>";
+		};
+		A954A83713EE98B30094E3FE /* rawcom4 */ = {
+			isa = PBXGroup;
+			children = (
+				A954A83913EE98B30094E3FE /* rawcom4.cpp */,
+			);
+			path = rawcom4;
+			sourceTree = "<group>";
+		};
+		A954A83A13EE98B30094E3FE /* rawfiles */ = {
+			isa = PBXGroup;
+			children = (
+				A954A83D13EE98B30094E3FE /* rawfiles.cpp */,
+			);
+			path = rawfiles;
+			sourceTree = "<group>";
+		};
+		A954A83F13EE98B30094E3FE /* zcom */ = {
+			isa = PBXGroup;
+			children = (
+				A954A84013EE98B30094E3FE /* Makefile */,
+				A954A84113EE98B30094E3FE /* Makefile.am */,
+				A954A84213EE98B30094E3FE /* zcom.cpp */,
+			);
+			path = zcom;
+			sourceTree = "<group>";
+		};
+		A954A84313EE98B30094E3FE /* common */ = {
+			isa = PBXGroup;
+			children = (
+				A999FF3917951C8900E65919 /* bz2comprs.cpp */,
+				A999FF3A17951C8900E65919 /* xzcomprs.cpp */,
+				A954A84513EE98B30094E3FE /* entriesblk.cpp */,
+				A954A84613EE98B30094E3FE /* lzsscomprs.cpp */,
+				A954A84913EE98B30094E3FE /* rawstr.cpp */,
+				A954A84A13EE98B30094E3FE /* rawstr4.cpp */,
+				A954A84B13EE98B30094E3FE /* rawverse.cpp */,
+				A954A84C13EE98B30094E3FE /* rawverse4.cpp */,
+				A954A84D13EE98B30094E3FE /* sapphire.cpp */,
+				A954A84E13EE98B30094E3FE /* swcipher.cpp */,
+				A954A84F13EE98B30094E3FE /* swcomprs.cpp */,
+				A954A85113EE98B30094E3FE /* zipcomprs.cpp */,
+				A954A85213EE98B30094E3FE /* zstr.cpp */,
+				A954A85313EE98B30094E3FE /* zverse.cpp */,
+			);
+			path = common;
+			sourceTree = "<group>";
+		};
+		A954A85413EE98B30094E3FE /* filters */ = {
+			isa = PBXGroup;
+			children = (
+				A999FF3D17951CA000E65919 /* scsuutf8.cpp */,
+				A96C2353176AF19C008D714B /* osisenum.cpp */,
+				A96C2354176AF19C008D714B /* osisglosses.cpp */,
+				A96C2355176AF19C008D714B /* osisxlit.cpp */,
+				A96C2355176AF19C008D714B /* osisreferencelinks.cpp */,
+				A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */,
+				A954A85513EE98B30094E3FE /* cipherfil.cpp */,
+				A954A85613EE98B30094E3FE /* gbffootnotes.cpp */,
+				A954A85713EE98B30094E3FE /* gbfheadings.cpp */,
+				A954A85813EE98B30094E3FE /* gbfhtml.cpp */,
+				A954A85913EE98B30094E3FE /* gbfhtmlhref.cpp */,
+				A954A85A13EE98B30094E3FE /* gbfmorph.cpp */,
+				A954A85B13EE98B30094E3FE /* gbfosis.cpp */,
+				A954A85C13EE98B30094E3FE /* gbfplain.cpp */,
+				A954A85D13EE98B30094E3FE /* gbfredletterwords.cpp */,
+				A954A85E13EE98B30094E3FE /* gbfrtf.cpp */,
+				A954A85F13EE98B30094E3FE /* gbfstrongs.cpp */,
+				A954A86013EE98B30094E3FE /* gbfthml.cpp */,
+				A954A86113EE98B30094E3FE /* gbfwebif.cpp */,
+				A954A86213EE98B30094E3FE /* gbfwordjs.cpp */,
+				A954A86313EE98B30094E3FE /* gbfxhtml.cpp */,
+				A954A86413EE98B30094E3FE /* greeklexattribs.cpp */,
+				A954A86513EE98B30094E3FE /* latin1utf16.cpp */,
+				A954A86613EE98B30094E3FE /* latin1utf8.cpp */,
+				A954A86913EE98B30094E3FE /* osisfootnotes.cpp */,
+				A954A86A13EE98B30094E3FE /* osisheadings.cpp */,
+				A954A86B13EE98B30094E3FE /* osishtmlhref.cpp */,
+				A954A86C13EE98B30094E3FE /* osislemma.cpp */,
+				A954A86D13EE98B30094E3FE /* osismorph.cpp */,
+				A954A86E13EE98B30094E3FE /* osismorphsegmentation.cpp */,
+				A954A86F13EE98B30094E3FE /* osisosis.cpp */,
+				A954A87013EE98B30094E3FE /* osisplain.cpp */,
+				A954A87113EE98B30094E3FE /* osisredletterwords.cpp */,
+				A954A87213EE98B30094E3FE /* osisrtf.cpp */,
+				A954A87413EE98B30094E3FE /* osisscripref.cpp */,
+				A954A87513EE98B30094E3FE /* osisstrongs.cpp */,
+				A954A87613EE98B30094E3FE /* osisvariants.cpp */,
+				A954A87713EE98B30094E3FE /* osiswebif.cpp */,
+				A954A87813EE98B30094E3FE /* osiswordjs.cpp */,
+				A954A87913EE98B30094E3FE /* osisxhtml.cpp */,
+				A954A87A13EE98B30094E3FE /* papyriplain.cpp */,
+				A954A87D13EE98B30094E3FE /* rtfhtml.cpp */,
+				A954A87E13EE98B30094E3FE /* swbasicfilter.cpp */,
+				A954A87F13EE98B30094E3FE /* swoptfilter.cpp */,
+				A954A88013EE98B30094E3FE /* teihtmlhref.cpp */,
+				A954A88113EE98B30094E3FE /* teiplain.cpp */,
+				A954A88213EE98B30094E3FE /* teirtf.cpp */,
+				A954A88313EE98B30094E3FE /* thmlfootnotes.cpp */,
+				A954A88413EE98B30094E3FE /* thmlgbf.cpp */,
+				A954A88513EE98B30094E3FE /* thmlheadings.cpp */,
+				A954A88613EE98B30094E3FE /* thmlhtml.cpp */,
+				A954A88713EE98B30094E3FE /* thmlhtmlhref.cpp */,
+				A954A88813EE98B30094E3FE /* thmllemma.cpp */,
+				A954A88913EE98B30094E3FE /* thmlmorph.cpp */,
+				A954A88A13EE98B30094E3FE /* thmlosis.cpp */,
+				A954A88B13EE98B30094E3FE /* thmlplain.cpp */,
+				A954A88C13EE98B30094E3FE /* thmlrtf.cpp */,
+				A954A88D13EE98B30094E3FE /* thmlscripref.cpp */,
+				A954A88E13EE98B30094E3FE /* thmlstrongs.cpp */,
+				A954A88F13EE98B30094E3FE /* thmlvariants.cpp */,
+				A954A89013EE98B30094E3FE /* thmlwebif.cpp */,
+				A954A89113EE98B30094E3FE /* thmlwordjs.cpp */,
+				A954A89213EE98B30094E3FE /* thmlxhtml.cpp */,
+				A954A89313EE98B30094E3FE /* unicodertf.cpp */,
+				A954A89413EE98B30094E3FE /* utf16utf8.cpp */,
+				A954A89513EE98B30094E3FE /* utf8arabicpoints.cpp */,
+				A954A89613EE98B30094E3FE /* utf8arshaping.cpp */,
+				A954A89713EE98B30094E3FE /* utf8bidireorder.cpp */,
+				A954A89813EE98B30094E3FE /* utf8cantillation.cpp */,
+				A954A89913EE98B30094E3FE /* utf8greekaccents.cpp */,
+				A954A89A13EE98B30094E3FE /* utf8hebrewpoints.cpp */,
+				A954A89B13EE98B30094E3FE /* utf8html.cpp */,
+				A954A89C13EE98B30094E3FE /* utf8latin1.cpp */,
+				A954A89D13EE98B30094E3FE /* utf8nfc.cpp */,
+				A954A89E13EE98B30094E3FE /* utf8nfkd.cpp */,
+				A954A89F13EE98B30094E3FE /* utf8transliterator.cpp */,
+				A954A8A013EE98B30094E3FE /* utf8utf16.cpp */,
+			);
+			path = filters;
+			sourceTree = "<group>";
+		};
+		A954A8A113EE98B30094E3FE /* genbook */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8A413EE98B30094E3FE /* rawgenbook */,
+				A954A8A813EE98B30094E3FE /* swgenbook.cpp */,
+			);
+			path = genbook;
+			sourceTree = "<group>";
+		};
+		A954A8A413EE98B30094E3FE /* rawgenbook */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8A713EE98B30094E3FE /* rawgenbook.cpp */,
+			);
+			path = rawgenbook;
+			sourceTree = "<group>";
+		};
+		A954A8A913EE98B30094E3FE /* lexdict */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8AC13EE98B30094E3FE /* rawld */,
+				A954A8B013EE98B30094E3FE /* rawld4 */,
+				A954A8B413EE98B30094E3FE /* swld.cpp */,
+				A954A8B513EE98B30094E3FE /* zld */,
+			);
+			path = lexdict;
+			sourceTree = "<group>";
+		};
+		A954A8AC13EE98B30094E3FE /* rawld */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8AF13EE98B30094E3FE /* rawld.cpp */,
+			);
+			path = rawld;
+			sourceTree = "<group>";
+		};
+		A954A8B013EE98B30094E3FE /* rawld4 */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8B313EE98B30094E3FE /* rawld4.cpp */,
+			);
+			path = rawld4;
+			sourceTree = "<group>";
+		};
+		A954A8B513EE98B30094E3FE /* zld */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8B813EE98B30094E3FE /* zld.cpp */,
+			);
+			path = zld;
+			sourceTree = "<group>";
+		};
+		A954A8BD13EE98B30094E3FE /* tests */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8BE13EE98B30094E3FE /* echomod.cpp */,
+			);
+			path = tests;
+			sourceTree = "<group>";
+		};
+		A954A8C013EE98B30094E3FE /* texts */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8C313EE98B30094E3FE /* rawtext */,
+				A954A8C713EE98B30094E3FE /* rawtext4 */,
+				A954A8CA13EE98B30094E3FE /* swtext.cpp */,
+				A954A8CB13EE98B30094E3FE /* ztext */,
+			);
+			path = texts;
+			sourceTree = "<group>";
+		};
+		A954A8C313EE98B30094E3FE /* rawtext */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8C613EE98B30094E3FE /* rawtext.cpp */,
+			);
+			path = rawtext;
+			sourceTree = "<group>";
+		};
+		A954A8C713EE98B30094E3FE /* rawtext4 */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8C913EE98B30094E3FE /* rawtext4.cpp */,
+			);
+			path = rawtext4;
+			sourceTree = "<group>";
+		};
+		A954A8CB13EE98B30094E3FE /* ztext */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8CE13EE98B30094E3FE /* ztext.cpp */,
+			);
+			path = ztext;
+			sourceTree = "<group>";
+		};
+		A954A8CF13EE98B30094E3FE /* utilfuns */ = {
+			isa = PBXGroup;
+			children = (
+				A954A8D013EE98B30094E3FE /* ftplib.c */,
+				A954A8D113EE98B30094E3FE /* ftpparse.c */,
+				A954A8D413EE98B30094E3FE /* regex.c */,
+				A954A8D513EE98B30094E3FE /* roman.cpp */,
+				A954A8D613EE98B30094E3FE /* swbuf.cpp */,
+				A954A8D713EE98B30094E3FE /* swobject.cpp */,
+				A954A8D913EE98B30094E3FE /* swversion.cpp */,
+				A954A8DA13EE98B30094E3FE /* url.cpp */,
+				A954A8DB13EE98B30094E3FE /* utilstr.cpp */,
+				A954A8DC13EE98B30094E3FE /* utilxml.cpp */,
+				A954A8E013EE98B30094E3FE /* zlib */,
+			);
+			path = utilfuns;
+			sourceTree = "<group>";
+		};
+		A954A8E013EE98B30094E3FE /* zlib */ = {
+			isa = PBXGroup;
+			children = (
+				A96C233E176AF139008D714B /* gzclose.c */,
+				A96C2340176AF139008D714B /* gzlib.c */,
+				A96C2341176AF139008D714B /* gzread.c */,
+				A96C2342176AF139008D714B /* gzwrite.c */,
+				A96C2343176AF139008D714B /* infback.c */,
+				A954A8E113EE98B30094E3FE /* adler32.c */,
+				A954A8E213EE98B30094E3FE /* compress.c */,
+				A954A8E313EE98B30094E3FE /* crc32.c */,
+				A954A8E413EE98B30094E3FE /* deflate.c */,
+				A954A8EB13EE98B30094E3FE /* inffast.c */,
+				A954A8EE13EE98B30094E3FE /* inflate.c */,
+				A954A8EF13EE98B30094E3FE /* inftrees.c */,
+				A954A8F413EE98B30094E3FE /* trees.c */,
+				A954A8F613EE98B30094E3FE /* uncompr.c */,
+				A954A8F713EE98B30094E3FE /* untgz.c */,
+				A954A8F813EE98B30094E3FE /* zutil.c */,
+			);
+			path = zlib;
+			sourceTree = "<group>";
+		};
+		A954A9E013EE9A2B0094E3FE /* clucene */ = {
+			isa = PBXGroup;
+			children = (
+				A954A9E213EE9A2B0094E3FE /* CLucene */,
+				A954AAD513EE9A2B0094E3FE /* CLucene.h */,
+			);
+			name = clucene;
+			path = dependencies/clucene;
+			sourceTree = "<group>";
+		};
+		A954A9E213EE9A2B0094E3FE /* CLucene */ = {
+			isa = PBXGroup;
+			children = (
+				A954A9E313EE9A2B0094E3FE /* analysis */,
+				A954A9F013EE9A2B0094E3FE /* CLBackwards.h */,
+				A954A9F113EE9A2B0094E3FE /* CLConfig.h */,
+				A954A9F213EE9A2B0094E3FE /* clucene-config.h */,
+				A954A9F313EE9A2B0094E3FE /* config */,
+				A954AA0A13EE9A2B0094E3FE /* debug */,
+				A954AA1213EE9A2B0094E3FE /* document */,
+				A954AA1913EE9A2B0094E3FE /* index */,
+				A954AA4813EE9A2B0094E3FE /* LuceneThreads.h */,
+				A954AA4913EE9A2B0094E3FE /* queryParser */,
+				A954AA5613EE9A2B0094E3FE /* search */,
+				A954AAA013EE9A2B0094E3FE /* StdHeader.cpp */,
+				A954AAA113EE9A2B0094E3FE /* StdHeader.h */,
+				A954AAA213EE9A2B0094E3FE /* store */,
+				A954AAB313EE9A2B0094E3FE /* util */,
+			);
+			path = CLucene;
+			sourceTree = "<group>";
+		};
+		A954A9E313EE9A2B0094E3FE /* analysis */ = {
+			isa = PBXGroup;
+			children = (
+				A954A9E413EE9A2B0094E3FE /* AnalysisHeader.cpp */,
+				A954A9E513EE9A2B0094E3FE /* AnalysisHeader.h */,
+				A954A9E613EE9A2B0094E3FE /* Analyzers.cpp */,
+				A954A9E713EE9A2B0094E3FE /* Analyzers.h */,
+				A954A9E813EE9A2B0094E3FE /* standard */,
+			);
+			path = analysis;
+			sourceTree = "<group>";
+		};
+		A954A9E813EE9A2B0094E3FE /* standard */ = {
+			isa = PBXGroup;
+			children = (
+				A954A9E913EE9A2B0094E3FE /* StandardAnalyzer.cpp */,
+				A954A9EA13EE9A2B0094E3FE /* StandardAnalyzer.h */,
+				A954A9EB13EE9A2B0094E3FE /* StandardFilter.cpp */,
+				A954A9EC13EE9A2B0094E3FE /* StandardFilter.h */,
+				A954A9ED13EE9A2B0094E3FE /* StandardTokenizer.cpp */,
+				A954A9EE13EE9A2B0094E3FE /* StandardTokenizer.h */,
+				A954A9EF13EE9A2B0094E3FE /* StandardTokenizerConstants.h */,
+			);
+			path = standard;
+			sourceTree = "<group>";
+		};
+		A954A9F313EE9A2B0094E3FE /* config */ = {
+			isa = PBXGroup;
+			children = (
+				A954A9F413EE9A2B0094E3FE /* compiler.h */,
+				A954A9F513EE9A2B0094E3FE /* CompilerBcb.h */,
+				A954A9F613EE9A2B0094E3FE /* CompilerGcc.h */,
+				A954A9F713EE9A2B0094E3FE /* CompilerMsvc.h */,
+				A954A9F813EE9A2B0094E3FE /* define_std.h */,
+				A954A9F913EE9A2B0094E3FE /* gunichartables.cpp */,
+				A954A9FA13EE9A2B0094E3FE /* gunichartables.h */,
+				A954A9FB13EE9A2B0094E3FE /* PlatformMac.h */,
+				A954A9FC13EE9A2B0094E3FE /* PlatformUnix.h */,
+				A954A9FD13EE9A2B0094E3FE /* PlatformWin32.h */,
+				A954A9FE13EE9A2B0094E3FE /* repl_lltot.cpp */,
+				A954A9FF13EE9A2B0094E3FE /* repl_tchar.h */,
+				A954AA0013EE9A2B0094E3FE /* repl_tcscasecmp.cpp */,
+				A954AA0113EE9A2B0094E3FE /* repl_tcslwr.cpp */,
+				A954AA0213EE9A2B0094E3FE /* repl_tcstod.cpp */,
+				A954AA0313EE9A2B0094E3FE /* repl_tcstoll.cpp */,
+				A954AA0413EE9A2B0094E3FE /* repl_tprintf.cpp */,
+				A954AA0513EE9A2B0094E3FE /* repl_wchar.h */,
+				A954AA0613EE9A2B0094E3FE /* threadCSection.h */,
+				A954AA0713EE9A2B0094E3FE /* threadPthread.h */,
+				A954AA0813EE9A2B0094E3FE /* threads.cpp */,
+				A954AA0913EE9A2B0094E3FE /* utf8.cpp */,
+			);
+			path = config;
+			sourceTree = "<group>";
+		};
+		A954AA0A13EE9A2B0094E3FE /* debug */ = {
+			isa = PBXGroup;
+			children = (
+				A954AA0B13EE9A2B0094E3FE /* condition.cpp */,
+				A954AA0C13EE9A2B0094E3FE /* condition.h */,
+				A954AA0D13EE9A2B0094E3FE /* error.cpp */,
+				A954AA0E13EE9A2B0094E3FE /* error.h */,
+				A954AA0F13EE9A2B0094E3FE /* lucenebase.h */,
+				A954AA1013EE9A2B0094E3FE /* mem.h */,
+				A954AA1113EE9A2B0094E3FE /* memtracking.cpp */,
+			);
+			path = debug;
+			sourceTree = "<group>";
+		};
+		A954AA1213EE9A2B0094E3FE /* document */ = {
+			isa = PBXGroup;
+			children = (
+				A954AA1313EE9A2B0094E3FE /* DateField.cpp */,
+				A954AA1413EE9A2B0094E3FE /* DateField.h */,
+				A954AA1513EE9A2B0094E3FE /* Document.cpp */,
+				A954AA1613EE9A2B0094E3FE /* Document.h */,
+				A954AA1713EE9A2B0094E3FE /* Field.cpp */,
+				A954AA1813EE9A2B0094E3FE /* Field.h */,
+			);
+			path = document;
+			sourceTree = "<group>";
+		};
+		A954AA1913EE9A2B0094E3FE /* index */ = {
+			isa = PBXGroup;
+			children = (
+				A954AA1A13EE9A2B0094E3FE /* CompoundFile.cpp */,
+				A954AA1B13EE9A2B0094E3FE /* CompoundFile.h */,
+				A954AA1C13EE9A2B0094E3FE /* DocumentWriter.cpp */,
+				A954AA1D13EE9A2B0094E3FE /* DocumentWriter.h */,
+				A954AA1E13EE9A2B0094E3FE /* FieldInfo.h */,
+				A954AA1F13EE9A2B0094E3FE /* FieldInfos.cpp */,
+				A954AA2013EE9A2B0094E3FE /* FieldInfos.h */,
+				A954AA2113EE9A2B0094E3FE /* FieldsReader.cpp */,
+				A954AA2213EE9A2B0094E3FE /* FieldsReader.h */,
+				A954AA2313EE9A2B0094E3FE /* FieldsWriter.cpp */,
+				A954AA2413EE9A2B0094E3FE /* FieldsWriter.h */,
+				A954AA2513EE9A2B0094E3FE /* IndexModifier.cpp */,
+				A954AA2613EE9A2B0094E3FE /* IndexModifier.h */,
+				A954AA2713EE9A2B0094E3FE /* IndexReader.cpp */,
+				A954AA2813EE9A2B0094E3FE /* IndexReader.h */,
+				A954AA2913EE9A2B0094E3FE /* IndexWriter.cpp */,
+				A954AA2A13EE9A2B0094E3FE /* IndexWriter.h */,
+				A954AA2B13EE9A2B0094E3FE /* MultiReader.cpp */,
+				A954AA2C13EE9A2B0094E3FE /* MultiReader.h */,
+				A954AA2D13EE9A2B0094E3FE /* SegmentHeader.h */,
+				A954AA2E13EE9A2B0094E3FE /* SegmentInfos.cpp */,
+				A954AA2F13EE9A2B0094E3FE /* SegmentInfos.h */,
+				A954AA3013EE9A2B0094E3FE /* SegmentMergeInfo.cpp */,
+				A954AA3113EE9A2B0094E3FE /* SegmentMergeInfo.h */,
+				A954AA3213EE9A2B0094E3FE /* SegmentMergeQueue.cpp */,
+				A954AA3313EE9A2B0094E3FE /* SegmentMergeQueue.h */,
+				A954AA3413EE9A2B0094E3FE /* SegmentMerger.cpp */,
+				A954AA3513EE9A2B0094E3FE /* SegmentMerger.h */,
+				A954AA3613EE9A2B0094E3FE /* SegmentReader.cpp */,
+				A954AA3713EE9A2B0094E3FE /* SegmentTermDocs.cpp */,
+				A954AA3813EE9A2B0094E3FE /* SegmentTermEnum.cpp */,
+				A954AA3913EE9A2B0094E3FE /* SegmentTermEnum.h */,
+				A954AA3A13EE9A2B0094E3FE /* SegmentTermPositions.cpp */,
+				A954AA3B13EE9A2B0094E3FE /* SegmentTermVector.cpp */,
+				A954AA3C13EE9A2B0094E3FE /* Term.cpp */,
+				A954AA3D13EE9A2B0094E3FE /* Term.h */,
+				A954AA3E13EE9A2B0094E3FE /* TermInfo.cpp */,
+				A954AA3F13EE9A2B0094E3FE /* TermInfo.h */,
+				A954AA4013EE9A2B0094E3FE /* TermInfosReader.cpp */,
+				A954AA4113EE9A2B0094E3FE /* TermInfosReader.h */,
+				A954AA4213EE9A2B0094E3FE /* TermInfosWriter.cpp */,
+				A954AA4313EE9A2B0094E3FE /* TermInfosWriter.h */,
+				A954AA4413EE9A2B0094E3FE /* Terms.h */,
+				A954AA4513EE9A2B0094E3FE /* TermVector.h */,
+				A954AA4613EE9A2B0094E3FE /* TermVectorReader.cpp */,
+				A954AA4713EE9A2B0094E3FE /* TermVectorWriter.cpp */,
+			);
+			path = index;
+			sourceTree = "<group>";
+		};
+		A954AA4913EE9A2B0094E3FE /* queryParser */ = {
+			isa = PBXGroup;
+			children = (
+				A954AA4A13EE9A2B0094E3FE /* Lexer.cpp */,
+				A954AA4B13EE9A2B0094E3FE /* Lexer.h */,
+				A954AA4C13EE9A2B0094E3FE /* MultiFieldQueryParser.cpp */,
+				A954AA4D13EE9A2B0094E3FE /* MultiFieldQueryParser.h */,
+				A954AA4E13EE9A2B0094E3FE /* QueryParser.cpp */,
+				A954AA4F13EE9A2B0094E3FE /* QueryParser.h */,
+				A954AA5013EE9A2B0094E3FE /* QueryParserBase.cpp */,
+				A954AA5113EE9A2B0094E3FE /* QueryParserBase.h */,
+				A954AA5213EE9A2B0094E3FE /* QueryToken.cpp */,
+				A954AA5313EE9A2B0094E3FE /* QueryToken.h */,
+				A954AA5413EE9A2B0094E3FE /* TokenList.cpp */,
+				A954AA5513EE9A2B0094E3FE /* TokenList.h */,
+			);
+			path = queryParser;
+			sourceTree = "<group>";
+		};
+		A954AA5613EE9A2B0094E3FE /* search */ = {
+			isa = PBXGroup;
+			children = (
+				A954AA5713EE9A2B0094E3FE /* BooleanClause.h */,
+				A954AA5813EE9A2B0094E3FE /* BooleanQuery.cpp */,
+				A954AA5913EE9A2B0094E3FE /* BooleanQuery.h */,
+				A954AA5A13EE9A2B0094E3FE /* BooleanScorer.cpp */,
+				A954AA5B13EE9A2B0094E3FE /* BooleanScorer.h */,
+				A954AA5C13EE9A2B0094E3FE /* CachingWrapperFilter.cpp */,
+				A954AA5D13EE9A2B0094E3FE /* CachingWrapperFilter.h */,
+				A954AA5E13EE9A2B0094E3FE /* ChainedFilter.cpp */,
+				A954AA5F13EE9A2B0094E3FE /* ChainedFilter.h */,
+				A954AA6013EE9A2B0094E3FE /* Compare.h */,
+				A954AA6113EE9A2B0094E3FE /* ConjunctionScorer.cpp */,
+				A954AA6213EE9A2B0094E3FE /* ConjunctionScorer.h */,
+				A954AA6313EE9A2B0094E3FE /* DateFilter.cpp */,
+				A954AA6413EE9A2B0094E3FE /* DateFilter.h */,
+				A954AA6513EE9A2B0094E3FE /* ExactPhraseScorer.cpp */,
+				A954AA6613EE9A2B0094E3FE /* ExactPhraseScorer.h */,
+				A954AA6713EE9A2B0094E3FE /* Explanation.cpp */,
+				A954AA6813EE9A2B0094E3FE /* Explanation.h */,
+				A954AA6913EE9A2B0094E3FE /* FieldCache.cpp */,
+				A954AA6A13EE9A2B0094E3FE /* FieldCache.h */,
+				A954AA6B13EE9A2B0094E3FE /* FieldCacheImpl.cpp */,
+				A954AA6C13EE9A2B0094E3FE /* FieldCacheImpl.h */,
+				A954AA6D13EE9A2B0094E3FE /* FieldDoc.h */,
+				A954AA6E13EE9A2B0094E3FE /* FieldDocSortedHitQueue.cpp */,
+				A954AA6F13EE9A2B0094E3FE /* FieldDocSortedHitQueue.h */,
+				A954AA7013EE9A2B0094E3FE /* FieldSortedHitQueue.cpp */,
+				A954AA7113EE9A2B0094E3FE /* FieldSortedHitQueue.h */,
+				A954AA7213EE9A2B0094E3FE /* Filter.h */,
+				A954AA7313EE9A2B0094E3FE /* FilteredTermEnum.cpp */,
+				A954AA7413EE9A2B0094E3FE /* FilteredTermEnum.h */,
+				A954AA7513EE9A2B0094E3FE /* FuzzyQuery.cpp */,
+				A954AA7613EE9A2B0094E3FE /* FuzzyQuery.h */,
+				A954AA7713EE9A2B0094E3FE /* HitQueue.cpp */,
+				A954AA7813EE9A2B0094E3FE /* HitQueue.h */,
+				A954AA7913EE9A2B0094E3FE /* Hits.cpp */,
+				A954AA7A13EE9A2B0094E3FE /* IndexSearcher.cpp */,
+				A954AA7B13EE9A2B0094E3FE /* IndexSearcher.h */,
+				A954AA7C13EE9A2B0094E3FE /* MultiSearcher.cpp */,
+				A954AA7D13EE9A2B0094E3FE /* MultiSearcher.h */,
+				A954AA7E13EE9A2B0094E3FE /* MultiTermQuery.cpp */,
+				A954AA7F13EE9A2B0094E3FE /* MultiTermQuery.h */,
+				A954AA8013EE9A2B0094E3FE /* PhrasePositions.cpp */,
+				A954AA8113EE9A2B0094E3FE /* PhrasePositions.h */,
+				A954AA8213EE9A2B0094E3FE /* PhraseQuery.cpp */,
+				A954AA8313EE9A2B0094E3FE /* PhraseQuery.h */,
+				A954AA8413EE9A2B0094E3FE /* PhraseQueue.h */,
+				A954AA8513EE9A2B0094E3FE /* PhraseScorer.cpp */,
+				A954AA8613EE9A2B0094E3FE /* PhraseScorer.h */,
+				A954AA8713EE9A2B0094E3FE /* PrefixQuery.cpp */,
+				A954AA8813EE9A2B0094E3FE /* PrefixQuery.h */,
+				A954AA8913EE9A2B0094E3FE /* QueryFilter.cpp */,
+				A954AA8A13EE9A2B0094E3FE /* QueryFilter.h */,
+				A954AA8B13EE9A2B0094E3FE /* RangeFilter.cpp */,
+				A954AA8C13EE9A2B0094E3FE /* RangeFilter.h */,
+				A954AA8D13EE9A2B0094E3FE /* RangeQuery.cpp */,
+				A954AA8E13EE9A2B0094E3FE /* RangeQuery.h */,
+				A954AA8F13EE9A2B0094E3FE /* Scorer.h */,
+				A954AA9013EE9A2B0094E3FE /* SearchHeader.cpp */,
+				A954AA9113EE9A2B0094E3FE /* SearchHeader.h */,
+				A954AA9213EE9A2B0094E3FE /* Similarity.cpp */,
+				A954AA9313EE9A2B0094E3FE /* Similarity.h */,
+				A954AA9413EE9A2B0094E3FE /* SloppyPhraseScorer.cpp */,
+				A954AA9513EE9A2B0094E3FE /* SloppyPhraseScorer.h */,
+				A954AA9613EE9A2B0094E3FE /* Sort.cpp */,
+				A954AA9713EE9A2B0094E3FE /* Sort.h */,
+				A954AA9813EE9A2B0094E3FE /* TermQuery.cpp */,
+				A954AA9913EE9A2B0094E3FE /* TermQuery.h */,
+				A954AA9A13EE9A2B0094E3FE /* TermScorer.cpp */,
+				A954AA9B13EE9A2B0094E3FE /* TermScorer.h */,
+				A954AA9C13EE9A2B0094E3FE /* WildcardQuery.cpp */,
+				A954AA9D13EE9A2B0094E3FE /* WildcardQuery.h */,
+				A954AA9E13EE9A2B0094E3FE /* WildcardTermEnum.cpp */,
+				A954AA9F13EE9A2B0094E3FE /* WildcardTermEnum.h */,
+			);
+			path = search;
+			sourceTree = "<group>";
+		};
+		A954AAA213EE9A2B0094E3FE /* store */ = {
+			isa = PBXGroup;
+			children = (
+				A954AAA313EE9A2B0094E3FE /* Directory.h */,
+				A954AAA413EE9A2B0094E3FE /* FSDirectory.cpp */,
+				A954AAA513EE9A2B0094E3FE /* FSDirectory.h */,
+				A954AAA613EE9A2B0094E3FE /* IndexInput.cpp */,
+				A954AAA713EE9A2B0094E3FE /* IndexInput.h */,
+				A954AAA813EE9A2B0094E3FE /* IndexOutput.cpp */,
+				A954AAA913EE9A2B0094E3FE /* IndexOutput.h */,
+				A954AAAA13EE9A2B0094E3FE /* InputStream.h */,
+				A954AAAB13EE9A2B0094E3FE /* Lock.cpp */,
+				A954AAAC13EE9A2B0094E3FE /* Lock.h */,
+				A954AAAD13EE9A2B0094E3FE /* MMapInput.cpp */,
+				A954AAAE13EE9A2B0094E3FE /* OutputStream.h */,
+				A954AAAF13EE9A2B0094E3FE /* RAMDirectory.cpp */,
+				A954AAB013EE9A2B0094E3FE /* RAMDirectory.h */,
+				A954AAB113EE9A2B0094E3FE /* TransactionalRAMDirectory.cpp */,
+				A954AAB213EE9A2B0094E3FE /* TransactionalRAMDirectory.h */,
+			);
+			path = store;
+			sourceTree = "<group>";
+		};
+		A954AAB313EE9A2B0094E3FE /* util */ = {
+			isa = PBXGroup;
+			children = (
+				A954AAB413EE9A2B0094E3FE /* Arrays.h */,
+				A954AAB513EE9A2B0094E3FE /* BitSet.cpp */,
+				A954AAB613EE9A2B0094E3FE /* BitSet.h */,
+				A954AAB713EE9A2B0094E3FE /* bufferedstream.h */,
+				A954AAB813EE9A2B0094E3FE /* dirent.cpp */,
+				A954AAB913EE9A2B0094E3FE /* dirent2.h */,
+				A954AABA13EE9A2B0094E3FE /* Equators.cpp */,
+				A954AABB13EE9A2B0094E3FE /* Equators.h */,
+				A954AABC13EE9A2B0094E3FE /* FastCharStream.cpp */,
+				A954AABD13EE9A2B0094E3FE /* FastCharStream.h */,
+				A954AABE13EE9A2B0094E3FE /* fileinputstream.cpp */,
+				A954AABF13EE9A2B0094E3FE /* fileinputstream.h */,
+				A954AAC013EE9A2B0094E3FE /* googlesparsemap.h */,
+				A954AAC113EE9A2B0094E3FE /* inputstreambuffer.h */,
+				A954AAC213EE9A2B0094E3FE /* jstreamsconfig.h */,
+				A954AAC313EE9A2B0094E3FE /* MD5Digester.cpp */,
+				A954AAC413EE9A2B0094E3FE /* MD5Digester.h */,
+				A954AAC513EE9A2B0094E3FE /* Misc.cpp */,
+				A954AAC613EE9A2B0094E3FE /* Misc.h */,
+				A954AAC713EE9A2B0094E3FE /* PriorityQueue.h */,
+				A954AAC813EE9A2B0094E3FE /* Reader.cpp */,
+				A954AAC913EE9A2B0094E3FE /* Reader.h */,
+				A954AACA13EE9A2B0094E3FE /* streambase.h */,
+				A954AACB13EE9A2B0094E3FE /* StringBuffer.cpp */,
+				A954AACC13EE9A2B0094E3FE /* StringBuffer.h */,
+				A954AACD13EE9A2B0094E3FE /* StringIntern.cpp */,
+				A954AACE13EE9A2B0094E3FE /* StringIntern.h */,
+				A954AACF13EE9A2B0094E3FE /* stringreader.h */,
+				A954AAD013EE9A2B0094E3FE /* subinputstream.h */,
+				A954AAD113EE9A2B0094E3FE /* ThreadLocal.cpp */,
+				A954AAD213EE9A2B0094E3FE /* ThreadLocal.h */,
+				A954AAD313EE9A2B0094E3FE /* VoidList.h */,
+				A954AAD413EE9A2B0094E3FE /* VoidMap.h */,
+			);
+			path = util;
+			sourceTree = "<group>";
+		};
+		A975ECD211C7925B007C1532 /* Utilities */ = {
+			isa = PBXGroup;
+			children = (
+				A975ED9811C7925C007C1532 /* imp2gbs.cpp */,
+				A975ED9911C7925C007C1532 /* imp2ld.cpp */,
+				A975ED9A11C7925C007C1532 /* imp2vs.cpp */,
+				A975ED9B11C7925C007C1532 /* installmgr.cpp */,
+				A975EDAB11C7925C007C1532 /* mod2imp.cpp */,
+				A975EDAC11C7925C007C1532 /* mod2osis.cpp */,
+				A975EDAD11C7925C007C1532 /* mod2vpl.cpp */,
+				A975EDAE11C7925C007C1532 /* mod2zmod.cpp */,
+				A975EDB111C7925C007C1532 /* osis2mod.cpp */,
+				A975EDB811C7925C007C1532 /* step2vpl.cpp */,
+				A975EDB911C7925C007C1532 /* stepdump.cpp */,
+				A975EDBB11C7925C007C1532 /* tei2mod.cpp */,
+				A975EDD811C7925C007C1532 /* vpl2mod.cpp */,
+				A975EDD911C7925C007C1532 /* vs2osisref.cpp */,
+				A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */,
+				A975EDDB11C7925C007C1532 /* xml2gbs.cpp */,
+			);
+			name = Utilities;
+			path = ../../utilities;
+			sourceTree = SOURCE_ROOT;
+		};
+		A9BFB0A313EDF51000032679 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				A9BFB0A413EDF51000032679 /* SenTestingKit.framework */,
+				A9BFB0A613EDF51100032679 /* Cocoa.framework */,
+				A9BFB0A813EDF51100032679 /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		A9BFB0A813EDF51100032679 /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				A9BFB0A913EDF51100032679 /* AppKit.framework */,
+				A9BFB0AA13EDF51100032679 /* CoreData.framework */,
+				A9BFB0AB13EDF51100032679 /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		A9BFB0AC13EDF51100032679 /* Tests */ = {
+			isa = PBXGroup;
+			children = (
+				A917AF2516B1BE38006367FC /* Tests-Info.plist */,
+				A964658011C663E200640FAC /* SwordManagerTest.h */,
+				A964658111C663E200640FAC /* SwordManagerTest.m */,
+				A918B8E211C6697400024D84 /* SwordModuleTest.h */,
+				A918B8E311C6697400024D84 /* SwordModuleTest.m */,
+				A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */,
+				A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */,
+				A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */,
+				A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */,
+			);
+			name = Tests;
+			path = test;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8DC2EF500486A6940098B216 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A975EAC511C77862007C1532 /* ObjCSword.h in Headers */,
+				A94EAC0B117B28920018B06F /* SwordBible.h in Headers */,
+				A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */,
+				A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */,
+				A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */,
+				A94EAC13117B28920018B06F /* SwordBook.h in Headers */,
+				A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */,
+				A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */,
+				A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */,
+				A94EAC1B117B28920018B06F /* SwordInstallSourceManager.h in Headers */,
+				A94EAC21117B28920018B06F /* SwordManager.h in Headers */,
+				A94EAC25117B28920018B06F /* SwordModule.h in Headers */,
+				A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */,
+				A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */,
+				A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */,
+				A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */,
+				A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */,
+				A9C2856F11C446B700803CB5 /* Configuration.h in Headers */,
+				A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */,
+				A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */,
+				A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */,
+				A929619D16B1BA240094E5BE /* SwordKey.h in Headers */,
+				A929619F16B1BA240094E5BE /* SwordListKey.h in Headers */,
+				A92961A116B1BA240094E5BE /* SwordVerseKey.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A954ABC113EE9AB00094E3FE /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA651207F9870067ED5B /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */,
+				A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */,
+				A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		8DC2EF4F0486A6940098B216 /* ObjCSword */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */;
+			buildPhases = (
+				8DC2EF500486A6940098B216 /* Headers */,
+				8DC2EF520486A6940098B216 /* Resources */,
+				8DC2EF540486A6940098B216 /* Sources */,
+				8DC2EF560486A6940098B216 /* Frameworks */,
+				A9A5050211C75C4B00EB6EA5 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A954ABCA13EE9D0F0094E3FE /* PBXTargetDependency */,
+			);
+			name = ObjCSword;
+			productInstallPath = "$(HOME)/Library/Frameworks";
+			productName = ObjCSword;
+			productReference = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		A954ABC213EE9AB00094E3FE /* sword */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A954ABC413EE9AB00094E3FE /* Build configuration list for PBXNativeTarget "sword" */;
+			buildPhases = (
+				A954ABBF13EE9AB00094E3FE /* Sources */,
+				A954ABC013EE9AB00094E3FE /* Frameworks */,
+				A954ABC113EE9AB00094E3FE /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = sword;
+			productName = libsword;
+			productReference = A954ABC313EE9AB00094E3FE /* libsword.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		A975EED811C792B9007C1532 /* mod2osis */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */;
+			buildPhases = (
+				A975EED611C792B9007C1532 /* Sources */,
+				A975EED711C792B9007C1532 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9A7EEAE14D5D4BB00B76B6A /* PBXTargetDependency */,
+			);
+			name = mod2osis;
+			productName = mod2osis;
+			productReference = A975EED911C792B9007C1532 /* mod2osis */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9A7EEB314D5D61700B76B6A /* osis2mod */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9A7EEBB14D5D61700B76B6A /* Build configuration list for PBXNativeTarget "osis2mod" */;
+			buildPhases = (
+				A9A7EEB014D5D61700B76B6A /* Sources */,
+				A9A7EEB114D5D61700B76B6A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9A7EEC114D5D66400B76B6A /* PBXTargetDependency */,
+			);
+			name = osis2mod;
+			productName = osis2mod;
+			productReference = A9A7EEB414D5D61700B76B6A /* osis2mod */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9BDFA5A1207F9870067ED5B /* LongRunningTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */;
+			buildPhases = (
+				A9BDFA5D1207F9870067ED5B /* Resources */,
+				A9BDFA5E1207F9870067ED5B /* Sources */,
+				A9BDFA611207F9870067ED5B /* Frameworks */,
+				A9BDFA641207F9870067ED5B /* ShellScript */,
+				A9BDFA651207F9870067ED5B /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */,
+			);
+			name = LongRunningTests;
+			productName = Tests;
+			productReference = A9BDFA6B1207F9870067ED5B /* Tests.octest */;
+			productType = "com.apple.product-type.bundle";
+		};
+		A9BFB0A113EDF51000032679 /* Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9BFB0B713EDF51100032679 /* Build configuration list for PBXNativeTarget "Tests" */;
+			buildPhases = (
+				A9BFB09D13EDF51000032679 /* Sources */,
+				A9BFB09E13EDF51000032679 /* Frameworks */,
+				A9BFB09F13EDF51000032679 /* Resources */,
+				A9BFB0A013EDF51000032679 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9BFB0BB13EDF5B600032679 /* PBXTargetDependency */,
+			);
+			name = Tests;
+			productName = "Tests-new";
+			productReference = A9BFB0A213EDF51000032679 /* Tests.octest */;
+			productType = "com.apple.product-type.bundle";
+		};
+		A9D2714414D717D800DA8926 /* imp2gbs */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D2714B14D717D800DA8926 /* Build configuration list for PBXNativeTarget "imp2gbs" */;
+			buildPhases = (
+				A9D2714714D717D800DA8926 /* Sources */,
+				A9D2714914D717D800DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D2714514D717D800DA8926 /* PBXTargetDependency */,
+			);
+			name = imp2gbs;
+			productName = mod2osis;
+			productReference = A9D2714E14D717D800DA8926 /* imp2gbs */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D2715114D717FD00DA8926 /* imp2ld */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D2715814D717FD00DA8926 /* Build configuration list for PBXNativeTarget "imp2ld" */;
+			buildPhases = (
+				A9D2715414D717FD00DA8926 /* Sources */,
+				A9D2715614D717FD00DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D2715214D717FD00DA8926 /* PBXTargetDependency */,
+			);
+			name = imp2ld;
+			productName = mod2osis;
+			productReference = A9D2715B14D717FD00DA8926 /* imp2ld */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D2715E14D7181200DA8926 /* imp2vs */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D2716514D7181200DA8926 /* Build configuration list for PBXNativeTarget "imp2vs" */;
+			buildPhases = (
+				A9D2716114D7181200DA8926 /* Sources */,
+				A9D2716314D7181200DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D2715F14D7181200DA8926 /* PBXTargetDependency */,
+			);
+			name = imp2vs;
+			productName = mod2osis;
+			productReference = A9D2716814D7181200DA8926 /* imp2vs */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D2716B14D7182300DA8926 /* installmgr */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D2717214D7182300DA8926 /* Build configuration list for PBXNativeTarget "installmgr" */;
+			buildPhases = (
+				A9D2716E14D7182300DA8926 /* Sources */,
+				A9D2717014D7182300DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D2716C14D7182300DA8926 /* PBXTargetDependency */,
+			);
+			name = installmgr;
+			productName = mod2osis;
+			productReference = A9D2717514D7182300DA8926 /* installmgr */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D2717814D7183B00DA8926 /* mod2imp */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D2717F14D7183B00DA8926 /* Build configuration list for PBXNativeTarget "mod2imp" */;
+			buildPhases = (
+				A9D2717B14D7183B00DA8926 /* Sources */,
+				A9D2717D14D7183B00DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D2717914D7183B00DA8926 /* PBXTargetDependency */,
+			);
+			name = mod2imp;
+			productName = mod2osis;
+			productReference = A9D2718214D7183B00DA8926 /* mod2imp */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D2718514D7185800DA8926 /* mod2vpl */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D2718C14D7185800DA8926 /* Build configuration list for PBXNativeTarget "mod2vpl" */;
+			buildPhases = (
+				A9D2718814D7185800DA8926 /* Sources */,
+				A9D2718A14D7185800DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D2718614D7185800DA8926 /* PBXTargetDependency */,
+			);
+			name = mod2vpl;
+			productName = mod2osis;
+			productReference = A9D2718F14D7185800DA8926 /* mod2vpl */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D2719214D7186A00DA8926 /* mod2zmod */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D2719914D7186A00DA8926 /* Build configuration list for PBXNativeTarget "mod2zmod" */;
+			buildPhases = (
+				A9D2719514D7186A00DA8926 /* Sources */,
+				A9D2719714D7186A00DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D2719314D7186A00DA8926 /* PBXTargetDependency */,
+			);
+			name = mod2zmod;
+			productName = mod2osis;
+			productReference = A9D2719C14D7186A00DA8926 /* mod2zmod */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D2719F14D7187E00DA8926 /* step2vpl */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D271A614D7187E00DA8926 /* Build configuration list for PBXNativeTarget "step2vpl" */;
+			buildPhases = (
+				A9D271A214D7187E00DA8926 /* Sources */,
+				A9D271A414D7187E00DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D271A014D7187E00DA8926 /* PBXTargetDependency */,
+			);
+			name = step2vpl;
+			productName = osis2mod;
+			productReference = A9D271A914D7187E00DA8926 /* step2vpl */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D271AC14D7189300DA8926 /* stepdump */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D271B314D7189300DA8926 /* Build configuration list for PBXNativeTarget "stepdump" */;
+			buildPhases = (
+				A9D271AF14D7189300DA8926 /* Sources */,
+				A9D271B114D7189300DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D271AD14D7189300DA8926 /* PBXTargetDependency */,
+			);
+			name = stepdump;
+			productName = osis2mod;
+			productReference = A9D271B614D7189300DA8926 /* stepdump */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D271B914D718A400DA8926 /* tei2mod */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D271C014D718A400DA8926 /* Build configuration list for PBXNativeTarget "tei2mod" */;
+			buildPhases = (
+				A9D271BC14D718A400DA8926 /* Sources */,
+				A9D271BE14D718A400DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D271BA14D718A400DA8926 /* PBXTargetDependency */,
+			);
+			name = tei2mod;
+			productName = osis2mod;
+			productReference = A9D271C314D718A400DA8926 /* tei2mod */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D271C614D718B800DA8926 /* vpl2mod */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D271CD14D718B800DA8926 /* Build configuration list for PBXNativeTarget "vpl2mod" */;
+			buildPhases = (
+				A9D271C914D718B800DA8926 /* Sources */,
+				A9D271CB14D718B800DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D271C714D718B800DA8926 /* PBXTargetDependency */,
+			);
+			name = vpl2mod;
+			productName = osis2mod;
+			productReference = A9D271D014D718B800DA8926 /* vpl2mod */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D271D314D718C800DA8926 /* vs2osisref */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D271DA14D718C800DA8926 /* Build configuration list for PBXNativeTarget "vs2osisref" */;
+			buildPhases = (
+				A9D271D614D718C800DA8926 /* Sources */,
+				A9D271D814D718C800DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D271D414D718C800DA8926 /* PBXTargetDependency */,
+			);
+			name = vs2osisref;
+			productName = osis2mod;
+			productReference = A9D271DD14D718C800DA8926 /* vs2osisref */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D271E014D718DF00DA8926 /* vs2osisreftxt */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D271E714D718DF00DA8926 /* Build configuration list for PBXNativeTarget "vs2osisreftxt" */;
+			buildPhases = (
+				A9D271E314D718DF00DA8926 /* Sources */,
+				A9D271E514D718DF00DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D271E114D718DF00DA8926 /* PBXTargetDependency */,
+			);
+			name = vs2osisreftxt;
+			productName = osis2mod;
+			productReference = A9D271EA14D718DF00DA8926 /* vs2osisreftxt */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9D271ED14D718F500DA8926 /* xml2gbs */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9D271F414D718F500DA8926 /* Build configuration list for PBXNativeTarget "xml2gbs" */;
+			buildPhases = (
+				A9D271F014D718F500DA8926 /* Sources */,
+				A9D271F214D718F500DA8926 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9D271EE14D718F500DA8926 /* PBXTargetDependency */,
+			);
+			name = xml2gbs;
+			productName = osis2mod;
+			productReference = A9D271F714D718F500DA8926 /* xml2gbs */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0460;
+			};
+			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+				en,
+			);
+			mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */;
+			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8DC2EF4F0486A6940098B216 /* ObjCSword */,
+				A9BDFA5A1207F9870067ED5B /* LongRunningTests */,
+				A9BFB0A113EDF51000032679 /* Tests */,
+				A954ABC213EE9AB00094E3FE /* sword */,
+				A9D2714414D717D800DA8926 /* imp2gbs */,
+				A9D2715114D717FD00DA8926 /* imp2ld */,
+				A9D2715E14D7181200DA8926 /* imp2vs */,
+				A9D2716B14D7182300DA8926 /* installmgr */,
+				A9D2717814D7183B00DA8926 /* mod2imp */,
+				A975EED811C792B9007C1532 /* mod2osis */,
+				A9D2718514D7185800DA8926 /* mod2vpl */,
+				A9D2719214D7186A00DA8926 /* mod2zmod */,
+				A9A7EEB314D5D61700B76B6A /* osis2mod */,
+				A9D2719F14D7187E00DA8926 /* step2vpl */,
+				A9D271AC14D7189300DA8926 /* stepdump */,
+				A9D271B914D718A400DA8926 /* tei2mod */,
+				A9D271C614D718B800DA8926 /* vpl2mod */,
+				A9D271D314D718C800DA8926 /* vs2osisref */,
+				A9D271E014D718DF00DA8926 /* vs2osisreftxt */,
+				A9D271ED14D718F500DA8926 /* xml2gbs */,
+				A9D271FA14D7193300DA8926 /* Utilities */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8DC2EF520486A6940098B216 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
+				A9D4382311C52947007AFE83 /* locales.d in Resources */,
+				A917AF2616B1BE38006367FC /* Tests-Info.plist in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA5D1207F9870067ED5B /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BFB09F13EDF51000032679 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		A9BDFA641207F9870067ED5B /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
+		};
+		A9BFB0A013EDF51000032679 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8DC2EF540486A6940098B216 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */,
+				A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */,
+				A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */,
+				A94EAC14117B28920018B06F /* SwordBook.mm in Sources */,
+				A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */,
+				A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */,
+				A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */,
+				A94EAC1C117B28920018B06F /* SwordInstallSourceManager.mm in Sources */,
+				A94EAC22117B28920018B06F /* SwordManager.mm in Sources */,
+				A94EAC26117B28920018B06F /* SwordModule.mm in Sources */,
+				A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */,
+				A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */,
+				A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */,
+				A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */,
+				A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */,
+				A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */,
+				A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */,
+				A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */,
+				A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */,
+				8C92CE39E231FF9CAAB5308B /* SwordUtil.m in Sources */,
+				8C92CE0B19FBB659FB8F8B71 /* FilterProviderFactory.mm in Sources */,
+				8C92CC7B68FDCDFFFB8B4A31 /* DefaultFilterProvider.mm in Sources */,
+				8C92C31DC92DF0671FCEB5B3 /* SwordFilter.mm in Sources */,
+				A929619C16B1BA240094E5BE /* SwordBibleTextEntry.m in Sources */,
+				A929619E16B1BA240094E5BE /* SwordKey.mm in Sources */,
+				A92961A016B1BA240094E5BE /* SwordListKey.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A954ABBF13EE9AB00094E3FE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A999FF3F17951CCE00E65919 /* bz2comprs.cpp in Sources */,
+				A999FF4017951CCE00E65919 /* xzcomprs.cpp in Sources */,
+				A999FF4117951CCE00E65919 /* scsuutf8.cpp in Sources */,
+				A96C2359176AFA3C008D714B /* remotetrans.cpp in Sources */,
+				A96C235A176AFA3C008D714B /* osisenum.cpp in Sources */,
+				A96C235B176AFA3C008D714B /* osisglosses.cpp in Sources */,
+				A96C235C176AFA3C008D714B /* osisxlit.cpp in Sources */,
+				A96C235C176AFA3C008D714B /* osisreferencelinks.cpp in Sources */,
+				A96C235D176AFA3C008D714B /* gzclose.c in Sources */,
+				A96C235E176AFA3C008D714B /* gzlib.c in Sources */,
+				A96C235F176AFA3C008D714B /* gzread.c in Sources */,
+				A96C2360176AFA3C008D714B /* gzwrite.c in Sources */,
+				A96C2361176AFA3C008D714B /* infback.c in Sources */,
+				A91C8B6817523609008702B9 /* versificationmgr.cpp in Sources */,
+				A967FB5616806B16004ED73C /* teixhtml.cpp in Sources */,
+				A954ACCA13EEA5340094E3FE /* ftplib.c in Sources */,
+				A954ACCB13EEA5340094E3FE /* ftpparse.c in Sources */,
+				A954ACCD13EEA5340094E3FE /* adler32.c in Sources */,
+				A954ACCE13EEA5340094E3FE /* compress.c in Sources */,
+				A954ACCF13EEA5340094E3FE /* crc32.c in Sources */,
+				A954ACD013EEA5340094E3FE /* deflate.c in Sources */,
+				A954ACD413EEA5340094E3FE /* inffast.c in Sources */,
+				A954ACD513EEA5340094E3FE /* inflate.c in Sources */,
+				A954ACD613EEA5340094E3FE /* inftrees.c in Sources */,
+				A954ACD913EEA5340094E3FE /* trees.c in Sources */,
+				A954ACDA13EEA5340094E3FE /* uncompr.c in Sources */,
+				A954ACDB13EEA5340094E3FE /* untgz.c in Sources */,
+				A954ACDC13EEA5340094E3FE /* zutil.c in Sources */,
+				A954AC3A13EEA0C10094E3FE /* swdisp.cpp in Sources */,
+				A954AC3B13EEA0C10094E3FE /* swlog.cpp in Sources */,
+				A954AC3C13EEA0C10094E3FE /* listkey.cpp in Sources */,
+				A954AC3D13EEA0C10094E3FE /* strkey.cpp in Sources */,
+				A954AC3E13EEA0C10094E3FE /* swkey.cpp in Sources */,
+				A954AC3F13EEA0C10094E3FE /* treekey.cpp in Sources */,
+				A954AC4013EEA0C10094E3FE /* treekeyidx.cpp in Sources */,
+				A954AC4113EEA0C10094E3FE /* versekey.cpp in Sources */,
+				A954AC4213EEA0C10094E3FE /* versetreekey.cpp in Sources */,
+				A954AC4313EEA0C10094E3FE /* curlftpt.cpp in Sources */,
+				A954AC4413EEA0C10094E3FE /* curlhttpt.cpp in Sources */,
+				A954AC4513EEA0C10094E3FE /* encfiltmgr.cpp in Sources */,
+				A954AC4613EEA0C10094E3FE /* filemgr.cpp in Sources */,
+				A954AC4713EEA0C10094E3FE /* ftplibftpt.cpp in Sources */,
+				A954AC4913EEA0C10094E3FE /* installmgr.cpp in Sources */,
+				A954AC4A13EEA0C10094E3FE /* localemgr.cpp in Sources */,
+				A954AC4B13EEA0C10094E3FE /* markupfiltmgr.cpp in Sources */,
+				A954AC4C13EEA0C10094E3FE /* stringmgr.cpp in Sources */,
+				A954AC4D13EEA0C10094E3FE /* swcacher.cpp in Sources */,
+				A954AC4E13EEA0C10094E3FE /* swconfig.cpp in Sources */,
+				A954AC4F13EEA0C10094E3FE /* swfiltermgr.cpp in Sources */,
+				A954AC5013EEA0C10094E3FE /* swlocale.cpp in Sources */,
+				A954AC5113EEA0C10094E3FE /* swmgr.cpp in Sources */,
+				A954AC5213EEA0C10094E3FE /* swsearchable.cpp in Sources */,
+				A954AC5413EEA0C10094E3FE /* hrefcom.cpp in Sources */,
+				A954AC5513EEA0C10094E3FE /* rawcom.cpp in Sources */,
+				A954AC5613EEA0C10094E3FE /* rawcom4.cpp in Sources */,
+				A954AC5713EEA0C10094E3FE /* rawfiles.cpp in Sources */,
+				A954AC5813EEA0C10094E3FE /* swcom.cpp in Sources */,
+				A954AC5913EEA0C10094E3FE /* zcom.cpp in Sources */,
+				A954AC5A13EEA0C10094E3FE /* entriesblk.cpp in Sources */,
+				A954AC5B13EEA0C10094E3FE /* lzsscomprs.cpp in Sources */,
+				A954AC5C13EEA0C10094E3FE /* rawstr.cpp in Sources */,
+				A954AC5D13EEA0C10094E3FE /* rawstr4.cpp in Sources */,
+				A954AC5E13EEA0C10094E3FE /* rawverse.cpp in Sources */,
+				A954AC5F13EEA0C10094E3FE /* rawverse4.cpp in Sources */,
+				A954AC6013EEA0C10094E3FE /* sapphire.cpp in Sources */,
+				A954AC6113EEA0C10094E3FE /* swcipher.cpp in Sources */,
+				A954AC6213EEA0C10094E3FE /* swcomprs.cpp in Sources */,
+				A954AC6313EEA0C10094E3FE /* zipcomprs.cpp in Sources */,
+				A954AC6413EEA0C10094E3FE /* zstr.cpp in Sources */,
+				A954AC6513EEA0C10094E3FE /* zverse.cpp in Sources */,
+				A954AC6613EEA0C10094E3FE /* cipherfil.cpp in Sources */,
+				A954AC6713EEA0C10094E3FE /* gbffootnotes.cpp in Sources */,
+				A954AC6813EEA0C10094E3FE /* gbfheadings.cpp in Sources */,
+				A954AC6913EEA0C10094E3FE /* gbfhtml.cpp in Sources */,
+				A954AC6A13EEA0C10094E3FE /* gbfhtmlhref.cpp in Sources */,
+				A954AC6B13EEA0C10094E3FE /* gbfmorph.cpp in Sources */,
+				A954AC6C13EEA0C10094E3FE /* gbfosis.cpp in Sources */,
+				A954AC6D13EEA0C10094E3FE /* gbfplain.cpp in Sources */,
+				A954AC6E13EEA0C10094E3FE /* gbfredletterwords.cpp in Sources */,
+				A954AC6F13EEA0C10094E3FE /* gbfrtf.cpp in Sources */,
+				A954AC7013EEA0C10094E3FE /* gbfstrongs.cpp in Sources */,
+				A954AC7113EEA0C10094E3FE /* gbfthml.cpp in Sources */,
+				A954AC7213EEA0C10094E3FE /* gbfwebif.cpp in Sources */,
+				A954AC7313EEA0C10094E3FE /* gbfwordjs.cpp in Sources */,
+				A954AC7413EEA0C10094E3FE /* gbfxhtml.cpp in Sources */,
+				A954AC7513EEA0C10094E3FE /* greeklexattribs.cpp in Sources */,
+				A954AC7613EEA0C10094E3FE /* latin1utf16.cpp in Sources */,
+				A954AC7713EEA0C10094E3FE /* latin1utf8.cpp in Sources */,
+				A954AC7813EEA0C10094E3FE /* osisfootnotes.cpp in Sources */,
+				A954AC7913EEA0C10094E3FE /* osisheadings.cpp in Sources */,
+				A954AC7A13EEA0C10094E3FE /* osishtmlhref.cpp in Sources */,
+				A954AC7B13EEA0C10094E3FE /* osislemma.cpp in Sources */,
+				A954AC7C13EEA0C10094E3FE /* osismorph.cpp in Sources */,
+				A954AC7D13EEA0C10094E3FE /* osismorphsegmentation.cpp in Sources */,
+				A954AC7E13EEA0C10094E3FE /* osisosis.cpp in Sources */,
+				A954AC7F13EEA0C10094E3FE /* osisplain.cpp in Sources */,
+				A954AC8013EEA0C10094E3FE /* osisredletterwords.cpp in Sources */,
+				A954AC8113EEA0C10094E3FE /* osisrtf.cpp in Sources */,
+				A954AC8313EEA0C10094E3FE /* osisscripref.cpp in Sources */,
+				A954AC8413EEA0C10094E3FE /* osisstrongs.cpp in Sources */,
+				A954AC8513EEA0C10094E3FE /* osisvariants.cpp in Sources */,
+				A954AC8613EEA0C10094E3FE /* osiswebif.cpp in Sources */,
+				A954AC8713EEA0C10094E3FE /* osiswordjs.cpp in Sources */,
+				A954AC8813EEA0C10094E3FE /* osisxhtml.cpp in Sources */,
+				A954AC8913EEA0C10094E3FE /* papyriplain.cpp in Sources */,
+				A954AC8C13EEA0C10094E3FE /* rtfhtml.cpp in Sources */,
+				A954AC8D13EEA0C10094E3FE /* swbasicfilter.cpp in Sources */,
+				A954AC8E13EEA0C10094E3FE /* swoptfilter.cpp in Sources */,
+				A954AC8F13EEA0C10094E3FE /* teihtmlhref.cpp in Sources */,
+				A954AC9013EEA0C10094E3FE /* teiplain.cpp in Sources */,
+				A954AC9113EEA0C10094E3FE /* teirtf.cpp in Sources */,
+				A954AC9213EEA0C10094E3FE /* thmlfootnotes.cpp in Sources */,
+				A954AC9313EEA0C10094E3FE /* thmlgbf.cpp in Sources */,
+				A954AC9413EEA0C10094E3FE /* thmlheadings.cpp in Sources */,
+				A954AC9513EEA0C10094E3FE /* thmlhtml.cpp in Sources */,
+				A954AC9613EEA0C10094E3FE /* thmlhtmlhref.cpp in Sources */,
+				A954AC9713EEA0C10094E3FE /* thmllemma.cpp in Sources */,
+				A954AC9813EEA0C10094E3FE /* thmlmorph.cpp in Sources */,
+				A954AC9913EEA0C10094E3FE /* thmlosis.cpp in Sources */,
+				A954AC9A13EEA0C10094E3FE /* thmlplain.cpp in Sources */,
+				A954AC9B13EEA0C10094E3FE /* thmlrtf.cpp in Sources */,
+				A954AC9C13EEA0C10094E3FE /* thmlscripref.cpp in Sources */,
+				A954AC9D13EEA0C10094E3FE /* thmlstrongs.cpp in Sources */,
+				A954AC9E13EEA0C10094E3FE /* thmlvariants.cpp in Sources */,
+				A954AC9F13EEA0C10094E3FE /* thmlwebif.cpp in Sources */,
+				A954ACA013EEA0C10094E3FE /* thmlwordjs.cpp in Sources */,
+				A954ACA113EEA0C10094E3FE /* thmlxhtml.cpp in Sources */,
+				A954ACA213EEA0C10094E3FE /* unicodertf.cpp in Sources */,
+				A954ACA313EEA0C10094E3FE /* utf16utf8.cpp in Sources */,
+				A954ACA413EEA0C10094E3FE /* utf8arabicpoints.cpp in Sources */,
+				A954ACA513EEA0C10094E3FE /* utf8arshaping.cpp in Sources */,
+				A954ACA613EEA0C10094E3FE /* utf8bidireorder.cpp in Sources */,
+				A954ACA713EEA0C10094E3FE /* utf8cantillation.cpp in Sources */,
+				A954ACA813EEA0C10094E3FE /* utf8greekaccents.cpp in Sources */,
+				A954ACA913EEA0C10094E3FE /* utf8hebrewpoints.cpp in Sources */,
+				A954ACAA13EEA0C10094E3FE /* utf8html.cpp in Sources */,
+				A954ACAB13EEA0C10094E3FE /* utf8latin1.cpp in Sources */,
+				A954ACAC13EEA0C10094E3FE /* utf8nfc.cpp in Sources */,
+				A954ACAD13EEA0C10094E3FE /* utf8nfkd.cpp in Sources */,
+				A954ACAE13EEA0C10094E3FE /* utf8transliterator.cpp in Sources */,
+				A954ACAF13EEA0C10094E3FE /* utf8utf16.cpp in Sources */,
+				A954ACB013EEA0C10094E3FE /* rawgenbook.cpp in Sources */,
+				A954ACB113EEA0C10094E3FE /* swgenbook.cpp in Sources */,
+				A954ACB213EEA0C10094E3FE /* rawld.cpp in Sources */,
+				A954ACB313EEA0C10094E3FE /* rawld4.cpp in Sources */,
+				A954ACB413EEA0C10094E3FE /* swld.cpp in Sources */,
+				A954ACB513EEA0C10094E3FE /* zld.cpp in Sources */,
+				A954ACB613EEA0C10094E3FE /* swmodule.cpp in Sources */,
+				A954ACB713EEA0C10094E3FE /* rawtext.cpp in Sources */,
+				A954ACB813EEA0C10094E3FE /* rawtext4.cpp in Sources */,
+				A954ACB913EEA0C10094E3FE /* swtext.cpp in Sources */,
+				A954ACBA13EEA0C10094E3FE /* ztext.cpp in Sources */,
+				A954ACBB13EEA0C10094E3FE /* roman.cpp in Sources */,
+				A954ACBC13EEA0C10094E3FE /* swbuf.cpp in Sources */,
+				A954ACBD13EEA0C10094E3FE /* swobject.cpp in Sources */,
+				A954ACBF13EEA0C10094E3FE /* swversion.cpp in Sources */,
+				A954ACC013EEA0C10094E3FE /* url.cpp in Sources */,
+				A954ACC113EEA0C10094E3FE /* utilstr.cpp in Sources */,
+				A954ACC213EEA0C10094E3FE /* utilxml.cpp in Sources */,
+				A954ABCB13EE9E460094E3FE /* AnalysisHeader.cpp in Sources */,
+				A954ABCC13EE9E460094E3FE /* Analyzers.cpp in Sources */,
+				A954ABCD13EE9E470094E3FE /* StandardAnalyzer.cpp in Sources */,
+				A954ABCE13EE9E470094E3FE /* StandardFilter.cpp in Sources */,
+				A954ABCF13EE9E470094E3FE /* StandardTokenizer.cpp in Sources */,
+				A954ABD013EE9E470094E3FE /* gunichartables.cpp in Sources */,
+				A954ABD113EE9E470094E3FE /* repl_lltot.cpp in Sources */,
+				A954ABD213EE9E470094E3FE /* repl_tcscasecmp.cpp in Sources */,
+				A954ABD313EE9E470094E3FE /* repl_tcslwr.cpp in Sources */,
+				A954ABD413EE9E470094E3FE /* repl_tcstod.cpp in Sources */,
+				A954ABD513EE9E470094E3FE /* repl_tcstoll.cpp in Sources */,
+				A954ABD613EE9E470094E3FE /* repl_tprintf.cpp in Sources */,
+				A954ABD713EE9E470094E3FE /* threads.cpp in Sources */,
+				A954ABD813EE9E470094E3FE /* utf8.cpp in Sources */,
+				A954ABD913EE9E470094E3FE /* condition.cpp in Sources */,
+				A954ABDA13EE9E470094E3FE /* error.cpp in Sources */,
+				A954ABDB13EE9E470094E3FE /* memtracking.cpp in Sources */,
+				A954ABDC13EE9E470094E3FE /* DateField.cpp in Sources */,
+				A954ABDD13EE9E470094E3FE /* Document.cpp in Sources */,
+				A954ABDE13EE9E470094E3FE /* Field.cpp in Sources */,
+				A954ABDF13EE9E470094E3FE /* CompoundFile.cpp in Sources */,
+				A954ABE013EE9E470094E3FE /* DocumentWriter.cpp in Sources */,
+				A954ABE113EE9E470094E3FE /* FieldInfos.cpp in Sources */,
+				A954ABE213EE9E470094E3FE /* FieldsReader.cpp in Sources */,
+				A954ABE313EE9E470094E3FE /* FieldsWriter.cpp in Sources */,
+				A954ABE413EE9E470094E3FE /* IndexModifier.cpp in Sources */,
+				A954ABE513EE9E470094E3FE /* IndexReader.cpp in Sources */,
+				A954ABE613EE9E470094E3FE /* IndexWriter.cpp in Sources */,
+				A954ABE713EE9E470094E3FE /* MultiReader.cpp in Sources */,
+				A954ABE813EE9E470094E3FE /* SegmentInfos.cpp in Sources */,
+				A954ABE913EE9E470094E3FE /* SegmentMergeInfo.cpp in Sources */,
+				A954ABEA13EE9E470094E3FE /* SegmentMergeQueue.cpp in Sources */,
+				A954ABEB13EE9E470094E3FE /* SegmentMerger.cpp in Sources */,
+				A954ABEC13EE9E470094E3FE /* SegmentReader.cpp in Sources */,
+				A954ABED13EE9E470094E3FE /* SegmentTermDocs.cpp in Sources */,
+				A954ABEE13EE9E470094E3FE /* SegmentTermEnum.cpp in Sources */,
+				A954ABEF13EE9E470094E3FE /* SegmentTermPositions.cpp in Sources */,
+				A954ABF013EE9E470094E3FE /* SegmentTermVector.cpp in Sources */,
+				A954ABF113EE9E470094E3FE /* Term.cpp in Sources */,
+				A954ABF213EE9E470094E3FE /* TermInfo.cpp in Sources */,
+				A954ABF313EE9E470094E3FE /* TermInfosReader.cpp in Sources */,
+				A954ABF413EE9E470094E3FE /* TermInfosWriter.cpp in Sources */,
+				A954ABF513EE9E470094E3FE /* TermVectorReader.cpp in Sources */,
+				A954ABF613EE9E470094E3FE /* TermVectorWriter.cpp in Sources */,
+				A954ABF713EE9E470094E3FE /* Lexer.cpp in Sources */,
+				A954ABF813EE9E470094E3FE /* MultiFieldQueryParser.cpp in Sources */,
+				A954ABF913EE9E470094E3FE /* QueryParser.cpp in Sources */,
+				A954ABFA13EE9E470094E3FE /* QueryParserBase.cpp in Sources */,
+				A954ABFB13EE9E470094E3FE /* QueryToken.cpp in Sources */,
+				A954ABFC13EE9E470094E3FE /* TokenList.cpp in Sources */,
+				A954ABFD13EE9E470094E3FE /* BooleanQuery.cpp in Sources */,
+				A954ABFE13EE9E470094E3FE /* BooleanScorer.cpp in Sources */,
+				A954ABFF13EE9E470094E3FE /* CachingWrapperFilter.cpp in Sources */,
+				A954AC0013EE9E470094E3FE /* ChainedFilter.cpp in Sources */,
+				A954AC0113EE9E470094E3FE /* ConjunctionScorer.cpp in Sources */,
+				A954AC0213EE9E470094E3FE /* DateFilter.cpp in Sources */,
+				A954AC0313EE9E470094E3FE /* ExactPhraseScorer.cpp in Sources */,
+				A954AC0413EE9E470094E3FE /* Explanation.cpp in Sources */,
+				A954AC0513EE9E470094E3FE /* FieldCache.cpp in Sources */,
+				A954AC0613EE9E470094E3FE /* FieldCacheImpl.cpp in Sources */,
+				A954AC0713EE9E470094E3FE /* FieldDocSortedHitQueue.cpp in Sources */,
+				A954AC0813EE9E470094E3FE /* FieldSortedHitQueue.cpp in Sources */,
+				A954AC0913EE9E470094E3FE /* FilteredTermEnum.cpp in Sources */,
+				A954AC0A13EE9E470094E3FE /* FuzzyQuery.cpp in Sources */,
+				A954AC0B13EE9E470094E3FE /* HitQueue.cpp in Sources */,
+				A954AC0C13EE9E470094E3FE /* Hits.cpp in Sources */,
+				A954AC0D13EE9E470094E3FE /* IndexSearcher.cpp in Sources */,
+				A954AC0E13EE9E470094E3FE /* MultiSearcher.cpp in Sources */,
+				A954AC0F13EE9E470094E3FE /* MultiTermQuery.cpp in Sources */,
+				A954AC1013EE9E470094E3FE /* PhrasePositions.cpp in Sources */,
+				A954AC1113EE9E470094E3FE /* PhraseQuery.cpp in Sources */,
+				A954AC1213EE9E470094E3FE /* PhraseScorer.cpp in Sources */,
+				A954AC1313EE9E470094E3FE /* PrefixQuery.cpp in Sources */,
+				A954AC1413EE9E470094E3FE /* QueryFilter.cpp in Sources */,
+				A954AC1513EE9E470094E3FE /* RangeFilter.cpp in Sources */,
+				A954AC1613EE9E470094E3FE /* RangeQuery.cpp in Sources */,
+				A954AC1713EE9E470094E3FE /* SearchHeader.cpp in Sources */,
+				A954AC1813EE9E470094E3FE /* Similarity.cpp in Sources */,
+				A954AC1913EE9E470094E3FE /* SloppyPhraseScorer.cpp in Sources */,
+				A954AC1A13EE9E470094E3FE /* Sort.cpp in Sources */,
+				A954AC1B13EE9E470094E3FE /* TermQuery.cpp in Sources */,
+				A954AC1C13EE9E470094E3FE /* TermScorer.cpp in Sources */,
+				A954AC1D13EE9E470094E3FE /* WildcardQuery.cpp in Sources */,
+				A954AC1E13EE9E470094E3FE /* WildcardTermEnum.cpp in Sources */,
+				A954AC1F13EE9E470094E3FE /* StdHeader.cpp in Sources */,
+				A954AC2013EE9E470094E3FE /* FSDirectory.cpp in Sources */,
+				A954AC2113EE9E470094E3FE /* IndexInput.cpp in Sources */,
+				A954AC2213EE9E470094E3FE /* IndexOutput.cpp in Sources */,
+				A954AC2313EE9E470094E3FE /* Lock.cpp in Sources */,
+				A954AC2413EE9E470094E3FE /* MMapInput.cpp in Sources */,
+				A954AC2513EE9E470094E3FE /* RAMDirectory.cpp in Sources */,
+				A954AC2613EE9E470094E3FE /* TransactionalRAMDirectory.cpp in Sources */,
+				A954AC2713EE9E470094E3FE /* BitSet.cpp in Sources */,
+				A954AC2813EE9E470094E3FE /* dirent.cpp in Sources */,
+				A954AC2913EE9E470094E3FE /* Equators.cpp in Sources */,
+				A954AC2A13EE9E470094E3FE /* FastCharStream.cpp in Sources */,
+				A954AC2B13EE9E470094E3FE /* fileinputstream.cpp in Sources */,
+				A954AC2C13EE9E470094E3FE /* MD5Digester.cpp in Sources */,
+				A954AC2D13EE9E470094E3FE /* Misc.cpp in Sources */,
+				A954AC2E13EE9E470094E3FE /* Reader.cpp in Sources */,
+				A954AC2F13EE9E470094E3FE /* StringBuffer.cpp in Sources */,
+				A954AC3013EE9E470094E3FE /* StringIntern.cpp in Sources */,
+				A954AC3113EE9E470094E3FE /* ThreadLocal.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A975EED611C792B9007C1532 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9A7EEB014D5D61700B76B6A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9A7EEBE14D5D64C00B76B6A /* osis2mod.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA5E1207F9870067ED5B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BFB09D13EDF51000032679 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BFB0BC13EDF5C900032679 /* SwordManagerTest.m in Sources */,
+				A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */,
+				A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2714714D717D800DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2715014D717F600DA8926 /* imp2gbs.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2715414D717FD00DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2715D14D7180F00DA8926 /* imp2ld.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2716114D7181200DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2716A14D7182100DA8926 /* imp2vs.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2716E14D7182300DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2717714D7183700DA8926 /* installmgr.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2717B14D7183B00DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2718414D7184E00DA8926 /* mod2imp.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2718814D7185800DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2719114D7186800DA8926 /* mod2vpl.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D2719514D7186A00DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D2719E14D7187A00DA8926 /* mod2zmod.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271A214D7187E00DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271AB14D7189100DA8926 /* step2vpl.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271AF14D7189300DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271B814D718A300DA8926 /* stepdump.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271BC14D718A400DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271C514D718B700DA8926 /* tei2mod.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271C914D718B800DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271D214D718C600DA8926 /* vpl2mod.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271D614D718C800DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271DF14D718DE00DA8926 /* vs2osisref.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271E314D718DF00DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271EC14D718F400DA8926 /* vs2osisreftxt.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9D271F014D718F500DA8926 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9D271F914D7190400DA8926 /* xml2gbs.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		A954ABCA13EE9D0F0094E3FE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A954ABC913EE9D0F0094E3FE /* PBXContainerItemProxy */;
+		};
+		A9A7EEAE14D5D4BB00B76B6A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9A7EEAD14D5D4BB00B76B6A /* PBXContainerItemProxy */;
+		};
+		A9A7EEC114D5D66400B76B6A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9A7EEC014D5D66400B76B6A /* PBXContainerItemProxy */;
+		};
+		A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* ObjCSword */;
+			targetProxy = A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */;
+		};
+		A9BFB0BB13EDF5B600032679 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* ObjCSword */;
+			targetProxy = A9BFB0BA13EDF5B600032679 /* PBXContainerItemProxy */;
+		};
+		A9D2714514D717D800DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D2714614D717D800DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2715214D717FD00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D2715314D717FD00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2715F14D7181200DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D2716014D7181200DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2716C14D7182300DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D2716D14D7182300DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2717914D7183B00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D2717A14D7183B00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2718614D7185800DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D2718714D7185800DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2719314D7186A00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D2719414D7186A00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271A014D7187E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271A114D7187E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271AD14D7189300DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271AE14D7189300DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271BA14D718A400DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271BB14D718A400DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271C714D718B800DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271C814D718B800DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271D414D718C800DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271D514D718C800DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271E114D718DF00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271E214D718DF00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271EE14D718F500DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271EF14D718F500DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D271FF14D7193A00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A954ABC213EE9AB00094E3FE /* sword */;
+			targetProxy = A9D271FE14D7193A00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720114D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2714414D717D800DA8926 /* imp2gbs */;
+			targetProxy = A9D2720014D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720314D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2715114D717FD00DA8926 /* imp2ld */;
+			targetProxy = A9D2720214D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720514D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2715E14D7181200DA8926 /* imp2vs */;
+			targetProxy = A9D2720414D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720714D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2716B14D7182300DA8926 /* installmgr */;
+			targetProxy = A9D2720614D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720914D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2717814D7183B00DA8926 /* mod2imp */;
+			targetProxy = A9D2720814D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720B14D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A975EED811C792B9007C1532 /* mod2osis */;
+			targetProxy = A9D2720A14D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720D14D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2718514D7185800DA8926 /* mod2vpl */;
+			targetProxy = A9D2720C14D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2720F14D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2719214D7186A00DA8926 /* mod2zmod */;
+			targetProxy = A9D2720E14D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721114D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9A7EEB314D5D61700B76B6A /* osis2mod */;
+			targetProxy = A9D2721014D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721314D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D2719F14D7187E00DA8926 /* step2vpl */;
+			targetProxy = A9D2721214D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721514D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D271AC14D7189300DA8926 /* stepdump */;
+			targetProxy = A9D2721414D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721714D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D271B914D718A400DA8926 /* tei2mod */;
+			targetProxy = A9D2721614D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721914D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D271C614D718B800DA8926 /* vpl2mod */;
+			targetProxy = A9D2721814D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721B14D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D271D314D718C800DA8926 /* vs2osisref */;
+			targetProxy = A9D2721A14D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721D14D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D271E014D718DF00DA8926 /* vs2osisreftxt */;
+			targetProxy = A9D2721C14D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+		A9D2721F14D7194E00DA8926 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A9D271ED14D718F500DA8926 /* xml2gbs */;
+			targetProxy = A9D2721E14D7194E00DA8926 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		089C1666FE841158C02AAC07 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C1667FE841158C02AAC07 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		1DEB91AE08733DA50010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
+				);
+				FRAMEWORK_VERSION = A;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = ObjCSword_Prefix.pch;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				HEADER_SEARCH_PATHS = "../../include/**";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "@rpath";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "-DDEBUG";
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = ObjCSword;
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+				WARNING_CFLAGS = "-Wall";
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Debug;
+		};
+		1DEB91AF08733DA50010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
+				);
+				FRAMEWORK_VERSION = A;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = ObjCSword_Prefix.pch;
+				GCC_VERSION = "";
+				HEADER_SEARCH_PATHS = "../../include/**";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "@rpath";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = "-DRELEASE";
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = ObjCSword;
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+				WARNING_CFLAGS = "-Wall";
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Release;
+		};
+		1DEB91B208733DA50010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_VERSION = "";
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		1DEB91B308733DA50010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_VERSION = "";
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		A954ABC513EE9AB00094E3FE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../include/**",
+					"$(SRCROOT)/dependencies/clucene/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = "@rpath";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-DUSELUCENE",
+					"-D_ICU_",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include/**/** $(SRCROOT)/dependencies/clucene/** $(SRCROOT)/dependencies/icu/include/**";
+				VALID_ARCHS = x86_64;
+			};
+			name = Debug;
+		};
+		A954ABC613EE9AB00094E3FE /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = lib;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../include/**",
+					"$(SRCROOT)/dependencies/clucene/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = "@rpath";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DNS_BLOCK_ASSERTIONS=1",
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-DUSELUCENE",
+					"-D_ICU_",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include/**/** $(SRCROOT)/dependencies/clucene/** $(SRCROOT)/dependencies/icu/include/**";
+				VALID_ARCHS = x86_64;
+			};
+			name = Release;
+		};
+		A975EEDE11C792BA007C1532 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2osis;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A975EEDF11C792BA007C1532 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2osis;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9A7EEBC14D5D61700B76B6A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		A9A7EEBD14D5D61700B76B6A /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		A9BDFA691207F9870067ED5B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
+				INFOPLIST_FILE = "test/Tests-Info.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"-framework",
+					Cocoa,
+					"-framework",
+					SenTestingKit,
+				);
+				PRODUCT_NAME = Tests;
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Debug;
+		};
+		A9BDFA6A1207F9870067ED5B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
+				INFOPLIST_FILE = "test/Tests-Info.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Cocoa,
+					"-framework",
+					SenTestingKit,
+				);
+				PRODUCT_NAME = Tests;
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+				WRAPPER_EXTENSION = octest;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9BFB0B813EDF51100032679 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				INFOPLIST_FILE = "test/Tests-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Debug;
+		};
+		A9BFB0B913EDF51100032679 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				INFOPLIST_FILE = "test/Tests-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				VALID_ARCHS = x86_64;
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Release;
+		};
+		A9D2714C14D717D800DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = imp2gbs;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A9D2714D14D717D800DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = imp2gbs;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9D2715914D717FD00DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = imp2ld;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A9D2715A14D717FD00DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = imp2ld;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9D2716614D7181200DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = imp2vs;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A9D2716714D7181200DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = imp2vs;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9D2717314D7182300DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = installmgr;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A9D2717414D7182300DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = installmgr;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9D2718014D7183B00DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2imp;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A9D2718114D7183B00DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2imp;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9D2718D14D7185800DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2vpl;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A9D2718E14D7185800DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2vpl;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9D2719A14D7186A00DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2zmod;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A9D2719B14D7186A00DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = mod2zmod;
+				SDKROOT = macosx;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9D271A714D7187E00DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = step2vpl;
+			};
+			name = Debug;
+		};
+		A9D271A814D7187E00DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = step2vpl;
+			};
+			name = Release;
+		};
+		A9D271B414D7189300DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = stepdump;
+			};
+			name = Debug;
+		};
+		A9D271B514D7189300DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = stepdump;
+			};
+			name = Release;
+		};
+		A9D271C114D718A400DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = tei2mod;
+			};
+			name = Debug;
+		};
+		A9D271C214D718A400DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = tei2mod;
+			};
+			name = Release;
+		};
+		A9D271CE14D718B800DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = vpl2mod;
+			};
+			name = Debug;
+		};
+		A9D271CF14D718B800DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = vpl2mod;
+			};
+			name = Release;
+		};
+		A9D271DB14D718C800DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = vs2osisref;
+			};
+			name = Debug;
+		};
+		A9D271DC14D718C800DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = vs2osisref;
+			};
+			name = Release;
+		};
+		A9D271E814D718DF00DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = vs2osisreftxt;
+			};
+			name = Debug;
+		};
+		A9D271E914D718DF00DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = vs2osisreftxt;
+			};
+			name = Release;
+		};
+		A9D271F514D718F500DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = xml2gbs;
+			};
+			name = Debug;
+		};
+		A9D271F614D718F500DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				HEADER_SEARCH_PATHS = (
+					"../../include/**",
+					"$(SRCROOT)/dependencies/icu/include/**",
+				);
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_CFLAGS = (
+					"-DCURLAVAILABLE",
+					"-Dunix",
+					"-D__unix__",
+					"-D_ICU_",
+				);
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = xml2gbs;
+			};
+			name = Release;
+		};
+		A9D271FC14D7193300DA8926 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		A9D271FD14D7193300DA8926 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COMBINE_HIDPI_IMAGES = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91AE08733DA50010E9CD /* Debug */,
+				1DEB91AF08733DA50010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91B208733DA50010E9CD /* Debug */,
+				1DEB91B308733DA50010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A954ABC413EE9AB00094E3FE /* Build configuration list for PBXNativeTarget "sword" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A954ABC513EE9AB00094E3FE /* Debug */,
+				A954ABC613EE9AB00094E3FE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A975EEDE11C792BA007C1532 /* Debug */,
+				A975EEDF11C792BA007C1532 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9A7EEBB14D5D61700B76B6A /* Build configuration list for PBXNativeTarget "osis2mod" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9A7EEBC14D5D61700B76B6A /* Debug */,
+				A9A7EEBD14D5D61700B76B6A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9BDFA691207F9870067ED5B /* Debug */,
+				A9BDFA6A1207F9870067ED5B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9BFB0B713EDF51100032679 /* Build configuration list for PBXNativeTarget "Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9BFB0B813EDF51100032679 /* Debug */,
+				A9BFB0B913EDF51100032679 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D2714B14D717D800DA8926 /* Build configuration list for PBXNativeTarget "imp2gbs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D2714C14D717D800DA8926 /* Debug */,
+				A9D2714D14D717D800DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D2715814D717FD00DA8926 /* Build configuration list for PBXNativeTarget "imp2ld" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D2715914D717FD00DA8926 /* Debug */,
+				A9D2715A14D717FD00DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D2716514D7181200DA8926 /* Build configuration list for PBXNativeTarget "imp2vs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D2716614D7181200DA8926 /* Debug */,
+				A9D2716714D7181200DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D2717214D7182300DA8926 /* Build configuration list for PBXNativeTarget "installmgr" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D2717314D7182300DA8926 /* Debug */,
+				A9D2717414D7182300DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D2717F14D7183B00DA8926 /* Build configuration list for PBXNativeTarget "mod2imp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D2718014D7183B00DA8926 /* Debug */,
+				A9D2718114D7183B00DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D2718C14D7185800DA8926 /* Build configuration list for PBXNativeTarget "mod2vpl" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D2718D14D7185800DA8926 /* Debug */,
+				A9D2718E14D7185800DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D2719914D7186A00DA8926 /* Build configuration list for PBXNativeTarget "mod2zmod" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D2719A14D7186A00DA8926 /* Debug */,
+				A9D2719B14D7186A00DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271A614D7187E00DA8926 /* Build configuration list for PBXNativeTarget "step2vpl" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271A714D7187E00DA8926 /* Debug */,
+				A9D271A814D7187E00DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271B314D7189300DA8926 /* Build configuration list for PBXNativeTarget "stepdump" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271B414D7189300DA8926 /* Debug */,
+				A9D271B514D7189300DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271C014D718A400DA8926 /* Build configuration list for PBXNativeTarget "tei2mod" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271C114D718A400DA8926 /* Debug */,
+				A9D271C214D718A400DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271CD14D718B800DA8926 /* Build configuration list for PBXNativeTarget "vpl2mod" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271CE14D718B800DA8926 /* Debug */,
+				A9D271CF14D718B800DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271DA14D718C800DA8926 /* Build configuration list for PBXNativeTarget "vs2osisref" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271DB14D718C800DA8926 /* Debug */,
+				A9D271DC14D718C800DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271E714D718DF00DA8926 /* Build configuration list for PBXNativeTarget "vs2osisreftxt" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271E814D718DF00DA8926 /* Debug */,
+				A9D271E914D718DF00DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271F414D718F500DA8926 /* Build configuration list for PBXNativeTarget "xml2gbs" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271F514D718F500DA8926 /* Debug */,
+				A9D271F614D718F500DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9D271FB14D7193300DA8926 /* Build configuration list for PBXAggregateTarget "Utilities" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9D271FC14D7193300DA8926 /* Debug */,
+				A9D271FD14D7193300DA8926 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}
diff --git a/bindings/objc/ObjCSword_Prefix.pch b/bindings/objc/ObjCSword_Prefix.pch
new file mode 100644
index 0000000..0eec7f5
--- /dev/null
+++ b/bindings/objc/ObjCSword_Prefix.pch
@@ -0,0 +1,15 @@
+//
+// Prefix header for all source files of the 'ObjCSword' target in the 'ObjCSword' project.
+//
+
+#ifdef __OBJC__
+    #import <Foundation/Foundation.h>
+#endif
+
+#ifdef DEBUG
+    #define DLog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
+    #define ALog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
+#else
+    #define DLog(...) ;
+    #define ALog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
+#endif
diff --git a/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj b/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..ecd4c13
--- /dev/null
+++ b/bindings/objc/ObjCSword_preLion.xcodeproj/project.pbxproj
@@ -0,0 +1,1060 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 45;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
+		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
+		A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; };
+		A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; };
+		A94EAC0B117B28920018B06F /* SwordBible.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE3117B28910018B06F /* SwordBible.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE4117B28910018B06F /* SwordBible.mm */; };
+		A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE5117B28920018B06F /* SwordBibleBook.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE6117B28920018B06F /* SwordBibleBook.mm */; };
+		A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE7117B28920018B06F /* SwordBibleChapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE8117B28920018B06F /* SwordBibleChapter.m */; };
+		A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */; };
+		A94EAC13117B28920018B06F /* SwordBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEB117B28920018B06F /* SwordBook.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC14117B28920018B06F /* SwordBook.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEC117B28920018B06F /* SwordBook.mm */; };
+		A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABED117B28920018B06F /* SwordCommentary.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABEE117B28920018B06F /* SwordCommentary.mm */; };
+		A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABEF117B28920018B06F /* SwordDictionary.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF0117B28920018B06F /* SwordDictionary.mm */; };
+		A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF1117B28920018B06F /* SwordInstallSource.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF2117B28920018B06F /* SwordInstallSource.mm */; };
+		A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF3117B28920018B06F /* SwordInstallSourceController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */; };
+		A94EAC1D117B28920018B06F /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF5117B28920018B06F /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF6117B28920018B06F /* SwordKey.mm */; };
+		A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF7117B28920018B06F /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABF8117B28920018B06F /* SwordListKey.mm */; };
+		A94EAC21117B28920018B06F /* SwordManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABF9117B28920018B06F /* SwordManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC22117B28920018B06F /* SwordManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFA117B28920018B06F /* SwordManager.mm */; };
+		A94EAC25117B28920018B06F /* SwordModule.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFD117B28920018B06F /* SwordModule.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC26117B28920018B06F /* SwordModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABFE117B28920018B06F /* SwordModule.mm */; };
+		A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */; };
+		A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */; };
+		A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC05117B28920018B06F /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC06117B28920018B06F /* SwordVerseKey.mm */; };
+		A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC07117B28920018B06F /* SwordVerseManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC08117B28920018B06F /* SwordVerseManager.mm */; };
+		A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EAC09117B28920018B06F /* VerseEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EAC0A117B28920018B06F /* VerseEnumerator.mm */; };
+		A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; };
+		A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956316411FD8C55007DC7AD /* libsword-ub.a */; };
+		A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; };
+		A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */ = {isa = PBXBuildFile; fileRef = A956324211FD90C9007DC7AD /* libclucene-ub.a */; };
+		A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; };
+		A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; };
+		A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; };
+		A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; };
+		A975EAC511C77862007C1532 /* ObjCSword.h in Headers */ = {isa = PBXBuildFile; fileRef = A975EAC411C77862007C1532 /* ObjCSword.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A975EDAC11C7925C007C1532 /* mod2osis.cpp */; };
+		A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = A9A2C17C118D9D3D0002873D /* Notifications.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */; };
+		A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */; };
+		A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A964658011C663E200640FAC /* SwordManagerTest.h */; };
+		A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A918B8E211C6697400024D84 /* SwordModuleTest.h */; };
+		A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */; };
+		A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; };
+		A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */ = {isa = PBXBuildFile; fileRef = A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */; };
+		A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; };
+		A9C2856F11C446B700803CB5 /* Configuration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2856D11C446B700803CB5 /* Configuration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = A9C2857111C4471400803CB5 /* OSXConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2857211C4471400803CB5 /* OSXConfiguration.m */; };
+		A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C2858211C44A0A00803CB5 /* Configuration.m */; };
+		A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */; };
+		A9D4382311C52947007AFE83 /* locales.d in Resources */ = {isa = PBXBuildFile; fileRef = A9D437CE11C52947007AFE83 /* locales.d */; };
+		A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A9EF1414120595650078A27C /* SwordLocaleManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9EF1415120595650078A27C /* SwordLocaleManager.mm */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		A964657A11C662CA00640FAC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = ObjCSword;
+		};
+		A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = ObjCSword;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		A9A5050211C75C4B00EB6EA5 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				A956324511FD90D2007DC7AD /* libclucene-ub.a in CopyFiles */,
+				A956316711FD8C5E007DC7AD /* libsword-ub.a in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword_Prefix.pch; sourceTree = "<group>"; };
+		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8DC2EF5B0486A6940098B216 /* ObjCSword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9013D3F11E316C700E1CCCA /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; };
+		A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = test/SwordModuleTest.h; sourceTree = "<group>"; };
+		A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = test/SwordModuleTest.m; sourceTree = "<group>"; };
+		A94EABE3117B28910018B06F /* SwordBible.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBible.h; path = src/SwordBible.h; sourceTree = "<group>"; };
+		A94EABE4117B28910018B06F /* SwordBible.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBible.mm; path = src/SwordBible.mm; sourceTree = "<group>"; };
+		A94EABE5117B28920018B06F /* SwordBibleBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleBook.h; path = src/SwordBibleBook.h; sourceTree = "<group>"; };
+		A94EABE6117B28920018B06F /* SwordBibleBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBibleBook.mm; path = src/SwordBibleBook.mm; sourceTree = "<group>"; };
+		A94EABE7117B28920018B06F /* SwordBibleChapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleChapter.h; path = src/SwordBibleChapter.h; sourceTree = "<group>"; };
+		A94EABE8117B28920018B06F /* SwordBibleChapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleChapter.m; path = src/SwordBibleChapter.m; sourceTree = "<group>"; };
+		A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBibleTextEntry.h; path = src/SwordBibleTextEntry.h; sourceTree = "<group>"; };
+		A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleTextEntry.m; path = src/SwordBibleTextEntry.m; sourceTree = "<group>"; };
+		A94EABEB117B28920018B06F /* SwordBook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordBook.h; path = src/SwordBook.h; sourceTree = "<group>"; };
+		A94EABEC117B28920018B06F /* SwordBook.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordBook.mm; path = src/SwordBook.mm; sourceTree = "<group>"; };
+		A94EABED117B28920018B06F /* SwordCommentary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordCommentary.h; path = src/SwordCommentary.h; sourceTree = "<group>"; };
+		A94EABEE117B28920018B06F /* SwordCommentary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordCommentary.mm; path = src/SwordCommentary.mm; sourceTree = "<group>"; };
+		A94EABEF117B28920018B06F /* SwordDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordDictionary.h; path = src/SwordDictionary.h; sourceTree = "<group>"; };
+		A94EABF0117B28920018B06F /* SwordDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordDictionary.mm; path = src/SwordDictionary.mm; sourceTree = "<group>"; };
+		A94EABF1117B28920018B06F /* SwordInstallSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSource.h; path = src/SwordInstallSource.h; sourceTree = "<group>"; };
+		A94EABF2117B28920018B06F /* SwordInstallSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSource.mm; path = src/SwordInstallSource.mm; sourceTree = "<group>"; };
+		A94EABF3117B28920018B06F /* SwordInstallSourceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordInstallSourceController.h; path = src/SwordInstallSourceController.h; sourceTree = "<group>"; };
+		A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordInstallSourceController.mm; path = src/SwordInstallSourceController.mm; sourceTree = "<group>"; };
+		A94EABF5117B28920018B06F /* SwordKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordKey.h; path = src/SwordKey.h; sourceTree = "<group>"; };
+		A94EABF6117B28920018B06F /* SwordKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordKey.mm; path = src/SwordKey.mm; sourceTree = "<group>"; };
+		A94EABF7117B28920018B06F /* SwordListKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKey.h; path = src/SwordListKey.h; sourceTree = "<group>"; };
+		A94EABF8117B28920018B06F /* SwordListKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordListKey.mm; path = src/SwordListKey.mm; sourceTree = "<group>"; };
+		A94EABF9117B28920018B06F /* SwordManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManager.h; path = src/SwordManager.h; sourceTree = "<group>"; };
+		A94EABFA117B28920018B06F /* SwordManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordManager.mm; path = src/SwordManager.mm; sourceTree = "<group>"; };
+		A94EABFD117B28920018B06F /* SwordModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModule.h; path = src/SwordModule.h; sourceTree = "<group>"; };
+		A94EABFE117B28920018B06F /* SwordModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModule.mm; path = src/SwordModule.mm; sourceTree = "<group>"; };
+		A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTextEntry.h; path = src/SwordModuleTextEntry.h; sourceTree = "<group>"; };
+		A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTextEntry.m; path = src/SwordModuleTextEntry.m; sourceTree = "<group>"; };
+		A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTreeEntry.h; path = src/SwordModuleTreeEntry.h; sourceTree = "<group>"; };
+		A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTreeEntry.m; path = src/SwordModuleTreeEntry.m; sourceTree = "<group>"; };
+		A94EAC05117B28920018B06F /* SwordVerseKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseKey.h; path = src/SwordVerseKey.h; sourceTree = "<group>"; };
+		A94EAC06117B28920018B06F /* SwordVerseKey.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseKey.mm; path = src/SwordVerseKey.mm; sourceTree = "<group>"; };
+		A94EAC07117B28920018B06F /* SwordVerseManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordVerseManager.h; path = src/SwordVerseManager.h; sourceTree = "<group>"; };
+		A94EAC08117B28920018B06F /* SwordVerseManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseManager.mm; path = src/SwordVerseManager.mm; sourceTree = "<group>"; };
+		A94EAC09117B28920018B06F /* VerseEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VerseEnumerator.h; path = src/VerseEnumerator.h; sourceTree = "<group>"; };
+		A94EAC0A117B28920018B06F /* VerseEnumerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VerseEnumerator.mm; path = src/VerseEnumerator.mm; sourceTree = "<group>"; };
+		A956316411FD8C55007DC7AD /* libsword-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsword-ub.a"; path = "build_sword/build/result_inst/lib/libsword-ub.a"; sourceTree = "<group>"; };
+		A956324211FD90C9007DC7AD /* libclucene-ub.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libclucene-ub.a"; path = "build_clucene/build/result_inst/lib/libclucene-ub.a"; sourceTree = "<group>"; };
+		A964658011C663E200640FAC /* SwordManagerTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordManagerTest.h; path = test/SwordManagerTest.h; sourceTree = "<group>"; };
+		A964658111C663E200640FAC /* SwordManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordManagerTest.m; path = test/SwordManagerTest.m; sourceTree = "<group>"; };
+		A975EAC411C77862007C1532 /* ObjCSword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjCSword.h; sourceTree = "<group>"; };
+		A975ED9811C7925C007C1532 /* imp2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2gbs.cpp; sourceTree = "<group>"; };
+		A975ED9911C7925C007C1532 /* imp2ld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2ld.cpp; sourceTree = "<group>"; };
+		A975ED9A11C7925C007C1532 /* imp2vs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imp2vs.cpp; sourceTree = "<group>"; };
+		A975ED9B11C7925C007C1532 /* installmgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = installmgr.cpp; sourceTree = "<group>"; };
+		A975EDAB11C7925C007C1532 /* mod2imp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2imp.cpp; sourceTree = "<group>"; };
+		A975EDAC11C7925C007C1532 /* mod2osis.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2osis.cpp; sourceTree = "<group>"; };
+		A975EDAD11C7925C007C1532 /* mod2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2vpl.cpp; sourceTree = "<group>"; };
+		A975EDAE11C7925C007C1532 /* mod2zmod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mod2zmod.cpp; sourceTree = "<group>"; };
+		A975EDB111C7925C007C1532 /* osis2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osis2mod.cpp; sourceTree = "<group>"; };
+		A975EDB811C7925C007C1532 /* step2vpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = step2vpl.cpp; sourceTree = "<group>"; };
+		A975EDB911C7925C007C1532 /* stepdump.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stepdump.cpp; sourceTree = "<group>"; };
+		A975EDBB11C7925C007C1532 /* tei2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tei2mod.cpp; sourceTree = "<group>"; };
+		A975EDD811C7925C007C1532 /* vpl2mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vpl2mod.cpp; sourceTree = "<group>"; };
+		A975EDD911C7925C007C1532 /* vs2osisref.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisref.cpp; sourceTree = "<group>"; };
+		A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vs2osisreftxt.cpp; sourceTree = "<group>"; };
+		A975EDDB11C7925C007C1532 /* xml2gbs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml2gbs.cpp; sourceTree = "<group>"; };
+		A975EED911C792B9007C1532 /* mod2osis */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mod2osis; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9921A1911FD9CA8002DAA72 /* libSword.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSword.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9A2C17C118D9D3D0002873D /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = src/Notifications.h; sourceTree = "<group>"; };
+		A9BDFA6B1207F9870067ED5B /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info copy.plist"; sourceTree = "<group>"; };
+		A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = test/SwordListKeyTest.h; sourceTree = "<group>"; };
+		A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = test/SwordListKeyTest.m; sourceTree = "<group>"; };
+		A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = test/SwordModuleLongRunTest.h; sourceTree = "<group>"; };
+		A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordModuleLongRunTest.mm; path = test/SwordModuleLongRunTest.mm; sourceTree = "<group>"; };
+		A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
+		A9C2819611C43C4900803CB5 /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9C2819711C43C4900803CB5 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
+		A9C2856D11C446B700803CB5 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configuration.h; path = src/services/Configuration.h; sourceTree = "<group>"; };
+		A9C2857111C4471400803CB5 /* OSXConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSXConfiguration.h; path = src/services/OSXConfiguration.h; sourceTree = "<group>"; };
+		A9C2857211C4471400803CB5 /* OSXConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OSXConfiguration.m; path = src/services/OSXConfiguration.m; sourceTree = "<group>"; };
+		A9C2858211C44A0A00803CB5 /* Configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Configuration.m; path = src/services/Configuration.m; sourceTree = "<group>"; };
+		A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SwordModule+Index.h"; path = "src/SwordModule+Index.h"; sourceTree = "<group>"; };
+		A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "SwordModule+Index.mm"; path = "src/SwordModule+Index.mm"; sourceTree = "<group>"; };
+		A9D437CE11C52947007AFE83 /* locales.d */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locales.d; path = ../../locales.d; sourceTree = SOURCE_ROOT; };
+		A9EF1414120595650078A27C /* SwordLocaleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordLocaleManager.h; path = src/SwordLocaleManager.h; sourceTree = "<group>"; };
+		A9EF1415120595650078A27C /* SwordLocaleManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordLocaleManager.mm; path = src/SwordLocaleManager.mm; sourceTree = "<group>"; };
+		D2F7E79907B2D74100F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8DC2EF560486A6940098B216 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A956324411FD90CE007DC7AD /* libclucene-ub.a in Frameworks */,
+				A956316611FD8C5B007DC7AD /* libsword-ub.a in Frameworks */,
+				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A975EED711C792B9007C1532 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA611207F9870067ED5B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BDFA621207F9870067ED5B /* SenTestingKit.framework in Frameworks */,
+				A9BDFA631207F9870067ED5B /* ObjCSword.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9C2819311C43C4900803CB5 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A964658F11C6654300640FAC /* SenTestingKit.framework in Frameworks */,
+				A964657C11C662CF00640FAC /* ObjCSword.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DFFF38A50411DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8DC2EF5B0486A6940098B216 /* ObjCSword.framework */,
+				A9C2819611C43C4900803CB5 /* Tests.octest */,
+				A975EED911C792B9007C1532 /* mod2osis */,
+				A9921A1911FD9CA8002DAA72 /* libSword.dylib */,
+				A9BDFA6B1207F9870067ED5B /* Tests.octest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 /* ObjCSword */ = {
+			isa = PBXGroup;
+			children = (
+				A975ECD211C7925B007C1532 /* Utilities */,
+				A9C2857911C4486400803CB5 /* Tests */,
+				A94EAE72117B32AF0018B06F /* Services */,
+				08FB77AEFE84172EC02AAC07 /* SwordWrapper */,
+				32C88DFF0371C24200C91783 /* Other Sources */,
+				089C1665FE841158C02AAC07 /* Resources */,
+				0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
+				034768DFFF38A50411DB9C8B /* Products */,
+				A9C2819711C43C4900803CB5 /* Tests-Info.plist */,
+				A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */,
+			);
+			name = ObjCSword;
+			sourceTree = "<group>";
+		};
+		0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */,
+				1058C7B2FEA5585E11CA2CBB /* Other Frameworks */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		089C1665FE841158C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				A9D437CE11C52947007AFE83 /* locales.d */,
+				8DC2EF5A0486A6940098B216 /* Info.plist */,
+				089C1666FE841158C02AAC07 /* InfoPlist.strings */,
+				A9013D3F11E316C700E1CCCA /* Info copy.plist */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77AEFE84172EC02AAC07 /* SwordWrapper */ = {
+			isa = PBXGroup;
+			children = (
+				A9EF1414120595650078A27C /* SwordLocaleManager.h */,
+				A9EF1415120595650078A27C /* SwordLocaleManager.mm */,
+				A94EABF9117B28920018B06F /* SwordManager.h */,
+				A94EABFA117B28920018B06F /* SwordManager.mm */,
+				A94EAC07117B28920018B06F /* SwordVerseManager.h */,
+				A94EAC08117B28920018B06F /* SwordVerseManager.mm */,
+				A94EABFD117B28920018B06F /* SwordModule.h */,
+				A94EABFE117B28920018B06F /* SwordModule.mm */,
+				A94EABE3117B28910018B06F /* SwordBible.h */,
+				A94EABE4117B28910018B06F /* SwordBible.mm */,
+				A94EABEB117B28920018B06F /* SwordBook.h */,
+				A94EABEC117B28920018B06F /* SwordBook.mm */,
+				A94EABED117B28920018B06F /* SwordCommentary.h */,
+				A94EABEE117B28920018B06F /* SwordCommentary.mm */,
+				A94EABEF117B28920018B06F /* SwordDictionary.h */,
+				A94EABF0117B28920018B06F /* SwordDictionary.mm */,
+				A94EABE5117B28920018B06F /* SwordBibleBook.h */,
+				A94EABE6117B28920018B06F /* SwordBibleBook.mm */,
+				A94EABE7117B28920018B06F /* SwordBibleChapter.h */,
+				A94EABE8117B28920018B06F /* SwordBibleChapter.m */,
+				A94EABFF117B28920018B06F /* SwordModuleTextEntry.h */,
+				A94EAC00117B28920018B06F /* SwordModuleTextEntry.m */,
+				A94EAC01117B28920018B06F /* SwordModuleTreeEntry.h */,
+				A94EAC02117B28920018B06F /* SwordModuleTreeEntry.m */,
+				A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */,
+				A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */,
+				A94EABF5117B28920018B06F /* SwordKey.h */,
+				A94EABF6117B28920018B06F /* SwordKey.mm */,
+				A94EABF7117B28920018B06F /* SwordListKey.h */,
+				A94EABF8117B28920018B06F /* SwordListKey.mm */,
+				A94EABE7117B28920018B06F /* SwordBibleChapter.h */,
+				A94EABE8117B28920018B06F /* SwordBibleChapter.m */,
+				A94EABE9117B28920018B06F /* SwordBibleTextEntry.h */,
+				A94EABEA117B28920018B06F /* SwordBibleTextEntry.m */,
+				A94EABF5117B28920018B06F /* SwordKey.h */,
+				A94EABF6117B28920018B06F /* SwordKey.mm */,
+				A94EABF7117B28920018B06F /* SwordListKey.h */,
+				A94EABF8117B28920018B06F /* SwordListKey.mm */,
+				A94EAC05117B28920018B06F /* SwordVerseKey.h */,
+				A94EAC06117B28920018B06F /* SwordVerseKey.mm */,
+				A94EAC09117B28920018B06F /* VerseEnumerator.h */,
+				A94EAC0A117B28920018B06F /* VerseEnumerator.mm */,
+				A94EABF1117B28920018B06F /* SwordInstallSource.h */,
+				A94EABF2117B28920018B06F /* SwordInstallSource.mm */,
+				A94EABF3117B28920018B06F /* SwordInstallSourceController.h */,
+				A94EABF4117B28920018B06F /* SwordInstallSourceController.mm */,
+				A9D4360311C4FE97007AFE83 /* SwordModule+Index.h */,
+				A9D4360411C4FE97007AFE83 /* SwordModule+Index.mm */,
+			);
+			name = SwordWrapper;
+			sourceTree = "<group>";
+		};
+		1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */,
+				A956316411FD8C55007DC7AD /* libsword-ub.a */,
+				A956324211FD90C9007DC7AD /* libclucene-ub.a */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7B2FEA5585E11CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				0867D6A5FE840307C02AAC07 /* AppKit.framework */,
+				D2F7E79907B2D74100F64583 /* CoreData.framework */,
+				0867D69BFE84028FC02AAC07 /* Foundation.framework */,
+				A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		32C88DFF0371C24200C91783 /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				A9A2C17C118D9D3D0002873D /* Notifications.h */,
+				32DBCF5E0370ADEE00C91783 /* ObjCSword_Prefix.pch */,
+				A975EAC411C77862007C1532 /* ObjCSword.h */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		A94EAE72117B32AF0018B06F /* Services */ = {
+			isa = PBXGroup;
+			children = (
+				A9C2856D11C446B700803CB5 /* Configuration.h */,
+				A9C2858211C44A0A00803CB5 /* Configuration.m */,
+				A9C2857111C4471400803CB5 /* OSXConfiguration.h */,
+				A9C2857211C4471400803CB5 /* OSXConfiguration.m */,
+			);
+			name = Services;
+			sourceTree = "<group>";
+		};
+		A975ECD211C7925B007C1532 /* Utilities */ = {
+			isa = PBXGroup;
+			children = (
+				A975ED9811C7925C007C1532 /* imp2gbs.cpp */,
+				A975ED9911C7925C007C1532 /* imp2ld.cpp */,
+				A975ED9A11C7925C007C1532 /* imp2vs.cpp */,
+				A975ED9B11C7925C007C1532 /* installmgr.cpp */,
+				A975EDAB11C7925C007C1532 /* mod2imp.cpp */,
+				A975EDAC11C7925C007C1532 /* mod2osis.cpp */,
+				A975EDAD11C7925C007C1532 /* mod2vpl.cpp */,
+				A975EDAE11C7925C007C1532 /* mod2zmod.cpp */,
+				A975EDB111C7925C007C1532 /* osis2mod.cpp */,
+				A975EDB811C7925C007C1532 /* step2vpl.cpp */,
+				A975EDB911C7925C007C1532 /* stepdump.cpp */,
+				A975EDBB11C7925C007C1532 /* tei2mod.cpp */,
+				A975EDD811C7925C007C1532 /* vpl2mod.cpp */,
+				A975EDD911C7925C007C1532 /* vs2osisref.cpp */,
+				A975EDDA11C7925C007C1532 /* vs2osisreftxt.cpp */,
+				A975EDDB11C7925C007C1532 /* xml2gbs.cpp */,
+			);
+			name = Utilities;
+			path = ../../utilities;
+			sourceTree = SOURCE_ROOT;
+		};
+		A9C2857911C4486400803CB5 /* Tests */ = {
+			isa = PBXGroup;
+			children = (
+				A964658011C663E200640FAC /* SwordManagerTest.h */,
+				A964658111C663E200640FAC /* SwordManagerTest.m */,
+				A918B8E211C6697400024D84 /* SwordModuleTest.h */,
+				A918B8E311C6697400024D84 /* SwordModuleTest.m */,
+				A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */,
+				A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */,
+				A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */,
+				A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */,
+			);
+			name = Tests;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8DC2EF500486A6940098B216 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A975EAC511C77862007C1532 /* ObjCSword.h in Headers */,
+				A94EAC0B117B28920018B06F /* SwordBible.h in Headers */,
+				A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */,
+				A94EAC0F117B28920018B06F /* SwordBibleChapter.h in Headers */,
+				A94EAC11117B28920018B06F /* SwordBibleTextEntry.h in Headers */,
+				A94EAC13117B28920018B06F /* SwordBook.h in Headers */,
+				A94EAC15117B28920018B06F /* SwordCommentary.h in Headers */,
+				A94EAC17117B28920018B06F /* SwordDictionary.h in Headers */,
+				A94EAC19117B28920018B06F /* SwordInstallSource.h in Headers */,
+				A94EAC1B117B28920018B06F /* SwordInstallSourceController.h in Headers */,
+				A94EAC1D117B28920018B06F /* SwordKey.h in Headers */,
+				A94EAC1F117B28920018B06F /* SwordListKey.h in Headers */,
+				A94EAC21117B28920018B06F /* SwordManager.h in Headers */,
+				A94EAC25117B28920018B06F /* SwordModule.h in Headers */,
+				A94EAC27117B28920018B06F /* SwordModuleTextEntry.h in Headers */,
+				A94EAC29117B28920018B06F /* SwordModuleTreeEntry.h in Headers */,
+				A94EAC2D117B28920018B06F /* SwordVerseKey.h in Headers */,
+				A94EAC2F117B28920018B06F /* SwordVerseManager.h in Headers */,
+				A94EAC31117B28920018B06F /* VerseEnumerator.h in Headers */,
+				A9A2C17D118D9D3D0002873D /* Notifications.h in Headers */,
+				A9C2856F11C446B700803CB5 /* Configuration.h in Headers */,
+				A9C2857311C4471400803CB5 /* OSXConfiguration.h in Headers */,
+				A9D4360511C4FE97007AFE83 /* SwordModule+Index.h in Headers */,
+				A9EF1416120595650078A27C /* SwordLocaleManager.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA651207F9870067ED5B /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BDFA661207F9870067ED5B /* SwordManagerTest.h in Headers */,
+				A9BDFA671207F9870067ED5B /* SwordModuleTest.h in Headers */,
+				A9BDFA7C1207FA2F0067ED5B /* SwordModuleLongRunTest.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9C281B611C43DB800803CB5 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A96465AD11C6658200640FAC /* SwordManagerTest.h in Headers */,
+				A918B8E411C6697400024D84 /* SwordModuleTest.h in Headers */,
+				A9BDFA781207F9F00067ED5B /* SwordListKeyTest.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		8DC2EF4F0486A6940098B216 /* ObjCSword */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */;
+			buildPhases = (
+				8DC2EF500486A6940098B216 /* Headers */,
+				8DC2EF520486A6940098B216 /* Resources */,
+				8DC2EF540486A6940098B216 /* Sources */,
+				8DC2EF560486A6940098B216 /* Frameworks */,
+				A9A5050211C75C4B00EB6EA5 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ObjCSword;
+			productInstallPath = "$(HOME)/Library/Frameworks";
+			productName = ObjCSword;
+			productReference = 8DC2EF5B0486A6940098B216 /* ObjCSword.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		A975EED811C792B9007C1532 /* mod2osis */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */;
+			buildPhases = (
+				A975EED611C792B9007C1532 /* Sources */,
+				A975EED711C792B9007C1532 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = mod2osis;
+			productName = mod2osis;
+			productReference = A975EED911C792B9007C1532 /* mod2osis */;
+			productType = "com.apple.product-type.tool";
+		};
+		A9BDFA5A1207F9870067ED5B /* LongRunningTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */;
+			buildPhases = (
+				A9BDFA5D1207F9870067ED5B /* Resources */,
+				A9BDFA5E1207F9870067ED5B /* Sources */,
+				A9BDFA611207F9870067ED5B /* Frameworks */,
+				A9BDFA641207F9870067ED5B /* ShellScript */,
+				A9BDFA651207F9870067ED5B /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */,
+			);
+			name = LongRunningTests;
+			productName = Tests;
+			productReference = A9BDFA6B1207F9870067ED5B /* Tests.octest */;
+			productType = "com.apple.product-type.bundle";
+		};
+		A9C2819511C43C4900803CB5 /* Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */;
+			buildPhases = (
+				A9C2819111C43C4900803CB5 /* Resources */,
+				A9C2819211C43C4900803CB5 /* Sources */,
+				A9C2819311C43C4900803CB5 /* Frameworks */,
+				A9C2819411C43C4900803CB5 /* ShellScript */,
+				A9C281B611C43DB800803CB5 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				A964657B11C662CA00640FAC /* PBXTargetDependency */,
+			);
+			name = Tests;
+			productName = Tests;
+			productReference = A9C2819611C43C4900803CB5 /* Tests.octest */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */;
+			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 0867D691FE84028FC02AAC07 /* ObjCSword */;
+			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8DC2EF4F0486A6940098B216 /* ObjCSword */,
+				A9C2819511C43C4900803CB5 /* Tests */,
+				A9BDFA5A1207F9870067ED5B /* LongRunningTests */,
+				A975EED811C792B9007C1532 /* mod2osis */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8DC2EF520486A6940098B216 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
+				A9D4382311C52947007AFE83 /* locales.d in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA5D1207F9870067ED5B /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9C2819111C43C4900803CB5 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		A9BDFA641207F9870067ED5B /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
+		};
+		A9C2819411C43C4900803CB5 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8DC2EF540486A6940098B216 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */,
+				A94EAC0E117B28920018B06F /* SwordBibleBook.mm in Sources */,
+				A94EAC10117B28920018B06F /* SwordBibleChapter.m in Sources */,
+				A94EAC12117B28920018B06F /* SwordBibleTextEntry.m in Sources */,
+				A94EAC14117B28920018B06F /* SwordBook.mm in Sources */,
+				A94EAC16117B28920018B06F /* SwordCommentary.mm in Sources */,
+				A94EAC18117B28920018B06F /* SwordDictionary.mm in Sources */,
+				A94EAC1A117B28920018B06F /* SwordInstallSource.mm in Sources */,
+				A94EAC1C117B28920018B06F /* SwordInstallSourceController.mm in Sources */,
+				A94EAC1E117B28920018B06F /* SwordKey.mm in Sources */,
+				A94EAC20117B28920018B06F /* SwordListKey.mm in Sources */,
+				A94EAC22117B28920018B06F /* SwordManager.mm in Sources */,
+				A94EAC26117B28920018B06F /* SwordModule.mm in Sources */,
+				A94EAC28117B28920018B06F /* SwordModuleTextEntry.m in Sources */,
+				A94EAC2A117B28920018B06F /* SwordModuleTreeEntry.m in Sources */,
+				A94EAC2E117B28920018B06F /* SwordVerseKey.mm in Sources */,
+				A94EAC30117B28920018B06F /* SwordVerseManager.mm in Sources */,
+				A94EAC32117B28920018B06F /* VerseEnumerator.mm in Sources */,
+				A9C2857411C4471400803CB5 /* OSXConfiguration.m in Sources */,
+				A9C2858311C44A0A00803CB5 /* Configuration.m in Sources */,
+				A9D4360611C4FE97007AFE83 /* SwordModule+Index.mm in Sources */,
+				A9EF1417120595650078A27C /* SwordLocaleManager.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A975EED611C792B9007C1532 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A975EEE511C79308007C1532 /* mod2osis.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9BDFA5E1207F9870067ED5B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A9C2819211C43C4900803CB5 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A96465A511C6657900640FAC /* SwordManagerTest.m in Sources */,
+				A918B8E511C6697400024D84 /* SwordModuleTest.m in Sources */,
+				A9BDFA791207F9F00067ED5B /* SwordListKeyTest.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		A964657B11C662CA00640FAC /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* ObjCSword */;
+			targetProxy = A964657A11C662CA00640FAC /* PBXContainerItemProxy */;
+		};
+		A9BDFA5B1207F9870067ED5B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* ObjCSword */;
+			targetProxy = A9BDFA5C1207F9870067ED5B /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		089C1666FE841158C02AAC07 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C1667FE841158C02AAC07 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		1DEB91AE08733DA50010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				COPY_PHASE_STRIP = NO;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
+				);
+				FRAMEWORK_VERSION = A;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_ENABLE_SYMBOL_SEPARATION = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = ObjCSword_Prefix.pch;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				HEADER_SEARCH_PATHS = "../../include/**";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "@rpath";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/build_sword/build/result_inst/lib\"",
+					"\"$(SRCROOT)/build_clucene/build/result_inst/lib\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "-DDEBUG";
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = ObjCSword;
+				SDKROOT = macosx10.5;
+				WARNING_CFLAGS = "-Wall";
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Debug;
+		};
+		1DEB91AF08733DA50010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					ppc,
+					"$(ARCHS_STANDARD_32_64_BIT)",
+				);
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
+				);
+				FRAMEWORK_VERSION = A;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = ObjCSword_Prefix.pch;
+				HEADER_SEARCH_PATHS = "../../include/**";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "@rpath";
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/build_sword/build/result_inst/lib\"",
+					"\"$(SRCROOT)/build_clucene/build/result_inst/lib\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				OTHER_CFLAGS = "-DRELEASE";
+				OTHER_LDFLAGS = (
+					"-lcurl",
+					"-lz",
+					"-licucore",
+				);
+				PRODUCT_NAME = ObjCSword;
+				SDKROOT = macosx10.5;
+				WARNING_CFLAGS = "-Wall";
+				WRAPPER_EXTENSION = framework;
+			};
+			name = Release;
+		};
+		1DEB91B208733DA50010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PREBINDING = NO;
+				SDKROOT = macosx10.6;
+			};
+			name = Debug;
+		};
+		1DEB91B308733DA50010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = macosx10.6;
+			};
+			name = Release;
+		};
+		A975EEDE11C792BA007C1532 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				HEADER_SEARCH_PATHS = "../../include/**";
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path";
+				PREBINDING = NO;
+				PRODUCT_NAME = mod2osis;
+				SDKROOT = macosx10.5;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+			};
+			name = Debug;
+		};
+		A975EEDF11C792BA007C1532 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				HEADER_SEARCH_PATHS = "../../include/**";
+				INSTALL_PATH = /usr/local/bin;
+				LD_RUNPATH_SEARCH_PATHS = "@loader_path";
+				PREBINDING = NO;
+				PRODUCT_NAME = mod2osis;
+				SDKROOT = macosx10.5;
+				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9BDFA691207F9870067ED5B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
+				INFOPLIST_FILE = "Tests-Info copy.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"-framework",
+					Cocoa,
+					"-framework",
+					SenTestingKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = Tests;
+				SDKROOT = macosx10.5;
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Debug;
+		};
+		A9BDFA6A1207F9870067ED5B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
+				INFOPLIST_FILE = "Tests-Info copy.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Cocoa,
+					"-framework",
+					SenTestingKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = Tests;
+				SDKROOT = macosx10.5;
+				WRAPPER_EXTENSION = octest;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		A9C2819811C43C4900803CB5 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
+				INFOPLIST_FILE = "Tests-Info.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"-framework",
+					Cocoa,
+					"-framework",
+					SenTestingKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = Tests;
+				SDKROOT = macosx10.5;
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Debug;
+		};
+		A9C2819911C43C4900803CB5 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_ENABLE_OBJC_GC = required;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
+				INFOPLIST_FILE = "Tests-Info.plist";
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
+				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Cocoa,
+					"-framework",
+					SenTestingKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = Tests;
+				SDKROOT = macosx10.5;
+				WRAPPER_EXTENSION = octest;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "ObjCSword" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91AE08733DA50010E9CD /* Debug */,
+				1DEB91AF08733DA50010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "ObjCSword" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91B208733DA50010E9CD /* Debug */,
+				1DEB91B308733DA50010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A975EEE811C79326007C1532 /* Build configuration list for PBXNativeTarget "mod2osis" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A975EEDE11C792BA007C1532 /* Debug */,
+				A975EEDF11C792BA007C1532 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9BDFA681207F9870067ED5B /* Build configuration list for PBXNativeTarget "LongRunningTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9BDFA691207F9870067ED5B /* Debug */,
+				A9BDFA6A1207F9870067ED5B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		A9C2819A11C43C4900803CB5 /* Build configuration list for PBXNativeTarget "Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9C2819811C43C4900803CB5 /* Debug */,
+				A9C2819911C43C4900803CB5 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}
diff --git a/bindings/objc/README b/bindings/objc/README
new file mode 100644
index 0000000..8d1b5ed
--- /dev/null
+++ b/bindings/objc/README
@@ -0,0 +1,27 @@
+Building ObjCSword wrapper framework howto (>= Mac OSX Lion (10.7)
+===================================================================
+Open Xcode Project (ObjCSword.xcodeproj) and build.
+
+
+Building ObjCSword wrapper framework howto (pre Mac OSX Lion (10.7)
+===================================================================
+
+Mac OS X target:
+The framework for Mac OS X relies on a manually, via makefile compiled SWORD library.
+The Xcode project also includes a target which builds the SWORD library but the result of this library does not work properly on PPC aritectures. Therefore the library has to be build manually.
+But don't worry, this process it relatively easy.
+
+1. build CLucene dependency
+cd to the "build_clucene" folder and type "make release-fat".
+This will compile clucene binaries for PPC, i686 and x86_64 and a universal binary will be created which is used in the Xcode project.
+
+2. build SWORD library
+cd to "build_sword" folder and type "make release-fat".
+This will similarly as for CLucene build binaries for PPC, i686 and x86_64 including a resulting universal binary that is used in the Xcode project.
+
+1. and 2. only need to be done if you are starting from a fresh SVN checkout.
+2. only needs to be repeated if the SWORD sources are changed.
+
+3. open the Xcode project and create ObjCSword framework.
+
+
diff --git a/bindings/objc/Tests-Info.plist b/bindings/objc/Tests-Info.plist
new file mode 100644
index 0000000..c285a47
--- /dev/null
+++ b/bindings/objc/Tests-Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/bindings/objc/build_clucene/Makefile b/bindings/objc/build_clucene/Makefile
new file mode 100644
index 0000000..e75feb9
--- /dev/null
+++ b/bindings/objc/build_clucene/Makefile
@@ -0,0 +1,25 @@
+.PHONY: default release-ppc release-intel release-fat debug-ppc debug-intel debug-fat clean
+
+default: release-fat
+
+release-ppc:
+	./build_mac_clucene.sh release ppc
+
+release-intel:
+	./build_mac_clucene.sh release intel
+
+release-fat:
+	./build_mac_clucene.sh release fat 
+
+debug-ppc:
+	./build_mac_clucene.sh debug ppc
+
+debug-intel:
+	./build_mac_clucene.sh debug intel
+
+debug-fat:
+	./build_mac_clucene.sh debug fat 
+
+clean:
+	rm -rf build
+
diff --git a/bindings/objc/build_clucene/build_mac_clucene.sh b/bindings/objc/build_clucene/build_mac_clucene.sh
new file mode 100755
index 0000000..9ff2169
--- /dev/null
+++ b/bindings/objc/build_clucene/build_mac_clucene.sh
@@ -0,0 +1,158 @@
+#!/bin/sh -e
+# script by Manfred Bergmann in 2006, updated in 2010
+#
+
+APP=clucene
+COMP=core
+VERS=0.9.21b
+BDIR=`pwd`
+
+SRCPACKAGE="$APP-$COMP-$VERS.tar.gz"
+
+DEBUG=0
+FAT=0
+PPC=0
+INTEL=0
+
+# check commandline
+for arg in "$@" 
+do
+	if [ "$arg" = "debug" ]; then
+		DEBUG=1
+		echo "building debug version"
+	fi
+	if [ "$arg" = "fat" ]; then
+		FAT=1
+		PPC=1
+		INTEL=1
+		echo "building fat version"
+	fi
+	if [ "$arg" = "ppc" ]; then
+		PPC=1
+		echo "building ppc version"
+	else
+		PPC=0
+	fi
+	if [ "$arg" = "intel" ]; then
+		INTEL=1
+		echo "building intel version"
+	else
+		INTEL=0
+	fi
+done
+
+# using seperate build dirs and building in them doesn't work with sword
+BUILD=$BDIR/build
+PPCPREFIX=$BUILD/ppc_inst
+INTELPREFIX=$BUILD/intel_inst
+INTEL64PREFIX=$BUILD/intel64_inst
+RESULTPREFIX=$BUILD/result_inst
+
+# Create install dirs if they doesn't exist
+if [ ! -d $BUILD ]; then
+	mkdir -p $BUILD
+fi
+if [ ! -d $PPCPREFIX ]; then
+	mkdir -p $PPCPREFIX
+fi
+if [ ! -d $INTELPREFIX ]; then
+	mkdir -p $INTELPREFIX
+fi
+if [ ! -d $INTEL64PREFIX ]; then
+	mkdir -p $INTEL64PREFIX
+fi
+if [ ! -d $RESULTPREFIX ]; then
+	mkdir -p $RESULTPREFIX
+	if [ ! -d $RESULTPREFIX/lib ]; then
+		mkdir -p $RESULTPREFIX/lib
+	fi
+fi
+
+# delete old source dir
+/bin/rm -rf $SRCPACKAGE
+
+# download first is not exist
+# due to size limitation in the source repo this file wil be downloaded
+# and buiding will need an internet connection
+if [ ! -f $SRCPACKAGE ]; then
+  curl -o $SRCPACKAGE http://www.crosswire.org/~mbergmann/$SRCPACKAGE
+fi
+# ungzip src
+tar -xzf $SRCPACKAGE
+
+CLUCENEPATH="$BDIR/$APP-$COMP-$VERS"
+
+# build stuff
+if [ $PPC -eq 1 ] || [ $FAT -eq 1 ]; then
+    echo "building PPC version of library..."    
+	cd $CLUCENEPATH
+	export CC=gcc
+	export CXX=g++
+	export SDK=/Developer/SDKs/MacOSX10.5.sdk
+	if [ $DEBUG -eq 1 ]; then
+		export CFLAGS="-O0 -g -arch ppc -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include"
+	else
+	    export CFLAGS="-O2 -g0 -arch ppc -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include"
+	fi
+	export CXXFLAGS="$CFLAGS"
+	export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK"
+	./configure --prefix=$PPCPREFIX
+	make install
+	make clean
+	cd $BDIR
+	# copy to result dir
+	PPC_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-ppc.a"
+	cp $PPCPREFIX/lib/lib$APP.a $PPC_LIB_EXPORT
+    echo "building PPC version of library...done"
+fi
+
+if [ $INTEL -eq 1 ] || [ $FAT -eq 1 ]; then
+    echo "building INTEL version of library..."
+	cd $CLUCENEPATH
+	export CC=gcc
+	export CXX=g++
+	export SDK=/Developer/SDKs/MacOSX10.5.sdk
+	if [ $DEBUG -eq 1 ]; then
+		export CFLAGS="-O0 -g -arch i686 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	else
+	    export CFLAGS="-O2 -g0 -arch i686 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	fi
+	export CXXFLAGS="$CFLAGS"
+	export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK"
+	./configure --prefix=$INTELPREFIX
+	make install
+	make clean
+	cd $BDIR
+	# copy to result dir
+	INTEL_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel.a"
+	cp $INTELPREFIX/lib/lib$APP.a $INTEL_LIB_EXPORT
+    echo "building INTEL version of library...done"
+
+    echo "building INTEL64 version of library..."
+	cd $CLUCENEPATH
+	export CC=gcc
+	export CXX=g++
+	export SDK=/Developer/SDKs/MacOSX10.5.sdk
+	if [ $DEBUG -eq 1 ]; then
+		export CFLAGS="-O0 -g -arch x86_64 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include"
+	else
+	    export CFLAGS="-O2 -g0 -arch x86_64 -mmacosx-version-min=10.5 -isysroot $SDK -I$SDK/usr/include"
+	fi
+	export CXXFLAGS="$CFLAGS"
+	export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK"
+	./configure --prefix=$INTEL64PREFIX
+	make install
+	make clean
+	cd $BDIR
+	# copy to result dir
+	INTEL64_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel64.a"
+	cp $INTEL64PREFIX/lib/lib$APP.a $INTEL64_LIB_EXPORT
+    echo "building INTEL64 version of library...done"
+fi
+
+# only for fat version
+if [ $FAT -eq 1 ]; then
+	# creating result
+	# build fat binary with lipo
+	lipo -create $PPC_LIB_EXPORT $INTEL_LIB_EXPORT $INTEL64_LIB_EXPORT -output $RESULTPREFIX/lib/lib$APP-ub.a
+fi
diff --git a/bindings/objc/build_sword/build_mac_sword.sh b/bindings/objc/build_sword/build_mac_sword.sh
new file mode 100755
index 0000000..77cfff9
--- /dev/null
+++ b/bindings/objc/build_sword/build_mac_sword.sh
@@ -0,0 +1,225 @@
+#!/bin/sh -e
+# script by Manfred Bergmann in 2006, updated in 2010
+#
+
+APP=sword
+VERS=1.6.2
+BDIR=`pwd`
+
+SWORDPATH="$BDIR/../../../"
+ICUPATH="$BDIR/../dependencies/icu"
+PPCCLUCENEPATH="$BDIR/../build_clucene/build/ppc_inst"
+INTELCLUCENEPATH="$BDIR/../build_clucene/build/intel_inst"
+INTEL64CLUCENEPATH="$BDIR/../build_clucene/build/intel64_inst"
+
+usage() {
+cat << EOF
+usage: $0 options
+
+OPTIONS:
+   -d      Buildtype debug version
+   -a      Architecture [intel|intel64|ppc|fat]
+   -b      Buildpath, default = "build"
+   -c      With clucene
+   -s      Path to SDK i.e. "/Developer/SDKs/MacOSX10.5.sdk"
+   -t      Deplyoment target i.e. "10.5"
+EOF
+}
+
+DEBUG=0
+FAT=0
+PPC=0
+INTEL=0
+INTEL64=0
+USECLUCENE=0
+BUILDDIR=build
+SDKDIR=/Developer/SDKs/MacOSX10.5.sdk
+DTARGET=10.5
+
+while getopts “da:b:s:t:c?� OPTION
+do
+     case $OPTION in
+         d)
+         DEBUG=1
+         echo "building debug version"
+         ;;
+         a)
+         if [ "$OPTARG" = "fat" ]; then
+           FAT=1
+           PPC=1
+           INTEL=1
+           INTEL64=1
+           echo "building fat version"
+         fi
+         if [ "$OPTARG" = "ppc" ]; then
+           PPC=1
+           echo "building ppc version"
+         fi
+         if [ "$OPTARG" = "intel" ]; then
+           INTEL=1
+           echo "building intel version"
+         fi
+         if [ "$OPTARG" = "intel64" ]; then
+           INTEL64=1
+           echo "building intel64 version"
+         fi
+         ;;
+         b)
+         BUILDDIR="$OPTARG"
+         echo "using builddir $BUILDDIR"
+         ;;
+         s)
+         SDKDIR="$OPTARG"
+         echo "using SDK at $SDKDIR"
+         ;;
+         t)
+         DTARGET="$OPTARG"
+         echo "using deployment target $DTARGET"
+         ;;
+         c)
+         USECLUCENE=1
+         echo "building with clucene"
+         ;;
+         ?)
+         usage
+         exit
+         ;;
+     esac
+done
+
+# using seperate build dirs and building in them doesn't work with sword
+BUILD=$BDIR/"$BUILDDIR"
+PPCPREFIX=$BUILD/ppc_inst
+INTELPREFIX=$BUILD/intel_inst
+INTEL64PREFIX=$BUILD/intel64_inst
+RESULTPREFIX=$BUILD/result_inst
+
+# Create install dirs if they doesn't exist
+if [ ! -d $BUILD ]; then
+	mkdir -p $BUILD
+fi
+if [ ! -d $PPCPREFIX ]; then
+	mkdir -p $PPCPREFIX
+fi
+if [ ! -d $INTELPREFIX ]; then
+	mkdir -p $INTELPREFIX
+fi
+if [ ! -d $INTEL64PREFIX ]; then
+	mkdir -p $INTEL64PREFIX
+fi
+if [ ! -d $RESULTPREFIX ]; then
+	mkdir -p $RESULTPREFIX
+	if [ ! -d $RESULTPREFIX/lib ]; then
+		mkdir -p $RESULTPREFIX/lib
+	fi
+fi
+
+# add icu tools to path
+export PATH="$PATH:$ICUPATH/bin"
+export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$ICUPATH/lib"
+
+PPC_LIB_EXPORT=
+INTEL_LIB_EXPORT=
+INTEL64_LIB_EXPORT=
+
+# build stuff
+if [ $PPC -eq 1 ] || [ $FAT -eq 1 ]; then
+    echo "building PPC version of library..."    
+	cd $SWORDPATH
+	echo 'autogen.sh ...'
+	./autogen.sh
+	echo 'autogen.sh ... done'
+	export CC=gcc
+	export CXX=g++
+	export SDK=$SDKDIR
+	if [ $DEBUG -eq 1 ]; then
+		export CFLAGS="-O0 -g -arch ppc -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	else
+	  export CFLAGS="-O2 -g0 -arch ppc -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	fi
+	export CXXFLAGS="$CFLAGS"
+	export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK"
+	if [ $USECLUCENE -eq 1 ]; then
+  	./configure --prefix=$PPCPREFIX --with-clucene=$PPCCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --disable-tests --disable-shared
+	else
+  	./configure --prefix=$PPCPREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --disable-tests --disable-shared --enable-utilities
+  fi
+	make all install
+	make clean
+	cd $BDIR
+	# copy to result dir
+	PPC_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-ppc.a"
+	cp $PPCPREFIX/lib/lib$APP.a $PPC_LIB_EXPORT
+  echo "building PPC version of library...done"
+fi
+
+if [ $INTEL -eq 1 ] || [ $FAT -eq 1 ]; then
+  echo "building INTEL version of library..."
+	cd $SWORDPATH
+	echo 'autogen.sh ...'
+	./autogen.sh
+	echo 'autogen.sh ... done'
+	export CC=gcc
+	export CXX=g++
+	export SDK=$SDKDIR
+	if [ $DEBUG -eq 1 ]; then
+		export CFLAGS="-O0 -g -arch i686 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	else
+	  export CFLAGS="-O2 -g0 -arch i686 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	fi
+	export CXXFLAGS="$CFLAGS"
+	export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK"
+	if [ $USECLUCENE -eq 1 ]; then
+  	./configure --prefix=$INTELPREFIX --with-clucene=$INTELCLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared
+  else
+  	./configure --prefix=$INTELPREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities
+  fi
+	make all install
+	make clean
+	cd $BDIR
+	# copy to result dir
+	INTEL_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel.a"
+	cp $INTELPREFIX/lib/lib$APP.a $INTEL_LIB_EXPORT
+  echo "building INTEL version of library...done"
+fi
+
+if [ $INTEL64 -eq 1 ] || [ $FAT -eq 1 ]; then
+  echo "building INTEL64 version of library..."
+	cd $SWORDPATH
+	echo 'autogen.sh ...'
+	./autogen.sh
+	echo 'autogen.sh ... done'
+	export CC=gcc
+	export CXX=g++
+	export SDK=$SDKDIR
+	if [ $DEBUG -eq 1 ]; then
+		export CFLAGS="-O0 -g -arch x86_64 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	else
+	  export CFLAGS="-O2 -g0 -arch x86_64 -mmacosx-version-min=$DTARGET -isysroot $SDK -I$SDK/usr/include -I$ICUPATH/include"
+	fi
+	export CXXFLAGS="$CFLAGS"
+	export LDFLAGS="-isysroot $SDK -Wl,-syslibroot,$SDK"
+	if [ $USECLUCENE -eq 1 ]; then
+  	./configure --prefix=$INTEL64PREFIX --with-clucene=$INTEL64CLUCENEPATH --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared
+  else
+  	./configure --prefix=$INTEL64PREFIX --without-clucene --with-zlib --with-conf --with-icu --with-curl --enable-tests --disable-shared --enable-utilities
+  fi
+	make all install
+	make clean
+	cd $BDIR
+	# copy to result dir
+	INTEL64_LIB_EXPORT="$RESULTPREFIX/lib/lib$APP-intel64.a"
+	cp $INTEL64PREFIX/lib/lib$APP.a $INTEL64_LIB_EXPORT
+  echo "building INTEL64 version of library...done"
+fi
+
+# only for fat version
+if [ $FAT -eq 1 ]; then
+	# creating result
+	# build fat binary with lipo
+	lipo -create $PPC_LIB_EXPORT $INTEL_LIB_EXPORT $INTEL64_LIB_EXPORT -output $RESULTPREFIX/lib/lib$APP-ub.a
+fi
+
+
+# run runlib to update the library content
+#ranlib $RESULTPREFIX/lib/*
diff --git a/bindings/objc/build_sword/build_ub_mac_swordutils.sh b/bindings/objc/build_sword/build_ub_mac_swordutils.sh
new file mode 100755
index 0000000..55c21f7
--- /dev/null
+++ b/bindings/objc/build_sword/build_ub_mac_swordutils.sh
@@ -0,0 +1,59 @@
+#!/bin/sh -e
+# script by Manfred Bergmann in 2006
+#
+
+# dependencies for this script are:
+# that "build_mac_sword.sh" has been executed in "fat" mode and
+# successfully created a "build_tools" folder with directories: "ppc_inst" and "intel_inst"
+
+# first build library
+./build_mac_sword.sh -a fat -b build_tools
+
+BDIR=.
+SWORDBUILD=$BDIR/build_tools
+PPCPREFIX=$SWORDBUILD/ppc_inst
+INTELPREFIX=$SWORDBUILD/intel_inst
+RESULTPREFIX=$SWORDBUILD/result_inst
+
+# Create install dirs if they doesn't exist
+if [ ! -d $SWORDBUILD ]; then
+    echo "build folder doesn't exist!\n"
+    exit 1
+fi
+if [ ! -d $PPCPREFIX ]; then
+    echo "ppc installation folder doesn't exist!\n"
+    exit 1
+fi
+if [ ! -d $INTELPREFIX ]; then
+    echo "intel installation folder doesn't exist!\n"
+    exit 1
+fi
+if [ ! -d $RESULTPREFIX ]; then
+    echo "result(fat) installation folder doesn't exist!\n"
+    exit 1
+fi
+
+BINDESTINATION=$RESULTPREFIX/bin
+if [ -d $BINDESTINATION ]; then
+    rm -r $BINDESTINATION
+fi
+mkdir $BINDESTINATION
+
+function callLipo {
+    lipo -create $INTELPREFIX/bin/$1 $PPCPREFIX/bin/$1 -output $BINDESTINATION/$1    
+}
+
+callLipo imp2gbs
+callLipo imp2ld
+callLipo imp2vs
+callLipo installmgr
+callLipo mod2imp
+callLipo mod2osis
+callLipo mod2vpl
+callLipo mod2zmod
+callLipo osis2mod
+callLipo tei2mod
+callLipo vpl2mod
+callLipo vs2osisref
+callLipo vs2osisreftxt
+callLipo xml2gbs
diff --git a/bindings/objc/build_sword/readme.txt b/bindings/objc/build_sword/readme.txt
new file mode 100644
index 0000000..f20e49e
--- /dev/null
+++ b/bindings/objc/build_sword/readme.txt
@@ -0,0 +1,9 @@
+Building sword library for Eloquent:
+
+- make a symlink for libtoolize:
+ln -s /usr/bin/glibtoolize /usr/bin/libtoolize
+
+- build the library as it is a dependency for the Xcode project:
+./build_mac_sword.sh -a fat -c
+(check -? for possible options).
+
diff --git a/bindings/objc/dependencies/retrieve.sh b/bindings/objc/dependencies/retrieve.sh
new file mode 100755
index 0000000..547a9fe
--- /dev/null
+++ b/bindings/objc/dependencies/retrieve.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# this script downloads icu dependencies and unpacks them
+# ICU is needed for building SWORD
+
+curl -o icu_build-ub.tar.gz http://www.crosswire.org/~mbergmann/icu_build-ub.tar.gz
+tar -xzf icu_build-ub.tar.gz
+
+curl -o clucene_src.tar.gz http://www.crosswire.org/~mbergmann/clucene_src.tar.gz
+tar -xzf clucene_src.tar.gz
+
+cd icu/lib
+ln -s libicudata.dylib libicudata.dylib.36
+ln -s libicui18n.dylib libicui18n.dylib.36
+ln -s libicuio.dylib libicuio.dylib.36
+ln -s libicule.dylib libicule.dylib.36
+ln -s libiculx.dylib libiculx.dylib.36
+ln -s libicutu.dylib libicutu.dylib.36
+ln -s libicuuc.dylib libicuuc.dylib.36
diff --git a/bindings/objc/dependencies/retrieve_iOS.sh b/bindings/objc/dependencies/retrieve_iOS.sh
new file mode 100755
index 0000000..4415a3b
--- /dev/null
+++ b/bindings/objc/dependencies/retrieve_iOS.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# this script downloads dependencies for iOS project
+
+curl -o libcurl_build.tar.gz http://www.crosswire.org/~mbergmann/libcurl_build.tar.gz
+tar -xzf libcurl_build.tar.gz
diff --git a/bindings/objc/doc/SWORD-HOWTO.txt b/bindings/objc/doc/SWORD-HOWTO.txt
new file mode 100644
index 0000000..5f1549b
--- /dev/null
+++ b/bindings/objc/doc/SWORD-HOWTO.txt
@@ -0,0 +1,55 @@
+
+When updating SWORD from SVN into this project,
+
+delete all the Makefiles & other support files, leaving only the .cpp and .h files in their various folders...
+
+The following files should be "disabled" in Xcode (so that Xcode doesn't try to compile them):
+
+src/utilfuns/win32/dirent.cpp
+src/frontend/framework/femain.cpp
+src/frontend/im/hebrewmcim.cpp
+src/frontend/im/nullim.cpp
+src/frontend/im/swinputmeth.cpp
+
+AND (because they have a main() function):
+src/keys/genarray.c 
+src/utilfuns/zlib/maketree.c
+
+ie:  all the files in the following folders:
+src/frontend/im
+src/frontend/framework
+src/utilfuns/win32
+
+
+DIFFS:
+- curlhttpt.cpp:: logging info on the httpd server side
+- localemgr.cpp:: we don't wanna try to "find" the config, cause it just slows app-launch down & it won't find it!
+
+
+Index: /Users/nicc/local/src/PocketSword/externals/sword/src/mgr/curlhttpt.cpp
+===================================================================
+--- /Users/nicc/local/src/PocketSword/externals/sword/src/mgr/curlhttpt.cpp	(revision 8)
++++ /Users/nicc/local/src/PocketSword/externals/sword/src/mgr/curlhttpt.cpp	(working copy)
+@@ -144,6 +144,7 @@
+ 
+ 		/* Switch on full protocol/debug output */
+ 		curl_easy_setopt(session, CURLOPT_VERBOSE, true);
++		curl_easy_setopt(session, CURLOPT_USERAGENT, p.c_str());
+ 		
+ 		/* FTP connection settings */
+ 
+
+Index: /Users/nicc/local/src/PocketSword/externals/sword/src/mgr/localemgr.cpp
+===================================================================
+--- /Users/nicc/local/src/PocketSword/externals/sword/src/mgr/localemgr.cpp	(revision 18)
++++ /Users/nicc/local/src/PocketSword/externals/sword/src/mgr/localemgr.cpp	(working copy)
+@@ -80,7 +80,7 @@
+ 	
+ 	if (!iConfigPath) {
+ 		SWLog::getSystemLog()->logDebug("LOOKING UP LOCALE DIRECTORY...");
+-		SWMgr::findConfig(&configType, &prefixPath, &configPath, &augPaths, &sysConf);
++		//SWMgr::findConfig(&configType, &prefixPath, &configPath, &augPaths, &sysConf);
+ 		if (sysConf) {
+ 			if ((entry = sysConf->Sections["Install"].find("LocalePath")) != sysConf->Sections["Install"].end()) {
+ 				configType = 9;	// our own
+
diff --git a/bindings/objc/doc/search.txt b/bindings/objc/doc/search.txt
new file mode 100644
index 0000000..b9cbb30
--- /dev/null
+++ b/bindings/objc/doc/search.txt
@@ -0,0 +1,21 @@
+loved one
+	= search for verses that contain "loved" or "one"
+	= this is the same as loved OR one
+
+"loved one"
+	= search for verses that contain the phrase "loved one"
+	
+love*
+	= search for verses that contain a word starting with "love" (love OR loves OR loved OR etc...)
+	
+loved AND one
+	= search for verses that contains the word "loved" and the word "one"
+
++loved one
+	= search for verses that must contain "loved" and may contain "one"
+
+loved NOT one
+	= search for verses that contain "loved" but not "one"
+
+(loved one) AND God
+	= search for verses that contain "loved" or "one" and "God"
\ No newline at end of file
diff --git a/bindings/objc/src/DefaultFilterProvider.h b/bindings/objc/src/DefaultFilterProvider.h
new file mode 100644
index 0000000..435daa0
--- /dev/null
+++ b/bindings/objc/src/DefaultFilterProvider.h
@@ -0,0 +1,37 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+// To change the template use AppCode | Preferences | File Templates.
+//
+
+
+#import <Foundation/Foundation.h>
+#import "SwordFilter.h"
+
+@protocol FilterProvider
+
+- (SwordFilter *)newOsisRenderFilter;
+- (SwordFilter *)newOsisPlainFilter;
+- (SwordFilter *)newGbfRenderFilter;
+- (SwordFilter *)newGbfPlainFilter;
+- (SwordFilter *)newThmlRenderFilter;
+- (SwordFilter *)newThmlPlainFilter;
+- (SwordFilter *)newTeiRenderFilter;
+- (SwordFilter *)newTeiPlainFilter;
+- (SwordFilter *)newHtmlPlainFilter;
+
+@end
+
+@interface DefaultFilterProvider : NSObject <FilterProvider>
+
+- (SwordFilter *)newOsisRenderFilter;
+- (SwordFilter *)newOsisPlainFilter;
+- (SwordFilter *)newGbfRenderFilter;
+- (SwordFilter *)newGbfPlainFilter;
+- (SwordFilter *)newThmlRenderFilter;
+- (SwordFilter *)newThmlPlainFilter;
+- (SwordFilter *)newTeiRenderFilter;
+- (SwordFilter *)newTeiPlainFilter;
+- (SwordFilter *)newHtmlPlainFilter;
+
+@end
diff --git a/bindings/objc/src/DefaultFilterProvider.mm b/bindings/objc/src/DefaultFilterProvider.mm
new file mode 100644
index 0000000..65d8c0a
--- /dev/null
+++ b/bindings/objc/src/DefaultFilterProvider.mm
@@ -0,0 +1,44 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+//
+
+
+#import "DefaultFilterProvider.h"
+#import "SwordFilter.h"
+
+@implementation DefaultFilterProvider
+
+- (SwordFilter *)newOsisRenderFilter {
+    return [SwordOsisHtmlRefFilter filter];
+}
+
+- (SwordFilter *)newOsisPlainFilter {
+    return [SwordOsisPlainFilter filter];
+}
+
+- (SwordFilter *)newGbfRenderFilter {
+    return [SwordGbfHtmlFilter filter];
+}
+
+- (SwordFilter *)newGbfPlainFilter {
+    return [SwordGbfPlainFilter filter];
+}
+
+- (SwordFilter *)newThmlRenderFilter {
+    return [SwordThmlHtmlFilter filter];
+}
+
+- (SwordFilter *)newThmlPlainFilter {
+    return [SwordThmlPlainFilter filter];
+}
+
+- (SwordFilter *)newTeiRenderFilter {
+    return [SwordTeiHtmlFilter filter];
+}
+
+- (SwordFilter *)newTeiPlainFilter {
+    return [SwordTeiPlainFilter filter];
+}
+
+@end
\ No newline at end of file
diff --git a/bindings/objc/src/FilterProviderFactory.h b/bindings/objc/src/FilterProviderFactory.h
new file mode 100644
index 0000000..b2a6e65
--- /dev/null
+++ b/bindings/objc/src/FilterProviderFactory.h
@@ -0,0 +1,24 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <swmgr.h>		// C++ Sword API
+#endif
+
+@protocol FilterProvider;
+
+/**
+* This factory has to be initialized before any Modules are loaded through SwordManager.
+*/
+@interface FilterProviderFactory : NSObject
+
++ (FilterProviderFactory *)providerFactory;
+
+- (void)initWithImpl:(id<FilterProvider>)aFilterProvider;
+- (id<FilterProvider>)get;
+
+@end
diff --git a/bindings/objc/src/FilterProviderFactory.mm b/bindings/objc/src/FilterProviderFactory.mm
new file mode 100644
index 0000000..75abc68
--- /dev/null
+++ b/bindings/objc/src/FilterProviderFactory.mm
@@ -0,0 +1,42 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+//
+
+
+#import "FilterProviderFactory.h"
+#import "DefaultFilterProvider.h"
+
+@interface FilterProviderFactory ()
+
+@property(nonatomic, retain) id <FilterProvider> filterProvider;
+
+@end
+
+@implementation FilterProviderFactory
+
++ (FilterProviderFactory *)providerFactory {
+    static FilterProviderFactory *singleton = nil;
+
+    if(singleton == nil) {
+        singleton = [[FilterProviderFactory alloc] init];
+    }
+
+    return singleton;
+}
+
+- (void)initWithImpl:(id <FilterProvider>)aFilterProvider {
+    self.filterProvider = aFilterProvider;
+}
+
+- (id <FilterProvider>)get {
+    return self.filterProvider;
+}
+
+- (void)dealloc {
+    self.filterProvider = nil;
+    [super dealloc];
+}
+
+
+@end
\ No newline at end of file
diff --git a/bindings/objc/src/Notifications.h b/bindings/objc/src/Notifications.h
new file mode 100644
index 0000000..3972646
--- /dev/null
+++ b/bindings/objc/src/Notifications.h
@@ -0,0 +1,16 @@
+/*
+ *  globals.h
+ *  ObjCSword
+ *
+ *  Created by Manfred Bergmann on 03.06.05.
+ *  Copyright 2007 mabe. All rights reserved.
+ *
+ */
+
+// Notification identifiers
+
+/**
+\brief this notification is send, when the modules have changed (updated, added, removed)
+ */
+#define NotificationModulesChanged @"NotificationModulesChanged"
+#define SendNotifyModulesChanged(X) [[NSNotificationCenter defaultCenter] postNotificationName:NotificationModulesChanged object:X];
diff --git a/bindings/objc/src/SwordBible.h b/bindings/objc/src/SwordBible.h
new file mode 100644
index 0000000..f57d322
--- /dev/null
+++ b/bindings/objc/src/SwordBible.h
@@ -0,0 +1,73 @@
+/*	SwordBible.h - Sword API wrapper for Biblical Texts.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#import "versekey.h"
+#endif
+
+@class SwordModule, SwordManager, SwordBibleBook, SwordModuleTextEntry, SwordBibleTextEntry;
+@class SwordKey;
+
+typedef enum {
+	OldTestament = 1,
+	NewTestament
+}Testament;
+
+@interface SwordBible : SwordModule {
+    NSMutableDictionary *books;
+}
+
+@property (retain, readwrite) NSMutableDictionary *books;
+
+// ----------- class methods -------------
++ (void)decodeRef:(NSString *)ref intoBook:(NSString **)bookName book:(int *)book chapter:(int *)chapter verse:(int *)verse;
++ (NSString *)firstRefName:(NSString *)abbr;
++ (NSString *)context:(NSString *)abbr;
+#ifdef __cplusplus
++ (int)bookIndexForSWKey:(sword::VerseKey *)key;
+#endif
+
+
+- (BOOL)hasReference:(NSString *)ref;
+- (int)numberOfVerseKeysForReference:(NSString *)aReference;
+
+// book lists
+- (NSArray *)bookList;
+
+- (NSString *)bookIntroductionFor:(SwordBibleBook *)aBook;
+- (NSString *)chapterIntroductionFor:(SwordBibleBook *)aBook chapter:(int)chapter;
+- (NSString *)moduleIntroduction;
+
+// some numbers
+- (SwordBibleBook *)bookForLocalizedName:(NSString *)bookName;
+- (int)chaptersForBookName:(NSString *)bookName;
+- (int)versesForChapter:(int)chapter bookName:(NSString *)bookName;
+- (int)versesForBible;
+
+// Text pulling
+
+/**
+* @return SwordBibleTextEntry
+*/
+- (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType;
+- (NSArray *)strippedTextEntriesForRef:(NSString *)reference context:(int)context;
+- (NSArray *)renderedTextEntriesForRef:(NSString *)reference context:(int)context;
+/**
+ Override from super class
+ @return Array of SwordBibleTextEntry
+ */
+- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType;
+
+@end
\ No newline at end of file
diff --git a/bindings/objc/src/SwordBible.mm b/bindings/objc/src/SwordBible.mm
new file mode 100644
index 0000000..03e378e
--- /dev/null
+++ b/bindings/objc/src/SwordBible.mm
@@ -0,0 +1,481 @@
+/*	SwordBible.mm - Sword API wrapper for Biblical Texts.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <ObjCSword/ObjCSword.h>
+
+using sword::AttributeTypeList;
+using sword::AttributeList;
+using sword::AttributeValue;
+
+@interface SwordBible ()
+
+- (void)buildBookList;
+- (BOOL)containsBookNumber:(int)aBookNum;
+- (NSArray *)textEntriesForReference:(NSString *)aReference context:(int)context textType:(TextPullType)textType;
+
+@end
+
+@implementation SwordBible
+
+@dynamic books;
+
+#pragma mark - class methods
+
+NSLock *bibleLock = nil;
+
+// changes an abbreviated reference into a full
+// eg. Dan4:5-7 => Daniel4:5
++ (void)decodeRef:(NSString *)ref intoBook:(NSString **)bookName book:(int *)book chapter:(int *)chapter verse:(int *)verse {
+    
+	if(!bibleLock) bibleLock = [[NSLock alloc] init];
+	[bibleLock lock];
+	
+    SwordVerseKey *key = [SwordVerseKey verseKeyWithRef:ref];
+
+    if(bookName != NULL) {
+        *bookName = [key bookName];        
+    }
+    if(book != NULL) {
+        *book = [key book];        
+    }
+    if(chapter != NULL) {
+        *chapter = [key chapter];        
+    }
+    if(verse != NULL) {
+        *verse = [key verse];
+    }
+    
+	[bibleLock unlock];
+}
+
++ (NSString *)firstRefName:(NSString *)abbr {
+	if(!bibleLock) bibleLock = [[NSLock alloc] init];
+	[bibleLock lock];
+	
+	sword::VerseKey vk([abbr UTF8String]);
+	NSString *result = [NSString stringWithUTF8String:vk];
+    
+	[bibleLock unlock];
+	
+	return result;
+}
+
++ (NSString *)context:(NSString *)abbr {
+
+	//get parsed simple ref
+	NSString *first = [SwordBible firstRefName:abbr];
+	NSArray *firstBits = [first componentsSeparatedByString:@":"];
+	
+	//if abbr contains : or . then we are a verse so return a chapter
+	if([abbr rangeOfString:@":"].location != NSNotFound || [abbr rangeOfString:@"."].location != NSNotFound) {
+		return [firstBits objectAtIndex:0];
+    }
+	
+	//otherwise return a book
+	firstBits = [first componentsSeparatedByString:@" "];
+	
+	if([firstBits count] > 0) {
+		return [firstBits objectAtIndex:0];
+    }
+	
+	return abbr;
+}
+
+/**
+ get book index for verseKey
+ that is: book number + testament * 100
+ */
++ (int)bookIndexForSWKey:(sword::VerseKey *)key {
+    return key->Book() + key->Testament() * 100;
+}
+
+#pragma mark - Initializers
+
+- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager {    
+	self = [super initWithName:aName swordManager:aManager];
+    if(self) {
+        [self setBooks:nil];
+	}
+    
+	return self;
+}
+
+- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager {
+    self = [super initWithSWModule:aModule swordManager:aManager];
+    if(self) {
+        [self setBooks:nil];    
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+	[super finalize];
+}
+
+- (void)dealloc {
+    [books release];
+    [super dealloc];
+}
+
+#pragma mark - Bible information
+
+- (void)buildBookList {
+	[moduleLock lock];
+    
+    sword::VersificationMgr *vmgr = sword::VersificationMgr::getSystemVersificationMgr();
+    const sword::VersificationMgr::System *system = vmgr->getVersificationSystem([[self versification] UTF8String]);
+
+    NSMutableDictionary *buf = [NSMutableDictionary dictionary];
+    int bookCount = system->getBookCount();
+    for(int i = 0;i < bookCount;i++) {
+        sword::VersificationMgr::Book *book = (sword::VersificationMgr::Book *)system->getBook(i);
+        
+        SwordBibleBook *bb = [[[SwordBibleBook alloc] initWithBook:book] autorelease];
+        [bb setNumber:i+1];
+        
+        NSString *bookName = [bb name];
+        [buf setObject:bb forKey:bookName];
+    }
+    self.books = buf;
+    
+	[moduleLock unlock];
+}
+
+- (BOOL)containsBookNumber:(int)aBookNum {
+    for(SwordBibleBook *bb in [self books]) {
+        if([bb number] == aBookNum) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+- (NSMutableDictionary *)books {
+    if(books == nil) {
+        [self buildBookList];
+    }
+    return books;
+}
+
+- (void)setBooks:(NSMutableDictionary *)aBooks {
+    [aBooks retain];
+    [books release];
+    books = aBooks;
+}
+
+- (NSArray *)bookList {
+    NSDictionary *b = [self books];
+    NSArray *bl = [[b allValues] sortedArrayUsingSelector:@selector(compare:)];
+    return bl;
+}
+
+- (BOOL)hasReference:(NSString *)ref {
+	[moduleLock lock];
+	
+	sword::VerseKey	*key = (sword::VerseKey *)(swModule->CreateKey());
+	(*key) = [ref UTF8String];
+    NSString *bookName = [NSString stringWithUTF8String:key->getBookName()];
+    int chapter = key->Chapter();
+    int verse = key->Verse();
+    
+    SwordBibleBook *bb = [[self books] objectForKey:bookName];
+    if(bb) {
+        if(chapter > 0 && chapter < [bb numberOfChapters]) {
+            if(verse > 0 && verse < [bb numberOfVersesForChapter:chapter]) {
+                return YES;
+            }
+        }
+    }    
+    
+	[moduleLock unlock];
+	
+	return NO;
+}
+
+- (int)numberOfVerseKeysForReference:(NSString *)aReference {
+    int ret = 0;
+    
+    if(aReference && [aReference length] > 0) {
+        sword::VerseKey vk;
+        sword::ListKey listKey = vk.ParseVerseList([aReference UTF8String], "Gen1", true);
+        // unfortunately there is no other way then loop though all verses to know how many
+        for(listKey = sword::TOP; !listKey.Error(); listKey++) ret++;    
+    }
+    
+    return ret;
+}
+
+- (int)chaptersForBookName:(NSString *)bookName {
+	[moduleLock lock];
+	
+	int maxChapters;
+	sword::VerseKey *key = (sword::VerseKey *)swModule->CreateKey();
+	(*key) = [bookName UTF8String];
+	maxChapters = key->getChapterMax();
+	delete key;
+	
+	[moduleLock unlock];
+	
+	return maxChapters;
+}
+
+
+- (int)versesForChapter:(int)chapter bookName:(NSString *)bookName {
+    int ret = -1;
+    
+	[moduleLock lock];
+	
+    SwordBibleBook *bb = [[self books] objectForKey:bookName];
+    if(bb) {
+        ret = [bb numberOfVersesForChapter:chapter];
+    }
+    
+	[moduleLock unlock];
+	
+	return ret;
+}
+
+- (int)versesForBible {
+    int ret = 0;
+
+    for(SwordBibleBook *bb in [self books]) {
+        int chapters = [bb numberOfChapters];
+        int verses = 0;
+        for(int j = 1;j <= chapters;j++) {
+            verses += [bb numberOfVersesForChapter:j];
+        }
+        ret += verses;
+    }
+    
+    return ret;
+}
+
+- (SwordBibleBook *)bookForLocalizedName:(NSString *)bookName {
+    for(SwordBibleBook *book in [[self books] allValues]) {
+        if([[book localizedName] isEqualToString:bookName]) {
+            return book;
+        }
+    }
+    return nil;
+}
+
+- (NSString *)moduleIntroduction {
+    NSString *ret;
+    
+    // save key
+    SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease];
+    
+    SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]];
+    [key setHeadings:YES];
+    [key setPosition:0];
+    [self setSwordKey:key];
+    ret = [self renderedText];
+    
+    // restore old key
+    [self setSwordKey:save];
+    
+    return ret;
+}
+
+- (NSString *)bookIntroductionFor:(SwordBibleBook *)aBook {
+    NSString *ret;
+    
+    // save key
+    SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease];
+
+    SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]];
+    [key setHeadings:YES];
+    [key setAutoNormalize:NO];
+    [key setTestament:[aBook testament]];
+    [key setBook:[aBook numberInTestament]];
+    [key setChapter:0];
+    [key setVerse:0];
+    [self setSwordKey:key];
+    ret = [self renderedText];
+    
+    // restore old key
+    [self setSwordKey:save];
+
+    return ret;
+}
+
+- (NSString *)chapterIntroductionFor:(SwordBibleBook *)aBook chapter:(int)chapter {
+    NSString *ret;
+    
+    // save key
+    SwordVerseKey *save = [(SwordVerseKey *)[self getKeyCopy] autorelease];
+
+    SwordVerseKey *key = [SwordVerseKey verseKeyWithVersification:[self versification]];
+    [key setHeadings:YES];
+    [key setAutoNormalize:NO];
+    [key setTestament:[aBook testament]];
+    [key setBook:[aBook numberInTestament]];
+    [key setChapter:chapter];
+    [key setVerse:0];
+    [self setSwordKey:key];
+    ret = [self renderedText];
+    
+    // restore old key
+    [self setSwordKey:save];
+
+    return ret;    
+}
+
+- (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType {
+    SwordBibleTextEntry *ret = nil;
+    
+    if(aKey) {
+        [moduleLock lock];
+        [self setSwordKey:aKey];
+        if(![self error]) {
+            NSString *txt;
+            if(aType == TextTypeRendered) {
+                txt = [self renderedText];
+            } else {
+                txt = [self strippedText];
+            }
+            
+            if(txt) {
+                ret = [SwordBibleTextEntry textEntryForKey:[aKey keyText] andText:txt];
+            } else {
+                ALog(@"nil key");
+            }
+
+            if([swManager globalOption:SW_OPTION_HEADINGS] && [self hasFeature:SWMOD_FEATURE_HEADINGS]) {
+                NSString *preverseHeading = [self entryAttributeValuePreverse];
+                if(preverseHeading && [preverseHeading length] > 0) {
+                    [ret setPreVerseHeading:preverseHeading];
+                }
+            }        
+        }
+        [moduleLock unlock];
+    }
+    
+    return ret;
+}
+
+- (NSString *)versification {
+    NSString *versification = [configEntries objectForKey:SWMOD_CONFENTRY_VERSIFICATION];
+    if(versification == nil) {
+        versification = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_VERSIFICATION];
+        if(versification != nil) {
+            [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION];
+        }
+    }
+    
+    // if still nil, use KJV versification
+    if(versification == nil) {
+        versification = @"KJV";
+        [configEntries setObject:versification forKey:SWMOD_CONFENTRY_VERSIFICATION];
+    }
+    
+    return versification;    
+}
+
+#pragma mark - SwordModuleAccess
+
+- (SwordKey *)createKey {
+    sword::VerseKey *vk = (sword::VerseKey *)swModule->CreateKey();
+    SwordVerseKey *newKey = [SwordVerseKey verseKeyWithSWVerseKey:vk makeCopy:YES];
+    delete vk;
+    
+    return newKey;
+}
+
+- (SwordKey *)getKey {
+    return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)swModule->getKey()];
+}
+
+- (SwordKey *)getKeyCopy {
+    return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)swModule->getKey() makeCopy:YES];
+}
+
+- (long)entryCount {
+    swModule->setPosition(sword::TOP);
+    long verseLowIndex = swModule->Index();
+    swModule->setPosition(sword::BOTTOM);
+    long verseHighIndex = swModule->Index();
+    
+    return verseHighIndex - verseLowIndex;
+}
+
+- (NSArray *)strippedTextEntriesForRef:(NSString *)reference {
+    return [self strippedTextEntriesForRef:reference context:0];
+}
+
+- (NSArray *)strippedTextEntriesForRef:(NSString *)reference context:(int)context {
+    return [self textEntriesForReference:reference context:context textType:TextTypeStripped];
+}
+
+- (NSArray *)renderedTextEntriesForRef:(NSString *)reference {
+    return [self renderedTextEntriesForRef:reference context:0];
+}
+
+- (NSArray *)renderedTextEntriesForRef:(NSString *)reference context:(int)context {
+    return [self textEntriesForReference:reference context:context textType:TextTypeRendered];
+}
+
+- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType {
+    return [self textEntriesForReference:aReference context:0 textType:textType];
+}
+
+- (NSArray *)textEntriesForReference:(NSString *)aReference context:(int)context textType:(TextPullType)textType {
+    NSMutableArray *ret = [NSMutableArray array];
+    
+    SwordListKey *lk = [SwordListKey listKeyWithRef:aReference v11n:[self versification]];
+    [lk setPosition:SWPOS_TOP];
+    [lk setPersist:NO];
+    SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:[lk keyText] v11n:[self versification]];
+    while(![lk error]) {
+        // set current key to vk
+        [vk setKeyText:[lk keyText]];
+        if(context != 0) {
+            long lowVerse = [vk verse] - context;
+            long highVerse = lowVerse + (context * 2);
+            for(;lowVerse <= highVerse;lowVerse++) {
+                [vk setVerse:lowVerse];
+                SwordBibleTextEntry *entry = (SwordBibleTextEntry *) [self textEntryForKey:vk textType:textType];
+                if(entry) {
+                    [ret addObject:entry];
+                }
+                [vk increment];
+            }
+        } else {
+            SwordBibleTextEntry *entry = (SwordBibleTextEntry *) [self textEntryForKey:vk textType:textType];
+            if(entry) {
+                [ret addObject:entry];
+            }            
+        }
+        [lk increment];
+    }
+    
+    return ret;    
+}
+
+- (void)writeEntry:(SwordModuleTextEntry *)anEntry {
+	
+    const char *data = [[anEntry text] UTF8String];
+    int dLen = strlen(data);
+
+	[moduleLock lock];
+    [self setKeyString:[anEntry key]];
+    if(![self error]) {
+        swModule->setEntry(data, dLen);	// save text to module at current position    
+    } else {
+        ALog(@"error at positioning module!");
+    }
+	[moduleLock unlock];
+}
+
+@end
diff --git a/bindings/objc/src/SwordBibleBook.h b/bindings/objc/src/SwordBibleBook.h
new file mode 100644
index 0000000..af48bb4
--- /dev/null
+++ b/bindings/objc/src/SwordBibleBook.h
@@ -0,0 +1,51 @@
+//
+//  SwordBibleBook.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 18.02.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <versificationmgr.h>
+#include <versekey.h>
+#include <localemgr.h>
+class sword::VersificationMgr::Book;
+#endif
+
+@interface SwordBibleBook : NSObject {
+#ifdef __cplusplus
+    sword::VersificationMgr::Book *swBook;
+#endif
+    
+    NSString *localizedName;
+    int number;
+    char numberInTestament;
+    char testament;
+    NSArray *chapters;
+}
+
+@property (readwrite) int number;
+@property (readwrite) char numberInTestament;
+@property (readwrite) char testament;
+@property (retain, readwrite) NSString *localizedName;
+@property (retain, readwrite) NSArray *chapters;
+
+#ifdef __cplusplus
+- (id)initWithBook:(sword::VersificationMgr::Book *)aBook;
+- (sword::VersificationMgr::Book *)book;
+#endif
+
+- (NSString *)name;
+- (NSString *)osisName;
+- (int)numberOfChapters;
+- (int)numberOfVersesForChapter:(int)chapter;
+/**
+ get book index for verseKey
+ that is: book number + testament * 100
+ */
+- (int)generatedIndex;
+
+@end
diff --git a/bindings/objc/src/SwordBibleBook.mm b/bindings/objc/src/SwordBibleBook.mm
new file mode 100644
index 0000000..eeb956b
--- /dev/null
+++ b/bindings/objc/src/SwordBibleBook.mm
@@ -0,0 +1,112 @@
+//
+//  SwordBibleBook.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 18.02.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordBibleBook.h"
+#import "SwordBibleChapter.h"
+
+
+@implementation SwordBibleBook
+
+@synthesize number;
+@synthesize numberInTestament;
+@synthesize testament;
+@synthesize localizedName;
+@dynamic chapters;
+
+- (id)init {
+    self = [super init];
+    if(self) {
+        self.number = 0;
+        self.numberInTestament = 0;
+        self.testament = 0;        
+        self.localizedName = @"";
+        self.chapters = nil;
+    }
+    
+    return self;
+}
+
+- (id)initWithBook:(sword::VersificationMgr::Book *)aBook {
+    self = [self init];
+    if(self) {
+        swBook = aBook;
+        
+        sword::VerseKey vk = sword::VerseKey(aBook->getOSISName());
+        [self setTestament:vk.Testament()];
+        [self setNumberInTestament:vk.Book()];
+        
+        // get system localeMgr to be able to translate the english bookName
+        sword::LocaleMgr *lmgr = sword::LocaleMgr::getSystemLocaleMgr();
+        self.localizedName = [NSString stringWithUTF8String:lmgr->translate(swBook->getLongName())];        
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [self setLocalizedName:nil];
+    [self setChapters:nil];
+    
+    [super dealloc];
+}
+
+- (NSString *)name {
+    return [NSString stringWithUTF8String:swBook->getLongName()];
+}
+
+- (NSString *)osisName {
+    return [NSString stringWithUTF8String:swBook->getOSISName()];
+}
+
+- (int)numberOfChapters {
+    return swBook->getChapterMax();
+}
+
+- (int)numberOfVersesForChapter:(int)chapter {
+    return swBook->getVerseMax(chapter);
+}
+
+- (void)setChapters:(NSArray *)anArray {
+    [anArray retain];
+    [chapters release];
+    chapters = anArray;
+}
+
+- (NSArray *)chapters {
+    if(chapters == nil) {
+        NSMutableArray *temp = [NSMutableArray array];
+        for(int i = 0;i < swBook->getChapterMax();i++) {
+            [temp addObject:[[[SwordBibleChapter alloc] initWithBook:self andChapter:i+1] autorelease]];
+        }
+        [self setChapters:[NSArray arrayWithArray:temp]];
+    }
+    return chapters;
+}
+
+/**
+ get book index for verseKey
+ that is: book number + testament * 100
+ */
+- (int)generatedIndex {
+    return number + testament * 100;
+}
+
+- (sword::VersificationMgr::Book *)book {
+    return swBook;
+}
+
+/** we implement this for sorting */
+- (NSComparisonResult)compare:(SwordBibleBook *)b {
+    return [[NSNumber numberWithInt:number] compare:[NSNumber numberWithInt:[b number]]];
+}
+
+@end
diff --git a/bindings/objc/src/SwordBibleChapter.h b/bindings/objc/src/SwordBibleChapter.h
new file mode 100644
index 0000000..11e4cff
--- /dev/null
+++ b/bindings/objc/src/SwordBibleChapter.h
@@ -0,0 +1,24 @@
+//
+//  SwordBibleChapter.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 19.02.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class SwordBibleBook;
+
+@interface SwordBibleChapter : NSObject {
+    /** the back reference */
+    SwordBibleBook *book;
+    int number;
+}
+
+@property (readwrite) int number;
+@property (readwrite, assign) SwordBibleBook *book;
+
+- (id)initWithBook:(SwordBibleBook *)aBook andChapter:(int)aNumber;
+
+@end
diff --git a/bindings/objc/src/SwordBibleChapter.m b/bindings/objc/src/SwordBibleChapter.m
new file mode 100644
index 0000000..8855227
--- /dev/null
+++ b/bindings/objc/src/SwordBibleChapter.m
@@ -0,0 +1,35 @@
+//
+//  SwordBibleChapter.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 19.02.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordBibleChapter.h"
+
+
+@implementation SwordBibleChapter
+
+@synthesize book;
+@synthesize number;
+
+- (id)initWithBook:(SwordBibleBook *)aBook andChapter:(int)aNumber {
+    self = [super init];
+    if(self) {
+        self.book = aBook;
+        self.number = aNumber;
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+@end
diff --git a/bindings/objc/src/SwordBibleTextEntry.h b/bindings/objc/src/SwordBibleTextEntry.h
new file mode 100644
index 0000000..42969cd
--- /dev/null
+++ b/bindings/objc/src/SwordBibleTextEntry.h
@@ -0,0 +1,21 @@
+//
+//  SwordBibleTextEntry.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 01.02.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SwordModuleTextEntry.h"
+
+@interface SwordBibleTextEntry : SwordModuleTextEntry {
+    NSString *preVerseHeading;
+}
+
+@property (readwrite, retain) NSString *preVerseHeading;
+
++ (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText;
+- (id)initWithKey:(NSString *)aKey andText:(NSString *)aText;
+
+@end
diff --git a/bindings/objc/src/SwordBibleTextEntry.m b/bindings/objc/src/SwordBibleTextEntry.m
new file mode 100644
index 0000000..115a33c
--- /dev/null
+++ b/bindings/objc/src/SwordBibleTextEntry.m
@@ -0,0 +1,38 @@
+//
+//  SwordBibleTextEntry.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 01.02.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import "SwordBibleTextEntry.h"
+
+@implementation SwordBibleTextEntry
+
+@synthesize preVerseHeading;
+
++ (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText {
+    return [[[SwordBibleTextEntry alloc] initWithKey:aKey andText:aText] autorelease];
+}
+
+- (id)initWithKey:(NSString *)aKey andText:(NSString *)aText {
+    self = [super init];
+    if(self) {
+        self.key = aKey;
+        self.text = aText;
+    }    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [self setPreVerseHeading:nil];
+    
+    [super dealloc];
+}
+
+@end
diff --git a/bindings/objc/src/SwordBook.h b/bindings/objc/src/SwordBook.h
new file mode 100644
index 0000000..b0c520a
--- /dev/null
+++ b/bindings/objc/src/SwordBook.h
@@ -0,0 +1,39 @@
+/*	SwordBook.h - Sword API wrapper for GenBooks.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <Foundation/Foundation.h>
+#import "SwordModule.h"
+
+#ifdef __cplusplus
+#include <treekeyidx.h>
+#endif
+
+#define GenBookRootKey @"root"
+
+@class SwordModule, SwordManager, SwordModuleTreeEntry;
+
+@interface SwordBook : SwordModule {
+	NSMutableDictionary *contents;
+}
+
+@property(readwrite, retain) NSMutableDictionary *contents;
+
+/**
+ return the tree content for the given treeKey
+ the treeKey has to be already loaded
+ @param[in]: treeKey that we should look for, nil for root
+ @return: SwordTreeEntry
+ */
+- (SwordModuleTreeEntry *)treeEntryForKey:(NSString *)treeKey;
+
+@end
diff --git a/bindings/objc/src/SwordBook.mm b/bindings/objc/src/SwordBook.mm
new file mode 100644
index 0000000..bcee1e4
--- /dev/null
+++ b/bindings/objc/src/SwordBook.mm
@@ -0,0 +1,152 @@
+/*	SwordBook.mm - Sword API wrapper for GenBooks.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import "SwordBook.h"
+#import "SwordModuleTreeEntry.h"
+
+@interface SwordBook ()
+
+- (SwordModuleTreeEntry *)_treeEntryForKey:(sword::TreeKeyIdx *)treeKey;
+
+@end
+
+@implementation SwordBook
+
+@synthesize contents;
+
+- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager {
+	self = [super initWithName:aName swordManager:aManager];
+    if(self) {
+        [self setContents:[NSMutableDictionary dictionary]];
+    }
+                         
+	return self;
+}
+
+- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager {
+    self = [super initWithSWModule:aModule swordManager:aManager];
+    if(self) {
+        [self setContents:[NSMutableDictionary dictionary]];
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [self setContents:nil];
+    
+    [super dealloc];
+}
+
+- (SwordModuleTreeEntry *)treeEntryForKey:(NSString *)treeKey {
+    SwordModuleTreeEntry * ret;
+    
+    [moduleLock lock];
+    if(treeKey == nil) {
+        ret = [contents objectForKey:@"root"];
+        if(ret == nil) {
+            sword::TreeKeyIdx *tk = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey *)*(swModule));
+            ret = [self _treeEntryForKey:tk];
+            // add to content
+            [contents setObject:ret forKey:@"root"];
+        }
+    } else {
+        ret = [contents objectForKey:treeKey];
+        if(ret == nil) {
+            const char *keyStr = [treeKey UTF8String];
+            if(![self isUnicode]) {
+                keyStr = [treeKey cStringUsingEncoding:NSISOLatin1StringEncoding];
+            }
+            // position module
+            sword::SWKey *mkey = new sword::SWKey(keyStr);
+            swModule->setKey(mkey);
+            sword::TreeKeyIdx *key = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey *)*(swModule));
+            ret = [self _treeEntryForKey:key];
+            // add to content
+            [contents setObject:ret forKey:treeKey];
+        }
+    }
+    [moduleLock unlock];
+    
+    return ret;
+}
+
+- (SwordModuleTreeEntry *)_treeEntryForKey:(sword::TreeKeyIdx *)treeKey {
+    SwordModuleTreeEntry *ret = [[[SwordModuleTreeEntry alloc] init] autorelease];
+    
+	char *treeNodeName = (char *)treeKey->getText();
+	NSString *nName;
+    
+    if(strlen(treeNodeName) == 0) {
+        nName = @"root";
+    } else {    
+        // key encoding depends on module encoding
+        nName = [NSString stringWithUTF8String:treeNodeName];
+        if(!nName) {
+            nName = [NSString stringWithCString:treeNodeName encoding:NSISOLatin1StringEncoding];
+        }
+    }
+    // set name
+    [ret setKey:nName];
+    NSMutableArray *c = [NSMutableArray array];
+    [ret setContent:c];
+	
+    // if this node has children, walk them
+	if(treeKey->hasChildren()) {
+        // get first child
+		treeKey->firstChild();
+        do {
+            NSString *subName;
+            // key encoding depends on module encoding
+            const char *textStr = treeKey->getText();
+            subName = [NSString stringWithUTF8String:textStr];
+            if(!subName) {
+                subName = [NSString stringWithCString:textStr encoding:NSISOLatin1StringEncoding];
+            }
+            if(subName) {
+                [c addObject:subName];
+            }
+        }
+        while(treeKey->nextSibling());            
+	}
+	
+	return ret;
+}
+
+- (void)testLoop {
+    SwordModuleTreeEntry *entry = [self treeEntryForKey:nil];
+    if([[entry content] count] > 0) {
+        for(NSString *subKey in [entry content]) {
+            entry = [self treeEntryForKey:subKey];
+            if([[entry content] count] > 0) {
+            } else {
+                DLog(@"Entry: %@", [entry key]);
+            }    
+        }
+    } else {
+        DLog(@"Entry: %@", [entry key]);
+    }    
+}
+
+#pragma mark - SwordModuleAccess
+
+- (long)entryCount {
+    // TODO: set value according to maximum entries here
+    return 1000;
+}
+
+@end
diff --git a/bindings/objc/src/SwordCommentary.h b/bindings/objc/src/SwordCommentary.h
new file mode 100644
index 0000000..feaf619
--- /dev/null
+++ b/bindings/objc/src/SwordCommentary.h
@@ -0,0 +1,35 @@
+/*	SwordCommentary.h - Sword API wrapper for Commentaries.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <Foundation/Foundation.h>
+#import <ObjCSword/ObjCSword.h>
+
+#ifdef __cplusplus
+#include <rawfiles.h>
+class sword::RawFiles;
+class sword::SWConfig;
+#endif
+
+
+
+@interface SwordCommentary : SwordBible {
+}
+
+/** 
+ creates a new empty editable commentary module 
+ caller has to make sure the module doesn't exist yet
+ @return path of the created module
+ */
++ (NSString *)createCommentaryWithName:(NSString *)aName;
+
+@end
diff --git a/bindings/objc/src/SwordCommentary.mm b/bindings/objc/src/SwordCommentary.mm
new file mode 100644
index 0000000..3b81738
--- /dev/null
+++ b/bindings/objc/src/SwordCommentary.mm
@@ -0,0 +1,80 @@
+/*	SwordCommentary.mm - Sword API wrapper for Commentaries.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import "SwordCommentary.h"
+
+@implementation SwordCommentary
+
+/** 
+ creates a new empty editable commentary module 
+ caller has to make sure the module doesn't exist yet
+ @return path of the created module
+ */
++ (NSString *)createCommentaryWithName:(NSString *)aName {
+    NSString *ret = nil;
+    
+    // let's create the directory for storing our module
+    NSFileManager *fm = [NSFileManager defaultManager];
+    
+    // modulePath
+    NSString *modPath = [[[Configuration config] defaultModulePath] stringByAppendingFormat:@"/%@.swd", aName];
+    if([fm fileExistsAtPath:modPath]) {
+        ALog(@"path exists already for mod: %@", aName);
+    } else {
+        ret = modPath;
+        
+        // create folder
+        [fm createDirectoryAtPath:modPath withIntermediateDirectories:NO attributes:nil error:NULL];
+        
+        // create mods.d folder
+        NSString *modsdPath = [modPath stringByAppendingPathComponent:@"mods.d"];
+        [fm createDirectoryAtPath:modsdPath withIntermediateDirectories:NO attributes:nil error:NULL];
+        // create module folder
+        NSString *dataPath = [modPath stringByAppendingPathComponent:@"modules"];
+        [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL];
+        dataPath = [dataPath stringByAppendingPathComponent:@"comments"];
+        [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL];
+        dataPath = [dataPath stringByAppendingPathComponent:@"rawfiles"];
+        [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL];
+        dataPath = [dataPath stringByAppendingPathComponent:aName];
+        [fm createDirectoryAtPath:dataPath withIntermediateDirectories:NO attributes:nil error:NULL];
+        
+        // let's create a brand new empty module
+        sword::RawFiles::createModule([dataPath UTF8String]);
+        // let's add our .conf file
+        sword::SWConfig newConf([[modsdPath stringByAppendingFormat:@"/%@.conf", aName] UTF8String]);
+        const char *aNameCStr = [aName UTF8String];
+        newConf[aNameCStr]["DataPath"] = [[NSString stringWithFormat:@"./modules/comments/rawfiles/%@", aName] UTF8String];
+        newConf[aNameCStr]["ModDrv"] = "RawFiles";
+        newConf[aNameCStr]["SourceType"] = "ThML";
+        newConf[aNameCStr]["Editable"] = "YES";
+        newConf[aNameCStr]["About"] = "This module allows you to store your own commentary.";
+        newConf.Save();
+    }
+    
+    return ret;
+}
+
+- (id)init {
+    return [super init];
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+@end
diff --git a/bindings/objc/src/SwordDictionary.h b/bindings/objc/src/SwordDictionary.h
new file mode 100644
index 0000000..6fea741
--- /dev/null
+++ b/bindings/objc/src/SwordDictionary.h
@@ -0,0 +1,26 @@
+/*	SwordDict.h - Sword API wrapper for lexicons and Dictionaries.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <Foundation/Foundation.h>
+
+@class SwordManager, SwordModule;
+
+@interface SwordDictionary : SwordModule {
+    /** only keys are buffered here */
+	NSMutableArray *keys;
+}
+
+- (NSArray *)allKeys;
+- (NSString *)entryForKey:(NSString *)aKey;
+
+@end
diff --git a/bindings/objc/src/SwordDictionary.mm b/bindings/objc/src/SwordDictionary.mm
new file mode 100644
index 0000000..4924d00
--- /dev/null
+++ b/bindings/objc/src/SwordDictionary.mm
@@ -0,0 +1,183 @@
+/*	SwordDict.mm - Sword API wrapper for lexicons and Dictionaries.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <ObjCSword/ObjCSword.h>
+
+@interface SwordDictionary (/* Private, class continuation */)
+/** private property */
+@property(readwrite, retain) NSMutableArray *keys;
+@end
+
+@interface SwordDictionary (PrivateAPI)
+
+- (void)readKeys;
+- (void)readFromCache;
+- (void)writeToCache;
+
+@end
+
+@implementation SwordDictionary (PrivateAPI)
+
+/**
+ only the keys are stored here in an array
+ */
+- (void)readKeys {    
+	if(keys == nil) {
+        [self readFromCache];
+    }
+    
+    // still no entries?
+	if([keys count] == 0) {
+        NSMutableArray *arr = [NSMutableArray array];
+
+        [moduleLock lock];
+        
+        swModule->setSkipConsecutiveLinks(true);
+        *swModule = sword::TOP;
+        swModule->getRawEntry();        
+        while(![self error]) {
+            char *cStrKeyText = (char *)swModule->KeyText();
+            if(cStrKeyText) {
+                NSString *keyText = [NSString stringWithUTF8String:cStrKeyText];
+                if(!keyText) {
+                    keyText = [NSString stringWithCString:swModule->KeyText() encoding:NSISOLatin1StringEncoding];
+                    if(!keyText) {
+                        ALog(@"Unable to create NSString instance from string: %s", cStrKeyText);
+                    }
+                }
+                
+                if(keyText) {
+                    [arr addObject:[keyText capitalizedString]];
+                }
+            } else {
+                ALog(@"Could not get keytext from sword module!");                
+            }
+            
+            (*swModule)++;
+        }
+
+        [moduleLock unlock];
+        
+        self.keys = arr;        
+        [self writeToCache];
+    }
+}
+
+- (void)readFromCache {
+	//open cached file
+    NSString *cachePath = [[[Configuration config] defaultAppSupportPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"cache-%@", [self name]]];
+	NSMutableArray *data = [NSMutableArray arrayWithContentsOfFile:cachePath];
+    if(data != nil) {
+        self.keys = data;
+    } else {
+        self.keys = [NSMutableArray array];
+    }
+}
+
+- (void)writeToCache {
+	// save cached file
+    NSString *cachePath = [[[Configuration config] defaultAppSupportPath] stringByAppendingPathComponent:[NSString stringWithFormat:@"cache-%@", [self name]]];
+	[keys writeToFile:cachePath atomically:NO];
+}
+
+@end
+
+@implementation SwordDictionary
+
+@synthesize keys;
+
+- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager {    
+	self = [super initWithName:aName swordManager:aManager];
+    if(self) {
+        self.keys = nil;
+    }
+    	
+	return self;
+}
+
+/** init with given SWModule */
+- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager {
+    self = [super initWithSWModule:aModule swordManager:aManager];
+    if(self) {
+        self.keys = nil;
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+	[super finalize];
+}
+
+- (void)dealloc {
+    [self setKeys:nil];
+    
+    [super dealloc];
+}
+
+- (NSArray *)allKeys {
+    NSArray *ret = self.keys;
+    if(ret == nil) {
+        [self readKeys];
+        ret = self.keys;
+    }
+	return ret;    
+}
+
+/**
+ returns stripped text for key.
+ nil if the key does not exist.
+ */
+- (NSString *)entryForKey:(NSString *)aKey {
+    NSString *ret = nil;
+    
+	[moduleLock lock];	
+    [self setKeyString:aKey];    
+	if([self error]) {
+        ALog(@"Error on setting key!");
+    } else {
+        ret = [self strippedText];
+    }
+	[moduleLock unlock];
+	
+	return ret;
+}
+
+- (id)attributeValueForParsedLinkData:(NSDictionary *)data {
+    return [self attributeValueForParsedLinkData:data withTextRenderType:TextTypeStripped];
+}
+
+- (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType {
+    id ret = nil;
+    
+    NSString *attrType = [data objectForKey:ATTRTYPE_TYPE];
+    if([attrType isEqualToString:@"scriptRef"] || 
+       [attrType isEqualToString:@"scripRef"] ||
+       [attrType isEqualToString:@"Greek"] ||
+       [attrType isEqualToString:@"Hebrew"] ||
+       [attrType hasPrefix:@"strongMorph"] || [attrType hasPrefix:@"robinson"]) {
+        NSString *key = [data objectForKey:ATTRTYPE_VALUE];
+        ret = [self strippedTextEntriesForRef:key];
+    }
+    
+    return ret;
+}
+
+#pragma mark - SwordModuleAccess
+
+
+- (long)entryCount {
+    return [[self allKeys] count];    
+}
+
+@end
diff --git a/bindings/objc/src/SwordFilter.h b/bindings/objc/src/SwordFilter.h
new file mode 100644
index 0000000..590c550
--- /dev/null
+++ b/bindings/objc/src/SwordFilter.h
@@ -0,0 +1,61 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+// To change the template use AppCode | Preferences | File Templates.
+//
+
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <swfilter.h>
+#endif
+
+@interface SwordFilter : NSObject
+
+#ifdef __cplusplus
+- (id)initWithSWFilter:(sword::SWFilter *)swFilter;
+- (sword::SWFilter *)swFilter;
+#endif
+
+@end
+
+@interface SwordOsisHtmlRefFilter : SwordFilter
++ (SwordOsisHtmlRefFilter *)filter;
+@end
+
+@interface SwordOsisPlainFilter : SwordFilter
++ (SwordOsisPlainFilter *)filter;
+@end
+
+@interface SwordOsisXHtmlFilter : SwordFilter
++ (SwordOsisXHtmlFilter *)filter;
+@end
+
+@interface SwordThmlHtmlFilter : SwordFilter
++ (SwordThmlHtmlFilter *)filter;
+@end
+
+@interface SwordThmlPlainFilter : SwordFilter
++ (SwordThmlPlainFilter *)filter;
+@end
+
+@interface SwordGbfHtmlFilter : SwordFilter
++ (SwordGbfHtmlFilter *)filter;
+@end
+
+@interface SwordGbfPlainFilter : SwordFilter
++ (SwordGbfPlainFilter *)filter;
+@end
+
+@interface SwordTeiHtmlFilter : SwordFilter
++ (SwordTeiHtmlFilter *)filter;
+@end
+
+@interface SwordTeiXHtmlFilter : SwordFilter
++ (SwordTeiXHtmlFilter *)filter;
+@end
+
+@interface SwordTeiPlainFilter : SwordFilter
++ (SwordTeiPlainFilter *)filter;
+@end
diff --git a/bindings/objc/src/SwordFilter.mm b/bindings/objc/src/SwordFilter.mm
new file mode 100644
index 0000000..7d609bc
--- /dev/null
+++ b/bindings/objc/src/SwordFilter.mm
@@ -0,0 +1,142 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+// To change the template use AppCode | Preferences | File Templates.
+//
+
+
+#import "SwordFilter.h"
+#import "osishtmlhref.h"
+#import "osisplain.h"
+#import "osisxhtml.h"
+#import "thmlhtmlhref.h"
+#import "thmlplain.h"
+#import "gbfhtmlhref.h"
+#import "gbfplain.h"
+#import "teihtmlhref.h"
+#import "teixhtml.h"
+#import "teiplain.h"
+
+@implementation SwordFilter {
+    sword::SWFilter *swFilter;
+}
+
+- (id)initWithSWFilter:(sword::SWFilter *)swFilter1 {
+    self = [super init];
+    if (self) {
+        swFilter = swFilter1;
+    }
+
+    return self;
+}
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+- (sword::SWFilter *)swFilter {
+    return swFilter;
+}
+
+@end
+
+@implementation SwordOsisHtmlRefFilter
++ (SwordOsisHtmlRefFilter *)filter {
+    return [[[SwordOsisHtmlRefFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::OSISHTMLHREF()];
+}
+@end
+
+@implementation SwordOsisXHtmlFilter
++ (SwordOsisXHtmlFilter *)filter {
+    return [[[SwordOsisXHtmlFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::OSISXHTML()];
+}
+@end
+
+@implementation SwordOsisPlainFilter
++ (SwordOsisPlainFilter *)filter {
+    return [[[SwordOsisPlainFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::OSISPlain()];
+}
+@end
+
+@implementation SwordThmlHtmlFilter
++ (SwordThmlHtmlFilter *)filter {
+    return [[[SwordThmlHtmlFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::ThMLHTMLHREF()];
+}
+@end
+
+@implementation SwordThmlPlainFilter
++ (SwordThmlPlainFilter *)filter {
+    return [[[SwordThmlPlainFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::ThMLPlain()];
+}
+@end
+
+@implementation SwordGbfHtmlFilter
++ (SwordGbfHtmlFilter *)filter {
+    return [[[SwordGbfHtmlFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::ThMLHTMLHREF()];
+}
+@end
+
+@implementation SwordGbfPlainFilter
++ (SwordGbfPlainFilter *)filter {
+    return [[[SwordGbfPlainFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::ThMLPlain()];
+}
+@end
+
+@implementation SwordTeiHtmlFilter
++ (SwordTeiHtmlFilter *)filter {
+    return [[[SwordTeiHtmlFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::TEIHTMLHREF()];
+}
+@end
+
+@implementation SwordTeiXHtmlFilter
++ (SwordTeiXHtmlFilter *)filter {
+    return [[[SwordTeiXHtmlFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::TEIXHTML()];
+}
+@end
+
+@implementation SwordTeiPlainFilter
++ (SwordTeiPlainFilter *)filter {
+    return [[[SwordTeiPlainFilter alloc] init] autorelease];
+}
+
+- (id)init {
+    return [super initWithSWFilter:new sword::TEIPlain()];
+}
+@end
+
diff --git a/bindings/objc/src/SwordInstallSource.h b/bindings/objc/src/SwordInstallSource.h
new file mode 100644
index 0000000..1b1bdf3
--- /dev/null
+++ b/bindings/objc/src/SwordInstallSource.h
@@ -0,0 +1,79 @@
+//
+//  SwordInstallSource.h
+//  Eloquent
+//
+//  Created by Manfred Bergmann on 13.08.07.
+//  Copyright 2007 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SwordModule.h"
+
+#ifdef __cplusplus
+#include <swmgr.h>
+#include <installmgr.h>
+class sword::SWModule;
+#endif
+
+@class SwordManager;
+@class SwordInstallSourceManager;
+
+#define INSTALLSOURCE_TYPE_FTP  @"FTP"
+
+@interface SwordInstallSource : NSObject {
+    
+#ifdef __cplusplus
+    sword::InstallSource *swInstallSource;
+#endif
+    
+    BOOL temporarySource;
+
+    /** the sword manager for this source */
+    SwordManager *swordManager;    
+}
+
+// init
+- (id)init;
+#ifdef __cplusplus
+- (id)initWithSource:(sword::InstallSource *)is;
+#endif
+- (id)initWithType:(NSString *)aType;
+
+// accessors
+- (NSString *)caption;
+- (void)setCaption:(NSString *)aCaption;
+- (NSString *)type;
+- (void)setType:(NSString *)aType;
+- (NSString *)source;
+- (void)setSource:(NSString *)aSource;
+- (NSString *)directory;
+- (void)setDirectory:(NSString *)aDir;
+
+- (BOOL)isLocalSource;
+
+// get config entry
+- (NSString *)configEntry;
+
+// install module
+- (void)installModuleWithName:(NSString *)mName 
+                 usingManager:(SwordManager *)swManager 
+        withInstallController:(SwordInstallSourceManager *)sim;
+
+/** List of available InstallSources */
+- (NSArray *)listModules;
+
+/** List of modules for given type */
+- (NSArray *)listModulesForType:(ModuleType)aType;
+
+/** list module types */
+- (NSArray *)listModuleTypes;
+
+/** Returns the SwordManager attached to this SwordInstallSourceController */
+- (SwordManager *)swordManager;
+- (void)setSwordManager:(SwordManager *)swManager;
+
+#ifdef __cplusplus
+- (sword::InstallSource *)installSource;
+#endif
+
+@end
diff --git a/bindings/objc/src/SwordInstallSource.mm b/bindings/objc/src/SwordInstallSource.mm
new file mode 100644
index 0000000..b1f71d3
--- /dev/null
+++ b/bindings/objc/src/SwordInstallSource.mm
@@ -0,0 +1,197 @@
+//
+//  SwordInstallSource.mm
+//  Eloquent
+//
+//  Created by Manfred Bergmann on 13.08.07.
+//  Copyright 2007 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordInstallSource.h"
+#import "SwordInstallSourceManager.h"
+#import "SwordManager.h"
+
+@interface SwordInstallSource ()
+
+@end
+
+@implementation SwordInstallSource
+
+// init
+- (id)init {
+    self = [super init];
+    if(self) {
+        temporarySource = NO;
+
+        // at first we have no sword manager
+        [self setSwordManager:nil];
+        
+        // init InstallMgr
+        swInstallSource = new sword::InstallSource("", "");
+        if(swInstallSource == nil) {
+            ALog(@"Could not init sword install source!");
+        }
+    }
+    
+    return self;
+}
+
+- (id)initWithType:(NSString *)aType {
+    self = [self init];
+    if(self) {
+        // set type
+        swInstallSource->type = [aType cStringUsingEncoding:NSUTF8StringEncoding];
+    }
+    
+    return self;
+}
+
+/** init with given source */
+- (id)initWithSource:(sword::InstallSource *)is {
+    self = [super init];
+    if(self) {
+        temporarySource = YES;
+        
+        // at first we have no sword manager
+        [self setSwordManager:nil];
+        
+        swInstallSource = is;
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    if(temporarySource == NO) {
+        //LogL(LOG_DEBUG, @"[SwordInstallSource -finalize] deleting swInstallSource");
+        //delete swInstallSource;
+    }
+    
+    [super finalize];
+}
+
+- (void)dealloc {
+    [swordManager release];
+    [super dealloc];
+}
+
+- (void)setSwordManager:(SwordManager *)swManager {
+    [swManager retain];
+    [swordManager release];
+    swordManager = swManager;
+}
+
+// accessors
+- (NSString *)caption {
+    const char *str = swInstallSource->caption;
+    return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease];
+}
+
+- (void)setCaption:(NSString *)aCaption {
+    swInstallSource->caption = [aCaption cStringUsingEncoding:NSUTF8StringEncoding];
+}
+
+- (NSString *)type {
+    const char *str = swInstallSource->type;
+    return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease];
+}
+
+- (void)setType:(NSString *)aType {
+    swInstallSource->type = [aType cStringUsingEncoding:NSUTF8StringEncoding];
+}
+
+- (NSString *)source {
+    const char *str = swInstallSource->source;
+    return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease];
+}
+
+- (void)setSource:(NSString *)aSource {
+    swInstallSource->source = [aSource cStringUsingEncoding:NSUTF8StringEncoding];
+}
+
+- (NSString *)directory {
+    const char *str = swInstallSource->directory;
+    return [[[NSString alloc] initWithCString:str encoding:NSUTF8StringEncoding] autorelease];
+}
+
+- (void)setDirectory:(NSString *)aDir {
+    swInstallSource->directory = [aDir cStringUsingEncoding:NSUTF8StringEncoding];
+}
+
+- (BOOL)isLocalSource {
+    return [[self source] isEqualToString:@"localhost"];
+}
+
+// get config entry
+- (NSString *)configEntry {
+    return [NSString stringWithFormat:@"%@|%@|%@", [self caption], [self source], [self directory]];
+}
+
+/** install module */
+- (void)installModuleWithName:(NSString *)mName usingManager:(SwordManager *)swManager withInstallController:(SwordInstallSourceManager *)sim {
+    sword::InstallMgr *im = [sim installMgr];
+    im->installModule([swManager swManager], 0, [mName UTF8String], swInstallSource);
+}
+
+/** list all modules of this source */
+- (NSArray *)listModules {
+    NSArray *ret = [NSArray array];
+    
+    SwordManager *sm = [self swordManager];
+    if(sm) {
+        ret = [sm listModules];
+    } else {
+        ALog(@"Have nil SwordManager");        
+    }
+    
+    return ret;
+}
+
+- (NSArray *)listModulesForType:(ModuleType)aType {
+    NSArray *ret = [NSArray array];
+
+    SwordManager *sm = [self swordManager];
+    if(sm) {
+        ret = [sm modulesForType:aType];
+    } else {
+        ALog(@"Have nil SwordManager");        
+    }    
+    
+    return ret;
+}
+
+/** list module types */
+- (NSArray *)listModuleTypes {
+    NSArray *ret = [SwordManager moduleTypes];
+    return ret;
+}
+
+// get associated SwordManager
+- (SwordManager *)swordManager {
+
+    if(swordManager == nil) {
+        // create SwordManager from the SWMgr of this source
+        sword::SWMgr *mgr;
+        if([[self source] isEqualToString:@"localhost"]) {
+            // create SwordManager from new SWMgr of path
+            mgr = new sword::SWMgr([[self directory] UTF8String], true, NULL, false, false);
+        } else {
+            // create SwordManager from the SWMgr of this source
+            mgr = swInstallSource->getMgr();    
+        }
+        
+        if(mgr == nil) {
+            ALog(@"Have a nil SWMgr!");
+        } else {
+            swordManager = [[SwordManager alloc] initWithSWMgr:mgr];    
+        }
+    }
+    
+    return swordManager;
+}
+
+/** low level API */
+- (sword::InstallSource *)installSource {
+    return swInstallSource;
+}
+
+@end
diff --git a/bindings/objc/src/SwordInstallSourceManager.h b/bindings/objc/src/SwordInstallSourceManager.h
new file mode 100755
index 0000000..ee22c48
--- /dev/null
+++ b/bindings/objc/src/SwordInstallSourceManager.h
@@ -0,0 +1,99 @@
+//
+//  SwordInstallManager.h
+//  Eloquent
+//
+//  Created by Manfred Bergmann on 13.08.07.
+//  Copyright 2007 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <swmgr.h>
+#include <installmgr.h>
+#include <swconfig.h>
+#include <multimapwdef.h>
+class sword::SWModule;
+class sword::InstallMgr;
+using sword::SWModule;
+using sword::InstallMgr;
+#endif
+
+@class SwordInstallSource;
+@class SwordModule;
+@class SwordManager;
+
+typedef enum _ModuleStatusConst {
+    ModStatOlder = 0x001,
+    ModStatSameVersion = 0x002,
+    ModStatUpdated = 0x004,
+    ModStatNew = 0x008,
+    ModStatCiphered = 0x010,
+    ModStatCipheredKeyPresent = 0x020
+}ModuleStatusConst;
+
+@interface SwordInstallSourceManager : NSObject {
+@private
+#ifdef __cplusplus
+    sword::InstallMgr *swInstallMgr;
+#endif
+
+    BOOL createPath;
+    
+    NSString *configPath;
+}
+
+// ------------------- getter / setter -------------------
+@property (retain, readwrite) NSString *configPath;
+@property (retain, readwrite) NSString *configFilePath;
+@property (retain, readwrite) NSMutableArray *installSourceList;
+/** Dictionary of InstallSources. Key: Caption */
+@property (retain, readwrite) NSMutableDictionary *installSources;
+
+// -------------------- methods --------------------
+
+// initialization
++ (SwordInstallSourceManager *)defaultController;
++ (SwordInstallSourceManager *)defaultControllerWithPath:(NSString *)aPath;
++ (SwordInstallSourceManager *)controllerWithPath:(NSString *)aPath;
+
+/**
+base path of the module installation
+ */
+- (id)init;
+- (id)initWithPath:(NSString *)aPath createPath:(BOOL)create;
+
+/** re-init after adding or removing new modules */
+- (void)reinitialize;
+
+// installation/unInstallation
+- (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager;
+- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager;
+
+// add/remove install sources
+- (void)addInstallSource:(SwordInstallSource *)is;
+- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit;
+- (void)removeInstallSource:(SwordInstallSource *)is;
+- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit;
+- (void)updateInstallSource:(SwordInstallSource *)is;
+- (int)refreshMasterRemoteInstallSourceList;
+
+// disclaimer
+- (BOOL)userDisclaimerConfirmed;
+- (void)setUserDisclaimerConfirmed:(BOOL)flag;
+
+// list modules in sources
+- (NSArray *)listModulesForSource:(SwordInstallSource *)is;
+
+// remote source list
+- (int)refreshInstallSource:(SwordInstallSource *)is;
+
+// get module status
+- (NSArray *)moduleStatusInInstallSource:(SwordInstallSource *)is baseManager:(SwordManager *)baseMgr;
+
+// low level access
+#ifdef __cplusplus
+- (sword::InstallMgr *)installMgr;
+#endif
+
+@end
diff --git a/bindings/objc/src/SwordInstallSourceManager.mm b/bindings/objc/src/SwordInstallSourceManager.mm
new file mode 100755
index 0000000..98d6cac
--- /dev/null
+++ b/bindings/objc/src/SwordInstallSourceManager.mm
@@ -0,0 +1,337 @@
+//
+//  SwordInstallManager.mm
+//  Eloquent
+//
+//  Created by Manfred Bergmann on 13.08.07.
+//  Copyright 2007 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordInstallSourceManager.h"
+#import "SwordInstallSource.h"
+#import "SwordManager.h"
+#import "ObjCSword_Prefix.pch"
+
+#ifdef __cplusplus
+typedef std::map<sword::SWBuf, sword::InstallSource *> InstallSourceMap;
+typedef sword::multimapwithdefault<sword::SWBuf, sword::SWBuf, std::less <sword::SWBuf> > ConfigEntMap;
+#endif
+
+#define INSTALLSOURCE_SECTION_TYPE_FTP  "FTPSource"
+#define INSTALLSOURCE_SECTION_TYPE_HTTP	"HTTPSource"
+
+@implementation SwordInstallSourceManager
+
+@dynamic configPath;
+
+// ------------------- getter / setter -------------------
+- (NSString *)configPath {
+    return configPath;
+}
+
+- (void)setConfigPath:(NSString *)value {
+    DLog(@"");
+    
+    if(configPath != value) {
+        [configPath release];
+        configPath = [value copy];
+        
+        if(value == nil) {
+            return;
+        }
+        
+        
+        // check for existence
+        NSFileManager *fm = [NSFileManager defaultManager];
+        BOOL isDir;
+        if(([fm fileExistsAtPath:configPath] == NO) && createPath == YES) {
+            // create path
+            [fm createDirectoryAtPath:configPath withIntermediateDirectories:NO attributes:nil error:NULL];
+        }
+        
+        if(([fm fileExistsAtPath:configPath isDirectory:&isDir] == YES) && (isDir)) {
+            // set configFilePath
+            [self setConfigFilePath:[configPath stringByAppendingPathComponent:@"InstallMgr.conf"]];
+            
+            // check config
+            if([fm fileExistsAtPath:self.configFilePath] == NO) {
+                // create config entry
+                sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]);
+                config["General"]["PassiveFTP"] = "true";
+                config.Save();
+
+                // create default Install source
+                SwordInstallSource *is = [[[SwordInstallSource alloc] initWithType:INSTALLSOURCE_TYPE_FTP] autorelease];
+                [is setCaption:@"CrossWire"];
+                [is setSource:@"ftp.crosswire.org"];
+                [is setDirectory:@"/pub/sword/raw"];
+                                    
+                // addInstallSource will reinitialize
+                [self addInstallSource:is withReinitialize:NO];
+                
+            }
+            // init installMgr
+            [self reinitialize];                
+
+            // sync with master install source list
+            //[self refreshMasterRemoteInstallSourceList];
+
+        } else {
+            ALog(@"Config path does not exist: %@", configPath);
+        }
+    }
+}
+
+// -------------------- methods --------------------
+
+// initialization
++ (SwordInstallSourceManager *)defaultController {
+    static SwordInstallSourceManager *singleton = nil;
+    if(singleton == nil) {
+        singleton = [[SwordInstallSourceManager alloc] init];
+    }
+    
+    return singleton;
+}
+
++ (SwordInstallSourceManager *)defaultControllerWithPath:(NSString *)aPath {
+    SwordInstallSourceManager *m = [SwordInstallSourceManager defaultController];
+    [m setConfigPath:aPath];
+    return m;
+}
+
++ (SwordInstallSourceManager *)controllerWithPath:(NSString *)aPath {
+    return [[[SwordInstallSourceManager alloc] initWithPath:aPath createPath:YES] autorelease];
+}
+
+/**
+base path of the module installation
+ */
+- (id)init {
+    self = [super init];
+    if(self) {
+        createPath = NO;
+        [self setConfigPath:nil];
+        [self setConfigFilePath:nil];
+        [self setInstallSources:[NSMutableDictionary dictionary]];
+        [self setInstallSourceList:[NSMutableArray array]];
+    }
+    
+    return self;
+}
+
+/**
+ initialize with given path
+ */
+- (id)initWithPath:(NSString *)aPath createPath:(BOOL)create {
+    self = [self init];
+    if(self) {
+        createPath = create;
+        [self setConfigPath:aPath];
+    }
+    
+    return self;
+}
+
+/** re-init after adding or removing new modules */
+- (void)reinitialize {
+    sword::SWConfig config([self.configFilePath UTF8String]);
+    config.Load();
+
+    // init installMgr
+    BOOL disclaimerConfirmed = NO;
+    if(swInstallMgr != nil) {
+        disclaimerConfirmed = [self userDisclaimerConfirmed];
+    }
+    swInstallMgr = new sword::InstallMgr([configPath UTF8String]);
+    if(swInstallMgr == nil) {
+        ALog(@"Could not initialize InstallMgr!");
+    } else {
+        [self setUserDisclaimerConfirmed:disclaimerConfirmed];
+        
+        // empty all lists
+        [self.installSources removeAllObjects];
+        [self.installSourceList removeAllObjects];
+        
+        // init install sources
+        for(InstallSourceMap::iterator it = swInstallMgr->sources.begin(); it != swInstallMgr->sources.end(); it++) {
+            sword::InstallSource *sis = it->second;
+            SwordInstallSource *is = [[[SwordInstallSource alloc] initWithSource:sis] autorelease];
+            
+            [self.installSources setObject:is forKey:[is caption]];
+            // also add to list
+            [self.installSourceList addObject:is];
+        }
+    }
+}
+
+- (void)finalize {
+    if(swInstallMgr != nil) {
+        delete swInstallMgr;
+    }
+
+    [super finalize];
+}
+
+- (void)dealloc {
+    if(swInstallMgr != nil) {
+        delete swInstallMgr;
+    }
+    
+    [self setConfigPath:nil];
+    [self setInstallSources:nil];
+    [self setInstallSourceList:nil];
+    [self setConfigFilePath:nil];
+    
+    [super dealloc];
+}
+
+- (void)addInstallSource:(SwordInstallSource *)is {
+    [self addInstallSource:is withReinitialize:YES];
+}
+
+// add/remove install sources
+- (void)addInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit {
+    
+    // save at once
+    sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]);
+	if([[is type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) {
+		config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[is configEntry] UTF8String]));
+	} else {
+		config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_HTTP, [[is configEntry] UTF8String]));
+	}
+    config.Save();
+    
+	if(reinit)
+		[self reinitialize];
+}
+
+- (void)removeInstallSource:(SwordInstallSource *)is {
+    [self removeInstallSource:is withReinitialize:NO];
+}
+
+- (void)removeInstallSource:(SwordInstallSource *)is withReinitialize:(BOOL)reinit {
+    
+    // remove source
+    [self.installSources removeObjectForKey:[is caption]];
+    [self.installSourceList removeObject:is];
+    
+    // save at once
+    sword::SWConfig config([self.configFilePath cStringUsingEncoding:NSUTF8StringEncoding]);
+    config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_HTTP);
+    config["Sources"].erase(INSTALLSOURCE_SECTION_TYPE_FTP);
+    
+    // build up new
+    for(SwordInstallSource *sis in self.installSources) {
+		if([[sis type] isEqualToString:INSTALLSOURCE_TYPE_FTP]) {
+			config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_FTP, [[sis configEntry] UTF8String]));
+		} else {
+			config["Sources"].insert(ConfigEntMap::value_type(INSTALLSOURCE_SECTION_TYPE_HTTP, [[sis configEntry] UTF8String]));
+		}
+    }
+    config.Save();
+    
+	if(reinit)
+		[self reinitialize];
+}
+
+- (void)updateInstallSource:(SwordInstallSource *)is {
+    // first remove, then add again
+    [self removeInstallSource:is withReinitialize:NO];
+    [self addInstallSource:is];
+}
+
+// installation/unInstallation
+- (int)installModule:(SwordModule *)aModule fromSource:(SwordInstallSource *)is withManager:(SwordManager *)manager {
+    
+    int stat;
+    if([[is source] isEqualToString:@"localhost"]) {
+        stat = swInstallMgr->installModule([manager swManager], [[is directory] UTF8String], [[aModule name] UTF8String]);
+    } else {
+        stat = swInstallMgr->installModule([manager swManager], 0, [[aModule name] UTF8String], [is installSource]);
+    }
+    
+    return stat;
+}
+
+- (int)refreshMasterRemoteInstallSourceList {
+    int stat = swInstallMgr->refreshRemoteSourceConfiguration();
+    if(stat) {
+        ALog(@"Unable to refresh with master install source!");
+    }
+    
+    return stat;
+}
+
+/**
+ uninstalls a module from a SwordManager
+ */
+- (int)uninstallModule:(SwordModule *)aModule fromManager:(SwordManager *)swManager {
+    int stat = swInstallMgr->removeModule([swManager swManager], [[aModule name] UTF8String]);
+    
+    return stat;
+}
+
+// list modules in sources
+- (NSArray *)listModulesForSource:(SwordInstallSource *)is {
+    return [is listModules];
+}
+
+/** refresh modules of this source 
+ refreshing the install source is necessary before installation of 
+ */
+- (int)refreshInstallSource:(SwordInstallSource *)is {
+    int ret = 1;
+    
+    if(is == nil) {
+        ALog(@"Install source is nil");
+    } else {
+        if([[is source] isEqualToString:@"localhost"] == NO) {
+            ret = swInstallMgr->refreshRemoteSource([is installSource]);
+        }
+    }
+    
+    return ret;
+}
+
+/**
+ returns an array of Modules with status set, nil on error
+ */
+- (NSArray *)moduleStatusInInstallSource:(SwordInstallSource *)is baseManager:(SwordManager *)baseMgr {
+    
+    NSArray *ret = nil;
+    
+    // get modules map
+    NSMutableArray *ar = [NSMutableArray array];
+    std::map<sword::SWModule *, int> modStats = swInstallMgr->getModuleStatus(*[baseMgr swManager], *[[is swordManager] swManager]);
+    sword::SWModule *module;
+	int status;
+	for(std::map<sword::SWModule *, int>::iterator it = modStats.begin(); it != modStats.end(); it++) {
+		module = it->first;
+		status = it->second;
+        
+        SwordModule *mod = [[[SwordModule alloc] initWithSWModule:module] autorelease];
+        [mod setStatus:status];
+        [ar addObject:mod];
+	}
+    
+    if(ar) {
+        ret = [NSArray arrayWithArray:ar];
+    }
+    
+    return ret;
+}
+
+- (BOOL)userDisclaimerConfirmed {
+    return swInstallMgr->isUserDisclaimerConfirmed();
+}
+
+- (void)setUserDisclaimerConfirmed:(BOOL)flag {
+    swInstallMgr->setUserDisclaimerConfirmed(flag);
+}
+
+/** low level access */
+- (sword::InstallMgr *)installMgr {
+    return swInstallMgr;
+}
+
+@end
diff --git a/bindings/objc/src/SwordKey.h b/bindings/objc/src/SwordKey.h
new file mode 100644
index 0000000..caa4f35
--- /dev/null
+++ b/bindings/objc/src/SwordKey.h
@@ -0,0 +1,47 @@
+//
+//  SwordKey.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 17.12.09.
+//  Copyright 2009 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <swkey.h>
+#endif
+
+@interface SwordKey : NSObject {
+#ifdef __cplusplus
+    sword::SWKey *sk;
+#endif
+    BOOL created;
+}
+
++ (SwordKey *)swordKey;
++ (SwordKey *)swordKeyWithRef:(NSString *)aRef;
+
+#ifdef __cplusplus
++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk;
++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy;
+- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk;
+- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy;
+- (sword::SWKey *)swKey;
+#endif
+
+- (SwordKey *)initWithRef:(NSString *)aRef;
+
+- (SwordKey *)clone;
+- (void)setPersist:(BOOL)flag;
+- (BOOL)persist;
+
+- (int)error;
+
+- (void)setPosition:(int)aPosition;
+- (void)decrement;
+- (void)increment;
+- (NSString *)keyText;
+- (void)setKeyText:(NSString *)aKey;
+
+@end
diff --git a/bindings/objc/src/SwordKey.mm b/bindings/objc/src/SwordKey.mm
new file mode 100644
index 0000000..5254443
--- /dev/null
+++ b/bindings/objc/src/SwordKey.mm
@@ -0,0 +1,124 @@
+//
+//  SwordKey.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 17.12.09.
+//  Copyright 2009 Software by MABE. All rights reserved.
+//
+
+#import "SwordKey.h"
+
+
+@implementation SwordKey
+
++ (SwordKey *)swordKey {
+    return [[[SwordKey alloc] init] autorelease];
+}
+
++ (SwordKey *)swordKeyWithRef:(NSString *)aRef {
+    return [[[SwordKey alloc] initWithRef:aRef] autorelease];
+}
+
++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk {
+    return [[[SwordKey alloc] initWithSWKey:aSk] autorelease];
+}
+
++ (SwordKey *)swordKeyWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy {
+    return [[[SwordKey alloc] initWithSWKey:aSk makeCopy:copy] autorelease];    
+}
+
+- (id)init {
+    return [self initWithRef:nil];
+}
+
+- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk {
+    return [self initWithSWKey:aSk makeCopy:NO];
+}
+
+- (SwordKey *)initWithSWKey:(sword::SWKey *)aSk makeCopy:(BOOL)copy {
+    self = [super init];
+    if(self) {
+        if(copy) {
+            if(aSk) {
+                sk = aSk->clone();            
+                created = YES;                
+            } else {
+                created = NO;
+            }
+        } else {
+            sk = aSk;
+            created = NO;
+        }
+    }    
+    return self;    
+}
+
+- (SwordKey *)initWithRef:(NSString *)aRef {
+    self = [super init];
+    if(self) {
+        sk = new sword::SWKey([aRef UTF8String]);
+        created = YES;
+    }
+    
+    return self;    
+}
+
+- (void)finalize {
+    if(created) {
+        delete sk;
+    }
+    
+    [super finalize];
+}
+
+- (void)dealloc {
+    if(created) {
+        delete sk;
+    }
+    
+    [super dealloc];    
+}
+
+- (SwordKey *)clone {
+    return [SwordKey swordKeyWithSWKey:sk];
+}
+
+#pragma mark - Methods
+
+- (void)setPersist:(BOOL)flag {
+    sk->Persist((int)flag);
+}
+
+- (BOOL)persist {
+    return (BOOL)sk->Persist();
+}
+
+- (int)error {
+    return sk->Error();
+}
+
+- (void)setPosition:(int)aPosition {
+    sk->setPosition(sword::SW_POSITION((char)aPosition));
+}
+
+- (void)decrement {
+    sk->decrement();
+}
+
+- (void)increment {
+    sk->increment();
+}
+
+- (NSString *)keyText {
+    return [NSString stringWithUTF8String:sk->getText()];
+}
+
+- (void)setKeyText:(NSString *)aKey {
+    sk->setText([aKey UTF8String]);
+}
+
+- (sword::SWKey *)swKey {
+    return sk;
+}
+
+@end
diff --git a/bindings/objc/src/SwordListKey.h b/bindings/objc/src/SwordListKey.h
new file mode 100644
index 0000000..043ea81
--- /dev/null
+++ b/bindings/objc/src/SwordListKey.h
@@ -0,0 +1,46 @@
+//
+//  SwordListKey.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 10.04.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SwordKey.h"
+
+#ifdef __cplusplus
+#include <swkey.h>
+#include <listkey.h>
+#endif
+
+@class SwordBible, VerseEnumerator;
+@class SwordVerseKey;
+
+@interface SwordListKey : SwordKey {
+}
+
++ (SwordListKey *)listKeyWithRef:(NSString *)aRef;
++ (SwordListKey *)listKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme;
++ (SwordListKey *)listKeyWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme;
+
+#ifdef __cplusplus
++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk;
++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy;
+- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk;
+- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy;
+- (sword::ListKey *)swListKey;
+#endif
+
+- (SwordListKey *)initWithRef:(NSString *)aRef;
+- (SwordListKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme;
+- (SwordListKey *)initWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme;
+
+- (void)parse;
+- (void)parseWithHeaders;
+- (VerseEnumerator *)verseEnumerator;
+
+- (NSInteger)numberOfVerses;
+- (BOOL)containsKey:(SwordVerseKey *)aVerseKey;
+
+@end
diff --git a/bindings/objc/src/SwordListKey.mm b/bindings/objc/src/SwordListKey.mm
new file mode 100644
index 0000000..07aa8f8
--- /dev/null
+++ b/bindings/objc/src/SwordListKey.mm
@@ -0,0 +1,106 @@
+//
+//  SwordListKey.mm
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 10.04.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <ObjCSword/ObjCSword.h>
+
+@implementation SwordListKey
+
++ (SwordListKey *)listKeyWithRef:(NSString *)aRef {
+    return [[[SwordListKey alloc] initWithRef:aRef] autorelease];
+}
+
++ (SwordListKey *)listKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme {
+    return [[[SwordListKey alloc] initWithRef:aRef v11n:scheme] autorelease];
+}
+
++ (SwordListKey *)listKeyWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme {
+    return [[[SwordListKey alloc] initWithRef:aRef headings:headings v11n:scheme] autorelease];
+}
+
++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk {
+    return [[[SwordListKey alloc] initWithSWListKey:aLk] autorelease];
+}
+
++ (SwordListKey *)listKeyWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy {
+    return [[[SwordListKey alloc] initWithSWListKey:aLk makeCopy:copy] autorelease];    
+}
+
+- (id)init {
+    return [super init];
+}
+
+- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk {
+    return (SwordListKey *) [super initWithSWKey:aLk];
+}
+
+- (SwordListKey *)initWithSWListKey:(sword::ListKey *)aLk makeCopy:(BOOL)copy {
+    return (SwordListKey *) [super initWithSWKey:aLk makeCopy:copy];
+}
+
+- (SwordListKey *)initWithRef:(NSString *)aRef {
+    return [self initWithRef:aRef v11n:nil];
+}
+
+- (SwordListKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme {
+    return [self initWithRef:aRef headings:NO v11n:scheme];
+}
+
+- (SwordListKey *)initWithRef:(NSString *)aRef headings:(BOOL)headings v11n:(NSString *)scheme {
+    sword::VerseKey vk;
+    vk.Headings((char)headings);
+    if(scheme) {
+        vk.setVersificationSystem([scheme UTF8String]);
+    }
+    sword::ListKey listKey = vk.ParseVerseList([aRef UTF8String], "gen", true);
+    sword::ListKey *lk = new sword::ListKey(listKey);
+    return (SwordListKey *) [super initWithSWKey:lk];
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [super dealloc];    
+}
+
+- (NSInteger)numberOfVerses {
+    NSInteger ret = 0;
+    
+    if(sk) {
+        for(*sk = sword::TOP; !sk->Error(); *sk++) ret++;    
+    }
+    
+    return ret;
+}
+
+- (void)parse {
+    
+}
+
+- (void)parseWithHeaders {
+}
+
+- (VerseEnumerator *)verseEnumerator {
+    return [[[VerseEnumerator alloc] initWithListKey:self] autorelease];
+}
+
+- (BOOL)containsKey:(SwordVerseKey *)aVerseKey {
+    BOOL ret = NO;
+    if(sk) {
+        *sk = [[aVerseKey osisRef] UTF8String];
+        ret = !sk->Error();
+    }
+    return ret;
+}
+
+- (sword::ListKey *)swListKey {
+    return (sword::ListKey *)sk;
+}
+
+@end
diff --git a/bindings/objc/src/SwordLocaleManager.h b/bindings/objc/src/SwordLocaleManager.h
new file mode 100644
index 0000000..dd67a13
--- /dev/null
+++ b/bindings/objc/src/SwordLocaleManager.h
@@ -0,0 +1,28 @@
+//
+//  SwordLocaleManager.h
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 01.08.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface SwordLocaleManager : NSObject {
+}
+
++ (SwordLocaleManager *)defaultManager;
+
+/**
+ Initializes the global locale system.
+ Any created instance that needs localized information will use it.
+ */
+- (void)initLocale;
+
+/**
+ Initializes global locale system.
+ Loads the locale (locale.d) folder from the specified path.
+ */
+- (void)initLocaleWithLocaledPath:(NSString *)aPath;
+
+@end
diff --git a/bindings/objc/src/SwordLocaleManager.mm b/bindings/objc/src/SwordLocaleManager.mm
new file mode 100644
index 0000000..18e4eba
--- /dev/null
+++ b/bindings/objc/src/SwordLocaleManager.mm
@@ -0,0 +1,66 @@
+//
+//  SwordLocaleManager.mm
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 01.08.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import "SwordLocaleManager.h"
+
+#include <swmgr.h>		// C++ Sword API
+#include <localemgr.h>
+
+@implementation SwordLocaleManager
+
++ (SwordLocaleManager *)defaultManager {
+    static SwordLocaleManager *instance = nil;
+    if(instance == nil) {
+        // use default path
+        instance = [[SwordLocaleManager alloc] init];
+    }
+    
+	return instance;
+}
+
+- (void)initLocale {
+    // set locale swManager
+    NSString *resourcePath = [[NSBundle bundleForClass:[SwordLocaleManager class]] resourcePath];
+    NSString *localePath = [resourcePath stringByAppendingPathComponent:@"locales.d"];
+    [self initLocaleWithLocaledPath:localePath];
+}
+
+- (void)initLocaleWithLocaledPath:(NSString *)aPath {
+    sword::LocaleMgr *lManager = sword::LocaleMgr::getSystemLocaleMgr();
+    lManager->loadConfigDir([aPath UTF8String]);
+    
+    //get the language
+    NSArray *availLocales = [NSLocale preferredLanguages];
+    
+    NSString *lang = nil;
+    NSString *loc;
+    BOOL haveLocale = NO;
+    // for every language, check if we know the locales
+    sword::StringList localeList = lManager->getAvailableLocales();
+    NSEnumerator *iter = [availLocales objectEnumerator];
+    while((loc = [iter nextObject]) && !haveLocale) {
+        // check if this locale is available in SWORD
+        sword::StringList::iterator it;
+        sword::SWBuf locale;
+        for(it = localeList.begin(); it != localeList.end(); ++it) {
+            locale = *it;
+            NSString *swLoc = [NSString stringWithCString:locale.c_str() encoding:NSUTF8StringEncoding];
+            if([swLoc hasPrefix:loc]) {
+                haveLocale = YES;
+                lang = loc;
+                break;
+            }
+        }        
+    }
+    
+    if(haveLocale) {
+        lManager->setDefaultLocaleName([lang UTF8String]);    
+    }
+}
+
+@end
diff --git a/bindings/objc/src/SwordManager.h b/bindings/objc/src/SwordManager.h
new file mode 100644
index 0000000..daf8ece
--- /dev/null
+++ b/bindings/objc/src/SwordManager.h
@@ -0,0 +1,223 @@
+/*	SwordManager.h - Sword API wrapper for Modules.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <Foundation/Foundation.h>
+#import "SwordModule.h"
+
+#ifdef __cplusplus
+#include <swmgr.h>		// C++ Sword API
+#include <localemgr.h>
+#include <versekey.h>
+class sword::SWModule;
+#endif
+
+/** the major types as returned in -[SwordModule -typeString] */
+#define SWMOD_TYPES_BIBLES              @"Biblical Texts"
+#define SWMOD_TYPES_COMMENTARIES        @"Commentaries"
+#define SWMOD_TYPES_DICTIONARIES        @"Lexicons / Dictionaries"
+#define SWMOD_TYPES_GENBOOKS            @"Generic Books"
+
+#define SWMOD_CATEGORY_DAILYDEVS        @"Daily Devotional"
+#define SWMOD_CATEGORY_GLOSSARIES       @"Glossaries"
+#define SWMOD_CATEGORY_CULTS            @"Cults / Unorthodox / Questionable Material"
+#define SWMOD_CATEGORY_ESSEYS           @"Essays"
+#define SWMOD_CATEGORY_MAPS             @"Maps"
+#define SWMOD_CATEGORY_IMAGES           @"Images"
+
+/** number of sword module stypes */
+#define SWMODTYPE_COUNT                 5
+
+/** config entries */
+#define SWMOD_CONFENTRY_VERSION             @"Version"
+#define SWMOD_CONFENTRY_MINVERSION          @"MinimumVersion"
+#define SWMOD_CONFENTRY_CIPHERKEY           @"CipherKey"
+#define SWMOD_CONFENTRY_ABOUT               @"About"
+#define SWMOD_CONFENTRY_CATEGORY            @"Category"
+#define SWMOD_CONFENTRY_INSTALLSIZE         @"InstallSize"
+#define SWMOD_CONFENTRY_COPYRIGHT           @"Copyright"
+#define SWMOD_CONFENTRY_COPYRIGHTHOLDER     @"CopyrightHolder"
+#define SWMOD_CONFENTRY_DISTRLICENSE        @"DistributionLicense"
+#define SWMOD_CONFENTRY_DISTRNOTES          @"DistributionNotes"
+#define SWMOD_CONFENTRY_TEXTSOURCE          @"TextSource"
+#define SWMOD_CONFENTRY_VERSIFICATION       @"Versification"
+#define SWMOD_CONFENTRY_DIRECTION           @"Direction"
+#define SWMOD_CONFENTRY_EDITABLE            @"Editable"
+
+/** module features */
+#define SWMOD_FEATURE_STRONGS           @"Strongs"
+#define SWMOD_FEATURE_HEADINGS          @"Headings"
+#define SWMOD_FEATURE_FOOTNOTES         @"Footnotes"
+#define SWMOD_FEATURE_MORPH             @"Morph"
+#define SWMOD_FEATURE_CANTILLATION      @"Cantillation"
+#define SWMOD_FEATURE_HEBREWPOINTS      @"HebrewPoints"
+#define SWMOD_FEATURE_GREEKACCENTS      @"GreekAccents"
+#define SWMOD_FEATURE_LEMMA             @"Lemma"
+#define SWMOD_FEATURE_SCRIPTREF         @"Scripref"     // not Scriptref
+#define SWMOD_FEATURE_VARIANTS          @"Variants"
+#define SWMOD_FEATURE_REDLETTERWORDS    @"RedLetterWords"
+
+/** global options */
+#define SW_OPTION_STRONGS               @"Strong's Numbers"
+#define SW_OPTION_HEADINGS              @"Headings"
+#define SW_OPTION_FOOTNOTES             @"Footnotes"
+#define SW_OPTION_MORPHS                @"Morphological Tags"
+#define SW_OPTION_HEBREWCANTILLATION    @"Hebrew Cantillation"
+#define SW_OPTION_HEBREWPOINTS          @"Hebrew Vowel Points"
+#define SW_OPTION_GREEKACCENTS          @"Greek Accents"
+#define SW_OPTION_LEMMAS                @"Lemmas"
+#define SW_OPTION_SCRIPTREFS            @"Cross-references"
+#define SW_OPTION_VARIANTS              @"Textual Variants"
+#define SW_OPTION_REDLETTERWORDS        @"Words of Christ in Red"
+// this is not part of Sword
+#define SW_OPTION_REF                   @"Reference"
+#define SW_OPTION_MODULENAME            @"ModuleName"
+
+/** config features definitions */
+#define SWMOD_CONF_FEATURE_STRONGS       @"StrongsNumbers"
+#define SWMOD_CONF_FEATURE_GREEKDEF      @"GreekDef"
+#define SWMOD_CONF_FEATURE_HEBREWDEF     @"HebrewDef"
+#define SWMOD_CONF_FEATURE_GREEKPARSE    @"GreekParse"
+#define SWMOD_CONF_FEATURE_HEBREWPARSE   @"HebrewParse"
+#define SWMOD_CONF_FEATURE_DAILYDEVOTION @"DailyDevotion"
+#define SWMOD_CONF_FEATURE_GLOSSARY      @"Glossary"
+#define SWMOD_CONF_FEATURE_IMAGES        @"Images"
+
+/** On / Off */
+#define SW_ON    @"On"
+#define SW_OFF   @"Off"
+
+// direction
+#define SW_DIRECTION_RTL    @"RtoL"
+
+// CipherKeys NSUserdefaultsKey
+#define DefaultsModuleCipherKeysKey     @"DefaultsModuleCipherKeysKey"
+
+@interface SwordManager : NSObject {
+    
+#ifdef __cplusplus
+	sword::SWMgr *swManager;
+	SwordFilter *plainFilter, *thmlFilter, *gbfFilter, *osisFilter, *teiFilter;
+    SwordFilter *thmlStripFilter, *gbfStripFilter, *osisStripFilter, *teiStripFilter;
+#endif
+
+	NSDictionary *modules;
+    NSString *modulesPath;
+	NSLock *managerLock;
+    BOOL temporaryManager;
+}
+
+// ------------------- getter / setter -------------------
+@property (retain, readwrite) NSDictionary *modules;
+@property (retain, readwrite) NSString *modulesPath;
+@property (retain, readwrite) NSLock *managerLock;
+@property (readwrite) BOOL temporaryManager;
+
+// --------------------- methods -----------------------
+
+/**
+ Convenience initializer. Creates an instance of SwordManager for a given module path.
+ Internally -initWithPath: is called.
+ */
++ (SwordManager *)managerWithPath:(NSString*)path;
+
+/**
+ Create an instance of SwordManager that will get the default manager
+ in this application.
+ Internally a static reference is set so that this instance will get a singleton object.
+ */
++ (SwordManager *)defaultManager;
+
+/**
+ Retrieve a list of known module types.
+ See SWMOD_CATEGORY_*
+ */
++ (NSArray *)moduleTypes;
+
+/**
+ Initializes this manager for the given module path.
+ */
+- (id)initWithPath:(NSString *)path;
+
+/**
+ Add an additional path to the manager to augment more modules.
+ */
+- (void)addModulesPath:(NSString*)path;
+
+/** 
+ re-init - reloads all modules, filters and such
+ This will be triggered if new module had been installed in the module installer.
+ */
+- (void)reInit;
+
+/**
+ Set a cipher key for the given module to make it unlocked and in order to render it's text.
+ */
+- (void)setCipherKey:(NSString*)key forModuleNamed:(NSString *)name;
+
+/**
+ Set a global option, for example render option.
+ */
+- (void)setGlobalOption:(NSString*)option value:(NSString *)value;
+
+/**
+ Returns the value of an option.
+ */
+- (BOOL)globalOption:(NSString *)option;
+
+/**
+ List of module names known by this manager
+ */
+- (NSArray *)moduleNames;
+
+/**
+ List of modules known by this manager
+ */
+- (NSArray *)listModules;
+
+/**
+ Module list sorted by name
+ */
+- (NSArray *)sortedModuleNames;
+
+/**
+ Get module with name from internal list
+ */
+- (SwordModule *)moduleWithName:(NSString *)name;
+
+/**
+ Get modules with certain feature from internal list
+ */
+- (NSArray *)modulesForFeature:(NSString *)feature;
+
+/**
+ Get modules with certain type from internal list
+ */
+- (NSArray *)modulesForType:(ModuleType)type;
+
+/**
+ Get modules with certain category from the internal list
+ */
+- (NSArray *)modulesForCategory:(ModuleCategory)cat;
+
+#ifdef __cplusplus
+- (id)initWithSWMgr:(sword::SWMgr *)swMgr;
+- (sword::SWModule *)getSWModuleWithName:(NSString *)moduleName;
+
+/**
+ Returns the underlying sword::SWMgr instance
+ */
+- (sword::SWMgr *)swManager;
+
+#endif
+
+@end
diff --git a/bindings/objc/src/SwordManager.mm b/bindings/objc/src/SwordManager.mm
new file mode 100644
index 0000000..c2962fb
--- /dev/null
+++ b/bindings/objc/src/SwordManager.mm
@@ -0,0 +1,391 @@
+/*	SwordManager.mm - Sword API wrapper for Modules.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <ObjCSword/ObjCSword.h>
+#import "Notifications.h"
+#import "FilterProviderFactory.h"
+#import "DefaultFilterProvider.h"
+
+#include "encfiltmgr.h"
+#import "SwordFilter.h"
+
+using std::string;
+using std::list;
+
+@interface SwordManager (PrivateAPI)
+
+- (void)refreshModules;
+- (void)addFiltersToModule:(SwordModule *)mod;
+
+@end
+
+@implementation SwordManager (PrivateAPI)
+
+- (void)refreshModules {
+    NSMutableDictionary *dict = [NSMutableDictionary dictionary];
+    
+    // loop over modules
+    sword::SWModule *mod;
+	for(sword::ModMap::iterator it = swManager->Modules.begin(); it != swManager->Modules.end(); it++) {
+		mod = it->second;
+        
+        if(mod) {
+            // temporary instance
+            SwordModule *swMod = [SwordModule moduleForSWModule:mod];
+            NSString *type = [swMod typeString];
+
+            ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type];
+            SwordModule *sm = [SwordModule moduleForType:aType swModule:mod swordManager:self];
+            [dict setObject:sm forKey:[[sm name] lowercaseString]];
+
+            [self addFiltersToModule:sm];
+        }
+	}
+    
+    // set modules
+    self.modules = dict;
+}
+
+- (void)addFiltersToModule:(SwordModule *)mod {
+    // prepare display filters
+
+    id<FilterProvider> filterProvider = [[FilterProviderFactory providerFactory] get];
+
+    switch([mod swModule]->Markup()) {
+        case sword::FMT_GBF:
+            if(!gbfFilter) {
+                gbfFilter = [filterProvider newGbfRenderFilter];
+            }
+            if(!gbfStripFilter) {
+                gbfStripFilter = [filterProvider newGbfPlainFilter];
+            }
+            [mod addRenderFilter:gbfFilter];
+            [mod addStripFilter:gbfStripFilter];
+            break;
+        case sword::FMT_THML:
+            if(!thmlFilter) {
+                thmlFilter = [filterProvider newThmlRenderFilter];
+            }
+            if(!thmlStripFilter) {
+                thmlStripFilter = [filterProvider newThmlPlainFilter];
+            }
+            [mod addRenderFilter:thmlFilter];
+            [mod addStripFilter:thmlStripFilter];
+            break;
+        case sword::FMT_OSIS:
+            if(!osisFilter) {
+                osisFilter = [filterProvider newOsisRenderFilter];
+            }
+            if(!osisStripFilter) {
+                osisStripFilter = [filterProvider newOsisPlainFilter];
+            }
+            [mod addRenderFilter:osisFilter];
+            [mod addStripFilter:osisStripFilter];
+            break;
+        case sword::FMT_TEI:
+            if(!teiFilter) {
+                teiFilter = [filterProvider newTeiRenderFilter];
+            }
+            if(!teiStripFilter) {
+                teiStripFilter = [filterProvider newTeiPlainFilter];
+            }
+            [mod addRenderFilter:teiFilter];
+            [mod addStripFilter:teiStripFilter];
+            break;
+        case sword::FMT_PLAIN:
+        default:
+            if(!plainFilter) {
+                plainFilter = [filterProvider newHtmlPlainFilter];
+            }
+            [mod addRenderFilter:plainFilter];
+            break;
+    }    
+}
+
+@end
+
+@implementation SwordManager
+
+@synthesize modules;
+@synthesize modulesPath;
+@synthesize managerLock;
+@synthesize temporaryManager;
+
+# pragma mark - class methods
+
++ (NSArray *)moduleTypes {
+    return [NSArray arrayWithObjects:
+            SWMOD_TYPES_BIBLES, 
+            SWMOD_TYPES_COMMENTARIES,
+            SWMOD_TYPES_DICTIONARIES,
+            SWMOD_TYPES_GENBOOKS, nil];
+}
+
++ (SwordManager *)managerWithPath:(NSString *)path {
+    SwordManager *manager = [[[SwordManager alloc] initWithPath:path] autorelease];
+    return manager;
+}
+
++ (SwordManager *)defaultManager {
+    static SwordManager *instance = nil;
+    if(instance == nil) {
+        // use default path
+        instance = [[SwordManager alloc] initWithPath:[[Configuration config] defaultModulePath]];
+    }
+    
+	return instance;
+}
+
+- (id)initWithPath:(NSString *)path {
+
+	if((self = [super init])) {
+        // this is our main swManager
+        temporaryManager = NO;
+        
+        self.modulesPath = path;
+
+		self.modules = [NSDictionary dictionary];
+		self.managerLock = (NSLock *)[[[NSRecursiveLock alloc] init] autorelease];
+
+        [self reInit];
+        
+        sword::StringList options = swManager->getGlobalOptions();
+        sword::StringList::iterator	it;
+        for(it = options.begin(); it != options.end(); it++) {
+            [self setGlobalOption:[NSString stringWithCString:it->c_str() encoding:NSUTF8StringEncoding] value:SW_OFF];
+        }        
+    }	
+	
+	return self;
+}
+
+- (id)initWithSWMgr:(sword::SWMgr *)aSWMgr {
+    self = [super init];
+    if(self) {
+        swManager = aSWMgr;
+        // this is a temporary swManager
+        temporaryManager = YES;
+        
+		self.modules = [NSDictionary dictionary];
+        self.managerLock = [(NSLock *)[[NSRecursiveLock alloc] init] autorelease];
+        
+		[self refreshModules];
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    if(!temporaryManager) {
+        delete swManager;
+    }
+    
+	[super finalize];
+}
+
+- (void)dealloc {
+    if(!temporaryManager) {
+        delete swManager;
+    }
+    [self setModules:nil];
+    [self setModulesPath:nil];
+    [self setManagerLock:nil];
+
+    [gbfFilter release];
+    [gbfStripFilter release];
+    [thmlFilter release];
+    [thmlStripFilter release];
+    [osisFilter release];
+    [osisStripFilter release];
+    [teiFilter release];
+    [teiStripFilter release];
+    [plainFilter release];
+    [super dealloc];
+}
+
+- (void)reInit {
+	[managerLock lock];
+    if(modulesPath && [modulesPath length] > 0) {
+        
+        // modulePath is the main sw manager
+        swManager = new sword::SWMgr([modulesPath UTF8String], true, new sword::EncodingFilterMgr(sword::ENC_UTF8));
+
+        if(!swManager) {
+            ALog(@"Cannot create SWMgr instance for default module path!");
+        } else {
+            NSFileManager *fm = [NSFileManager defaultManager];
+            NSArray *subDirs = [fm contentsOfDirectoryAtPath:modulesPath error:NULL];
+            // for all sub directories add module
+            BOOL directory;
+            NSString *fullSubDir;
+            NSString *subDir;
+            for(subDir in subDirs) {
+                // as long as it's not hidden
+                if(![subDir hasPrefix:@"."] && 
+                   ![subDir isEqualToString:@"InstallMgr"] && 
+                   ![subDir isEqualToString:@"mods.d"] &&
+                   ![subDir isEqualToString:@"modules"]) {
+                    fullSubDir = [modulesPath stringByAppendingPathComponent:subDir];
+                    fullSubDir = [fullSubDir stringByStandardizingPath];
+                    
+                    //if its a directory
+                    if([fm fileExistsAtPath:fullSubDir isDirectory:&directory]) {
+                        if(directory) {
+                            DLog(@"Augmenting folder: %@", fullSubDir);
+                            swManager->augmentModules([fullSubDir UTF8String]);
+                            DLog(@"Augmenting folder done");
+                        }
+                    }
+                }
+            }
+            
+            // clear some data
+            [self refreshModules];
+            
+            SendNotifyModulesChanged(NULL);
+        }
+    }
+	[managerLock unlock];    
+}
+
+- (void)addModulesPath:(NSString *)path {
+	[managerLock lock];
+	if(swManager == nil) {
+		swManager = new sword::SWMgr([path UTF8String], true, new sword::EncodingFilterMgr(sword::ENC_UTF8));
+    } else {
+		swManager->augmentModules([path UTF8String]);
+    }
+	
+	[self refreshModules];
+	[managerLock unlock];
+    
+    SendNotifyModulesChanged(NULL);
+}
+
+- (SwordModule *)moduleWithName:(NSString *)name {
+    
+	SwordModule	*ret = [modules objectForKey:[name lowercaseString]];
+    if(ret == nil) {
+        sword::SWModule *mod = [self getSWModuleWithName:name];
+        if(mod == NULL) {
+            ALog(@"No module by that name: %@!", name);
+        } else {
+            // temporary instance
+            SwordModule *swMod = [SwordModule moduleForSWModule:mod];
+            NSString *type = [swMod typeString];
+            
+            ModuleType aType = [SwordModule moduleTypeForModuleTypeString:type];
+            ret = [SwordModule moduleForType:aType swModule:mod swordManager:self];
+
+            if(ret != nil) {
+                NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithDictionary:modules];
+                [dict setObject:ret forKey:[name lowercaseString]];
+                self.modules = dict;                
+            }
+        }        
+    }
+    
+	return ret;
+}
+
+- (void)setCipherKey:(NSString *)key forModuleNamed:(NSString *)name {
+	[managerLock lock];	
+	swManager->setCipherKey([name UTF8String], [key UTF8String]);
+	[managerLock unlock];
+}
+
+#pragma mark - module access
+
+- (void)setGlobalOption:(NSString *)option value:(NSString *)value {
+	[managerLock lock];
+    swManager->setGlobalOption([option UTF8String], [value UTF8String]);
+	[managerLock unlock];
+}
+
+- (BOOL)globalOption:(NSString *)option {
+    return [[NSString stringWithUTF8String:swManager->getGlobalOption([option UTF8String])] isEqualToString:SW_ON];
+}
+
+- (NSArray *)listModules {
+    return [modules allValues];
+}
+- (NSArray *)moduleNames {
+    return [modules allKeys];
+}
+
+- (NSArray *)sortedModuleNames {
+    return [[self moduleNames] sortedArrayUsingSelector:@selector(compare:)];
+}
+
+- (NSArray *)modulesForFeature:(NSString *)feature {
+    NSMutableArray *ret = [NSMutableArray array];
+    for(SwordModule *mod in [modules allValues]) {
+        if([mod hasFeature:feature]) {
+            [ret addObject:mod];
+        }
+    }
+	
+    // sort
+    NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]];
+    [ret sortUsingDescriptors:sortDescriptors];
+
+	return [NSArray arrayWithArray:ret];
+}
+
+- (NSArray *)modulesForType:(ModuleType)type {
+    NSMutableArray *ret = [NSMutableArray array];
+    for(SwordModule *mod in [modules allValues]) {
+        if([mod type] == type || type == All) {
+            [ret addObject:mod];
+        }
+    }
+    
+    // sort
+    NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]];
+    [ret sortUsingDescriptors:sortDescriptors];
+    
+	return [NSArray arrayWithArray:ret];
+}
+
+- (NSArray *)modulesForCategory:(ModuleCategory)cat {
+    NSMutableArray *ret = [NSMutableArray array];
+    for(SwordModule *mod in [modules allValues]) {
+        if([mod category] == cat) {
+            [ret addObject:mod];
+        }
+    }
+    
+    // sort
+    NSArray *sortDescriptors = [NSArray arrayWithObject:[[[NSSortDescriptor alloc] initWithKey:@"name" ascending:YES] autorelease]];
+    [ret sortUsingDescriptors:sortDescriptors];
+    
+	return [NSArray arrayWithArray:ret];    
+}
+
+#pragma mark - lowLevel methods
+
+- (sword::SWMgr *)swManager {
+    return swManager;
+}
+
+- (sword::SWModule *)getSWModuleWithName:(NSString *)moduleName {
+	sword::SWModule *module;
+
+	[managerLock lock];
+	module = swManager->Modules[[moduleName UTF8String]];	
+	[managerLock unlock];
+    
+	return module;
+}
+
+@end
diff --git a/bindings/objc/src/SwordModule+Index.h b/bindings/objc/src/SwordModule+Index.h
new file mode 100644
index 0000000..df4f7d7
--- /dev/null
+++ b/bindings/objc/src/SwordModule+Index.h
@@ -0,0 +1,19 @@
+//
+//  SwordModuleIndex.h
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 13.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SwordModule.h"
+
+@interface SwordModule(Index)
+
+- (BOOL)hasSearchIndex;
+- (void)createSearchIndex;
+- (void)deleteSearchIndex;
+- (NSArray *)performIndexSearch:(NSString *)searchString;
+
+@end
diff --git a/bindings/objc/src/SwordModule+Index.mm b/bindings/objc/src/SwordModule+Index.mm
new file mode 100644
index 0000000..91dfa06
--- /dev/null
+++ b/bindings/objc/src/SwordModule+Index.mm
@@ -0,0 +1,51 @@
+//
+//  SwordModuleIndex.m
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 13.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import "SwordModule+Index.h"
+#import "SwordModuleTextEntry.h"
+
+@implementation SwordModule(Index)
+
+- (BOOL)hasSearchIndex {
+	NSString *dataPath = [self configFileEntryForConfigKey:@"AbsoluteDataPath"];
+	dataPath = [dataPath stringByAppendingPathComponent:@"lucene"];
+	dataPath = [dataPath stringByAppendingPathComponent:@"segments"];
+    
+	if ([[NSFileManager defaultManager] fileExistsAtPath:dataPath]) {
+		return YES;
+	} else {
+		return NO;
+	}
+}
+
+- (void)createSearchIndex {
+	swModule->createSearchFramework();
+}
+
+- (void)deleteSearchIndex {
+	swModule->deleteSearchFramework();
+}
+
+- (NSArray *)performIndexSearch:(NSString *)searchString {
+	sword::ListKey results = swModule->search([searchString UTF8String], -4);
+	results.sort();
+
+	NSMutableArray *retArray = [NSMutableArray array];
+	if(results.Count() > 0) {
+		while(!results.Error()) {
+            NSString *keyString = [NSString stringWithUTF8String:results.getText()];
+			SwordModuleTextEntry *entry = [SwordModuleTextEntry textEntryForKey:keyString andText:nil];
+			[retArray addObject:entry];
+			[entry release];
+			results++;
+		}
+	}
+	return retArray;
+}
+
+@end
diff --git a/bindings/objc/src/SwordModule.h b/bindings/objc/src/SwordModule.h
new file mode 100644
index 0000000..9f1e0ad
--- /dev/null
+++ b/bindings/objc/src/SwordModule.h
@@ -0,0 +1,368 @@
+/*	SwordModule.h - Sword API wrapper for Modules.
+
+    Copyright 2008 Manfred Bergmann
+    Based on code by Will Thimbleby
+  
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#import "swmodule.h"
+#endif
+
+// defines for dictionary entries for passage study
+#define ATTRTYPE_TYPE       @"type"
+#define ATTRTYPE_PASSAGE    @"passage"
+#define ATTRTYPE_MODULE     @"modulename"
+#define ATTRTYPE_NOTENUMBER @"notenumber"
+#define ATTRTYPE_ACTION     @"action"
+#define ATTRTYPE_VALUE      @"value"
+
+// positions
+#define SWPOS_BOTTOM   2
+#define SWPOS_TOP      1
+
+
+@class SwordManager, SwordModuleTextEntry, SwordKey;
+@class SwordFilter;
+
+typedef enum {
+    TextTypeStripped = 1,
+    TextTypeRendered
+}TextPullType;
+
+/** These are the main module types as returned in -typeString */
+typedef enum {
+    All         = 0x0000,
+	Bible       = 0x0001, 
+    Commentary  = 0x0002, 
+    Dictionary  = 0x0004,
+    Genbook     = 0x0008
+}ModuleType;
+
+/**
+ These are the main module categories as returned in -categoryString
+ Remember that modules type bible, commentary, dictionary and genbook not necessarily have a category
+ */
+typedef enum {
+    Unset           = -1,
+    NoCategory      = 0,
+	DailyDevotion   = 0x0001, 
+    Maps            = 0x0002, 
+    Glossary        = 0x0004,
+    Images          = 0x0008,
+    Essays          = 0x0010,
+    Cults           = 0x0011    
+}ModuleCategory;
+
+
+@interface SwordModule : NSObject {
+    
+    NSMutableDictionary *configEntries;
+	ModuleType type;
+	ModuleCategory category;
+    int status;
+	SwordManager *swManager;	
+	NSRecursiveLock *moduleLock;
+    NSLock *indexLock;
+    
+    /** we store the name separately */
+    NSString *typeString;
+    NSString *name;
+    NSString *descr;
+    NSString *lang;
+
+    
+    /** yes, we have a delegate to report any action to */
+    id delegate;
+
+#ifdef __cplusplus
+	sword::SWModule	*swModule;
+#endif
+}
+
+// ------------- properties ---------------
+@property (readwrite) ModuleType type;
+@property (readwrite) int status;
+@property (retain, readwrite) NSRecursiveLock *moduleLock;
+@property (retain, readwrite) NSLock *indexLock;
+@property (retain, readwrite) SwordManager *swManager;
+
+// swmodule properties
+@property (retain, readonly) NSString *name;
+@property (retain, readonly) NSString *typeString;
+@property (retain, readonly) NSString *descr;
+@property (retain, readonly) NSString *lang;
+
+#ifdef __cplusplus
+
+/**
+ Convenience initializer
+ */
++ (id)moduleForSWModule:(sword::SWModule *)aModule;
++ (id)moduleForSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager;
+
+/**
+ Factory method that creates the correct module type instance for the given type
+ */
++ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager;
+
+/**
+ Initialize this module with an the SWModule.
+ This initializer should normally not need to be used.
+ */
+- (id)initWithSWModule:(sword::SWModule *)aModule;
+
+/**
+ Initialize this module with an the SWModule and a SwordManager instance.
+ This initializer should normally not need to be used.
+ */
+- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager;
+
+/**
+ Retrieve the underlying SWModule instance
+ */
+- (sword::SWModule *)swModule;
+
+#endif
+
+/**
+ maps type string to ModuleType enum
+ @param[in] typeStr type String as in -typeString(SwordModule)
+ @return type according to ModuleType enum
+ */
++ (ModuleType)moduleTypeForModuleTypeString:(NSString *)typeStr;
+
+/**
+ maps type string to ModuleType enum
+ @param[in] categoryStr category String as in -categoryString(SwordModule)
+ @return type according to ModuleCategory enum
+ */
++ (ModuleCategory)moduleCategoryForModuleCategoryString:(NSString *)categoryStr;
+
+// ------------- instance methods ---------------
+
+/**
+ Initializes module with a given name and SwordManager.
+ The SwordManager is needed because the underlying SWModule is retrieved from SwordManager.
+ */
+- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager;
+
+/** Adds a render filter to this module */
+- (void)addRenderFilter:(SwordFilter *)aFilter;
+
+/** Adds a strip filter to this module */
+- (void)addStripFilter:(SwordFilter *)aFilter;
+
+/**
+ Any error while processing the module?
+ */
+- (NSInteger)error;
+
+// --------------- Conf entries --------------
+
+/**
+ Module category as string
+ */
+- (NSString *)categoryString;
+/**
+ Module category
+ */
+- (ModuleCategory)category;
+/**
+ Module version
+ */
+- (NSString *)version;
+/**
+ Module minimum Sword version
+ */
+- (NSString *)minVersion;
+/**
+ Module about text
+ */
+- (NSString *)aboutText;
+/**
+ Override to get custom behaviour.
+ */
+- (NSAttributedString *)fullAboutText;
+/**
+ Module versification type
+ */
+- (NSString *)versification;
+/**
+ Is module Unicode UTF-8?
+ */
+- (BOOL)isUnicode;
+/**
+ Is module encrypted
+ */
+- (BOOL)isEncrypted;
+/**
+ Is module locked, that is encrypted but not unlocked?
+ */
+- (BOOL)isLocked;
+/**
+ Is module editable, i.e. is it's a personal commentary?
+ */
+- (BOOL)isEditable;
+/**
+ Is module writing direction Right to Left?
+ */
+- (BOOL)isRTL;
+/**
+ Has module this feature?
+ See SWMOD_FEATURE_* in SwordManager
+ */
+- (BOOL)hasFeature:(NSString *)feature;
+/**
+ Returns a config entry for a given config key
+ */
+- (NSString *)configFileEntryForConfigKey:(NSString *)entryKey;
+
+// ------------------ module unlocking ------------------
+
+/**
+ Unlock this module with a cipher key, if it is encrypted.
+ */
+- (BOOL)unlock:(NSString *)unlockKey;
+
+// ------------------ module access semaphores -----------------
+
+/**
+ Aquires a module access lock so that no other thread may access this module.
+ */
+- (void)lockModuleAccess;
+/**
+ Unlock module access. Make it accessible to other threads.
+ */
+- (void)unlockModuleAccess;
+
+// ----------------- module positioning ------------------------
+
+/**
+ Increment module key position
+ */
+- (void)incKeyPosition;
+/**
+ Decrement module key position
+ */
+- (void)decKeyPosition;
+/**
+ Set position key from a string
+ */
+- (void)setKeyString:(NSString *)aKeyString;
+/**
+ Set position from a key
+ */
+- (void)setSwordKey:(SwordKey *)aKey;
+
+/**
+ Module key. New instance created by module.
+ */
+- (SwordKey *)createKey;
+/**
+ Module key. Reference only.
+ */
+- (SwordKey *)getKey;
+/**
+ Module key. Reference only but cloned.
+ */
+- (SwordKey *)getKeyCopy;
+
+// ------------------- module metadata processing ------------------
+
+/**
+ Process metadata attributes of module entry.
+ */
+- (void)setProcessEntryAttributes:(BOOL)flag;
+/**
+ Are metadata attributes of module entry processed?
+ */
+- (BOOL)processEntryAttributes;
+
+/**
+ returns attribute values from the engine for notes, cross-refs and such for the given link type
+ @return NSArray for references
+ @return NSString for text data
+ */
+- (id)attributeValueForParsedLinkData:(NSDictionary *)data;
+- (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType;
+
+/** returns the pre-verse entry value */
+- (NSString *)entryAttributeValuePreverse;
+- (NSString *)entryAttributeValuePreverseForKey:(SwordKey *)aKey;
+
+- (NSString *)entryAttributeValueFootnoteOfType:(NSString *)fnType indexValue:(NSString *)index;
+- (NSString *)entryAttributeValueFootnoteOfType:(NSString *)fnType indexValue:(NSString *)index forKey:(SwordKey *)aKey;
+
+- (NSArray *)entryAttributeValuesLemma;
+
+// ----------------- Module text access ----------------------
+
+/**
+ Retrieves a text entry for a given key.
+ Type can be: "rendered" or "stripped"
+ */
+- (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType;
+/**
+ Convenience method with a key-string
+ */
+- (SwordModuleTextEntry *)textEntryForKeyString:(NSString *)aKeyString textType:(TextPullType)aType;
+/**
+ Pulls all text entries for the given reference
+ @return Array of SwordModuleTextEntry
+ */
+- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType;
+
+/**
+ Returns a rendered text for the text at the current module position
+ */
+- (NSString *)renderedText;
+/**
+ Renders the given string with the modules render filters
+ */
+- (NSString *)renderedTextFromString:(NSString *)aString;
+/** 
+ Returns a stripped text for the text at the current module position
+ */
+- (NSString *)strippedText;
+/**
+ Strips the given string with the modules strip filters
+ */
+- (NSString *)strippedTextFromString:(NSString *)aString;
+
+/**
+ abstract method, override in subclass
+ This method generates stripped text string for a given reference.
+ @param[in] reference bible reference
+ @return Array of SwordModuleTextEntry instances
+ */
+- (NSArray *)strippedTextEntriesForRef:(NSString *)reference;
+
+/** 
+ abstract method, override in subclass
+ This method generates HTML string for a given reference.
+ @param[in] reference bible reference
+ @return Array of SwordModuleTextEntry instances
+ */
+- (NSArray *)renderedTextEntriesForRef:(NSString *)reference;
+
+/** 
+ number of entries
+ abstract method, should be overriden by subclasses
+ */
+- (long)entryCount;
+
+/**
+ Write text to module position
+ */
+- (void)writeEntry:(SwordModuleTextEntry *)anEntry;
+
+@end
diff --git a/bindings/objc/src/SwordModule.mm b/bindings/objc/src/SwordModule.mm
new file mode 100644
index 0000000..12e2ad8
--- /dev/null
+++ b/bindings/objc/src/SwordModule.mm
@@ -0,0 +1,735 @@
+/*	SwordModule.mm - Sword API wrapper for Modules.
+
+	Copyright 2008 Manfred Bergmann
+	Based on code by Will Thimbleby
+
+	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 version 2.
+
+	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. (http://www.gnu.org/licenses/gpl.html)
+*/
+
+#import "ObjCSword_Prefix.pch"
+#import "SwordModule.h"
+#import "SwordManager.h"
+#import "SwordModuleTextEntry.h"
+#import "SwordVerseKey.h"
+#import "SwordBible.h"
+#import "SwordCommentary.h"
+#import "SwordDictionary.h"
+#import "SwordBook.h"
+#import "SwordFilter.h"
+
+@interface SwordModule ()
+
+@property (retain, readwrite) NSString *name;
+@property (retain, readwrite) NSString *typeString;
+@property (retain, readwrite) NSString *descr;
+@property (retain, readwrite) NSString *lang;
+@property(readwrite, retain) NSMutableDictionary *configEntries;
+
+- (void)mainInit;
+
+@end
+
+@implementation SwordModule
+
+@synthesize configEntries;
+@synthesize type;
+@synthesize status;
+@synthesize moduleLock;
+@synthesize indexLock;
+@synthesize swManager;
+@synthesize name;
+@synthesize typeString;
+@synthesize descr;
+@synthesize lang;
+
+
++ (id)moduleForSWModule:(sword::SWModule *)aModule {
+    return [[[SwordModule alloc] initWithSWModule:aModule] autorelease];
+}
+
++ (id)moduleForSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager {
+    return [[[SwordModule alloc] initWithSWModule:aModule swordManager:aManager] autorelease];
+}
+
++ (id)moduleForType:(ModuleType)aType swModule:(sword::SWModule *)swModule swordManager:(SwordManager *)aManager {
+    SwordModule *sm;
+    if(aType == Bible) {
+        sm = [[[SwordBible alloc] initWithSWModule:swModule swordManager:aManager] autorelease];
+    } else if(aType == Commentary) {
+        sm = [[[SwordCommentary alloc] initWithSWModule:swModule swordManager:aManager] autorelease];
+    } else if(aType == Dictionary) {
+        sm = [[[SwordDictionary alloc] initWithSWModule:swModule swordManager:aManager] autorelease];
+    } else if(aType == Genbook) {
+        sm = [[[SwordBook alloc] initWithSWModule:swModule swordManager:aManager] autorelease];
+    } else {
+        sm = [[[SwordModule alloc] initWithSWModule:swModule swordManager:aManager] autorelease];
+    }
+    
+    return sm;
+}
+
++ (ModuleType)moduleTypeForModuleTypeString:(NSString *)typeStr {
+     ModuleType ret = Bible;
+    
+    if(typeStr == nil) {
+        ALog(@"have a nil typeStr!");
+        return ret;
+    }
+    
+    if([typeStr isEqualToString:SWMOD_TYPES_BIBLES]) {
+        ret = Bible;
+    } else if([typeStr isEqualToString:SWMOD_TYPES_COMMENTARIES]) {
+        ret = Commentary;
+    } else if([typeStr isEqualToString:SWMOD_TYPES_DICTIONARIES]) {
+        ret = Dictionary;
+    } else if([typeStr isEqualToString:SWMOD_TYPES_GENBOOKS]) {
+        ret = Genbook;
+    }
+    
+    return ret;
+}
+
++ (ModuleCategory)moduleCategoryForModuleCategoryString:(NSString *)categoryStr {
+    ModuleCategory ret = NoCategory;
+    
+    if(categoryStr == nil) {
+        ALog(@"have a nil categoryStr!");
+        return ret;
+    }
+    
+    if([categoryStr isEqualToString:SWMOD_CATEGORY_MAPS]) {
+        ret = Maps;
+    } else if([categoryStr isEqualToString:SWMOD_CATEGORY_IMAGES]) {
+        ret = Images;
+    } else if([categoryStr isEqualToString:SWMOD_CATEGORY_DAILYDEVS]) {
+        ret = DailyDevotion;
+    } else if([categoryStr isEqualToString:SWMOD_CATEGORY_ESSEYS]) {
+        ret = Essays;
+    } else if([categoryStr isEqualToString:SWMOD_CATEGORY_GLOSSARIES]) {
+        ret = Glossary;
+    } else if([categoryStr isEqualToString:SWMOD_CATEGORY_CULTS]) {
+        ret = Cults;
+    }
+    
+    return ret;    
+}
+
+#pragma mark - Initializer
+
+- (void)mainInit {
+    category = Unset;
+    self.name = [self retrieveName];
+    self.typeString = [self retrieveType];
+    self.descr = [self retrieveDescr];
+    self.lang = [self retrieveLang];
+
+    self.type = [SwordModule moduleTypeForModuleTypeString:self.typeString];
+    self.moduleLock = [[[NSRecursiveLock alloc] init] autorelease];
+    self.indexLock = [[[NSLock alloc] init] autorelease];
+    self.configEntries = [NSMutableDictionary dictionary];
+}
+
+- (id)initWithName:(NSString *)aName swordManager:(SwordManager *)aManager {
+    self = [super init];
+	if(self) {
+		swModule = [aManager getSWModuleWithName:aName];
+        self.swManager = aManager;
+        
+        [self mainInit];
+	}
+	
+	return self;
+}
+
+- (id)initWithSWModule:(sword::SWModule *)aModule {
+    return [self initWithSWModule:aModule swordManager:nil];
+}
+
+- (id)initWithSWModule:(sword::SWModule *)aModule swordManager:(SwordManager *)aManager {    
+    self = [super init];
+    if(self) {
+        swModule = aModule;
+        self.swManager = aManager;
+        
+        [self mainInit];
+    }
+    
+    return self;
+}
+
+- (void)finalize {    
+	[super finalize];
+}
+
+- (void)dealloc {
+    [self setConfigEntries:nil];
+    [self setSwManager:nil];
+    [self setModuleLock:nil];
+    [self setIndexLock:nil];
+    [self setName:nil];
+    [self setDescr:nil];
+    [self setTypeString:nil];
+    [self setLang:nil];
+
+    [super dealloc];
+}
+
+#pragma mark - Filters
+
+- (void)addRenderFilter:(SwordFilter *)aFilter {
+    swModule->AddRenderFilter([aFilter swFilter]);
+}
+
+- (void)addStripFilter:(SwordFilter *)aFilter {
+    swModule->AddStripFilter([aFilter swFilter]);
+}
+
+#pragma mark - Module access semaphores
+
+- (void)lockModuleAccess {
+    [moduleLock lock];
+}
+
+- (void)unlockModuleAccess {
+    [moduleLock unlock];
+}
+
+#pragma mark - Conf entries
+
+- (NSAttributedString *)fullAboutText {
+    return [[[NSAttributedString alloc] initWithString:@""] autorelease];
+}
+
+- (NSInteger)error {
+    return swModule->Error();
+}
+
+- (NSString *)retrieveName {
+    NSString *str = [NSString stringWithCString:swModule->Name() encoding:NSUTF8StringEncoding];
+    if(!str) {
+        str = [NSString stringWithCString:swModule->Name() encoding:NSISOLatin1StringEncoding];
+    }
+    return str;
+}
+
+- (NSString *)retrieveDescr {
+    NSString *str = [NSString stringWithCString:swModule->Description() encoding:NSUTF8StringEncoding];
+    if(!str) {
+        str = [NSString stringWithCString:swModule->Description() encoding:NSISOLatin1StringEncoding];
+    }
+    return str;
+}
+
+- (NSString *)retrieveLang {
+    NSString *str = [NSString stringWithCString:swModule->Lang() encoding:NSUTF8StringEncoding];
+    if(!str) {
+        str = [NSString stringWithCString:swModule->Lang() encoding:NSISOLatin1StringEncoding];
+    }
+    return str;
+}
+
+- (NSString *)retrieveType {
+    NSString *str = [NSString stringWithCString:swModule->Type() encoding:NSUTF8StringEncoding];
+    if(!str) {
+        str = [NSString stringWithCString:swModule->Type() encoding:NSISOLatin1StringEncoding];
+    }
+    return str;
+}
+
+- (NSString *)categoryString {
+    NSString *cat = [configEntries objectForKey:SWMOD_CONFENTRY_CATEGORY];
+    if(cat == nil) {
+        cat = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_CATEGORY];
+        if(cat != nil) {
+            [configEntries setObject:cat forKey:SWMOD_CONFENTRY_CATEGORY];
+        }
+    }
+    
+    return cat;
+}
+
+- (ModuleCategory)category {
+    if(category == Unset) {
+        category = [SwordModule moduleCategoryForModuleCategoryString:[self categoryString]];
+    }
+    return category;
+}
+
+- (NSString *)cipherKey {
+    NSString *cipherKey = [configEntries objectForKey:SWMOD_CONFENTRY_CIPHERKEY];
+    if(cipherKey == nil) {
+        cipherKey = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_CIPHERKEY];
+        if(cipherKey != nil) {
+            [configEntries setObject:cipherKey forKey:SWMOD_CONFENTRY_CIPHERKEY];
+        }
+    }
+    
+    return cipherKey;
+}
+
+- (NSString *)version {
+    NSString *version = [configEntries objectForKey:SWMOD_CONFENTRY_VERSION];
+    if(version == nil) {
+        version = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_VERSION];
+        if(version != nil) {
+            [configEntries setObject:version forKey:SWMOD_CONFENTRY_VERSION];
+        }
+    }
+    
+    return version;
+}
+
+- (NSString *)minVersion {
+    NSString *minVersion = [configEntries objectForKey:SWMOD_CONFENTRY_MINVERSION];
+    if(minVersion == nil) {
+        minVersion = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_MINVERSION];
+        if(minVersion != nil) {
+            [configEntries setObject:minVersion forKey:SWMOD_CONFENTRY_MINVERSION];
+        }
+    }
+    
+    return minVersion;
+}
+
+/** this might be RTF string  but the return value will be converted to UTF8 */
+- (NSString *)aboutText {
+    NSMutableString *aboutText = [configEntries objectForKey:SWMOD_CONFENTRY_ABOUT];
+    if(aboutText == nil) {
+        aboutText = [NSMutableString stringWithString:[self configFileEntryForConfigKey:SWMOD_CONFENTRY_ABOUT]];
+        if(aboutText != nil) {
+			//search & replace the RTF markup:
+			// "\\qc"		- for centering							--->>>  ignore these
+			// "\\pard"		- for resetting paragraph attributes	--->>>  ignore these
+			// "\\par"		- for paragraph breaks					--->>>  honour these
+			// "\\u{num}?"	- for unicode characters				--->>>  honour these
+			[aboutText replaceOccurrencesOfString:@"\\qc" withString:@"" options:0 range:NSMakeRange(0, [aboutText length])];
+			[aboutText replaceOccurrencesOfString:@"\\pard" withString:@"" options:0 range:NSMakeRange(0, [aboutText length])];
+			[aboutText replaceOccurrencesOfString:@"\\par" withString:@"\n" options:0 range:NSMakeRange(0, [aboutText length])];
+            
+			NSMutableString *retStr = [[@"" mutableCopy] autorelease];
+			for(NSUInteger i=0; i<[aboutText length]; i++) {
+				unichar c = [aboutText characterAtIndex:i];
+                
+				if(c == '\\' && ((i+1) < [aboutText length])) {
+					unichar d = [aboutText characterAtIndex:(i+1)];
+					if (d == 'u') {
+						//we have an unicode character!
+						@try {
+							NSInteger unicodeChar = 0;
+							NSMutableString *unicodeCharString = [[@"" mutableCopy] autorelease];
+							int j = 0;
+							BOOL negative = NO;
+							if ([aboutText characterAtIndex:(i+2)] == '-') {
+								//we have a negative unicode char
+								negative = YES;
+								j++;//skip past the '-'
+							}
+							while(isdigit([aboutText characterAtIndex:(i+2+j)])) {
+								[unicodeCharString appendFormat:@"%C", [aboutText characterAtIndex:(i+2+j)]];
+								j++;
+							}
+							unicodeChar = [unicodeCharString integerValue];
+							if (negative) unicodeChar = 65536 - unicodeChar;
+							i += j+2;
+							[retStr appendFormat:@"%C", unicodeChar];
+						}
+						@catch (NSException * e) {
+							[retStr appendFormat:@"%C", c];
+						}
+						//end dealing with the unicode character.
+					} else {
+						[retStr appendFormat:@"%C", c];
+					}
+				} else {
+					[retStr appendFormat:@"%C", c];
+				}
+			}
+			
+			aboutText = retStr;
+        } else {
+            aboutText = [NSMutableString string];
+        }
+        [configEntries setObject:aboutText forKey:SWMOD_CONFENTRY_ABOUT];
+    }
+    
+    return aboutText;    
+}
+
+/** this is only relevant for bible and commentaries */
+- (NSString *)versification {
+    return @"";
+}
+
+- (BOOL)isEditable {
+    BOOL ret = NO;
+    NSString *editable = [configEntries objectForKey:SWMOD_CONFENTRY_EDITABLE];
+    if(editable == nil) {
+        editable = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_EDITABLE];
+        if(editable != nil) {
+            [configEntries setObject:editable forKey:SWMOD_CONFENTRY_EDITABLE];
+        }
+    }
+    
+    if(editable) {
+        if([editable isEqualToString:@"YES"]) {
+            ret = YES;
+        }
+    }
+    
+    return ret;
+}
+
+- (BOOL)isRTL {
+    BOOL ret = NO;
+    NSString *direction = [configEntries objectForKey:SWMOD_CONFENTRY_DIRECTION];
+    if(direction == nil) {
+        direction = [self configFileEntryForConfigKey:SWMOD_CONFENTRY_DIRECTION];
+        if(direction != nil) {
+            [configEntries setObject:direction forKey:SWMOD_CONFENTRY_DIRECTION];
+        }
+    }
+    
+    if(direction) {
+        if([direction isEqualToString:SW_DIRECTION_RTL]) {
+            ret = YES;
+        }
+    }
+    
+    return ret;    
+}
+
+- (BOOL)isUnicode {    
+    return swModule->isUnicode();
+}
+
+- (BOOL)isEncrypted {
+    BOOL encrypted = YES;
+    if([self cipherKey] == nil) {
+        encrypted = NO;
+    }
+    
+    return encrypted;
+}
+
+- (BOOL)isLocked {
+    /** is module locked/has cipherkey config entry but cipherkey entry is empty */
+    BOOL locked = NO;
+    NSString *key = [self cipherKey];
+    if(key != nil) {
+        // check user defaults, that's where we store the entered keys
+        NSDictionary *cipherKeys = [[NSUserDefaults standardUserDefaults] objectForKey:DefaultsModuleCipherKeysKey];
+        if([key length] == 0 && [[cipherKeys allKeys] containsObject:[self name]] == NO) {
+            locked = YES;
+        }
+    }
+    
+    return locked;
+}
+
+// general feature access
+- (BOOL)hasFeature:(NSString *)feature {
+	BOOL has = NO;
+	
+	if(swModule->getConfig().has("Feature", [feature UTF8String])) {
+		has = YES;
+    } else if (swModule->getConfig().has("GlobalOptionFilter", [[NSString stringWithFormat:@"GBF%@", feature] UTF8String])) {
+ 		has = YES;
+    } else if (swModule->getConfig().has("GlobalOptionFilter", [[NSString stringWithFormat:@"ThML%@", feature] UTF8String])) {
+ 		has = YES;
+    } else if (swModule->getConfig().has("GlobalOptionFilter", [[NSString stringWithFormat:@"UTF8%@", feature] UTF8String])) {
+ 		has = YES;
+    } else if (swModule->getConfig().has("GlobalOptionFilter", [[NSString stringWithFormat:@"OSIS%@", feature] UTF8String])) {
+ 		has = YES;
+    } else if (swModule->getConfig().has("GlobalOptionFilter", [feature UTF8String])) {
+ 		has = YES;
+    }
+	
+	return has;
+}
+
+- (NSString *)configFileEntryForConfigKey:(NSString *)entryKey {
+	NSString *result = nil;
+    
+	[moduleLock lock];
+    const char *entryStr = swModule->getConfigEntry([entryKey UTF8String]);
+	if(entryStr) {
+		result = [NSString stringWithUTF8String:entryStr];
+        if(!result) {
+            result = [NSString stringWithCString:entryStr encoding:NSISOLatin1StringEncoding];
+        }
+    }
+	[moduleLock unlock];
+	
+	return result;
+}
+
+#pragma mark - Module unlocking
+
+- (BOOL)unlock:(NSString *)unlockKey {
+    
+	if (![self isEncrypted]) {
+		return NO;
+    }
+    
+    NSMutableDictionary	*cipherKeys = [NSMutableDictionary dictionaryWithDictionary:
+                                       [[NSUserDefaults standardUserDefaults] objectForKey:DefaultsModuleCipherKeysKey]];
+    [cipherKeys setObject:unlockKey forKey:[self name]];
+    [[NSUserDefaults standardUserDefaults] setObject:cipherKeys forKey:DefaultsModuleCipherKeysKey];
+    
+	[swManager setCipherKey:unlockKey forModuleNamed:[self name]];
+    
+	return YES;
+}
+
+#pragma mark - Module positioning
+
+- (void)incKeyPosition {
+    swModule->increment(1);
+}
+
+- (void)decKeyPosition {
+    swModule->decrement(1);
+}
+
+- (void)setKeyString:(NSString *)aKeyString {
+    swModule->setKey([aKeyString UTF8String]);
+}
+
+- (void)setSwordKey:(SwordKey *)aKey {
+    swModule->setKey([aKey swKey]);
+}
+
+- (SwordKey *)createKey {
+    sword::SWKey *sk = swModule->CreateKey();
+    SwordKey *newKey = [SwordKey swordKeyWithSWKey:sk makeCopy:YES];
+    delete sk;
+    
+    return newKey;
+}
+
+- (SwordKey *)getKey {
+    return [SwordKey swordKeyWithSWKey:swModule->getKey()];
+}
+
+- (SwordKey *)getKeyCopy {
+    return [SwordKey swordKeyWithSWKey:swModule->getKey() makeCopy:YES];
+}
+
+#pragma mark - Module metadata processing
+
+- (id)attributeValueForParsedLinkData:(NSDictionary *)data {
+    return [self attributeValueForParsedLinkData:data withTextRenderType:TextTypeStripped];
+}
+
+- (id)attributeValueForParsedLinkData:(NSDictionary *)data withTextRenderType:(TextPullType)textType {
+    id ret = nil;
+    
+    NSString *passage = [data objectForKey:ATTRTYPE_PASSAGE];
+    if(passage) {
+        passage = [[passage stringByReplacingOccurrencesOfString:@"+" withString:@" "] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    } 
+    NSString *attrType = [data objectForKey:ATTRTYPE_TYPE];
+    if([attrType isEqualToString:@"n"]) {
+        NSString *footnoteText = [self entryAttributeValueFootnoteOfType:attrType 
+                                                              indexValue:[data objectForKey:ATTRTYPE_VALUE] 
+                                                                  forKey:[SwordKey swordKeyWithRef:passage]];
+        ret = footnoteText;
+    } else if([attrType isEqualToString:@"x"] || [attrType isEqualToString:@"scriptRef"] || [attrType isEqualToString:@"scripRef"]) {
+        NSString *key = @"";
+        if([attrType isEqualToString:@"x"]) {
+            key = [self entryAttributeValueFootnoteOfType:attrType
+                                               indexValue:[data objectForKey:ATTRTYPE_VALUE] 
+                                                   forKey:[SwordKey swordKeyWithRef:passage]];            
+        } else {
+            key = [[[data objectForKey:ATTRTYPE_VALUE] stringByReplacingOccurrencesOfString:@"+" 
+                                                                                 withString:@" "] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];            
+        }
+        if(textType == TextTypeRendered) {
+            ret = [self renderedTextEntriesForRef:key];
+        } else {
+            ret = [self strippedTextEntriesForRef:key];
+        }
+    }
+    
+    return ret;
+}
+
+- (void)setProcessEntryAttributes:(BOOL)flag {
+    swModule->processEntryAttributes(flag);
+}
+
+- (BOOL)processEntryAttributes {
+    return swModule->isProcessEntryAttributes();
+}
+
+- (NSString *)entryAttributeValuePreverse {
+    NSString *ret = [NSString stringWithUTF8String:swModule->getEntryAttributes()["Heading"]["Preverse"]["0"].c_str()];
+    
+    return ret;
+}
+
+- (NSString *)entryAttributeValueFootnoteOfType:(NSString *)fnType indexValue:(NSString *)index {
+    NSString *ret = @"";    
+    if([fnType isEqualToString:@"x"]) {
+        ret = [NSString stringWithUTF8String:swModule->getEntryAttributes()["Footnote"][[index UTF8String]]["refList"].c_str()];        
+    } else if([fnType isEqualToString:@"n"]) {
+        ret = [NSString stringWithUTF8String:swModule->getEntryAttributes()["Footnote"][[index UTF8String]]["body"].c_str()];
+    }
+    return ret;
+}
+
+- (NSArray *)entryAttributeValuesLemma {
+    NSMutableArray *array = [NSMutableArray array];
+    
+    // parse entry attributes and look for Lemma (String's numbers)
+    sword::AttributeTypeList::iterator words;
+    sword::AttributeList::iterator word;
+    sword::AttributeValue::iterator strongVal;
+    words = swModule->getEntryAttributes().find("Word");
+    if(words != swModule->getEntryAttributes().end()) {
+        for(word = words->second.begin();word != words->second.end(); word++) {
+            strongVal = word->second.find("Lemma");
+            if(strongVal != word->second.end()) {
+                // pass empty "Text" entries
+                if(strongVal->second == "G3588") {
+                    if (word->second.find("Text") == word->second.end())
+                        continue;	// no text? let's skip
+                }
+                NSMutableString *stringValStr = [NSMutableString stringWithUTF8String:(const char *)strongVal->second];
+                if(stringValStr) {
+                    [stringValStr replaceOccurrencesOfString:@"|x-Strongs:" withString:@" " options:0 range:NSMakeRange(0, [stringValStr length])];                    
+                    [array addObject:stringValStr];
+                }
+            }
+        }
+    }
+    return [NSArray arrayWithArray:array];
+}
+
+- (NSString *)entryAttributeValuePreverseForKey:(SwordKey *)aKey {
+    [moduleLock lock];
+    [self setSwordKey:aKey];
+    swModule->RenderText(); // force processing of key
+    NSString *value = [self entryAttributeValuePreverse];
+    [moduleLock unlock];
+    return value;
+}
+
+- (NSString *)entryAttributeValueFootnoteOfType:(NSString *)fnType indexValue:(NSString *)index forKey:(SwordKey *)aKey {
+    [moduleLock lock];
+    [self setSwordKey:aKey];
+    swModule->RenderText(); // force processing of key
+    NSString *value = [self entryAttributeValueFootnoteOfType:fnType indexValue:index];
+    [moduleLock unlock];
+    return value;
+}
+
+
+- (NSString *)description {
+    return [self name];
+}
+
+#pragma mark - Module text access
+
+- (NSString *)renderedText {
+    NSString *ret = @"";
+    ret = [NSString stringWithUTF8String:swModule->RenderText()];
+    if(!ret) {
+        ret = [NSString stringWithCString:swModule->RenderText() encoding:NSISOLatin1StringEncoding];
+    }
+    return ret;
+}
+
+- (NSString *)renderedTextFromString:(NSString *)aString {
+    NSString *ret = @"";
+    ret = [NSString stringWithUTF8String:swModule->RenderText([aString UTF8String])];
+    if(!ret) {
+        ret = [NSString stringWithCString:swModule->RenderText([aString UTF8String]) encoding:NSISOLatin1StringEncoding];
+    }
+    return ret;
+}
+
+- (NSString *)strippedText {
+    NSString *ret = @"";
+    ret = [NSString stringWithUTF8String:swModule->StripText()];
+    if(!ret) {
+        ret = [NSString stringWithCString:swModule->StripText() encoding:NSISOLatin1StringEncoding];
+    }
+    return ret;
+}
+
+- (NSString *)strippedTextFromString:(NSString *)aString {
+    NSString *ret = @"";
+    ret = [NSString stringWithUTF8String:swModule->RenderText([aString UTF8String])];
+    if(!ret) {
+        ret = [NSString stringWithCString:swModule->RenderText([aString UTF8String]) encoding:NSISOLatin1StringEncoding];
+    }
+    return ret;
+}
+
+- (NSArray *)strippedTextEntriesForRef:(NSString *)reference {
+    return [self textEntriesForReference:reference textType:TextTypeStripped];
+}
+
+- (NSArray *)renderedTextEntriesForRef:(NSString *)reference {
+    return [self textEntriesForReference:reference textType:TextTypeRendered];
+}
+
+- (SwordModuleTextEntry *)textEntryForKey:(SwordKey *)aKey textType:(TextPullType)aType {
+    SwordModuleTextEntry *ret = nil;
+    
+    if(aKey) {
+        [moduleLock lock];
+        [self setSwordKey:aKey];
+        if(![self error]) {
+            NSString *txt = @"";
+            if(aType == TextTypeRendered) {
+                txt = [self renderedText];
+            } else {
+                txt = [self strippedText];
+            }
+            
+            if(txt) {
+                ret = [SwordModuleTextEntry textEntryForKey:[aKey keyText] andText:txt];
+            } else {
+                ALog(@"Nil key");
+            }
+        }
+        [moduleLock unlock];
+    }
+    
+    return ret;
+}
+
+- (SwordModuleTextEntry *)textEntryForKeyString:(NSString *)aKeyString textType:(TextPullType)aType {
+    return [self textEntryForKey:[SwordKey swordKeyWithRef:aKeyString] textType:aType];
+}
+
+- (NSArray *)textEntriesForReference:(NSString *)aReference textType:(TextPullType)textType {
+    NSArray *ret = nil;
+    
+    SwordModuleTextEntry *entry = [self textEntryForKey:[SwordKey swordKeyWithRef:aReference] 
+                                               textType:textType];
+    if(entry) {
+        ret = [NSArray arrayWithObject:entry];
+    }
+    
+    return ret;    
+}
+
+- (void)writeEntry:(SwordModuleTextEntry *)anEntry {}
+
+- (long)entryCount {
+    return 0;
+}
+
+- (sword::SWModule *)swModule {
+	return swModule;
+}
+
+@end
diff --git a/bindings/objc/src/SwordModuleTextEntry.h b/bindings/objc/src/SwordModuleTextEntry.h
new file mode 100644
index 0000000..7759be4
--- /dev/null
+++ b/bindings/objc/src/SwordModuleTextEntry.h
@@ -0,0 +1,24 @@
+//
+//  SwordModuleTextEntry.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 03.10.09.
+//  Copyright 2009 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class SwordKey;
+
+@interface SwordModuleTextEntry : NSObject {
+    NSString *key;
+    NSString *text;
+}
+
+@property (readwrite, retain) NSString *key;
+@property (readwrite, retain) NSString *text;
+
++ (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText;
+- (id)initWithKey:(NSString *)aKey andText:(NSString *)aText;
+
+@end
diff --git a/bindings/objc/src/SwordModuleTextEntry.m b/bindings/objc/src/SwordModuleTextEntry.m
new file mode 100644
index 0000000..3dec05d
--- /dev/null
+++ b/bindings/objc/src/SwordModuleTextEntry.m
@@ -0,0 +1,42 @@
+//
+//  SwordModuleTextEntry.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 03.10.09.
+//  Copyright 2009 Software by MABE. All rights reserved.
+//
+
+#import "SwordModuleTextEntry.h"
+#import "SwordKey.h"
+
+@implementation SwordModuleTextEntry
+
+@synthesize key;
+@synthesize text;
+
++ (id)textEntryForKey:(NSString *)aKey andText:(NSString *)aText {
+    return [[[SwordModuleTextEntry alloc] initWithKey:aKey andText:aText] autorelease];
+}
+
+- (id)initWithKey:(NSString *)aKey andText:(NSString *)aText {
+    self = [super init];
+    if(self) {
+        self.key = aKey;
+        self.text = aText;
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [self setKey:nil];
+    [self setText:nil];
+    
+    [super dealloc];
+}
+
+@end
diff --git a/bindings/objc/src/SwordModuleTreeEntry.h b/bindings/objc/src/SwordModuleTreeEntry.h
new file mode 100644
index 0000000..cd27cbe
--- /dev/null
+++ b/bindings/objc/src/SwordModuleTreeEntry.h
@@ -0,0 +1,22 @@
+//
+//  SwordTreeEntry.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 29.08.08.
+//  Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface SwordModuleTreeEntry : NSObject {
+    NSString *key;
+    NSArray *content;
+}
+
+@property (retain, readwrite) NSString *key;
+@property (retain, readwrite) NSArray *content;
+
+- (id)initWithKey:(NSString *)aKey content:(NSArray *)aContent;
+
+@end
diff --git a/bindings/objc/src/SwordModuleTreeEntry.m b/bindings/objc/src/SwordModuleTreeEntry.m
new file mode 100644
index 0000000..fea0b16
--- /dev/null
+++ b/bindings/objc/src/SwordModuleTreeEntry.m
@@ -0,0 +1,38 @@
+//
+//  SwordTreeEntry.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 29.08.08.
+//  Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordModuleTreeEntry.h"
+
+
+@implementation SwordModuleTreeEntry
+
+@synthesize key;
+@synthesize content;
+
+- (id)initWithKey:(NSString *)aKey content:(NSArray *)aContent {
+    self = [super init];
+    if(self) {
+        self.key = aKey;
+        self.content = aContent;
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [self setKey:nil];
+    [self setContent:nil];
+    
+    [super dealloc];
+}
+
+@end
diff --git a/bindings/objc/src/SwordUtil.h b/bindings/objc/src/SwordUtil.h
new file mode 100644
index 0000000..92779bf
--- /dev/null
+++ b/bindings/objc/src/SwordUtil.h
@@ -0,0 +1,20 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+// To change the template use AppCode | Preferences | File Templates.
+//
+
+
+#import <Foundation/Foundation.h>
+
+
+@interface SwordUtil : NSObject
+
+/**
+ Rendered Module texts may have hyperlinks. Those links may have key/value pairs to target data.
+ This method will return a dictionary with attribute/value pairs from parameters of the link.
+ See ATTRTYPE_* for key types.
+ */
++ (NSDictionary *)dictionaryFromUrl:(NSURL *)aURL;
+
+@end
diff --git a/bindings/objc/src/SwordUtil.m b/bindings/objc/src/SwordUtil.m
new file mode 100644
index 0000000..9f53870
--- /dev/null
+++ b/bindings/objc/src/SwordUtil.m
@@ -0,0 +1,64 @@
+//
+// Created by mbergmann on 18.12.12.
+//
+// To change the template use AppCode | Preferences | File Templates.
+//
+
+
+#import <ObjCSword/ObjCSword.h>
+#import "SwordUtil.h"
+
+
+@implementation SwordUtil
+
++ (NSDictionary *)dictionaryFromUrl:(NSURL *)aURL {
+    NSMutableDictionary *ret = [NSMutableDictionary dictionary];
+
+    NSString *scheme = [aURL scheme];
+    if([scheme isEqualToString:@"sword"]) {
+        // in this case host is the module and path the reference
+        [ret setObject:[aURL host] forKey:ATTRTYPE_MODULE];
+        [ret setObject:[[[aURL path] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]
+                        stringByReplacingOccurrencesOfString:@"/" withString:@""]
+                forKey:ATTRTYPE_VALUE];
+        [ret setObject:@"scriptRef" forKey:ATTRTYPE_TYPE];
+        [ret setObject:@"showRef" forKey:ATTRTYPE_ACTION];
+    } else if([scheme isEqualToString:@"applewebdata"]) {
+        // in this case
+        NSString *path = [aURL path];
+        NSString *query = [aURL query];
+        if([[path lastPathComponent] isEqualToString:@"passagestudy.jsp"]) {
+            NSArray *data = [query componentsSeparatedByString:@"&"];
+            NSString *type = @"x";
+            NSString *module = @"";
+            NSString *passage = @"";
+            NSString *value = @"1";
+            NSString *action = @"";
+            for(NSString *entry in data) {
+                if([entry hasPrefix:@"type="]) {
+                    type = [[entry componentsSeparatedByString:@"="] objectAtIndex:1];
+                } else if([entry hasPrefix:@"module="]) {
+                    module = [[entry componentsSeparatedByString:@"="] objectAtIndex:1];
+                } else if([entry hasPrefix:@"passage="]) {
+                    passage = [[entry componentsSeparatedByString:@"="] objectAtIndex:1];
+                } else if([entry hasPrefix:@"action="]) {
+                    action = [[entry componentsSeparatedByString:@"="] objectAtIndex:1];
+                } else if([entry hasPrefix:@"value="]) {
+                    value = [[entry componentsSeparatedByString:@"="] objectAtIndex:1];
+                } else {
+                    ALog(@"Unknown parameter: %@", entry);
+                }
+            }
+
+            [ret setObject:[module stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_MODULE];
+            [ret setObject:[passage stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_PASSAGE];
+            [ret setObject:[value stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_VALUE];
+            [ret setObject:[action stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_ACTION];
+            [ret setObject:[type stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] forKey:ATTRTYPE_TYPE];
+        }
+    }
+
+    return ret;
+}
+
+@end
\ No newline at end of file
diff --git a/bindings/objc/src/SwordVerseKey.h b/bindings/objc/src/SwordVerseKey.h
new file mode 100644
index 0000000..a72911b
--- /dev/null
+++ b/bindings/objc/src/SwordVerseKey.h
@@ -0,0 +1,55 @@
+//
+//  SwordVerseKey.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 17.03.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SwordKey.h"
+
+#ifdef __cplusplus
+#include <versekey.h>
+#endif
+
+@interface SwordVerseKey : SwordKey {
+}
+
++ (SwordVerseKey *)verseKey;
++ (SwordVerseKey *)verseKeyWithVersification:(NSString *)scheme;
++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef;
++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme;
+
+#ifdef __cplusplus
++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk;
++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy;
+- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk;
+- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy;
+- (sword::VerseKey *)swVerseKey;
+#endif
+
+- (SwordVerseKey *)initWithVersification:(NSString *)scheme;
+- (SwordVerseKey *)initWithRef:(NSString *)aRef;
+- (SwordVerseKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme;
+
+- (int)index;
+- (int)testament;
+- (void)setTestament:(char)val;
+- (int)book;
+- (void)setBook:(char)val;
+- (int)chapter;
+- (void)setChapter:(int)val;
+- (int)verse;
+- (void)setVerse:(int)val;
+- (BOOL)headings;
+- (void)setHeadings:(BOOL)flag;
+- (BOOL)autoNormalize;
+- (void)setAutoNormalize:(BOOL)flag;
+- (NSString *)bookName;
+- (NSString *)osisBookName;
+- (NSString *)osisRef;
+- (void)setVersification:(NSString *)versification;
+- (NSString *)versification;
+
+@end
diff --git a/bindings/objc/src/SwordVerseKey.mm b/bindings/objc/src/SwordVerseKey.mm
new file mode 100644
index 0000000..ca15f17
--- /dev/null
+++ b/bindings/objc/src/SwordVerseKey.mm
@@ -0,0 +1,163 @@
+//
+//  SwordVerseKey.mm
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 17.03.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordVerseKey.h"
+
+
+@implementation SwordVerseKey
+
++ (SwordVerseKey *)verseKey {
+    return [[[SwordVerseKey alloc] init] autorelease];
+}
+
++ (SwordVerseKey *)verseKeyWithVersification:(NSString *)scheme {
+    return [[[SwordVerseKey alloc] initWithVersification:scheme] autorelease];
+}
+
++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef {
+    return [[[SwordVerseKey alloc] initWithRef:aRef] autorelease];
+}
+
++ (SwordVerseKey *)verseKeyWithRef:(NSString *)aRef v11n:(NSString *)scheme {
+    return [[[SwordVerseKey alloc] initWithRef:aRef v11n:scheme] autorelease];
+}
+
++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk {
+    return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk] autorelease];
+}
+
++ (SwordVerseKey *)verseKeyWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy {
+    return [[[SwordVerseKey alloc] initWithSWVerseKey:aVk makeCopy:copy] autorelease];    
+}
+
+- (id)init {
+    return [self initWithRef:nil];
+}
+
+- (SwordVerseKey *)initWithVersification:(NSString *)scheme {
+    return [self initWithRef:nil v11n:scheme];
+}
+
+- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk {
+    return [self initWithSWVerseKey:aVk makeCopy:NO];
+}
+
+- (SwordVerseKey *)initWithSWVerseKey:(sword::VerseKey *)aVk makeCopy:(BOOL)copy {
+    self = [super initWithSWKey:aVk makeCopy:copy];
+    if(self) {
+        [self swVerseKey]->setVersificationSystem(aVk->getVersificationSystem());
+    }
+    return self;    
+}
+
+- (SwordVerseKey *)initWithRef:(NSString *)aRef {
+    return [self initWithRef:aRef v11n:nil];
+}
+
+- (SwordVerseKey *)initWithRef:(NSString *)aRef v11n:(NSString *)scheme {
+    sword::VerseKey *vk = new sword::VerseKey();            
+    self = [super initWithSWKey:vk];
+    if(self) {
+        created = YES;
+        if(scheme) {
+            [self setVersification:scheme];
+        }
+        
+        if(aRef) {
+            [self setKeyText:aRef];
+        }        
+    }    
+    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [super dealloc];    
+}
+
+- (SwordKey *)clone {
+    return [SwordVerseKey verseKeyWithSWVerseKey:(sword::VerseKey *)sk];
+}
+
+- (BOOL)headings {
+    return (BOOL)((sword::VerseKey *)sk)->Headings();
+}
+
+- (void)setHeadings:(BOOL)flag {
+    ((sword::VerseKey *)sk)->Headings(flag);
+}
+
+- (BOOL)autoNormalize {
+    return (BOOL)((sword::VerseKey *)sk)->AutoNormalize();
+}
+
+- (void)setAutoNormalize:(BOOL)flag {
+    ((sword::VerseKey *)sk)->AutoNormalize(flag);
+}
+
+- (int)testament {
+    return ((sword::VerseKey *)sk)->getTestament();
+}
+
+- (int)book {
+    return ((sword::VerseKey *)sk)->getBook();
+}
+
+- (int)chapter {
+    return ((sword::VerseKey *)sk)->getChapter();
+}
+
+- (int)verse {
+    return ((sword::VerseKey *)sk)->getVerse();
+}
+
+- (void)setTestament:(char)val {
+    ((sword::VerseKey *)sk)->setTestament(val);
+}
+
+- (void)setBook:(char)val {
+    ((sword::VerseKey *)sk)->setBook(val);
+}
+
+- (void)setChapter:(int)val {
+    ((sword::VerseKey *)sk)->setChapter(val);
+}
+
+- (void)setVerse:(int)val {
+    ((sword::VerseKey *)sk)->setVerse(val);
+}
+
+- (NSString *)bookName {
+    return [NSString stringWithUTF8String:((sword::VerseKey *)sk)->getBookName()];
+}
+
+- (NSString *)osisBookName {
+    return [NSString stringWithUTF8String:((sword::VerseKey *)sk)->getOSISBookName()];
+}
+
+- (NSString *)osisRef {
+    return [NSString stringWithUTF8String:((sword::VerseKey *)sk)->getOSISRef()];    
+}
+
+- (void)setVersification:(NSString *)versification {
+    ((sword::VerseKey *)sk)->setVersificationSystem([versification UTF8String]);
+}
+
+- (NSString *)versification {
+    return [NSString stringWithUTF8String:((sword::VerseKey *)sk)->getVersificationSystem()];
+}
+
+- (sword::VerseKey *)swVerseKey {
+    return (sword::VerseKey *)sk;
+}
+
+@end
diff --git a/bindings/objc/src/SwordVerseManager.h b/bindings/objc/src/SwordVerseManager.h
new file mode 100644
index 0000000..c9667c5
--- /dev/null
+++ b/bindings/objc/src/SwordVerseManager.h
@@ -0,0 +1,36 @@
+//
+//  SwordVerseManager.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 19.03.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef __cplusplus
+#include <versificationmgr.h>
+class sword::VersificationMgr::Book;
+#endif
+
+#define SW_VERSIFICATION_KJV       @"KJV"
+
+@interface SwordVerseManager : NSObject {
+#ifdef __cplusplus
+    sword::VersificationMgr *verseMgr;
+#endif
+    NSMutableDictionary *booksPerVersification;
+}
+
++ (SwordVerseManager *)defaultManager;
+
+/** convenience method that returns the books for default scheme (KJV) */
+- (NSArray *)books;
+/** books for a versification scheme */
+- (NSArray *)booksForVersification:(NSString *)verseScheme;
+
+#ifdef __cplusplus
+- (sword::VersificationMgr *)verseMgr;
+#endif
+
+@end
diff --git a/bindings/objc/src/SwordVerseManager.mm b/bindings/objc/src/SwordVerseManager.mm
new file mode 100644
index 0000000..72f26fc
--- /dev/null
+++ b/bindings/objc/src/SwordVerseManager.mm
@@ -0,0 +1,85 @@
+//
+//  SwordVerseManager.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 19.03.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordVerseManager.h"
+#import "SwordBibleBook.h"
+
+
+@interface SwordVerseManager ()
+
+@property (retain, readwrite) NSMutableDictionary *booksPerVersification;
+
+@end
+
+@implementation SwordVerseManager
+
+@synthesize booksPerVersification;
+
++ (SwordVerseManager *)defaultManager {
+    static SwordVerseManager *singleton = nil;
+    if(!singleton) {
+        singleton = [[SwordVerseManager alloc] init];
+    }
+    
+    return singleton;
+}
+
+- (id)init {
+    self = [super init];
+    if(self) {
+        self.booksPerVersification = [NSMutableDictionary dictionary];
+        verseMgr = sword::VersificationMgr::getSystemVersificationMgr();
+    }
+    
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [self setBooksPerVersification:nil];
+    
+    [super dealloc];
+}
+
+/** convenience method that returns the books for default scheme (KJV) */
+- (NSArray *)books {
+    return [self booksForVersification:SW_VERSIFICATION_KJV];
+}
+
+/** books for a versification scheme */
+- (NSArray *)booksForVersification:(NSString *)verseScheme {
+    NSArray *ret = [booksPerVersification objectForKey:verseScheme];
+    if(ret == nil) {
+        // hasn't been initialized yet
+        const sword::VersificationMgr::System *system = verseMgr->getVersificationSystem([verseScheme UTF8String]);
+        NSUInteger bookCount = (NSUInteger)system->getBookCount();
+        NSMutableArray *buf = [NSMutableArray arrayWithCapacity:bookCount];
+        for(int i = 0;i < bookCount;i++) {
+            sword::VersificationMgr::Book *book = (sword::VersificationMgr::Book *)system->getBook(i);
+            
+            SwordBibleBook *bb = [[[SwordBibleBook alloc] initWithBook:book] autorelease];
+            [bb setNumber:i+1]; // VerseKey-Book() starts at index 1
+            
+            // add to array
+            [buf addObject:bb];
+        }
+        [booksPerVersification setObject:buf forKey:verseScheme];
+        ret = buf;
+    }
+    
+    return ret;
+}
+
+- (sword::VersificationMgr *)verseMgr {
+    return verseMgr;
+}
+
+@end
diff --git a/bindings/objc/src/VerseEnumerator.h b/bindings/objc/src/VerseEnumerator.h
new file mode 100644
index 0000000..52da7ab
--- /dev/null
+++ b/bindings/objc/src/VerseEnumerator.h
@@ -0,0 +1,22 @@
+//
+//  VerseEnumerator.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 25.02.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class SwordListKey;
+
+@interface VerseEnumerator : NSEnumerator {
+    SwordListKey *listKey;
+}
+
+- (id)initWithListKey:(SwordListKey *)aListKey;
+
+- (NSArray *)allObjects;
+- (NSString *)nextObject;
+
+@end
diff --git a/bindings/objc/src/VerseEnumerator.mm b/bindings/objc/src/VerseEnumerator.mm
new file mode 100644
index 0000000..cd5c665
--- /dev/null
+++ b/bindings/objc/src/VerseEnumerator.mm
@@ -0,0 +1,58 @@
+//
+//  VerseEnumerator.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 25.02.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import "VerseEnumerator.h"
+#import "SwordListKey.h"
+
+@interface VerseEnumerator ()
+@property (retain, readwrite) SwordListKey *listKey;
+@end
+
+@implementation VerseEnumerator
+
+@synthesize listKey;
+
+- (id)initWithListKey:(SwordListKey *)aListKey {
+    self = [super init];
+    if(self) {
+        self.listKey = aListKey;
+        *[listKey swListKey] = sword::TOP;
+    }
+    return self;
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [listKey release];
+    [super dealloc];
+}
+
+- (NSArray *)allObjects {
+    NSMutableArray *t = [NSMutableArray array];
+    for(*[listKey swListKey] = sword::TOP;![listKey swListKey]->Error(); *[listKey swListKey] += 1) {
+        [t addObject:[listKey keyText]];
+    }
+    // position TOP again
+    *[listKey swListKey] = sword::TOP;
+    
+    return [NSArray arrayWithArray:t];
+}
+
+- (NSString *)nextObject {
+    NSString *ret = nil;
+    if(![listKey swListKey]->Error()) {
+        ret = [listKey keyText];
+        *[listKey swListKey] += 1;
+    }
+    return ret;
+}
+
+@end
diff --git a/bindings/objc/src/services/Configuration.h b/bindings/objc/src/services/Configuration.h
new file mode 100644
index 0000000..e967c58
--- /dev/null
+++ b/bindings/objc/src/services/Configuration.h
@@ -0,0 +1,45 @@
+//
+//  Configuration.h
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 12.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+/*
+ To define your own configuration:
+ Create a subclass of Configuration and override the methods there (as done in OSXConfiguration).
+ To globally apply your configuration do:
+ [[Configuration config] setClass:[<YourConfigSubclass> class]];
+ */
+
+@protocol Configuration
+
+- (NSString *)osVersion;
+- (NSString *)bundleVersion;
+- (NSString *)defaultModulePath;
+- (NSString *)defaultAppSupportPath;
+- (NSString *)tempFolder;
+- (NSString *)logFile;
+
+@end
+
+@interface Configuration : NSObject <Configuration> {
+    Configuration *impl;
+}
+
++ (Configuration *)config;
++ (Configuration *)configWithImpl:(id<Configuration>)configImpl;
+
+- (NSString *)osVersion;
+- (NSString *)bundleVersion;
+- (NSString *)defaultModulePath;
+- (NSString *)defaultAppSupportPath;
+- (NSString *)tempFolder;
+- (NSString *)logFile;
+
+- (void)setImpl:(id<Configuration>)configImpl;
+
+@end
diff --git a/bindings/objc/src/services/Configuration.m b/bindings/objc/src/services/Configuration.m
new file mode 100644
index 0000000..67ec709
--- /dev/null
+++ b/bindings/objc/src/services/Configuration.m
@@ -0,0 +1,54 @@
+//
+//  Configuration.m
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 13.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import "Configuration.h"
+
+@implementation Configuration
+
++ (Configuration *)config {
+    static Configuration *instance = nil;
+    if(instance == nil) {
+        instance = [[Configuration alloc] init];
+    }
+    return instance;
+}
+
++ (Configuration *)configWithImpl:(id<Configuration>)configImpl {
+    [[Configuration config] setImpl:configImpl];
+    return [Configuration config];
+}
+
+- (id)init {
+    return [super init];
+}
+
+- (void)finalize {
+    [super finalize];
+}
+
+- (void)dealloc {
+    [impl release];
+
+    [super dealloc];
+}
+
+- (void)setImpl:(id<Configuration>)configImpl {
+    impl = (Configuration *)configImpl;
+    [impl retain];
+}
+
+#pragma mark Configuration implementation
+
+- (NSString *)osVersion {return [impl osVersion];}
+- (NSString *)bundleVersion {return [impl bundleVersion];}
+- (NSString *)defaultModulePath {return [impl defaultModulePath];}
+- (NSString *)defaultAppSupportPath {return [impl defaultAppSupportPath];}
+- (NSString *)tempFolder {return [impl tempFolder];}
+- (NSString *)logFile {return [impl logFile];}
+
+@end
diff --git a/bindings/objc/src/services/OSXConfiguration.h b/bindings/objc/src/services/OSXConfiguration.h
new file mode 100644
index 0000000..93e02e1
--- /dev/null
+++ b/bindings/objc/src/services/OSXConfiguration.h
@@ -0,0 +1,22 @@
+//
+//  OSXConfiguration.h
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 12.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Configuration.h"
+
+@interface OSXConfiguration : Configuration <Configuration> {
+}
+
+- (NSString *)osVersion;
+- (NSString *)bundleVersion;
+- (NSString *)defaultModulePath;
+- (NSString *)defaultAppSupportPath;
+- (NSString *)tempFolder;
+- (NSString *)logFile;
+
+@end
diff --git a/bindings/objc/src/services/OSXConfiguration.m b/bindings/objc/src/services/OSXConfiguration.m
new file mode 100644
index 0000000..7d53987
--- /dev/null
+++ b/bindings/objc/src/services/OSXConfiguration.m
@@ -0,0 +1,38 @@
+//
+//  OSXConfiguration.m
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 12.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import "OSXConfiguration.h"
+
+
+@implementation OSXConfiguration
+
+- (NSString *)osVersion {
+    return [[NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"] objectForKey:@"ProductVersion"];
+}
+
+- (NSString *)bundleVersion {
+    return (NSString *)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleVersionKey);
+}
+
+- (NSString *)defaultModulePath {
+    return [@"~/Library/Application Support/Sword" stringByExpandingTildeInPath];
+}
+
+- (NSString *)defaultAppSupportPath {
+    return [@"~/Library/Application Support/MacSword" stringByExpandingTildeInPath];
+}
+
+- (NSString *)tempFolder {
+    return [@"~/Library/Caches/ObjCSword" stringByExpandingTildeInPath];
+}
+
+- (NSString *)logFile {
+    return [@"~/Library/Logs/ObjCSword.log" stringByExpandingTildeInPath];
+}
+
+@end
diff --git a/bindings/objc/src/services/iOSConfiguration.h b/bindings/objc/src/services/iOSConfiguration.h
new file mode 100644
index 0000000..2f0989b
--- /dev/null
+++ b/bindings/objc/src/services/iOSConfiguration.h
@@ -0,0 +1,24 @@
+//
+//  iOSConfiguration.h
+//  ObjCSword-iOS
+//
+//  Created by Manfred Bergmann on 10.03.11.
+//  Copyright 2011 Software by MABE. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+#import "Configuration.h"
+
+
+@interface iOSConfiguration : Configuration <Configuration> {
+}
+
+- (NSString *)osVersion;
+- (NSString *)bundleVersion;
+- (NSString *)defaultModulePath;
+- (NSString *)defaultAppSupportPath;
+- (NSString *)tempFolder;
+- (NSString *)logFile;
+
+@end
diff --git a/bindings/objc/src/services/iOSConfiguration.m b/bindings/objc/src/services/iOSConfiguration.m
new file mode 100644
index 0000000..2f5b439
--- /dev/null
+++ b/bindings/objc/src/services/iOSConfiguration.m
@@ -0,0 +1,38 @@
+//
+//  iOSConfiguration.m
+//  ObjCSword-iOS
+//
+//  Created by Manfred Bergmann on 10.03.11.
+//  Copyright 2011 Software by MABE. All rights reserved.
+//
+
+#import "iOSConfiguration.h"
+
+
+@implementation iOSConfiguration
+
+- (NSString *)osVersion {
+    return [[UIDevice currentDevice] systemVersion];
+}
+
+- (NSString *)bundleVersion {
+    return (NSString *)CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleVersionKey);
+}
+
+- (NSString *)defaultModulePath {
+    return [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex: 0] stringByAppendingString: @"/Modules"];
+}
+
+- (NSString *)defaultAppSupportPath {
+    return [[NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) objectAtIndex: 0] stringByAppendingString: @"/"];
+}
+
+- (NSString *)tempFolder {
+    return [[NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) objectAtIndex: 0] stringByAppendingString: @"/Temp"];
+}
+
+- (NSString *)logFile {
+    return [super logFile];
+}
+
+@end
diff --git a/bindings/objc/test/SwordListKeyTest.h b/bindings/objc/test/SwordListKeyTest.h
new file mode 100644
index 0000000..4d4ff43
--- /dev/null
+++ b/bindings/objc/test/SwordListKeyTest.h
@@ -0,0 +1,14 @@
+//
+//  SwordListKeyTest.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 10.04.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface SwordListKeyTest : SenTestCase {
+}
+
+@end
diff --git a/bindings/objc/test/SwordListKeyTest.m b/bindings/objc/test/SwordListKeyTest.m
new file mode 100644
index 0000000..73d47dc
--- /dev/null
+++ b/bindings/objc/test/SwordListKeyTest.m
@@ -0,0 +1,51 @@
+//
+//  SwordListKeyTest.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 10.04.09.
+//  Copyright 2009 __MyCompanyName__. All rights reserved.
+//
+
+#import <ObjCSword/ObjCSword.h>
+#import "SwordListKeyTest.h"
+
+@implementation SwordListKeyTest
+
+- (void)testContainsKey {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"Gen 1:1-5"];
+    SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"Gen 1:3"];
+    STAssertTrue([lk containsKey:vk], @"");
+}
+
+/*
+- (void)testNumberOfVerses {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20"];
+    STAssertNotNil(lk, @"");
+    STAssertTrue(([lk numberOfVerses] == 19), @"");
+}
+*/
+
+- (void)testVerseEnumeratorAllObjects {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20"];
+    STAssertNotNil(lk, @"");
+    
+    VerseEnumerator *ve = [lk verseEnumerator];
+    NSArray *verseRefs = [ve allObjects];
+    STAssertNotNil(verseRefs, @"");
+    STAssertTrue(([verseRefs count] == 19), @"");
+}
+
+- (void)testVerseEnumeratorNextObject {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:2-20"];
+    STAssertNotNil(lk, @"");
+    
+    VerseEnumerator *ve = [lk verseEnumerator];
+    int count = 0;
+    NSString *ref;
+    while((ref = [ve nextObject])) {
+        count++;
+    }
+    STAssertTrue((count == 19), @"");
+}
+
+@end
diff --git a/bindings/objc/test/SwordManagerTest.h b/bindings/objc/test/SwordManagerTest.h
new file mode 100644
index 0000000..167d335
--- /dev/null
+++ b/bindings/objc/test/SwordManagerTest.h
@@ -0,0 +1,16 @@
+//
+//  SwordManagerTest.h
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 14.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+
+@interface SwordManagerTest : SenTestCase {
+
+}
+
+@end
diff --git a/bindings/objc/test/SwordManagerTest.m b/bindings/objc/test/SwordManagerTest.m
new file mode 100644
index 0000000..d2c93dd
--- /dev/null
+++ b/bindings/objc/test/SwordManagerTest.m
@@ -0,0 +1,26 @@
+//
+//  SwordManagerTest.m
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 14.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <ObjCSword/ObjCSword.h>
+#import "SwordManagerTest.h"
+
+@implementation SwordManagerTest
+
+- (void)setUp {
+    [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]];
+}
+
+- (void)testSwordManagerInit {
+    NSString *modPath = [[Configuration config] defaultModulePath];
+    NSLog(@"%@", modPath);
+    
+    SwordManager *sm = [SwordManager managerWithPath:modPath]; 
+    STAssertTrue([[sm modules] count] > 0, @"");
+}
+
+@end
diff --git a/bindings/objc/test/SwordModuleLongRunTest.h b/bindings/objc/test/SwordModuleLongRunTest.h
new file mode 100644
index 0000000..d415885
--- /dev/null
+++ b/bindings/objc/test/SwordModuleLongRunTest.h
@@ -0,0 +1,17 @@
+//
+//  SwordModuleTest.h
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 14.12.08.
+//  Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@class SwordModule;
+
+@interface SwordModuleTest : SenTestCase {
+    SwordModule *mod;
+}
+
+@end
diff --git a/bindings/objc/test/SwordModuleLongRunTest.mm b/bindings/objc/test/SwordModuleLongRunTest.mm
new file mode 100644
index 0000000..699a18c
--- /dev/null
+++ b/bindings/objc/test/SwordModuleLongRunTest.mm
@@ -0,0 +1,103 @@
+//
+//  SwordModuleTest.m
+//  MacSword2
+//
+//  Created by Manfred Bergmann on 14.12.08.
+//  Copyright 2008 __MyCompanyName__. All rights reserved.
+//
+
+#import "SwordModuleTest.h"
+#ifdef TARGET_IPHONE_SIMULATOR
+#import "SwordManager.h"
+#import "Configuration.h"
+#import "iOSConfiguration.h"
+#import "SwordModule.h"
+#import "SwordBibleTextEntry.h"
+#import "VerseEnumerator.h"
+#import "SwordListKey.h"
+#else
+#import "ObjCSword/ObjCSword.h"
+#endif
+
+@implementation SwordModuleTest
+
+- (void)setUp {
+#ifdef TARGET_IPHONE_SIMULATOR
+    [[Configuration config] setClass:[iOSConfiguration class]];
+#else
+    [[Configuration config] setClass:[OSXConfiguration class]];
+#endif
+    mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"];    
+}
+
+- (void)testCreateSearchIndex {
+    SwordModule *sm = [[SwordManager defaultManager] moduleWithName:@"GerSch"];
+    STAssertNotNil(sm, @"Module is nil");
+    
+    NSLog(@"creating clucene search index...");
+    [sm createSearchIndex];
+    NSLog(@"creating clucene search index...done");
+}
+
+
+- (void)testRenderedTextEntriesForRef {
+    NSArray *entries = [(SwordBible *)mod renderedTextEntriesForRef:@"gen1-rev22"];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    for(SwordBibleTextEntry *entry in entries) {
+        ref = [entry key];
+        rendered = [entry text];
+    }
+}
+
+- (void)testRenderedWithEnumerator {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen1-rev22"];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    VerseEnumerator *iter = [lk verseEnumerator];
+    while((ref = [iter nextObject])) {
+        [(SwordBible *)mod setKeyString:ref];
+        rendered = [mod renderedText];
+    }
+}
+
+- (void)testCommentarySkipLinksPersist {
+    SwordModule *com = [[SwordManager defaultManager] moduleWithName:@"MHC"];
+    
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1-2"];
+    [lk setPersist:YES];
+    [com setSwordKey:lk];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    int count = 0;
+    while(![com error]) {
+        ref = [lk keyText];
+        rendered = [com renderedText];
+        NSLog(@"%@:%@", ref, rendered);
+        [com incKeyPosition];
+        count++;
+    }
+    STAssertTrue((count == 1), @"");
+}
+
+- (void)testCommentarySkipLinksNoPersist {
+    SwordModule *com = [[SwordManager defaultManager] moduleWithName:@"MHC"];
+    
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1-2"];
+    [lk setPersist:NO];
+    [lk setPosition:SWPOS_TOP];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    int count = 0;
+    while(![lk error]) {
+        ref = [lk keyText];
+        [com setSwordKey:lk];
+        rendered = [com renderedText];
+        NSLog(@"%@:%@", ref, rendered);
+        [lk increment];
+        count++;
+    }
+    STAssertTrue((count == 1), @"");
+}
+
+@end
diff --git a/bindings/objc/test/SwordModuleTest.h b/bindings/objc/test/SwordModuleTest.h
new file mode 100644
index 0000000..95135fc
--- /dev/null
+++ b/bindings/objc/test/SwordModuleTest.h
@@ -0,0 +1,18 @@
+//
+//  SwordModuleTest.h
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 14.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@class SwordModule, SwordManager;
+
+@interface SwordModuleTest : SenTestCase {
+    SwordManager *mgr;
+    SwordModule *mod;
+}
+
+@end
diff --git a/bindings/objc/test/SwordModuleTest.m b/bindings/objc/test/SwordModuleTest.m
new file mode 100644
index 0000000..a308513
--- /dev/null
+++ b/bindings/objc/test/SwordModuleTest.m
@@ -0,0 +1,161 @@
+//
+//  SwordModuleTest.m
+//  ObjCSword
+//
+//  Created by Manfred Bergmann on 14.06.10.
+//  Copyright 2010 Software by MABE. All rights reserved.
+//
+
+#import <ObjCSword/ObjCSword.h>
+#import "SwordModuleTest.h"
+
+@implementation SwordModuleTest
+
+- (void)setUp {
+    [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]];
+    mgr = [SwordManager managerWithPath:[[Configuration config] defaultModulePath]];
+    mod = [mgr moduleWithName:@"GerNeUe"];
+}
+
+- (void)testLoopRenderedVerses {
+    SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"];
+    STAssertNotNil(bible, @"Module is nil");
+
+    NSArray *verses = [bible renderedTextEntriesForRef:@"Gen"];
+    STAssertNotNil(verses, @"");
+    STAssertTrue([bible numberOfVerseKeysForReference:@"Gen"] == [verses count], @"");    
+}
+
+- (void)testRenderedVerseText {
+    SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"];
+    STAssertNotNil(bible, @"Module is nil");
+    
+    SwordModuleTextEntry *text = [bible textEntryForKeyString:@"gen1.1" textType:TextTypeRendered];
+    STAssertNotNil(text, @"");
+    STAssertTrue([[text text] length] > 0, @"");
+}
+
+- (void)testCloneModule {
+    SwordBible *bible = (SwordBible *)[mgr moduleWithName:@"GerSch"];
+    STAssertNotNil(bible, @"Module is nil");
+
+    /*
+    SwordBible *cloned = (SwordBible *)[bible clone];
+    STAssertNotNil(cloned, @"Module is nil");    
+     */
+}
+
+- (void)testLoopWithModulePos {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen" v11n:[mod versification]];
+    [lk setPersist:YES];
+    [mod setSwordKey:lk];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    while(![mod error]) {
+        ref = [lk keyText];
+        rendered = [mod renderedText];
+        [mod incKeyPosition];
+    }
+}
+
+- (void)testLoopWithModulePosNoPersist {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen" v11n:[mod versification]];    
+    [lk setPersist:NO];
+    [lk setPosition:SWPOS_TOP];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    while(![lk error]) {
+        ref = [lk keyText];
+        [mod setSwordKey:lk];
+        rendered = [mod renderedText];
+        //NSLog(@"%@:%@", ref, rendered);
+        [lk increment];
+    }
+}
+
+- (void)testLoopWithModulePosWithHeadings {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen" headings:YES v11n:[mod versification]];
+    [lk setPersist:YES];
+    [mod setSwordKey:lk];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    while(![mod error]) {
+        ref = [lk keyText];
+        rendered = [mod renderedText];
+        [mod incKeyPosition];
+    }
+}
+
+- (void)testLoopWithModulePosWithDiverseReference {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1;4:5-8" v11n:[mod versification]];
+    [lk setPersist:YES];
+    [mod setSwordKey:lk];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    while(![mod error]) {
+        ref = [lk keyText];
+        rendered = [mod renderedText];
+        NSLog(@"%@:%@", ref, rendered);
+        [mod incKeyPosition];
+    }
+}
+
+- (void)testLoopWithModulePosNoPersistWithDiverseReference {
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1;4:5-8" v11n:[mod versification]];
+    [lk setPersist:NO];
+    [lk setPosition:SWPOS_TOP];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    while(![lk error]) {
+        ref = [lk keyText];
+        [mod setSwordKey:lk];
+        rendered = [mod renderedText];
+        NSLog(@"%@:%@", ref, rendered);
+        [lk increment];
+    }
+}
+
+- (void)testLoopWithModulePosWithDiverseReferenceAndContext {
+    int context = 1;
+    SwordVerseKey *vk = [SwordVerseKey verseKeyWithVersification:[mod versification]];
+    [vk setPersist:YES];
+    SwordListKey *lk = [SwordListKey listKeyWithRef:@"gen 1:1;4:5;8:4;10:2-5" v11n:[mod versification]];
+    [lk setPersist:YES];
+    [mod setSwordKey:lk];
+    NSString *ref = nil;
+    NSString *rendered = nil;
+    while(![mod error]) {
+        if(context > 0) {
+            [vk setKeyText:[lk keyText]];
+            long lowVerse = [vk verse] - context;
+            long highVerse = lowVerse + (context * 2);
+            [vk setVerse:lowVerse];
+            [mod setSwordKey:vk];
+            for(;lowVerse <= highVerse;lowVerse++) {
+                ref = [vk keyText];
+                rendered = [mod renderedText];                
+                NSLog(@"%@:%@", ref, rendered);
+                [mod incKeyPosition];
+            }
+            // set back list key
+            [mod setSwordKey:lk];
+            [mod incKeyPosition];
+        } else {
+            ref = [lk keyText];
+            rendered = [mod renderedText];
+            NSLog(@"%@:%@", ref, rendered);
+            [mod incKeyPosition];            
+        }
+    }
+}
+
+- (void)testStrippedTextForRef {
+    SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"1Mo 1:2"];
+    NSLog(@"start position: %@", [vk keyText]);
+    [vk decrement];
+    NSLog(@"decrement position: %@", [vk keyText]);
+    [vk setVerse:[vk verse] + 3];
+    NSLog(@"verse + 3: %@", [vk keyText]);
+}
+
+@end
diff --git a/bindings/objc/test/Tests-Info.plist b/bindings/objc/test/Tests-Info.plist
new file mode 100644
index 0000000..c285a47
--- /dev/null
+++ b/bindings/objc/test/Tests-Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/bindings/swig/CMakeLists.txt b/bindings/swig/CMakeLists.txt
new file mode 100644
index 0000000..d2f4b16
--- /dev/null
+++ b/bindings/swig/CMakeLists.txt
@@ -0,0 +1,41 @@
+#####################################################################################################
+#
+# A system to, hopefully, build the Sword bindings which are asked for.  Currently I only know and
+# therefore only support Python & Perl bindings.  YMMV for it, please submit patches or suggestions.
+# I will try to get them integrated into the system if I can.  If there are bindings that you need
+# other than the Python|Perl/Swig bindings, then you should probably speak up now.
+
+MESSAGE(STATUS "\n-- CONFIGURING SWIG BINDINGS")
+#####################################################################################################
+# SWIG
+# We need to find the SWIG executable in order to be able to do this, right?
+FIND_PACKAGE(SWIG)
+
+IF(NOT SWIG_FOUND)
+	MESSAGE(FATAL_ERROR "Swig: no")
+ELSE(NOT SWIG_FOUND)
+	MESSAGE(STATUS "Swig: yes")
+	
+	SET(CMAKE_SWIG_FLAGS "-w-451,-402;-shadow;-c++")
+	
+	MACRO(SWORD_SWIG_GENERATE LANG)
+		ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx
+			COMMAND ${SWIG_EXECUTABLE} ${CMAKE_SWIG_FLAGS} -${LANG} -o "${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx"
+				"-I${CMAKE_SOURCE_DIR}/bindings/swig" ${SWIG_INCLUDES} "${CMAKE_SOURCE_DIR}/bindings/swig/sword.i"
+			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+	ENDMACRO(SWORD_SWIG_GENERATE)
+	
+	GET_DIRECTORY_PROPERTY(cmake_include_directories INCLUDE_DIRECTORIES)
+	SET(SWIG_INCLUDES)
+	FOREACH(directory ${cmake_include_directories})
+		SET(SWIG_INCLUDES ${SWIG_INCLUDES} "-I${directory}")
+	ENDFOREACH(directory ${cmake_include_directories})
+	
+	IF(SWORD_BINDINGS MATCHES ".*Python.*")
+		ADD_SUBDIRECTORY(python)
+	ENDIF(SWORD_BINDINGS MATCHES ".*Python.*")
+	
+	IF(SWORD_BINDINGS MATCHES ".*Perl.*")
+		ADD_SUBDIRECTORY(perl)
+	ENDIF(SWORD_BINDINGS MATCHES ".*Perl.*")
+ENDIF(NOT SWIG_FOUND)
diff --git a/bindings/swig/README b/bindings/swig/README
new file mode 100644
index 0000000..88f5026
--- /dev/null
+++ b/bindings/swig/README
@@ -0,0 +1,35 @@
+Also see the directions in the README file in the parent directory from this
+file (<sword-root>/bindings/README) for directions on building with CMake.
+
+Building the SWIG Bindings
+==========================
+
+You may need to do the following to get this to work. From this directory:
+
+cd package
+
+# Special step for BSD-liks (e.g. Mac OS X):
+# edit autogen.sh to remove the "-a" option from cp
+
+./autogen.sh
+./configure
+make
+
+# Rather than make, you probably only care about one of the languages bindings.
+# So you might try one of these pairs of commands instead:
+# 
+make perlswig
+make perl_make
+cd perl
+sudo make install
+
+#
+# or
+#
+
+make pythonswig
+make python_make
+cd python
+sudo python setup.py install
+
+
diff --git a/bindings/swig/bases.i b/bindings/swig/bases.i
new file mode 100755
index 0000000..91b5152
--- /dev/null
+++ b/bindings/swig/bases.i
@@ -0,0 +1,35 @@
+%{
+#include "rawverse.h"
+#include "zverse.h"
+#include "rawstr.h"
+#include "rawstr4.h"
+#include "zstr.h"
+#include "swgenbook.h"
+#include "lzsscomprs.h"
+#include "zipcomprs.h"
+#include "versekey.h"
+#include "versetreekey.h"
+#include "treekey.h"
+#include "rawgenbook.h"
+#include "swtext.h"
+#include "swcom.h"
+#include "rawcom.h"
+#include "swld.h"
+#include "zld.h"
+#include "zcom.h"
+#include "ztext.h"
+#include "rawld.h"
+#include "rawld4.h"
+#include "treekeyidx.h"
+#include "rawtext.h"
+
+
+%}
+
+%immutable sword::RawVerse::nl;
+
+%include "rawverse.h"
+%include "zverse.h"
+%include "rawstr.h"
+%include "rawstr4.h"
+%include "zstr.h"
diff --git a/bindings/swig/defs.i b/bindings/swig/defs.i
new file mode 100644
index 0000000..4d94cb6
--- /dev/null
+++ b/bindings/swig/defs.i
@@ -0,0 +1,6 @@
+%{
+#include "defs.h"
+%}
+
+%include "defs.h"
+
diff --git a/bindings/swig/deprecations.i b/bindings/swig/deprecations.i
new file mode 100644
index 0000000..bab0381
--- /dev/null
+++ b/bindings/swig/deprecations.i
@@ -0,0 +1,62 @@
+/* Methods that are deprecated in SWORD and should be ignored. */
+
+/* These are all together */
+%ignore sword::SWModule::operator const char *;
+%ignore sword::SWVersion::operator const char *;
+%ignore sword::ListKey::operator const char *;
+%ignore sword::VerseKey::operator const char *;
+%ignore sword::TreeKey::operator const char *;
+%ignore sword::TreeKeyIdx::operator const char *;
+%ignore sword::VerseTreeKey::operator const char *;
+%ignore sword::XMLTag::operator const char *;
+
+%ignore sword::StatusReporter::statusUpdate;
+
+%ignore sword::SWDisplay::Display(SWModule&);
+
+%ignore sword::SWKey::Error();
+%ignore sword::SWKey::Persist() const;
+%ignore sword::SWKey::Persist(signed char);
+
+%ignore sword::SWModule::AddEncodingFilter(SWFilter*);
+%ignore sword::SWModule::AddOptionFilter(SWOptionFilter*);
+%ignore sword::SWModule::AddRawFilter(SWFilter*);
+%ignore sword::SWModule::AddRenderFilter(SWFilter*);
+%ignore sword::SWModule::AddStripFilter(SWFilter*);
+%ignore sword::SWModule::CreateKey;
+%ignore sword::SWModule::Description;
+%ignore sword::SWModule::Direction;
+%ignore sword::SWModule::Disp;
+%ignore sword::SWModule::Display();
+%ignore sword::SWModule::Encoding;
+%ignore sword::SWModule::Error();
+%ignore sword::SWModule::getSkipConsecutiveLinks();
+%ignore sword::SWModule::Index;
+%ignore sword::SWModule::Key;
+%ignore sword::SWModule::KeyText;
+%ignore sword::SWModule::Lang;
+%ignore sword::SWModule::Markup;
+%ignore sword::SWModule::Name;
+%ignore sword::SWModule::processEntryAttributes(bool) const;
+%ignore sword::SWModule::ReplaceEncodingFilter(SWFilter*, SWFilter*);
+%ignore sword::SWModule::RemoveEncodingFilter(SWFilter*);
+%ignore sword::SWModule::RenderText;
+%ignore sword::SWModule::ReplaceRenderFilter(SWFilter*, SWFilter*);
+%ignore sword::SWModule::RemoveRenderFilter(SWFilter*);
+%ignore sword::SWModule::SetKey;
+%ignore sword::SWModule::setKey(SWKey const &);
+%ignore sword::SWModule::StripText;
+%ignore sword::SWModule::Type;
+
+%ignore sword::VerseKey::AutoNormalize;
+%ignore sword::VerseKey::Book;
+%ignore sword::VerseKey::Chapter;
+%ignore sword::VerseKey::ClearBounds();
+%ignore sword::VerseKey::Headings;
+%ignore sword::VerseKey::LowerBound;
+%ignore sword::VerseKey::Normalize;
+%ignore sword::VerseKey::ParseVerseList;
+%ignore sword::VerseKey::Testament;
+%ignore sword::VerseKey::TestamentIndex() const;
+%ignore sword::VerseKey::UpperBound;
+%ignore sword::VerseKey::Verse;
diff --git a/bindings/swig/directors.i b/bindings/swig/directors.i
new file mode 100644
index 0000000..ec5e42c
--- /dev/null
+++ b/bindings/swig/directors.i
@@ -0,0 +1,32 @@
+/* 
+This is a list of all the classes which have directors enabled.
+
+Directors allow virtual methods of classes to be overridden in a subclass in
+the target language. This may have performance implications, and is not
+available for all target languages, though it should be for the main ones
+*/
+%feature("director") sword::SWLog::logMessage;
+%feature("director") PyStringMgr;
+%feature("nodirector") PyStringMgr::upperUTF8;
+%feature("nodirector") PyStringMgr::upperLatin1;
+
+%feature("director") RenderCallback;
+%feature("director") MarkupCallback;
+
+%feature("director") SWSearcher;
+
+%feature("director") sword::StatusReporter;
+%feature("director") sword::FTPTransport;
+%feature("nodirector") sword::FTPTransport::getDirList;
+
+%feature("director:except") {
+    if ($error != NULL) {
+        throw Swig::DirectorMethodException();
+    }
+}
+
+%exception {
+    try { $action }
+    catch (Swig::DirectorException &e) { SWIG_fail; }
+}
+
diff --git a/bindings/swig/encfiltmgr.i b/bindings/swig/encfiltmgr.i
new file mode 100644
index 0000000..1e52fb8
--- /dev/null
+++ b/bindings/swig/encfiltmgr.i
@@ -0,0 +1,11 @@
+%{
+#include "encfiltmgr.h"
+%}
+
+%include "encfiltmgr.h"
+
+%extend sword::EncodingFilterMgr {
+	static sword::EncodingFilterMgr *castTo(sword::SWFilterMgr *o) {
+		return dynamic_cast<sword::EncodingFilterMgr*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/examples/av11n.py b/bindings/swig/examples/av11n.py
new file mode 100755
index 0000000..9ce7979
--- /dev/null
+++ b/bindings/swig/examples/av11n.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+#
+# This does a very roughshod attempt to compare the osisIDs found in an
+# XML file with each of the versifications that SWORD knows about to help
+# a user find the one which is most akin to the one they are using. It is
+# limited in its need for your file to be at least segregated into OT/NT
+# in the proper order, although within each testament, it requires nothing
+# special as for ordering.
+#
+# Invoke simply by calling the program and the file name.  If you want
+# more output, change the following line to be True instead of False
+verbose = False
+debug = True
+import sys
+import re
+verseid = re.compile('^.+\..+\..+$')
+
+# Inform the user that we need the SWORD extension
+try:
+	import Sword
+except:
+	print "You do not have the SWORD library installed. Please install it."
+	sys.exit(1)
+
+# Inform the user that we need pyquery, as it makes parsing XML files that much easier
+try:
+	from pyquery import PyQuery as pq
+except:
+	print "You do not appear to have PyQuery installed. Please install it."
+	sys.exit(2)
+
+# Without the name of a file, we cannot proceed any further
+if len(sys.argv) < 2 or sys.argv[1] == '--help':
+	print "Usage: %s <OSISfile>" % (sys.argv[0],)
+
+# Open the file
+if debug:
+	print 'Opening %s' % (sys.argv[1],)
+d = pq(filename=sys.argv[1])
+# Get the list of versifications
+if debug:
+	print 'Fetching a list of versifications'
+vmgr = Sword.VersificationMgr.getSystemVersificationMgr()
+av11ns = vmgr.getVersificationSystems()
+
+# Get the list of all osisIDs
+if debug:
+	print 'Fetching a list of OSIS IDs'
+ids = d("*[osisID]")
+# Iterate each versification scheme
+for v11n in av11ns:
+	print 'Checking %s' % (v11n.c_str(),)
+	# Construct a list of the IDs in this versification
+	key = Sword.VerseKey()
+	key.setVersificationSystem(v11n.c_str())
+	otkeyList = [] # Anything left in this afterwards is missing from the OSIS ot
+	ntkeyList = [] # Anything left in this afterwards is missing from the OSIS nt
+	otextraKeys = [] # Anything that gets placed in here is extraneous OT material (we think)
+	ntextraKeys = [] # Anything that gets placed in here is extraneous NT material (we think)
+	
+	inNT = False
+	while key.popError() == '\x00':
+		skey = key.getOSISRef()
+		if not inNT and re.match('^Matt', skey): # Assume we enter the NT when we hit Matthew
+			inNT = True
+		if inNT:
+			ntkeyList.append(skey)
+		else:
+			otkeyList.append(skey)
+		key.increment()
+	ntkeyList = set(ntkeyList) # The 'in' operator only works on a set
+	otkeyList = set(otkeyList)
+	
+	inNT = False
+	# Now iterate the ones we have in this file
+	for e in ids:
+		osisid = e.attrib.get('osisID')
+		#print 'Checking key %s' % (osisid,)
+		if osisid in otkeyList:
+			otkeyList.remove(osisid)
+		elif osisid in ntkeyList:
+			ntkeyList.remove(osisid)
+			inNT = True
+		elif verseid.match(osisid) and inNT:
+			ntextraKeys.append(osisid)
+		elif verseid.match(osisid) and not inNT:
+			otextraKeys.append(osisid)
+		# Ignore it if not verseid.match() 
+			
+	# Now let's see what is left over
+	keyList = list(otkeyList.union(ntkeyList)) # Sets in Python cannot be ordered
+	keyList.sort()
+	if len(keyList) > 0:
+		if verbose:
+			print '\tThe following IDs do not appear in your file:'
+			for k in keyList:
+				print k
+		else:
+			print '\tThere are %d OT IDs and %d NT IDs in the versification which are not in your file.' % (len(otkeyList), len(ntkeyList))
+	else:
+		print '\tYour file has all the references in this versification'
+		
+	# Now let's see if you had extra
+	if len(otextraKeys + ntextraKeys) > 0:
+		if verbose:
+			print '\tThe following IDs do not appear in the versification:'
+			for k in ntextraKeys + otextraKeys:
+				print k
+		else:
+			print '\tThere are %d OT IDs and %d NT IDs in your file which do not appear in the versification.' % (len(otextraKeys), len(ntextraKeys))
+	else:
+		print '\tYour file has no extra references'
diff --git a/bindings/swig/examples/mod2zmod.pl b/bindings/swig/examples/mod2zmod.pl
new file mode 100755
index 0000000..d771830
--- /dev/null
+++ b/bindings/swig/examples/mod2zmod.pl
@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+
+#******************************************************************************
+#
+#  mod2zmod.pl -	This program converts a given module into a compressed
+#			module of the same type. This is just an example to
+#			demomstrate the power of the Perl Sword bindings. The
+#			code is almost written the same way the C++ of
+#			mod2zmod.cpp code was written
+#
+# $Id: mod2zmod.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2002-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+use Sword;
+use strict;
+
+my $appname = "mod2zmod.pl";
+
+sub printUsage()
+{
+	print "\n$appname - Convert a module into a compressed module of the same type.\n";
+	print "Usage: $appname <module> <datapth> [blocktype [compresstype]]\n";
+	print("datapath: the directory in which to write the zModule\n");
+        print("blockType  : (default 4)\n\t2 - verses\n\t3 - chapters\n\t4 - books\n");
+        print("compressType: (default 1):\n\t1 - LZSS\n\t2 - Zip\n\n");
+
+	exit(-1);
+}
+
+#main part of the program
+if (scalar(@ARGV) < 2 || scalar(@ARGV) > 4) {
+	printUsage;
+}
+
+#initialization stuff
+my $datapath = $ARGV[1];
+my $blockType = defined $ARGV[2] ? $ARGV[2] : 4;
+my $compressType = defined $ARGV[3] ? $ARGV[3] : 1;
+my $mgr = new Sword::SWMgr();
+my $module = $mgr->module($ARGV[0]);
+my $compressor = ($compressType == 1) ? new Sword::LZSSCompress() : new Sword::ZipCompress();
+
+my $newmod;
+
+if ($module->Type() eq "Biblical Texts") {
+	if (!Sword::zText::createModule( $datapath, $blockType )) {
+		print "$appname: Couldn't create module in $datapath";
+		exit(-1);
+	}
+        $newmod = new Sword::zText( $datapath, 0, 0, $blockType, $compressor );
+
+} elsif ($module->Type() eq "Lexicons / Dictionaries") {
+	if (!Sword::zLD::createModule( $datapath )){
+		print "$appname: Couldn't create module in $datapath";
+		exit(-1);
+	}
+	$newmod = new Sword::zLD( $datapath, 0, 0, $blockType, $compressor)
+} elsif ($module->Type() eq "Commentaries") {
+	if (!Sword::zCom::createModule( $datapath, $blockType )){
+		print "$appname: Couldn't create module in $datapath";
+		exit(-1);
+	}
+	$newmod = new Sword::zCom( $datapath, 0, 0, $blockType, $compressor)
+}
+
+# now copy the content of the module!
+
+my $buffer;
+
+$module->top();
+$module->setSkipConsecutiveLinks(0);
+do {
+	my $key = $module->Key();
+	if (($buffer eq $module->getRawEntry()) &&($buffer ne "")) {
+                print "Adding [", $key->getText(), "] link to: \n";
+		$newmod->writeLink($key);
+	}
+	else {
+		$buffer = $module->getRawEntry();
+		if ($buffer ne "") {
+		  $newmod->SetKey($key);
+		  $newmod->write($buffer);
+		  # print "Added ", $key->getText(), "\n";
+		}
+		else {
+		  print "Skipping empty ", $key->getText(), "\n";
+		}
+	}
+} while($module->next());
+
+print "The new module is now available in $datapath!\n";
diff --git a/bindings/swig/extras.i b/bindings/swig/extras.i
new file mode 100755
index 0000000..6422578
--- /dev/null
+++ b/bindings/swig/extras.i
@@ -0,0 +1,13 @@
+%{ 
+#include "markupcallback.h"
+#include "rendercallback.h"
+#include "searcher.h"
+%}
+
+%include "markupcallback.h"
+%include "rendercallback.h"
+%include "searcher.h"
+
+
+
+
diff --git a/bindings/swig/filemgr.i b/bindings/swig/filemgr.i
new file mode 100644
index 0000000..365ff5b
--- /dev/null
+++ b/bindings/swig/filemgr.i
@@ -0,0 +1,6 @@
+%{
+#include "filemgr.h"
+%}
+
+%include "filemgr.h"
+
diff --git a/bindings/swig/installmgr.i b/bindings/swig/installmgr.i
new file mode 100644
index 0000000..2849520
--- /dev/null
+++ b/bindings/swig/installmgr.i
@@ -0,0 +1,8 @@
+%ignore sword::InstallSource::userData;
+
+%{
+#include "installmgr.h"
+%}
+
+%include "installmgr.h"
+
diff --git a/bindings/swig/listkey.i b/bindings/swig/listkey.i
new file mode 100644
index 0000000..deaeac2
--- /dev/null
+++ b/bindings/swig/listkey.i
@@ -0,0 +1,26 @@
+%{
+#include "listkey.h"
+%}
+
+%ignore sword::ListKey::operator<<;
+%ignore sword::ListKey::ClearList;
+%ignore sword::ListKey::Count;
+%ignore sword::ListKey::Remove;
+%ignore sword::ListKey::SetToElement;
+%ignore sword::ListKey::GetElement;
+
+%include "listkey.h"
+
+/*
+%extend {
+	virtual char SetToElement(int element) {
+		return self->SetToElement(element, TOP);
+	};
+}
+*/
+
+%extend sword::ListKey {
+	static sword::ListKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::ListKey*>(o);
+	}
+}
diff --git a/bindings/swig/local/std_multimap.i b/bindings/swig/local/std_multimap.i
new file mode 100644
index 0000000..24eef8f
--- /dev/null
+++ b/bindings/swig/local/std_multimap.i
@@ -0,0 +1,166 @@
+//file std_multimap.i
+
+%include <std_common.i>
+
+
+%{
+#include <map>
+#include <algorithm>
+#include <stdexcept>
+#include <iostream>
+%}
+
+// exported class
+
+namespace std {
+
+        template<class T1, class T2> class multimap {
+                // add typemaps here
+                public:
+                        multimap();
+                        multimap(const multimap<T1,T2> &);
+
+                        unsigned int size() const;
+                        bool empty() const;
+                        void clear();
+
+                        %extend {
+                                //need a way to get the first element 
+                                const T1 getElementOne(std::multimap<T1,T2>::iterator it) throw (std::out_of_range) {
+                                        return it->first;
+                                }
+                                //and the second
+                                T2 getElementTwo(std::multimap<T1,T2>::iterator it) throw (std::out_of_range) {
+                                        return it->second;
+                                }
+                                //nice to have the beginning iterator
+                                std::multimap<T1,T2>::iterator getBeginIterator() {
+                                        return self->begin();
+                                }
+                                //and to get the next iterator
+                                std::multimap<T1,T2>::iterator getNextIterator(std::multimap<T1,T2>::iterator it) {
+                                        if (it != self->end()) {
+                                                return ++it;
+                                        } else {
+                                                return it;
+                                        }
+                                }
+                        }
+        };
+
+        //The rest is pretty much straight from std_map.i with name and signature changes
+        // specializations for built-ins 
+
+        %define specialize_std_multimap_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
+
+                template<class T> class multimap<K,T> {
+                        // add typemaps here
+                        public:
+                                multimap();
+                                multimap(const multimap<K,T> &);
+
+                                unsigned int size() const;
+                                bool empty() const;
+                                void clear();
+                                %extend {
+                                        T& get(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        return i->second;
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        void set(K key, const T& x) {
+                                                (*self)[key] = x;
+                                        }
+                                        void del(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        self->erase(i);
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        bool has_key(K key) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                return i != self->end();
+                                        }
+                                }
+                };
+        %enddef
+
+                %define specialize_std_multimap_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
+                template<class K> class multimap<K,T> {
+                        // add typemaps here
+                        public:
+                                multimap();
+                                multimap(const multimap<K,T> &);
+
+                                unsigned int size() const;
+                                bool empty() const;
+                                void clear();
+                                %extend {
+                                        T get(const K& key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        return i->second;
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        void set(const K& key, T x) {
+                                                (*self)[key] = x;
+                                        }
+                                        void del(const K& key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        self->erase(i);
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        bool has_key(const K& key) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                return i != self->end();
+                                        }
+                                }
+                };
+        %enddef
+
+                %define specialize_std_multimap_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO,
+                                T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
+                template<> class multimap<K,T> {
+                        // add typemaps here
+                        public:
+                                multimap();
+                                multimap(const multimap<K,T> &);
+
+                                unsigned int size() const;
+                                bool empty() const;
+                                void clear();
+                                %extend {
+                                        T get(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        return i->second;
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        void set(K key, T x) {
+                                                (*self)[key] = x;
+                                        }
+                                        void del(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        self->erase(i);
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        bool has_key(K key) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                return i != self->end();
+                                        }
+                                }
+                };
+        %enddef
+
+                // add specializations here
+
+}
diff --git a/bindings/swig/localemgr.i b/bindings/swig/localemgr.i
new file mode 100644
index 0000000..05d8a4e
--- /dev/null
+++ b/bindings/swig/localemgr.i
@@ -0,0 +1,13 @@
+%{
+#include <localemgr.h>
+%}
+
+%include "localemgr.h"
+
+%extend sword::LocaleMgr {
+    std::vector < sword::SWBuf > getAvailableLocalesVector() {
+        std::list<sword::SWBuf> l(self->getAvailableLocales());
+        return std::vector< sword::SWBuf >(l.begin(), l.end());
+    }
+}
+
diff --git a/bindings/swig/lzsscomprs.i b/bindings/swig/lzsscomprs.i
new file mode 100644
index 0000000..f2ed093
--- /dev/null
+++ b/bindings/swig/lzsscomprs.i
@@ -0,0 +1,11 @@
+%{
+#include <lzsscomprs.h>
+%}
+
+%include "lzsscomprs.h"
+
+%extend sword::LZSSCompress {
+	static sword::LZSSCompress *castTo(sword::SWCompress *o) {
+		return dynamic_cast<sword::LZSSCompress*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/markupcallback.h b/bindings/swig/markupcallback.h
new file mode 100755
index 0000000..4898b1b
--- /dev/null
+++ b/bindings/swig/markupcallback.h
@@ -0,0 +1,46 @@
+#include <markupfiltmgr.h>
+#include <swbuf.h>
+#include <defs.h>
+using namespace sword;
+
+class MarkupCallback {
+public:
+	virtual ~MarkupCallback() { ;}
+	virtual bool run(SWModule* x) {return false;}
+};
+
+class MyMarkup : public MarkupFilterMgr {
+private:
+	MarkupCallback* _callback;
+
+public:		
+	MyMarkup(MarkupCallback* callback, char markup = FMT_THML, char encoding = ENC_UTF8) : 
+		MarkupFilterMgr(markup, encoding), _callback(callback) {}
+
+	virtual ~MyMarkup() { 
+		delCallback(); 
+	}
+
+	void delCallback() { 
+		delete _callback; _callback = 0; 
+	}
+
+	void setCallback(MarkupCallback *cb) { 
+		delCallback(); 
+		_callback = cb; 
+	}
+
+	bool call(SWModule* x) { 
+		if (_callback) 
+			return _callback->run(x);					 
+		return false;
+	}
+
+protected:
+	virtual void AddRenderFilters(SWModule *module, 
+			ConfigEntMap &section) { 
+		if(!call(module)) {
+			MarkupFilterMgr::AddRenderFilters(module, section);
+		}	   
+	}
+};
diff --git a/bindings/swig/markupfiltmgr.i b/bindings/swig/markupfiltmgr.i
new file mode 100644
index 0000000..d675d64
--- /dev/null
+++ b/bindings/swig/markupfiltmgr.i
@@ -0,0 +1,13 @@
+%{
+#include <markupfiltmgr.h>
+using namespace sword;
+%}
+
+%include "markupfiltmgr.h"
+
+
+%extend sword::MarkupFilterMgr {
+	static sword::MarkupFilterMgr *castTo(sword::SWFilterMgr *o) {
+		return dynamic_cast<sword::MarkupFilterMgr*>(o);
+	}
+}
diff --git a/bindings/swig/multimapwdef.i b/bindings/swig/multimapwdef.i
new file mode 100644
index 0000000..ac25ae9
--- /dev/null
+++ b/bindings/swig/multimapwdef.i
@@ -0,0 +1,11 @@
+%{
+#include "multimapwdef.h"
+%}
+
+%ignore sword::multimapwithdefault::operator [];
+
+%include "multimapwdef.h"
+
+%extend sword::multimapwithdefault {
+}
+
diff --git a/bindings/swig/oldmake/Makefile.am b/bindings/swig/oldmake/Makefile.am
new file mode 100644
index 0000000..45a37ef
--- /dev/null
+++ b/bindings/swig/oldmake/Makefile.am
@@ -0,0 +1,95 @@
+
+if RUNSWIG
+PERLSWIG=perlswig
+TCLSWIG=tclswig
+PYTHONSWIG=pythonswig
+PHPSWIG=phpswig
+else
+PERLSWIG=
+TCLSWIG=
+PYTHONSWIG=
+PHPSWIG=
+endif
+
+all: $(PERLBUILD) $(TCLBUILD) $(PYTHONBUILD) $(PHPBUILD)
+	echo "built"
+
+perl_make: perl_makebuild
+	cd perl && make
+
+perlswig: sword.i
+	mkdir -p perl
+	$(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) $(SWORD_INCLUDES) $(top_srcdir)/sword.i
+
+perl_makebuild: $(PERLSWIG)
+	mkdir -p perl
+	echo "writing perl/Makefile.PL"
+	@echo "#! /usr/bin/perl" > perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "use ExtUtils::MakeMaker;" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "# See lib/ExtUtils/MakeMaker.pm for details of how to influence" >> perl/Makefile.PL
+	@echo "# the contents of the Makefile that is written." >> perl/Makefile.PL
+	@echo "WriteMakefile(" >> perl/Makefile.PL
+	@echo "		'NAME'		=> 'Sword'," >> perl/Makefile.PL
+	@echo "		'VERSION'	=> '$(VERSION)'," >> perl/Makefile.PL
+	@echo "		'INC'		=> '$(SWORD_INCLUDES)'," >> perl/Makefile.PL
+	@echo "		'DEFINE'	=> '-DSWIG'," >> perl/Makefile.PL
+	@echo "		'LIBS'		=> '$(LIB_SWORD) -lz'," >> perl/Makefile.PL
+	@echo "		'PREREQ_PM'	=> {}, # e.g., Module::Name => 1.1" >> perl/Makefile.PL
+	@echo "			($$] >= 5.005 ?		## Add these new keywords supported since 5.005" >> perl/Makefile.PL
+	@echo "			(ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module" >> perl/Makefile.PL
+	@echo "			AUTHOR		=> 'Sword Project <sword-devel@crosswire.org>') : ())," >> perl/Makefile.PL
+	@echo ");" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "rename 'Makefile', 'Makefile.old' or die \"can't rename Makefile\";" >> perl/Makefile.PL
+	@echo "open(INPUT, '<Makefile.old') or die \"can't open input Makefile.old\";" >> perl/Makefile.PL
+	@echo "open(OUTPUT, '>Makefile') or die \"can't open output Makefile\";" >> perl/Makefile.PL
+	@echo "while (<INPUT>) {" >> perl/Makefile.PL
+	@echo "	s/\-lsword/\-lsword \-lstdc\+\+/;" >> perl/Makefile.PL
+	@echo "	print OUTPUT \"$$""_\";" >> perl/Makefile.PL
+	@echo "}" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "close INPUT;" >> perl/Makefile.PL
+	@echo "close OUTPUT;" >> perl/Makefile.PL
+	cd perl && $(PERL) Makefile.PL && make clean
+	@echo "\.old" > perl/MANIFEST.SKIP
+	@echo "~$$" >> perl/MANIFEST.SKIP
+	@echo "\.bak" >> perl/MANIFEST.SKIP
+	@echo "^CVS" >> perl/MANIFEST.SKIP
+	@echo "Makefile$$" >> perl/MANIFEST.SKIP
+	cd perl && $(PERL) Makefile.PL && make manifest
+
+tclswig: sword.i
+	mkdir -p tcl
+	$(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) $(top_srcdir)/sword.i
+
+python_make: python_makebuild
+	cd python && $(PYTHON) setup.py build_ext $(SWORD_INCLUDES) $(LIB_SWORD)
+
+pythonswig: sword.i
+	mkdir -p python
+	$(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) $(top_srcdir)/sword.i
+
+python_makebuild: $(PYTHONSWIG)
+	mkdir -p python
+	echo "writing python/setup.py"
+	@echo "#! /usr/bin/python" > python/setup.py
+	@echo "" >> python/setup.py
+	@echo "from distutils.core import setup, Extension" >> python/setup.py
+	@echo "setup (name = \"sword\"," >> python/setup.py
+	@echo "	version = \"$(VERSION)\"," >> python/setup.py
+	@echo "	maintainer = \"Sword Developers\"," >> python/setup.py
+	@echo "	maintainer_email = \"sword-devel@crosswire.org\"," >> python/setup.py
+	@echo "	url = \"http://www.crosswire.org/sword\"," >> python/setup.py
+	@echo "	py_modules = [\"Sword\"]," >> python/setup.py
+	@echo "	ext_modules = [Extension(\"sword\", [\"Sword.cxx\"]," >> python/setup.py
+	@echo "	define_macros=[('SWIG',1)])], " >> python/setup.py
+	@echo ")" >> python/setup.py
+
+
+
+phpswig: sword.i
+	mkdir -p php
+	$(SWIG) -php4 -c++ -fullmake -o php/Sword.cxx -I$(top_srcdir) $(top_srcdir)/sword.i
+
diff --git a/bindings/swig/oldmake/Makefile.oth b/bindings/swig/oldmake/Makefile.oth
new file mode 100644
index 0000000..44f00ce
--- /dev/null
+++ b/bindings/swig/oldmake/Makefile.oth
@@ -0,0 +1,22 @@
+TOP        = $(PWD)
+SWIG       = swig
+#SWIGOPT    = -Wall -proxy
+SWIGOPT    = -shadow
+CXXSRCS    = 
+TARGET     = sword
+INTERFACE  = sword.i
+LIBS       = -lm -lz -lsword
+INCLUDE	   = -I$(TOP)/../../include/
+
+all::
+	$(MAKE) -f $(TOP)/Makefile.swig CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	TARGET='$(TARGET)' SWIGOPT='$(SWIGOPT)' INTERFACE='$(INTERFACE)' LIBS='$(LIBS)' INCLUDE='$(INCLUDE)' perl5_cpp
+
+static::
+	$(MAKE) -f $(TOP)/Makefile.swig CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
+	TARGET='myperl' INTERFACE='$(INTERFACE)' INCLUDE='$INCLUDE' perl5_cpp_static
+
+clean::
+	rm -f *_wrap* *.o *~ *.so myperl *.pyc .~* core
+
+check: all
diff --git a/bindings/swig/oldmake/Makefile.swig b/bindings/swig/oldmake/Makefile.swig
new file mode 100644
index 0000000..9b8271a
--- /dev/null
+++ b/bindings/swig/oldmake/Makefile.swig
@@ -0,0 +1,578 @@
+# Generated automatically from Makefile.in by configure.
+# ------------------------------------------------------------
+# SWIG Examples Makefile
+#
+# This file is used by the examples to build modules.  Assuming
+# you ran configure, this file will probably work.  However,
+# it's not perfect so you might need to do some hand tweaking.
+#
+# Other notes:
+#
+# 1.   Take a look at the prefixes below.   Since SWIG works with
+#      multiple target languages, you may need to find out where
+#      certain packages have been installed.   Set the prefixes
+#      accordingly.
+#
+# 2.   To use this makefile, simply set SRCS, INTERFACE, INCLUDE, LIBS,
+#      TARGET, and do a
+#           $(MAKE) -f Makefile.template.in SRCS='$(SRCS)' \
+#           INCLUDE='$(INCLUDE) LIBS='$(LIBS)' INTERFACE='$(INTERFACE)' \
+#           TARGET='$(TARGET)' method
+#
+#      'method' describes what is being built.
+#---------------------------------------------------------------
+
+TARGET     =
+CC         = gcc
+CXX        = c++
+CFLAGS     =
+prefix     = /usr/local
+exec_prefix= ${prefix}
+SRCS       =
+INCLUDE    =
+LIBS       =
+INTERFACE  =
+SWIGOPT    =
+SWIG       = swig
+RUNTIMEDIR = $(exec_prefix)/lib
+
+LIBM       = -lieee -lm
+LIBC       = 
+LIBCRYPT   = -lcrypt
+SYSLIBS    = $(LIBM) $(LIBC) $(LIBCRYPT)
+
+libtool_comp = $(TOP)/../Tools/libtool --mode compile
+libtool_link = $(TOP)/../Tools/libtool --mode link
+
+# X11 options
+
+XLIB       = -L/usr/X11R6/lib -lX11
+XINCLUDE   = -I/usr/X11R6/include
+
+IWRAP      = $(INTERFACE:.i=_wrap.i)
+ISRCS      = $(IWRAP:.i=.c)
+ICXXSRCS   = $(IWRAP:.i=.cxx)
+IOBJS      = $(IWRAP:.i=.o)
+
+##################################################################
+# Dynamic loading for C++
+# If you are going to be building dynamic loadable modules in C++,
+# you may need to edit this line appropriately.
+#
+# This line works for g++, but I'm not sure what it might be
+# for other C++ compilers
+##################################################################
+
+CPP_DLLIBS = #-L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
+             -L/usr/local/lib -lg++ -lstdc++ -lgcc
+
+# Solaris workshop 5.0 
+# CPP_DLLIBS = -L/opt/SUNWspro/lib -lCrun
+
+# Symbols used for using shared libraries
+SO=		.so
+LDSHARED=	gcc -shared
+CCSHARED=	-fpic
+CXXSHARED=      gcc -shared
+
+# This is used for building shared libraries with a number of C++
+# compilers.   If it doesn't work,  comment it out.
+CXXSHARED=      c++ -shared 
+
+OBJS      = $(SRCS:.c=.o) $(CXXSRCS:.cxx=.o)
+
+##################################################################
+#####                       Tcl/Tk                          ######
+##################################################################
+
+# Set these to your local copy of Tcl/Tk.
+
+TCL_INCLUDE = 
+TCL_LIB     = 
+TCL_OPTS    = -ldl 
+TK_OPTS     = -ltk -ltcl -ldl 
+
+# Extra Tcl specific dynamic linking options
+TCL_DLNK   = 
+
+# -----------------------------------------------------------
+# Build a new version of the tclsh shell
+# -----------------------------------------------------------
+
+
+tclsh: $(SRCS)
+	$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE)
+	$(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) $(TCL_INCLUDE) \
+	$(TCL_LIB)  $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET)
+
+tclsh_cpp: $(SRCS)
+	$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -ltclsh.i $(INTERFACE)
+	$(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) $(TCL_INCLUDE) \
+	$(TCL_LIB) $(TCL_OPTS) $(LIBS) $(SYSLIBS) -o $(TARGET)
+
+# -----------------------------------------------------------
+# Build a new copy of wish
+# -----------------------------------------------------------
+
+wish: $(SRCS)
+	$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE)
+	$(CC) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) $(TCL_INCLUDE) \
+	$(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET)
+
+
+wish_cpp: $(SRCS)
+	$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) -lwish.i $(INTERFACE)
+	$(CXX) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) $(TCL_INCLUDE) \
+	$(XINCLUDE) $(TCL_LIB) $(TK_OPTS) $(XLIB) $(LIBS) $(SYSLIBS) -o $(TARGET)
+
+# -----------------------------------------------------------
+# Build a Tcl dynamic loadable module (you might need to tweak this)
+# -----------------------------------------------------------
+
+tcl:  $(SRCS)
+	$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) $(TCL_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(TARGET)$(SO)
+
+# -----------------------------------------------------------
+# Build a Tcl7.5 dynamic loadable module for C++
+# -----------------------------------------------------------
+
+tcl_cpp: $(SRCS)
+	$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) $(TCL_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)$(SO)
+
+# -----------------------------------------------------------
+# Build a Tcl7.5 dynamic loadable module, linked against SWIG runtime lib
+# -----------------------------------------------------------
+
+TCL_RUNTIME=-L$(RUNTIMEDIR) -lswigtcl8
+
+tcl_multi:  $(SRCS)
+	$(SWIG) -c -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) $(TCL_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(TCL_RUNTIME) $(TCL_DLNK) $(LIBS) -o $(TARGET)$(SO)
+
+tcl_multi_cpp: $(SRCS)
+	$(SWIG) -c -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) $(TCL_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(TCL_RUNTIME) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)$(SO)
+
+##################################################################
+#####                       PERL 5                          ######
+##################################################################
+
+# You need to set this variable to the Perl5 directory containing the
+# files "perl.h", "EXTERN.h" and "XSUB.h".   With Perl5.003, it's
+# usually something like /usr/local/lib/perl5/arch-osname/5.003/CORE.
+
+PERL5_INCLUDE= /usr/lib/perl5/5.6.1/i386-linux/CORE
+
+# Extra Perl specific dynamic linking options
+PERL5_DLNK   = 
+
+# ----------------------------------------------------------------
+# Build a Perl5 dynamically loadable module (C)
+# ----------------------------------------------------------------
+
+perl5: $(SRCS)
+	$(SWIG) -perl5 $(SWIGOPT) $(INTERFACE)
+	$(CC) -c -Dbool=char $(CCSHARED) $(CFLAGS) -DSWIG $(SRCS) $(ISRCS) $(INCLUDE) -I$(PERL5_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) -o $(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Build a Perl5 dynamically loadable module (C++)
+# ----------------------------------------------------------------
+
+perl5_cpp: $(SRCS)
+	$(SWIG) -perl5 -c++ $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) -DSWIG -Dexplicit= $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) -I$(PERL5_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Build a Perl5 dynamically loadable module, linked against SWIG runtime lib
+# ----------------------------------------------------------------
+
+PERL5_RUNTIME=-L$(RUNTIMEDIR) -lswigpl
+
+perl5_multi: $(SRCS)
+	$(SWIG) -c -perl5 $(SWIGOPT) $(INTERFACE)
+	$(CC) -c -DSWIG -Dbool=char $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) -I$(PERL5_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(PERL5_RUNTIME) $(PERL5_DLNK) $(LIBS) -o $(TARGET)$(SO)
+
+perl5_multi_cpp: $(SRCS)
+	$(SWIG) -c -perl5 -c++ $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) -DSWIG -Dexplicit= $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) -I$(PERL5_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(PERL5_RUNTIME) $(PERL5_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Build a module from existing XS C source code.   (ie. from xsubpp).
+# ----------------------------------------------------------------
+perl5_xs: $(SRCS)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(INCLUDE) -I$(PERL5_INCLUDE)
+	$(LDSHARED) $(OBJS) $(LIBS) -o $(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Build a statically linked Perl5 executable
+# ----------------------------------------------------------------
+
+PERL5_LIB    = -L$(PERL5_INCLUDE) -lperl.so -ldl  $(SYSLIBS)
+
+perl5_static: $(SRCS)
+	$(SWIG) -perl5 -static -lperlmain.i $(SWIGOPT) $(INTERFACE)
+	$(CC) $(CFLAGS) -Dbool=char $(SRCS) $(ISRCS) $(INCLUDE) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET)
+
+perl5_static_cpp: $(SRCS)
+	$(SWIG) -perl5 -c++ -static -lperlmain.i $(SWIGOPT) $(INTERFACE)
+	$(CXX) $(CFLAGS) -Dexplicit= $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) -I$(PERL5_INCLUDE) $(PERL5_LIB) $(LIBS) -o $(TARGET)
+
+
+##################################################################
+#####                       PYTHON                          ######
+##################################################################
+
+# Make sure these locate your Python installation
+PYTHON_INCLUDE= -DHAVE_CONFIG_H 
+PYTHON_LIB    = 
+
+# Extra Python specific dynamic linking options
+PYTHON_DLNK   = 
+
+# ----------------------------------------------------------------
+# Build a C dynamically loadable module
+# ----------------------------------------------------------------
+
+python: $(SRCS)
+	$(SWIG) -python $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDE) $(PYTHON_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) -o $(TARGET)module$(SO)
+
+# -----------------------------------------------------------------
+# Build a C++ dynamically loadable module
+# -----------------------------------------------------------------
+
+python_cpp: $(SRCS)
+	$(SWIG) -c++ -python $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) $(PYTHON_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(PYTHON_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)module$(SO)
+
+# -----------------------------------------------------------------
+# Build a dynamically loadable module, linked against SWIG Runtime lib
+# -----------------------------------------------------------------
+
+PYTHON_RUNTIME=-L$(RUNTIMEDIR) -lswigpy
+
+python_multi: $(SRCS)
+	$(SWIG) -c -python $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDE) $(PYTHON_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(PYTHON_RUNTIME) $(PYTHON_DLNK) $(LIBS) -o $(TARGET)module$(SO)
+
+python_multi_cpp: $(SRCS)
+	$(SWIG) -c -c++ -python $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) $(PYTHON_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(PYTHON_RUNTIME) $(PYTHON_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)module$(SO)
+
+
+# -----------------------------------------------------------------
+# Build statically linked Python interpreter
+#
+# These should only be used in conjunction with the %include embed.i
+# library file
+# -----------------------------------------------------------------
+
+#TKINTER = -L/usr/X11R6.3/lib -L/usr/local/compat/lib -ltk4.0 -ltcl7.4 -lX11
+TKINTER =
+PYTHON_LIBOPTS = -lpython2.2 -ldl  $(TKINTER) $(SYSLIBS)
+
+python_static: $(SRCS)
+	$(SWIG) -python -lembed.i $(SWIGOPT) $(INTERFACE)
+	$(CC) $(CFLAGS) -Xlinker -export-dynamic $(ISRCS) $(SRCS) $(INCLUDE) \
+	$(PYTHON_INCLUDE) $(LIBS) -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET)
+
+python_static_cpp: $(SRCS)
+	$(SWIG) -c++ -python -lembed.i $(SWIGOPT) $(INTERFACE)
+	$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) \
+	$(PYTHON_INCLUDE) $(LIBS)  -L$(PYTHON_LIB) $(PYTHON_LIBOPTS) -o $(TARGET)
+
+# -----------------------------------------------------------------
+# Cleaning the python examples
+# -----------------------------------------------------------------
+
+python_clean:
+	rm -f *_wrap* *.o *~ *$(SO) mypython *.pyc .~* core
+
+##################################################################
+#####                       GUILE                           ######
+##################################################################
+
+# Make sure these locate your Guile installation
+GUILE_INCLUDE = 
+GUILE_LIB     = 
+
+# ----------------------------------------------------------------
+# Build a C dynamically loadable module
+# ----------------------------------------------------------------
+
+guile: $(SRCS)
+	$(SWIG) -guile -Linkage ltdlmod $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDE) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(LIBS) -o lib$(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Build a C++ dynamically loadable module
+# -----------------------------------------------------------------
+
+guile_cpp: $(SRCS)
+	$(SWIG) -c++ -guile -Linkage ltdlmod $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDE) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o lib$(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Build a dynamically loadable module with passive linkage
+# -----------------------------------------------------------------
+
+guile_passive: $(SRCS)
+	$(SWIG) -guile -Linkage passive $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDE) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(LIBS) -o lib$(TARGET)$(SO)
+
+guile_passive_cpp: $(SRCS)
+	$(SWIG) -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDE) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o lib$(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Build a dynamically loadable module with passive linkage, 
+# linked against SWIG runtime lib
+# -----------------------------------------------------------------
+
+GUILE_RUNTIME=-L$(RUNTIMEDIR) -lswigguile
+
+guile_passive_multi: $(SRCS)
+	$(SWIG) -c -guile -Linkage passive $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDE) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(GUILE_RUNTIME) $(LIBS) -o lib$(TARGET)$(SO)
+
+guile_passive_multi_cpp: $(SRCS)
+	$(SWIG) -c -c++ -guile -Linkage passive $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDE) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(GUILE_RUNTIME) $(LIBS) $(CPP_DLLIBS) -o lib$(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Build statically linked Guile interpreter
+# -----------------------------------------------------------------
+
+GUILE_LIBOPTS =  -ldl  $(SYSLIBS)
+
+guile_static: $(SRCS)
+	$(SWIG) -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE)
+	$(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDE) \
+	  -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \
+	  $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+
+guile_static_cpp: $(SRCS)
+	$(SWIG) -c++ -guile -lguilemain.i -Linkage ltdlmod $(SWIGOPT) $(INTERFACE)
+	$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) \
+	  -DSWIGINIT="SCM scm_init_$(TARGET)_module(void); scm_init_$(TARGET)_module();" \
+	  $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+
+guile_simple: $(SRCS)
+	$(SWIG) -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE)
+	$(CC) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDE) \
+	  $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+
+guile_simple_cpp: $(SRCS)
+	$(SWIG) -c++ -guile -lguilemain.i -Linkage simple $(SWIGOPT) $(INTERFACE)
+	$(CXX) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) \
+	  $(GUILE_INCLUDE) $(LIBS) -L$(GUILE_LIB) $(GUILE_LIBOPTS) -o $(TARGET)-guile
+
+##################################################################
+#####                       JAVA                            ######
+##################################################################
+
+# You need to set this variable to the java directories containing the
+# files "jni.h" and "md.h"
+# usually something like /usr/java/include and /usr/java/include/<arch-osname>.
+JAVA_INCLUDE= 
+
+# Extra Java specific dynamic linking options
+JAVA_DLNK  = 
+JAVALIBPREFIX = lib
+
+# ----------------------------------------------------------------
+# Build a java dynamically loadable module (C)
+# ----------------------------------------------------------------
+
+java: $(SRCS)
+	$(SWIG) -java $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) $(JAVA_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVALIBPREFIX)$(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Build a java dynamically loadable module (C++)
+# ----------------------------------------------------------------
+
+java_cpp: $(SRCS)
+	$(SWIG) -java -c++ $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) $(JAVA_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVALIBPREFIX)$(TARGET)$(SO)
+
+# ----------------------------------------------------------------
+# Build a java dynamically loadable module
+# ----------------------------------------------------------------
+
+java_multi: $(SRCS)
+	$(SWIG) -java $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) $(JAVA_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVALIBPREFIX)$(TARGET)$(SO)
+
+java_multi_cpp: $(SRCS)
+	$(SWIG) -java -c++ $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) $(JAVA_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVALIBPREFIX)$(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Cleaning the java examples
+# -----------------------------------------------------------------
+
+java_clean:
+	mv main.java main.java.tmp
+	rm -f *_wrap* *.o core *~ *$(SO) *.class *.java 
+	mv main.java.tmp main.java
+
+##################################################################
+#####                       MZSCHEME                        ######
+##################################################################
+
+MZC = test -n "" && 
+
+# ----------------------------------------------------------------
+# Build a C/C++ dynamically loadable module
+# ----------------------------------------------------------------
+
+mzscheme: $(SRCS)
+	$(SWIG) -mzscheme $(SWIGOPT) $(INTERFACE)
+	$(MZC) ++ccf "$(INCLUDE)" --cc $(ISRCS) $(SRCS)
+	$(MZC) --ld $(TARGET)$(SO) $(OBJS) $(IOBJS)
+
+mzscheme_cpp: $(SRCS)
+	$(SWIG) -mzscheme -c++ $(SWIGOPT) $(INTERFACE)
+	$(MZC) ++ccf "$(INCLUDE)" --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS)
+	$(MZC) --ld $(TARGET)$(SO) $(OBJS) $(IOBJS) $(CPP_DLLIBS) 
+
+# ----------------------------------------------------------------
+# Build a dynamically loadable module, linked against SWIG runtime
+# ----------------------------------------------------------------
+
+MZSCHEME_RUNTIME=-L$(RUNTIMEDIR) -lswigmz
+
+mzscheme_multi: $(SRCS)
+	$(SWIG) -c -mzscheme $(SWIGOPT) $(INTERFACE)
+	$(MZC) ++ccf "$(INCLUDE)" --cc $(ISRCS) $(SRCS)
+	$(MZC) --ld $(TARGET)$(SO) $(OBJS) $(IOBJS) $(MZSCHEME_RUNTIME)
+
+mzscheme_multi_cpp: $(SRCS)
+	$(SWIG) -c -mzscheme -c++ $(SWIGOPT) $(INTERFACE)
+	$(MZC) ++ccf "$(INCLUDE)" --cc $(ICXXSRCS) $(SRCS) $(CXXSRCS)
+	$(MZC) --ld $(TARGET)$(SO) $(OBJS) $(IOBJS) $(MZSCHEME_RUNTIME) $(CPP_DLLIBS) 
+
+##################################################################
+#####                       RUBY                            ######
+##################################################################
+
+# Make sure these locate your Ruby installation
+RUBY_CFLAGS=  -DHAVE_CONFIG_H
+RUBY_INCLUDE= -I/usr/local/lib/ruby/1.4/arch
+RUBY_LIB     = /usr/local/lib/ruby/1.4/arch
+RUBY_DLNK = 
+
+# ----------------------------------------------------------------
+# Build a C dynamically loadable module
+# ----------------------------------------------------------------
+
+ruby: $(SRCS)
+	$(SWIG) -ruby $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDE) $(RUBY_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) -o $(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Build a C++ dynamically loadable module
+# -----------------------------------------------------------------
+
+ruby_cpp: $(SRCS)
+	$(SWIG) -c++ -ruby $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) $(RUBY_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Build a dynamically loadable module, linked against SWIG runtime lib
+# -----------------------------------------------------------------
+
+RUBY_RUNTIME=-L$(RUNTIMEDIR) -lswigrb
+
+ruby_multi: $(SRCS)
+	$(SWIG) -c -ruby $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ISRCS) $(SRCS) $(INCLUDE) $(RUBY_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(RUBY_RUNTIME) $(RUBY_DLNK) $(LIBS) -o $(TARGET)$(SO)
+
+ruby_multi_cpp: $(SRCS)
+	$(SWIG) -c -c++ -ruby $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) $(RUBY_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(RUBY_RUNTIME) $(RUBY_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)$(SO)
+
+# -----------------------------------------------------------------
+# Build statically linked Ruby interpreter
+#
+# These should only be used in conjunction with the %include embed.i
+# library file
+# -----------------------------------------------------------------
+
+RUBY_LIBOPTS = -lruby -lm -ldl  $(SYSLIBS)
+
+ruby_static: $(SRCS)
+	$(SWIG) -ruby -lembed.i $(SWIGOPT) $(INTERFACE)
+	$(CC) $(CFLAGS) $(RUBY_CFLAGS) -Xlinker -export-dynamic $(ISRCS) $(SRCS) $(INCLUDE) \
+	$(RUBY_INCLUDE) $(LIBS) -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET)
+
+ruby_cpp_static: $(SRCS)
+	$(SWIG) -c++ -ruby -lembed.i $(SWIGOPT) $(INTERFACE)
+	$(CXX) $(CFLAGS) $(RUBY_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) \
+	$(RUBY_INCLUDE) $(LIBS)  -L$(RUBY_LIB) $(RUBY_LIBOPTS) -o $(TARGET)
+
+
+# -------------------------------------------------------------------
+# Build a PHP4 dynamically loadable module (C)
+# -------------------------------------------------------------------
+
+PHP4_INCLUDE = 
+
+php4: $(SRCS)
+	$(SWIG) -php4 $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDE) $(PHP4_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(LIBS) -o $(TARGET)$(SO)
+
+# --------------------------------------------------------------------
+# Build a PHP4 dynamically loadable module (C++)
+# --------------------------------------------------------------------
+
+php4_cpp: $(SRCS)
+	$(SWIG) -php4 -c++ $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDE) $(PHP4_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)$(SO)
+
+# ---------------------------------------------------------------------
+# Build a dynamically loadable module, linked against SWIG Runtime lib
+# ---------------------------------------------------------------------
+
+PHP4_RUNTIME=-L$(RUNTIMEDIR) -lswigphp4
+
+php4_multi: $(SRCS)
+	$(SWIG) -c -php4 $(SWIGOPT) $(INTERFACE)
+	$(CC) -c $(CCSHARED) $(CFLAGS) $(ISRCS) $(SRCS) $(INCLUDE) $(PHP4_INCLUDE)
+	$(LDSHARED) $(OBJS) $(IOBJS) $(PHP4_RUNTIME) $(PHP4_DLNK) $(LIBS) -o $(TARGET)module$(SO)
+
+php4_multi_cpp: $(SRCS)
+	$(SWIG) -c -c++ -php4 $(SWIGOPT) $(INTERFACE)
+	$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDE) $(PHP4_INCLUDE)
+	$(CXXSHARED) $(OBJS) $(IOBJS) $(PHP4_RUNTIME) $(PHP4_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(TARGET)module$(SO)
diff --git a/bindings/swig/osishtmlhref.i b/bindings/swig/osishtmlhref.i
new file mode 100755
index 0000000..a3ae458
--- /dev/null
+++ b/bindings/swig/osishtmlhref.i
@@ -0,0 +1,14 @@
+%{
+#include <swbasicfilter.h>
+#include <osishtmlhref.h>
+#include <thmlhtmlhref.h>
+#include <gbfhtmlhref.h>
+#include "utf8html.h"
+%}
+
+%include <swbasicfilter.h>
+%include "osishtmlhref.h"
+%include "thmlhtmlhref.h"
+%include "gbfhtmlhref.h"
+%include "utf8html.h"
+
diff --git a/bindings/swig/package/Makefile.am b/bindings/swig/package/Makefile.am
new file mode 100644
index 0000000..14500c3
--- /dev/null
+++ b/bindings/swig/package/Makefile.am
@@ -0,0 +1,127 @@
+AM_CPPFLAGS = @SWORD_CFLAGS@
+ACLOCAL_AMFLAGS=$(ACLOCAL_AMFLAGS) -I m4
+lib_LTLIBRARIES = libsword_csharpsword.la
+libsword_csharpsword_la_LIBADD = @SWORD_LIBS@
+libsword_csharpsword_la_SOURCES = csharp/Sword.cxx
+
+EXTRA_DIST = *.i
+
+
+if RUNSWIG
+PERLSWIG=perlswig
+TCLSWIG=tclswig
+PYTHONSWIG=pythonswig
+PHPSWIG=phpswig
+else
+PERLSWIG=
+TCLSWIG=
+PYTHONSWIG=
+PHPSWIG=
+endif
+
+all: $(PERLBUILD) $(TCLBUILD) $(PYTHONBUILD) $(PHPBUILD)
+	echo "built"
+
+perl_make: perl_makebuild
+	cd perl && make
+
+perlswig: sword.i
+	mkdir -p perl
+	$(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+perl_makebuild: $(PERLSWIG)
+	mkdir -p perl
+	echo "writing perl/Makefile.PL"
+	@echo "#! /usr/bin/perl" > perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "use ExtUtils::MakeMaker;" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "# See lib/ExtUtils/MakeMaker.pm for details of how to influence" >> perl/Makefile.PL
+	@echo "# the contents of the Makefile that is written." >> perl/Makefile.PL
+	@echo "WriteMakefile(" >> perl/Makefile.PL
+	@echo "		'NAME'		=> 'Sword'," >> perl/Makefile.PL
+	@echo "		'VERSION'	=> '$(VERSION)'," >> perl/Makefile.PL
+	@echo "		'INC'		=> '@SWORD_CFLAGS@ -I..'," >> perl/Makefile.PL
+	@echo "		'DEFINE'	=> '-DSWIG'," >> perl/Makefile.PL
+	@echo "		'LIBS'		=> '@SWORD_LIBS@'," >> perl/Makefile.PL
+	@echo "		'PREREQ_PM'	=> {}, # e.g., Module::Name => 1.1" >> perl/Makefile.PL
+	@echo "			($$] >= 5.005 ?		## Add these new keywords supported since 5.005" >> perl/Makefile.PL
+	@echo "			(ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module" >> perl/Makefile.PL
+	@echo "			AUTHOR		=> 'Sword Project <sword-devel@crosswire.org>') : ())," >> perl/Makefile.PL
+	@echo ");" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "rename 'Makefile', 'Makefile.old' or die \"can't rename Makefile\";" >> perl/Makefile.PL
+	@echo "open(INPUT, '<Makefile.old') or die \"can't open input Makefile.old\";" >> perl/Makefile.PL
+	@echo "open(OUTPUT, '>Makefile') or die \"can't open output Makefile\";" >> perl/Makefile.PL
+	@echo "while (<INPUT>) {" >> perl/Makefile.PL
+	@echo "	s/\-lsword/\-lsword \-lstdc\+\+/;" >> perl/Makefile.PL
+	@echo "	print OUTPUT \"$$""_\";" >> perl/Makefile.PL
+	@echo "}" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "close INPUT;" >> perl/Makefile.PL
+	@echo "close OUTPUT;" >> perl/Makefile.PL
+	cd perl && $(PERL) Makefile.PL && make clean
+	@echo "\.old" > perl/MANIFEST.SKIP
+	@echo "~$$" >> perl/MANIFEST.SKIP
+	@echo "\.bak" >> perl/MANIFEST.SKIP
+	@echo "^CVS" >> perl/MANIFEST.SKIP
+	@echo "Makefile$$" >> perl/MANIFEST.SKIP
+	cd perl && $(PERL) Makefile.PL && make manifest
+
+tclswig: sword.i
+	mkdir -p tcl
+	$(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+python_make: python_makebuild
+	cd python && $(PYTHON) setup.py build_ext $(LIB_SWORD)
+
+pythonswig: sword.i
+	mkdir -p python
+	$(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+python_makebuild: $(PYTHONSWIG)
+	mkdir -p python
+	echo "writing python/setup.py"
+	@echo "#! /usr/bin/python" > python/setup.py
+	@echo "" >> python/setup.py
+	@echo "from distutils.core import setup" >> python/setup.py
+	@echo "from distutils.extension import Extension" >> python/setup.py
+	@echo "import commands" >> python/setup.py
+	@echo "" >> python/setup.py
+	@echo "def pkgconfig(*packages, **kw):" >> python/setup.py
+	@echo "	flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}" >> python/setup.py
+	@echo "	for token in commands.getoutput(\"pkg-config --libs --cflags %s\" % ' '.join(packages)).split():" >> python/setup.py
+	@echo "		if flag_map.has_key(token[:2]):" >> python/setup.py
+	@echo "			kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])" >> python/setup.py
+	@echo "		else: # throw others to extra_link_args" >> python/setup.py
+	@echo "			kw.setdefault('extra_link_args', []).append(token)" >> python/setup.py
+	@echo "	for k, v in kw.iteritems(): # remove duplicated" >> python/setup.py
+	@echo "		kw[k] = list(set(v))" >> python/setup.py
+	@echo "	return kw" >> python/setup.py
+	@echo "" >> python/setup.py
+	@echo "setup (name = \"sword\"," >> python/setup.py
+	@echo "	version = \"$(VERSION)\"," >> python/setup.py
+	@echo "	maintainer = \"Sword Developers\"," >> python/setup.py
+	@echo "	maintainer_email = \"sword-devel@crosswire.org\"," >> python/setup.py
+	@echo "	url = \"http://www.crosswire.org/sword\"," >> python/setup.py
+	@echo "	py_modules = [\"Sword\"]," >> python/setup.py
+	@echo "	include_dirs=['..', '../..']," >> python/setup.py
+	@echo "	ext_modules = [Extension(\"_Sword\", [\"Sword.cxx\"], **pkgconfig('sword')" >> python/setup.py
+	@echo "	)], " >> python/setup.py
+	@echo ")" >> python/setup.py
+
+
+
+phpswig: sword.i
+	mkdir -p php
+	$(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+
+csharp/Sword.cxx: csharpswig
+
+csharpswig: sword.i
+	        mkdir -p csharp
+		        $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@  $(top_srcdir)/sword.i
+
+csharpmake:
+	        mcs -out:csharp/Sword.dll -target:library csharp/*.cs
diff --git a/bindings/swig/package/Makefile.in b/bindings/swig/package/Makefile.in
new file mode 100644
index 0000000..9d9d7ee
--- /dev/null
+++ b/bindings/swig/package/Makefile.in
@@ -0,0 +1,945 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) depcomp README \
+	config.guess config.sub install-sh missing ltmain.sh
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/perl.m4 $(top_srcdir)/php4.m4 \
+	$(top_srcdir)/python.m4 $(top_srcdir)/swig.m4 \
+	$(top_srcdir)/tcl.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libsword_csharpsword_la_DEPENDENCIES =
+am_libsword_csharpsword_la_OBJECTS = Sword.lo
+libsword_csharpsword_la_OBJECTS =  \
+	$(am_libsword_csharpsword_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libsword_csharpsword_la_SOURCES)
+DIST_SOURCES = $(libsword_csharpsword_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+AM_RECURSIVE_TARGETS = cscope
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PERL5DYNAMICLINKING = @PERL5DYNAMICLINKING@
+PERL5EXT = @PERL5EXT@
+PERL5LIB = @PERL5LIB@
+PERLBUILD = @PERLBUILD@
+PHP4 = @PHP4@
+PHP4INC = @PHP4INC@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PYINCLUDE = @PYINCLUDE@
+PYLIB = @PYLIB@
+PYLINK = @PYLINK@
+PYTHON = @PYTHON@
+PYTHONBUILD = @PYTHONBUILD@
+PYTHONDYNAMICLINKING = @PYTHONDYNAMICLINKING@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWIG = @SWIG@
+SWORD_CFLAGS = @SWORD_CFLAGS@
+SWORD_LIBS = @SWORD_LIBS@
+TCLDYNAMICLINKING = @TCLDYNAMICLINKING@
+TCLINCLUDE = @TCLINCLUDE@
+TCLLIB = @TCLLIB@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = @SWORD_CFLAGS@
+ACLOCAL_AMFLAGS = $(ACLOCAL_AMFLAGS) -I m4
+lib_LTLIBRARIES = libsword_csharpsword.la
+libsword_csharpsword_la_LIBADD = @SWORD_LIBS@
+libsword_csharpsword_la_SOURCES = csharp/Sword.cxx
+EXTRA_DIST = *.i
+@RUNSWIG_FALSE@PERLSWIG = 
+@RUNSWIG_TRUE@PERLSWIG = perlswig
+@RUNSWIG_FALSE@TCLSWIG = 
+@RUNSWIG_TRUE@TCLSWIG = tclswig
+@RUNSWIG_FALSE@PYTHONSWIG = 
+@RUNSWIG_TRUE@PYTHONSWIG = pythonswig
+@RUNSWIG_FALSE@PHPSWIG = 
+@RUNSWIG_TRUE@PHPSWIG = phpswig
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cxx .lo .o .obj
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libsword_csharpsword.la: $(libsword_csharpsword_la_OBJECTS) $(libsword_csharpsword_la_DEPENDENCIES) $(EXTRA_libsword_csharpsword_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libsword_csharpsword_la_OBJECTS) $(libsword_csharpsword_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Sword.Plo@am__quote@
+
+.cxx.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cxx.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cxx.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+Sword.lo: csharp/Sword.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Sword.lo -MD -MP -MF $(DEPDIR)/Sword.Tpo -c -o Sword.lo `test -f 'csharp/Sword.cxx' || echo '$(srcdir)/'`csharp/Sword.cxx
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Sword.Tpo $(DEPDIR)/Sword.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='csharp/Sword.cxx' object='Sword.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Sword.lo `test -f 'csharp/Sword.cxx' || echo '$(srcdir)/'`csharp/Sword.cxx
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool config.lt
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
+	clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \
+	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
+
+
+all: $(PERLBUILD) $(TCLBUILD) $(PYTHONBUILD) $(PHPBUILD)
+	echo "built"
+
+perl_make: perl_makebuild
+	cd perl && make
+
+perlswig: sword.i
+	mkdir -p perl
+	$(SWIG) -perl -c++ -shadow -o perl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+perl_makebuild: $(PERLSWIG)
+	mkdir -p perl
+	echo "writing perl/Makefile.PL"
+	@echo "#! /usr/bin/perl" > perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "use ExtUtils::MakeMaker;" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "# See lib/ExtUtils/MakeMaker.pm for details of how to influence" >> perl/Makefile.PL
+	@echo "# the contents of the Makefile that is written." >> perl/Makefile.PL
+	@echo "WriteMakefile(" >> perl/Makefile.PL
+	@echo "		'NAME'		=> 'Sword'," >> perl/Makefile.PL
+	@echo "		'VERSION'	=> '$(VERSION)'," >> perl/Makefile.PL
+	@echo "		'INC'		=> '@SWORD_CFLAGS@ -I..'," >> perl/Makefile.PL
+	@echo "		'DEFINE'	=> '-DSWIG'," >> perl/Makefile.PL
+	@echo "		'LIBS'		=> '@SWORD_LIBS@'," >> perl/Makefile.PL
+	@echo "		'PREREQ_PM'	=> {}, # e.g., Module::Name => 1.1" >> perl/Makefile.PL
+	@echo "			($$] >= 5.005 ?		## Add these new keywords supported since 5.005" >> perl/Makefile.PL
+	@echo "			(ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module" >> perl/Makefile.PL
+	@echo "			AUTHOR		=> 'Sword Project <sword-devel@crosswire.org>') : ())," >> perl/Makefile.PL
+	@echo ");" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "rename 'Makefile', 'Makefile.old' or die \"can't rename Makefile\";" >> perl/Makefile.PL
+	@echo "open(INPUT, '<Makefile.old') or die \"can't open input Makefile.old\";" >> perl/Makefile.PL
+	@echo "open(OUTPUT, '>Makefile') or die \"can't open output Makefile\";" >> perl/Makefile.PL
+	@echo "while (<INPUT>) {" >> perl/Makefile.PL
+	@echo "	s/\-lsword/\-lsword \-lstdc\+\+/;" >> perl/Makefile.PL
+	@echo "	print OUTPUT \"$$""_\";" >> perl/Makefile.PL
+	@echo "}" >> perl/Makefile.PL
+	@echo "" >> perl/Makefile.PL
+	@echo "close INPUT;" >> perl/Makefile.PL
+	@echo "close OUTPUT;" >> perl/Makefile.PL
+	cd perl && $(PERL) Makefile.PL && make clean
+	@echo "\.old" > perl/MANIFEST.SKIP
+	@echo "~$$" >> perl/MANIFEST.SKIP
+	@echo "\.bak" >> perl/MANIFEST.SKIP
+	@echo "^CVS" >> perl/MANIFEST.SKIP
+	@echo "Makefile$$" >> perl/MANIFEST.SKIP
+	cd perl && $(PERL) Makefile.PL && make manifest
+
+tclswig: sword.i
+	mkdir -p tcl
+	$(SWIG) -tcl -c++ -namespace -pkgversion $(VERSION) -o tcl/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+python_make: python_makebuild
+	cd python && $(PYTHON) setup.py build_ext $(LIB_SWORD)
+
+pythonswig: sword.i
+	mkdir -p python
+	$(SWIG) -python -c++ -shadow -o python/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+python_makebuild: $(PYTHONSWIG)
+	mkdir -p python
+	echo "writing python/setup.py"
+	@echo "#! /usr/bin/python" > python/setup.py
+	@echo "" >> python/setup.py
+	@echo "from distutils.core import setup" >> python/setup.py
+	@echo "from distutils.extension import Extension" >> python/setup.py
+	@echo "import commands" >> python/setup.py
+	@echo "" >> python/setup.py
+	@echo "def pkgconfig(*packages, **kw):" >> python/setup.py
+	@echo "	flag_map = {'-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'}" >> python/setup.py
+	@echo "	for token in commands.getoutput(\"pkg-config --libs --cflags %s\" % ' '.join(packages)).split():" >> python/setup.py
+	@echo "		if flag_map.has_key(token[:2]):" >> python/setup.py
+	@echo "			kw.setdefault(flag_map.get(token[:2]), []).append(token[2:])" >> python/setup.py
+	@echo "		else: # throw others to extra_link_args" >> python/setup.py
+	@echo "			kw.setdefault('extra_link_args', []).append(token)" >> python/setup.py
+	@echo "	for k, v in kw.iteritems(): # remove duplicated" >> python/setup.py
+	@echo "		kw[k] = list(set(v))" >> python/setup.py
+	@echo "	return kw" >> python/setup.py
+	@echo "" >> python/setup.py
+	@echo "setup (name = \"sword\"," >> python/setup.py
+	@echo "	version = \"$(VERSION)\"," >> python/setup.py
+	@echo "	maintainer = \"Sword Developers\"," >> python/setup.py
+	@echo "	maintainer_email = \"sword-devel@crosswire.org\"," >> python/setup.py
+	@echo "	url = \"http://www.crosswire.org/sword\"," >> python/setup.py
+	@echo "	py_modules = [\"Sword\"]," >> python/setup.py
+	@echo "	include_dirs=['..', '../..']," >> python/setup.py
+	@echo "	ext_modules = [Extension(\"_Sword\", [\"Sword.cxx\"], **pkgconfig('sword')" >> python/setup.py
+	@echo "	)], " >> python/setup.py
+	@echo ")" >> python/setup.py
+
+phpswig: sword.i
+	mkdir -p php
+	$(SWIG) -php4 -c++ -phpfull -o php/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@ $(top_srcdir)/sword.i
+
+csharp/Sword.cxx: csharpswig
+
+csharpswig: sword.i
+	        mkdir -p csharp
+		        $(SWIG) -csharp -c++ -nodefaultctor -dllimport libsword_csharpwrap.dll -o csharp/Sword.cxx -I$(top_srcdir) @SWORD_CFLAGS@  $(top_srcdir)/sword.i
+
+csharpmake:
+	        mcs -out:csharp/Sword.dll -target:library csharp/*.cs
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/bindings/swig/package/README b/bindings/swig/package/README
new file mode 100644
index 0000000..90caf83
--- /dev/null
+++ b/bindings/swig/package/README
@@ -0,0 +1,28 @@
+README
+------
+
+To build the sword bindings for Sword you require
+
+SWIG 1.3 (see http://www.swig.org)
+one of perl, python, tcl, php
+Sword 1.5.8 or newer
+
+First run
+./autogen.sh
+./configure
+
+Then, e.g.,:
+
+make perlswig
+make perl_make
+cd perl
+sudo make install
+
+or
+
+make pythonswig
+make python_make
+cd python
+sudo python setup.py install
+
+
diff --git a/bindings/swig/package/aclocal.m4 b/bindings/swig/package/aclocal.m4
new file mode 100644
index 0000000..0c2ed70
--- /dev/null
+++ b/bindings/swig/package/aclocal.m4
@@ -0,0 +1,1285 @@
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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, or
+# (at your option) any later version.
+#
+# 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 General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+     	AC_MSG_RESULT([no])
+	m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.13'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.13.4], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.13.4])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is '.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_CONDITIONAL                                            -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
+fi])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[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".
+  rm -rf conftest.dir
+  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_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
+  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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # 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.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    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
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=$depmode
+        break
+      fi
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+AM_CONDITIONAL([am__fastdep$1], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
+AC_DEFUN([AM_SET_DEPDIR],
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
+])
+
+# Generate code to set up dependency tracking.              -*- Autoconf -*-
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[{
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  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.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  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 "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each '.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Do all the work for Automake.                             -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This macro actually does too much.  Some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_PREREQ([2.65])dnl
+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+dnl the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+AC_REQUIRE([AC_PROG_INSTALL])dnl
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
+fi
+
+# 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
+AC_SUBST([CYGPATH_W])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_CC],
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
+])
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+])
+
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  The stamp files are numbered to have different names.
+
+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+# loop where config.status creates the headers, so we can generate
+# our stamp files there.
+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+[# Compute $1's index in $config_headers.
+_am_arg=$1
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+AC_SUBST([install_sh])])
+
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[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
+AC_SUBST([am__leading_dot])])
+
+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
+# From Jim Meyering
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
+AC_DEFUN([AM_MAINTAINER_MODE],
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST([MAINT])dnl
+]
+)
+
+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
+rm -f confinc confmf
+])
+
+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
+AC_DEFUN([AM_MISSING_PROG],
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  AC_MSG_WARN(['missing' script is too old or missing])
+fi
+])
+
+# Helper functions for option handling.                     -*- Autoconf -*-
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# --------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SANITY_CHECK
+# ---------------
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
+esac
+
+# 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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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" conftest.file`
+     fi
+     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".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$[2]" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
+
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+   [am_cv_make_support_nested_variables],
+   [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
+  AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# 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.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# --------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+# Check how to create a tarball.                            -*- Autoconf -*-
+
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+#     tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+#     $(am__untar) < result.tar
+#
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
+m4_include([perl.m4])
+m4_include([php4.m4])
+m4_include([python.m4])
+m4_include([swig.m4])
+m4_include([tcl.m4])
diff --git a/bindings/swig/package/autogen.sh b/bindings/swig/package/autogen.sh
new file mode 100755
index 0000000..0597976
--- /dev/null
+++ b/bindings/swig/package/autogen.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+echo "*** copying swig files"
+cp -a ../*.i .
+cp -a ../*.h .
+cp -R ../local .
+
+echo "*** Recreating libtool"
+if test -z "$LTIZE"; then
+LTIZE="$AUTODIR""libtoolize"
+fi
+echo "$LTIZE"
+       $LTIZE --force --copy;
+
+ACLOCAL="$AUTODIR""aclocal"
+echo "*** Recreating aclocal.m4"
+echo "$ACLOCAL"
+	$ACLOCAL -I .;
+
+echo "*** Recreating configure"
+AUTOCONF="$AUTODIR""autoconf"
+	$AUTOCONF;
+	
+echo "*** Recreating the Makefile.in files"
+AUTOMAKE="$AUTODIR""automake"
+	$AUTOMAKE -ac --foreign;
diff --git a/bindings/swig/package/bases.i b/bindings/swig/package/bases.i
new file mode 100755
index 0000000..91b5152
--- /dev/null
+++ b/bindings/swig/package/bases.i
@@ -0,0 +1,35 @@
+%{
+#include "rawverse.h"
+#include "zverse.h"
+#include "rawstr.h"
+#include "rawstr4.h"
+#include "zstr.h"
+#include "swgenbook.h"
+#include "lzsscomprs.h"
+#include "zipcomprs.h"
+#include "versekey.h"
+#include "versetreekey.h"
+#include "treekey.h"
+#include "rawgenbook.h"
+#include "swtext.h"
+#include "swcom.h"
+#include "rawcom.h"
+#include "swld.h"
+#include "zld.h"
+#include "zcom.h"
+#include "ztext.h"
+#include "rawld.h"
+#include "rawld4.h"
+#include "treekeyidx.h"
+#include "rawtext.h"
+
+
+%}
+
+%immutable sword::RawVerse::nl;
+
+%include "rawverse.h"
+%include "zverse.h"
+%include "rawstr.h"
+%include "rawstr4.h"
+%include "zstr.h"
diff --git a/bindings/swig/package/config.guess b/bindings/swig/package/config.guess
new file mode 100755
index 0000000..b79252d
--- /dev/null
+++ b/bindings/swig/package/config.guess
@@ -0,0 +1,1558 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-06-10'
+
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# 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 General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+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`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/bindings/swig/package/config.sub b/bindings/swig/package/config.sub
new file mode 100755
index 0000000..c765b34
--- /dev/null
+++ b/bindings/swig/package/config.sub
@@ -0,0 +1,1788 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-04-24'
+
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# 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 General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 \
+	| or1k | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or1k-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/bindings/swig/package/configure b/bindings/swig/package/configure
new file mode 100755
index 0000000..7e38cc8
--- /dev/null
+++ b/bindings/swig/package/configure
@@ -0,0 +1,18487 @@
+#! /bin/sh
+# From configure.ac Revision: 2875 .
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for swordbindings 1.6.2.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+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
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; 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
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# 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
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # 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 sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='swordbindings'
+PACKAGE_TARNAME='swordbindings'
+PACKAGE_VERSION='1.6.2'
+PACKAGE_STRING='swordbindings 1.6.2'
+PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
+
+ac_unique_file="sword.i"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+TCLDYNAMICLINKING
+TCLLIB
+TCLINCLUDE
+PHP4INC
+PHP4
+PYTHONDYNAMICLINKING
+PYTHONBUILD
+PYLINK
+PYLIB
+PYINCLUDE
+PYTHON
+PERLBUILD
+PERL5LIB
+PERL5DYNAMICLINKING
+PERL5EXT
+PERL
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+SWORD_LIBS
+SWORD_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+RUNSWIG_FALSE
+RUNSWIG_TRUE
+SWIG
+CXXCPP
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+LIBTOOL
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+with_swigbin
+enable_swig
+enable_maintainer_mode
+with_perl
+with_python
+with_php4
+with_tclconfig
+with_tcl
+with_tclincl
+with_tcllib
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+CPP
+CXXCPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+SWORD_CFLAGS
+SWORD_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+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.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    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 ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$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 ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    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 ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    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-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-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    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 ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    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-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 ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_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
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  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
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# 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 the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    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=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# 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 swordbindings 1.6.2 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 \`..']
+
+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]
+  --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]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/swordbindings]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_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
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of swordbindings 1.6.2:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-swig=path       Run swig to generate new source default=no
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+--disable-swig do not run swig to generate input files
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
+  --with-swigbin=path        Set location of swig executable
+  --with-perl=path       Set location of Perl5 executable
+  --with-python=path       Set location of Python executable
+  --with-php4=path	  Set location of PHP4 executable
+  --with-tclconfig=path  Set location of tclConfig.sh
+  --with-tcl=path         Set location of Tcl package
+  --with-tclincl=path     Set location of Tcl include directory
+  --with-tcllib=path      Set location of Tcl library directory
+
+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>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) 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
+  CXXCPP      C++ preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  SWORD_CFLAGS
+              C compiler flags for SWORD, overriding pkg-config
+  SWORD_LIBS  linker flags for SWORD, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to the package provider.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested 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
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+swordbindings configure 1.6.2
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 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
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by swordbindings $as_me 1.6.2, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+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`
+/usr/bin/hostinfo      = `(/usr/bin/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=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&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_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=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append 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
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset 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: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > 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
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_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 $ac_precious_vars; 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,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_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
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_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.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+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
+
+
+
+
+
+am__api_version='1.13'
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    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
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_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
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# 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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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" conftest.file`
+     fi
+     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".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# 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
+
+
+# Define the identity of the package.
+ PACKAGE='swordbindings'
+ VERSION='1.6.2'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+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"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+
+
+# ---------------------------------------------------------------------
+# Check Programs
+# ---------------------------------------------------------------------
+ac_ext=cpp
+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
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_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"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # 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
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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 | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=cpp
+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
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-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='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&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".
+  rm -rf conftest.dir
+  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
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # 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.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    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
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$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=cpp
+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 -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$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
+ac_ext=cpp
+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
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&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".
+  rm -rf conftest.dir
+  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
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # 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.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    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
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$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
+
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  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_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 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
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+  enable_win32_dll=no
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+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
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=cpp
+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
+
+CC="$lt_save_CC"
+
+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=cpp
+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
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+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
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' ${wl}-bernotok'
+	    allow_undefined_flag_CXX=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
+	    archive_cmds_need_lc_CXX=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	ld_shlibs_CXX=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='${wl}-E'
+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='${wl}-z,text'
+	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+	      '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+	      '"$reload_cmds_CXX"
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+ac_ext=cpp
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+
+
+# Check whether --with-swigbin was given.
+if test "${with_swigbin+set}" = set; then :
+  withval=$with_swigbin;  SWIGBIN="$withval"
+else
+  SWIGBIN=
+fi
+
+# Check whether --enable-swig was given.
+if test "${enable_swig+set}" = set; then :
+  enableval=$enable_swig;
+else
+  enable_swig=no
+fi
+
+
+if test -z "$SWIGBIN"; then
+# Extract the first word of "swig", so it can be a program name with args.
+set dummy swig; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SWIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SWIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+SWIG=$ac_cv_path_SWIG
+if test -n "$SWIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5
+$as_echo "$SWIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+else
+# Extract the first word of "swig", so it can be a program name with args.
+set dummy swig; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SWIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SWIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_SWIG="$SWIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $SWIGBIN
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_SWIG" && ac_cv_path_SWIG=""not found""
+  ;;
+esac
+fi
+SWIG=$ac_cv_path_SWIG
+if test -n "$SWIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5
+$as_echo "$SWIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+
+runswig=true
+if test x"$SWIG"="xnot found"; then
+	runswig=false
+fi
+if test x"$enable_swig"="xno"; then
+	runswig=false
+fi
+
+ if test x$runswig = xtrue; then
+  RUNSWIG_TRUE=
+  RUNSWIG_FALSE='#'
+else
+  RUNSWIG_TRUE='#'
+  RUNSWIG_FALSE=
+fi
+
+
+#ac_cv_swigversion=``
+
+
+
+# ---------------------------------------------------------------------
+# Check libraries
+# ---------------------------------------------------------------------
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SWORD" >&5
+$as_echo_n "checking for SWORD... " >&6; }
+
+if test -n "$SWORD_CFLAGS"; then
+    pkg_cv_SWORD_CFLAGS="$SWORD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sword >= 1.5.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sword >= 1.5.7") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SWORD_CFLAGS=`$PKG_CONFIG --cflags "sword >= 1.5.7" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$SWORD_LIBS"; then
+    pkg_cv_SWORD_LIBS="$SWORD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sword >= 1.5.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "sword >= 1.5.7") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_SWORD_LIBS=`$PKG_CONFIG --libs "sword >= 1.5.7" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        SWORD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sword >= 1.5.7" 2>&1`
+        else
+	        SWORD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sword >= 1.5.7" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SWORD_PKG_ERRORS" >&5
+
+	true
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	true
+else
+	SWORD_CFLAGS=$pkg_cv_SWORD_CFLAGS
+	SWORD_LIBS=$pkg_cv_SWORD_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+# ---------------------------------------------------------------------
+# Misc
+# ---------------------------------------------------------------------
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+# Check whether --enable-swig was given.
+if test "${enable_swig+set}" = set; then :
+  enableval=$enable_swig; enable_swig=$enableval
+else
+  enable_swig=no
+fi
+
+ if test x$enable_swig = xyes; then
+  RUNSWIG_TRUE=
+  RUNSWIG_FALSE='#'
+else
+  RUNSWIG_TRUE='#'
+  RUNSWIG_FALSE=
+fi
+
+
+# ---------------------------------------------------------------------
+# Check Scripting languages
+# ---------------------------------------------------------------------
+
+
+
+PERLBIN=
+PERLSWIG=
+
+
+# Check whether --with-perl was given.
+if test "${with_perl+set}" = set; then :
+  withval=$with_perl;  PERLBIN="$withval"
+else
+  PERLBIN=
+fi
+
+
+# First figure out what the name of Perl5 is
+
+if test -z "$PERLBIN"; then
+for ac_prog in perl perl5.6.1 perl5.6.0 perl5.004 perl5.003 perl5.002 perl5.001 perl5 perl
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PERL" && break
+done
+
+else
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PERLBIN
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PERL=$ac_cv_path_PERL
+if test -n "$PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+#PERL="$PERLBIN"
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl5 header files" >&5
+$as_echo_n "checking for Perl5 header files... " >&6; }
+if test -n "$PERL"; then
+	PERL5DIR=`($PERL -e 'use Config; print $Config{archlib};') 2>/dev/null`
+	if test "$PERL5DIR" != ""; then
+		dirs="$PERL5DIR $PERL5DIR/CORE"
+		PERL5EXT=none
+		PERLBUILD=perl_make
+		for i in $dirs; do
+			if test -r $i/perl.h; then
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
+				PERL5EXT="$i"
+				break;
+			fi
+		done
+		if test "$PERL5EXT" = none; then
+			PERL5EXT="$PERL5DIR/CORE"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: could not locate perl.h...using $PERL5EXT" >&5
+$as_echo "could not locate perl.h...using $PERL5EXT" >&6; }
+		fi
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl5 library" >&5
+$as_echo_n "checking for Perl5 library... " >&6; }
+		PERL5LIB=`($PERL -e 'use Config; $_=$Config{libperl}; s/^lib//; s/$Config{_a}$//; print $_') 2>/dev/null`
+		if test "$PERL5LIB" = "" ; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+		else
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL5LIB" >&5
+$as_echo "$PERL5LIB" >&6; }
+		fi
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to determine perl5 configuration" >&5
+$as_echo "unable to determine perl5 configuration" >&6; }
+		PERL5EXT=$PERL5DIR
+	fi
+else
+       	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: could not figure out how to run perl5" >&5
+$as_echo "could not figure out how to run perl5" >&6; }
+#	PERL5EXT="/usr/local/lib/perl/archname/5.003/CORE"
+fi
+
+# Only cygwin (Windows) needs the library for dynamic linking
+case $ac_sys_system/$ac_sys_release in
+CYGWIN*) PERL5DYNAMICLINKING="-L$PERL5EXT -l$PERL5LIB";;
+*)PERL5DYNAMICLINKING="";;
+esac
+
+
+
+
+
+
+
+
+
+
+PYINCLUDE=
+PYLIB=
+PYPACKAGE=
+PYTHONBUILD=
+
+# I don't think any of this commented stuff works anymore
+
+#PYLINK="-lModules -lPython -lObjects -lParser"
+
+#AC_ARG_WITH(py,[  --with-py=path          Set location of Python],[
+#	PYPACKAGE="$withval"], [PYPACKAGE=])
+#AC_ARG_WITH(pyincl,[  --with-pyincl=path      Set location of Python include directory],[
+#	PYINCLUDE="$withval"], [PYINCLUDE=])
+#AC_ARG_WITH(pylib,[  --with-pylib=path       Set location of Python library directory],[
+#	PYLIB="$withval"], [PYLIB=])
+
+#if test -z "$PYINCLUDE"; then
+#   if test -n "$PYPACKAGE"; then
+#	PYINCLUDE="$PYPACKAGE/include"
+#   fi
+#fi
+
+#if test -z "$PYLIB"; then
+#   if test -n "$PYPACKAGE"; then
+#	PYLIB="$PYPACKAGE/lib"
+#   fi
+#fi
+
+
+# Check whether --with-python was given.
+if test "${with_python+set}" = set; then :
+  withval=$with_python;  PYBIN="$withval"
+else
+  PYBIN=
+fi
+
+
+# First figure out the name of the Python executable
+
+if test -z "$PYBIN"; then
+for ac_prog in $prefix/bin/python python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PYTHON+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PYTHON in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PYTHON" && break
+done
+
+else
+PYTHON="$PYBIN"
+fi
+
+if test -n "$PYTHON"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python prefix" >&5
+$as_echo_n "checking for Python prefix... " >&6; }
+    PYPREFIX=`($PYTHON -c "import sys; print sys.prefix") 2>/dev/null`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYPREFIX" >&5
+$as_echo "$PYPREFIX" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python exec-prefix" >&5
+$as_echo_n "checking for Python exec-prefix... " >&6; }
+    PYEPREFIX=`($PYTHON -c "import sys; print sys.exec_prefix") 2>/dev/null`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYEPREFIX" >&5
+$as_echo "$PYEPREFIX" >&6; }
+
+
+    # Note: I could not think of a standard way to get the version string from different versions.
+    # This trick pulls it out of the file location for a standard library file.
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python version" >&5
+$as_echo_n "checking for Python version... " >&6; }
+
+    # Need to do this hack since autoconf replaces __file__ with the name of the configure file
+    filehack="file__"
+    PYVERSION=`($PYTHON -c "import string,operator; print operator.getitem(string.split(string.__$filehack,'/'),-2)")`
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYVERSION" >&5
+$as_echo "$PYVERSION" >&6; }
+
+    # Set the include directory
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python header files" >&5
+$as_echo_n "checking for Python header files... " >&6; }
+    if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
+        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
+    fi
+    if test -z "$PYINCLUDE"; then
+        if test -r $PYPREFIX/include/Py/Python.h; then
+            PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
+        fi
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYINCLUDE" >&5
+$as_echo "$PYINCLUDE" >&6; }
+
+    # Set the library directory blindly.   This probably won't work with older versions
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python library" >&5
+$as_echo_n "checking for Python library... " >&6; }
+    dirs="$PYVERSION/config $PYVERSION/lib python/lib"
+    for i in $dirs; do
+        if test -d $PYEPREFIX/lib/$i; then
+           PYLIB="$PYEPREFIX/lib/$i"
+	   PYTHONBUILD=python_make
+           break
+        fi
+    done
+    if test -z "$PYLIB"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: Not found" >&5
+$as_echo "Not found" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYLIB" >&5
+$as_echo "$PYLIB" >&6; }
+    fi
+
+    # Check for really old versions
+    if test -r $PYLIB/libPython.a; then
+         PYLINK="-lModules -lPython -lObjects -lParser"
+    else
+         PYLINK="-l$PYVERSION"
+    fi
+fi
+
+# Only cygwin (Windows) needs the library for dynamic linking
+case $ac_sys_system/$ac_sys_release in
+CYGWIN*) PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK"
+         PYINCLUDE="-DUSE_DL_IMPORT $PYINCLUDE"
+         ;;
+*)PYTHONDYNAMICLINKING="";;
+esac
+
+
+
+
+
+
+
+
+
+
+
+PHP4BIN=
+
+
+# Check whether --with-php4 was given.
+if test "${with_php4+set}" = set; then :
+  withval=$with_php4;  PHP4BIN="$withval"
+else
+  PHP4BIN=
+fi
+
+
+if test -z "$PHP4BIN"; then
+for ac_prog in php php4
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PHP4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PHP4 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PHP4="$PHP4" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PHP4="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PHP4=$ac_cv_path_PHP4
+if test -n "$PHP4"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP4" >&5
+$as_echo "$PHP4" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PHP4" && break
+done
+
+else
+PHP4="$PHP4BIN"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PHP4 header files" >&5
+$as_echo_n "checking for PHP4 header files... " >&6; }
+dirs="/usr/include/php /usr/local/include/php /usr/local/apache/php /usr/include/php4 /usr/local/include/php4 /usr/local/apache/php4"
+for i in $dirs; do
+	if test -r $i/php_config.h -o -r $i/php_version.h; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
+		PHP4EXT="$i"
+		PHP4INC="-I$PHP4EXT -I$PHP4EXT/Zend -I$PHP4EXT/main -I$PHP4EXT/TSRM"
+		break;
+	fi
+done
+if test -z "$PHP4INC"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+
+
+
+
+
+
+
+
+TCLINCLUDE=
+TCLLIB=
+TCLPACKAGE=
+#TCLSWIG=
+
+
+# Check whether --with-tclconfig was given.
+if test "${with_tclconfig+set}" = set; then :
+  withval=$with_tclconfig; with_tclconfig="$withval"
+fi
+
+
+# Check whether --with-tcl was given.
+if test "${with_tcl+set}" = set; then :
+  withval=$with_tcl;
+	TCLPACKAGE="$withval"
+else
+  TCLPACKAGE=
+fi
+
+
+# Check whether --with-tclincl was given.
+if test "${with_tclincl+set}" = set; then :
+  withval=$with_tclincl;
+	TCLINCLUDE="-I$withval"
+else
+  TCLINCLUDE=
+fi
+
+
+# Check whether --with-tcllib was given.
+if test "${with_tcllib+set}" = set; then :
+  withval=$with_tcllib;
+	TCLLIB="-L$withval"
+else
+  TCLLIB=
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
+$as_echo_n "checking for Tcl configuration... " >&6; }
+# First check to see if --with-tclconfig was specified.
+if test x"${with_tclconfig}" != x ; then
+   if test -f "${with_tclconfig}/tclConfig.sh" ; then
+      TCLCONFIG=`(cd ${with_tclconfig}; pwd)`
+   else
+      as_fn_error $? "${with_tcl} directory doesn't contain tclConfig.sh" "$LINENO" 5
+   fi
+fi
+# check in a few common install locations
+if test x"${TCLCONFIG}" = x ; then
+    for i in `ls -d /usr/lib 2>/dev/null` \
+	     `ls -d ${prefix}/lib 2>/dev/null` \
+	    `ls -d /usr/local/lib 2>/dev/null` ; do
+	if test -f "$i/tclConfig.sh" ; then
+	    TCLCONFIG=`(cd $i; pwd)`
+	    break
+	fi
+    done
+fi
+if test x"${TCLCONFIG}" = x ; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $TCLCONFIG/tclConfig.sh" >&5
+$as_echo "found $TCLCONFIG/tclConfig.sh" >&6; }
+    . $TCLCONFIG/tclConfig.sh
+    TCLINCLUDE=-I$TCL_PREFIX/include
+    TCLLIB=$TCL_LIB_SPEC
+fi
+
+if test -z "$TCLINCLUDE"; then
+   if test -n "$TCLPACKAGE"; then
+	TCLINCLUDE="-I$TCLPACKAGE/include"
+   fi
+fi
+
+if test -z "$TCLLIB"; then
+   if test -n "$TCLPACKAGE"; then
+	TCLLIB="-L$TCLPACKAGE/lib -ltcl"
+   fi
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl header files" >&5
+$as_echo_n "checking for Tcl header files... " >&6; }
+if test -z "$TCLINCLUDE"; then
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <tcl.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  TCLINCLUDE=""
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+if test -z "$TCLINCLUDE"; then
+	dirs="$prefix/include /usr/local/include /usr/include /opt/local/include"
+	for i in $dirs ; do
+		if test -r $i/tcl.h; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
+			TCLINCLUDE="-I$i"
+			break
+		fi
+	done
+fi
+if test -z "$TCLINCLUDE"; then
+#	TCLINCLUDE="-I/usr/local/include"
+    	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLINCLUDE" >&5
+$as_echo "$TCLINCLUDE" >&6; }
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl library" >&5
+$as_echo_n "checking for Tcl library... " >&6; }
+if test -z "$TCLLIB"; then
+dirs="$prefix/lib /usr/local/lib /usr/lib /opt/local/lib"
+for i in $dirs ; do
+	if test -r $i/libtcl.a; then
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
+	    TCLLIB="-L$i -ltcl"
+	    break
+	fi
+done
+if test -z "$TCLLIB"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+#	TCLLIB="-L/usr/local/lib"
+fi
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLLIB" >&5
+$as_echo "$TCLLIB" >&6; }
+fi
+
+# Only cygwin (Windows) needs the library for dynamic linking
+case $ac_sys_system/$ac_sys_release in
+CYGWIN*) TCLDYNAMICLINKING="$TCLLIB";;
+*)TCLDYNAMICLINKING="";;
+esac
+
+
+
+
+#AC_SUBST(TCLSWIG)
+
+
+
+# ---------------------------------------------------------------------
+# Final output
+# ---------------------------------------------------------------------
+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, 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.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be 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, we kill variables containing newlines.
+# 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.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}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 "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# Transform confdefs.h into DEFS.
+# Protect against shell expansion while executing Makefile rules.
+# Protect against Makefile macro expansion.
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
+
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${RUNSWIG_TRUE}" && test -z "${RUNSWIG_FALSE}"; then
+  as_fn_error $? "conditional \"RUNSWIG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${RUNSWIG_TRUE}" && test -z "${RUNSWIG_FALSE}"; then
+  as_fn_error $? "conditional \"RUNSWIG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+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
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; 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
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# 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
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by swordbindings $as_me 1.6.2, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   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
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to the package provider."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+swordbindings config.status 1.6.2
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+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=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+OBJDUMP \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+nm_file_list_spec \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries 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[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # 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.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;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&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  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.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_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
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  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 "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# An object symbol dumper.
+OBJDUMP=$lt_OBJDUMP
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# 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 || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
diff --git a/bindings/swig/package/configure.ac b/bindings/swig/package/configure.ac
new file mode 100644
index 0000000..a8e1806
--- /dev/null
+++ b/bindings/swig/package/configure.ac
@@ -0,0 +1,46 @@
+# ---------------------------------------------------------------------
+# Initialisation
+# ---------------------------------------------------------------------
+AC_INIT([swordbindings],[1.6.2])
+AC_CONFIG_SRCDIR(sword.i)
+AC_PREREQ(2.59)
+AC_REVISION($Revision: 2875 $)
+AM_INIT_AUTOMAKE
+AC_CONFIG_MACRO_DIR([m4])
+
+# ---------------------------------------------------------------------
+# Check Programs
+# ---------------------------------------------------------------------
+AC_LANG(C++)
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+SW_PROG_SWIG
+
+# ---------------------------------------------------------------------
+# Check libraries
+# ---------------------------------------------------------------------
+PKG_PROG_PKG_CONFIG
+PKG_CHECK_MODULES([SWORD], [sword >= 1.5.7],,true)
+
+# ---------------------------------------------------------------------
+# Misc
+# ---------------------------------------------------------------------
+AM_MAINTAINER_MODE
+AC_ARG_ENABLE(swig, [--disable-swig do not run swig to generate input files], enable_swig=$enableval, enable_swig=no)
+AM_CONDITIONAL([RUNSWIG], [test x$enable_swig = xyes])
+
+# ---------------------------------------------------------------------
+# Check Scripting languages
+# ---------------------------------------------------------------------
+SW_FIND_PERL
+SW_FIND_PYTHON
+SW_FIND_PHP4
+SW_FIND_TCL
+
+# ---------------------------------------------------------------------
+# Final output
+# ---------------------------------------------------------------------
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
diff --git a/bindings/swig/package/defs.i b/bindings/swig/package/defs.i
new file mode 100644
index 0000000..4d94cb6
--- /dev/null
+++ b/bindings/swig/package/defs.i
@@ -0,0 +1,6 @@
+%{
+#include "defs.h"
+%}
+
+%include "defs.h"
+
diff --git a/bindings/swig/package/depcomp b/bindings/swig/package/depcomp
new file mode 100755
index 0000000..4ebd5b3
--- /dev/null
+++ b/bindings/swig/package/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+
+# 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, or (at your option)
+# any later version.
+
+# 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 General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bindings/swig/package/deprecations.i b/bindings/swig/package/deprecations.i
new file mode 100644
index 0000000..bab0381
--- /dev/null
+++ b/bindings/swig/package/deprecations.i
@@ -0,0 +1,62 @@
+/* Methods that are deprecated in SWORD and should be ignored. */
+
+/* These are all together */
+%ignore sword::SWModule::operator const char *;
+%ignore sword::SWVersion::operator const char *;
+%ignore sword::ListKey::operator const char *;
+%ignore sword::VerseKey::operator const char *;
+%ignore sword::TreeKey::operator const char *;
+%ignore sword::TreeKeyIdx::operator const char *;
+%ignore sword::VerseTreeKey::operator const char *;
+%ignore sword::XMLTag::operator const char *;
+
+%ignore sword::StatusReporter::statusUpdate;
+
+%ignore sword::SWDisplay::Display(SWModule&);
+
+%ignore sword::SWKey::Error();
+%ignore sword::SWKey::Persist() const;
+%ignore sword::SWKey::Persist(signed char);
+
+%ignore sword::SWModule::AddEncodingFilter(SWFilter*);
+%ignore sword::SWModule::AddOptionFilter(SWOptionFilter*);
+%ignore sword::SWModule::AddRawFilter(SWFilter*);
+%ignore sword::SWModule::AddRenderFilter(SWFilter*);
+%ignore sword::SWModule::AddStripFilter(SWFilter*);
+%ignore sword::SWModule::CreateKey;
+%ignore sword::SWModule::Description;
+%ignore sword::SWModule::Direction;
+%ignore sword::SWModule::Disp;
+%ignore sword::SWModule::Display();
+%ignore sword::SWModule::Encoding;
+%ignore sword::SWModule::Error();
+%ignore sword::SWModule::getSkipConsecutiveLinks();
+%ignore sword::SWModule::Index;
+%ignore sword::SWModule::Key;
+%ignore sword::SWModule::KeyText;
+%ignore sword::SWModule::Lang;
+%ignore sword::SWModule::Markup;
+%ignore sword::SWModule::Name;
+%ignore sword::SWModule::processEntryAttributes(bool) const;
+%ignore sword::SWModule::ReplaceEncodingFilter(SWFilter*, SWFilter*);
+%ignore sword::SWModule::RemoveEncodingFilter(SWFilter*);
+%ignore sword::SWModule::RenderText;
+%ignore sword::SWModule::ReplaceRenderFilter(SWFilter*, SWFilter*);
+%ignore sword::SWModule::RemoveRenderFilter(SWFilter*);
+%ignore sword::SWModule::SetKey;
+%ignore sword::SWModule::setKey(SWKey const &);
+%ignore sword::SWModule::StripText;
+%ignore sword::SWModule::Type;
+
+%ignore sword::VerseKey::AutoNormalize;
+%ignore sword::VerseKey::Book;
+%ignore sword::VerseKey::Chapter;
+%ignore sword::VerseKey::ClearBounds();
+%ignore sword::VerseKey::Headings;
+%ignore sword::VerseKey::LowerBound;
+%ignore sword::VerseKey::Normalize;
+%ignore sword::VerseKey::ParseVerseList;
+%ignore sword::VerseKey::Testament;
+%ignore sword::VerseKey::TestamentIndex() const;
+%ignore sword::VerseKey::UpperBound;
+%ignore sword::VerseKey::Verse;
diff --git a/bindings/swig/package/directors.i b/bindings/swig/package/directors.i
new file mode 100644
index 0000000..ec5e42c
--- /dev/null
+++ b/bindings/swig/package/directors.i
@@ -0,0 +1,32 @@
+/* 
+This is a list of all the classes which have directors enabled.
+
+Directors allow virtual methods of classes to be overridden in a subclass in
+the target language. This may have performance implications, and is not
+available for all target languages, though it should be for the main ones
+*/
+%feature("director") sword::SWLog::logMessage;
+%feature("director") PyStringMgr;
+%feature("nodirector") PyStringMgr::upperUTF8;
+%feature("nodirector") PyStringMgr::upperLatin1;
+
+%feature("director") RenderCallback;
+%feature("director") MarkupCallback;
+
+%feature("director") SWSearcher;
+
+%feature("director") sword::StatusReporter;
+%feature("director") sword::FTPTransport;
+%feature("nodirector") sword::FTPTransport::getDirList;
+
+%feature("director:except") {
+    if ($error != NULL) {
+        throw Swig::DirectorMethodException();
+    }
+}
+
+%exception {
+    try { $action }
+    catch (Swig::DirectorException &e) { SWIG_fail; }
+}
+
diff --git a/bindings/swig/package/encfiltmgr.i b/bindings/swig/package/encfiltmgr.i
new file mode 100644
index 0000000..1e52fb8
--- /dev/null
+++ b/bindings/swig/package/encfiltmgr.i
@@ -0,0 +1,11 @@
+%{
+#include "encfiltmgr.h"
+%}
+
+%include "encfiltmgr.h"
+
+%extend sword::EncodingFilterMgr {
+	static sword::EncodingFilterMgr *castTo(sword::SWFilterMgr *o) {
+		return dynamic_cast<sword::EncodingFilterMgr*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/extras.i b/bindings/swig/package/extras.i
new file mode 100755
index 0000000..6422578
--- /dev/null
+++ b/bindings/swig/package/extras.i
@@ -0,0 +1,13 @@
+%{ 
+#include "markupcallback.h"
+#include "rendercallback.h"
+#include "searcher.h"
+%}
+
+%include "markupcallback.h"
+%include "rendercallback.h"
+%include "searcher.h"
+
+
+
+
diff --git a/bindings/swig/package/filemgr.i b/bindings/swig/package/filemgr.i
new file mode 100644
index 0000000..365ff5b
--- /dev/null
+++ b/bindings/swig/package/filemgr.i
@@ -0,0 +1,6 @@
+%{
+#include "filemgr.h"
+%}
+
+%include "filemgr.h"
+
diff --git a/bindings/swig/package/install-sh b/bindings/swig/package/install-sh
new file mode 100755
index 0000000..377bb86
--- /dev/null
+++ b/bindings/swig/package/install-sh
@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-11-20.07; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test X"$d" = X && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bindings/swig/package/installmgr.i b/bindings/swig/package/installmgr.i
new file mode 100644
index 0000000..2849520
--- /dev/null
+++ b/bindings/swig/package/installmgr.i
@@ -0,0 +1,8 @@
+%ignore sword::InstallSource::userData;
+
+%{
+#include "installmgr.h"
+%}
+
+%include "installmgr.h"
+
diff --git a/bindings/swig/package/listkey.i b/bindings/swig/package/listkey.i
new file mode 100644
index 0000000..deaeac2
--- /dev/null
+++ b/bindings/swig/package/listkey.i
@@ -0,0 +1,26 @@
+%{
+#include "listkey.h"
+%}
+
+%ignore sword::ListKey::operator<<;
+%ignore sword::ListKey::ClearList;
+%ignore sword::ListKey::Count;
+%ignore sword::ListKey::Remove;
+%ignore sword::ListKey::SetToElement;
+%ignore sword::ListKey::GetElement;
+
+%include "listkey.h"
+
+/*
+%extend {
+	virtual char SetToElement(int element) {
+		return self->SetToElement(element, TOP);
+	};
+}
+*/
+
+%extend sword::ListKey {
+	static sword::ListKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::ListKey*>(o);
+	}
+}
diff --git a/bindings/swig/package/local/std_multimap.i b/bindings/swig/package/local/std_multimap.i
new file mode 100644
index 0000000..24eef8f
--- /dev/null
+++ b/bindings/swig/package/local/std_multimap.i
@@ -0,0 +1,166 @@
+//file std_multimap.i
+
+%include <std_common.i>
+
+
+%{
+#include <map>
+#include <algorithm>
+#include <stdexcept>
+#include <iostream>
+%}
+
+// exported class
+
+namespace std {
+
+        template<class T1, class T2> class multimap {
+                // add typemaps here
+                public:
+                        multimap();
+                        multimap(const multimap<T1,T2> &);
+
+                        unsigned int size() const;
+                        bool empty() const;
+                        void clear();
+
+                        %extend {
+                                //need a way to get the first element 
+                                const T1 getElementOne(std::multimap<T1,T2>::iterator it) throw (std::out_of_range) {
+                                        return it->first;
+                                }
+                                //and the second
+                                T2 getElementTwo(std::multimap<T1,T2>::iterator it) throw (std::out_of_range) {
+                                        return it->second;
+                                }
+                                //nice to have the beginning iterator
+                                std::multimap<T1,T2>::iterator getBeginIterator() {
+                                        return self->begin();
+                                }
+                                //and to get the next iterator
+                                std::multimap<T1,T2>::iterator getNextIterator(std::multimap<T1,T2>::iterator it) {
+                                        if (it != self->end()) {
+                                                return ++it;
+                                        } else {
+                                                return it;
+                                        }
+                                }
+                        }
+        };
+
+        //The rest is pretty much straight from std_map.i with name and signature changes
+        // specializations for built-ins 
+
+        %define specialize_std_multimap_on_key(K,CHECK,CONVERT_FROM,CONVERT_TO)
+
+                template<class T> class multimap<K,T> {
+                        // add typemaps here
+                        public:
+                                multimap();
+                                multimap(const multimap<K,T> &);
+
+                                unsigned int size() const;
+                                bool empty() const;
+                                void clear();
+                                %extend {
+                                        T& get(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        return i->second;
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        void set(K key, const T& x) {
+                                                (*self)[key] = x;
+                                        }
+                                        void del(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        self->erase(i);
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        bool has_key(K key) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                return i != self->end();
+                                        }
+                                }
+                };
+        %enddef
+
+                %define specialize_std_multimap_on_value(T,CHECK,CONVERT_FROM,CONVERT_TO)
+                template<class K> class multimap<K,T> {
+                        // add typemaps here
+                        public:
+                                multimap();
+                                multimap(const multimap<K,T> &);
+
+                                unsigned int size() const;
+                                bool empty() const;
+                                void clear();
+                                %extend {
+                                        T get(const K& key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        return i->second;
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        void set(const K& key, T x) {
+                                                (*self)[key] = x;
+                                        }
+                                        void del(const K& key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        self->erase(i);
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        bool has_key(const K& key) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                return i != self->end();
+                                        }
+                                }
+                };
+        %enddef
+
+                %define specialize_std_multimap_on_both(K,CHECK_K,CONVERT_K_FROM,CONVERT_K_TO,
+                                T,CHECK_T,CONVERT_T_FROM,CONVERT_T_TO)
+                template<> class multimap<K,T> {
+                        // add typemaps here
+                        public:
+                                multimap();
+                                multimap(const multimap<K,T> &);
+
+                                unsigned int size() const;
+                                bool empty() const;
+                                void clear();
+                                %extend {
+                                        T get(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        return i->second;
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        void set(K key, T x) {
+                                                (*self)[key] = x;
+                                        }
+                                        void del(K key) throw (std::out_of_range) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                if (i != self->end())
+                                                        self->erase(i);
+                                                else
+                                                        throw std::out_of_range("key not found");
+                                        }
+                                        bool has_key(K key) {
+                                                std::multimap<K,T >::iterator i = self->find(key);
+                                                return i != self->end();
+                                        }
+                                }
+                };
+        %enddef
+
+                // add specializations here
+
+}
diff --git a/bindings/swig/package/localemgr.i b/bindings/swig/package/localemgr.i
new file mode 100644
index 0000000..05d8a4e
--- /dev/null
+++ b/bindings/swig/package/localemgr.i
@@ -0,0 +1,13 @@
+%{
+#include <localemgr.h>
+%}
+
+%include "localemgr.h"
+
+%extend sword::LocaleMgr {
+    std::vector < sword::SWBuf > getAvailableLocalesVector() {
+        std::list<sword::SWBuf> l(self->getAvailableLocales());
+        return std::vector< sword::SWBuf >(l.begin(), l.end());
+    }
+}
+
diff --git a/bindings/swig/package/ltmain.sh b/bindings/swig/package/ltmain.sh
new file mode 100644
index 0000000..63ae69d
--- /dev/null
+++ b/bindings/swig/package/ltmain.sh
@@ -0,0 +1,9655 @@
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.2
+TIMESTAMP=""
+package_revision=1.3337
+
+# 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+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
+
+# The name of this program:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "$my_tmpdir"
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "$1" | $SED \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    echo
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
+func_help ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	p
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $opt_debug
+
+    func_error "missing argument for $1."
+    exit_cmd=exit
+}
+
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
+
+
+
+
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+nonopt=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
+    opt="$1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug='set -x'
+			func_echo "enabling shell trace mode"
+			$opt_debug
+			;;
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
+			;;
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
+			shift
+			;;
+      --preserve-dup-deps)
+			opt_preserve_dup_deps=:
+			;;
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
+			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
+			shift
+			;;
+
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+    esac
+  done
+
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
+
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
+
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
+
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
+
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+
+
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try \`$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# 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+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+volatile const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps ; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      else
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    echo
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$absdir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|qnx|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_append libobjs " $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$opt_mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS="$save_ifs"
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$opt_mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$opt_mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    func_append oldobjs " $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	odir="$objdir"
+      else
+	odir="$dir/$objdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$opt_mode" = uninstall && odir="$dir"
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case "$opt_mode" in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$opt_mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$opt_mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+
diff --git a/bindings/swig/package/lzsscomprs.i b/bindings/swig/package/lzsscomprs.i
new file mode 100644
index 0000000..f2ed093
--- /dev/null
+++ b/bindings/swig/package/lzsscomprs.i
@@ -0,0 +1,11 @@
+%{
+#include <lzsscomprs.h>
+%}
+
+%include "lzsscomprs.h"
+
+%extend sword::LZSSCompress {
+	static sword::LZSSCompress *castTo(sword::SWCompress *o) {
+		return dynamic_cast<sword::LZSSCompress*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/m4/libtool.m4 b/bindings/swig/package/m4/libtool.m4
new file mode 100644
index 0000000..126202f
--- /dev/null
+++ b/bindings/swig/package/m4/libtool.m4
@@ -0,0 +1,7992 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -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
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/bindings/swig/package/m4/ltoptions.m4 b/bindings/swig/package/m4/ltoptions.m4
new file mode 100644
index 0000000..5d9acd8
--- /dev/null
+++ b/bindings/swig/package/m4/ltoptions.m4
@@ -0,0 +1,384 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/bindings/swig/package/m4/ltsugar.m4 b/bindings/swig/package/m4/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/bindings/swig/package/m4/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/bindings/swig/package/m4/ltversion.m4 b/bindings/swig/package/m4/ltversion.m4
new file mode 100644
index 0000000..07a8602
--- /dev/null
+++ b/bindings/swig/package/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/bindings/swig/package/m4/lt~obsolete.m4 b/bindings/swig/package/m4/lt~obsolete.m4
new file mode 100644
index 0000000..c573da9
--- /dev/null
+++ b/bindings/swig/package/m4/lt~obsolete.m4
@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/bindings/swig/package/markupcallback.h b/bindings/swig/package/markupcallback.h
new file mode 100755
index 0000000..4898b1b
--- /dev/null
+++ b/bindings/swig/package/markupcallback.h
@@ -0,0 +1,46 @@
+#include <markupfiltmgr.h>
+#include <swbuf.h>
+#include <defs.h>
+using namespace sword;
+
+class MarkupCallback {
+public:
+	virtual ~MarkupCallback() { ;}
+	virtual bool run(SWModule* x) {return false;}
+};
+
+class MyMarkup : public MarkupFilterMgr {
+private:
+	MarkupCallback* _callback;
+
+public:		
+	MyMarkup(MarkupCallback* callback, char markup = FMT_THML, char encoding = ENC_UTF8) : 
+		MarkupFilterMgr(markup, encoding), _callback(callback) {}
+
+	virtual ~MyMarkup() { 
+		delCallback(); 
+	}
+
+	void delCallback() { 
+		delete _callback; _callback = 0; 
+	}
+
+	void setCallback(MarkupCallback *cb) { 
+		delCallback(); 
+		_callback = cb; 
+	}
+
+	bool call(SWModule* x) { 
+		if (_callback) 
+			return _callback->run(x);					 
+		return false;
+	}
+
+protected:
+	virtual void AddRenderFilters(SWModule *module, 
+			ConfigEntMap &section) { 
+		if(!call(module)) {
+			MarkupFilterMgr::AddRenderFilters(module, section);
+		}	   
+	}
+};
diff --git a/bindings/swig/package/markupfiltmgr.i b/bindings/swig/package/markupfiltmgr.i
new file mode 100644
index 0000000..d675d64
--- /dev/null
+++ b/bindings/swig/package/markupfiltmgr.i
@@ -0,0 +1,13 @@
+%{
+#include <markupfiltmgr.h>
+using namespace sword;
+%}
+
+%include "markupfiltmgr.h"
+
+
+%extend sword::MarkupFilterMgr {
+	static sword::MarkupFilterMgr *castTo(sword::SWFilterMgr *o) {
+		return dynamic_cast<sword::MarkupFilterMgr*>(o);
+	}
+}
diff --git a/bindings/swig/package/missing b/bindings/swig/package/missing
new file mode 100755
index 0000000..cdea514
--- /dev/null
+++ b/bindings/swig/package/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2012-06-26.16; # UTC
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# 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, or (at your option)
+# any later version.
+
+# 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 General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/bindings/swig/package/multimapwdef.i b/bindings/swig/package/multimapwdef.i
new file mode 100644
index 0000000..ac25ae9
--- /dev/null
+++ b/bindings/swig/package/multimapwdef.i
@@ -0,0 +1,11 @@
+%{
+#include "multimapwdef.h"
+%}
+
+%ignore sword::multimapwithdefault::operator [];
+
+%include "multimapwdef.h"
+
+%extend sword::multimapwithdefault {
+}
+
diff --git a/bindings/swig/package/osishtmlhref.i b/bindings/swig/package/osishtmlhref.i
new file mode 100755
index 0000000..a3ae458
--- /dev/null
+++ b/bindings/swig/package/osishtmlhref.i
@@ -0,0 +1,14 @@
+%{
+#include <swbasicfilter.h>
+#include <osishtmlhref.h>
+#include <thmlhtmlhref.h>
+#include <gbfhtmlhref.h>
+#include "utf8html.h"
+%}
+
+%include <swbasicfilter.h>
+%include "osishtmlhref.h"
+%include "thmlhtmlhref.h"
+%include "gbfhtmlhref.h"
+%include "utf8html.h"
+
diff --git a/bindings/swig/package/perl.m4 b/bindings/swig/package/perl.m4
new file mode 100644
index 0000000..36a3f01
--- /dev/null
+++ b/bindings/swig/package/perl.m4
@@ -0,0 +1,71 @@
+#----------------------------------------------------------------
+# Look for Perl5
+#----------------------------------------------------------------
+
+AC_DEFUN([SW_FIND_PERL],
+[
+
+
+PERLBIN=
+PERLSWIG=
+
+AC_ARG_WITH(perl,[  --with-perl=path       Set location of Perl5 executable],[ PERLBIN="$withval"], [PERLBIN=])
+
+# First figure out what the name of Perl5 is
+
+if test -z "$PERLBIN"; then
+AC_PATH_PROGS(PERL, perl perl5.6.1 perl5.6.0 perl5.004 perl5.003 perl5.002 perl5.001 perl5 perl)
+else
+AC_PATH_PROG(PERL, perl, , $PERLBIN)
+#PERL="$PERLBIN"
+fi
+
+
+AC_MSG_CHECKING(for Perl5 header files)
+if test -n "$PERL"; then
+	PERL5DIR=`($PERL -e 'use Config; print $Config{archlib};') 2>/dev/null`
+	if test "$PERL5DIR" != ""; then
+		dirs="$PERL5DIR $PERL5DIR/CORE"
+		PERL5EXT=none
+		PERLBUILD=perl_make
+		for i in $dirs; do
+			if test -r $i/perl.h; then
+				AC_MSG_RESULT($i)
+				PERL5EXT="$i"
+				break;
+			fi
+		done
+		if test "$PERL5EXT" = none; then
+			PERL5EXT="$PERL5DIR/CORE"
+			AC_MSG_RESULT(could not locate perl.h...using $PERL5EXT)
+		fi
+
+		AC_MSG_CHECKING(for Perl5 library)
+		PERL5LIB=`($PERL -e 'use Config; $_=$Config{libperl}; s/^lib//; s/$Config{_a}$//; print $_') 2>/dev/null`
+		if test "$PERL5LIB" = "" ; then
+			AC_MSG_RESULT(not found)
+		else
+			AC_MSG_RESULT($PERL5LIB)
+		fi
+	else
+		AC_MSG_RESULT(unable to determine perl5 configuration)
+		PERL5EXT=$PERL5DIR
+	fi
+else
+       	AC_MSG_RESULT(could not figure out how to run perl5)
+#	PERL5EXT="/usr/local/lib/perl/archname/5.003/CORE"
+fi
+
+# Only cygwin (Windows) needs the library for dynamic linking
+case $ac_sys_system/$ac_sys_release in
+CYGWIN*) PERL5DYNAMICLINKING="-L$PERL5EXT -l$PERL5LIB";;
+*)PERL5DYNAMICLINKING="";;
+esac
+
+
+AC_SUBST(PERL5EXT)
+AC_SUBST(PERL5DYNAMICLINKING)
+AC_SUBST(PERL5LIB)
+AC_SUBST(PERLBUILD)
+
+])
diff --git a/bindings/swig/package/php4.m4 b/bindings/swig/package/php4.m4
new file mode 100644
index 0000000..3b5ea8b
--- /dev/null
+++ b/bindings/swig/package/php4.m4
@@ -0,0 +1,33 @@
+#-------------------------------------------------------------------------
+# Look for Php4
+#-------------------------------------------------------------------------
+
+AC_DEFUN([SW_FIND_PHP4],
+[
+
+PHP4BIN=
+
+AC_ARG_WITH(php4,[  --with-php4=path	  Set location of PHP4 executable],[ PHP4BIN="$withval"], [PHP4BIN=])
+
+if test -z "$PHP4BIN"; then
+AC_PATH_PROGS(PHP4, php php4)
+else
+PHP4="$PHP4BIN"
+fi
+AC_MSG_CHECKING(for PHP4 header files)
+dirs="/usr/include/php /usr/local/include/php /usr/local/apache/php /usr/include/php4 /usr/local/include/php4 /usr/local/apache/php4"
+for i in $dirs; do
+	if test -r $i/php_config.h -o -r $i/php_version.h; then
+		AC_MSG_RESULT($i)
+		PHP4EXT="$i"
+		PHP4INC="-I$PHP4EXT -I$PHP4EXT/Zend -I$PHP4EXT/main -I$PHP4EXT/TSRM"
+		break;
+	fi
+done
+if test -z "$PHP4INC"; then
+	AC_MSG_RESULT(not found)
+fi
+
+AC_SUBST(PHP4INC)
+	
+])
diff --git a/bindings/swig/package/python.m4 b/bindings/swig/package/python.m4
new file mode 100644
index 0000000..7d517fa
--- /dev/null
+++ b/bindings/swig/package/python.m4
@@ -0,0 +1,117 @@
+#----------------------------------------------------------------
+# Look for Python
+#----------------------------------------------------------------
+
+AC_DEFUN([SW_FIND_PYTHON],
+[
+
+PYINCLUDE=
+PYLIB=
+PYPACKAGE=
+PYTHONBUILD=
+
+# I don't think any of this commented stuff works anymore
+
+#PYLINK="-lModules -lPython -lObjects -lParser"
+
+#AC_ARG_WITH(py,[  --with-py=path          Set location of Python],[
+#	PYPACKAGE="$withval"], [PYPACKAGE=])
+#AC_ARG_WITH(pyincl,[  --with-pyincl=path      Set location of Python include directory],[
+#	PYINCLUDE="$withval"], [PYINCLUDE=])
+#AC_ARG_WITH(pylib,[  --with-pylib=path       Set location of Python library directory],[
+#	PYLIB="$withval"], [PYLIB=])
+
+#if test -z "$PYINCLUDE"; then
+#   if test -n "$PYPACKAGE"; then
+#	PYINCLUDE="$PYPACKAGE/include"
+#   fi
+#fi
+
+#if test -z "$PYLIB"; then
+#   if test -n "$PYPACKAGE"; then
+#	PYLIB="$PYPACKAGE/lib"
+#   fi
+#fi
+
+AC_ARG_WITH(python,[  --with-python=path       Set location of Python executable],[ PYBIN="$withval"], [PYBIN=])
+
+# First figure out the name of the Python executable
+
+if test -z "$PYBIN"; then
+AC_PATH_PROGS(PYTHON, $prefix/bin/python python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python1.4 python)
+else
+PYTHON="$PYBIN"
+fi
+
+if test -n "$PYTHON"; then
+    AC_MSG_CHECKING(for Python prefix)
+    PYPREFIX=`($PYTHON -c "import sys; print sys.prefix") 2>/dev/null`
+    AC_MSG_RESULT($PYPREFIX)
+    AC_MSG_CHECKING(for Python exec-prefix)
+    PYEPREFIX=`($PYTHON -c "import sys; print sys.exec_prefix") 2>/dev/null`
+    AC_MSG_RESULT($PYEPREFIX)
+
+
+    # Note: I could not think of a standard way to get the version string from different versions.
+    # This trick pulls it out of the file location for a standard library file.
+
+    AC_MSG_CHECKING(for Python version)
+
+    # Need to do this hack since autoconf replaces __file__ with the name of the configure file
+    filehack="file__"
+    PYVERSION=`($PYTHON -c "import string,operator; print operator.getitem(string.split(string.__$filehack,'/'),-2)")`
+    AC_MSG_RESULT($PYVERSION)
+
+    # Set the include directory
+
+    AC_MSG_CHECKING(for Python header files)		
+    if test -r $PYPREFIX/include/$PYVERSION/Python.h; then
+        PYINCLUDE="-I$PYPREFIX/include/$PYVERSION -I$PYEPREFIX/lib/$PYVERSION/config"
+    fi
+    if test -z "$PYINCLUDE"; then
+        if test -r $PYPREFIX/include/Py/Python.h; then
+            PYINCLUDE="-I$PYPREFIX/include/Py -I$PYEPREFIX/lib/python/lib"
+        fi
+    fi
+    AC_MSG_RESULT($PYINCLUDE)
+
+    # Set the library directory blindly.   This probably won't work with older versions
+    AC_MSG_CHECKING(for Python library)
+    dirs="$PYVERSION/config $PYVERSION/lib python/lib"
+    for i in $dirs; do
+        if test -d $PYEPREFIX/lib/$i; then
+           PYLIB="$PYEPREFIX/lib/$i"
+	   PYTHONBUILD=python_make
+           break
+        fi
+    done
+    if test -z "$PYLIB"; then
+        AC_MSG_RESULT(Not found)
+    else
+        AC_MSG_RESULT($PYLIB)
+    fi
+
+    # Check for really old versions
+    if test -r $PYLIB/libPython.a; then
+         PYLINK="-lModules -lPython -lObjects -lParser"
+    else
+         PYLINK="-l$PYVERSION"
+    fi
+fi
+
+# Only cygwin (Windows) needs the library for dynamic linking
+case $ac_sys_system/$ac_sys_release in
+CYGWIN*) PYTHONDYNAMICLINKING="-L$PYLIB $PYLINK"
+         PYINCLUDE="-DUSE_DL_IMPORT $PYINCLUDE"
+         ;;
+*)PYTHONDYNAMICLINKING="";;
+esac
+
+
+AC_SUBST(PYINCLUDE)
+AC_SUBST(PYLIB)
+AC_SUBST(PYLINK)
+AC_SUBST(PYTHONBUILD)
+AC_SUBST(PYTHONDYNAMICLINKING)
+
+])
diff --git a/bindings/swig/package/rawcom.i b/bindings/swig/package/rawcom.i
new file mode 100644
index 0000000..5e9c17b
--- /dev/null
+++ b/bindings/swig/package/rawcom.i
@@ -0,0 +1,14 @@
+%{
+#include "rawcom.h"
+%}
+
+
+%include "rawcom.h"
+
+
+
+%extend sword::RawCom {
+	static sword::RawCom *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawCom*>(o);
+	}
+}
diff --git a/bindings/swig/package/rawgenbook.i b/bindings/swig/package/rawgenbook.i
new file mode 100644
index 0000000..ac4fd1c
--- /dev/null
+++ b/bindings/swig/package/rawgenbook.i
@@ -0,0 +1,12 @@
+%{
+#include "rawgenbook.h"
+%}
+
+%include "rawgenbook.h"
+
+%extend sword::RawGenBook {
+	static sword::RawGenBook *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawGenBook*>(o);
+	}
+	
+}
diff --git a/bindings/swig/package/rawld.i b/bindings/swig/package/rawld.i
new file mode 100644
index 0000000..b1a10df
--- /dev/null
+++ b/bindings/swig/package/rawld.i
@@ -0,0 +1,12 @@
+%{
+#include "rawld.h"
+%}
+
+%include "rawld.h"
+
+%extend sword::RawLD {
+	static sword::RawLD *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawLD*>(o);
+	}
+
+}
diff --git a/bindings/swig/package/rawld4.i b/bindings/swig/package/rawld4.i
new file mode 100644
index 0000000..27e47b2
--- /dev/null
+++ b/bindings/swig/package/rawld4.i
@@ -0,0 +1,12 @@
+%{
+#include "rawld4.h"
+%}
+
+%include "rawld4.h"
+
+%extend sword::RawLD4 {
+	static sword::RawLD4 *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawLD4*>(o);
+	}
+
+}
diff --git a/bindings/swig/package/rawtext.i b/bindings/swig/package/rawtext.i
new file mode 100644
index 0000000..fa2d019
--- /dev/null
+++ b/bindings/swig/package/rawtext.i
@@ -0,0 +1,12 @@
+%{
+#include "rawtext.h"
+%}
+
+%include "rawtext.h"
+
+
+%extend sword::RawText {
+	static sword::RawText *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawText*>(o);
+	}	
+}
diff --git a/bindings/swig/package/remotetrans.i b/bindings/swig/package/remotetrans.i
new file mode 100644
index 0000000..6024765
--- /dev/null
+++ b/bindings/swig/package/remotetrans.i
@@ -0,0 +1,6 @@
+%{
+#include "remotetrans.h"
+%}
+
+%include "remotetrans.h"
+
diff --git a/bindings/swig/package/rendercallback.h b/bindings/swig/package/rendercallback.h
new file mode 100755
index 0000000..bfb54fc
--- /dev/null
+++ b/bindings/swig/package/rendercallback.h
@@ -0,0 +1,251 @@
+#ifndef _RENDERCALLBACK_H
+#define _RENDERCALLBACK_H
+#include <swbuf.h>
+#include <swmodule.h>
+#include <swkey.h>
+#include <swbasicfilter.h>
+#include <utilxml.h>
+#include <osishtmlhref.h>
+#include <thmlhtmlhref.h>
+
+#define FAILED 0
+#define SUCCEEDED 1
+#define INHERITED 2
+
+using namespace sword;
+
+class ReturnSuccess 
+{
+public:
+	ReturnSuccess(): data(""), success(FAILED) {}
+	ReturnSuccess(const char* data, int success): data(data), success(success) {}
+	virtual ~ReturnSuccess() {}
+	const char* data;
+	int success;
+};
+
+
+class RenderCallback {
+public:
+	virtual ~RenderCallback() {;}
+
+	virtual ReturnSuccess run(sword::SWBuf& x, const char * token, 
+			sword::BasicFilterUserData* userData) 
+	{
+		ReturnSuccess nullm("", INHERITED);
+		return nullm;
+	}
+};
+
+// Forward declarations
+class OSISData;
+class ThMLData;
+
+
+class PyOSISHTMLHREF: public sword::OSISHTMLHREF 
+{
+private:
+	RenderCallback* _callback;
+
+public:
+	// Create a class which can be inherited externally
+#ifndef SWIG
+	using sword::OSISHTMLHREF::MyUserData;
+	class MyOsisUserData : public MyUserData {
+		public:
+		MyOsisUserData(const SWModule *module, const SWKey *key):
+			MyUserData(module, key) {};
+	};
+#endif
+	
+	using sword::OSISHTMLHREF::removeTokenSubstitute;
+	using sword::OSISHTMLHREF::addTokenSubstitute;
+	using sword::OSISHTMLHREF::addAllowedEscapeString;
+	using sword::OSISHTMLHREF::removeAllowedEscapeString;
+		
+	PyOSISHTMLHREF(RenderCallback* callback)
+	{
+		_callback=callback;
+	}
+
+	static OSISData* getData(sword::BasicFilterUserData* f)
+	{
+		return (OSISData*) f;
+	}
+			
+	virtual ~PyOSISHTMLHREF() 
+	{ 
+		delCallback();
+	} 
+	
+	void delCallback() 
+	{
+		delete _callback;
+		_callback = 0;
+	}
+	
+	void setCallback(RenderCallback *cb)
+	{
+		delCallback();
+		_callback = cb;
+	}
+
+	ReturnSuccess call(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)
+	{ 
+		if (_callback) return _callback->run(buf, token, userData); 
+		else 
+		{
+			ReturnSuccess nullm("", INHERITED);
+			return nullm;
+		}
+	}
+
+protected:
+	virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)
+	{
+		SWBuf scratch;
+		bool sub = (userData->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+		if(sub) return true;
+
+		ReturnSuccess result = call(buf, token, userData);
+		switch(result.success)
+		{
+			case INHERITED:
+				return sword::OSISHTMLHREF::handleToken(buf, token, userData);
+			case FAILED: 		 
+				return false;
+			case SUCCEEDED:
+				buf += result.data;
+				return true;
+		}		
+
+		return true;
+	}
+};
+
+
+class PyThMLHTMLHREF : public ThMLHTMLHREF {
+private:
+	RenderCallback* _callback;
+public:
+	// Create a class which can be inherited externally
+#ifndef SWIG
+	using sword::ThMLHTMLHREF::MyUserData;
+	class MyThmlUserData : public MyUserData {
+		public:
+		MyThmlUserData(const SWModule *module, const SWKey *key):
+			MyUserData(module, key) {};
+	};
+#endif
+
+	using sword::ThMLHTMLHREF::removeTokenSubstitute;	
+	using sword::ThMLHTMLHREF::addTokenSubstitute;
+	using sword::ThMLHTMLHREF::addAllowedEscapeString;
+	using sword::ThMLHTMLHREF::removeAllowedEscapeString;	
+	PyThMLHTMLHREF(RenderCallback* callback)
+	{
+		_callback=callback;
+	}
+
+	static ThMLData* getData(sword::BasicFilterUserData* f)
+	{
+		return (ThMLData*) f;
+	}
+	
+	virtual ~PyThMLHTMLHREF() 
+	{ 
+		delCallback();
+	} 
+	
+	void delCallback() 
+	{
+		delete _callback;
+		_callback = 0;
+	}
+	
+	void setCallback(RenderCallback *cb)
+	{
+		delCallback();
+		_callback = cb;
+	}
+
+	ReturnSuccess call(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)		  
+	{ 
+		if (_callback) return _callback->run(buf, token, userData); 
+		else 
+		{
+			ReturnSuccess nullm("", INHERITED);
+			return nullm;
+		}
+	}
+protected:
+	virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)
+	{
+		SWBuf scratch;
+		bool sub = (userData->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+		if(sub) return true;
+		
+		ReturnSuccess result = call(buf, token, userData);
+		switch(result.success)
+		{
+			case INHERITED:
+				return sword::ThMLHTMLHREF::handleToken(buf, token, userData);
+			case FAILED: 		 
+				return false;
+		case SUCCEEDED:
+			buf += result.data;
+			return true;
+		}		
+
+		return true;
+	}
+};
+
+class OSISData : 
+#ifndef SWIG
+public PyOSISHTMLHREF::MyOsisUserData {
+public:
+	OSISData(const SWModule *module, const SWKey *key):
+	PyOSISHTMLHREF::MyOsisUserData(module, key) {};
+#else
+// trick SWIG into thinking this is not inherited from an inner class...
+public sword::BasicFilterUserData 
+{
+public:
+	bool osisQToTick;
+	bool inBold;
+	bool inXRefNote;
+	bool BiblicalText;
+	int suspendLevel;
+	SWBuf wordsOfChristStart;
+	SWBuf wordsOfChristEnd;
+	SWBuf lastTransChange;
+	SWBuf w;
+	SWBuf fn;
+	SWBuf version;
+
+#endif //!SWIG
+};
+
+class ThMLData : 
+#ifndef SWIG
+public PyThMLHTMLHREF::MyThmlUserData {
+	public:
+	ThMLData(const SWModule *module, const SWKey *key):
+		PyThMLHTMLHREF::MyThmlUserData(module, key) {};
+
+#else
+// trick SWIG into thinking this is not inherited from an inner class...
+public sword::BasicFilterUserData 
+{
+public:
+	SWBuf inscriptRef;
+	bool SecHead;
+	bool BiblicalText;
+	SWBuf version;
+	XMLTag startTag;	
+
+#endif //!SWIG
+};
+
+#endif // _RENDERCALLBACK_H
diff --git a/bindings/swig/package/searcher.h b/bindings/swig/package/searcher.h
new file mode 100755
index 0000000..e04db92
--- /dev/null
+++ b/bindings/swig/package/searcher.h
@@ -0,0 +1,43 @@
+#include <swmodule.h>
+#include <swkey.h>
+#include <listkey.h>
+
+using namespace sword;
+class SWSearcher{
+public:
+	sword::SWModule* mod;
+	int percent;
+
+	static void Callback(char status, void *me){
+		SWSearcher* searcher = (SWSearcher*)me;
+		searcher->PercentFunction((int) status);
+	}
+
+	virtual void PercentFunction(int value){
+		percent=value;
+	}
+	
+	SWSearcher(sword::SWModule* Mod){mod=Mod;}
+	virtual ~SWSearcher(){}
+
+	int GetPercent(){return percent;}
+
+	bool isSearchSupported(const char *istr, int searchType = 0,
+							  int flags = 0,
+			SWKey * scope = 0) {
+			bool checksupported = true;
+			mod->search(istr, searchType, flags, scope, &checksupported);
+			return checksupported;
+	}
+
+	ListKey &doSearch(const char *istr, int searchType = 0, int flags = 0,
+					  SWKey *scope = 0) {
+			return mod->search(istr, searchType, flags, scope,
+				   0, this->Callback, (void *) this);
+	}
+
+	void TerminateSearch(){
+		mod->terminateSearch=true;
+	}
+};
+
diff --git a/bindings/swig/package/stringmgr.i b/bindings/swig/package/stringmgr.i
new file mode 100644
index 0000000..ba216b1
--- /dev/null
+++ b/bindings/swig/package/stringmgr.i
@@ -0,0 +1,26 @@
+
+%{
+#include "stringmgr.h"
+class PyStringMgr : public sword::StringMgr
+{
+    public:
+       char *upperUTF8(char *text, unsigned int max = 0) const
+        {
+            sword::SWBuf buf=(const char*)text;
+            getUpper(&buf);
+            strncpy(text, buf.c_str(), (max) ? max : strlen(text));
+            return text;
+        }
+
+        virtual void getUpper(sword::SWBuf* test) const = 0;
+};
+%}
+
+%include "stringmgr.h"
+class PyStringMgr : public sword::StringMgr
+{
+    public:
+       char *upperUTF8(char *text, unsigned int max = 0) const;
+       virtual void getUpper(sword::SWBuf* test) const = 0;
+};
+
diff --git a/bindings/swig/package/swbuf.i b/bindings/swig/package/swbuf.i
new file mode 100644
index 0000000..ada600f
--- /dev/null
+++ b/bindings/swig/package/swbuf.i
@@ -0,0 +1,37 @@
+%{
+#include "swbuf.h"
+%}
+
+%rename(__str__) sword::SWBuf::operator const char *;
+%ignore sword::SWBuf::operator[];
+%ignore sword::SWBuf::operator+;
+%ignore sword::SWBuf::operator==;
+%ignore sword::SWBuf::operator!=;
+%ignore sword::SWBuf::operator+=;
+%ignore sword::SWBuf::operator-=;
+%ignore sword::SWBuf::operator<=;
+%ignore sword::SWBuf::operator>=;
+%ignore sword::SWBuf::operator<;
+%ignore sword::SWBuf::operator>;
+%ignore sword::SWBuf::operator<<;
+%ignore sword::SWBuf::operator>>;
+%ignore sword::SWBuf::operator=;
+%ignore sword::SWBuf::operator--;
+%ignore sword::SWBuf::charAt(unsigned long);
+
+/* Ignore this horrible constructor.
+*  This would be the default for single character strings passed in. This can
+*  lead to changing of immutable strings!!!!
+*/
+%ignore sword::SWBuf::SWBuf(char, unsigned long);
+
+
+%include "swbuf.h"
+
+
+%extend sword::SWBuf {
+        char charAt2(unsigned int pos) {
+                return self->charAt((unsigned long)pos);
+        }
+};
+
diff --git a/bindings/swig/package/swcacher.i b/bindings/swig/package/swcacher.i
new file mode 100644
index 0000000..99b065e
--- /dev/null
+++ b/bindings/swig/package/swcacher.i
@@ -0,0 +1,6 @@
+%{
+#include "swcacher.h"
+%}
+
+%include "swcacher.h"
+
diff --git a/bindings/swig/package/swcom.i b/bindings/swig/package/swcom.i
new file mode 100644
index 0000000..90291cf
--- /dev/null
+++ b/bindings/swig/package/swcom.i
@@ -0,0 +1,14 @@
+%{
+#include "swcom.h"
+%}
+
+%ignore sword::SWCom::SWCom;
+
+%include "swcom.h"
+
+%extend sword::SWCom {
+	/* C++-style cast */
+	static sword::SWCom *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWCom*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/swcomprs.i b/bindings/swig/package/swcomprs.i
new file mode 100644
index 0000000..3cdd653
--- /dev/null
+++ b/bindings/swig/package/swcomprs.i
@@ -0,0 +1,10 @@
+%{
+#include <swcomprs.h>
+%}
+
+%ignore sword::SWCompress::Buf;
+%ignore sword::SWCompress::zBuf;
+%ignore sword::SWCompress::GetChars;
+%ignore sword::SWCompress::SendChars;
+
+%include "swcomprs.h"
diff --git a/bindings/swig/package/swconfig.i b/bindings/swig/package/swconfig.i
new file mode 100644
index 0000000..b1f6834
--- /dev/null
+++ b/bindings/swig/package/swconfig.i
@@ -0,0 +1,25 @@
+%{
+#include "swconfig.h"
+%}
+
+%ignore sword::SWConfig::operator[];
+%ignore sword::SWConfig::operator+=;
+%ignore sword::SWConfig::sections;
+%ignore sword::SWConfig::Sections;
+
+%include "swconfig.h"
+
+
+%extend sword::SWConfig {
+  void set(const char* group, const char* entry, const char* value) {
+	self->Sections[group][entry] = value;
+  };
+  const char* get(const char* group, const char* entry) {
+	return self->Sections[group][entry].c_str();
+  };
+  PySectionMap /*std::map < sword::SWBuf, std::multimap <sword::SWBuf, sword::SWBuf> > */
+  *getSections() {
+    return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->Sections;
+  }
+}
+
diff --git a/bindings/swig/package/swdisp.i b/bindings/swig/package/swdisp.i
new file mode 100644
index 0000000..3451cd7
--- /dev/null
+++ b/bindings/swig/package/swdisp.i
@@ -0,0 +1,5 @@
+%{
+#include "swdisp.h"
+%}
+
+%include "swdisp.h"
diff --git a/bindings/swig/package/swfilter.i b/bindings/swig/package/swfilter.i
new file mode 100644
index 0000000..46f659a
--- /dev/null
+++ b/bindings/swig/package/swfilter.i
@@ -0,0 +1,7 @@
+%{
+#include <swfilter.h>
+%}
+
+%ignore sword::SWFilter::getOptionValues;
+
+%include "swfilter.h"
diff --git a/bindings/swig/package/swfiltermgr.i b/bindings/swig/package/swfiltermgr.i
new file mode 100644
index 0000000..fb6b507
--- /dev/null
+++ b/bindings/swig/package/swfiltermgr.i
@@ -0,0 +1,12 @@
+%{
+#include <swfiltermgr.h>
+%}
+
+%ignore sword::SWFilterMgr::AddGlobalOptions;
+%ignore sword::SWFilterMgr::AddLocalOptions;
+%ignore sword::SWFilterMgr::AddEncodingFilters;
+%ignore sword::SWFilterMgr::AddRenderFilters;
+%ignore sword::SWFilterMgr::AddStripFilters;
+%ignore sword::SWFilterMgr::AddRawFilters;
+
+%include "swfiltermgr.h"
diff --git a/bindings/swig/package/swgenbook.i b/bindings/swig/package/swgenbook.i
new file mode 100644
index 0000000..aef3df0
--- /dev/null
+++ b/bindings/swig/package/swgenbook.i
@@ -0,0 +1,11 @@
+%{
+#include "swgenbook.h"
+%}
+
+%include "swgenbook.h"
+
+%extend sword::SWGenBook {
+	static sword::SWGenBook *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWGenBook*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/swig.m4 b/bindings/swig/package/swig.m4
new file mode 100644
index 0000000..49f1fdc
--- /dev/null
+++ b/bindings/swig/package/swig.m4
@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Look for SWIG
+#----------------------------------------------------------------
+
+AC_DEFUN([SW_PROG_SWIG],
+[
+
+AC_ARG_WITH(swigbin,[  --with-swigbin=path        Set location of swig executable],[ SWIGBIN="$withval"], [SWIGBIN=])
+AC_ARG_ENABLE(swig,[  --enable-swig=path       Run swig to generate new source default=no],, enable_swig=no)
+
+if test -z "$SWIGBIN"; then
+AC_PATH_PROG(SWIG, swig)
+else
+AC_PATH_PROG(SWIG, swig, "not found", $SWIGBIN)
+fi
+
+runswig=true
+if test x"$SWIG"="xnot found"; then
+	runswig=false
+fi
+if test x"$enable_swig"="xno"; then
+	runswig=false
+fi
+
+AM_CONDITIONAL(RUNSWIG, test x$runswig = xtrue)
+
+#ac_cv_swigversion=``
+
+])
diff --git a/bindings/swig/package/swkey.i b/bindings/swig/package/swkey.i
new file mode 100644
index 0000000..ebbd934
--- /dev/null
+++ b/bindings/swig/package/swkey.i
@@ -0,0 +1,15 @@
+%{
+#include "swkey.h"
+%}
+
+%ignore sword::SWKey::userData;
+%ignore sword::SWKey::Index;
+%ignore sword::SWKey::Traversable;
+
+%rename (getPosition) sword::SW_POSITION::operator char;
+
+%include "swkey.h"
+
+#ifndef SWIGPERL
+%rename(__str__) sword::SWKey::operator const char *;
+#endif
diff --git a/bindings/swig/package/swld.i b/bindings/swig/package/swld.i
new file mode 100644
index 0000000..135f14e
--- /dev/null
+++ b/bindings/swig/package/swld.i
@@ -0,0 +1,13 @@
+%{
+#include "swld.h"
+%}
+
+%ignore sword::SWLD::SWLD;
+
+%include "swld.h"
+
+%extend sword::SWLD {
+	static sword::SWLD *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWLD*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/swlocale.i b/bindings/swig/package/swlocale.i
new file mode 100644
index 0000000..1977bba
--- /dev/null
+++ b/bindings/swig/package/swlocale.i
@@ -0,0 +1,16 @@
+%{
+#include "swlocale.h"
+%}
+
+%ignore sword::SWLocale::operator+=;
+%ignore sword::SWLocale::getBookAbbrevs(int *);
+
+%include "swlocale.h"
+
+%extend sword::SWLocale {
+    const sword::abbrev* getBookAbbrevs() {
+        int x;
+        return self->getBookAbbrevs(&x);
+    }
+
+}
diff --git a/bindings/swig/package/swlog.i b/bindings/swig/package/swlog.i
new file mode 100644
index 0000000..4b8a0f0
--- /dev/null
+++ b/bindings/swig/package/swlog.i
@@ -0,0 +1,6 @@
+%{
+#include "swlog.h"
+%}
+
+%include "swlog.h"
+
diff --git a/bindings/swig/package/swmgr.i b/bindings/swig/package/swmgr.i
new file mode 100644
index 0000000..d914be0
--- /dev/null
+++ b/bindings/swig/package/swmgr.i
@@ -0,0 +1,40 @@
+%{
+#include <swmgr.h>
+%}
+
+%ignore sword::SWMgr::Modules;
+%ignore sword::SWMgr::findConfig;
+%include "swmgr.h"
+
+%extend sword::SWMgr {
+    std::vector < sword::SWBuf > getGlobalOptionsVector() {
+        std::list<sword::SWBuf> l(self->getGlobalOptions());
+        return std::vector< sword::SWBuf >(l.begin(), l.end());
+    }
+    
+    std::vector < sword::SWBuf > getGlobalOptionValuesVector(const char *option) {
+        std::list<sword::SWBuf> l(self->getGlobalOptionValues(option));
+        return std::vector< sword::SWBuf >(l.begin(), l.end());
+    }
+    
+    std::map<sword::SWBuf, sword::SWModule*> &getModules() {
+        return self->Modules;
+    }
+    
+    SWModule* getModuleAt( const int pos ) {
+        if (pos < 0 || pos > (int)self->Modules.size() )
+            return 0;
+    
+        sword::ModMap::iterator it = self->Modules.begin(); 
+        
+        for (int i = 0; i < pos; ++i) {
+            it++;
+        }
+
+        if ( it != self->Modules.end() ) {
+            return (*it).second;
+        }
+        
+        return 0;
+    }
+} 
diff --git a/bindings/swig/package/swmodule.i b/bindings/swig/package/swmodule.i
new file mode 100644
index 0000000..d9417db
--- /dev/null
+++ b/bindings/swig/package/swmodule.i
@@ -0,0 +1,35 @@
+%{
+#include "swmodule.h"
+%}
+
+%ignore sword::SWModule::operator SWKey &;
+%ignore sword::SWModule::operator SWKey *;
+
+%ignore sword::SWModule::Search;
+
+%ignore sword::SWModule::SWModule;
+%ignore sword::SWModule::filterBuffer;
+%ignore sword::SWModule::getEntryAttributes;
+%ignore sword::SWModule::getConfig;
+%ignore sword::SWModule::setConfig;
+
+%include "swmodule.h"
+
+%extend sword::SWModule {
+	
+	static sword::SWModule *castTo(sword::SWSearchable *o) {
+		return dynamic_cast<sword::SWModule*>(o);
+	}
+
+
+    std::map < sword::SWBuf, std::map < sword::SWBuf, std::map < sword::SWBuf, sword::SWBuf > > > 
+    
+      &getEntryAttributesMap() {
+            return self->getEntryAttributes();
+    }
+
+  std::map <sword::SWBuf, sword::SWBuf> *getConfigMap() {
+    return ( std::map < sword::SWBuf, sword::SWBuf > * ) &self->getConfig();
+  }
+}
+
diff --git a/bindings/swig/package/swobject.i b/bindings/swig/package/swobject.i
new file mode 100644
index 0000000..b6079a2
--- /dev/null
+++ b/bindings/swig/package/swobject.i
@@ -0,0 +1,7 @@
+%{
+#include "swobject.h"
+%}
+
+%ignore sword::SWClass::SWClass;
+
+%include "swobject.h"
diff --git a/bindings/swig/package/swoptfilter.i b/bindings/swig/package/swoptfilter.i
new file mode 100644
index 0000000..7ef7b87
--- /dev/null
+++ b/bindings/swig/package/swoptfilter.i
@@ -0,0 +1,13 @@
+%{
+#include "swoptfilter.h"
+%}
+
+%ignore sword::SWOptionFilter::getOptionValues;
+
+%include "swoptfilter.h"
+
+%extend sword::SWOptionFilter {
+	static sword::SWOptionFilter *castTo(sword::SWFilter *o) {
+		return dynamic_cast<sword::SWOptionFilter*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/sword.i b/bindings/swig/package/sword.i
new file mode 100644
index 0000000..a963fa1
--- /dev/null
+++ b/bindings/swig/package/sword.i
@@ -0,0 +1,106 @@
+#define SWDLLEXPORT  
+
+%module "Sword"
+%module(directors="1") Sword;
+
+/* Ignore warnings about Unknown base class */
+%warnfilter(401);
+
+%include "deprecations.i"
+
+#ifdef SWIGPYTHON
+%include "directors.i"
+#endif
+
+/* Some renames for sanity */
+%ignore *::operator SWBuf;
+
+/* Some generic ignores. These don't map into any Python operators */
+%ignore *::operator=;
+%ignore *::operator++;
+%ignore *::operator--;
+%ignore *::operator sword::SWKey &;
+%ignore *::operator sword::SWKey *;
+/* An ignore for missing wchar_t compatibility */
+%ignore sword::SWBuf::append(wchar_t);
+
+%include "defs.i"
+%include "swbuf.i"
+
+%include "multimapwdef.i"
+
+
+/* Now include all the STL templates we are going to use */
+%include "templates.i"
+
+%include "swobject.i"
+%include "swconfig.i"
+%include "swversion.i"
+%include "bases.i"
+
+%include "swkey.i"
+%include "listkey.i"
+%include "versekey.i"
+%include "treekey.i"
+%include "treekeyidx.i"
+%include "versetreekey.i"
+
+%include "swdisp.i"
+
+%include "swfilter.i"
+%include "swoptfilter.i"
+%include "swfiltermgr.i"
+
+
+%include "stringmgr.i"
+%include "swsearchable.i"
+//%include "swcacher.i"
+%include "swmodule.i"
+
+
+
+%include "swmgr.i"
+%include "filemgr.h"
+
+%include "encfiltmgr.i"
+%include "markupfiltmgr.i"
+
+%include "swlocale.i"
+
+%include "swcomprs.i"
+%include "lzsscomprs.i"
+%include "zipcomprs.i"
+
+
+%include "swcom.i"
+%include "rawcom.i"
+%include "zcom.i"
+
+%include "swgenbook.i"
+%include "rawgenbook.i"
+
+%include "swld.i"
+%include "rawld.i"
+%include "rawld4.i"
+%include "zld.i"
+
+%include "swtext.i"
+%include "rawtext.i"
+%include "ztext.i"
+
+%include "localemgr.i"
+
+%include "url.i"
+%include "utilxml.i"
+
+%include "osishtmlhref.i"
+%include "extras.i"
+%include "swlog.i"
+
+#ifndef EXCLUDE_FTP
+%include "remotetrans.i"
+
+#ifndef EXCLUDE_INSTALLMGR
+%include "installmgr.i"
+#endif
+#endif
diff --git a/bindings/swig/package/sword.m4 b/bindings/swig/package/sword.m4
new file mode 100644
index 0000000..97f06bb
--- /dev/null
+++ b/bindings/swig/package/sword.m4
@@ -0,0 +1,174 @@
+##	-*- autoconf -*-
+dnl This file was created by Joachim Ansorg <jansorg@gmx.de>
+dnl It provides macord for the autoconf package to find the Sword library on your system.
+
+dnl ----------------------------------------------------------------------
+dnl		Check wheter to use static linking
+dnl		first parameter is the required version
+dnl		second is whether to use static sword library
+dnl ----------------------------------------------------------------------
+AC_DEFUN([SW_CHECK_SWORD],
+[
+dnl AC_MSG_CHECKING([for a Sword installation])
+
+dnl The option for the configure script
+AC_ARG_WITH(sword-dir,
+[  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr) ],
+[
+  ac_sword_dir=$withval
+],ac_sword_dir=/usr
+)
+
+AC_ARG_ENABLE(static-sword,
+[  --enable-static-sword    Link to the static Sword library],
+ 	ac_static_sword="YES",
+ 	[ ac_static_sword="$2" ]
+)
+
+dnl try to find Sword library files
+AC_MSG_CHECKING([for Sword library files])
+AC_REQUIRE([AC_FIND_ZLIB])
+ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib64 /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
+
+if test "$ac_static_sword" = "YES"; then
+	SEARCH_LIBS="libsword.a";
+else
+	SEARCH_LIBS="libsword.a libsword.so";
+fi
+
+
+AC_CACHE_VAL(ac_cv_sword_libdir, AC_FIND_FILE($SEARCH_LIBS, $ac_sword_library_dirs, ac_cv_sword_libdir))
+
+if test "$ac_cv_sword_libdir" = "NO"; then
+  AC_MSG_ERROR(SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!);
+fi
+
+if test "$ac_static_sword" = "YES"; then
+	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
+else
+	LIB_SWORD="-L$ac_cv_sword_libdir -lsword";
+fi
+
+#AC_SUBST(SWORD_LIBRARY_PATH)
+AC_SUBST(LIB_SWORD)
+all_libraries="$all_libraries -L$ac_cv_sword_libdir"
+
+if test "$ac_static_sword" = "YES"; then
+	MESSAGE="static library $ac_cv_sword_libdir/libsword.a";
+else
+	MESSAGE="$ac_cv_sword_libdir";
+fi
+AC_MSG_RESULT([$MESSAGE])
+
+
+
+dnl -- try to find Swords include files --
+AC_MSG_CHECKING([for Sword include files])
+ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword"
+
+AC_CACHE_VAL(ac_cv_sword_incdir, AC_FIND_FILE(swmgr.h, $ac_sword_include_dirs, ac_cv_sword_incdir))
+
+if test "$ac_cv_sword_incdir" = "NO"; then
+	AC_MSG_ERROR([The Sword include file files were not found.
+Please try to use configure with --with-sword-dir=/your/SWORD/path !
+])
+fi
+
+SWORD_INCLUDES="-I$ac_cv_sword_incdir"
+SWORD_INCLUDE_DIR="$ac_cv_sword_incdir"
+AC_SUBST(SWORD_INCLUDES)
+AC_SUBST(SWORD_INCLUDE_DIR)
+all_includes="$all_includes -I$ac_cv_sword_incdir"
+
+AC_MSG_RESULT([$ac_cv_sword_incdir])
+
+
+
+dnl -- check if Sword matches the minimum version --
+AC_MSG_CHECKING([if you have Sword $1 or later])
+
+AC_CACHE_VAL(ac_cv_installed_sword_version,
+[
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
+ac_LIBRARY_PATH="$LIBRARY_PATH"
+ac_cxxflags_safe="$CXXFLAGS"
+ac_ldflags_safe="$LDFLAGS"
+ac_libs_safe="$LIBS"
+
+CXXFLAGS="$CXXFLAGS -I$"
+LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
+LIBS="$LIB_SWORD -lz"
+LD_LIBRARY_PATH="$ac_cv_sword_libdir"
+export LD_LIBRARY_PATH
+LIBRARY_PATH=
+export LIBRARY_PATH
+
+cat > conftest.$ac_ext <<EOF
+#include <iostream.h>
+#include <swversion.h>
+using std::cout;
+using std::endl;
+using sword::SWVersion;
+
+int main(int argc, char* argv[]) {
+	if (argc != 2) {
+		cout << SWVersion::currentVersion << endl;
+	}
+	else if (argc == 2) 
+	{
+		if (SWVersion(&argv[[1]]) < SWVersion::currentVersion || SWVersion(&argv[[1]]) == SWVersion::currentVersion)
+		{
+			cout << 0 << endl;
+			return 0;
+		}
+		else	
+		{
+			cout << 1 << endl;
+			return 1; //version not recent enough
+		}
+	}
+	return 0;
+}
+EOF
+
+ac_link='${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+if AC_TRY_EVAL(ac_link) && test -s conftest; then
+	if test -x conftest; then
+		eval ac_cv_installed_sword_version=`./conftest 2>&5`
+		echo "configure: ac_cv_installed_sword_version=$ac_cv_installed_sword_version" >&AC_FD_CC
+		eval sword_test_returncode=`./conftest $1 2>&5`;
+		echo "configure: sword_test_returncode=$sword_test_returncode" >&AC_FD_CC
+	fi
+else
+  echo "configure: failed program was:" >&AC_FD_CC
+  cat conftest.$ac_ext >&AC_FD_CC
+fi
+
+rm -f conftest*
+CXXFLAGS="$ac_cxxflags_safe"
+LDFLAGS="$ac_ldflags_safe"
+LIBS="$ac_libs_safe"
+
+LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
+export LD_LIBRARY_PATH
+LIBRARY_PATH="$ac_LIBRARY_PATH"
+export LIBRARY_PATH
+AC_LANG_RESTORE
+])
+
+right_version="ok";
+if test "x$sword_test_returncode" = "x1"; then
+	echo "configure: changing right_version" >&AC_FD_CC
+	right_version="wrong version";
+fi;
+	
+AC_MSG_RESULT([$ac_cv_installed_sword_version])
+echo "configure: right_version=$right_version" >&AC_FD_CC
+if test "x$right_version" != "xok"; then
+        AC_MSG_ERROR([Your Sword installation is not recent enough! $sword_test_returncode Please
+upgrade to version $1!]);
+fi;
+
+])
diff --git a/bindings/swig/package/swsearchable.i b/bindings/swig/package/swsearchable.i
new file mode 100644
index 0000000..6f6cbde
--- /dev/null
+++ b/bindings/swig/package/swsearchable.i
@@ -0,0 +1,25 @@
+%{
+#include "swsearchable.h"
+%}
+
+%ignore sword::SWSearchable::search;
+%ignore sword::SWSearchable::createSearchFramework;
+%ignore sword::SWSearchable::nullPercent;
+
+%include "swsearchable.h"
+
+%extend sword::SWSearchable {
+        bool isSearchSupported(const char *istr, int searchType = 0,
+                                  int flags = 0,
+                SWKey * scope = 0) {
+                bool checksupported = true;
+                self->search(istr, searchType, flags, scope, &checksupported);
+                return checksupported;
+        }
+
+        ListKey &doSearch(const char *istr, int searchType = 0, int flags = 0,
+                          SWKey *scope = 0) {
+                return self->search(istr, searchType, flags, scope);
+        }
+};
+
diff --git a/bindings/swig/package/swtext.i b/bindings/swig/package/swtext.i
new file mode 100644
index 0000000..62aa00d
--- /dev/null
+++ b/bindings/swig/package/swtext.i
@@ -0,0 +1,13 @@
+%{
+#include "swtext.h"
+%}
+
+%ignore sword::SWText::SWText;
+
+%include "swtext.h"
+
+%extend sword::SWText {
+	static sword::SWText *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWText*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/swversion.i b/bindings/swig/package/swversion.i
new file mode 100644
index 0000000..c09d7c7
--- /dev/null
+++ b/bindings/swig/package/swversion.i
@@ -0,0 +1,5 @@
+%{
+#include "swversion.h"
+%}
+
+%include "swversion.h"
diff --git a/bindings/swig/package/tcl.m4 b/bindings/swig/package/tcl.m4
new file mode 100644
index 0000000..9d9cee2
--- /dev/null
+++ b/bindings/swig/package/tcl.m4
@@ -0,0 +1,114 @@
+#--------------------------------------------------------------------
+#	Try to locate the Tcl package
+#--------------------------------------------------------------------
+
+AC_DEFUN([SW_FIND_TCL],
+[
+
+
+TCLINCLUDE=
+TCLLIB=
+TCLPACKAGE=
+#TCLSWIG=
+
+AC_ARG_WITH(tclconfig,[  --with-tclconfig=path  Set location of tclConfig.sh],
+        with_tclconfig="$withval")
+AC_ARG_WITH(tcl,[  --with-tcl=path         Set location of Tcl package],[
+	TCLPACKAGE="$withval"], [TCLPACKAGE=])
+AC_ARG_WITH(tclincl,[  --with-tclincl=path     Set location of Tcl include directory],[
+	TCLINCLUDE="-I$withval"], [TCLINCLUDE=])
+AC_ARG_WITH(tcllib,[  --with-tcllib=path      Set location of Tcl library directory],[
+	TCLLIB="-L$withval"], [TCLLIB=])
+
+AC_MSG_CHECKING([for Tcl configuration])
+# First check to see if --with-tclconfig was specified.
+if test x"${with_tclconfig}" != x ; then
+   if test -f "${with_tclconfig}/tclConfig.sh" ; then
+      TCLCONFIG=`(cd ${with_tclconfig}; pwd)`
+   else
+      AC_MSG_ERROR([${with_tcl} directory doesn't contain tclConfig.sh])
+   fi
+fi
+# check in a few common install locations
+if test x"${TCLCONFIG}" = x ; then
+    for i in `ls -d /usr/lib 2>/dev/null` \
+	     `ls -d ${prefix}/lib 2>/dev/null` \
+	    `ls -d /usr/local/lib 2>/dev/null` ; do
+	if test -f "$i/tclConfig.sh" ; then
+	    TCLCONFIG=`(cd $i; pwd)`
+	    break
+	fi
+    done
+fi
+if test x"${TCLCONFIG}" = x ; then
+    AC_MSG_RESULT(no)
+else
+    AC_MSG_RESULT(found $TCLCONFIG/tclConfig.sh)
+    . $TCLCONFIG/tclConfig.sh
+    TCLINCLUDE=-I$TCL_PREFIX/include
+    TCLLIB=$TCL_LIB_SPEC
+fi
+
+if test -z "$TCLINCLUDE"; then
+   if test -n "$TCLPACKAGE"; then
+	TCLINCLUDE="-I$TCLPACKAGE/include"
+   fi
+fi
+
+if test -z "$TCLLIB"; then
+   if test -n "$TCLPACKAGE"; then
+	TCLLIB="-L$TCLPACKAGE/lib -ltcl"
+   fi
+fi
+
+AC_MSG_CHECKING(for Tcl header files)
+if test -z "$TCLINCLUDE"; then
+AC_TRY_CPP([#include <tcl.h>], , TCLINCLUDE="")
+if test -z "$TCLINCLUDE"; then
+	dirs="$prefix/include /usr/local/include /usr/include /opt/local/include"
+	for i in $dirs ; do
+		if test -r $i/tcl.h; then
+			AC_MSG_RESULT($i)
+			TCLINCLUDE="-I$i"
+			break
+		fi
+	done
+fi
+if test -z "$TCLINCLUDE"; then
+#	TCLINCLUDE="-I/usr/local/include"
+    	AC_MSG_RESULT(not found)
+fi
+else
+        AC_MSG_RESULT($TCLINCLUDE)
+fi
+
+AC_MSG_CHECKING(for Tcl library)
+if test -z "$TCLLIB"; then
+dirs="$prefix/lib /usr/local/lib /usr/lib /opt/local/lib"
+for i in $dirs ; do
+	if test -r $i/libtcl.a; then
+	    AC_MSG_RESULT($i)
+	    TCLLIB="-L$i -ltcl"
+	    break
+	fi
+done
+if test -z "$TCLLIB"; then
+	AC_MSG_RESULT(not found)
+#	TCLLIB="-L/usr/local/lib"
+fi
+else
+AC_MSG_RESULT($TCLLIB)
+fi
+
+# Only cygwin (Windows) needs the library for dynamic linking
+case $ac_sys_system/$ac_sys_release in
+CYGWIN*) TCLDYNAMICLINKING="$TCLLIB";;
+*)TCLDYNAMICLINKING="";;
+esac
+
+AC_SUBST(TCLINCLUDE)
+AC_SUBST(TCLLIB)
+AC_SUBST(TCLDYNAMICLINKING)
+#AC_SUBST(TCLSWIG)
+
+])
diff --git a/bindings/swig/package/templates.i b/bindings/swig/package/templates.i
new file mode 100644
index 0000000..20fd9cd
--- /dev/null
+++ b/bindings/swig/package/templates.i
@@ -0,0 +1,79 @@
+%include <stl.i>
+%include <std_map.i>
+%include <std_list.i>
+
+%include <std_pair.i>
+#ifdef SWIGPYTHON
+%include <std_multimap.i>
+#else
+%include "local/std_multimap.i"
+#endif
+%include <multimapwdef.h>
+
+/*
+Include SWModule and DirEntry here, so that it will be able to appear below
+*/
+%{
+#include "swmodule.h"
+#include "filemgr.h"
+#include "swconfig.h"
+%}
+
+/* 
+These are the stl templates that are used throughout Sword. Some have more
+than one name in Sword, depending on context. However, these are all wrapped with the one class.
+For example, sword::AttributeValueMap is the same as sword::ConfigEntMap
+Both are wrapped as the former, however
+*/
+%inline %{
+typedef std::map< sword::SWBuf, sword::SWBuf > AttributeValueMap;
+typedef std::map< sword::SWBuf, AttributeValueMap> AttributeListMap;
+typedef std::map< sword::SWBuf, AttributeListMap> AttributeTypeListMap; 
+typedef std::multimap < sword::SWBuf, sword::SWBuf, std::less < sword::SWBuf > > PyConfigEntMap;
+typedef std::map < sword::SWBuf, PyConfigEntMap > PySectionMap;
+%}
+
+/* Used by SWModule and SWConfig */
+%template() std::pair <sword::SWBuf, sword::SWBuf>;
+%template(AttributeValueMap) std::map < sword::SWBuf, sword::SWBuf >;
+
+/* Used by SWModule */
+%template() std::pair <sword::SWBuf, AttributeValueMap>;
+%template(AttributeListMap) std::map < sword::SWBuf, AttributeValueMap>;
+%template() std::pair < sword::SWBuf, AttributeListMap>;
+%template(AttributeTypeListMap) std::map < sword::SWBuf, AttributeListMap>;
+
+/* Used by SWConfig */
+#ifdef SWIGPYTHON
+%template(PyConfigEntMap) std::multimap < sword::SWBuf, sword::SWBuf, std::less <sword::SWBuf> >;
+#endif
+/* %template() std::less <sword::SWBuf>;*/
+%template() std::pair < sword::SWBuf, std::multimap < sword::SWBuf,
+ sword::SWBuf > >/*PyConfigEntMap >*/;
+%template(PySectionMap) std::map < sword::SWBuf, std::multimap < sword::SWBuf,
+ sword::SWBuf > >/*std::map < sword::SWBuf, PyConfigEntMap >*/;
+
+/* Used by SWMgr */
+%template() std::pair<sword::SWBuf, sword::SWModule*>;
+%template(ModuleMap) std::map<sword::SWBuf, sword::SWModule*>;
+
+/* Used by SWMgr and LocaleMgr */
+%template(StringVector) std::vector < sword::SWBuf >;
+
+/* Used by xmltag */
+%template(StringList) std::list < sword::SWBuf >;
+
+
+/* Used by InstallMgr */
+#ifndef EXCLUDE_INSTALLMGR
+%{
+#include "installmgr.h"
+%}
+%template() std::pair<sword::SWBuf, sword::InstallSource*>;
+%template(InstallSourceMap) std::map<sword::SWBuf, sword::InstallSource*>;
+%template() std::pair<sword::SWModule *, int>;
+%template() std::map<sword::SWModule *, int>;
+#endif
+
+/* Used by DirEntry */
+%template(DirEntryVector) std::vector < sword::DirEntry > ;
diff --git a/bindings/swig/package/treekey.i b/bindings/swig/package/treekey.i
new file mode 100644
index 0000000..a2bbac7
--- /dev/null
+++ b/bindings/swig/package/treekey.i
@@ -0,0 +1,38 @@
+%{
+#include "treekey.h"
+%}
+
+%ignore sword::TreeKey::getUserData(int *);
+%ignore sword::TreeKey::setUserData(const char *, int);
+
+%include <carrays.i>
+
+//%pointer_class(unsigned char, BytePointer);
+//%array_class(unsigned char, ByteArray);
+
+%include "treekey.h"
+
+%extend sword::TreeKey {
+	static sword::TreeKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::TreeKey*>(o);
+	}
+}
+
+/*
+%extend sword::TreeKey {
+
+        const unsigned char *getUserData2() {
+                return (const unsigned char*)(self->getUserData(0));
+        }
+
+        int getUserDataSize() {
+                int s;
+                self->getUserData(&s);
+                return s;
+        }
+
+        void setUserData(unsigned char data[], int size) {
+                self->setUserData(((const char*)(data)), size);
+        }
+};
+*/
diff --git a/bindings/swig/package/treekeyidx.i b/bindings/swig/package/treekeyidx.i
new file mode 100644
index 0000000..16e332d
--- /dev/null
+++ b/bindings/swig/package/treekeyidx.i
@@ -0,0 +1,11 @@
+%{
+#include "treekeyidx.h"
+%}
+
+%include "treekeyidx.h"
+
+%extend sword::TreeKeyIdx {
+	static sword::TreeKeyIdx *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::TreeKeyIdx*>(o);
+	}
+}
diff --git a/bindings/swig/package/url.i b/bindings/swig/package/url.i
new file mode 100644
index 0000000..2ef4cf4
--- /dev/null
+++ b/bindings/swig/package/url.i
@@ -0,0 +1,5 @@
+%{
+#include <url.h>
+%}
+
+%include "url.h"
diff --git a/bindings/swig/package/utilxml.i b/bindings/swig/package/utilxml.i
new file mode 100644
index 0000000..9094f06
--- /dev/null
+++ b/bindings/swig/package/utilxml.i
@@ -0,0 +1,5 @@
+%{
+#include <utilxml.h>
+%}
+
+%include "utilxml.h"
diff --git a/bindings/swig/package/versekey.i b/bindings/swig/package/versekey.i
new file mode 100644
index 0000000..539989d
--- /dev/null
+++ b/bindings/swig/package/versekey.i
@@ -0,0 +1,188 @@
+%{
+#include "versekey.h"
+#include "versificationmgr.h"
+%}
+
+
+%ignore sword::sbook::versemax;
+%ignore sword::VerseKey::setBookAbbrevs;
+%ignore sword::VerseKey::setBooks;
+
+%ignore sword::VerseKey::builtin_BMAX;
+%ignore sword::VerseKey::builtin_books;
+%ignore sword::VerseKey::BMAX;
+%ignore sword::VerseKey::books;
+%ignore sword::VerseKey::VerseKey(SWKey const &);
+
+%immutable sword::VerseKey::builtin_abbrevs;
+%immutable sword::sbook::name;
+%immutable sword::sbook::prefAbbrev;
+%immutable sword::abbrev::ab;
+
+%include "versekey.h"
+%include "versificationmgr.h"
+
+%extend sword::abbrev {
+	int getAbbrevCount() {
+		int abbrevsCnt;
+		for (abbrevsCnt = 0; *self[abbrevsCnt].ab; abbrevsCnt++) {}
+		return abbrevsCnt-1;
+	}
+
+	const struct sword::abbrev* getAbbrevData(int i) {
+		return &(self[i]);
+	}
+}
+
+%extend sword::sbook {
+	const int verseMax( int chapter ) {
+		if ( chapter > 0  && chapter < self->chapmax ) {
+			return self->versemax[chapter-1];
+		} else {
+			return 0;
+		}
+	}
+};
+
+
+
+%extend sword::VerseKey {
+	/* C++-style cast */
+	static sword::VerseKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::VerseKey*>(o);
+	}
+
+
+	/* Get number of books in the given testament
+	* testament may be 1 (OT) or 2 (NT)
+	*/
+
+        
+	const int bookCount( const int testament ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		return self->BMAX[testament-1];
+	};
+
+
+    const int getBookCount(){
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        return system->getBookCount();
+    }
+    
+        
+	/* Get name of book
+	* Returns the name of the booknumber in the givn testament.
+	* Testament may be 1 (OT) or 2 (NT)
+	* book may be in the range of 1 <= bookCount(testament)
+	*/
+	const char* bookName( const int testament, const int book ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		if ( (book < 1) || (book > self->BMAX[testament-1]) ) {
+			return 0;
+		}
+
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        
+        int book_num = (book - 1) + (
+            (testament == 2) ? self->BMAX[0] : 0
+        );
+
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
+        if(!b) {
+            fprintf(stderr, "b is null for %d?!?\n", book_num);
+            return 0;
+        }
+        return b->getLongName();
+
+ 
+	};
+
+    int getBookNumberByOSISName( const char* bookname ) {
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        return system->getBookNumberByOSISName(bookname);
+   }
+    
+    const char* getOSISBookName( const int book ) {
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+   		if ( (book < 0) || (book >= system->getBookCount()))
+            return 0;
+
+        return system->getBook(book)->getOSISName();
+    }
+ 
+        
+
+	/* Get number of chapters in the given testament and book number
+	* testament may be 1 (OT) or 2 (NT)
+	* book may be in the range 1 <= bookCount(testament)
+	*/
+	const int chapterCount( const int testament, const int book ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		if ( (book < 1) || (book > self->BMAX[testament-1]) ) {
+			return 0;
+		}
+
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        
+        int book_num = (book - 1) + (
+            (testament == 2) ? self->BMAX[0] : 0
+        );
+
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
+        if(!b) {
+            fprintf(stderr, "b is null for %d?!?\n", book_num);
+            return 0;
+        }        
+
+        return b->getChapterMax();
+	};
+	/* Get number of verses in the given chapter of the given in the given testament,
+	* testament may be 1 (OT) or 2 (NT)
+	* book may be in the range 1 <= bookCount(testament)
+	* chapter may be in the range 1 <= chapterCount(testament, book)
+	*/
+	const int verseCount( const int testament, const int book, const int chapter ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		if ( (book < 1) || (book > self->BMAX[testament-1]) ) {
+			return 0;
+		}
+
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        
+        int book_num = (book - 1) + (
+            (testament == 2) ? self->BMAX[0] : 0
+        );
+
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
+        if(!b) {
+            fprintf(stderr, "b is null for %d?!?\n", book_num);
+            return 0;
+        }
+		if ( (chapter < 1) || (chapter > b->getChapterMax()) ) {
+			return 0;
+		}
+
+		return b->getVerseMax(chapter);
+
+	};
+};
diff --git a/bindings/swig/package/versetreekey.i b/bindings/swig/package/versetreekey.i
new file mode 100644
index 0000000..35c0e3e
--- /dev/null
+++ b/bindings/swig/package/versetreekey.i
@@ -0,0 +1,12 @@
+%{
+#include "versetreekey.h"
+%}
+
+%include "versetreekey.h"
+
+%extend sword::VerseTreeKey {
+	/* C++-style cast */
+	static sword::VerseTreeKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::VerseTreeKey*>(o);
+	}
+};
diff --git a/bindings/swig/package/zcom.i b/bindings/swig/package/zcom.i
new file mode 100644
index 0000000..83af55f
--- /dev/null
+++ b/bindings/swig/package/zcom.i
@@ -0,0 +1,12 @@
+%{
+#include "zverse.h"
+#include "zcom.h"
+%}
+
+%include "zcom.h"
+
+%extend sword::zCom {
+	static sword::zCom *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::zCom*>(o);
+	}
+}
diff --git a/bindings/swig/package/zipcomprs.i b/bindings/swig/package/zipcomprs.i
new file mode 100644
index 0000000..500295d
--- /dev/null
+++ b/bindings/swig/package/zipcomprs.i
@@ -0,0 +1,11 @@
+%{
+#include <zipcomprs.h>
+%}
+
+%include "zipcomprs.h"
+
+%extend sword::ZipCompress {
+	static sword::ZipCompress *castTo(sword::SWCompress *o) {
+		return dynamic_cast<sword::ZipCompress*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/package/zld.i b/bindings/swig/package/zld.i
new file mode 100644
index 0000000..36f07b2
--- /dev/null
+++ b/bindings/swig/package/zld.i
@@ -0,0 +1,11 @@
+%{
+#include "zld.h"
+%}
+
+%include "zld.h"
+
+%extend sword::zLD {
+	static sword::zLD *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::zLD*>(o);
+	}
+}
diff --git a/bindings/swig/package/zlib.m4 b/bindings/swig/package/zlib.m4
new file mode 100644
index 0000000..11e38e7
--- /dev/null
+++ b/bindings/swig/package/zlib.m4
@@ -0,0 +1,111 @@
+##   -*- autoconf -*-
+
+
+AC_DEFUN([AC_FIND_ZLIB],
+[
+AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
+AC_MSG_CHECKING([for libz])
+AC_CACHE_VAL(ac_cv_lib_z,
+[
+AC_LANG_C
+kde_save_LIBS="$LIBS"
+LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
+kde_save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
+AC_TRY_LINK(dnl
+[
+#include<zlib.h>
+],
+            [return (zlibVersion() == ZLIB_VERSION); ],
+            eval "ac_cv_lib_z='-lz'",
+            eval "ac_cv_lib_z=no")
+LIBS="$kde_save_LIBS"
+CFLAGS="$kde_save_CFLAGS"
+])dnl
+if test ! "$ac_cv_lib_z" = no; then
+  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
+  LIBZ="$ac_cv_lib_z"
+  AC_SUBST(LIBZ)
+  AC_MSG_RESULT($ac_cv_lib_z)
+else
+  AC_MSG_ERROR(not found. Check your installation and look into config.log)
+  LIBZ=""
+  AC_SUBST(LIBZ)
+fi
+])
+
+AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
+[
+AC_MSG_CHECKING(for extra includes)
+AC_ARG_WITH(extra-includes, [  --with-extra-includes=DIR
+                          adds non standard include paths],
+  kde_use_extra_includes="$withval",
+  kde_use_extra_includes=NONE
+)
+kde_extra_includes=
+if test -n "$kde_use_extra_includes" && \
+   test "$kde_use_extra_includes" != "NONE"; then
+
+   ac_save_ifs=$IFS
+   IFS=':'
+   for dir in $kde_use_extra_includes; do
+     kde_extra_includes="$kde_extra_includes $dir"
+     USER_INCLUDES="$USER_INCLUDES -I$dir"
+   done
+   IFS=$ac_save_ifs
+   kde_use_extra_includes="added"
+else
+   kde_use_extra_includes="no"
+fi
+AC_SUBST(USER_INCLUDES)
+
+AC_MSG_RESULT($kde_use_extra_includes)
+
+kde_extra_libs=
+AC_MSG_CHECKING(for extra libs)
+AC_ARG_WITH(extra-libs, [  --with-extra-libs=DIR   adds non standard library paths],
+  kde_use_extra_libs=$withval,
+  kde_use_extra_libs=NONE
+)
+if test -n "$kde_use_extra_libs" && \
+   test "$kde_use_extra_libs" != "NONE"; then
+
+   ac_save_ifs=$IFS
+   IFS=':'
+   for dir in $kde_use_extra_libs; do
+     kde_extra_libs="$kde_extra_libs $dir"
+     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
+     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
+   done
+   IFS=$ac_save_ifs
+   kde_use_extra_libs="added"
+else
+   kde_use_extra_libs="no"
+fi
+
+AC_SUBST(USER_LDFLAGS)
+
+AC_MSG_RESULT($kde_use_extra_libs)
+
+])
+
+dnl ------------------------------------------------------------------------
+dnl Find a file (or one of more files in a list of dirs)
+dnl ------------------------------------------------------------------------
+dnl
+AC_DEFUN([AC_FIND_FILE],
+[
+$3=NO
+for i in $2;
+do
+  for j in $1;
+  do
+    echo "configure: __oline__: $i/$j" >&AC_FD_CC
+    if test -r "$i/$j"; then
+      echo "taking that" >&AC_FD_CC
+      $3=$i
+      break 2
+    fi
+  done
+done
+])
diff --git a/bindings/swig/package/ztext.i b/bindings/swig/package/ztext.i
new file mode 100644
index 0000000..55db441
--- /dev/null
+++ b/bindings/swig/package/ztext.i
@@ -0,0 +1,11 @@
+%{
+#include "ztext.h"
+%}
+
+%include "ztext.h"
+
+%extend sword::zText {
+	static sword::zText *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::zText*>(o);
+	}
+}
diff --git a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt
new file mode 100644
index 0000000..3e2e2e9
--- /dev/null
+++ b/bindings/swig/perl/CMakeLists.txt
@@ -0,0 +1,68 @@
+# This method works but there is no good way to install the results of it
+#FIND_PACKAGE(PerlLibs REQUIRED)
+#INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH})
+#
+#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON)
+#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "")
+#
+#SWIG_ADD_MODULE(Sword perl
+#	"../sword.i"
+#)
+#
+#SWIG_LINK_LIBRARIES(Sword ${PERL_LIBRARY} ${SWORD_LINK_NAME})
+
+FIND_PACKAGE(Perl REQUIRED)
+
+SET(PERL_MAKEFILE "#!${PERL_EXECUTABLE}
+
+use ExtUtils::MakeMaker;
+
+# See lib/ExtUtils/MakeMaker.pm for details of how to influence
+# the contents of the Makefile that is written
+WriteMakefile(
+	'NAME'		=> 'Sword',
+	'VERSION'	=> '${SWORD_VERSION}',
+	'INC'		=> '-I${CMAKE_SOURCE_DIR}/include -I${CMAKE_CURRENT_SOURCE_DIR}/..',
+	'DEFINE'	=> '-DSWIG',
+	'LIBS'		=> '-L${CMAKE_BINARY_DIR} -lsword -lz',
+	'FIRST_MAKEFILE' => 'Makefile.perlswig',
+	'PREREQ_PM'	=> {},
+		($] >= 5.005 ? ## Add these new keywords supported since 5.005
+		(ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module
+		AUTHOR => 'Sword Project <sword-devel@crosswire.org>') : ()),
+);
+
+rename 'Makefile.perlswig', 'Makefile.perlswig.old' or die \"Can't rename Makefile\";
+open(INPUT, '<Makefile.perlswig.old') or die \"Can't open input Makefile.old\";
+open(OUTPUT,'>Makefile.perlswig') or die \"Can't open output Makefile\";
+while (<INPUT>) {
+  s/\\-lsword/\\-lsword \\-lstdc\\+\\+/;
+  print OUTPUT \"$_\";
+}
+
+close INPUT;
+close OUTPUT;")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL "${PERL_MAKEFILE}")
+
+SET(SKIP_MAKEFILE "\\.old
+~$
+\\.bak
+^CVS
+Makefile$")
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.SKIP "${SKIP_MAKEFILE}")
+
+SWORD_SWIG_GENERATE(perl)
+
+ADD_CUSTOM_COMMAND(OUTPUT MANIFEST Makefile.perlswig
+	COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig clean
+	COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig manifest
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+ADD_CUSTOM_TARGET(perlswig ALL
+	COMMAND make -f Makefile.perlswig
+	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${CMAKE_CURRENT_BINARY_DIR}/Makefile.perlswig ${SWORD_LINK_NAME}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+INSTALL(SCRIPT install.cmake)
+
+MESSAGE(STATUS "Perl: yes")
diff --git a/bindings/swig/perl/install.cmake b/bindings/swig/perl/install.cmake
new file mode 100644
index 0000000..5ba23e5
--- /dev/null
+++ b/bindings/swig/perl/install.cmake
@@ -0,0 +1,3 @@
+EXECUTE_PROCESS(COMMAND
+	make -f Makefile.perlswig install
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bindings/swig/perl/)
diff --git a/bindings/swig/python/CMakeLists.txt b/bindings/swig/python/CMakeLists.txt
new file mode 100644
index 0000000..b661654
--- /dev/null
+++ b/bindings/swig/python/CMakeLists.txt
@@ -0,0 +1,58 @@
+# This method works, but there is no established way to do the installation
+#FIND_PACKAGE(PythonLibs REQUIRED)
+#INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS})
+#
+#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON)
+#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "")
+#
+#SWIG_ADD_MODULE(Sword python
+#	"../sword.i"
+#)
+#
+#SWIG_LINK_LIBRARIES(Sword ${PYTHON_LIBRARIES} ${SWORD_LINK_NAME})
+
+FIND_PACKAGE(PythonInterp REQUIRED)
+FIND_PACKAGE(PythonLibs)
+
+IF(NOT PYTHONLIBS_FOUND)
+	MESSAGE(FATAL_ERROR "Failed to locate Python.h header.")
+ENDIF(NOT PYTHONLIBS_FOUND)
+
+SET(PY_SCRIPT "#!${PYTHON_EXECUTABLE}
+
+from distutils.core import setup, Extension
+setup(name='sword',version='${SWORD_VERSION}',
+maintainer='Sword Developers',
+maintainer_email='sword-devel@crosswire.org',
+url='http://www.crosswire.org/sword',
+py_modules=['Sword'],
+include_dirs=['${CMAKE_CURRENT_SOURCE_DIR}', '${CMAKE_SOURCE_DIR}/include', '${CMAKE_CURRENT_SOURCE_DIR}/..', '${CMAKE_CURRENT_SOURCE_DIR}../../'],
+ext_modules = [Extension('_Sword',['Sword.cxx'],
+libraries=[('sword')],
+library_dirs=[('${CMAKE_BINARY_DIR}')],
+)]
+,)"
+)
+
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/setup.py "${PY_SCRIPT}")
+
+SWORD_SWIG_GENERATE(python)
+
+ADD_CUSTOM_TARGET(swordswig ALL
+	COMMAND python setup.py build
+	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${SWORD_LINK_NAME}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+# Allow user installation to custom directory
+IF(SWORD_PYTHON_INSTALL_DIR)
+	SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR}")
+ELSE(SWORD_PYTHON_INSTALL_DIR)
+	SET(SETUP_ARGS "--home=${CMAKE_INSTALL_PREFIX}")
+ENDIF(SWORD_PYTHON_INSTALL_DIR)
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in"
+	       "${CMAKE_CURRENT_BINARY_DIR}/install.cmake")
+
+# Run external installation script
+INSTALL(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install.cmake")
+
+MESSAGE(STATUS "Python: yes")
diff --git a/bindings/swig/python/install.cmake.in b/bindings/swig/python/install.cmake.in
new file mode 100644
index 0000000..5dbd52e
--- /dev/null
+++ b/bindings/swig/python/install.cmake.in
@@ -0,0 +1,4 @@
+EXECUTE_PROCESS(COMMAND
+	python setup.py install @SETUP_ARGS@
+	WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+)
diff --git a/bindings/swig/rawcom.i b/bindings/swig/rawcom.i
new file mode 100644
index 0000000..5e9c17b
--- /dev/null
+++ b/bindings/swig/rawcom.i
@@ -0,0 +1,14 @@
+%{
+#include "rawcom.h"
+%}
+
+
+%include "rawcom.h"
+
+
+
+%extend sword::RawCom {
+	static sword::RawCom *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawCom*>(o);
+	}
+}
diff --git a/bindings/swig/rawgenbook.i b/bindings/swig/rawgenbook.i
new file mode 100644
index 0000000..ac4fd1c
--- /dev/null
+++ b/bindings/swig/rawgenbook.i
@@ -0,0 +1,12 @@
+%{
+#include "rawgenbook.h"
+%}
+
+%include "rawgenbook.h"
+
+%extend sword::RawGenBook {
+	static sword::RawGenBook *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawGenBook*>(o);
+	}
+	
+}
diff --git a/bindings/swig/rawld.i b/bindings/swig/rawld.i
new file mode 100644
index 0000000..b1a10df
--- /dev/null
+++ b/bindings/swig/rawld.i
@@ -0,0 +1,12 @@
+%{
+#include "rawld.h"
+%}
+
+%include "rawld.h"
+
+%extend sword::RawLD {
+	static sword::RawLD *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawLD*>(o);
+	}
+
+}
diff --git a/bindings/swig/rawld4.i b/bindings/swig/rawld4.i
new file mode 100644
index 0000000..27e47b2
--- /dev/null
+++ b/bindings/swig/rawld4.i
@@ -0,0 +1,12 @@
+%{
+#include "rawld4.h"
+%}
+
+%include "rawld4.h"
+
+%extend sword::RawLD4 {
+	static sword::RawLD4 *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawLD4*>(o);
+	}
+
+}
diff --git a/bindings/swig/rawtext.i b/bindings/swig/rawtext.i
new file mode 100644
index 0000000..fa2d019
--- /dev/null
+++ b/bindings/swig/rawtext.i
@@ -0,0 +1,12 @@
+%{
+#include "rawtext.h"
+%}
+
+%include "rawtext.h"
+
+
+%extend sword::RawText {
+	static sword::RawText *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::RawText*>(o);
+	}	
+}
diff --git a/bindings/swig/remotetrans.i b/bindings/swig/remotetrans.i
new file mode 100644
index 0000000..6024765
--- /dev/null
+++ b/bindings/swig/remotetrans.i
@@ -0,0 +1,6 @@
+%{
+#include "remotetrans.h"
+%}
+
+%include "remotetrans.h"
+
diff --git a/bindings/swig/rendercallback.h b/bindings/swig/rendercallback.h
new file mode 100755
index 0000000..bfb54fc
--- /dev/null
+++ b/bindings/swig/rendercallback.h
@@ -0,0 +1,251 @@
+#ifndef _RENDERCALLBACK_H
+#define _RENDERCALLBACK_H
+#include <swbuf.h>
+#include <swmodule.h>
+#include <swkey.h>
+#include <swbasicfilter.h>
+#include <utilxml.h>
+#include <osishtmlhref.h>
+#include <thmlhtmlhref.h>
+
+#define FAILED 0
+#define SUCCEEDED 1
+#define INHERITED 2
+
+using namespace sword;
+
+class ReturnSuccess 
+{
+public:
+	ReturnSuccess(): data(""), success(FAILED) {}
+	ReturnSuccess(const char* data, int success): data(data), success(success) {}
+	virtual ~ReturnSuccess() {}
+	const char* data;
+	int success;
+};
+
+
+class RenderCallback {
+public:
+	virtual ~RenderCallback() {;}
+
+	virtual ReturnSuccess run(sword::SWBuf& x, const char * token, 
+			sword::BasicFilterUserData* userData) 
+	{
+		ReturnSuccess nullm("", INHERITED);
+		return nullm;
+	}
+};
+
+// Forward declarations
+class OSISData;
+class ThMLData;
+
+
+class PyOSISHTMLHREF: public sword::OSISHTMLHREF 
+{
+private:
+	RenderCallback* _callback;
+
+public:
+	// Create a class which can be inherited externally
+#ifndef SWIG
+	using sword::OSISHTMLHREF::MyUserData;
+	class MyOsisUserData : public MyUserData {
+		public:
+		MyOsisUserData(const SWModule *module, const SWKey *key):
+			MyUserData(module, key) {};
+	};
+#endif
+	
+	using sword::OSISHTMLHREF::removeTokenSubstitute;
+	using sword::OSISHTMLHREF::addTokenSubstitute;
+	using sword::OSISHTMLHREF::addAllowedEscapeString;
+	using sword::OSISHTMLHREF::removeAllowedEscapeString;
+		
+	PyOSISHTMLHREF(RenderCallback* callback)
+	{
+		_callback=callback;
+	}
+
+	static OSISData* getData(sword::BasicFilterUserData* f)
+	{
+		return (OSISData*) f;
+	}
+			
+	virtual ~PyOSISHTMLHREF() 
+	{ 
+		delCallback();
+	} 
+	
+	void delCallback() 
+	{
+		delete _callback;
+		_callback = 0;
+	}
+	
+	void setCallback(RenderCallback *cb)
+	{
+		delCallback();
+		_callback = cb;
+	}
+
+	ReturnSuccess call(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)
+	{ 
+		if (_callback) return _callback->run(buf, token, userData); 
+		else 
+		{
+			ReturnSuccess nullm("", INHERITED);
+			return nullm;
+		}
+	}
+
+protected:
+	virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)
+	{
+		SWBuf scratch;
+		bool sub = (userData->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+		if(sub) return true;
+
+		ReturnSuccess result = call(buf, token, userData);
+		switch(result.success)
+		{
+			case INHERITED:
+				return sword::OSISHTMLHREF::handleToken(buf, token, userData);
+			case FAILED: 		 
+				return false;
+			case SUCCEEDED:
+				buf += result.data;
+				return true;
+		}		
+
+		return true;
+	}
+};
+
+
+class PyThMLHTMLHREF : public ThMLHTMLHREF {
+private:
+	RenderCallback* _callback;
+public:
+	// Create a class which can be inherited externally
+#ifndef SWIG
+	using sword::ThMLHTMLHREF::MyUserData;
+	class MyThmlUserData : public MyUserData {
+		public:
+		MyThmlUserData(const SWModule *module, const SWKey *key):
+			MyUserData(module, key) {};
+	};
+#endif
+
+	using sword::ThMLHTMLHREF::removeTokenSubstitute;	
+	using sword::ThMLHTMLHREF::addTokenSubstitute;
+	using sword::ThMLHTMLHREF::addAllowedEscapeString;
+	using sword::ThMLHTMLHREF::removeAllowedEscapeString;	
+	PyThMLHTMLHREF(RenderCallback* callback)
+	{
+		_callback=callback;
+	}
+
+	static ThMLData* getData(sword::BasicFilterUserData* f)
+	{
+		return (ThMLData*) f;
+	}
+	
+	virtual ~PyThMLHTMLHREF() 
+	{ 
+		delCallback();
+	} 
+	
+	void delCallback() 
+	{
+		delete _callback;
+		_callback = 0;
+	}
+	
+	void setCallback(RenderCallback *cb)
+	{
+		delCallback();
+		_callback = cb;
+	}
+
+	ReturnSuccess call(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)		  
+	{ 
+		if (_callback) return _callback->run(buf, token, userData); 
+		else 
+		{
+			ReturnSuccess nullm("", INHERITED);
+			return nullm;
+		}
+	}
+protected:
+	virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData)
+	{
+		SWBuf scratch;
+		bool sub = (userData->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+		if(sub) return true;
+		
+		ReturnSuccess result = call(buf, token, userData);
+		switch(result.success)
+		{
+			case INHERITED:
+				return sword::ThMLHTMLHREF::handleToken(buf, token, userData);
+			case FAILED: 		 
+				return false;
+		case SUCCEEDED:
+			buf += result.data;
+			return true;
+		}		
+
+		return true;
+	}
+};
+
+class OSISData : 
+#ifndef SWIG
+public PyOSISHTMLHREF::MyOsisUserData {
+public:
+	OSISData(const SWModule *module, const SWKey *key):
+	PyOSISHTMLHREF::MyOsisUserData(module, key) {};
+#else
+// trick SWIG into thinking this is not inherited from an inner class...
+public sword::BasicFilterUserData 
+{
+public:
+	bool osisQToTick;
+	bool inBold;
+	bool inXRefNote;
+	bool BiblicalText;
+	int suspendLevel;
+	SWBuf wordsOfChristStart;
+	SWBuf wordsOfChristEnd;
+	SWBuf lastTransChange;
+	SWBuf w;
+	SWBuf fn;
+	SWBuf version;
+
+#endif //!SWIG
+};
+
+class ThMLData : 
+#ifndef SWIG
+public PyThMLHTMLHREF::MyThmlUserData {
+	public:
+	ThMLData(const SWModule *module, const SWKey *key):
+		PyThMLHTMLHREF::MyThmlUserData(module, key) {};
+
+#else
+// trick SWIG into thinking this is not inherited from an inner class...
+public sword::BasicFilterUserData 
+{
+public:
+	SWBuf inscriptRef;
+	bool SecHead;
+	bool BiblicalText;
+	SWBuf version;
+	XMLTag startTag;	
+
+#endif //!SWIG
+};
+
+#endif // _RENDERCALLBACK_H
diff --git a/bindings/swig/searcher.h b/bindings/swig/searcher.h
new file mode 100755
index 0000000..e04db92
--- /dev/null
+++ b/bindings/swig/searcher.h
@@ -0,0 +1,43 @@
+#include <swmodule.h>
+#include <swkey.h>
+#include <listkey.h>
+
+using namespace sword;
+class SWSearcher{
+public:
+	sword::SWModule* mod;
+	int percent;
+
+	static void Callback(char status, void *me){
+		SWSearcher* searcher = (SWSearcher*)me;
+		searcher->PercentFunction((int) status);
+	}
+
+	virtual void PercentFunction(int value){
+		percent=value;
+	}
+	
+	SWSearcher(sword::SWModule* Mod){mod=Mod;}
+	virtual ~SWSearcher(){}
+
+	int GetPercent(){return percent;}
+
+	bool isSearchSupported(const char *istr, int searchType = 0,
+							  int flags = 0,
+			SWKey * scope = 0) {
+			bool checksupported = true;
+			mod->search(istr, searchType, flags, scope, &checksupported);
+			return checksupported;
+	}
+
+	ListKey &doSearch(const char *istr, int searchType = 0, int flags = 0,
+					  SWKey *scope = 0) {
+			return mod->search(istr, searchType, flags, scope,
+				   0, this->Callback, (void *) this);
+	}
+
+	void TerminateSearch(){
+		mod->terminateSearch=true;
+	}
+};
+
diff --git a/bindings/swig/stringmgr.i b/bindings/swig/stringmgr.i
new file mode 100644
index 0000000..ba216b1
--- /dev/null
+++ b/bindings/swig/stringmgr.i
@@ -0,0 +1,26 @@
+
+%{
+#include "stringmgr.h"
+class PyStringMgr : public sword::StringMgr
+{
+    public:
+       char *upperUTF8(char *text, unsigned int max = 0) const
+        {
+            sword::SWBuf buf=(const char*)text;
+            getUpper(&buf);
+            strncpy(text, buf.c_str(), (max) ? max : strlen(text));
+            return text;
+        }
+
+        virtual void getUpper(sword::SWBuf* test) const = 0;
+};
+%}
+
+%include "stringmgr.h"
+class PyStringMgr : public sword::StringMgr
+{
+    public:
+       char *upperUTF8(char *text, unsigned int max = 0) const;
+       virtual void getUpper(sword::SWBuf* test) const = 0;
+};
+
diff --git a/bindings/swig/swbuf.i b/bindings/swig/swbuf.i
new file mode 100644
index 0000000..ada600f
--- /dev/null
+++ b/bindings/swig/swbuf.i
@@ -0,0 +1,37 @@
+%{
+#include "swbuf.h"
+%}
+
+%rename(__str__) sword::SWBuf::operator const char *;
+%ignore sword::SWBuf::operator[];
+%ignore sword::SWBuf::operator+;
+%ignore sword::SWBuf::operator==;
+%ignore sword::SWBuf::operator!=;
+%ignore sword::SWBuf::operator+=;
+%ignore sword::SWBuf::operator-=;
+%ignore sword::SWBuf::operator<=;
+%ignore sword::SWBuf::operator>=;
+%ignore sword::SWBuf::operator<;
+%ignore sword::SWBuf::operator>;
+%ignore sword::SWBuf::operator<<;
+%ignore sword::SWBuf::operator>>;
+%ignore sword::SWBuf::operator=;
+%ignore sword::SWBuf::operator--;
+%ignore sword::SWBuf::charAt(unsigned long);
+
+/* Ignore this horrible constructor.
+*  This would be the default for single character strings passed in. This can
+*  lead to changing of immutable strings!!!!
+*/
+%ignore sword::SWBuf::SWBuf(char, unsigned long);
+
+
+%include "swbuf.h"
+
+
+%extend sword::SWBuf {
+        char charAt2(unsigned int pos) {
+                return self->charAt((unsigned long)pos);
+        }
+};
+
diff --git a/bindings/swig/swcacher.i b/bindings/swig/swcacher.i
new file mode 100644
index 0000000..99b065e
--- /dev/null
+++ b/bindings/swig/swcacher.i
@@ -0,0 +1,6 @@
+%{
+#include "swcacher.h"
+%}
+
+%include "swcacher.h"
+
diff --git a/bindings/swig/swcom.i b/bindings/swig/swcom.i
new file mode 100644
index 0000000..90291cf
--- /dev/null
+++ b/bindings/swig/swcom.i
@@ -0,0 +1,14 @@
+%{
+#include "swcom.h"
+%}
+
+%ignore sword::SWCom::SWCom;
+
+%include "swcom.h"
+
+%extend sword::SWCom {
+	/* C++-style cast */
+	static sword::SWCom *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWCom*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/swcomprs.i b/bindings/swig/swcomprs.i
new file mode 100644
index 0000000..3cdd653
--- /dev/null
+++ b/bindings/swig/swcomprs.i
@@ -0,0 +1,10 @@
+%{
+#include <swcomprs.h>
+%}
+
+%ignore sword::SWCompress::Buf;
+%ignore sword::SWCompress::zBuf;
+%ignore sword::SWCompress::GetChars;
+%ignore sword::SWCompress::SendChars;
+
+%include "swcomprs.h"
diff --git a/bindings/swig/swconfig.i b/bindings/swig/swconfig.i
new file mode 100644
index 0000000..b1f6834
--- /dev/null
+++ b/bindings/swig/swconfig.i
@@ -0,0 +1,25 @@
+%{
+#include "swconfig.h"
+%}
+
+%ignore sword::SWConfig::operator[];
+%ignore sword::SWConfig::operator+=;
+%ignore sword::SWConfig::sections;
+%ignore sword::SWConfig::Sections;
+
+%include "swconfig.h"
+
+
+%extend sword::SWConfig {
+  void set(const char* group, const char* entry, const char* value) {
+	self->Sections[group][entry] = value;
+  };
+  const char* get(const char* group, const char* entry) {
+	return self->Sections[group][entry].c_str();
+  };
+  PySectionMap /*std::map < sword::SWBuf, std::multimap <sword::SWBuf, sword::SWBuf> > */
+  *getSections() {
+    return (PySectionMap* /*std::map < sword::SWBuf, std::multimap < sword::SWBuf, sword::SWBuf > > * */) &self->Sections;
+  }
+}
+
diff --git a/bindings/swig/swdisp.i b/bindings/swig/swdisp.i
new file mode 100644
index 0000000..3451cd7
--- /dev/null
+++ b/bindings/swig/swdisp.i
@@ -0,0 +1,5 @@
+%{
+#include "swdisp.h"
+%}
+
+%include "swdisp.h"
diff --git a/bindings/swig/swfilter.i b/bindings/swig/swfilter.i
new file mode 100644
index 0000000..46f659a
--- /dev/null
+++ b/bindings/swig/swfilter.i
@@ -0,0 +1,7 @@
+%{
+#include <swfilter.h>
+%}
+
+%ignore sword::SWFilter::getOptionValues;
+
+%include "swfilter.h"
diff --git a/bindings/swig/swfiltermgr.i b/bindings/swig/swfiltermgr.i
new file mode 100644
index 0000000..fb6b507
--- /dev/null
+++ b/bindings/swig/swfiltermgr.i
@@ -0,0 +1,12 @@
+%{
+#include <swfiltermgr.h>
+%}
+
+%ignore sword::SWFilterMgr::AddGlobalOptions;
+%ignore sword::SWFilterMgr::AddLocalOptions;
+%ignore sword::SWFilterMgr::AddEncodingFilters;
+%ignore sword::SWFilterMgr::AddRenderFilters;
+%ignore sword::SWFilterMgr::AddStripFilters;
+%ignore sword::SWFilterMgr::AddRawFilters;
+
+%include "swfiltermgr.h"
diff --git a/bindings/swig/swgenbook.i b/bindings/swig/swgenbook.i
new file mode 100644
index 0000000..aef3df0
--- /dev/null
+++ b/bindings/swig/swgenbook.i
@@ -0,0 +1,11 @@
+%{
+#include "swgenbook.h"
+%}
+
+%include "swgenbook.h"
+
+%extend sword::SWGenBook {
+	static sword::SWGenBook *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWGenBook*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/swig-perl.doxygen b/bindings/swig/swig-perl.doxygen
new file mode 100644
index 0000000..2c2b650
--- /dev/null
+++ b/bindings/swig/swig-perl.doxygen
@@ -0,0 +1,177 @@
+# Doxyfile 0.1
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME           = SWIG-Perl
+PROJECT_NUMBER         = 0.1
+OUTPUT_DIRECTORY       = .
+OUTPUT_LANGUAGE        = English
+EXTRACT_ALL            = YES
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = NO
+STRIP_FROM_PATH        = 
+INTERNAL_DOCS          = NO
+STRIP_CODE_COMMENTS    = YES
+CASE_SENSE_NAMES       = YES
+SHORT_NAMES            = NO
+HIDE_SCOPE_NAMES       = NO
+VERBATIM_HEADERS       = YES
+SHOW_INCLUDE_FILES     = YES
+JAVADOC_AUTOBRIEF      = NO
+INHERIT_DOCS           = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+ALIASES                = 
+ENABLED_SECTIONS       = 
+MAX_INITIALIZER_LINES  = 30
+OPTIMIZE_OUTPUT_FOR_C  = NO
+SHOW_USED_FILES        = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           = 
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                  = 
+FILE_PATTERNS          = *.i
+RECURSIVE              = NO
+EXCLUDE                = 
+EXCLUDE_PATTERNS       = 
+EXAMPLE_PATH           = 
+EXAMPLE_PATTERNS       = 
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             = 
+INPUT_FILTER           = 
+FILTER_SOURCE_FILES    = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX     = YES
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          = 
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML          = YES
+HTML_OUTPUT            = api-documentation
+HTML_HEADER            = 
+HTML_FOOTER            = 
+HTML_STYLESHEET        = 
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = NO
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         = 
+LATEX_HEADER           = 
+PDF_HYPERLINKS         = NO
+USE_PDFLATEX           = NO
+LATEX_BATCHMODE        = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    = 
+RTF_EXTENSIONS_FILE    = 
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML           = NO
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF   = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           = 
+INCLUDE_FILE_PATTERNS  = 
+PREDEFINED             = 
+EXPAND_AS_DEFINED      = 
+SKIP_FUNCTION_MACROS   = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references   
+#---------------------------------------------------------------------------
+TAGFILES               = 
+GENERATE_TAGFILE       = 
+ALLEXTERNALS           = NO
+PERL_PATH              = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS         = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = YES
+COLLABORATION_GRAPH    = YES
+TEMPLATE_RELATIONS     = YES
+HIDE_UNDOC_RELATIONS   = YES
+INCLUDE_GRAPH          = YES
+INCLUDED_BY_GRAPH      = YES
+GRAPHICAL_HIERARCHY    = YES
+DOT_PATH               = 
+DOTFILE_DIRS           = 
+MAX_DOT_GRAPH_WIDTH    = 1024
+MAX_DOT_GRAPH_HEIGHT   = 1024
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
+CGI_NAME               = search.cgi
+CGI_URL                = 
+DOC_URL                = 
+DOC_ABSPATH            = 
+BIN_ABSPATH            = /usr/local/bin/
+EXT_DOC_PATHS          = 
diff --git a/bindings/swig/swkey.i b/bindings/swig/swkey.i
new file mode 100644
index 0000000..ebbd934
--- /dev/null
+++ b/bindings/swig/swkey.i
@@ -0,0 +1,15 @@
+%{
+#include "swkey.h"
+%}
+
+%ignore sword::SWKey::userData;
+%ignore sword::SWKey::Index;
+%ignore sword::SWKey::Traversable;
+
+%rename (getPosition) sword::SW_POSITION::operator char;
+
+%include "swkey.h"
+
+#ifndef SWIGPERL
+%rename(__str__) sword::SWKey::operator const char *;
+#endif
diff --git a/bindings/swig/swld.i b/bindings/swig/swld.i
new file mode 100644
index 0000000..135f14e
--- /dev/null
+++ b/bindings/swig/swld.i
@@ -0,0 +1,13 @@
+%{
+#include "swld.h"
+%}
+
+%ignore sword::SWLD::SWLD;
+
+%include "swld.h"
+
+%extend sword::SWLD {
+	static sword::SWLD *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWLD*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/swlocale.i b/bindings/swig/swlocale.i
new file mode 100644
index 0000000..1977bba
--- /dev/null
+++ b/bindings/swig/swlocale.i
@@ -0,0 +1,16 @@
+%{
+#include "swlocale.h"
+%}
+
+%ignore sword::SWLocale::operator+=;
+%ignore sword::SWLocale::getBookAbbrevs(int *);
+
+%include "swlocale.h"
+
+%extend sword::SWLocale {
+    const sword::abbrev* getBookAbbrevs() {
+        int x;
+        return self->getBookAbbrevs(&x);
+    }
+
+}
diff --git a/bindings/swig/swlog.i b/bindings/swig/swlog.i
new file mode 100644
index 0000000..4b8a0f0
--- /dev/null
+++ b/bindings/swig/swlog.i
@@ -0,0 +1,6 @@
+%{
+#include "swlog.h"
+%}
+
+%include "swlog.h"
+
diff --git a/bindings/swig/swmgr.i b/bindings/swig/swmgr.i
new file mode 100644
index 0000000..d914be0
--- /dev/null
+++ b/bindings/swig/swmgr.i
@@ -0,0 +1,40 @@
+%{
+#include <swmgr.h>
+%}
+
+%ignore sword::SWMgr::Modules;
+%ignore sword::SWMgr::findConfig;
+%include "swmgr.h"
+
+%extend sword::SWMgr {
+    std::vector < sword::SWBuf > getGlobalOptionsVector() {
+        std::list<sword::SWBuf> l(self->getGlobalOptions());
+        return std::vector< sword::SWBuf >(l.begin(), l.end());
+    }
+    
+    std::vector < sword::SWBuf > getGlobalOptionValuesVector(const char *option) {
+        std::list<sword::SWBuf> l(self->getGlobalOptionValues(option));
+        return std::vector< sword::SWBuf >(l.begin(), l.end());
+    }
+    
+    std::map<sword::SWBuf, sword::SWModule*> &getModules() {
+        return self->Modules;
+    }
+    
+    SWModule* getModuleAt( const int pos ) {
+        if (pos < 0 || pos > (int)self->Modules.size() )
+            return 0;
+    
+        sword::ModMap::iterator it = self->Modules.begin(); 
+        
+        for (int i = 0; i < pos; ++i) {
+            it++;
+        }
+
+        if ( it != self->Modules.end() ) {
+            return (*it).second;
+        }
+        
+        return 0;
+    }
+} 
diff --git a/bindings/swig/swmodule.i b/bindings/swig/swmodule.i
new file mode 100644
index 0000000..d9417db
--- /dev/null
+++ b/bindings/swig/swmodule.i
@@ -0,0 +1,35 @@
+%{
+#include "swmodule.h"
+%}
+
+%ignore sword::SWModule::operator SWKey &;
+%ignore sword::SWModule::operator SWKey *;
+
+%ignore sword::SWModule::Search;
+
+%ignore sword::SWModule::SWModule;
+%ignore sword::SWModule::filterBuffer;
+%ignore sword::SWModule::getEntryAttributes;
+%ignore sword::SWModule::getConfig;
+%ignore sword::SWModule::setConfig;
+
+%include "swmodule.h"
+
+%extend sword::SWModule {
+	
+	static sword::SWModule *castTo(sword::SWSearchable *o) {
+		return dynamic_cast<sword::SWModule*>(o);
+	}
+
+
+    std::map < sword::SWBuf, std::map < sword::SWBuf, std::map < sword::SWBuf, sword::SWBuf > > > 
+    
+      &getEntryAttributesMap() {
+            return self->getEntryAttributes();
+    }
+
+  std::map <sword::SWBuf, sword::SWBuf> *getConfigMap() {
+    return ( std::map < sword::SWBuf, sword::SWBuf > * ) &self->getConfig();
+  }
+}
+
diff --git a/bindings/swig/swobject.i b/bindings/swig/swobject.i
new file mode 100644
index 0000000..b6079a2
--- /dev/null
+++ b/bindings/swig/swobject.i
@@ -0,0 +1,7 @@
+%{
+#include "swobject.h"
+%}
+
+%ignore sword::SWClass::SWClass;
+
+%include "swobject.h"
diff --git a/bindings/swig/swoptfilter.i b/bindings/swig/swoptfilter.i
new file mode 100644
index 0000000..7ef7b87
--- /dev/null
+++ b/bindings/swig/swoptfilter.i
@@ -0,0 +1,13 @@
+%{
+#include "swoptfilter.h"
+%}
+
+%ignore sword::SWOptionFilter::getOptionValues;
+
+%include "swoptfilter.h"
+
+%extend sword::SWOptionFilter {
+	static sword::SWOptionFilter *castTo(sword::SWFilter *o) {
+		return dynamic_cast<sword::SWOptionFilter*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/sword.i b/bindings/swig/sword.i
new file mode 100644
index 0000000..a963fa1
--- /dev/null
+++ b/bindings/swig/sword.i
@@ -0,0 +1,106 @@
+#define SWDLLEXPORT  
+
+%module "Sword"
+%module(directors="1") Sword;
+
+/* Ignore warnings about Unknown base class */
+%warnfilter(401);
+
+%include "deprecations.i"
+
+#ifdef SWIGPYTHON
+%include "directors.i"
+#endif
+
+/* Some renames for sanity */
+%ignore *::operator SWBuf;
+
+/* Some generic ignores. These don't map into any Python operators */
+%ignore *::operator=;
+%ignore *::operator++;
+%ignore *::operator--;
+%ignore *::operator sword::SWKey &;
+%ignore *::operator sword::SWKey *;
+/* An ignore for missing wchar_t compatibility */
+%ignore sword::SWBuf::append(wchar_t);
+
+%include "defs.i"
+%include "swbuf.i"
+
+%include "multimapwdef.i"
+
+
+/* Now include all the STL templates we are going to use */
+%include "templates.i"
+
+%include "swobject.i"
+%include "swconfig.i"
+%include "swversion.i"
+%include "bases.i"
+
+%include "swkey.i"
+%include "listkey.i"
+%include "versekey.i"
+%include "treekey.i"
+%include "treekeyidx.i"
+%include "versetreekey.i"
+
+%include "swdisp.i"
+
+%include "swfilter.i"
+%include "swoptfilter.i"
+%include "swfiltermgr.i"
+
+
+%include "stringmgr.i"
+%include "swsearchable.i"
+//%include "swcacher.i"
+%include "swmodule.i"
+
+
+
+%include "swmgr.i"
+%include "filemgr.h"
+
+%include "encfiltmgr.i"
+%include "markupfiltmgr.i"
+
+%include "swlocale.i"
+
+%include "swcomprs.i"
+%include "lzsscomprs.i"
+%include "zipcomprs.i"
+
+
+%include "swcom.i"
+%include "rawcom.i"
+%include "zcom.i"
+
+%include "swgenbook.i"
+%include "rawgenbook.i"
+
+%include "swld.i"
+%include "rawld.i"
+%include "rawld4.i"
+%include "zld.i"
+
+%include "swtext.i"
+%include "rawtext.i"
+%include "ztext.i"
+
+%include "localemgr.i"
+
+%include "url.i"
+%include "utilxml.i"
+
+%include "osishtmlhref.i"
+%include "extras.i"
+%include "swlog.i"
+
+#ifndef EXCLUDE_FTP
+%include "remotetrans.i"
+
+#ifndef EXCLUDE_INSTALLMGR
+%include "installmgr.i"
+#endif
+#endif
diff --git a/bindings/swig/sword.pl b/bindings/swig/sword.pl
new file mode 100755
index 0000000..29310ab
--- /dev/null
+++ b/bindings/swig/sword.pl
@@ -0,0 +1,128 @@
+#!/usr/bin/perl
+
+#******************************************************************************
+#
+#  sword.pl -	This looks like a test program to check binding functionality
+#
+# $Id: sword.pl 2960 2013-08-13 15:49:39Z greg.hellings $
+#
+# Copyright 2002-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+use Sword;
+
+print "Version (should be 1.0): " , $Sword::VERSION , "\n";
+
+print "Create SWConfig object!\n";
+$config = new Sword::SWConfig("test.conf");
+
+print "Load\n";
+$config->Load();
+
+print "Set value ... ";
+print $config->set("Group", "Entry", "Value");
+print " finished \n";
+
+print "Get value ... ";
+print $config->get("Group", "Entry");
+print " finished \n";
+
+$config->Save();
+
+#testing SWMgr
+print "testing SWMgr\n";
+#$localemgr = Sword::LocaleMgr::getSystemLocaleMgr();
+#$localemgr->setDefaultLocaleName("de");
+
+$mgr = new Sword::SWMgr();
+print "init ... ";
+#$module = $mgr->module("GerLut1545-temp");
+$module = $mgr->getModule("WEB");
+print "Printing WEB Module information: \n";
+print "Name:\t", $module->getName(),"\nDescription:\t", $module->getDescription(), "\nLang:\t", $module->getLanguage(), "\n";
+
+$key = new Sword::VerseKey("Matthew 3:16");
+#$key->setPersist(1);
+$module->setKey($key);
+
+for ($i = 0; $i < 15; $i++) {
+  print "(", $module->getKeyText() ,")\t", $module->stripText(), "\n";
+  $key->increment();
+  $module->setKey($key);
+}
+$key->increment(103);
+$module->setKey($key);
+print "(", $module->getKeyText() ,")\t", $module->stripText(), "\n";
+
+#testing write interface
+$key->setText("John 3:16");
+$module->setKey($key);
+$module->setEntry("This is a test entry! This tests the write abilities of the Sword Perl classes", 78);
+print "(", $module->getKeyText() ,")\t", $module->stripText(), "\n";
+
+print "Searching for God: ";
+$list = $module->doSearch("God");
+print $list->getCount(), " entries found!\n";
+#for ( $i = 0; $i < $list->Count(); $i++) {
+#  print "(", $i, ")\t", $list->GetElement()->getText(), "\n";
+#  $list->next();
+#}
+
+print "Creating new module! Writing search result...";
+#Sword::RawText::createModule("/usr/share/sword/modules/texts/ztext/testmodule/");
+#$newmod = new Sword::RawText("/usr/share/sword/modules/texts/ztext/testmodule/");
+
+#$key->setText("Genesis 1:1");
+$newkey = $key->clone();
+#$newmod->SetKey($newkey);
+#
+#for ($i = 0; $i < $list->Count(); $i++, $list->next()) {
+#	$key->setText($list->GetElement()->getText());
+#	$newkey->setText($list->GetElement()->getText());	
+#
+#	$newmod->write( $module->StripText() );
+#}
+
+print "Now create the LD module\n";
+
+ mkdir("ldmod");
+Sword::zText::createModule("ldmod/",4);
+
+print "first step}\n";
+
+$newmod = new Sword::zText("ldmod/");
+
+print "Created module;\n";
+
+$newkey = $newmod->createKey();
+#$newkey->setPersist(1);
+$newkey->setText(" ");
+$module->setKey($newkey);
+
+print "Loop! \n";
+
+for ($i = 0; $i < $list->getCount(); $i++) {
+	print $list->getElement()->getText() . "\n";
+
+        $key->setText($list->getElement()->getText());
+        $newkey->setText($list->getElement()->getText());
+
+	$newmod->setKey($newkey);
+
+	$entry = $module->stripText();
+        $newmod->setEntry( $entry, length $entry );
+	$list->increment();
+}
+
diff --git a/bindings/swig/swsearchable.i b/bindings/swig/swsearchable.i
new file mode 100644
index 0000000..6f6cbde
--- /dev/null
+++ b/bindings/swig/swsearchable.i
@@ -0,0 +1,25 @@
+%{
+#include "swsearchable.h"
+%}
+
+%ignore sword::SWSearchable::search;
+%ignore sword::SWSearchable::createSearchFramework;
+%ignore sword::SWSearchable::nullPercent;
+
+%include "swsearchable.h"
+
+%extend sword::SWSearchable {
+        bool isSearchSupported(const char *istr, int searchType = 0,
+                                  int flags = 0,
+                SWKey * scope = 0) {
+                bool checksupported = true;
+                self->search(istr, searchType, flags, scope, &checksupported);
+                return checksupported;
+        }
+
+        ListKey &doSearch(const char *istr, int searchType = 0, int flags = 0,
+                          SWKey *scope = 0) {
+                return self->search(istr, searchType, flags, scope);
+        }
+};
+
diff --git a/bindings/swig/swtext.i b/bindings/swig/swtext.i
new file mode 100644
index 0000000..62aa00d
--- /dev/null
+++ b/bindings/swig/swtext.i
@@ -0,0 +1,13 @@
+%{
+#include "swtext.h"
+%}
+
+%ignore sword::SWText::SWText;
+
+%include "swtext.h"
+
+%extend sword::SWText {
+	static sword::SWText *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::SWText*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/swversion.i b/bindings/swig/swversion.i
new file mode 100644
index 0000000..c09d7c7
--- /dev/null
+++ b/bindings/swig/swversion.i
@@ -0,0 +1,5 @@
+%{
+#include "swversion.h"
+%}
+
+%include "swversion.h"
diff --git a/bindings/swig/templates.i b/bindings/swig/templates.i
new file mode 100644
index 0000000..20fd9cd
--- /dev/null
+++ b/bindings/swig/templates.i
@@ -0,0 +1,79 @@
+%include <stl.i>
+%include <std_map.i>
+%include <std_list.i>
+
+%include <std_pair.i>
+#ifdef SWIGPYTHON
+%include <std_multimap.i>
+#else
+%include "local/std_multimap.i"
+#endif
+%include <multimapwdef.h>
+
+/*
+Include SWModule and DirEntry here, so that it will be able to appear below
+*/
+%{
+#include "swmodule.h"
+#include "filemgr.h"
+#include "swconfig.h"
+%}
+
+/* 
+These are the stl templates that are used throughout Sword. Some have more
+than one name in Sword, depending on context. However, these are all wrapped with the one class.
+For example, sword::AttributeValueMap is the same as sword::ConfigEntMap
+Both are wrapped as the former, however
+*/
+%inline %{
+typedef std::map< sword::SWBuf, sword::SWBuf > AttributeValueMap;
+typedef std::map< sword::SWBuf, AttributeValueMap> AttributeListMap;
+typedef std::map< sword::SWBuf, AttributeListMap> AttributeTypeListMap; 
+typedef std::multimap < sword::SWBuf, sword::SWBuf, std::less < sword::SWBuf > > PyConfigEntMap;
+typedef std::map < sword::SWBuf, PyConfigEntMap > PySectionMap;
+%}
+
+/* Used by SWModule and SWConfig */
+%template() std::pair <sword::SWBuf, sword::SWBuf>;
+%template(AttributeValueMap) std::map < sword::SWBuf, sword::SWBuf >;
+
+/* Used by SWModule */
+%template() std::pair <sword::SWBuf, AttributeValueMap>;
+%template(AttributeListMap) std::map < sword::SWBuf, AttributeValueMap>;
+%template() std::pair < sword::SWBuf, AttributeListMap>;
+%template(AttributeTypeListMap) std::map < sword::SWBuf, AttributeListMap>;
+
+/* Used by SWConfig */
+#ifdef SWIGPYTHON
+%template(PyConfigEntMap) std::multimap < sword::SWBuf, sword::SWBuf, std::less <sword::SWBuf> >;
+#endif
+/* %template() std::less <sword::SWBuf>;*/
+%template() std::pair < sword::SWBuf, std::multimap < sword::SWBuf,
+ sword::SWBuf > >/*PyConfigEntMap >*/;
+%template(PySectionMap) std::map < sword::SWBuf, std::multimap < sword::SWBuf,
+ sword::SWBuf > >/*std::map < sword::SWBuf, PyConfigEntMap >*/;
+
+/* Used by SWMgr */
+%template() std::pair<sword::SWBuf, sword::SWModule*>;
+%template(ModuleMap) std::map<sword::SWBuf, sword::SWModule*>;
+
+/* Used by SWMgr and LocaleMgr */
+%template(StringVector) std::vector < sword::SWBuf >;
+
+/* Used by xmltag */
+%template(StringList) std::list < sword::SWBuf >;
+
+
+/* Used by InstallMgr */
+#ifndef EXCLUDE_INSTALLMGR
+%{
+#include "installmgr.h"
+%}
+%template() std::pair<sword::SWBuf, sword::InstallSource*>;
+%template(InstallSourceMap) std::map<sword::SWBuf, sword::InstallSource*>;
+%template() std::pair<sword::SWModule *, int>;
+%template() std::map<sword::SWModule *, int>;
+#endif
+
+/* Used by DirEntry */
+%template(DirEntryVector) std::vector < sword::DirEntry > ;
diff --git a/bindings/swig/treekey.i b/bindings/swig/treekey.i
new file mode 100644
index 0000000..a2bbac7
--- /dev/null
+++ b/bindings/swig/treekey.i
@@ -0,0 +1,38 @@
+%{
+#include "treekey.h"
+%}
+
+%ignore sword::TreeKey::getUserData(int *);
+%ignore sword::TreeKey::setUserData(const char *, int);
+
+%include <carrays.i>
+
+//%pointer_class(unsigned char, BytePointer);
+//%array_class(unsigned char, ByteArray);
+
+%include "treekey.h"
+
+%extend sword::TreeKey {
+	static sword::TreeKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::TreeKey*>(o);
+	}
+}
+
+/*
+%extend sword::TreeKey {
+
+        const unsigned char *getUserData2() {
+                return (const unsigned char*)(self->getUserData(0));
+        }
+
+        int getUserDataSize() {
+                int s;
+                self->getUserData(&s);
+                return s;
+        }
+
+        void setUserData(unsigned char data[], int size) {
+                self->setUserData(((const char*)(data)), size);
+        }
+};
+*/
diff --git a/bindings/swig/treekeyidx.i b/bindings/swig/treekeyidx.i
new file mode 100644
index 0000000..16e332d
--- /dev/null
+++ b/bindings/swig/treekeyidx.i
@@ -0,0 +1,11 @@
+%{
+#include "treekeyidx.h"
+%}
+
+%include "treekeyidx.h"
+
+%extend sword::TreeKeyIdx {
+	static sword::TreeKeyIdx *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::TreeKeyIdx*>(o);
+	}
+}
diff --git a/bindings/swig/url.i b/bindings/swig/url.i
new file mode 100644
index 0000000..2ef4cf4
--- /dev/null
+++ b/bindings/swig/url.i
@@ -0,0 +1,5 @@
+%{
+#include <url.h>
+%}
+
+%include "url.h"
diff --git a/bindings/swig/utilxml.i b/bindings/swig/utilxml.i
new file mode 100644
index 0000000..9094f06
--- /dev/null
+++ b/bindings/swig/utilxml.i
@@ -0,0 +1,5 @@
+%{
+#include <utilxml.h>
+%}
+
+%include "utilxml.h"
diff --git a/bindings/swig/versekey.i b/bindings/swig/versekey.i
new file mode 100644
index 0000000..539989d
--- /dev/null
+++ b/bindings/swig/versekey.i
@@ -0,0 +1,188 @@
+%{
+#include "versekey.h"
+#include "versificationmgr.h"
+%}
+
+
+%ignore sword::sbook::versemax;
+%ignore sword::VerseKey::setBookAbbrevs;
+%ignore sword::VerseKey::setBooks;
+
+%ignore sword::VerseKey::builtin_BMAX;
+%ignore sword::VerseKey::builtin_books;
+%ignore sword::VerseKey::BMAX;
+%ignore sword::VerseKey::books;
+%ignore sword::VerseKey::VerseKey(SWKey const &);
+
+%immutable sword::VerseKey::builtin_abbrevs;
+%immutable sword::sbook::name;
+%immutable sword::sbook::prefAbbrev;
+%immutable sword::abbrev::ab;
+
+%include "versekey.h"
+%include "versificationmgr.h"
+
+%extend sword::abbrev {
+	int getAbbrevCount() {
+		int abbrevsCnt;
+		for (abbrevsCnt = 0; *self[abbrevsCnt].ab; abbrevsCnt++) {}
+		return abbrevsCnt-1;
+	}
+
+	const struct sword::abbrev* getAbbrevData(int i) {
+		return &(self[i]);
+	}
+}
+
+%extend sword::sbook {
+	const int verseMax( int chapter ) {
+		if ( chapter > 0  && chapter < self->chapmax ) {
+			return self->versemax[chapter-1];
+		} else {
+			return 0;
+		}
+	}
+};
+
+
+
+%extend sword::VerseKey {
+	/* C++-style cast */
+	static sword::VerseKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::VerseKey*>(o);
+	}
+
+
+	/* Get number of books in the given testament
+	* testament may be 1 (OT) or 2 (NT)
+	*/
+
+        
+	const int bookCount( const int testament ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		return self->BMAX[testament-1];
+	};
+
+
+    const int getBookCount(){
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        return system->getBookCount();
+    }
+    
+        
+	/* Get name of book
+	* Returns the name of the booknumber in the givn testament.
+	* Testament may be 1 (OT) or 2 (NT)
+	* book may be in the range of 1 <= bookCount(testament)
+	*/
+	const char* bookName( const int testament, const int book ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		if ( (book < 1) || (book > self->BMAX[testament-1]) ) {
+			return 0;
+		}
+
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        
+        int book_num = (book - 1) + (
+            (testament == 2) ? self->BMAX[0] : 0
+        );
+
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
+        if(!b) {
+            fprintf(stderr, "b is null for %d?!?\n", book_num);
+            return 0;
+        }
+        return b->getLongName();
+
+ 
+	};
+
+    int getBookNumberByOSISName( const char* bookname ) {
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        return system->getBookNumberByOSISName(bookname);
+   }
+    
+    const char* getOSISBookName( const int book ) {
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+   		if ( (book < 0) || (book >= system->getBookCount()))
+            return 0;
+
+        return system->getBook(book)->getOSISName();
+    }
+ 
+        
+
+	/* Get number of chapters in the given testament and book number
+	* testament may be 1 (OT) or 2 (NT)
+	* book may be in the range 1 <= bookCount(testament)
+	*/
+	const int chapterCount( const int testament, const int book ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		if ( (book < 1) || (book > self->BMAX[testament-1]) ) {
+			return 0;
+		}
+
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        
+        int book_num = (book - 1) + (
+            (testament == 2) ? self->BMAX[0] : 0
+        );
+
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
+        if(!b) {
+            fprintf(stderr, "b is null for %d?!?\n", book_num);
+            return 0;
+        }        
+
+        return b->getChapterMax();
+	};
+	/* Get number of verses in the given chapter of the given in the given testament,
+	* testament may be 1 (OT) or 2 (NT)
+	* book may be in the range 1 <= bookCount(testament)
+	* chapter may be in the range 1 <= chapterCount(testament, book)
+	*/
+	const int verseCount( const int testament, const int book, const int chapter ) {
+		if ( (testament < 1) || (testament > 2) ) {
+			return 0;
+		};
+		if ( (book < 1) || (book > self->BMAX[testament-1]) ) {
+			return 0;
+		}
+
+        const sword::VersificationMgr::System* system = sword::VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(
+            self->getVersificationSystem()
+        );
+        
+        int book_num = (book - 1) + (
+            (testament == 2) ? self->BMAX[0] : 0
+        );
+
+        const sword::VersificationMgr::Book* b = system->getBook(book_num);
+        if(!b) {
+            fprintf(stderr, "b is null for %d?!?\n", book_num);
+            return 0;
+        }
+		if ( (chapter < 1) || (chapter > b->getChapterMax()) ) {
+			return 0;
+		}
+
+		return b->getVerseMax(chapter);
+
+	};
+};
diff --git a/bindings/swig/versetreekey.i b/bindings/swig/versetreekey.i
new file mode 100644
index 0000000..35c0e3e
--- /dev/null
+++ b/bindings/swig/versetreekey.i
@@ -0,0 +1,12 @@
+%{
+#include "versetreekey.h"
+%}
+
+%include "versetreekey.h"
+
+%extend sword::VerseTreeKey {
+	/* C++-style cast */
+	static sword::VerseTreeKey *castTo(sword::SWKey *o) {
+		return dynamic_cast<sword::VerseTreeKey*>(o);
+	}
+};
diff --git a/bindings/swig/vstudio/SwigSword.csproj b/bindings/swig/vstudio/SwigSword.csproj
new file mode 100644
index 0000000..7b40eab
--- /dev/null
+++ b/bindings/swig/vstudio/SwigSword.csproj
@@ -0,0 +1,99 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>8.0.50727</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{F594299C-1C3B-461E-B64A-6167735DCA12}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>SwigSword</RootNamespace>

+    <AssemblyName>SwigSword</AssemblyName>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>bin\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Data" />

+    <Reference Include="System.Xml" />

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="abbrev.cs" />

+    <Compile Include="AttributeListMap.cs" />

+    <Compile Include="AttributeTypeListMap.cs" />

+    <Compile Include="AttributeValueMap.cs" />

+    <Compile Include="EncodingFilterMgr.cs" />

+    <Compile Include="ListKey.cs" />

+    <Compile Include="LocaleMgr.cs" />

+    <Compile Include="LZSSCompress.cs" />

+    <Compile Include="MarkupFilterMgr.cs" />

+    <Compile Include="ModuleMap.cs" />

+    <Compile Include="RawCom.cs" />

+    <Compile Include="RawGenBook.cs" />

+    <Compile Include="RawLD.cs" />

+    <Compile Include="RawLD4.cs" />

+    <Compile Include="RawText.cs" />

+    <Compile Include="sbook.cs" />

+    <Compile Include="StringVector.cs" />

+    <Compile Include="SWBuf.cs" />

+    <Compile Include="SWClass.cs" />

+    <Compile Include="SWCom.cs" />

+    <Compile Include="SWCompress.cs" />

+    <Compile Include="SWConfig.cs" />

+    <Compile Include="SWDisplay.cs" />

+    <Compile Include="SWFilter.cs" />

+    <Compile Include="SWFilterMgr.cs" />

+    <Compile Include="SWGenBook.cs" />

+    <Compile Include="SWKey.cs" />

+    <Compile Include="SWLD.cs" />

+    <Compile Include="SWLocale.cs" />

+    <Compile Include="SWMgr.cs" />

+    <Compile Include="SWModule.cs" />

+    <Compile Include="SWObject.cs" />

+    <Compile Include="SWOptionFilter.cs" />

+    <Compile Include="Sword.cs" />

+    <Compile Include="SwordPINVOKE.cs" />

+    <Compile Include="SWSearchable.cs" />

+    <Compile Include="SWText.cs" />

+    <Compile Include="SW_POSITION.cs" />

+    <Compile Include="TreeKey.cs" />

+    <Compile Include="TreeKeyIdx.cs" />

+    <Compile Include="URL.cs" />

+    <Compile Include="VerseKey.cs" />

+    <Compile Include="VerseTreeKey.cs" />

+    <Compile Include="zCom.cs" />

+    <Compile Include="ZipCompress.cs" />

+    <Compile Include="zLD.cs" />

+    <Compile Include="zText.cs" />

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="Properties\" />

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+  </PropertyGroup>

+</Project>
\ No newline at end of file
diff --git a/bindings/swig/vstudio/libsword-csharpbindings.sln b/bindings/swig/vstudio/libsword-csharpbindings.sln
new file mode 100644
index 0000000..36cd729
--- /dev/null
+++ b/bindings/swig/vstudio/libsword-csharpbindings.sln
@@ -0,0 +1,36 @@
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual C++ Express 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\..\lib\vcppmake\vc8\libsword.vcproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword_csharpsword", "libsword_csharpsword.vcproj", "{0BD1471F-07D9-441C-9210-40A52770F2A1}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug with ICU|Win32 = Debug with ICU|Win32

+		Debug|Win32 = Debug|Win32

+		Release with ICU|Win32 = Release with ICU|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release with ICU|Win32.Build.0 = Release with ICU|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.ActiveCfg = Debug with ICU|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug with ICU|Win32.Build.0 = Debug with ICU|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Debug|Win32.Build.0 = Debug|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.ActiveCfg = Release with ICU|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release with ICU|Win32.Build.0 = Release with ICU|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.ActiveCfg = Release|Win32

+		{0BD1471F-07D9-441C-9210-40A52770F2A1}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/bindings/swig/vstudio/libsword_csharpsword.vcproj b/bindings/swig/vstudio/libsword_csharpsword.vcproj
new file mode 100644
index 0000000..4d69c39
--- /dev/null
+++ b/bindings/swig/vstudio/libsword_csharpsword.vcproj
@@ -0,0 +1,966 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="libsword_csharpsword"

+	ProjectGUID="{0BD1471F-07D9-441C-9210-40A52770F2A1}"

+	RootNamespace="libsword"

+	AssemblyReferenceSearchPaths="&quot;..\..\..\lib\vcppmake\vc8\Release&quot;"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword_csharpsword.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i  "

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../../../apps/windoze/CBuilder5/InstallMgr/curl,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWUSINGDLL"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Release/libsword.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+				DisableSpecificWarnings="4996"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug with ICU|Win32"

+			OutputDirectory=".\ICUDebug"

+			IntermediateDirectory=".\ICUDebug"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../../icu-sword/source/common,../../../../icu-sword/source/i18n,../../../include,../../../src/utilfuns/win32"

+				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\ICUDebug/libsword.pch"

+				AssemblerListingLocation=".\ICUDebug/"

+				ObjectFile=".\ICUDebug/"

+				ProgramDataBaseFileName=".\ICUDebug/"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+				CompileAs="0"

+				DisableSpecificWarnings="4996"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine=" swig -csharp -c++ -nodefaultctor -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../include,../../../src/utilfuns/win32"

+				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\Debug/libsword.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				BrowseInformation="1"

+				SuppressStartupBanner="true"

+				DebugInformationFormat="4"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release with ICU|Win32"

+			OutputDirectory=".\ICURelease"

+			IntermediateDirectory=".\ICURelease"

+			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="false"

+			CharacterSet="2"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+				CommandLine=" swig -csharp -c++ -nodefaultctor -DNDEBUG -DWIN32 -D_LIB -DREGEX_MALLOC -DSWUSINGDLL -dllimport libsword-csharpwrap.dll -module Sword -o Sword.cxx -I.. -I../../../include ../sword.i  "

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="2"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../../../../icu-sword/include,../../../include,../../../src/utilfuns/win32,../../../apps/windoze/CBuilder5/InstallMgr/curl/include"

+				PreprocessorDefinitions="NDEBUG;_ICU_;WIN32;_LIB;REGEX_MALLOC"

+				StringPooling="true"

+				RuntimeLibrary="2"

+				EnableFunctionLevelLinking="true"

+				UsePrecompiledHeader="0"

+				PrecompiledHeaderFile=".\ICURelease/libsword.pch"

+				AssemblerListingLocation=".\ICURelease/"

+				ObjectFile=".\ICURelease/"

+				ProgramDataBaseFileName=".\ICURelease/"

+				SuppressStartupBanner="true"

+				CompileAs="0"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalDependencies="libsword.lib"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCManifestTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCAppVerifierTool"

+			/>

+			<Tool

+				Name="VCWebDeploymentTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+		<ProjectReference

+			ReferencedProjectIdentifier="{97449E5E-F880-4D22-933A-0D2FC32034D4}"

+			RelativePathToProject=".\libsword.vcproj"

+		/>

+	</References>

+	<Files>

+		<Filter

+			Name="Sword Source Files"

+			>

+			<File

+				RelativePath=".\Sword.cxx"

+				>

+			</File>

+		</Filter>

+		<Filter

+			Name="Sword Header Files"

+			>

+			<File

+				RelativePath="..\..\..\include\apocrypha.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\canon.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\cdsourcemgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\cipherfil.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\defs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\echomod.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\encfiltmgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\entriesblk.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\femain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\filemgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\flatapi.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\ftpparse.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbffootnotes.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfheadings.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfhtml.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfhtmlhref.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfmorph.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfosis.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfplain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfredletterwords.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfrtf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfstrongs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfthml.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\gbfwebif.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\Greek2Greek.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\GreekChars.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\greeklexattribs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\hebrewmcim.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\hrefcom.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\latin1utf16.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\latin1utf8.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\listkey.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\localemgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\lzsscomprs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\markupfiltmgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\multimapwdef.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\nullim.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisfootnotes.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisheadings.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osishtmlhref.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osislemma.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osismorph.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osismorphsegmentation.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisosis.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisplain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisredletterwords.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisrtf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisscripref.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osisstrongs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\osiswebif.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\papyriplain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawcom.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawfiles.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawgbf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawgenbook.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawld.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawld4.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawstr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawstr4.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawtext.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rawverse.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\regex.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\remotesourcemgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\roman.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\rtfhtml.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\sapphire.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\scsuutf8.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\stringmgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\strkey.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swbasicfilter.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swbuf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swcacher.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swcipher.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swcom.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swcomprs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swconfig.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swdisp.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swdisprtf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swdisprtfchap.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swfilter.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swfiltermgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swgenbook.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swinputmeth.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swinstallmgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swkey.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swld.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swlocale.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swlog.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swmacs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swmgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swmodule.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swobject.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swoptfilter.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swremotemgr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swsearchable.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swtext.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swversion.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\swwinlog.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\sysdata.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\tbdisp.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\teiplain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\teirtf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlfootnotes.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlgbf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlheadings.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlhtml.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlhtmlhref.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmllemma.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlmorph.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlosis.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlplain.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlrtf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlscripref.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlstrongs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlvariants.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\thmlwebif.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\treekey.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\treekeyidx.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\unicodertf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\unixstr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\untgz.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\url.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf16utf8.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8arshaping.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8bidireorder.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8cantillation.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8greekaccents.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8hebrewpoints.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8arabicpoints.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8html.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8latin1.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8nfc.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8nfkd.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8transliterator.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utf8utf16.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utilfuns.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utilstr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\utilxml.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\versekey.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\versetreekey.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\zcom.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\zconf.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\zipcomprs.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\zld.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\zlib.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\zstr.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\ztext.h"

+				>

+			</File>

+			<File

+				RelativePath="..\..\..\include\zverse.h"

+				>

+			</File>

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/bindings/swig/zcom.i b/bindings/swig/zcom.i
new file mode 100644
index 0000000..83af55f
--- /dev/null
+++ b/bindings/swig/zcom.i
@@ -0,0 +1,12 @@
+%{
+#include "zverse.h"
+#include "zcom.h"
+%}
+
+%include "zcom.h"
+
+%extend sword::zCom {
+	static sword::zCom *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::zCom*>(o);
+	}
+}
diff --git a/bindings/swig/zipcomprs.i b/bindings/swig/zipcomprs.i
new file mode 100644
index 0000000..500295d
--- /dev/null
+++ b/bindings/swig/zipcomprs.i
@@ -0,0 +1,11 @@
+%{
+#include <zipcomprs.h>
+%}
+
+%include "zipcomprs.h"
+
+%extend sword::ZipCompress {
+	static sword::ZipCompress *castTo(sword::SWCompress *o) {
+		return dynamic_cast<sword::ZipCompress*>(o);
+	}
+}
\ No newline at end of file
diff --git a/bindings/swig/zld.i b/bindings/swig/zld.i
new file mode 100644
index 0000000..36f07b2
--- /dev/null
+++ b/bindings/swig/zld.i
@@ -0,0 +1,11 @@
+%{
+#include "zld.h"
+%}
+
+%include "zld.h"
+
+%extend sword::zLD {
+	static sword::zLD *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::zLD*>(o);
+	}
+}
diff --git a/bindings/swig/ztext.i b/bindings/swig/ztext.i
new file mode 100644
index 0000000..55db441
--- /dev/null
+++ b/bindings/swig/ztext.i
@@ -0,0 +1,11 @@
+%{
+#include "ztext.h"
+%}
+
+%include "ztext.h"
+
+%extend sword::zText {
+	static sword::zText *castTo(sword::SWModule *o) {
+		return dynamic_cast<sword::zText*>(o);
+	}
+}
diff --git a/bindings/usrinst.sh b/bindings/usrinst.sh
new file mode 100755
index 0000000..f584050
--- /dev/null
+++ b/bindings/usrinst.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+#******************************************************************************
+# Convenience script specifying most common options to ./configure
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+#
+
+OPTIONS="--prefix=/usr $OPTIONS"
+OPTIONS="--enable-corba $OPTIONS"
+
+CPPFLAGS="$CFLAGS $CPPFLAGS" JAVAC=javac ./configure $OPTIONS $*
+
diff --git a/buildtest.cpp b/buildtest.cpp
new file mode 100644
index 0000000..010d1a6
--- /dev/null
+++ b/buildtest.cpp
@@ -0,0 +1,83 @@
+/******************************************************************************
+ *
+ *  buildtest.cpp -	This is a dumby program which does nothing useful but
+ *			links to the SWORD engine to confirm basic things were
+ *			built ok.
+ *
+ * $Id: buildtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <versekey.h>
+#include <rawtext.h>
+//#include <zcom.h>
+#include <rawcom.h>
+//#include <rawfiles.h>
+#ifndef NO_SWORD_NAMESPACE
+using sword::VerseKey;
+using sword::RawText;
+using sword::RawCom;
+using sword::SWKey;
+#endif
+using std::cout;
+
+int main(int argc, char **argv)
+{
+	int loop;
+	int max;
+	VerseKey mykey;
+//	RawText text("src/modules/texts/rawtext/sve/", "Sven Text", "Sven Text");
+	RawText text("src/modules/texts/rawtext/webster/", "Webster", "Webster Text");
+//	RawText text("src/modules/texts/rawtext/orthjbc/", "Webster", "Webster Text");
+//	RawText text("src/modules/texts/rawtext/kjv/", "KJV", "KJV Text");
+//	RawText text("src/modules/texts/rawtext/vnt/", "VNT", "Valera Spanish NT");
+//	RawCom  commentary("src/modules/comments/rawcom/rwp/", "RWP", "Robertson's Word Pictures");
+	RawCom  commentary("src/modules/comments/rawcom/mhc/", "MHC", "Matthew Henry's Commentary on the Whole Bible");
+//	RawFiles  commentary("src/modules/comments/rawfiles/personal/", "MHC", "Matthew Henry's Commentary on the Whole Bible");
+
+
+	if (argc > 3)
+		mykey.setAutoNormalize(false);  // Turn off autonormalize if 3 args to allow for intros
+				// This is kludgy but at lease you can try it
+				// with something like: sword "Matthew 1:0" 1 1
+
+
+	mykey = (argc < 2) ? "James    1:19" : argv[1];
+	mykey.setPersist(true);
+	text.setKey(mykey);
+	commentary.setKey(mykey);
+
+
+	max = (argc < 3) ? 1 : atoi(argv[2]);
+
+
+	cout << "\n";
+
+
+	for (loop = 0; loop < max; loop++) {
+		cout << (SWKey &)text << ":\n";
+		text.display();
+		cout << "\n";
+		cout << "-------------\n";
+		commentary.display();
+		cout << "\n";
+		cout << "==========================\n";
+		mykey++;
+	}
+	cout << "\n\n";
+}
diff --git a/cmake/FindCLucene.cmake b/cmake/FindCLucene.cmake
new file mode 100644
index 0000000..b98293a
--- /dev/null
+++ b/cmake/FindCLucene.cmake
@@ -0,0 +1,123 @@
+#
+# SOURCE: http://websvn.kde.org/trunk/kdesupport/strigi/cmake/FindCLucene.cmake?view=log
+#
+# ONE FIX: /usr/lib64 added to work on Fedora
+#
+
+
+#
+# This module looks for clucene (http://clucene.sf.net) support
+# It will define the following values
+#
+# CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
+# CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
+# CLUCENE_LIBRARY      = the library to link against CLucene
+# CLUCENE_VERSION      = The CLucene version string
+# CLucene_FOUND        = set to 1 if clucene is found
+#
+
+INCLUDE(CheckSymbolExists)
+INCLUDE(FindLibraryWithDebug)
+
+if(NOT CLUCENE_MIN_VERSION)
+	set(CLUCENE_MIN_VERSION "0.9.19")
+endif(NOT CLUCENE_MIN_VERSION)
+
+IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+	INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
+ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+
+IF(MSVC)
+	IF(CMAKE_BUILD_TYPE STREQUAL "Release")
+		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/Release)
+	ELSE(CMAKE_BUILD_TYPE STREQUAL "Release")
+		SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/debug)
+	ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release")
+	SET(WIN_CLUCENE_INCLUDE_PATH ../clucene-core/src)
+ELSE(MSVC)
+	SET(WIN_CLUCENE_SEARCH_PATH "")
+	SET(WIN_CLUCENE_INCLUDE_PATH "")
+ENDIF(MSVC)
+
+SET(TRIAL_LIBRARY_PATHS
+	$ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
+	${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+	/usr/local/lib${LIB_SUFFIX}
+	/opt/local/lib${LIB_SUFFIX}
+	/usr/lib${LIB_SUFFIX}
+	/usr/lib64
+	/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+	/sw/lib${LIB_SUFFIX}
+	/usr/pkg/lib${LIB_SUFFIX}
+	${WIN_CLUCENE_SEARCH_PATH}
+	)
+SET(TRIAL_INCLUDE_PATHS
+	$ENV{CLUCENE_HOME}/include
+	${CMAKE_INSTALL_PREFIX}/include
+	/usr/local/include
+	/usr/include
+	/sw/include
+	/usr/pkg/include
+	${WIN_CLUCENE_INCLUDE_PATH}
+	)
+FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
+	NAMES clucene clucene-core
+	PATHS ${TRIAL_LIBRARY_PATHS})
+FIND_PATH(CLUCENE_INCLUDE_DIR
+	NAMES CLucene.h
+	PATHS ${TRIAL_INCLUDE_PATHS}
+	ONLY_CMAKE_FIND_ROOT_PATH)
+
+IF(WIN32)
+	SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR})
+ENDIF(WIN32)
+
+SET(CLUCENE_GOOD_VERSION TRUE)
+
+FIND_PATH(CLUCENE_LIBRARY_DIR
+	NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+IF (CLUCENE_LIBRARY_DIR)
+	SET(CLUCENE_INCLUDE_DIR ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR})
+	#MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
+	FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
+	STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
+	IF (CLMATCH)
+		STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
+		IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
+			MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+			SET(CLUCENE_GOOD_VERSION FALSE)
+		ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
+		IF (CLUCENE_VERSION STREQUAL "0.9.17")
+			MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+			SET(CLUCENE_GOOD_VERSION FALSE)
+		ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+		IF (CLUCENE_VERSION VERSION_GREATER "2.0")
+			MESSAGE (STATUS "Found CLucene 2, enabling compatibility mode")
+			SET(CLUCENE2 TRUE)
+		ELSE (CLUCENE_VERSION VERSION_GREATER "2.0")
+			SET(CLUCENE2 FALSE)
+		ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0")
+	ENDIF (CLMATCH)
+ELSE (CLUCENE_LIBRARY_DIR)
+	#MESSAGE(STATUS "CLucene library dir not found.")
+ENDIF (CLUCENE_LIBRARY_DIR)
+
+IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+	SET(CLucene_FOUND TRUE)
+ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+
+IF(CLucene_FOUND)
+	IF(NOT CLucene_FIND_QUIETLY)
+		MESSAGE(STATUS "CLucene: Yes ${CLUCENE_LIBRARY}")
+	ENDIF(NOT CLucene_FIND_QUIETLY)
+ELSE(CLucene_FOUND)
+	IF(CLucene_FIND_REQUIRED)
+		MESSAGE(FATAL_ERROR "CLucene: No")
+	ENDIF(CLucene_FIND_REQUIRED)
+ENDIF(CLucene_FOUND)
+
+MARK_AS_ADVANCED(
+	CLUCENE_INCLUDE_DIR
+	CLUCENE_LIBRARY_DIR
+	CLUCENE_LIBRARY
+	)
diff --git a/cmake/FindICU.cmake b/cmake/FindICU.cmake
new file mode 100644
index 0000000..9dff9f3
--- /dev/null
+++ b/cmake/FindICU.cmake
@@ -0,0 +1,51 @@
+# Finds the International Components for Unicode (ICU) Library
+#
+#  ICU_FOUND          - True if ICU found.
+#  ICU_I18N_FOUND     - True if ICU's internationalization library found.
+#  ICU_INCLUDE_DIRS   - Directory to include to get ICU headers
+#                       Note: always include ICU headers as, e.g., 
+#                       unicode/utypes.h
+#  ICU_LIBRARIES      - Libraries to link against for the common ICU
+#  ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
+#                       (note: in addition to ICU_LIBRARIES)
+
+# Look for the header file.
+find_path(
+  ICU_INCLUDE_DIR 
+  NAMES unicode/utypes.h
+  DOC "Include directory for the ICU library")
+mark_as_advanced(ICU_INCLUDE_DIR)
+
+# Look for the library.
+find_library(
+  ICU_LIBRARY
+  NAMES icuuc cygicuuc cygicuuc32
+  DOC "Libraries to link against for the common parts of ICU")
+mark_as_advanced(ICU_LIBRARY)
+
+# Copy the results to the output variables.
+if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+  set(ICU_FOUND 1)
+  set(ICU_LIBRARIES ${ICU_LIBRARY})
+  set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
+
+  # Look for the ICU internationalization libraries
+  find_library(
+    ICU_I18N_LIBRARY
+    NAMES icuin icui18n cygicuin cygicuin32
+    DOC "Libraries to link against for ICU internationalization")
+  mark_as_advanced(ICU_I18N_LIBRARY)
+  if (ICU_I18N_LIBRARY)
+    set(ICU_I18N_FOUND 1)
+    set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
+  else (ICU_I18N_LIBRARY)
+    set(ICU_I18N_FOUND 0)
+    set(ICU_I18N_LIBRARIES)
+  endif (ICU_I18N_LIBRARY)
+else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+  set(ICU_FOUND 0)
+  set(ICU_I18N_FOUND 0)
+  set(ICU_LIBRARIES)
+  set(ICU_I18N_LIBRARIES)
+  set(ICU_INCLUDE_DIRS)
+endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
diff --git a/cmake/FindLibraryWithDebug.cmake b/cmake/FindLibraryWithDebug.cmake
new file mode 100644
index 0000000..0844a1e
--- /dev/null
+++ b/cmake/FindLibraryWithDebug.cmake
@@ -0,0 +1,117 @@
+#
+# SOURCE KDE4 cmake additional files
+#
+
+#
+#  FIND_LIBRARY_WITH_DEBUG
+#  -> enhanced FIND_LIBRARY to allow the search for an
+#     optional debug library with a WIN32_DEBUG_POSTFIX similar
+#     to CMAKE_DEBUG_POSTFIX when creating a shared lib
+#     it has to be the second and third argument
+
+# Copyright (c) 2007, Christian Ehrlicher, <ch.ehrlicher@gmx.de>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+MACRO(FIND_LIBRARY_WITH_DEBUG var_name win32_dbg_postfix_name dgb_postfix libname)
+
+  IF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX")
+
+     # no WIN32_DEBUG_POSTFIX -> simply pass all arguments to FIND_LIBRARY
+     FIND_LIBRARY(${var_name}
+                  ${win32_dbg_postfix_name}
+                  ${dgb_postfix}
+                  ${libname}
+                  ${ARGN}
+     )
+
+  ELSE(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX")
+
+    IF(NOT WIN32)
+      # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX
+
+      FIND_LIBRARY(${var_name} ${libname} ${ARGN})
+
+    ELSE(NOT WIN32)
+
+      # 1. get all possible libnames
+      SET(args ${ARGN})
+      SET(newargs "")
+      SET(libnames_release "")
+      SET(libnames_debug "")
+
+      LIST(LENGTH args listCount)
+
+      IF("${libname}" STREQUAL "NAMES")
+        SET(append_rest 0)
+        LIST(APPEND args " ")
+
+        FOREACH(i RANGE ${listCount})
+          LIST(GET args ${i} val)
+
+          IF(append_rest)
+            LIST(APPEND newargs ${val})
+          ELSE(append_rest)
+            IF("${val}" STREQUAL "PATHS")
+              LIST(APPEND newargs ${val})
+              SET(append_rest 1)
+            ELSE("${val}" STREQUAL "PATHS")
+              LIST(APPEND libnames_release "${val}")
+              LIST(APPEND libnames_debug   "${val}${dgb_postfix}")
+            ENDIF("${val}" STREQUAL "PATHS")
+          ENDIF(append_rest)
+
+        ENDFOREACH(i)
+
+      ELSE("${libname}" STREQUAL "NAMES")
+
+        # just one name
+        LIST(APPEND libnames_release "${libname}")
+        LIST(APPEND libnames_debug   "${libname}${dgb_postfix}")
+
+        SET(newargs ${args})
+
+      ENDIF("${libname}" STREQUAL "NAMES")
+
+      # search the release lib
+      FIND_LIBRARY(${var_name}_RELEASE
+                   NAMES ${libnames_release}
+                   ${newargs}
+      )
+
+      # search the debug lib
+      FIND_LIBRARY(${var_name}_DEBUG
+                   NAMES ${libnames_debug}
+                   ${newargs}
+      )
+
+      IF(${var_name}_RELEASE AND ${var_name}_DEBUG)
+
+        # both libs found
+        SET(${var_name} optimized ${${var_name}_RELEASE}
+                        debug     ${${var_name}_DEBUG})
+
+      ELSE(${var_name}_RELEASE AND ${var_name}_DEBUG)
+
+        IF(${var_name}_RELEASE)
+
+          # only release found
+          SET(${var_name} ${${var_name}_RELEASE})
+
+        ELSE(${var_name}_RELEASE)
+
+          # only debug (or nothing) found
+          SET(${var_name} ${${var_name}_DEBUG})
+
+        ENDIF(${var_name}_RELEASE)
+
+      ENDIF(${var_name}_RELEASE AND ${var_name}_DEBUG)
+
+      MARK_AS_ADVANCED(${var_name}_RELEASE)
+      MARK_AS_ADVANCED(${var_name}_DEBUG)
+
+    ENDIF(NOT WIN32)
+
+  ENDIF(NOT "${win32_dbg_postfix_name}" STREQUAL "WIN32_DEBUG_POSTFIX")
+
+ENDMACRO(FIND_LIBRARY_WITH_DEBUG)
diff --git a/cmake/FindRegex.cmake b/cmake/FindRegex.cmake
new file mode 100644
index 0000000..cd04ec9
--- /dev/null
+++ b/cmake/FindRegex.cmake
@@ -0,0 +1,43 @@
+######################################################################
+# This will test to see if the system has a regex.h file.  If so, then
+# that header will be included and the library will not build its own
+# regex support.  If the regex.h is located, then it is assumed that the
+# Standard C Library has built-in support for Regex and it will not be
+# necessary for SWORD to use its own system internally.
+#
+# Variables:
+# REGEX_INCLUDE_DIR	- the directory containing the regex.h file
+# REGEX_FOUND		- Set to true if the system's regex.h exists
+
+# We call this twice because on Mac, at least for me, it finds a regex.h
+# inside of /System/Library/Frameworks/Ruby.framework/Headers, which is
+# the paramount of useless.  By calling it the first time with some basic
+# Unix/Linux compatible forced paths, if it finds it there, then we won't
+# have to search again, the value will be cached.  However, if the first
+# call to FIND_PATH fails, then the search will be run again below.
+FIND_PATH(REGEX_INCLUDE_DIR regex.h
+	PATHS /usr/include /usr/local/include
+	NO_DEFAULT_PATH
+	ONLY_CMAKE_FIND_ROOT_PATH
+)
+# Second call
+IF(NOT REGEX_INCLUDE_DIR)
+	FIND_PATH(REGEX_INCLUDE_DIR regex.h
+			ONLY_CMAKE_FIND_ROOT_PATH	# Hopefully that will assist in iPhone stuffs
+		 )
+ENDIF(NOT REGEX_INCLUDE_DIR)
+
+FIND_LIBRARY(REGEX_LIBRARY
+	NAMES regex gnurx)
+
+IF(REGEX_INCLUDE_DIR)
+	SET(REGEX_FOUND 1)
+	MESSAGE(STATUS "System regex.h: Yes")
+ELSE(REGEX_INCLUDE_DIR)
+	MESSAGE(STATUS "System regex.h: No")
+ENDIF(REGEX_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(
+	REGEX_INCLUDE_DIR
+)
+
diff --git a/cmake/README b/cmake/README
new file mode 100644
index 0000000..1a8c8ef
--- /dev/null
+++ b/cmake/README
@@ -0,0 +1,87 @@
+
+BUILDING WITH CMAKE
+
+First, you'll be required to install CMake. You can get pre-built binaries here: [1]. There are versions for Linux/Unix, OS X, Windows, SunOS/Sparc, IRIX64, HPUX and AIX. Most of them have GUIs, but can also be run from the command line. If you are in Linux/Unix there is almost certainly a package available from your system. I have tested the build with versions 2.6.4 and 2.8 of CMake - if you have something from the 2.4 series and are feeling brave enough to try it, please edit the file CMakeLists.txt and, near the top of the file, change the line that reads CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) to require a version low enough so you can test with your version. I have set the minimum at 2.6.0 because that is the minimum I have tested with and not because I am aware of any limitations of versions earlier than 2.4 which would break the system. Please report any success or failures you have as a result of changes.
+
+If you have the SWORD supporting libraries you want to use installed, and also have CMake installed, it is now time to try to configure the system. Follow the appropriate steps laid out below:
+
+
+Bash or other command-line tool, probably Unix/Linux environment
+
+    * Create a new directory where the actual configure or build will take place - this can be an empty subdirectory of SWORD (e.g. sword/cmakebuild) or a parallel directory (sword/../swordbuild) or anywhere else you would like. I personally use the parallel directory and following example commands will reflect a directory structure with cmake_sword/ as the base of the SWORD sources and a parallel directory cmake_build/ as the build directory.
+    * Change into your build directory: cd cmake_build
+    * Issue the call to CMake with any options you want to test and point it to the root of your SWORD sources: cmake <options> ../cmake_sword/
+    * Check that there are no error messages and that CMake ends with the messages "Configuring done", "Generating done", and "Build files have been written to: <object directory>"
+    * From here on out, building should be just like building with Autotools - make -j4/sudo make install 
+
+GUI users
+
+For those of you using the GUI interfaces with, for example, Windows or OS X or even the CMake GUIs for Linux:
+
+    * Open the CMake GUI.
+    * For the line where the GUI asks "Where is the source code:" browse to the directory where you checked out the SWORD source: C:\Users\Greg\Documents\Projects\cmake_sword
+    * For the line where the GUI asks "Where to build the binaries:" browse to a directory (does not need to exist yet for the GUI to operate) that is not the same as the path with the source: C:\Users\Greg\Documents\Projects\cmake_build
+    * If you wish to specify certain options (see the section on options), click the "Add Entry" button and enter the argument you wish to specify under "Name" and the value of that argument under "Value".
+    * Click "Configure"
+          o If prompted to create the build directory, say "Yes"
+          o Select the "generator" for this project... for this, select the system you wish to use to actually do the compile. Some examples are different versions of Microsoft Visual Studio, Unix Makefiles, MSYS Makefiles, Cygwin Makefiles, Xcode projects, Eclipse projects, Borland projects and more.
+          o Unless you are building for the iPhone (in which case you should skip to the section especially for iPhones!), you will probably want to leave "Use default native compilers" unless you are a power user and know what compiler you would like to use. You could use special options here if you need to select special cross-compilers or similar. 
+    * After configure is completed, if there were errors, you will have a chance to correct them. If certain libraries were not located or you wish to use other values, you can select the Advanced View or check Show Advanced and manually edit any of the cached values.
+    * If you are happy with the results and there are no errors or after you have corrected any errors, click Configure a second time.
+    * Click Generate
+    * Navigate to the directory where you specified to build the binaries and invoke your build system through its native mechanics - open the project file, execute the Makefiles, etc. 
+
+iPhone
+
+There are special steps to be taken to build for the iPhone, if you so wish. When I next get on my Mac, I will post these directions especially for you.
+
+    * alternatively, talk to me about how I do things for PocketSword. I use neither the Make system or CMake. --Niccarter 12:10, 19 April 2010 (UTC) 
+
+How can I customize my options?
+
+While not all of the options and functionality of the original SWORD automake system are necessarily supported, I would like to document those which I know about and their status. Also, I want to document the basic method of specifying these options.
+CMake Options
+
+Probably the only important CMake option for normal users is the "Generator" option. For those of you using a GUI, you will be prompted for the Generator to use the first time you click Configure. For command-line users, the default will generally be Unix Makefiles - this goes for Linux, Mac OS X and MinGW in my experience - (possibly different if you're using the DOS prompt in Windows, I haven't checked there) unless you specify otherwise. To get a list of the generators supported by your version of CMake run "cmake --help". The generators will be listed at the bottom. Select the one you would like, for example Xcode, and add the option string: -G Xcode to your invocation of CMake. Other examples might be -G "KDevelop3 - Unix Makefiles" if you wanted to use KDevelop3 but have it managing Unix Makefiles.
+SWORD Options
+
+For all of these options if you are using a GUI, you can set these options by clicking "Add Entry" before configuring and setting the Name and Value fields. For command line users, you would set an option named SWORD_OPTION to value VALUE by adding -DSWORD_OPTION=VALUE to your CMake options. This would look like cmake -DSWORD_OPTION=VALUE ../cmake_build or similar.
+
+The options are listed here by name, grouped roughly by their functioning.
+General, interesting options
+
+    * SWORD_GLOBAL_CONF - If this has a non-empty value, then the option "-DGLOBCONFPATH=${SWORD_GLOBAL_CONF}/sword.conf" is passed to the compiler. If SWORD_GLOBAL_CONF is unset or is empty, then no additional options are passed to the compiler. I believe support for this is only half implemented at the moment. I believe that, if this is set, then an actual sword.conf should be written to the directory specified. At present this is not the case. I am unsure of the correct default behavior if this is not specified.
+    * CMAKE_INSTALL_PREFIX - The location on disk where the files will be installed. If left unset this will default to /opt/local on OS X, C:\Program Files (x86)\libsword\ under Microsoft Visual Studio and /usr/local for anything else. Executables will be installed in the bin/ subdirectory, libraries under lib/ and headers under include/sword. A package config file will be installed in lib/pkgconfig. There is currently no support for installing the different components to other locations, although one could be supplied without much extra effort if it is useful.
+    * SWORD_BUILD_UTILS - If this has the value "No" then utilities will not be built. If this has any other value or is left unspecified, the Utilities will be built and installed.
+    * SWORD_BUILD_EXAMPLES - If this is given the value "Yes" then the examples/cmdline demos will be built. If this has any other value or is left blank, then demos will not be built.
+    * SWORD_BUILD_TESTS - If this is given the value "Yes" then the SWORD tests will be run. They are still run using the same system as before (or as closely as it could be replicated). If this has any other value or is left unspecified, tests will not be run. The exception to that is the simple buildtest.cpp in the root of the sword/ folder which will always be built when the library is built. 
+
+Optional dependencies
+
+    * SWORD_NO_ZLIB and SWORD_USE_INTERNAL_ZLIB - If SWORD_NO_ZLIB has value "Yes" then No ZLib support will be built into the library. If SWORD_NO_ZLIB has any other value, then ZLib support will be built into the library. If support is to be built in, and either a system-wide ZLib is not found OR SWORD_USE_INTERNAL_ZLIB is set to "Yes", then the internal version will be built. If a system library is found AND SWORD_USE_INTERNAL_ZLIB is set to anything other than "Yes" or has no value, then the system library will be linked against. If both SWORD_NO_ZLIB and SWORD_USE_INTERNAL_ZLIB are set to "Yes" then SWORD_NO_ZLIB will be used, and no ZLib support will be built.
+    * SWORD_NO_CURL - If this is set to "Yes" then cURL support will not be included regardless of whether cURL is found on the system. If this is any other value or has no value set, then cURL will be built against if it is located and ignored if it cannot be located.
+    * SWORD_NO_CLUCENE - If this is set to "Yes" then CLucene will be ignored if found. If this is set to any other value or has no value, then the library will be built against CLucene if it can be located and ignored if it cannot be located. 
+
+Developer or Packager specific options
+
+    * LIBSWORD_LIBRARY_TYPE - If this has the value "Shared" then a shared library will be build (DLL or .so) along with the exported linking stub. If this is unspecified, then a static library will be built.
+    * CMAKE_BUILD_TYPE - If this is given the value of "Debug" then the default SWORD debugging flags (-g3 -Wall -Werror -O0) will be enabled. If this is unspecified or any value other than "Debug" then the flag -O3 will be enabled.
+    * SWORD_ENABLE_WARNINGS - If this has the value "Yes" then -Werror will be passed to the compiler. This would allow independent specification of -Werror without needing to enable actual debugging. Should this also enable -Wall?
+    * SWORD_ENABLE_PROFILE - if this has the value of "Yes" then the -pg option will be passed to the compiler. I don't know what this does, but it was available with Autotools, so it has been replicated here. This defaults to off.
+    * SWORD_ENABLE_PROFILEN - if this has the value of "Yes" then the "-g -finstrument-functions" options will be passed to the compiler. The same disclaimer goes for this as goes for the previous option. This also defaults to off. 
+
+How do I hack the code?
+
+If you want to directly hack the SWORD library for reasons other than CMake, I suggest you go elsewhere on this wiki for that.
+
+If you have suggestions and edits for this system, you are welcome to create patches and submit them to the sword-devel mailing list. Also, you can find my email on the list's archives and send them directly to me (Greg Hellings) or, if you are ambitious, you are welcome to create a branch using your favorite DVCS and publish it somewhere and let me know. Bazaar has amazing support for allowing me interface with whatever system you wish, so you can publish a git, Mercurial, Bazaar, SVN or CVS repository with the code in it and I should be able to review your changes and integrate them.
+
+For a basic overview - all of the files are contained within the sword/cmake directory except for a few CMakeLists.txt files in strategic locations. CMakeLists.txt is the file that is the entry point for the system. Any calls to functions like FIND(ICU QUIET) will look for a module either included with your CMake system (ZLib) or included within the directory specified by the line SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") CMake will try to find a file titled FindICU.cmake in one of those paths to satisfy your call to FIND(ICU).
+
+Source lists are in sword/cmake/sources.cmake. I have kept them broken out evenly into their separate base directories under sword/src. Additionally any sources which are only included for conditional reasons have their own set of variables down towards the bottom of that file with what are hopefully successfully mnemonic names.
+
+After calls to FIND(<library>), the system then has to react to which files were found and which were not. This is handled with some semi-complicated logic in sword/cmake/muxsources.cmake.
+
+Since utilities, tests and examples are all optional compilations, they have their own CMakeLists.txt files located in their own directories. These are invoked with a call to ADD_SUBDIRECTORY([path to directory]). Additional CMakeLists.txt files could also be created for things like the bindings and other self-contained paths.
+
+After build, install is handled in the sword/cmake/install.cmake file. 
diff --git a/cmake/build-debug.sh b/cmake/build-debug.sh
new file mode 100755
index 0000000..16c6669
--- /dev/null
+++ b/cmake/build-debug.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# A sample script showing how to build most of the options available to this system.
+# Invoke it from the top directory of SWORD by calling $ cmake/build-debug.sh
+#
+
+mkdir -p build
+cd build
+# Configure with Python and Perl bindings, examples, tests and a debug build into
+# a shared library
+cmake -DSWORD_BINDINGS="Python Perl" \
+	-DSWORD_BUILD_EXAMPLES="Yes" \
+	-DSWORD_BUILD_TESTS="Yes" \
+	-DLIBSWORD_LIBRARY_TYPE="Shared" \
+	-DCMAKE_BUILD_TYPE="Debug" .. \
+	-DCMAKE_INSTALL_PREFIX="~/"
+make -j10
+cd ..
+
+echo "Now the library has been built, along with the Perl and Python bindings. \
+Both will be installed to the the user's home directory if you are building \
+under Linux or a similar Unix-like environment if you execute the command \
+'make install' from the build directory with privileges to write into the \
+~/ directory."
diff --git a/cmake/build-release.sh b/cmake/build-release.sh
new file mode 100755
index 0000000..f278c9f
--- /dev/null
+++ b/cmake/build-release.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# A sample script showing how to build most of the options available to this system.
+# Invoke it from the top directory of SWORD by calling $ cmake/build-release.sh
+#
+
+mkdir -p build
+cd build
+# Configure with Python and Perl bindings, examples, tests and a debug build into
+# a shared library, plus static option as well.  They will be installed to the
+# /opt/sword directory
+cmake -DSWORD_BINDINGS="Python Perl" \
+	-DSWORD_BUILD_EXAMPLES="Yes" \
+	-DSWORD_BUILD_TESTS="Yes" \
+	-DLIBSWORD_LIBRARY_TYPE="Shared Static" \
+	-DCMAKE_BUILD_TYPE="Release" \
+	-DCMAKE_INSTALL_PREFIX="/opt/sword" ..
+make -j10
+cd ..
+
+echo "Now the library has been built, along with the Perl and Python bindings. \
+If you now execute 'make install' from the build directory you will \
+install the library to /opt/sword if you have privileges to write there \
+with the account you execute the install from."
diff --git a/cmake/configure-iphone-simulator.sh b/cmake/configure-iphone-simulator.sh
new file mode 100755
index 0000000..0b9d5c0
--- /dev/null
+++ b/cmake/configure-iphone-simulator.sh
@@ -0,0 +1,30 @@
+#! /bin/bash
+# Usage: accepts 2 arguments - in order - SDK version, root of the source
+# Anything after those first two commands are passed to CMake
+if [ $# -lt 2 ]
+then
+	echo "usage: $0 <SDK Version> <root of build> [additional CMake parameters]"
+	exit
+fi
+
+unset CPATH
+unset C_INCLUDE_PATH
+unset CPLUS_INCLUDE_PATH
+unset OBJC_INCLUDE_PATH
+unset LIBS
+unset DYLD_FALLBACK_LIBRARY_PATH
+unset DYLD_FALLBACK_FRAMEWORK_PATH
+
+export SDKVER="$1"
+shift
+export DEVROOT="/Developer/Platforms/iPhoneSimulator.platform/Developer"
+export SDKROOT="$DEVROOT/SDKs/iPhoneSimulator$SDKVER.sdk"
+export PKG_CONFIG_PATH="$SDKROOT/usr/lib/pkgconfig":"/opt/iphone-$SDKVER/lib/pkgconfig":"/usr/local/iphone-$SDKVER/lib/pkgconfig"
+export PKG_CONFIG_LIBDIR="$PKG_CONFIG_PATH"
+export MAINFOLDER=$1
+shift
+
+cmake \
+     -DCMAKE_TOOLCHAIN_FILE="$MAINFOLDER/cmake/toolchains/iphone-simulator-$SDKVER.toolchain" \
+     -DCMAKE_INSTALL_PREFIX="/opt/iphone-simultaor-$SDKVER" \
+	$MAINFOLDER $*
diff --git a/cmake/configure-iphone.sh b/cmake/configure-iphone.sh
new file mode 100755
index 0000000..3596e48
--- /dev/null
+++ b/cmake/configure-iphone.sh
@@ -0,0 +1,30 @@
+#! /bin/bash
+# Usage: accepts 2 arguments - in order - SDK version, root of the source
+# Anything after those first two commands are passed to CMake
+if [ $# -lt 2 ]
+then
+	echo "usage: $0 <SDK Version> <root of build> [additional CMake parameters]"
+	exit
+fi
+
+unset CPATH
+unset C_INCLUDE_PATH
+unset CPLUS_INCLUDE_PATH
+unset OBJC_INCLUDE_PATH
+unset LIBS
+unset DYLD_FALLBACK_LIBRARY_PATH
+unset DYLD_FALLBACK_FRAMEWORK_PATH
+
+export SDKVER="$1"
+shift
+export DEVROOT="/Developer/Platforms/iPhoneOS.platform/Developer"
+export SDKROOT="$DEVROOT/SDKs/iPhoneOS$SDKVER.sdk"
+export PKG_CONFIG_PATH="$SDROOT/usr/lib/pkgconfig":"/opt/iphone-$SDKVER/lib/pkgconfig":"/usr/local/iphone-$SDKVER/lib/pkgconfig"
+export PKG_CONFIG_LIBDIR="$PKG_CONFIG_PATH"
+export MAINFOLDER=$1
+shift
+
+cmake \
+     -DCMAKE_TOOLCHAIN_FILE="$MAINFOLDER/cmake/toolchains/iphone-$SDKVER.toolchain" \
+     -DCMAKE_INSTALL_PREFIX="/opt/iphone-$SDKVER" \
+	$MAINFOLDER $*
diff --git a/cmake/install.cmake b/cmake/install.cmake
new file mode 100644
index 0000000..fd79545
--- /dev/null
+++ b/cmake/install.cmake
@@ -0,0 +1,56 @@
+#####################################################################
+# First, install the library itself
+# 
+MESSAGE(STATUS "\n-- CONFIGURING INSTALLATION DESTINATIONS")
+# Configuration files, of course
+SET(prefix 		"${PREFIX}")
+SET(exec_prefix 	"${PREFIX}")
+SET(libdir              "${LIBDIR}")
+SET(includedir 		"${INCLUDEDIR}")
+
+# Install the library
+IF(BUILDING_SHARED)
+	INSTALL(TARGETS sword
+		DESTINATION "${LIBDIR}")
+ENDIF(BUILDING_SHARED)
+IF(BUILDING_STATIC)
+	INSTALL(TARGETS sword_static
+		DESTINATION "${LIBDIR}")
+ENDIF(BUILDING_STATIC)
+# Install the locales
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/locales.d
+	DESTINATION "${PREFIX}/share/sword")
+
+# Install the headers
+INSTALL(FILES ${SWORD_INSTALL_HEADERS}
+	DESTINATION "${INCLUDEDIR}/sword")
+
+IF(SWORD_INTERNAL_REGEX)
+	INSTALL(FILES ${INTERNAL_REGEX_HEADER}
+		DESTINATION "${INCLUDEDIR}/sword")
+ENDIF(SWORD_INTERNAL_REGEX)
+
+MESSAGE(STATUS "Destination: ${PREFIX}")
+
+SET(VERSION		${SWORD_VERSION})
+IF(WITH_CURL)
+	SET(CURL_LIBS	${CURL_LIBRARY})
+ENDIF(WITH_CURL)
+IF(WITH_CLUCENE)
+	SET(CLUCENE_LIBS	${CLUCENE_LIBRARY})
+ENDIF(WITH_CLUCENE)
+IF(WITH_ICU)
+	SET(ICU_LIBS	"${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}")
+ENDIF(WITH_ICU)
+
+IF(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+	SET(SHAREDLIB_TRUE "#")
+ELSE(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+	SET(SHAREDLIB_FALSE "#")
+ENDIF(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+# The @ONLY restricts it because our ${variable} which are left there as part of pkg-config
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sword.pc.in ${CMAKE_CURRENT_BINARY_DIR}/sword.pc @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/swversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/swversion.h @ONLY)
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sword.pc
+	DESTINATION "${LIBDIR}/pkgconfig")
diff --git a/cmake/muxsources.cmake b/cmake/muxsources.cmake
new file mode 100644
index 0000000..cf60af6
--- /dev/null
+++ b/cmake/muxsources.cmake
@@ -0,0 +1,84 @@
+################################################################################################
+#
+# This file will mess with the sources lists, as well as set variables, such as the WITH_* to be
+# used later in the configure process.
+#
+# Written by Greg Hellings
+SET(sword_SOURCES ${sword_base_SOURCES})
+# Check for if we've found ZLIB
+# This one is a bit more unique, since we still allow compilation without
+# a ZLIB at all, and allowing a user to disable it does not bring about use
+# of some internal fall-back but just leaves the ability to read ZLIB files
+# out of the library altogether
+MESSAGE(STATUS "\n-- CONFIGURING SOURCE LIST")
+IF(SWORD_NO_ZLIB STREQUAL "Yes")
+	MESSAGE(STATUS "ZLib: excluded by use option")
+	ADD_DEFINITIONS(-DEXCLUDEZLIB)
+	SET(WITH_ZLIB 0)
+ELSE(SWORD_NO_ZLIB STREQUAL "Yes")
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_used_SOURCES})
+	IF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes")
+		MESSAGE(STATUS "ZLib: internal")
+		SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_nofound_SOURCES})
+		SET(WITH_INTERNAL_ZLIB 1)
+	ELSE(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes")
+		MESSAGE(STATUS "ZLib: system ${ZLIB_LIBRARY}")
+		SET(WITH_ZLIB 1)
+	ENDIF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes")
+ENDIF(SWORD_NO_ZLIB STREQUAL "Yes")
+
+# Check for if we've found cURL
+IF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes")
+	MESSAGE(STATUS "cURL: system ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}")
+	ADD_DEFINITIONS(-DCURLAVAILABLE)
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_found_SOURCES})
+	SET(WITH_CURL 1)
+ELSE(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes")
+	MESSAGE(STATUS "cURL: no")
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_nofound_SOURCES})
+	SET(WITH_CURL 0)
+ENDIF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes")
+
+# And for CLucene
+IF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes")
+	MESSAGE(STATUS "CLucene: yes ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}")
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_found_SOURCES})
+	SET(WITH_CLUCENE 1)
+ELSE(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes")
+	MESSAGE(STATUS "CLucene: no")
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_nofound_SOURCES})
+	SET(WITH_CLUCENE 0)
+ENDIF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes")
+
+# Alert the user if PkgConfig is unavailalbe
+IF(NOT PKG_CONFIG_FOUND)
+	MESSAGE(STATUS "PkgConfig: no")
+	SET(WITH_PKG_CONFIG 1)
+ELSE(NOT PKG_CONFIG_FOUND)
+	MESSAGE(STATUS "PkgConfig: yes")
+	SET(WITH_PKG_CONFIG 0)
+ENDIF(NOT PKG_CONFIG_FOUND)
+
+# ICU needs some lovin' too
+IF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+	MESSAGE(STATUS "ICU: yes ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}")
+	ADD_DEFINITIONS(-D_ICU_)
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_icu_found_SOURCES})
+	SET(WITH_ICU 1)
+ELSE(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+	MESSAGE(STATUS "ICU: no")
+	SET(WITH_ICU 0)
+ENDIF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+
+# Internal or external regex.h
+IF(REGEX_FOUND)
+	MESSAGE(STATUS "Regex.h: system ${REGEX_INCLUDE_DIR}")
+	INCLUDE_DIRECTORIES(${REGEX_INCLUDE_DIR})
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_external_regex_SOURCES})
+	SET(WITH_REGEX 1)
+ELSE(REGEX_FOUND)
+	MESSAGE(STATUS "Regex.h: internal")
+	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include/internal/regex)
+	SET(sword_SOURCES ${sword_SOURCES} ${sword_internal_regex_SOURCES})
+	SET(WITH_REGEX 0)
+ENDIF(REGEX_FOUND)
diff --git a/cmake/options.cmake b/cmake/options.cmake
new file mode 100644
index 0000000..3e07128
--- /dev/null
+++ b/cmake/options.cmake
@@ -0,0 +1,52 @@
+# A list of the options that the library supports
+SET(SWORD_PYTHON_INSTALL_DIR "" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.")
+
+# Installation options
+IF(APPLE)
+	SET(SWORD_INSTALL_DIR "/opt/local")
+ELSEIF(MSVC)
+	SET(SWORD_INSTALL_DIR "C:\\Program Files (x86)\\libsword\\")
+ELSE(APPLE)
+	SET(SWORD_INSTALL_DIR "/usr/local")
+ENDIF(APPLE)
+
+IF(CMAKE_INSTALL_PREFIX)
+	SET(PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}.")
+ELSE(CMAKE_INSTALL_PREFIX)
+	SET(PREFIX "${SWORD_INSTALL_DIR}" CACHE STRING "Directory into which to install architecture-dependent files. Defaults to ${SWORD_INSTALL_DIR}")
+ENDIF(CMAKE_INSTALL_PREFIX)
+
+SET(LIBDIR "${PREFIX}/lib" CACHE STRING "Object code library install directory. Defaults to ${SWORD_INSTALL_DIR}/lib")
+
+SET(INCLUDEDIR "${PREFIX}/include" CACHE STRING "C Header files install directory. Defaults to ${SWORD_INSTALL_DIR}/include.")
+
+SET(BINDIR "${PREFIX}/bin" CACHE STRING "Directory to install binary executable files. Defaults to ${SWORD_INSTALL_DIR}/bin.")
+
+# Post-processing of variables
+MACRO(PROCESS_VERSION LEVEL VALUE)
+    SET(SWORD_VERSION_${LEVEL} ${VALUE})
+    IF(${VALUE} LESS 10)
+        SET(${LEVEL} "00${VALUE}")
+    ELSEIF(${VALUE} LESS 100)
+        SET(${LEVEL} "0${VALUE}")
+    ELSE()
+        SET(${LEVEL} "${VALUE}")
+    ENDIF()
+ENDMACRO()
+
+STRING(REGEX MATCHALL "^([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.?([0-9]+)?$"
+    SWORD_VERSION_PARTS "${SWORD_VERSION}")
+# We don't always have a nano version
+IF("${CMAKE_MATCH_4}" STREQUAL "")
+    SET(CMAKE_MATCH_4 "0")
+ENDIF("${CMAKE_MATCH_4}" STREQUAL "")
+
+SET(SWORD_VERSION_MAJOR ${CMAKE_MATCH_1}) # No post-processing on this, so it's not octal
+PROCESS_VERSION("MINOR" ${CMAKE_MATCH_2})
+PROCESS_VERSION("MICRO" ${CMAKE_MATCH_3})
+PROCESS_VERSION("NANO"  ${CMAKE_MATCH_4})
+
+SET(SWORD_VERSION_STR "${SWORD_VERSION}")
+SET(SWORD_VERSION_NUM "${SWORD_VERSION_MAJOR}${MINOR}${MICRO}${NANO}")
+
+MESSAGE(STATUS "SWORD Version ${SWORD_VERSION_NUM}")
diff --git a/cmake/sources.cmake b/cmake/sources.cmake
new file mode 100644
index 0000000..d6b8959
--- /dev/null
+++ b/cmake/sources.cmake
@@ -0,0 +1,420 @@
+# This file started on 18 January 2010 by Gregory Hellings
+# It is ceded to The SWORD Library developers and CrossWire under the terms
+# of their own GPLv2 license and all copyright is transferred to them for
+# all posterity and eternity, wherever such transfer is possible.  Where it is
+# not, then this file is released under the GPLv2 by myself.
+#
+#
+SET(sword_base_frontend_SOURCES
+	src/frontend/swdisp.cpp
+	src/frontend/swlog.cpp
+)
+SOURCE_GROUP("src\\frontend" FILES ${sword_base_frontend_SOURCES})
+
+SET(sword_base_keys_SOURCES
+	src/keys/swkey.cpp
+	src/keys/listkey.cpp
+	src/keys/strkey.cpp
+	src/keys/treekey.cpp
+	src/keys/treekeyidx.cpp
+	src/keys/versekey.cpp
+	src/keys/versetreekey.cpp
+)
+SOURCE_GROUP("src\\keys" FILES ${sword_base_keys_SOURCES})
+
+SET(sword_base_mgr_SOURCES
+	src/mgr/swconfig.cpp
+	src/mgr/swmgr.cpp
+	src/mgr/swfiltermgr.cpp
+	src/mgr/encfiltmgr.cpp
+	src/mgr/markupfiltmgr.cpp
+	src/mgr/filemgr.cpp
+	src/mgr/versificationmgr.cpp
+	src/mgr/remotetrans.cpp
+	src/mgr/swlocale.cpp
+	src/mgr/localemgr.cpp
+	src/mgr/swcacher.cpp
+	src/mgr/swsearchable.cpp
+	src/mgr/installmgr.cpp
+	src/mgr/stringmgr.cpp
+)
+SOURCE_GROUP("src\\mgr" FILES ${sword_base_mgr_SOURCES})
+
+SET(sword_base_module_SOURCES
+	src/modules/swmodule.cpp
+	src/modules/comments/swcom.cpp
+	src/modules/comments/hrefcom/hrefcom.cpp
+	src/modules/comments/rawcom/rawcom.cpp
+	src/modules/comments/rawcom4/rawcom4.cpp
+	src/modules/comments/rawfiles/rawfiles.cpp
+	src/modules/comments/zcom/zcom.cpp
+	src/modules/common/rawstr.cpp
+	src/modules/common/rawstr4.cpp
+	src/modules/common/swcomprs.cpp
+	src/modules/common/lzsscomprs.cpp
+	src/modules/common/rawverse.cpp
+	src/modules/common/rawverse4.cpp
+	src/modules/common/swcipher.cpp
+	src/modules/common/zverse.cpp
+	src/modules/common/zstr.cpp
+	src/modules/common/entriesblk.cpp
+	src/modules/common/sapphire.cpp
+	src/modules/filters/swbasicfilter.cpp
+	src/modules/filters/swoptfilter.cpp
+
+	src/modules/filters/gbfhtml.cpp
+	src/modules/filters/gbfxhtml.cpp
+	src/modules/filters/gbfhtmlhref.cpp
+	src/modules/filters/gbfwebif.cpp
+	src/modules/filters/gbfplain.cpp
+	src/modules/filters/gbfrtf.cpp
+	src/modules/filters/gbfstrongs.cpp
+	src/modules/filters/gbffootnotes.cpp
+	src/modules/filters/gbfheadings.cpp
+	src/modules/filters/gbfredletterwords.cpp
+	src/modules/filters/gbfmorph.cpp
+	src/modules/filters/gbfwordjs.cpp
+
+	src/modules/filters/thmlstrongs.cpp
+	src/modules/filters/thmlfootnotes.cpp
+	src/modules/filters/thmlheadings.cpp
+	src/modules/filters/thmlmorph.cpp
+	src/modules/filters/thmllemma.cpp
+	src/modules/filters/thmlscripref.cpp
+	src/modules/filters/thmlvariants.cpp
+	src/modules/filters/thmlgbf.cpp
+	src/modules/filters/thmlrtf.cpp
+	src/modules/filters/thmlhtml.cpp
+	src/modules/filters/thmlxhtml.cpp
+	src/modules/filters/thmlhtmlhref.cpp
+	src/modules/filters/thmlwebif.cpp
+	src/modules/filters/thmlwordjs.cpp
+
+	src/modules/filters/teiplain.cpp
+	src/modules/filters/teirtf.cpp
+	src/modules/filters/teixhtml.cpp
+	src/modules/filters/teihtmlhref.cpp
+
+	src/modules/filters/gbfthml.cpp
+	src/modules/filters/gbfosis.cpp
+	src/modules/filters/thmlosis.cpp
+	src/modules/filters/thmlplain.cpp
+	src/modules/filters/osisosis.cpp
+
+	src/modules/filters/osisenum.cpp 
+	src/modules/filters/osisglosses.cpp 
+	src/modules/filters/osisxlit.cpp 
+	src/modules/filters/osisheadings.cpp
+	src/modules/filters/osisfootnotes.cpp 
+	src/modules/filters/osishtmlhref.cpp
+	src/modules/filters/osisxhtml.cpp
+	src/modules/filters/osiswebif.cpp
+	src/modules/filters/osismorph.cpp
+	src/modules/filters/osisstrongs.cpp
+	src/modules/filters/osisplain.cpp
+	src/modules/filters/osisrtf.cpp
+	src/modules/filters/osislemma.cpp
+	src/modules/filters/osisredletterwords.cpp
+	src/modules/filters/osisscripref.cpp
+	src/modules/filters/osisvariants.cpp
+	src/modules/filters/osiswordjs.cpp
+	src/modules/filters/osismorphsegmentation.cpp
+	src/modules/filters/osisreferencelinks.cpp
+
+	src/modules/filters/latin1utf8.cpp
+	src/modules/filters/latin1utf16.cpp
+	src/modules/filters/utf8utf16.cpp
+	src/modules/filters/utf16utf8.cpp
+	src/modules/filters/utf8html.cpp
+	src/modules/filters/utf8latin1.cpp
+	src/modules/filters/unicodertf.cpp
+	src/modules/filters/scsuutf8.cpp
+
+	src/modules/filters/utf8cantillation.cpp
+	src/modules/filters/utf8hebrewpoints.cpp
+	src/modules/filters/utf8arabicpoints.cpp
+	src/modules/filters/utf8greekaccents.cpp
+
+	src/modules/filters/cipherfil.cpp
+
+	src/modules/filters/rtfhtml.cpp
+	src/modules/filters/greeklexattribs.cpp
+	src/modules/filters/papyriplain.cpp
+
+	src/modules/genbook/swgenbook.cpp
+	src/modules/genbook/rawgenbook/rawgenbook.cpp
+	
+	src/modules/lexdict/swld.cpp
+	src/modules/lexdict/rawld/rawld.cpp
+	src/modules/lexdict/rawld4/rawld4.cpp
+	src/modules/lexdict/zld/zld.cpp
+	
+	src/modules/texts/swtext.cpp
+	src/modules/texts/rawtext/rawtext.cpp
+	src/modules/texts/rawtext4/rawtext4.cpp
+	src/modules/texts/ztext/ztext.cpp
+)
+SOURCE_GROUP("src\\modules" FILES ${sword_base_module_SOURCES})
+
+SET(sword_base_utilfns_SOURCES
+	src/utilfuns/swobject.cpp
+	src/utilfuns/utilstr.cpp
+	src/utilfuns/utilxml.cpp
+	src/utilfuns/swversion.cpp
+	src/utilfuns/swbuf.cpp
+	src/utilfuns/ftpparse.c
+	src/utilfuns/url.cpp
+	src/utilfuns/roman.cpp
+)
+SOURCE_GROUP("src\\utilfns" FILES ${sword_base_utilfns_SOURCES})
+
+SET(sword_base_binding_SOURCES
+	bindings/flatapi.cpp
+)
+
+# Universal sources
+SET(sword_base_SOURCES
+	${sword_base_frontend_SOURCES}
+	${sword_base_keys_SOURCES}
+	${sword_base_mgr_SOURCES}
+	${sword_base_module_SOURCES}
+	${sword_base_utilfns_SOURCES}
+	${sword_base_binding_SOURCES}
+)
+
+# Sources relying on ZLib
+SET(sword_zlib_used_SOURCES
+	src/modules/common/zipcomprs.cpp
+	src/modules/common/bz2comprs.cpp
+	src/modules/common/xzcomprs.cpp
+	src/utilfuns/zlib/untgz.c
+)
+SET(sword_zlib_nofound_SOURCES
+	src/utilfuns/zlib/adler32.c
+	src/utilfuns/zlib/compress.c
+	src/utilfuns/zlib/crc32.c
+	src/utilfuns/zlib/deflate.c
+	src/utilfuns/zlib/gzclose.c
+	src/utilfuns/zlib/gzlib.c
+	src/utilfuns/zlib/gzread.c
+	src/utilfuns/zlib/gzwrite.c
+	src/utilfuns/zlib/infback.c
+	src/utilfuns/zlib/inftrees.c
+	src/utilfuns/zlib/inflate.c
+	src/utilfuns/zlib/inffast.c
+	src/utilfuns/zlib/trees.c
+	src/utilfuns/zlib/uncompr.c
+	src/utilfuns/zlib/zutil.c
+)
+
+# Sources relying on cURL
+SET(sword_curl_found_SOURCES
+	src/mgr/curlftpt.cpp
+	src/mgr/curlhttpt.cpp
+)
+SET(sword_curl_nofound_SOURCES
+	src/mgr/ftplibftpt.cpp
+	src/utilfuns/ftplib.c
+)
+
+# Sources relying on CLucene
+SET(sword_clucene_found_SOURCES)
+SET(sword_clucene_nofound_SOURCES)
+
+# Sources based on the regex stuff
+SET(sword_internal_regex_SOURCES
+	src/utilfuns/regex.c
+)
+SET(sword_external_regex_SOURCES)
+
+# Sources based on the ICU status
+SET(sword_icu_found_SOURCES
+	src/modules/filters/utf8transliterator.cpp
+	src/modules/filters/utf8nfc.cpp
+	src/modules/filters/utf8nfkd.cpp
+	src/modules/filters/utf8arshaping.cpp
+	src/modules/filters/utf8bidireorder.cpp
+)
+
+# Headers
+SET(SWORD_INSTALL_HEADERS
+	include/canon.h
+	include/canon_abbrevs.h
+	include/cipherfil.h
+	include/curlftpt.h
+	include/curlhttpt.h
+	include/defs.h
+	include/echomod.h
+	include/encfiltmgr.h
+	include/entriesblk.h
+	include/femain.h
+	include/filemgr.h
+	include/versificationmgr.h
+	include/flatapi.h
+	include/ftpparse.h
+	include/remotetrans.h
+	include/ftplibftpt.h
+	include/ftplib.h
+
+	include/gbffootnotes.h
+	include/gbfheadings.h
+	include/gbfhtml.h
+	include/gbfxhtml.h
+	include/gbfhtmlhref.h
+	include/gbfwebif.h
+	include/gbfmorph.h
+	include/gbfosis.h
+	include/gbfplain.h
+	include/gbfredletterwords.h
+	include/gbfrtf.h
+	include/gbfstrongs.h
+	include/gbfwordjs.h
+	include/gbfthml.h
+	include/greeklexattribs.h
+
+	include/hebrewmcim.h
+	include/hrefcom.h
+	include/installmgr.h
+	include/latin1utf16.h
+	include/latin1utf8.h
+	include/listkey.h
+	include/localemgr.h
+	include/lzsscomprs.h
+	include/markupfiltmgr.h
+	include/multimapwdef.h
+	include/nullim.h
+
+	include/osisenum.h
+	include/osisglosses.h
+	include/osisxlit.h
+	include/osisheadings.h
+	include/osishtmlhref.h
+	include/osisxhtml.h
+	include/osiswebif.h
+	include/osismorph.h
+	include/osismorphsegmentation.h
+	include/osisplain.h
+	include/osisrtf.h
+	include/osisosis.h
+	include/osisstrongs.h
+	include/osisfootnotes.h   
+	include/osislemma.h   
+	include/osisredletterwords.h   
+	include/osisscripref.h   
+	include/osiswordjs.h   
+	include/osisvariants.h   
+	include/osisreferencelinks.h   
+
+	include/papyriplain.h
+	include/rawcom.h
+	include/rawfiles.h
+	include/rawgenbook.h
+	include/rawld.h
+	include/rawld4.h
+	include/rawstr.h
+	include/rawstr4.h
+	include/rawtext.h
+	include/rawverse.h
+
+	include/roman.h
+	include/rtfhtml.h
+	include/sapphire.h
+	include/scsuutf8.h
+	include/strkey.h
+	include/swbasicfilter.h
+	include/swbuf.h
+	include/swcacher.h
+	include/swcipher.h
+	include/swcom.h
+	include/swcomprs.h
+	include/swconfig.h
+	include/swdisp.h
+	include/swfilter.h
+	include/swfiltermgr.h
+	include/swgenbook.h
+	include/swinputmeth.h
+	include/swkey.h
+	include/swld.h
+	include/swlocale.h
+	include/swlog.h
+	include/swmacs.h
+	include/swmgr.h
+	include/stringmgr.h
+	include/swmodule.h
+	include/swoptfilter.h
+	include/swobject.h
+	include/swsearchable.h
+	include/swtext.h
+    "${CMAKE_CURRENT_BINARY_DIR}/include/swversion.h"
+	include/sysdata.h
+
+	include/thmlfootnotes.h
+	include/thmlgbf.h
+	include/thmlheadings.h
+	include/thmlhtml.h
+	include/thmlxhtml.h
+	include/thmlhtmlhref.h
+	include/thmlwebif.h
+	include/thmllemma.h
+	include/thmlmorph.h
+	include/thmlosis.h
+	include/thmlplain.h
+	include/thmlrtf.h
+	include/thmlscripref.h
+	include/thmlstrongs.h
+	include/thmlvariants.h
+	include/thmlwordjs.h
+
+	include/teiplain.h
+	include/teirtf.h
+	include/teixhtml.h
+	include/teihtmlhref.h
+
+	include/treekey.h
+	include/treekeyidx.h
+	include/unicodertf.h
+	include/url.h
+	include/untgz.h
+	include/utf16utf8.h
+	include/utf8arshaping.h
+	include/utf8bidireorder.h
+	include/utf8cantillation.h
+	include/utf8greekaccents.h
+	include/utf8hebrewpoints.h
+	include/utf8arabicpoints.h
+	include/utf8html.h
+	include/utf8latin1.h
+	include/utf8nfc.h
+	include/utf8nfkd.h
+	include/utf8transliterator.h
+	include/utf8utf16.h
+	include/utilstr.h
+	include/utilxml.h
+
+	include/versekey.h
+	include/versetreekey.h
+	include/zcom.h
+	include/zipcomprs.h
+	include/zld.h
+	include/zstr.h
+	include/ztext.h
+	include/zverse.h
+
+	include/canon_kjva.h
+	include/canon_leningrad.h
+	include/canon_mt.h
+	include/canon_nrsv.h
+	include/canon_nrsva.h
+	include/canon_synodal.h
+	include/canon_vulg.h
+	include/canon_german.h
+	include/canon_luther.h
+	include/canon_null.h
+	include/canon_lxx.h
+	include/canon_orthodox.h
+	include/canon_synodalprot.h
+)
+
+SET(INTERNAL_REGEX_HEADER
+	include/internal/regex/regex.h
+)
diff --git a/cmake/toolchains/Toolchain-mingw32.cmake b/cmake/toolchains/Toolchain-mingw32.cmake
new file mode 100644
index 0000000..0f7ed9e
--- /dev/null
+++ b/cmake/toolchains/Toolchain-mingw32.cmake
@@ -0,0 +1,36 @@
+SET(MINGW32_ROOT "/usr/i686-pc-mingw32/sys-root/mingw")
+
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER /usr/bin/i686-pc-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER /usr/bin/i686-pc-mingw32-g++)
+
+# where is the target environment
+SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/i686-pc-mingw32)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# FindQt4.cmake queries qmake to get information,
+# which doesn't work when crosscompiling
+SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include)
+SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib)
+
+# set the resource compiler (RHBZ #652435)
+SET(CMAKE_RC_COMPILER /usr/bin/i686-pc-mingw32-windres)
+
+# override boost library suffix which defaults to -mgw
+SET(Boost_COMPILER -gcc45)
+
+# Since ICU is all strange and smart and stuff, let's do this
+SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/")
+SET(ICU_CONFIG_OPTS "--noverify")
+
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0")
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include")
+
+SET(CROSS_COMPILE_MINGW32 TRUE)
diff --git a/cmake/toolchains/Toolchain-mingw64-x64.cmake b/cmake/toolchains/Toolchain-mingw64-x64.cmake
new file mode 100644
index 0000000..53a1bee
--- /dev/null
+++ b/cmake/toolchains/Toolchain-mingw64-x64.cmake
@@ -0,0 +1,37 @@
+SET(MINGW32_ROOT "/usr/x86_64-w64-mingw32/sys-root/mingw")
+
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER /usr/bin/x86_64-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER /usr/bin/x86_64-w64-mingw32-g++)
+
+# where is the target environment
+SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/x86_64-w64-mingw32)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# FindQt4.cmake queries qmake to get information,
+# which doesn't work when crosscompiling
+SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include)
+SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib)
+
+# set the resource compiler (RHBZ #652435)
+SET(CMAKE_RC_COMPILER /usr/bin/x86_64-w64-mingw32-windres)
+
+# override boost library suffix which defaults to -mgw
+SET(Boost_COMPILER -gcc45)
+
+# Since ICU is all strange and smart and stuff, let's do this
+SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/")
+SET(ICU_CONFIG_OPTS "--noverify")
+
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0")
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include")
+
+SET(CROSS_COMPILE_MINGW32 TRUE)
+
diff --git a/cmake/toolchains/Toolchain-mingw64-x86.cmake b/cmake/toolchains/Toolchain-mingw64-x86.cmake
new file mode 100644
index 0000000..6c2ddbe
--- /dev/null
+++ b/cmake/toolchains/Toolchain-mingw64-x86.cmake
@@ -0,0 +1,36 @@
+SET(MINGW32_ROOT "/usr/i686-w64-mingw32/sys-root/mingw")
+
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER /usr/bin/i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER /usr/bin/i686-w64-mingw32-g++)
+
+# where is the target environment
+SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/i686-w64-mingw32)
+
+# search for programs in the build host directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+# for libraries and headers in the target directories
+SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+# FindQt4.cmake queries qmake to get information,
+# which doesn't work when crosscompiling
+SET(QT_HEADERS_DIR ${CMAKE_FIND_ROOT_PATH}/include)
+SET(QT_LIBRARY_DIR ${CMAKE_FIND_ROOT_PATH}/lib)
+
+# set the resource compiler (RHBZ #652435)
+SET(CMAKE_RC_COMPILER /usr/bin/i686-w64-mingw32-windres)
+
+# override boost library suffix which defaults to -mgw
+SET(Boost_COMPILER -gcc45)
+
+# Since ICU is all strange and smart and stuff, let's do this
+SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/")
+SET(ICU_CONFIG_OPTS "--noverify")
+
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0")
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include")
+
+SET(CROSS_COMPILE_MINGW32 TRUE)
diff --git a/cmake/toolchains/iphone-2.2.1.toolchain-broken b/cmake/toolchains/iphone-2.2.1.toolchain-broken
new file mode 100644
index 0000000..215c637
--- /dev/null
+++ b/cmake/toolchains/iphone-2.2.1.toolchain-broken
@@ -0,0 +1,51 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR arm)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "2.2.1")
+SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "armv6" "armv7")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99" "-x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch armv6")
+ADD_DEFINITIONS("-arch armv7")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-${SDKVER}/include")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-${SDKVER}/" "/usr/local/iphone-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneOS 1)
+SET (iPhoneOS_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-3.0.toolchain b/cmake/toolchains/iphone-3.0.toolchain
new file mode 100644
index 0000000..5026b4e
--- /dev/null
+++ b/cmake/toolchains/iphone-3.0.toolchain
@@ -0,0 +1,51 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR arm)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.0")
+SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "armv6" "armv7")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99" "-x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch armv6")
+ADD_DEFINITIONS("-arch armv7")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-${SDKVER}/include")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-${SDKVER}/" "/usr/local/iphone-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneOS 1)
+SET (iPhoneOS_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-3.1.2.toolchain b/cmake/toolchains/iphone-3.1.2.toolchain
new file mode 100644
index 0000000..8102cd6
--- /dev/null
+++ b/cmake/toolchains/iphone-3.1.2.toolchain
@@ -0,0 +1,51 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR arm)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.1.2")
+SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "armv6" "armv7")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99" "-x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch armv6")
+ADD_DEFINITIONS("-arch armv7")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-${SDKVER}/include")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-${SDKVER}/" "/usr/local/iphone-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneOS 1)
+SET (iPhoneOS_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-3.1.3.toolchain b/cmake/toolchains/iphone-3.1.3.toolchain
new file mode 100644
index 0000000..c23b3fc
--- /dev/null
+++ b/cmake/toolchains/iphone-3.1.3.toolchain
@@ -0,0 +1,51 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR arm)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.1.3")
+SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "armv6" "armv7")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99" "-x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch armv6")
+ADD_DEFINITIONS("-arch armv7")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-${SDKVER}/include")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-${SDKVER}/" "/usr/local/iphone-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneOS 1)
+SET (iPhoneOS_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-3.1.toolchain b/cmake/toolchains/iphone-3.1.toolchain
new file mode 100644
index 0000000..bd15810
--- /dev/null
+++ b/cmake/toolchains/iphone-3.1.toolchain
@@ -0,0 +1,51 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR arm)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.1")
+SET (DEVROOT "/Developer/Platforms/iPhoneOS.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "armv6" "armv7")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99" "-x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch armv6")
+ADD_DEFINITIONS("-arch armv7")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-${SDKVER}/include")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-${SDKVER}/" "/usr/local/iphone-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneOS 1)
+SET (iPhoneOS_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-simulator-2.2.1.toolchain-broken b/cmake/toolchains/iphone-simulator-2.2.1.toolchain-broken
new file mode 100644
index 0000000..d6b7fa7
--- /dev/null
+++ b/cmake/toolchains/iphone-simulator-2.2.1.toolchain-broken
@@ -0,0 +1,51 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR i686)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "2.2.1")
+SET (DEVROOT "/Developer/Platforms/iPhoneSimulator.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneSimulator${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "i386" "x86_64")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99 -x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch i386")
+ADD_DEFINITIONS("-arch x86_64")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/include")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-simulator-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-simulator-${SDKVER}/" "/usr/local/iphone-simulator-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneSimulator 1)
+SET (iPhoneSimulator_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-simulator-3.0.toolchain b/cmake/toolchains/iphone-simulator-3.0.toolchain
new file mode 100644
index 0000000..e4acec5
--- /dev/null
+++ b/cmake/toolchains/iphone-simulator-3.0.toolchain
@@ -0,0 +1,52 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR i686)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.0")
+SET (DEVROOT "/Developer/Platforms/iPhoneSimulator.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneSimulator${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "i386" "x86_64")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99 -x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch i386")
+ADD_DEFINITIONS("-arch x86_64")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include/c++/4.2.1/i686-apple-darwin9")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-simulator-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-simulator-${SDKVER}/" "/usr/local/iphone-simulator-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneSimulator 1)
+SET (iPhoneSimulator_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-simulator-3.1.2.toolchain b/cmake/toolchains/iphone-simulator-3.1.2.toolchain
new file mode 100644
index 0000000..8cf1b4a
--- /dev/null
+++ b/cmake/toolchains/iphone-simulator-3.1.2.toolchain
@@ -0,0 +1,52 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR i686)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.1.2")
+SET (DEVROOT "/Developer/Platforms/iPhoneSimulator.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneSimulator${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "i386" "x86_64")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99 -x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch i386")
+ADD_DEFINITIONS("-arch x86_64")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include/c++/4.2.1/i686-apple-darwin9")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-simulator-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-simulator-${SDKVER}/" "/usr/local/iphone-simulator-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneSimulator 1)
+SET (iPhoneSimulator_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-simulator-3.1.3.toolchain b/cmake/toolchains/iphone-simulator-3.1.3.toolchain
new file mode 100644
index 0000000..6d7025c
--- /dev/null
+++ b/cmake/toolchains/iphone-simulator-3.1.3.toolchain
@@ -0,0 +1,52 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR i686)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.1.3")
+SET (DEVROOT "/Developer/Platforms/iPhoneSimulator.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneSimulator${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "i386" "x86_64")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99 -x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch i386")
+ADD_DEFINITIONS("-arch x86_64")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include/c++/4.2.1/i686-apple-darwin9")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-simulator-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-simulator-${SDKVER}/" "/usr/local/iphone-simulator-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneSimulator 1)
+SET (iPhoneSimulator_VERSION ${SDKVER})
diff --git a/cmake/toolchains/iphone-simulator-3.1.toolchain b/cmake/toolchains/iphone-simulator-3.1.toolchain
new file mode 100644
index 0000000..98dbbad
--- /dev/null
+++ b/cmake/toolchains/iphone-simulator-3.1.toolchain
@@ -0,0 +1,52 @@
+# Michael Aaron Safyan (michaelsafyan@gmail.com). Copyright (C) 2009-2010. Simplified BSD License.
+SET (CMAKE_SYSTEM_NAME Generic)
+SET (CMAKE_SYSTEM_VERSION 1)
+SET (CMAKE_SYSTEM_PROCESSOR i686)
+SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+SET (SDKVER "3.1")
+SET (DEVROOT "/Developer/Platforms/iPhoneSimulator.platform/Developer")
+SET (SDKROOT "${DEVROOT}/SDKs/iPhoneSimulator${SDKVER}.sdk")
+SET (CMAKE_OSX_SYSROOT "${SDKROOT}")
+SET (CMAKE_OSX_ARCHITECTURES "i386" "x86_64")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_COMPILER "${DEVROOT}/usr/bin/gcc-4.2")
+SET (CMAKE_CXX_COMPILER "${DEVROOT}/usr/bin/g++-4.2")
+
+SET (CMAKE_C_FLAGS "-std=c99 -x objective-c")
+SET (CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+SET (CMAKE_CXX_FLAGS "-x objective-c++")
+SET (CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} "-DDEBUG=1" "-ggdb")
+SET (CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} "-DNDEBUG=1")
+SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS} "-DNDEBUG=1" "-ggdb")
+
+ADD_DEFINITIONS("-arch i386")
+ADD_DEFINITIONS("-arch x86_64")
+ADD_DEFINITIONS("-pipe")
+ADD_DEFINITIONS("-no-cpp-precomp")
+ADD_DEFINITIONS("--sysroot=${SDKROOT}")
+ADD_DEFINITIONS("-miphoneos-version-min=${SDKVER}")
+
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/opt/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/include")
+INCLUDE_DIRECTORIES(SYSTEM "${SDKROOT}/usr/include/c++/4.2.1/i686-apple-darwin9")
+
+LINK_DIRECTORIES("${SDKROOT}/usr/lib")
+LINK_DIRECTORIES("${SDKROOT}/opt/iphone-simulator-${SDKVER}/lib")
+LINK_DIRECTORIES("${SDKROOT}/usr/local/iphone-simulator-${SDKVER}/lib")
+
+SET (CMAKE_FIND_ROOT_PATH "${SDKROOT}" "/opt/iphone-simulator-${SDKVER}/" "/usr/local/iphone-simulator-${SDKVER}/")
+SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+SET (iPhone 1)
+SET (iPhoneSimulator 1)
+SET (iPhoneSimulator_VERSION ${SDKVER})
diff --git a/config.guess b/config.guess
new file mode 100755
index 0000000..b79252d
--- /dev/null
+++ b/config.guess
@@ -0,0 +1,1558 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-06-10'
+
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# 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 General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+	"4"
+#else
+	""
+#endif
+	); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+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`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/config.h.in b/config.h.in
new file mode 100644
index 0000000..4847ab0
--- /dev/null
+++ b/config.h.in
@@ -0,0 +1,62 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
diff --git a/config.sub b/config.sub
new file mode 100755
index 0000000..c765b34
--- /dev/null
+++ b/config.sub
@@ -0,0 +1,1788 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
+
+timestamp='2013-04-24'
+
+# This file 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 3 of the License, or
+# (at your option) any later version.
+#
+# 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 General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2013 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
+	| fido | fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 \
+	| or1k | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or1k-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/configure b/configure
new file mode 100755
index 0000000..4f8ab3e
--- /dev/null
+++ b/configure
@@ -0,0 +1,19801 @@
+#! /bin/sh
+# From configure.ac Revision: 1.45 .
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for sword 1.7.2.
+#
+# Report bugs to <sword-bugs@crosswire.org>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+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
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: sword-bugs@crosswire.org about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; 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
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# 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
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # 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 sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='sword'
+PACKAGE_TARNAME='sword'
+PACKAGE_VERSION='1.7.2'
+PACKAGE_STRING='sword 1.7.2'
+PACKAGE_BUGREPORT='sword-bugs@crosswire.org'
+PACKAGE_URL='http://crosswire.org/sword'
+
+ac_unique_file="sword.bmp"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+LIBOBJS
+BUILDEXAMPLES_FALSE
+BUILDEXAMPLES_TRUE
+BUILDUTILS_FALSE
+BUILDUTILS_TRUE
+BUILDTESTS_FALSE
+BUILDTESTS_TRUE
+USE_PKGCONF_FALSE
+USE_PKGCONF_TRUE
+CONFDEF_FALSE
+CONFDEF_TRUE
+USE_INTERNAL_REGEX_FALSE
+USE_INTERNAL_REGEX_TRUE
+INTERNALFTPLIB_FALSE
+INTERNALFTPLIB_TRUE
+WITHCURLSFTP_FALSE
+WITHCURLSFTP_TRUE
+WITHCURL_FALSE
+WITHCURL_TRUE
+USECXX11REGEX_FALSE
+USECXX11REGEX_TRUE
+INSTCONF_FALSE
+INSTCONF_TRUE
+SHAREDLIB_FALSE
+SHAREDLIB_TRUE
+USELUCENE_FALSE
+USELUCENE_TRUE
+HAVE_VSNPRINTF_FALSE
+HAVE_VSNPRINTF_TRUE
+HAVE_ICUSWORD_FALSE
+HAVE_ICUSWORD_TRUE
+HAVE_ICU_FALSE
+HAVE_ICU_TRUE
+HAVE_LIBZ_FALSE
+HAVE_LIBZ_TRUE
+ICU_IOLIBS
+ICU_LIBS
+CURL_LIBS
+target_mingw32
+target_system
+AM_CFLAGS
+AM_CXXFLAGS
+enable_profile
+enable_debug
+ICU_VER
+dir_confdef
+with_conf
+with_icusword
+with_icu
+with_zlib
+SWORD_VERSION_NANO
+SWORD_VERSION_MICRO
+SWORD_VERSION_MINOR
+SWORD_VERSION_MAJOR
+SWORD_VERSION_STR
+SWORD_VERSION_NUM
+CURL_CONFIG
+ICU_CONFIG
+HAVE_CPPUNIT_FALSE
+HAVE_CPPUNIT_TRUE
+CPPUNIT_LIBS
+CPPUNIT_CFLAGS
+CPPUNIT_CONFIG
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+CLUCENE_CXXFLAGS
+CLUCENE_LIBS
+CLUCENE2_LIBS
+CLUCENE2_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+CXXCPP
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+RANLIB
+ac_ct_AR
+AR
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+ac_ct_CXX
+CXXFLAGS
+CXX
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_os
+target_vendor
+target_cpu
+target
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_dependency_tracking
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
+with_clucene
+with_zlib
+with_icu
+with_icusword
+with_conf
+with_cxx11regex
+with_curl
+with_curl_sftp
+with_internalregex
+enable_debug
+enable_warnings
+enable_profile
+enable_profilefn
+enable_tests
+enable_utilities
+enable_examples
+enable_maintainer_mode
+with_cppunit_prefix
+with_cppunit_exec_prefix
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+CPP
+CXXCPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+CLUCENE2_CFLAGS
+CLUCENE2_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+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.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    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 ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$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 ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    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 ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    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-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-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    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 ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    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-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 ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_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
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  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
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# 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 the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    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=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# 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 sword 1.7.2 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 \`..']
+
+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]
+  --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]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/sword]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_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
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+  --target=TARGET   configure for building compilers for TARGET [HOST]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of sword 1.7.2:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-static[=PKGS]  build static libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-debug          build debug library (default=no)
+  --enable-warnings       build with compiler warnings as errors (default=no)
+  --enable-profile        allow profiling (default=no)
+  --enable-profilefn      allow functioncheck profiling (default=no)
+  --enable-tests          build test programs (default=yes)
+  --enable-utilities      build utilities (default=yes)
+  --enable-examples       build examples (default=no)
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
+   --with-clucene=<path>  prefix of CLucene-Core installation. e.g. /usr/local
+                          or /usr
+  --with-zlib             allow zlib compressed modules (default=yes)
+  --with-icu              use ICU for unicode (default=yes)
+  --with-icusword         use custom SWORD ICU (default=no)
+  --with-conf             install a new sword.conf (default=yes)
+  --with-cxx11regex       build regex support using c++11 regex (default=no)
+  --with-curl             build install manager support using libcurl
+                          (default=yes)
+  --with-curl_sftp        build install manager support using libcurl+sftp
+                          (requires --with-curl, default=yes)
+  --with-internalregex    Compile using SWORDs internal copy of regex
+  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)
+  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)
+
+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>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) 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
+  CXXCPP      C++ preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  CLUCENE2_CFLAGS
+              C compiler flags for CLUCENE2, overriding pkg-config
+  CLUCENE2_LIBS
+              linker flags for CLUCENE2, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <sword-bugs@crosswire.org>.
+sword home page: <http://crosswire.org/sword>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested 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
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+sword configure 1.7.2
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 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
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
+
+# ac_fn_cxx_check_func LINENO FUNC VAR
+# ------------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_cxx_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* 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_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_func
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by sword $as_me 1.7.2, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+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`
+/usr/bin/hostinfo      = `(/usr/bin/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=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&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_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=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append 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
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset 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: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > 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
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_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 $ac_precious_vars; 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,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_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
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_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.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+ac_aux_dir=
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    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
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if ${ac_cv_target+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$target_alias" = x; then
+  ac_cv_target=$ac_cv_host
+else
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+$as_echo "$ac_cv_target" >&6; }
+case $ac_cv_target in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
+esac
+target=$ac_cv_target
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_target
+shift
+target_cpu=$1
+target_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+target_os=$*
+IFS=$ac_save_IFS
+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
+
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+test -n "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+am__api_version='1.13'
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /usr/ucb/* ) ;;
+  *)
+    # OSF1 and SCO ODT 3.0 have their own names for install.
+    # Don't use installbsd from OSF since it installs stuff as root
+    # by default.
+    for ac_prog in ginstall scoinst install; do
+      for ac_exec_ext in '' $ac_executable_extensions; do
+	if as_fn_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
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
+	  fi
+	fi
+      done
+    done
+    ;;
+esac
+
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL=$ac_cv_path_install
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    INSTALL=$ac_install_sh
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# 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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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" conftest.file`
+     fi
+     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".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
+else
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was `s,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "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
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
+fi
+
+# 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
+
+
+# Define the identity of the package.
+ PACKAGE='sword'
+ VERSION='1.7.2'
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+
+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"}
+
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+
+
+
+
+ac_config_headers="$ac_config_headers include/config.h"
+
+
+
+
+case $host_os in
+     mingw*)
+	   # both lines necessary to convince gcc to build dll
+	   LIBS="$LIBS -no-undefined";
+	   export lt_cv_deplibs_check_method=pass_all;
+	   ;;
+esac
+
+# ---------------------------------------------------------------------
+# Check Programs
+# ---------------------------------------------------------------------
+CFLAGS=" $CFLAGS"
+CXXFLAGS=" $CXXFLAGS"
+ac_ext=cpp
+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
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_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"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # 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
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; 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 | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=cpp
+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
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo this is the am__doit target
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# Ignore all kinds of additional output from 'make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-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='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+depcc="$CC"   am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&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".
+  rm -rf conftest.dir
+  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
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # 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.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    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
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$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=cpp
+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 -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CXX=$ac_cv_prog_CXX
+if test -n "$CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CXX" && break
+  done
+fi
+if test -z "$CXX"; then
+  ac_ct_CXX=$CXX
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CXX="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+if test -n "$ac_ct_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CXX" && break
+done
+
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
+fi
+
+  fi
+fi
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_save_CXXFLAGS=$CXXFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+else
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$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
+ac_ext=cpp
+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
+
+depcc="$CXX"  am_compiler_list=
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
+  $as_echo_n "(cached) " >&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".
+  rm -rf conftest.dir
+  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
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
+  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
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+    # 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.  Also, some Intel
+    # versions had trouble with output in subdirs.
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
+    case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
+    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
+      ;;
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
+    none) break ;;
+    esac
+    if depmode=$depmode \
+       source=sub/conftest.c object=$am__obj \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj 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
+      # or remarks (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored or not supported.
+      # When given -MP, icc 7.0 and 7.1 complain thusly:
+      #   icc: Command line warning: ignoring option '-M'; no argument required
+      # The diagnosis changed in icc 8.0:
+      #   icc: Command line remark: option '-MP' not supported
+      if (grep 'ignoring option' conftest.err ||
+          grep 'not supported' 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$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
+
+
+
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AS="${ac_tool_prefix}as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+  ac_ct_AS=$AS
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AS"; then
+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AS="as"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AS" = x; then
+    AS="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AS=$ac_ct_AS
+  fi
+else
+  AS="$ac_cv_prog_AS"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+  ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+case `pwd` in
+  *\ * | *\	*)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.2'
+macro_revision='1.3337'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+     for ac_i in 1 2 3 4 5 6 7; do
+       ac_script="$ac_script$as_nl$ac_script"
+     done
+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+     { ac_script=; unset ac_script;}
+     if test -z "$SED"; then
+  ac_path_SED_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  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_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+  # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo '' >> "conftest.nl"
+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_SED_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_SED="$ac_path_SED"
+      ac_path_SED_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_SED_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_SED"; then
+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+  fi
+else
+  ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+  rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+   then ac_cv_path_FGREP="$GREP -F"
+   else
+     if test -z "$FGREP"; then
+  ac_path_FGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in fgrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+  # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'FGREP' >> "conftest.nl"
+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_FGREP="$ac_path_FGREP"
+      ac_path_FGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_FGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_FGREP"; then
+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_FGREP=$FGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DUMPBIN"; then
+  ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$DUMPBIN" && break
+  done
+fi
+if test -z "$DUMPBIN"; then
+  ac_ct_DUMPBIN=$DUMPBIN
+  for ac_prog in dumpbin "link -dump"
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DUMPBIN"; then
+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_DUMPBIN" && break
+done
+
+  if test "x$ac_ct_DUMPBIN" = x; then
+    DUMPBIN=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DUMPBIN=$ac_ct_DUMPBIN
+  fi
+fi
+
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&5
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+  cat conftest.out >&5
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+
+fi
+
+if test -n $lt_cv_sys_max_cmd_len ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+$as_echo "$xsi_shell" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+$as_echo "$lt_shell_append" >&6; }
+
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OBJDUMP"; then
+  ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+  ac_ct_OBJDUMP=$OBJDUMP
+  # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OBJDUMP"; then
+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OBJDUMP="objdump"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OBJDUMP" = x; then
+    OBJDUMP="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OBJDUMP=$ac_ct_OBJDUMP
+  fi
+else
+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[45]*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[3-9]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DLLTOOL=$ac_ct_DLLTOOL
+  fi
+else
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar
+  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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+  ac_ct_RANLIB=$RANLIB
+  # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_RANLIB="ranlib"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
+else
+  RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[BCDT]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[ABCDGISTW]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDEGRST]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[BCDEGRST]'
+  ;;
+osf*)
+  symcode='[BCDEGQRST]'
+  ;;
+solaris*)
+  symcode='[BDRT]'
+  ;;
+sco3.2v5*)
+  symcode='[DT]'
+  ;;
+sysv4.2uw2*)
+  symcode='[DT]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[ABDT]'
+  ;;
+sysv4)
+  symcode='[DFNSTU]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[ABCDGIRSTW]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK '"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&5
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+  enableval=$enable_libtool_lock;
+fi
+
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  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
+
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_cc_needs_belf=yes
+else
+  lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext 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
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+  case $host_os in
+    rhapsody* | darwin*)
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+  ac_ct_DSYMUTIL=$DSYMUTIL
+  # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_DSYMUTIL" = x; then
+    DSYMUTIL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    DSYMUTIL=$ac_ct_DSYMUTIL
+  fi
+else
+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
+  ac_cv_prog_NMEDIT="$NMEDIT" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+  ac_ct_NMEDIT=$NMEDIT
+  # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_NMEDIT" = x; then
+    NMEDIT=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    NMEDIT=$ac_ct_NMEDIT
+  fi
+else
+  NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LIPO"; then
+  ac_cv_prog_LIPO="$LIPO" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+  ac_ct_LIPO=$LIPO
+  # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_LIPO"; then
+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_LIPO="lipo"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_LIPO" = x; then
+    LIPO=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LIPO=$ac_ct_LIPO
+  fi
+else
+  LIPO="$ac_cv_prog_LIPO"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL"; then
+  ac_cv_prog_OTOOL="$OTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+  ac_ct_OTOOL=$OTOOL
+  # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL"; then
+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL="otool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL" = x; then
+    OTOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL=$ac_ct_OTOOL
+  fi
+else
+  OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$OTOOL64"; then
+  ac_cv_prog_OTOOL64="$OTOOL64" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+  ac_ct_OTOOL64=$OTOOL64
+  # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_OTOOL64"; then
+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_OTOOL64="otool64"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_OTOOL64" = x; then
+    OTOOL64=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    OTOOL64=$ac_ct_OTOOL64
+  fi
+else
+  OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&5
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_ld_exported_symbols_list=yes
+else
+  lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+	LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
+    rhapsody* | darwin1.[012])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[012]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # 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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 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
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+
+
+
+
+
+# Set options
+
+
+
+        enable_dlopen=no
+
+
+
+            # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+  # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  pic_mode=default
+fi
+
+
+test -z "$pic_mode" && pic_mode=default
+
+
+
+
+
+
+
+  # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+  enableval=$enable_fast_install; p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
+else
+  enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/${ac_tool_prefix}file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
+[\\/*] |  ?:[\\/]*)
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/file; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac
+fi
+
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  else
+    MAGIC_CMD=:
+  fi
+fi
+
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC="$CC"
+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
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="-fno-rtti -fno-exceptions"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_rtti_exceptions=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+    :
+fi
+
+fi
+
+
+
+
+
+
+  lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+  if test "$GCC" = yes; then
+    lt_prog_compiler_wl='-Wl,'
+    lt_prog_compiler_static='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      lt_prog_compiler_can_build_shared=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      lt_prog_compiler_pic='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      lt_prog_compiler_wl='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static='-Bstatic'
+      else
+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      lt_prog_compiler_pic='-DDLL_EXPORT'
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	lt_prog_compiler_pic='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      lt_prog_compiler_static='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      lt_prog_compiler_wl='-Wl,'
+      # PIC (with -KPIC) is the default.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-KPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fPIC'
+	lt_prog_compiler_static='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='--shared'
+	lt_prog_compiler_static='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
+      ccc*)
+        lt_prog_compiler_wl='-Wl,'
+        # All Alpha code is PIC.
+        lt_prog_compiler_static='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-qpic'
+	lt_prog_compiler_static='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Wl,'
+	  ;;
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      lt_prog_compiler_wl='-Wl,'
+      # All OSF/1 code is PIC.
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    rdos*)
+      lt_prog_compiler_static='-non_shared'
+      ;;
+
+    solaris*)
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      lt_prog_compiler_wl='-Qoption ld '
+      lt_prog_compiler_pic='-PIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	lt_prog_compiler_pic='-Kconform_pic'
+	lt_prog_compiler_static='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_pic='-KPIC'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
+    uts4*)
+      lt_prog_compiler_pic='-pic'
+      lt_prog_compiler_static='-Bstatic'
+      ;;
+
+    *)
+      lt_prog_compiler_can_build_shared=no
+      ;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic=
+    ;;
+  *)
+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+    case $lt_prog_compiler_pic in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+     esac
+else
+    lt_prog_compiler_pic=
+     lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+    :
+else
+    lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  runpath_var=
+  allow_undefined_flag=
+  always_export_symbols=no
+  archive_cmds=
+  archive_expsym_cmds=
+  compiler_needs_object=no
+  enable_shared_with_static_runtimes=no
+  export_dynamic_flag_spec=
+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  hardcode_automatic=no
+  hardcode_direct=no
+  hardcode_direct_absolute=no
+  hardcode_libdir_flag_spec=
+  hardcode_libdir_separator=
+  hardcode_minus_L=no
+  hardcode_shlibpath_var=unsupported
+  inherit_rpath=no
+  link_all_deplibs=unknown
+  module_cmds=
+  module_expsym_cmds=
+  old_archive_from_new_cmds=
+  old_archive_from_expsyms_cmds=
+  thread_safe_flag_spec=
+  whole_archive_flag_spec=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  include_expsyms=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[3-9]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	allow_undefined_flag=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+      # as there is no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
+      allow_undefined_flag=unsupported
+      always_export_symbols=no
+      enable_shared_with_static_runtimes=yes
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
+    interix[3-9]*)
+      hardcode_direct=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      export_dynamic_flag_spec='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  whole_archive_flag_spec=
+	  tmp_sharedflag='--shared' ;;
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        ld_shlibs=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+	ld_shlibs=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    ld_shlibs=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+    esac
+
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      allow_undefined_flag=unsupported
+      always_export_symbols=yes
+      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	hardcode_direct=unsupported
+      fi
+      ;;
+
+    aix[4-9]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      archive_cmds=''
+      hardcode_direct=yes
+      hardcode_direct_absolute=yes
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      file_list_spec='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[012]|aix4.[012].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  hardcode_direct=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  hardcode_minus_L=yes
+	  hardcode_libdir_flag_spec='-L$libdir'
+	  hardcode_libdir_separator=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      export_dynamic_flag_spec='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      always_export_symbols=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	allow_undefined_flag='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+	  allow_undefined_flag="-z nodefs"
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
+
+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  no_undefined_flag=' ${wl}-bernotok'
+	  allow_undefined_flag=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
+	  archive_cmds_need_lc=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            archive_expsym_cmds=''
+        ;;
+      m68k)
+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_minus_L=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[45]*)
+      export_dynamic_flag_spec=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc=no
+  hardcode_direct=no
+  hardcode_automatic=yes
+  hardcode_shlibpath_var=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
+  link_all_deplibs=yes
+  allow_undefined_flag="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+
+  else
+  ld_shlibs=no
+  fi
+
+      ;;
+
+    dgux*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      export_dynamic_flag_spec='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+	hardcode_direct=yes
+	hardcode_direct_absolute=yes
+	export_dynamic_flag_spec='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	hardcode_minus_L=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_separator=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  hardcode_direct=no
+	  hardcode_shlibpath_var=no
+	  ;;
+	*)
+	  hardcode_direct=yes
+	  hardcode_direct_absolute=yes
+	  export_dynamic_flag_spec='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  hardcode_minus_L=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      inherit_rpath=yes
+      link_all_deplibs=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    newsos6)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_shlibpath_var=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	  export_dynamic_flag_spec='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     hardcode_libdir_flag_spec='-R$libdir'
+	     ;;
+	   *)
+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      allow_undefined_flag=unsupported
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+	allow_undefined_flag=' -expect_unresolved \*'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      archive_cmds_need_lc='no'
+      hardcode_libdir_separator=:
+      ;;
+
+    solaris*)
+      no_undefined_flag=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case $host_os in
+      solaris2.[0-5] | solaris2.[0-5].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      link_all_deplibs=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  reload_cmds='$CC -r -o $output$reload_objs'
+	  hardcode_direct=no
+        ;;
+	motorola)
+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      hardcode_shlibpath_var=no
+      ;;
+
+    sysv4.3*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_shlibpath_var=no
+      export_dynamic_flag_spec='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	hardcode_shlibpath_var=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	ld_shlibs=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag='${wl}-z,text'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      no_undefined_flag='${wl}-z,text'
+      allow_undefined_flag='${wl}-z,nodefs'
+      archive_cmds_need_lc=no
+      hardcode_shlibpath_var=no
+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
+      hardcode_libdir_separator=':'
+      link_all_deplibs=yes
+      export_dynamic_flag_spec='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_shlibpath_var=no
+      ;;
+
+    *)
+      ld_shlibs=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	export_dynamic_flag_spec='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test "$ld_shlibs" = no && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[lt_foo]++; }
+  if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+   test -n "$runpath_var" ||
+   test "X$hardcode_automatic" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
+     test "$hardcode_minus_L" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test "$hardcode_action" = relink ||
+   test "$inherit_rpath" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+  if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+
+fi
+
+    ;;
+
+  *)
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_shl_load=yes
+else
+  ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_svld_dlopen=yes
+else
+  ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dld_dld_link=yes
+else
+  ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
+  lt_cv_dlopen_self_static=cross
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}
+_LT_EOF
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&5 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+    esac
+  else :
+    # compilation failed
+    lt_cv_dlopen_self_static=no
+  fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    fi
+    ;;
+  *)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    ;;
+  esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+  # Report which library types will actually be built
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[4-9]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=cpp
+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
+
+CC="$lt_save_CC"
+
+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_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 confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=cpp
+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
+
+else
+  _lt_caught_CXX_error=yes
+fi
+
+ac_ext=cpp
+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
+
+archive_cmds_need_lc_CXX=no
+allow_undefined_flag_CXX=
+always_export_symbols_CXX=no
+archive_expsym_cmds_CXX=
+compiler_needs_object_CXX=no
+export_dynamic_flag_spec_CXX=
+hardcode_direct_CXX=no
+hardcode_direct_absolute_CXX=no
+hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_separator_CXX=
+hardcode_minus_L_CXX=no
+hardcode_shlibpath_var_CXX=unsupported
+hardcode_automatic_CXX=no
+inherit_rpath_CXX=no
+module_cmds_CXX=
+module_expsym_cmds_CXX=
+link_all_deplibs_CXX=unknown
+old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
+no_undefined_flag_CXX=
+whole_archive_flag_spec_CXX=
+enable_shared_with_static_runtimes_CXX=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+objext_CXX=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+  # save warnings/boilerplate of simple test code
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+  ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  compiler_CXX=$CC
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
+    else
+      lt_prog_compiler_no_builtin_flag_CXX=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+  with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [\\/]* | ?:[\\/]*)
+      re_direlt='/[^/][^/]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+
+
+
+
+
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          whole_archive_flag_spec_CXX=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+    ld_shlibs_CXX=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+      aix[4-9]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        archive_cmds_CXX=''
+        hardcode_direct_CXX=yes
+        hardcode_direct_absolute_CXX=yes
+        hardcode_libdir_separator_CXX=':'
+        link_all_deplibs_CXX=yes
+        file_list_spec_CXX='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[012]|aix4.[012].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    hardcode_direct_CXX=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    hardcode_minus_L_CXX=yes
+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
+	    hardcode_libdir_separator_CXX=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        always_export_symbols_CXX=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          allow_undefined_flag_CXX='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+	    allow_undefined_flag_CXX="-z nodefs"
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    no_undefined_flag_CXX=' ${wl}-bernotok'
+	    allow_undefined_flag_CXX=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
+	    archive_cmds_need_lc_CXX=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  allow_undefined_flag_CXX=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  ld_shlibs_CXX=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+
+
+  archive_cmds_need_lc_CXX=no
+  hardcode_direct_CXX=no
+  hardcode_automatic_CXX=yes
+  hardcode_shlibpath_var_CXX=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
+  link_all_deplibs_CXX=yes
+  allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+
+  else
+  ld_shlibs_CXX=no
+  fi
+
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        ld_shlibs_CXX=no
+        ;;
+
+      freebsd-elf*)
+        archive_cmds_need_lc_CXX=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        ld_shlibs_CXX=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
+        ;;
+
+      hpux9*)
+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        export_dynamic_flag_spec_CXX='${wl}-E'
+        hardcode_direct_CXX=yes
+        hardcode_minus_L_CXX=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            ld_shlibs_CXX=no
+            ;;
+          aCC*)
+            archive_cmds_CXX='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              ld_shlibs_CXX=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+	  hardcode_libdir_separator_CXX=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      export_dynamic_flag_spec_CXX='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct_CXX=no
+            hardcode_shlibpath_var_CXX=no
+            ;;
+          *)
+            hardcode_direct_CXX=yes
+            hardcode_direct_absolute_CXX=yes
+            hardcode_minus_L_CXX=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[3-9]*)
+	hardcode_direct_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	export_dynamic_flag_spec_CXX='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    link_all_deplibs_CXX=yes
+	    ;;
+        esac
+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+        hardcode_libdir_separator_CXX=:
+        inherit_rpath_CXX=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    archive_cmds_need_lc_CXX=no
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
+	      prelink_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      old_archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      archive_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      no_undefined_flag_CXX=' -zdefs'
+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      compiler_needs_object_CXX=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	ld_shlibs_CXX=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        ld_shlibs_CXX=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	ld_shlibs_CXX=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    export_dynamic_flag_spec_CXX='${wl}-E'
+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	    hardcode_libdir_separator_CXX=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+		;;
+	    esac
+
+	    hardcode_libdir_separator_CXX=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+	      hardcode_libdir_separator_CXX=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      ld_shlibs_CXX=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            archive_cmds_need_lc_CXX=yes
+	    no_undefined_flag_CXX=' -zdefs'
+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
+	    hardcode_shlibpath_var_CXX=no
+	    case $host_os in
+	      solaris2.[0-5] | solaris2.[0-5].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    link_all_deplibs_CXX=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[0-5] | solaris2.[0-5].*) ;;
+		*)
+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+      no_undefined_flag_CXX='${wl}-z,text'
+      archive_cmds_need_lc_CXX=no
+      hardcode_shlibpath_var_CXX=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	no_undefined_flag_CXX='${wl}-z,text'
+	allow_undefined_flag_CXX='${wl}-z,nodefs'
+	archive_cmds_need_lc_CXX=no
+	hardcode_shlibpath_var_CXX=no
+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
+	hardcode_libdir_separator_CXX=':'
+	link_all_deplibs_CXX=yes
+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+	      '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+	      '"$reload_cmds_CXX"
+	    ;;
+	  *)
+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    ld_shlibs_CXX=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        ld_shlibs_CXX=no
+        ;;
+    esac
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+    test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+    GCC_CXX="$GXX"
+    LD_CXX="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    # Dependencies to place before and after the object being linked:
+predep_objects_CXX=
+postdep_objects_CXX=
+predeps_CXX=
+postdeps_CXX=
+compiler_lib_search_path_CXX=
+
+cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$compiler_lib_search_path_CXX"; then
+	     compiler_lib_search_path_CXX="${prev}${p}"
+	   else
+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$postdeps_CXX"; then
+	   postdeps_CXX="${prev}${p}"
+	 else
+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$predep_objects_CXX"; then
+	   predep_objects_CXX="$p"
+	 else
+	   predep_objects_CXX="$predep_objects_CXX $p"
+	 fi
+       else
+	 if test -z "$postdep_objects_CXX"; then
+	   postdep_objects_CXX="$p"
+	 else
+	   postdep_objects_CXX="$postdep_objects_CXX $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling CXX test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+case $host_os in
+interix[3-9]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  predep_objects_CXX=
+  postdep_objects_CXX=
+  postdeps_CXX=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      postdeps_CXX='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+
+
+case " $postdeps_CXX " in
+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
+esac
+ compiler_lib_search_dirs_CXX=
+if test -n "${compiler_lib_search_path_CXX}"; then
+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    lt_prog_compiler_wl_CXX=
+lt_prog_compiler_pic_CXX=
+lt_prog_compiler_static_CXX=
+
+
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    lt_prog_compiler_wl_CXX='-Wl,'
+    lt_prog_compiler_static_CXX='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	lt_prog_compiler_static_CXX='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            lt_prog_compiler_pic_CXX='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      lt_prog_compiler_pic_CXX='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      lt_prog_compiler_pic_CXX=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
+    interix[3-9]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	lt_prog_compiler_pic_CXX=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	lt_prog_compiler_pic_CXX='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      lt_prog_compiler_pic_CXX='-fPIC -shared'
+      ;;
+    *)
+      lt_prog_compiler_pic_CXX='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[4-9]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  lt_prog_compiler_static_CXX='-Bstatic'
+	else
+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      lt_prog_compiler_pic_CXX='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      lt_prog_compiler_pic_CXX='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fPIC'
+	    lt_prog_compiler_static_CXX='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-qpic'
+	    lt_prog_compiler_static_CXX='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      lt_prog_compiler_pic_CXX='-KPIC'
+	      lt_prog_compiler_static_CXX='-Bstatic'
+	      lt_prog_compiler_wl_CXX='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    lt_prog_compiler_pic_CXX='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        lt_prog_compiler_pic_CXX='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    lt_prog_compiler_pic_CXX=
+	    lt_prog_compiler_static_CXX='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    lt_prog_compiler_wl_CXX='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    lt_prog_compiler_pic_CXX='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    lt_prog_compiler_pic_CXX='-pic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    lt_prog_compiler_pic_CXX='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    lt_prog_compiler_pic_CXX='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	lt_prog_compiler_can_build_shared_CXX=no
+	;;
+    esac
+  fi
+
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    lt_prog_compiler_pic_CXX=
+    ;;
+  *)
+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+    ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic_CXX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_pic_works_CXX=yes
+     fi
+   fi
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+    case $lt_prog_compiler_pic_CXX in
+     "" | " "*) ;;
+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+     esac
+else
+    lt_prog_compiler_pic_CXX=
+     lt_prog_compiler_can_build_shared_CXX=no
+fi
+
+fi
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler_static_works_CXX=yes
+       fi
+     else
+       lt_cv_prog_compiler_static_works_CXX=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+    :
+else
+    lt_prog_compiler_static_CXX=
+fi
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       lt_cv_prog_compiler_c_o_CXX=yes
+     fi
+   fi
+   chmod u+w . 2>&5
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+
+
+
+
+hard_links="nottested"
+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+  if test "$hard_links" = no; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+  case $host_os in
+  aix[4-9]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    export_symbols_cmds_CXX="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  *)
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+$as_echo "$ld_shlibs_CXX" >&6; }
+test "$ld_shlibs_CXX" = no && can_build_shared=no
+
+with_gnu_ld_CXX=$with_gnu_ld
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc_CXX" in
+x|xyes)
+  # Assume -lc should be added
+  archive_cmds_need_lc_CXX=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $archive_cmds_CXX in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[4-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[01] | aix4.[01].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[45]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[23].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[01]* | freebsdelf3.[01]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[3-9]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+  lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[89] | openbsd2.[89].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" ||
+   test -n "$runpath_var_CXX" ||
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$hardcode_direct_CXX" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+     test "$hardcode_minus_L_CXX" != no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
+$as_echo "$hardcode_action_CXX" >&6; }
+
+if test "$hardcode_action_CXX" = relink ||
+   test "$inherit_rpath_CXX" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+
+
+
+
+
+
+
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+ac_ext=cpp
+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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
+
+int
+main ()
+{
+#if BYTE_ORDER != BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUCENE2" >&5
+$as_echo_n "checking for CLUCENE2... " >&6; }
+
+if test -n "$CLUCENE2_CFLAGS"; then
+    pkg_cv_CLUCENE2_CFLAGS="$CLUCENE2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core >= 2.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libclucene-core >= 2.3") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CLUCENE2_CFLAGS=`$PKG_CONFIG --cflags "libclucene-core >= 2.3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CLUCENE2_LIBS"; then
+    pkg_cv_CLUCENE2_LIBS="$CLUCENE2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libclucene-core >= 2.3\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libclucene-core >= 2.3") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CLUCENE2_LIBS=`$PKG_CONFIG --libs "libclucene-core >= 2.3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CLUCENE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libclucene-core >= 2.3" 2>&1`
+        else
+	        CLUCENE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libclucene-core >= 2.3" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CLUCENE2_PKG_ERRORS" >&5
+
+	true
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	true
+else
+	CLUCENE2_CFLAGS=$pkg_cv_CLUCENE2_CFLAGS
+	CLUCENE2_LIBS=$pkg_cv_CLUCENE2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+if test "x$CLUCENE2_LIBS" = x; then
+
+
+ac_ext=cpp
+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
+
+
+
+# Ask user for path to clucene-core stuff:.
+
+# Check whether --with-clucene was given.
+if test "${with_clucene+set}" = set; then :
+  withval=$with_clucene;
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to include clucene 0.x" >&5
+$as_echo_n "checking how to include clucene 0.x... " >&6; }
+if test "x$with_clucene" = "xno"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
+$as_echo "excluding support" >&6; }
+else
+#try some default locations
+if test -z "$with_clucene" || test "x$with_clucene" = "xyes"; then
+	#use parent of this directory, and some common library paths
+	with_clucene=$(cd "../" && pwd)
+	with_clucene="$with_clucene /usr /usr/local"
+else
+	#use an absolute path
+	with_clucene=$(cd "$with_clucene" && pwd)
+fi
+clucene_set_failed=
+CLUCENE_CXXFLAGS=
+CLUCENE_LIBS=
+for flag in $with_clucene; do
+	if test -z "$clucene_set_failed"; then
+		if test -e "$flag/include/CLucene.h"; then
+# 64-bit checks first
+			if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then
+				clucene_set_failed=$flag
+				CLUCENE_LIBS="-L$flag/lib64 -lclucene"
+				if test -e "$flag/include/CLucene/clucene-config.h"; then
+					CLUCENE_CXXFLAGS="-I$flag/include"
+				else
+					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib64"
+				fi
+			else
+# 32-bit checks
+				if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
+					clucene_set_failed=$flag
+					CLUCENE_LIBS="-L$flag/lib -lclucene"
+					if test -e "$flag/include/CLucene/clucene-config.h"; then
+						CLUCENE_CXXFLAGS="-I$flag/include"
+					else
+						CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
+					fi
+				fi
+			fi
+		fi
+	fi
+
+	if test -z "$clucene_set_failed"; then
+		if test -e "$flag/src/CLucene/StdHeader.h"; then
+			if test -e "$flag/src/libclucene.la"; then
+				CLUCENE_LIBS="-L$flag/src/ -lclucene"
+				CLUCENE_CXXFLAGS="-I$flag/src/"
+				clucene_set_failed=$flag/src/
+			fi
+		fi
+	fi
+done
+
+if test -z "$clucene_set_failed"; then
+	clucene_set_failed="true"
+        with_clucene="no"
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
+$as_echo "excluding support" >&6; }
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $clucene_set_failed" >&5
+$as_echo "$clucene_set_failed" >&6; }
+fi
+
+if test "$clucene_set_failed" = "true"; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not detect clucene location.  To enable clucene, you must
+		call configure with the --with-clucene option specifying the location.
+	    This tells configure where to find the CLucene Core library and headers.
+	    e.g. --with-clucene=/usr/local or --with-clucene=/usr" >&5
+$as_echo "$as_me: WARNING: Could not detect clucene location.  To enable clucene, you must
+		call configure with the --with-clucene option specifying the location.
+	    This tells configure where to find the CLucene Core library and headers.
+	    e.g. --with-clucene=/usr/local or --with-clucene=/usr" >&2;}
+fi
+
+
+fi
+
+
+
+ac_ext=cpp
+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
+
+
+fi
+
+# ---------------------------------------------------------------------
+# With options
+# ---------------------------------------------------------------------
+
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+else
+  with_zlib=yes
+fi
+
+
+# Check whether --with-icu was given.
+if test "${with_icu+set}" = set; then :
+  withval=$with_icu;
+else
+  with_icu=yes
+fi
+
+
+# Check whether --with-icusword was given.
+if test "${with_icusword+set}" = set; then :
+  withval=$with_icusword;
+else
+  with_icusword=no
+fi
+
+
+# Check whether --with-conf was given.
+if test "${with_conf+set}" = set; then :
+  withval=$with_conf;
+else
+  with_conf=yes
+fi
+
+
+# Check whether --with-cxx11regex was given.
+if test "${with_cxx11regex+set}" = set; then :
+  withval=$with_cxx11regex;
+else
+  with_cxx11regex=no
+fi
+
+
+# Check whether --with-curl was given.
+if test "${with_curl+set}" = set; then :
+  withval=$with_curl;
+else
+  with_curl=yes
+fi
+
+
+# Check whether --with-curl_sftp was given.
+if test "${with_curl_sftp+set}" = set; then :
+  withval=$with_curl_sftp;
+else
+  with_curl_sftp=yes
+fi
+
+#AC_ARG_WITH(lucene,
+#	AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no)
+
+# Check whether --with-internalregex was given.
+if test "${with_internalregex+set}" = set; then :
+  withval=$with_internalregex;
+fi
+
+
+
+# ---------------------------------------------------------------------
+# Enable options
+# ---------------------------------------------------------------------
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+else
+  enable_debug=no
+fi
+
+# Check whether --enable-warnings was given.
+if test "${enable_warnings+set}" = set; then :
+  enableval=$enable_warnings;
+else
+  enable_warnings=no
+fi
+
+# Check whether --enable-profile was given.
+if test "${enable_profile+set}" = set; then :
+  enableval=$enable_profile;
+else
+  enable_profile=no
+fi
+
+# Check whether --enable-profilefn was given.
+if test "${enable_profilefn+set}" = set; then :
+  enableval=$enable_profilefn;
+else
+  enable_profilefn=no
+fi
+
+# Check whether --enable-tests was given.
+if test "${enable_tests+set}" = set; then :
+  enableval=$enable_tests;
+else
+  enable_tests=yes
+fi
+
+# Check whether --enable-utilities was given.
+if test "${enable_utilities+set}" = set; then :
+  enableval=$enable_utilities;
+else
+  enable_utilities=yes
+fi
+
+# Check whether --enable-examples was given.
+if test "${enable_examples+set}" = set; then :
+  enableval=$enable_examples;
+else
+  enable_examples=no
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+# ---------------------------------------------------------------------
+# Debug and profile
+# ---------------------------------------------------------------------
+
+# these are first because the SET AM_C.*FLAGS, not just append
+if test x$enable_debug = xyes; then
+  GCJFLAGS="-g -O0"
+  if test x$ac_cv_prog_cc_g = xyes; then
+    AM_CFLAGS="-g3 -O0 -Wall -Werror"
+  else
+    AM_CFLAGS="-O0 -Wall -Werror"
+  fi
+  if test x$ac_cv_prog_cxx_g = xyes; then
+    AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual"
+  else
+    AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual"
+  fi
+else
+  AM_CFLAGS="-O3"
+  AM_CXXFLAGS="-O3"
+fi
+
+AM_CFLAGS="$AM_CFLAGS -fPIC"
+AM_CXXFLAGS="$AM_CXXFLAGS -fPIC"
+
+# ---------------------------------------------------------------------
+# Check libraries
+# ---------------------------------------------------------------------
+if test x$with_zlib  = xyes; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
+$as_echo_n "checking for compress in -lz... " >&6; }
+if ${ac_cv_lib_z_compress+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lz  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char compress ();
+int
+main ()
+{
+return compress ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_z_compress=yes
+else
+  ac_cv_lib_z_compress=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
+$as_echo "$ac_cv_lib_z_compress" >&6; }
+if test "x$ac_cv_lib_z_compress" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBZ 1
+_ACEOF
+
+  LIBS="-lz $LIBS"
+
+else
+  with_zlib="no"
+fi
+
+else
+	with_zlib="no"
+fi
+
+if test x$with_zlib = xno; then
+	AM_CFLAGS="$AM_CFLAGS -DEXCLUDEZLIB"
+	AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB"
+fi
+
+if test "x$with_internalregex" = "xyes"; then :
+  have_systemregex="no"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing regexec" >&5
+$as_echo_n "checking for library containing regexec... " >&6; }
+if ${ac_cv_search_regexec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char regexec ();
+int
+main ()
+{
+return regexec ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' regex; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_regexec=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_regexec+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_regexec+:} false; then :
+
+else
+  ac_cv_search_regexec=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_regexec" >&5
+$as_echo "$ac_cv_search_regexec" >&6; }
+ac_res=$ac_cv_search_regexec
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  have_systemregex="yes"
+else
+  have_systemregex="no"
+fi
+
+fi
+
+if test "x$have_systemregex" = "xyes"; then :
+  with_internalregex="no"
+       { $as_echo "$as_me:${as_lineno-$LINENO}: Using system regex.h" >&5
+$as_echo "$as_me: Using system regex.h" >&6;}
+else
+  with_internalregex="yes"
+       if test "x$with_internalregex" = "xno"; then :
+  as_fn_error $? "System regex forced but not found" "$LINENO" 5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Using internal regex.h" >&5
+$as_echo "$as_me: Using internal regex.h" >&6;}
+fi
+fi
+
+
+# ---------------------------------------------------------------------
+# Find CppUnit
+# ---------------------------------------------------------------------
+# Locate CppUnit (minimum version 1.8.0) for testing.
+
+
+
+# Check whether --with-cppunit-prefix was given.
+if test "${with_cppunit_prefix+set}" = set; then :
+  withval=$with_cppunit_prefix; cppunit_config_prefix="$withval"
+else
+  cppunit_config_prefix=""
+fi
+
+
+# Check whether --with-cppunit-exec-prefix was given.
+if test "${with_cppunit_exec_prefix+set}" = set; then :
+  withval=$with_cppunit_exec_prefix; cppunit_config_exec_prefix="$withval"
+else
+  cppunit_config_exec_prefix=""
+fi
+
+
+  if test x$cppunit_config_exec_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+     fi
+  fi
+  if test x$cppunit_config_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+     fi
+  fi
+
+  # Extract the first word of "cppunit-config", so it can be a program name with args.
+set dummy cppunit-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CPPUNIT_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CPPUNIT_CONFIG="$CPPUNIT_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_CPPUNIT_CONFIG" && ac_cv_path_CPPUNIT_CONFIG="no"
+  ;;
+esac
+fi
+CPPUNIT_CONFIG=$ac_cv_path_CPPUNIT_CONFIG
+if test -n "$CPPUNIT_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CONFIG" >&5
+$as_echo "$CPPUNIT_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  cppunit_version_min=1.8.0
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cppunit - version >= $cppunit_version_min" >&5
+$as_echo_n "checking for Cppunit - version >= $cppunit_version_min... " >&6; }
+  no_cppunit=""
+  if test "$CPPUNIT_CONFIG" = "no" ; then
+    no_cppunit=yes
+  else
+    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+    cppunit_version=`$CPPUNIT_CONFIG --version`
+
+    cppunit_major_version=`echo $cppunit_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    cppunit_minor_version=`echo $cppunit_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    cppunit_micro_version=`echo $cppunit_version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+
+    cppunit_major_min=`echo $cppunit_version_min | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    cppunit_minor_min=`echo $cppunit_version_min | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    cppunit_micro_min=`echo $cppunit_version_min | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+
+    cppunit_version_proper=`expr \
+        $cppunit_major_version \> $cppunit_major_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \> $cppunit_minor_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \= $cppunit_minor_min \& \
+        $cppunit_micro_version \>= $cppunit_micro_min `
+
+    if test "$cppunit_version_proper" = "1" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&5
+$as_echo "$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version" >&6; }
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      no_cppunit=yes
+    fi
+  fi
+
+  if test "x$no_cppunit" = x ; then
+     :
+  else
+     CPPUNIT_CFLAGS=""
+     CPPUNIT_LIBS=""
+     :
+  fi
+
+
+
+
+
+# You can set up an automake conditional and use it to conditionally
+# build cppunit-using test programs.
+ if test "$CPPUNIT_LIBS"; then
+  HAVE_CPPUNIT_TRUE=
+  HAVE_CPPUNIT_FALSE='#'
+else
+  HAVE_CPPUNIT_TRUE='#'
+  HAVE_CPPUNIT_FALSE=
+fi
+
+
+
+# ---------------------------------------------------------------------
+# Find pkg-config
+# ---------------------------------------------------------------------
+use_pkgconfig=yes
+# Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x$PKG_CONFIG = xno ; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/" >&5
+$as_echo "$as_me: WARNING: *** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not using pkg-config" >&5
+$as_echo "$as_me: WARNING: not using pkg-config" >&2;}
+  use_pkgconfig=no
+fi
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then
+  :
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** pkg-config too old; version 0.14 or better required." >&5
+$as_echo "$as_me: WARNING: *** pkg-config too old; version 0.14 or better required." >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not using pkg-config" >&5
+$as_echo "$as_me: WARNING: not using pkg-config" >&2;}
+  use_pkgconfig=no
+fi
+
+
+# ---------------------------------------------------------------------
+# Find ICU tools
+# ---------------------------------------------------------------------
+ICU_VER=
+ICU_LIBS=
+ICU_IOLIBS=
+if test x$with_icu = xyes; then
+	# Extract the first word of "icu-config", so it can be a program name with args.
+set dummy icu-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ICU_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ICU_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ICU_CONFIG="$ICU_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ICU_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_ICU_CONFIG" && ac_cv_path_ICU_CONFIG="no"
+  ;;
+esac
+fi
+ICU_CONFIG=$ac_cv_path_ICU_CONFIG
+if test -n "$ICU_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ICU_CONFIG" >&5
+$as_echo "$ICU_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# The icu-config script was new in icu 2.2
+	if test "$ICU_CONFIG" = "no" ; then
+	   echo "*** The icu-config script installed by icu could not be found"
+	   echo "*** continuing anyway and assuming 2.1 or earlier"
+	   ICU_VER="2.1"
+	   ICU_LIBS="-licui18n -licuuc -licudata"
+	   ICU_IOLIBS="-lustdio"
+	else
+	   ICU_VER=`$ICU_CONFIG --version`
+	   ICU_LIBS=`$ICU_CONFIG --ldflags`
+	   #ICU_IOLIBS=`if test $(echo "$ICU_VER >= 3.0"|bc) -eq 1; then $ICU_CONFIG --ldflags-icuio; else $ICU_CONFIG --ldflags-ustdio; fi;`
+	   ICU_IOLIBS=`$ICU_CONFIG --ldflags-icuio`
+	fi
+     AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_"
+     AM_CFLAGS="$AM_CFLAGS -D_ICU_"
+fi
+
+if test "x$ICU_LIBS" != x; then
+	with_icu=yes
+	LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS"
+else
+	with_icu=no
+fi
+
+
+if test x$with_icusword = xyes; then
+AM_CXXFLAGS="$AM_CXXFLAGS -D_ICUSWORD_"
+AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_"
+fi
+
+
+AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
+
+if test x$enable_warnings = xyes; then
+  AM_CFLAGS="$AM_CFLAGS -Werror"
+  AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual"
+fi
+
+if test x$enable_profile = xyes; then
+  AM_CFLAGS="$AM_CFLAGS -pg"
+  AM_CXXFLAGS="$AM_CXXFLAGS -pg"
+fi
+if test x$enable_profilefn = xyes; then
+  AM_CFLAGS="$AM_CFLAGS -g -finstrument-functions"
+  AM_CXXFLAGS="$AM_CXXFLAGS -g -finstrument-functions"
+  LIBS="$LIBS -g -finstrument-functions -lfnccheck"
+fi
+
+# ---------------------------------------------------------------------
+# Check for curl for installmgr suport
+# ---------------------------------------------------------------------
+
+with_internalftplib=no
+if test x$with_curl = xyes; then
+    # Extract the first word of "curl-config", so it can be a program name with args.
+set dummy curl-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CURL_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CURL_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_CURL_CONFIG" && ac_cv_path_CURL_CONFIG="no"
+  ;;
+esac
+fi
+CURL_CONFIG=$ac_cv_path_CURL_CONFIG
+if test -n "$CURL_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
+$as_echo "$CURL_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    if test "$CURL_CONFIG" = "no" ; then
+	echo "*** The curl-config script installed by curl could not be found"
+	echo "*** compiling without libcurl support"
+	with_curl=no
+	with_curl_sftp=no
+	with_internalftplib=yes
+    else
+	echo "curl found - remote install options available"
+	CURL_AM_CFLAGS=`$CURL_CONFIG --cflags`
+	CURL_LIBS=`$CURL_CONFIG --libs`
+	AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS"
+	AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS"
+	LIBS="$LIBS $CURL_LIBS"
+	if test x$with_curl_sftp = xyes; then
+		if test x`$CURL_CONFIG --protocols|grep SFTP|wc -l` = x1; then
+			AM_CXXFLAGS="$AM_CXXFLAGS -DCURLSFTPAVAILABLE"
+			AM_CFLAGS="$AM_CFLAGS -DCURLSFTPAVAILABLE"
+		else
+			with_curl_sftp=no;
+		fi
+	fi
+    fi
+else
+	with_curl=no;
+	with_curl_sftp=no;
+	with_internalftplib=yes
+fi
+
+if test x$with_cxx11regex = xyes; then
+	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100"
+fi
+
+# ---------------------------------------------------------------------
+# Check for clucene for lucene searching support
+# ---------------------------------------------------------------------
+
+# NOTE the $libdir hack at the end of the c[xx]flags.  Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
+with_clucene=no
+if test "x$CLUCENE2_LIBS" != x; then
+   echo "clucene 2.x found - lucene searching options available"
+   AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
+   AM_CFLAGS="$AM_CFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
+   LIBS="$LIBS $CLUCENE2_LIBS"
+   with_clucene="yes 2.x"
+   CLUCENE_LIBS="$CLUCENE_LIBS $CLUCENE2_LIBS"
+else
+if test "x$CLUCENE_LIBS" != x; then
+   echo "lucene 0.x found - lucene searching options available"
+   AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE -I$libdir"
+   AM_CFLAGS="$AM_CFLAGS -DUSELUCENE -I$libdir"
+   LIBS="$LIBS $CLUCENE_LIBS"
+   with_clucene="yes 0.x"
+else
+   echo "lucene searching options not available"
+fi
+fi
+
+for ac_func in vsnprintf
+do :
+  ac_fn_cxx_check_func "$LINENO" "vsnprintf" "ac_cv_func_vsnprintf"
+if test "x$ac_cv_func_vsnprintf" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VSNPRINTF 1
+_ACEOF
+ have_vsnprintf="yes"
+fi
+done
+
+
+# ---------------------------------------------------------------------
+# Alter global conf directory only if not /etc
+# ---------------------------------------------------------------------
+
+if test "x$sysconfdir" = "x/etc"; then
+  dir_confdef="no"
+else
+  dir_confdef="yes"
+fi
+
+
+V1=`expr $VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*\.*[0-9]*'`
+V2=`expr $VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*\.*[0-9]*'`
+V3=`expr $VERSION : '[0-9]*\.[0-9]*\.*\([0-9]*\)\.*[0-9]*'`
+V4=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*\.*\([0-9]*\)'`
+
+
+SWORD_VERSION_STR=$VERSION
+SWORD_VERSION_MAJOR=$V1
+SWORD_VERSION_MINOR=$V2
+SWORD_VERSION_MICRO=$V3
+if test "$V4" = "" ; then V4=0; fi
+SWORD_VERSION_NANO=$V4
+
+if test "$V2" -le 9 ; then V2=0$V2 ; fi
+if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi
+if test "$V4" -le 9 ; then V4=00$V4 ; elif test "$V4" -le 99 ; then V4=0$V4 ; fi
+SWORD_VERSION_NUM=$V1$V2$V3$V4
+
+
+
+
+
+
+
+
+
+
+# ---------------------------------------------------------------------
+# Substitute variables into makefiles
+# ---------------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# ---------------------------------------------------------------------
+# Conditional variables
+# ---------------------------------------------------------------------
+
+ if test x$with_zlib = xyes; then
+  HAVE_LIBZ_TRUE=
+  HAVE_LIBZ_FALSE='#'
+else
+  HAVE_LIBZ_TRUE='#'
+  HAVE_LIBZ_FALSE=
+fi
+
+ if test x$with_icu = xyes; then
+  HAVE_ICU_TRUE=
+  HAVE_ICU_FALSE='#'
+else
+  HAVE_ICU_TRUE='#'
+  HAVE_ICU_FALSE=
+fi
+
+ if test x$with_icusword = xyes; then
+  HAVE_ICUSWORD_TRUE=
+  HAVE_ICUSWORD_FALSE='#'
+else
+  HAVE_ICUSWORD_TRUE='#'
+  HAVE_ICUSWORD_FALSE=
+fi
+
+ if test x$have_vsnprintf = xyes; then
+  HAVE_VSNPRINTF_TRUE=
+  HAVE_VSNPRINTF_FALSE='#'
+else
+  HAVE_VSNPRINTF_TRUE='#'
+  HAVE_VSNPRINTF_FALSE=
+fi
+
+
+ if test "x$with_clucene" != xno; then
+  USELUCENE_TRUE=
+  USELUCENE_FALSE='#'
+else
+  USELUCENE_TRUE='#'
+  USELUCENE_FALSE=
+fi
+
+ if test x$enable_shared = xyes; then
+  SHAREDLIB_TRUE=
+  SHAREDLIB_FALSE='#'
+else
+  SHAREDLIB_TRUE='#'
+  SHAREDLIB_FALSE=
+fi
+
+ if test x$with_conf = xyes; then
+  INSTCONF_TRUE=
+  INSTCONF_FALSE='#'
+else
+  INSTCONF_TRUE='#'
+  INSTCONF_FALSE=
+fi
+
+ if test x$with_cxx11regex = xyes; then
+  USECXX11REGEX_TRUE=
+  USECXX11REGEX_FALSE='#'
+else
+  USECXX11REGEX_TRUE='#'
+  USECXX11REGEX_FALSE=
+fi
+
+ if test x$with_curl = xyes; then
+  WITHCURL_TRUE=
+  WITHCURL_FALSE='#'
+else
+  WITHCURL_TRUE='#'
+  WITHCURL_FALSE=
+fi
+
+ if test x$with_curl_sftp = xyes; then
+  WITHCURLSFTP_TRUE=
+  WITHCURLSFTP_FALSE='#'
+else
+  WITHCURLSFTP_TRUE='#'
+  WITHCURLSFTP_FALSE=
+fi
+
+ if test x$with_internalftplib = xyes; then
+  INTERNALFTPLIB_TRUE=
+  INTERNALFTPLIB_FALSE='#'
+else
+  INTERNALFTPLIB_TRUE='#'
+  INTERNALFTPLIB_FALSE=
+fi
+
+ if test x$with_internalregex = xyes; then
+  USE_INTERNAL_REGEX_TRUE=
+  USE_INTERNAL_REGEX_FALSE='#'
+else
+  USE_INTERNAL_REGEX_TRUE='#'
+  USE_INTERNAL_REGEX_FALSE=
+fi
+
+ if test x$dir_confdef = xyes; then
+  CONFDEF_TRUE=
+  CONFDEF_FALSE='#'
+else
+  CONFDEF_TRUE='#'
+  CONFDEF_FALSE=
+fi
+
+ if test x$use_pkgconfig = xyes; then
+  USE_PKGCONF_TRUE=
+  USE_PKGCONF_FALSE='#'
+else
+  USE_PKGCONF_TRUE='#'
+  USE_PKGCONF_FALSE=
+fi
+
+ if test x$enable_tests = xyes; then
+  BUILDTESTS_TRUE=
+  BUILDTESTS_FALSE='#'
+else
+  BUILDTESTS_TRUE='#'
+  BUILDTESTS_FALSE=
+fi
+
+ if test x$enable_utilities = xyes; then
+  BUILDUTILS_TRUE=
+  BUILDUTILS_FALSE='#'
+else
+  BUILDUTILS_TRUE='#'
+  BUILDUTILS_FALSE=
+fi
+
+ if test x$enable_examples = xyes; then
+  BUILDEXAMPLES_TRUE=
+  BUILDEXAMPLES_FALSE='#'
+else
+  BUILDEXAMPLES_TRUE='#'
+  BUILDEXAMPLES_FALSE=
+fi
+
+
+# ---------------------------------------------------------------------
+# Final output
+# ---------------------------------------------------------------------
+ac_config_files="$ac_config_files Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec"
+
+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, 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.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be 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, we kill variables containing newlines.
+# 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.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}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 "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+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_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_CPPUNIT_TRUE}" && test -z "${HAVE_CPPUNIT_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CPPUNIT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_LIBZ_TRUE}" && test -z "${HAVE_LIBZ_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_LIBZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_ICU_TRUE}" && test -z "${HAVE_ICU_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_ICU\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_ICUSWORD_TRUE}" && test -z "${HAVE_ICUSWORD_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_ICUSWORD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_VSNPRINTF_TRUE}" && test -z "${HAVE_VSNPRINTF_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_VSNPRINTF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USELUCENE_TRUE}" && test -z "${USELUCENE_FALSE}"; then
+  as_fn_error $? "conditional \"USELUCENE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${SHAREDLIB_TRUE}" && test -z "${SHAREDLIB_FALSE}"; then
+  as_fn_error $? "conditional \"SHAREDLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${INSTCONF_TRUE}" && test -z "${INSTCONF_FALSE}"; then
+  as_fn_error $? "conditional \"INSTCONF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USECXX11REGEX_TRUE}" && test -z "${USECXX11REGEX_FALSE}"; then
+  as_fn_error $? "conditional \"USECXX11REGEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITHCURL_TRUE}" && test -z "${WITHCURL_FALSE}"; then
+  as_fn_error $? "conditional \"WITHCURL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITHCURLSFTP_TRUE}" && test -z "${WITHCURLSFTP_FALSE}"; then
+  as_fn_error $? "conditional \"WITHCURLSFTP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${INTERNALFTPLIB_TRUE}" && test -z "${INTERNALFTPLIB_FALSE}"; then
+  as_fn_error $? "conditional \"INTERNALFTPLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_INTERNAL_REGEX_TRUE}" && test -z "${USE_INTERNAL_REGEX_FALSE}"; then
+  as_fn_error $? "conditional \"USE_INTERNAL_REGEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${CONFDEF_TRUE}" && test -z "${CONFDEF_FALSE}"; then
+  as_fn_error $? "conditional \"CONFDEF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${USE_PKGCONF_TRUE}" && test -z "${USE_PKGCONF_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PKGCONF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILDTESTS_TRUE}" && test -z "${BUILDTESTS_FALSE}"; then
+  as_fn_error $? "conditional \"BUILDTESTS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILDUTILS_TRUE}" && test -z "${BUILDUTILS_FALSE}"; then
+  as_fn_error $? "conditional \"BUILDUTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${BUILDEXAMPLES_TRUE}" && test -z "${BUILDEXAMPLES_FALSE}"; then
+  as_fn_error $? "conditional \"BUILDEXAMPLES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+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
+IFS=$as_save_IFS
+
+     ;;
+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
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; 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
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# 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
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by sword $as_me 1.7.2, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   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 <sword-bugs@crosswire.org>.
+sword home page: <http://crosswire.org/sword>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+sword config.status 1.7.2
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+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=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+nm_file_list_spec \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib \
+compiler_lib_search_dirs \
+predep_objects \
+postdep_objects \
+predeps \
+postdeps \
+compiler_lib_search_path \
+LD_CXX \
+reload_flag_CXX \
+compiler_CXX \
+lt_prog_compiler_no_builtin_flag_CXX \
+lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
+lt_prog_compiler_static_CXX \
+lt_cv_prog_compiler_c_o_CXX \
+export_dynamic_flag_spec_CXX \
+whole_archive_flag_spec_CXX \
+compiler_needs_object_CXX \
+with_gnu_ld_CXX \
+allow_undefined_flag_CXX \
+no_undefined_flag_CXX \
+hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_separator_CXX \
+exclude_expsyms_CXX \
+include_expsyms_CXX \
+file_list_spec_CXX \
+compiler_lib_search_dirs_CXX \
+predep_objects_CXX \
+postdep_objects_CXX \
+predeps_CXX \
+postdeps_CXX \
+compiler_lib_search_path_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
+old_archive_cmds_CXX \
+old_archive_from_new_cmds_CXX \
+old_archive_from_expsyms_cmds_CXX \
+archive_cmds_CXX \
+archive_expsym_cmds_CXX \
+module_cmds_CXX \
+module_expsym_cmds_CXX \
+export_symbols_cmds_CXX \
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[\\\\\\\`\\"\\\$]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+xsi_shell='$xsi_shell'
+lt_shell_append='$lt_shell_append'
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'
+
+
+
+
+
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
+    "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
+    "tests/cppunit/Makefile") CONFIG_FILES="$CONFIG_FILES tests/cppunit/Makefile" ;;
+    "utilities/Makefile") CONFIG_FILES="$CONFIG_FILES utilities/Makefile" ;;
+    "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
+    "examples/cmdline/Makefile") CONFIG_FILES="$CONFIG_FILES examples/cmdline/Makefile" ;;
+    "utilities/diatheke/Makefile") CONFIG_FILES="$CONFIG_FILES utilities/diatheke/Makefile" ;;
+    "sword.pc") CONFIG_FILES="$CONFIG_FILES sword.pc" ;;
+    "include/swversion.h") CONFIG_FILES="$CONFIG_FILES include/swversion.h" ;;
+    "sword.spec") CONFIG_FILES="$CONFIG_FILES sword.spec" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries 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[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #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.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # 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.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;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&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $_am_arg | $_am_arg:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
+	 X"$_am_arg" : 'X\(//\)$' \| \
+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Older Autoconf quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  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.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_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
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running 'make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "$am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  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 "
+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
+  done
+}
+ ;;
+    "libtool":C)
+
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags="CXX "
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects
+postdep_objects=$lt_postdep_objects
+predeps=$lt_predeps
+postdeps=$lt_postdeps
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+
+ltmain="$ac_aux_dir/ltmain.sh"
+
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
+
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+
+
+    cat <<_LT_EOF >> "$ofile"
+
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# The linker used to build libraries.
+LD=$lt_LD_CXX
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds_CXX
+
+# A language specific compiler.
+CC=$lt_compiler_CXX
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC_CXX
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic_CXX
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static_CXX
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc_CXX
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object_CXX
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds_CXX
+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds_CXX
+module_expsym_cmds=$lt_module_expsym_cmds_CXX
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld_CXX
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag_CXX
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag_CXX
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct_CXX
+
+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L_CXX
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic_CXX
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath_CXX
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs_CXX
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols_CXX
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms_CXX
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms_CXX
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds_CXX
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec_CXX
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action_CXX
+
+# The directories searched by this compiler when creating a shared library.
+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
+
+# Dependencies to place before and after the objects being linked to
+# create a shared library.
+predep_objects=$lt_predep_objects_CXX
+postdep_objects=$lt_postdep_objects_CXX
+predeps=$lt_predeps_CXX
+postdeps=$lt_postdeps_CXX
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+
+# ### END LIBTOOL TAG CONFIG: CXX
+_LT_EOF
+
+ ;;
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# 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 || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+
+echo
+echo
+echo "Configuration:"
+echo     "     LIBDIR:           $libdir"
+echo     "     DEBUG:            $enable_debug"
+echo     "     PROFILE:          $enable_profile"
+echo     "     BUILD TESTS:      $enable_tests"
+echo     "     BUILD EXAMPLES:   $enable_examples"
+echo     "     BUILD UTILITIES:  $enable_utilities"
+echo     "     LIBZ:             $with_zlib"
+echo     "     ICU:              $with_icu"
+echo     "     ICUSWORD:         $with_icusword"
+echo     "     CXX11REGEX:       $with_cxx11regex"
+echo     "     CURL:             $with_curl"
+echo     "     CURL SFTP:        $with_curl_sftp"
+echo     "     INTERNAL FTPLIB:  $with_internalftplib"
+echo     "     INTERNAL REGEX:   $with_internalregex"
+echo     "     CLUCENE:          $with_clucene"
+echo
+echo
+
+
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..bb687cb
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,412 @@
+# ---------------------------------------------------------------------
+# Initialisation
+# ---------------------------------------------------------------------
+
+# Version change: Change line 8 only !
+# Change it immediately after a release
+
+AC_INIT(sword, 1.7.2, sword-bugs@crosswire.org, sword, http://crosswire.org/sword)
+AC_CONFIG_SRCDIR(sword.bmp)
+AC_PREREQ(2.52)
+AC_REVISION($Revision: 1.45 $)
+
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
+
+AM_CONFIG_HEADER(include/config.h)
+
+AC_CONFIG_MACRO_DIR([m4])
+
+case $host_os in
+     mingw*)
+	   # both lines necessary to convince gcc to build dll
+	   LIBS="$LIBS -no-undefined";
+	   export lt_cv_deplibs_check_method=pass_all;
+	   ;;
+esac
+
+# ---------------------------------------------------------------------
+# Check Programs
+# ---------------------------------------------------------------------
+CFLAGS=" $CFLAGS"
+CXXFLAGS=" $CXXFLAGS"
+AC_LANG(C++)
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_INSTALL
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+AC_C_BIGENDIAN
+
+PKG_CHECK_MODULES([CLUCENE2], [libclucene-core >= 2.3],,true)
+if test "x$CLUCENE2_LIBS" = x; then
+ACX_CLUCENE
+fi
+
+# ---------------------------------------------------------------------
+# With options
+# ---------------------------------------------------------------------
+AC_ARG_WITH(zlib,
+	AC_HELP_STRING([--with-zlib],[allow zlib compressed modules (default=yes)]),,with_zlib=yes)
+AC_ARG_WITH(icu,
+	AC_HELP_STRING([--with-icu],[use ICU for unicode (default=yes)]),,with_icu=yes)
+AC_ARG_WITH(icusword,
+	AC_HELP_STRING([--with-icusword],[use custom SWORD ICU (default=no)]),,with_icusword=no)
+AC_ARG_WITH(conf,
+	AC_HELP_STRING([--with-conf],[install a new sword.conf (default=yes)]),,with_conf=yes)
+AC_ARG_WITH(cxx11regex,
+	AC_HELP_STRING([--with-cxx11regex],[build regex support using c++11 regex (default=no)]),,with_cxx11regex=no)
+AC_ARG_WITH(curl,
+	AC_HELP_STRING([--with-curl],[build install manager support using libcurl (default=yes)]),,with_curl=yes)
+AC_ARG_WITH(curl_sftp,
+	AC_HELP_STRING([--with-curl_sftp],[build install manager support using libcurl+sftp (requires --with-curl, default=yes)]),,with_curl_sftp=yes)
+#AC_ARG_WITH(lucene,
+#	AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no)
+AC_ARG_WITH([internalregex],
+	AS_HELP_STRING([--with-internalregex], [Compile using SWORDs internal copy of regex]))
+
+
+# ---------------------------------------------------------------------
+# Enable options
+# ---------------------------------------------------------------------
+AC_ARG_ENABLE(debug,
+	AC_HELP_STRING([--enable-debug],[build debug library (default=no)]),,enable_debug=no)
+AC_ARG_ENABLE(warnings,
+	AC_HELP_STRING([--enable-warnings],[build with compiler warnings as errors (default=no)]),,enable_warnings=no)
+AC_ARG_ENABLE(profile,
+	AC_HELP_STRING([--enable-profile],[allow profiling (default=no)]),,enable_profile=no)
+AC_ARG_ENABLE(profilefn,
+	AC_HELP_STRING([--enable-profilefn],[allow functioncheck profiling (default=no)]),,enable_profilefn=no)
+AC_ARG_ENABLE(tests,
+	AC_HELP_STRING([--enable-tests],[build test programs (default=yes)]),,enable_tests=yes)
+AC_ARG_ENABLE(utilities,
+	AC_HELP_STRING([--enable-utilities],[build utilities (default=yes)]),,enable_utilities=yes)
+AC_ARG_ENABLE(examples,
+	AC_HELP_STRING([--enable-examples],[build examples (default=no)]),,enable_examples=no)
+AM_MAINTAINER_MODE
+
+# ---------------------------------------------------------------------
+# Debug and profile
+# ---------------------------------------------------------------------
+
+# these are first because the SET AM_C.*FLAGS, not just append
+if test x$enable_debug = xyes; then
+  GCJFLAGS="-g -O0"
+  if test x$ac_cv_prog_cc_g = xyes; then
+    AM_CFLAGS="-g3 -O0 -Wall -Werror"
+  else
+    AM_CFLAGS="-O0 -Wall -Werror"
+  fi
+  if test x$ac_cv_prog_cxx_g = xyes; then
+    AM_CXXFLAGS="-g3 -O0 -Wall -Werror -Woverloaded-virtual"
+  else
+    AM_CXXFLAGS="-O0 -Wall -Werror -Woverloaded-virtual"
+  fi
+else
+  AM_CFLAGS="-O3"
+  AM_CXXFLAGS="-O3"
+fi
+
+AM_CFLAGS="$AM_CFLAGS -fPIC"
+AM_CXXFLAGS="$AM_CXXFLAGS -fPIC"
+
+# ---------------------------------------------------------------------
+# Check libraries
+# ---------------------------------------------------------------------
+if test x$with_zlib  = xyes; then
+	AC_CHECK_LIB(z, compress,,with_zlib="no")
+else
+	with_zlib="no"
+fi
+
+if test x$with_zlib = xno; then
+	AM_CFLAGS="$AM_CFLAGS -DEXCLUDEZLIB"
+	AM_CXXFLAGS="$AM_CXXFLAGS -DEXCLUDEZLIB"
+fi
+
+AS_IF([test "x$with_internalregex" = "xyes"],
+      [have_systemregex="no"],
+      [AC_SEARCH_LIBS(regexec, regex, [have_systemregex="yes"], [have_systemregex="no"])])
+
+AS_IF([test "x$have_systemregex" = "xyes"],
+      [with_internalregex="no"
+       AC_MSG_NOTICE([Using system regex.h])],
+      [with_internalregex="yes"
+       AS_IF([test "x$with_internalregex" = "xno"],
+      	[AC_MSG_ERROR([System regex forced but not found])],
+	[AC_MSG_NOTICE([Using internal regex.h])])])
+ 
+
+# ---------------------------------------------------------------------
+# Find CppUnit
+# ---------------------------------------------------------------------
+# Locate CppUnit (minimum version 1.8.0) for testing.  
+AM_PATH_CPPUNIT(1.8.0)
+
+# You can set up an automake conditional and use it to conditionally
+# build cppunit-using test programs.
+AM_CONDITIONAL(HAVE_CPPUNIT, test "$CPPUNIT_LIBS")
+
+
+# ---------------------------------------------------------------------
+# Find pkg-config
+# ---------------------------------------------------------------------
+use_pkgconfig=yes
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test x$PKG_CONFIG = xno ; then
+  AC_MSG_WARN([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
+  AC_MSG_WARN([not using pkg-config])
+  use_pkgconfig=no
+fi
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.14 ; then
+  :
+else
+  AC_MSG_WARN([*** pkg-config too old; version 0.14 or better required.])
+  AC_MSG_WARN([not using pkg-config])
+  use_pkgconfig=no
+fi
+
+
+# ---------------------------------------------------------------------
+# Find ICU tools
+# ---------------------------------------------------------------------
+ICU_VER=
+ICU_LIBS=
+ICU_IOLIBS=
+if test x$with_icu = xyes; then
+	AC_PATH_PROG(ICU_CONFIG, icu-config, no)
+# The icu-config script was new in icu 2.2
+	if test "$ICU_CONFIG" = "no" ; then
+	   echo "*** The icu-config script installed by icu could not be found"
+	   echo "*** continuing anyway and assuming 2.1 or earlier"
+	   ICU_VER="2.1"
+	   ICU_LIBS="-licui18n -licuuc -licudata"
+	   ICU_IOLIBS="-lustdio"
+	else
+	   ICU_VER=`$ICU_CONFIG --version`
+	   ICU_LIBS=`$ICU_CONFIG --ldflags`
+	   #ICU_IOLIBS=`if test $(echo "$ICU_VER >= 3.0"|bc) -eq 1; then $ICU_CONFIG --ldflags-icuio; else $ICU_CONFIG --ldflags-ustdio; fi;`
+	   ICU_IOLIBS=`$ICU_CONFIG --ldflags-icuio`
+	fi
+     AM_CXXFLAGS="$AM_CXXFLAGS -D_ICU_"
+     AM_CFLAGS="$AM_CFLAGS -D_ICU_"
+fi
+
+if test "x$ICU_LIBS" != x; then
+	with_icu=yes
+	LIBS="$LIBS $ICU_LIBS $ICU_IOLIBS"
+else
+	with_icu=no
+fi
+
+
+if test x$with_icusword = xyes; then
+AM_CXXFLAGS="$AM_CXXFLAGS -D_ICUSWORD_"
+AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_"
+fi
+
+
+AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
+
+if test x$enable_warnings = xyes; then
+  AM_CFLAGS="$AM_CFLAGS -Werror"
+  AM_CXXFLAGS="$AM_CXXFLAGS -Werror -Woverloaded-virtual"
+fi
+
+if test x$enable_profile = xyes; then
+  AM_CFLAGS="$AM_CFLAGS -pg"
+  AM_CXXFLAGS="$AM_CXXFLAGS -pg"
+fi
+if test x$enable_profilefn = xyes; then
+  AM_CFLAGS="$AM_CFLAGS -g -finstrument-functions"
+  AM_CXXFLAGS="$AM_CXXFLAGS -g -finstrument-functions"
+  LIBS="$LIBS -g -finstrument-functions -lfnccheck"
+fi
+
+# ---------------------------------------------------------------------
+# Check for curl for installmgr suport
+# ---------------------------------------------------------------------
+
+with_internalftplib=no
+if test x$with_curl = xyes; then
+    AC_PATH_PROG(CURL_CONFIG, curl-config, no)
+    if test "$CURL_CONFIG" = "no" ; then
+	echo "*** The curl-config script installed by curl could not be found"
+	echo "*** compiling without libcurl support"
+	with_curl=no
+	with_curl_sftp=no
+	with_internalftplib=yes
+    else
+	echo "curl found - remote install options available"
+	CURL_AM_CFLAGS=`$CURL_CONFIG --cflags`
+	CURL_LIBS=`$CURL_CONFIG --libs`
+	AM_CXXFLAGS="$AM_CXXFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS"
+	AM_CFLAGS="$AM_CFLAGS -DCURLAVAILABLE $CURL_AM_CFLAGS"
+	LIBS="$LIBS $CURL_LIBS"
+	if test x$with_curl_sftp = xyes; then
+		if test x`$CURL_CONFIG --protocols|grep SFTP|wc -l` = x1; then
+			AM_CXXFLAGS="$AM_CXXFLAGS -DCURLSFTPAVAILABLE"
+			AM_CFLAGS="$AM_CFLAGS -DCURLSFTPAVAILABLE"
+		else
+			with_curl_sftp=no;
+		fi
+	fi
+    fi
+else
+	with_curl=no;
+	with_curl_sftp=no;
+	with_internalftplib=yes
+fi
+
+if test x$with_cxx11regex = xyes; then
+	AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100"
+fi
+
+# ---------------------------------------------------------------------
+# Check for clucene for lucene searching support
+# ---------------------------------------------------------------------
+
+# NOTE the $libdir hack at the end of the c[xx]flags.  Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
+with_clucene=no
+if test "x$CLUCENE2_LIBS" != x; then
+   echo "clucene 2.x found - lucene searching options available"
+   AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
+   AM_CFLAGS="$AM_CFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
+   LIBS="$LIBS $CLUCENE2_LIBS"
+   with_clucene="yes 2.x"
+   CLUCENE_LIBS="$CLUCENE_LIBS $CLUCENE2_LIBS"
+else
+if test "x$CLUCENE_LIBS" != x; then
+   echo "lucene 0.x found - lucene searching options available"
+   AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE_CXXFLAGS -DUSELUCENE -I$libdir"
+   AM_CFLAGS="$AM_CFLAGS -DUSELUCENE -I$libdir"
+   LIBS="$LIBS $CLUCENE_LIBS"
+   with_clucene="yes 0.x"
+else
+   echo "lucene searching options not available"
+fi
+fi
+
+AC_CHECK_FUNCS(vsnprintf, [have_vsnprintf="yes"])
+
+# ---------------------------------------------------------------------
+# Alter global conf directory only if not /etc
+# ---------------------------------------------------------------------
+
+if test "x$sysconfdir" = "x/etc"; then
+  dir_confdef="no"
+else
+  dir_confdef="yes"
+fi
+
+changequote(<<,>>)
+V1=`expr $VERSION : '\([0-9]*\)\.[0-9]*\.*[0-9]*\.*[0-9]*'`
+V2=`expr $VERSION : '[0-9]*\.\([0-9]*\)\.*[0-9]*\.*[0-9]*'`
+V3=`expr $VERSION : '[0-9]*\.[0-9]*\.*\([0-9]*\)\.*[0-9]*'`
+V4=`expr $VERSION : '[0-9]*\.[0-9]*\.*[0-9]*\.*\([0-9]*\)'`
+changequote([,])
+
+SWORD_VERSION_STR=$VERSION
+SWORD_VERSION_MAJOR=$V1
+SWORD_VERSION_MINOR=$V2
+SWORD_VERSION_MICRO=$V3
+if test "$V4" = "" ; then V4=0; fi
+SWORD_VERSION_NANO=$V4
+
+if test "$V2" -le 9 ; then V2=0$V2 ; fi
+if test "$V3" -le 9 ; then V3=00$V3 ; elif test "$V3" -le 99 ; then V3=0$V3 ; fi
+if test "$V4" -le 9 ; then V4=00$V4 ; elif test "$V4" -le 99 ; then V4=0$V4 ; fi
+SWORD_VERSION_NUM=$V1$V2$V3$V4
+
+AC_SUBST(SWORD_VERSION_NUM)
+AC_SUBST(SWORD_VERSION_STR)
+AC_SUBST(SWORD_VERSION_MAJOR)
+AC_SUBST(SWORD_VERSION_MINOR)
+AC_SUBST(SWORD_VERSION_MICRO)
+AC_SUBST(SWORD_VERSION_NANO)
+
+
+
+# ---------------------------------------------------------------------
+# Substitute variables into makefiles
+# ---------------------------------------------------------------------
+AC_SUBST(with_zlib)
+AC_SUBST(with_icu)
+AC_SUBST(with_icusword)
+AC_SUBST(with_conf)
+AC_SUBST(dir_confdef)
+AC_SUBST(CC)
+AC_SUBST(ICU_VER)
+AC_SUBST(enable_debug)
+AC_SUBST(enable_profile)
+
+AC_SUBST(AM_CXXFLAGS)
+AC_SUBST(AM_CFLAGS)
+
+AC_SUBST(target_cpu)
+AC_SUBST(target_vendor)
+AC_SUBST(target_os)
+
+AC_SUBST(target_system)
+AC_SUBST(target_mingw32)
+
+AC_SUBST(CURL_LIBS)
+AC_SUBST(ICU_LIBS)
+AC_SUBST(ICU_IOLIBS)
+AC_SUBST(CLUCENE_LIBS)
+
+
+# ---------------------------------------------------------------------
+# Conditional variables
+# ---------------------------------------------------------------------
+
+AM_CONDITIONAL(HAVE_LIBZ, test x$with_zlib = xyes)
+AM_CONDITIONAL(HAVE_ICU, test x$with_icu = xyes)
+AM_CONDITIONAL(HAVE_ICUSWORD, test x$with_icusword = xyes)
+AM_CONDITIONAL(HAVE_VSNPRINTF, test x$have_vsnprintf = xyes)
+
+AM_CONDITIONAL(USELUCENE, test "x$with_clucene" != xno)
+AM_CONDITIONAL(SHAREDLIB, test x$enable_shared = xyes)
+AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes)
+AM_CONDITIONAL(USECXX11REGEX, test x$with_cxx11regex = xyes)
+AM_CONDITIONAL(WITHCURL, test x$with_curl = xyes)
+AM_CONDITIONAL(WITHCURLSFTP, test x$with_curl_sftp = xyes)
+AM_CONDITIONAL(INTERNALFTPLIB, test x$with_internalftplib = xyes)
+AM_CONDITIONAL(USE_INTERNAL_REGEX, test x$with_internalregex = xyes)
+AM_CONDITIONAL(CONFDEF, test x$dir_confdef = xyes)
+AM_CONDITIONAL(USE_PKGCONF, test x$use_pkgconfig = xyes)
+AM_CONDITIONAL(BUILDTESTS, test x$enable_tests = xyes)
+AM_CONDITIONAL(BUILDUTILS, test x$enable_utilities = xyes)
+AM_CONDITIONAL(BUILDEXAMPLES, test x$enable_examples = xyes)
+
+# ---------------------------------------------------------------------
+# Final output
+# ---------------------------------------------------------------------
+AC_CONFIG_FILES(Makefile lib/Makefile tests/Makefile tests/cppunit/Makefile utilities/Makefile examples/Makefile examples/cmdline/Makefile utilities/diatheke/Makefile sword.pc include/swversion.h sword.spec)
+AC_OUTPUT
+
+echo
+echo
+echo "Configuration:"
+echo     "     LIBDIR:           $libdir"
+echo     "     DEBUG:            $enable_debug"
+echo     "     PROFILE:          $enable_profile"
+echo     "     BUILD TESTS:      $enable_tests"
+echo     "     BUILD EXAMPLES:   $enable_examples"
+echo     "     BUILD UTILITIES:  $enable_utilities"
+echo     "     LIBZ:             $with_zlib"
+echo     "     ICU:              $with_icu"
+echo     "     ICUSWORD:         $with_icusword"
+echo     "     CXX11REGEX:       $with_cxx11regex"
+echo     "     CURL:             $with_curl"
+echo     "     CURL SFTP:        $with_curl_sftp"
+echo     "     INTERNAL FTPLIB:  $with_internalftplib"
+echo     "     INTERNAL REGEX:   $with_internalregex"
+echo     "     CLUCENE:          $with_clucene"
+echo
+echo
+
+
+
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..fd2351f
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,29 @@
+You can download extra modules from:
+
+  http://www.crosswire.org/sword/modules/
+
+then install modules in /usr/local/share/sword
+
+# cd /usr/local/share/sword
+# unzip ~/SwordMod.zip
+
+That method of install is not supported.
+
+Alternatively, for use on a user by user basis install them to 
+~/.sword
+
+Another alternative is to use the new commandline installmgr application, 
+or use BibleTime's install functionality.
+
+To use installmgr - by default it will install to ~/.sword
+the default remoteSrcName is crosswire:
+  $ installmgr -init
+  $ installmgr -r <remoteSrcName>
+  $ installmgr -rl <remoteSrcName>   list available modules from remote source
+  $ installmgr -ri <remoteSrcName> <modName> install module from remote source
+
+Also, feel free to join us on IRC at irc.freenode.net #sword
+
+:)
+Daniel
+
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..3f241a4
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package is using quilt for patching upstream source.
+
+Please see /usr/share/doc/quilt/README.source.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com>, Mon,  4 Jan 2010 01:05:24 +0200
diff --git a/debian/bzr-builddeb.conf b/debian/bzr-builddeb.conf
new file mode 100644
index 0000000..92dd76e
--- /dev/null
+++ b/debian/bzr-builddeb.conf
@@ -0,0 +1,4 @@
+[BUILDDEB]
+commit-message-from-changelog=True
+quilt-tree-policy=applied
+quilt-commit-policy=applied
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..f4ddb00
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,935 @@
+sword (1.7.2+dfsg-2) unstable; urgency=medium
+
+  * Correct shared library symlink. (Closes: #747420)
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Sun, 11 May 2014 22:09:52 +0100
+
+sword (1.7.2+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Rebase patches.
+  * icu translit files are no longer generated, don't install them.
+  * drop installing greek transliteration doc.
+  * bump abi to 10.
+  * switch to debhelper 9.
+
+ -- Dimitri John Ledkov <xnox@debian.org>  Sat, 19 Apr 2014 15:05:09 +0100
+
+sword (1.6.2+dfsg-6) unstable; urgency=low
+
+  [ Rene Engelhard ]
+  * fix FTBFS: remove include/zconf.h and don't rely on it (closes: #707537)
+  
+  [ Dmitrijs Ledkovs ]
+  * Add patch to build against clucene-core 2.
+
+ -- Dmitrijs Ledkovs <xnox@debian.org>  Sun, 04 Aug 2013 19:20:31 +0100
+
+sword (1.6.2+dfsg-5ubuntu1) raring; urgency=low
+
+  * Build against clucene-core 2.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Wed, 21 Nov 2012 01:45:59 +0000
+
+sword (1.6.2+dfsg-5) unstable; urgency=low
+
+  * Fix FTBFS due to icu changes (Closes: #676097).
+
+ -- Dmitrijs Ledkovs <xnox@debian.org>  Thu, 07 Jun 2012 07:49:56 +0100
+
+sword (1.6.2+dfsg-4) unstable; urgency=low
+
+  [ Matthias Klose ]
+  * Fix build failure in installed header file with GCC 4.7.
+    Addresses: #667387.
+
+  [ Dmitrijs Ledkovs ]
+  * Remove python-sword swig bindings. Loads of build-time warnings (4.6)
+    and errors (4.7) and the resulting module was reported not to
+    work. Should be readded if/when it can be build with gcc 4.7 without
+    errors. (Closes: #667387)
+
+ -- Dmitrijs Ledkovs <xnox@debian.org>  Tue, 17 Apr 2012 21:39:11 +0100
+
+sword (1.6.2+dfsg-3) unstable; urgency=low
+
+  * Fix FTBFS if running binary-arch target only.
+
+ -- Dmitrijs Ledkovs <xnox@debian.org>  Mon, 09 Apr 2012 14:58:48 +0100
+
+sword (1.6.2+dfsg-2) unstable; urgency=low
+
+  [ Dmitrijs Ledkovs <xnox@debian.org> ]
+  * Fix linking against CLucene
+  * Backport CMake changes
+  * Set sword config path to /etc
+  * ABI was broken in 1.6.2, bump soname to libsword9 (Closes: 663096)
+  * Split libswordX into libswordX, -utils & -common, to make libswordX
+    non-conflicting with libswordX+1
+
+ -- Dmitrijs Ledkovs <xnox@debian.org>  Sat, 07 Apr 2012 14:22:48 +0100
+
+sword (1.6.2+dfsg-1) unstable; urgency=low
+  
+  [ Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> ]
+  * Revamped debian/rules to use dh tiny rules style
+  * Raised compat to debhelper 7 and change associated packaging files
+  * Use CMake to build sword
+  * debian/patches/02_libver.diff: dropped, using CMake variable
+  * Add debian/source/local-options with VCS friendly options
+  * Add .bzr-builddeb/default.conf to facilitate building from bzr
+  * Use dpkg-buildflags
+  * Make CMake honour environmental variables
+  * Create python-sword package (LP: #49959) (Closes: 640357)
+  * document vs2osisreftxt.1
+  * 3.0 (quilt) format only (launchpad ppa supports it now)
+  * fix gcc-4.6 warnings
+  * Additional compiler error fix, thanks to
+    "brian m. carlson" <sandals@crustytoothpaste.net> (Closes: 624962)
+  * Updated debian/copyright to match the updated dep-5 spec
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Tue, 30 Nov 2010 23:06:43 +0000
+
+sword (1.6.1+dfsg-2) unstable; urgency=low
+
+  [ Dmitrijs Ledkovs ]
+  * Fixed lintian warning about watch file.
+  * debian/patches/13_curl - Upstream fix for curl 7.20 compatibility.
+  * bumped standards version to 3.8.4 - no changes required.
+  * Update email address.
+  * Added upstream changelog.
+  * debian/copyright:
+    - Removed reference to unversioned GPL license
+    - Two files do not explictly specify GPL version
+    - Based on clause 9 GPL-2 & clause 14 GPL-3, GPL-2 is selected such
+    that to be compatible with the rest of sword
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Mon, 22 Mar 2010 19:14:19 +0000
+
+sword (1.6.1+dfsg-1) unstable; urgency=low
+
+  [ Jonathan Marsden ]
+  * debian/libsword8.examples: Add missing tcl eggdrop bot script.
+
+  [ Dmitrijs Ledkovs ]
+  * Drop shipping .la file in favour of pkg-config (Debian release goal)
+    - More info http://lists.debian.org/debian-devel/2009/08/msg00783.html
+  * Drop backported patches, refreshed libver & compiler warnings.
+  * Compiling with -Werror enabled. 
+  * Bumped standards version to 3.8.3, no changes needed.
+  * Added debian/README.source documentation quilt usage
+  * Added configure option --without-internalregex
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com>  Thu, 21 Jan 2010 00:10:17 +0000
+
+sword (1.6.0+dfsg-1) unstable; urgency=low
+
+  [ Jonathan Marsden ]
+  * New upstream release. (Closes: #507960) (LP: #320558)
+  * debian/patches/02_libver.diff:
+    - Bump SONAME to 8 -- SWORD 1.6 is not backward compatible with 1.5.11.
+  * debian/patches/series:
+    - Remove 10_diatheke.diff -- included in upstream source.
+  * debian/patches/:
+    - Remove several old unused .diff files.
+    - Add 11_regex_only_when_needed.diff to conditionally include regex lib.
+    - Add 12_fix_compiler_warnings.diff to remove all compiler warnings.
+    - Add 13_fix_osis2mod_compression_default.diff from upstream svn.
+    - Add 14_closing_section_not_chapter.diff from upstream svn.
+  * debian/libsword7.*: 
+    - Rename to libsword8.*
+    - Change libsword7 to libsword8 within files.
+  * debian/rules: 
+    - SONAME bump to 8.
+    - Set library version check to >= 1.6
+  * debian/control:
+    - Change libsword7 to libsword8.
+    - Add libsword7 to Conflicts.
+    - Fix case of sword to SWORD in package descriptions.
+    - Bump Standards-Version to 3.8.1 (no changes needed).
+    - Fix section for libsword-dbg to avoid lintian warning.
+  * debian/rules:
+    - Add DFSG get-orig-source target.
+  * debian/copyright:
+    - Fix various mistakes in initial attempt to document copyrights.
+  
+  [ Dmitrijs Ledkovs ]
+  * debian/rules: Added utils.mk to use missing-files target and call it on
+    each build.
+  * debian/libsword-dev.install: Added libsword.la, previously missing.
+  * debian/libsword7.install: Added missing libicu translit files.
+  * debian/control:
+    - Updated all uses of SWORD version to 1.6
+    - Added libsword-dbg package
+  * debian/watch: Fixed a small mistake which was resulting in extra "."
+    in final version name.
+  * debian/rules: simplified manpage processing.
+  * debian/libsword8.lintian-overrides: added override for module
+    installation directory.
+  * debian/copyright: Updated with information about everyfile.
+    Closes: #513448 LP: #322638
+  * debian/diatheke.examples: moved examples here from the diatheke.install
+  * debian/rules:
+    - enabled shell script based testsuite
+    - added commented out cppunit testsuite
+  * debian/patches/40_missing_includes.diff: 
+    - added several missing stdio.h includes to prevent FTBFS of testsuite.
+  
+  [ Closed Bugs ]
+  * FTBFS on intrepid (LP: #305172)
+
+ -- Jonathan Marsden <jmarsden@fastmail.fm>  Sat, 30 May 2009 11:55:55 -0700
+
+sword (1.5.11-1) experimental; urgency=low
+
+  [Jonathan Marsden]
+  * New upstream release
+  * debian/rules:
+    - Switch to using more normal CDBS/autotools not tarball in tarball.
+    - Build against libicu for better i18n support.
+    - Use chrpath on installed binaries to get rid of lintian warnings.
+    - Set DEB_DH_MAKESHLIBS_ARGS to (>= 1.5.11) not (>=1.5.11-1).
+    - Add pod2man command to generate tei2mod man page.
+    - Use -n option on pod2man commands to fix command names in man pages.
+  * Bump SONAME to 7.
+    - Rename debian/libsword6.* appropriately.
+    - Change 6 to 7 in several scripts including debian/rules
+      and debian/control
+  * debian/patches:
+    - Remove most patches as being unnecessary now.
+    - Simplify debian/patches/02_libver.diff to only edit the version-info.
+  * debian/control:
+    - Bump Standards-Version to 3.8.0.
+    - Update diatheke one-line description (cli tool not CGI script).
+    - Removed recommends of a web server for diatheke.
+    - Edit description of diatheke removing references to web/CGI.
+    - Add ${misc:Depends} to Depends of binary packages.
+    - Add Homepage tag
+    - Update Conflicts: to libsword6.
+    - Update Replaces: to include libsword6.
+  * debian/*:
+    - Move CGI scripts to install as examples, for security reasons.
+    - Add debian/diatheke.README.Debian explaining move of CGI scripts.
+    - Minimize unnecessary debian/*.dirs files and entries in them.
+    - Remove unnecessary debian/libsword7.shlibs file.
+  * debian/diatheke.1:
+    - Escape all unescaped dashes.
+    - Add trailing newline.
+  * debian/diatheke.manpages:
+    - Create file, add debian/diatheke.1 so this man page is included in
+      the diatheke binary package.
+  * debian/libsword7.install:
+    - Add missing usr/bin/tei2mod entry so the tei2mod command is installed.
+  * debian/libsword7.manpages:
+    - Add an entry for tei2mod.1 man page.
+  * debian/tei2mod.1.pod:
+    - Add the tei2mod man page source.
+
+  [Dmitrijs Ledkovs]
+  * debian/*.pod
+    - Added manpages for all utilities.
+  * debian/rules
+    - Added rules to generate manpages from POD.
+  * debian/libsword7.manpages
+    - Created manpages list.
+  * debian/control
+    - Set maintainer to CrossWire Packaging team
+    - Set uploaders: Daniel Glassey, Dmitrijs Ledkovs, Jonathan Marsden
+    - Extended descriptions of the packages
+  * debian/changelog
+    - updated formatting, sorted by developer
+  * debian/copyrights
+    - updated to proposed copyright format
+  * debian/patches
+    - added patch descriptions
+
+ -- Jonathan Marsden <jmarsden@fastmail.fm>  Sat, 04 Apr 2009 23:09:16 -0700
+
+sword (1.5.9-8.1ubuntu1) intrepid; urgency=low
+
+  * Fakesync with Debian unstable (LP: #234580)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com>  Wed, 28 May 2008 15:38:08 +0200
+
+sword (1.5.9-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Amend 08_gcc_43.diff to fix GCC 4.3 FTBFS (Closes: #474824)
+  * debian/control:
+    - Build-Depend on cdbs >= 0.4.27 instead of 0.4.27-1.
+    - Bump Standards-Version to 3.7.3.
+    - Use ${binary:Version} instead of ${Source-Version}.
+
+ -- Chris Lamb <chris@chris-lamb.co.uk>  Sat, 12 Apr 2008 00:00:29 +0100
+
+sword (1.5.9-8ubuntu1) hardy; urgency=low
+
+  * Fakesync from Debian unstable.
+  * Fixes CVE-2008-0932. (LP: #195696)
+
+ -- William Grant <william.grant@ubuntu.org.au>  Sun, 16 Mar 2008 20:59:00 +1100
+
+sword (1.5.9-8) unstable; urgency=high
+
+  * diatheke failed to use shell_escape for the range parameter 
+    properly, Closes: #466449
+
+ -- Daniel Glassey <wdg@debian.org>  Mon, 18 Feb 2008 22:57:25 +0000
+
+sword (1.5.9-7.1) unstable; urgency=medium
+
+  [ Luk Claes ]
+  * Non-maintainer upload.
+  * Don't ship the libsword.la file anymore (Closes: #444562).
+  * Don't rely on libclucene.la anymore (Closes: #445776).
+
+ -- root <luk@debian.org>  Sat, 02 Feb 2008 15:46:07 +0000
+
+sword (1.5.9-7) unstable; urgency=low
+
+  * libsword-dev should not depend on libclucene-dev
+    or libc6-dev, libz-dev, libcurl4-gnutls-dev
+  * patch 09_pcfile.diff don't link apps to all these libs
+  * update patch 02_libver.diff link lib to clucene
+
+ -- Daniel Glassey <wdg@debian.org>  Fri, 31 Aug 2007 16:33:10 +0100
+
+sword (1.5.9-6ubuntu1) gutsy; urgency=low
+
+  * Fakesync from Debian unstable
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Lionel Porcheron <lionel.porcheron@ubuntu.com>  Sun, 08 Jul 2007 22:51:24 +0200
+
+sword (1.5.9-6) unstable; urgency=low
+
+  * debian/control: diatheke should recommend apache2 now
+  * unmet Recommends on libapache-mod-perl | apache-perl (Closes:
+    #429565)
+
+ -- Daniel Glassey <wdg@debian.org>  Fri, 22 Jun 2007 10:45:24 +0100
+
+sword (1.5.9-5ubuntu2) gutsy; urgency=low
+
+  * Rebuild for the libcurl transition mess.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Thu,  5 Jul 2007 14:11:58 +1000
+
+sword (1.5.9-5ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Modify Maintainer value to match Debian-Maintainer-Fied Spec
+
+ -- Raphael Pinson <raphink@ubuntu.com>  Wed,  6 Jun 2007 15:53:55 +0200
+
+sword (1.5.9-5) unstable; urgency=low
+
+  * debian/control change libsword-dev dependency to 
+      libcurl4-gnutls-dev, Closes: #423936
+  * include patch to build with gcc 4.3, Closes: #417717
+
+ -- Daniel Glassey <wdg@debian.org>  Sat, 19 May 2007 16:22:41 -0600
+
+sword (1.5.9-4ubuntu1) gutsy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+  * Fakesync
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Sat, 19 May 2007 14:23:34 +1000
+
+sword (1.5.9-4) unstable; urgency=low
+
+  * debian/control curl transition, change build dep to 
+      libcurl4-gnutls-dev, Closes: #423936, #423958
+  * enable 06_warnings and 07_warn_tools patches 
+
+ -- Daniel Glassey <wdg@debian.org>  Tue, 15 May 2007 07:56:16 -0600
+
+sword (1.5.9-3build1) feisty; urgency=low
+
+  * Fakesync due to mismatched orig.tar.gz (no Ubuntu changes).
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 12 Jan 2007 14:05:22 +0100
+
+sword (1.5.9-3) unstable; urgency=high
+
+  * patch 06_warnings.diff - modifications to fix some compiler warnings 
+        (not enabled in this version)
+  * patch 07_warnings_tools.diff - modifications to fix some compiler warnings 
+        (not enabled in this version)
+  * debian/control: diatheke to recommend not depend on webserver as
+      the script can be used on its own, Closes: #358535
+  * patch 04_ziplock.diff to fix error when uncompressing locked modules
+      IMPORTANT - prevents a crash with bibletime and locked modules
+      so urgency high
+  * patch 05_getline.diff prevents potential use of uninitialised var
+  * rename diffs to xx_name.diff
+
+ -- Daniel Glassey <wdg@debian.org>  Fri, 24 Nov 2006 15:14:05 +0000
+
+sword (1.5.9-2) unstable; urgency=low
+
+  * Use CLUCENE_LIBS not LUCENE_LIBS in sword.pc.in
+       so that frontends will just link to clucene
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 23 Nov 2006 11:37:17 +0000
+
+sword (1.5.9-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/control:
+      changes to API so new package libsword6, replaces libsword5c2a
+      don't depend on libicu36-dev
+			(would have depended on libicu36-dev instead of icu34)
+  * debian/rules:
+      shlibs for libsword6
+      new upstream tarball
+			use --with-clucene=/usr
+			don't build with icu
+  * remove debian/control.in
+  * debian/libsword6.dirs: rename
+  * debian/libsword6.docs: rename and refer to correct dir
+  * debian/libsword6.install: rename and use new .so name
+  * debian/libsword6.shlibs: rename and use new .so name
+  * debian/patches: don't need utilities patch, update lib version patch
+  * debian/diatheke*: refer to 1.5.9 directory
+
+ -- Daniel Glassey <wdg@debian.org>  Mon, 25 Sep 2006 19:53:37 +0100
+
+sword (1.5.9-0ubuntu3) edgy; urgency=low
+
+  * Update debian/libsword6.shlibs with Ubuntu version of lib 
+
+ -- Raphaël Pinson <raphink@ichthux.com>  Thu, 28 Sep 2006 11:04:42 +0200
+
+sword (1.5.9-0ubuntu2) edgy; urgency=low
+
+  * Shlibs created with libsword6 >= 1.5.9-0ubuntu1 in debian/rules
+
+ -- Raphaël Pinson <raphink@ichthux.com>  Tue, 26 Sep 2006 08:18:34 +0200
+
+sword (1.5.9-0ubuntu1) edgy; urgency=low
+
+  [ Daniel Glassey ]
+  * New upstream version
+  * debian/control:
+      changes to API so new package libsword6, replaces libsword5c2a
+      don't depend on libicu36-dev
+			(would have depended on libicu36-dev instead of icu34)
+  * debian/rules:
+      shlibs for libsword6
+      new upstream tarball
+			use --with-clucene=/usr
+			don't build with icu
+  * remove debian/control.in
+  * debian/libsword6.dirs: rename
+  * debian/libsword6.docs: rename and refer to correct dir
+  * debian/libsword6.install: rename and use new .so name
+  * debian/libsword6.shlibs: rename and use new .so name
+  * debian/patches: don't need utilities patch, update lib version patch
+  * debian/diatheke*: refer to 1.5.9 directory
+
+  [ Raphaël Pinson ]
+  * Bump debhelper version to 5
+
+ -- Raphaël Pinson <raphink@ichthux.com>  Tue, 26 Sep 2006 07:30:20 +0200
+
+sword (1.5.8-9) unstable; urgency=low
+
+  * build using clucene, build-deps on libclucene-dev
+  * not released, but applies to 1.5.9
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 14 Dec 2005 19:46:26 +0000
+
+sword (1.5.8-8) unstable; urgency=low
+
+  * fix build depends wrt cdbs autogenerated version
+  * debian/rules: fix shlibsdeps
+
+ -- Daniel Glassey <wdg@debian.org>  Sat, 10 Dec 2005 20:25:24 +0000
+
+sword (1.5.8-7) unstable; urgency=medium
+
+  * ackknowledge NMU, thanks, Closes: #339269
+  * don't autogenerate debian/control using cdbs
+  * use gnutls version of curl since sword is GPLd
+
+ -- Daniel Glassey <wdg@debian.org>  Thu,  8 Dec 2005 10:42:17 +0000
+
+sword (1.5.8-6.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Medium-urgency upload for RC bugfix.
+  * Rename libsword5 to libsword5c2a for the C++ mt allocator ABI transition,
+    and conflict/replace libsword5 accordingly (closes: #339269).
+
+ -- Steve Langasek <vorlon@debian.org>  Mon,  5 Dec 2005 00:10:19 -0800
+
+sword (1.5.8-6) unstable; urgency=low
+
+  * build dep on a version of libcurl3-openssl-dev that has the
+       correct depends, Closes: #334667
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 19 Oct 2005 08:52:38 +0100
+
+sword (1.5.8-5) unstable; urgency=low
+
+  * rebuild against curl and openssl
+  * build depend on libcurl3-openssl-dev instead of libcurl3-dev
+  * libsword-dev depends on libcurl3-openssl-dev
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 13 Oct 2005 11:44:39 +0100
+
+sword (1.5.8-4) unstable; urgency=low
+
+  * debian/rules: shlibs should be for libsword5 >= 1.5.8-3
+
+ -- Daniel Glassey <wdg@debian.org>  Fri,  9 Sep 2005 12:00:29 +0100
+
+sword (1.5.8-3) unstable; urgency=low
+
+  * debian/libsword5.shlibs: Fix shlibs problem for bug #323116
+  * updated FSF address in copyright
+  * remove libsword5.conffiles to stop duplication
+  * change the lib soname to 5 rather than 1.5.8
+
+ -- Daniel Glassey <wdg@debian.org>  Wed,  7 Sep 2005 15:44:47 +0100
+
+sword (1.5.8-2) unstable; urgency=low
+
+  * Don't install libsword-1.5.8.so to both packages
+  * html docs aren't in sword any more so remove libsword-dev.doc-base
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 11 Aug 2005 16:07:03 +0100
+
+sword (1.5.8-1) unstable; urgency=low
+
+  * New upstream release
+     so new package libsword5, no need for libsword4c2 now
+  * Thanks for the gcc4 fix, acknowledge NMU (Closes: #288586)
+  * Change to using cdbs and quilt to manage patches
+  * include imp2gbs and xml2gbs utilities
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 10 Aug 2005 15:44:34 +0100
+
+sword (1.5.7-7.1) unstable; urgency=low
+
+  * Non-Maintainer Upload
+  * C++ transition: libsword4 -> libsword4c2
+  * Fix gcc4 compile error: Use intptr_t as type for pointers, not 'int'
+    (Closes: #288586)
+  * Debhelper compat level 4, to fix calls to ldconfig properly, and drop a
+    lot of manual stuff
+  * Run dh_makeshlibs *before* dh_installdeb
+  * Fix broken dh_shlibs invocation
+
+ -- Jeroen van Wolffelaar <jeroen@wolffelaar.nl>  Sat,  6 Aug 2005 19:42:38 +0200
+
+sword (1.5.7-7) unstable; urgency=high
+
+  * Patch from security team, Closes: #291433
+  * Added shell_escape() function to fix arbitrary command execution
+    [apps/console/diatheke/cgi/diatheke.pl, CAN-2005-0015]
+  * Improvements by Ulf Härnhammar
+
+ -- Daniel Glassey <wdg@debian.org>  Mon, 17 Jan 2005 16:24:37 +0000
+
+sword (1.5.7-6) unstable; urgency=low
+
+  * libsword-dev should depend on libcurl3-dev
+
+ -- Daniel Glassey <wdg@debian.org>  Mon, 13 Dec 2004 23:03:20 +0000
+
+sword (1.5.7-5) unstable; urgency=low
+
+  * Change from libcurl2-dev to libcurl3-dev, Closes: #279460
+  * Move the pkgconfig file to the dev package, Closes: #281585
+
+ -- Daniel Glassey <wdg@debian.org>  Thu,  9 Dec 2004 14:26:45 +0000
+
+sword (1.5.7-4) unstable; urgency=low
+
+  * Use PassiveFtp for installmgr by default
+      This avoids problems with the BibleTime installer, Closes: #235601
+
+ -- Daniel Glassey <wdg@debian.org>  Fri, 16 Jul 2004 16:51:35 +0100
+
+sword (1.5.7-3) unstable; urgency=low
+
+  * src/utilfuns/utilstr.cpp - toupperstr *buf++ fix
+      caused segfaults when compiled with -O2
+  * fix to build with gcc 3.4 
+      include/multimapwdef.h, Closes: #258768
+  * build the diatheke package again, it is still there just in a 
+      different place, Closes: #229444
+  * fix documentation about modules, 
+      README.Debian, Closes: #249020
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 14 Jul 2004 16:54:27 +0100
+
+sword (1.5.7-2) unstable; urgency=low
+
+  * Fix problem building with current libcurl2-dev - TRUE has
+      been removed from the curl header, VERBOSE just needs to
+      be 1 now, Closes: #227860
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 15 Jan 2004 15:50:07 +0000
+
+sword (1.5.7-1) unstable; urgency=low
+
+  * New upstream version
+  * set lib version to 4
+  * remove diatheke as it has been removed from upstream source,
+     hopefully it will be released separately soon
+  * improve the copyright file because of post to debian-devel
+
+ -- Daniel Glassey <wdg@debian.org>  Wed,  7 Jan 2004 15:16:30 +0000
+
+sword (1.5.6-9) unstable; urgency=medium
+
+  * Build depend on libcurl2-dev
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 20 Nov 2003 10:20:11 +0000
+
+sword (1.5.6-8) unstable; urgency=low
+
+  * Remove the recommends of libsword-runtime from libsword-dev, Closes:
+    #220411
+  * That'd better be the last of the control file mistakes :/
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 12 Nov 2003 14:39:30 +0000
+
+sword (1.5.6-7) unstable; urgency=low
+
+  * Also Replaces libsword-runtime and libsword-config, Closes #220408
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 12 Nov 2003 14:00:34 +0000
+
+sword (1.5.6-6) unstable; urgency=low
+
+  * Rerun libtool/autoconf/automake, Closes: #220250
+
+ -- Daniel Glassey <wdg@debian.org>  Tue, 11 Nov 2003 19:20:16 +0000
+
+sword (1.5.6-5) unstable; urgency=low
+
+  * libsword3 replaces libsword2c103, Closes: #219463
+  * libsword3 replaces libsword1, Closes: #219463
+  * no libsword-runtime package now so description is irrelevant, Closes: #209977
+
+ -- Daniel Glassey <wdg@debian.org>  Fri,  7 Nov 2003 13:53:46 +0000
+
+sword (1.5.6-4) unstable; urgency=low
+
+  * The 'ok, forget about the config package' release
+  * now at policy 3.6.1.0
+  * add a build-dep for pkg-config
+  * ready to upload to unstable
+
+ -- Daniel Glassey <wdg@debian.org>  Wed,  5 Nov 2003 17:04:44 +0000
+
+sword (1.5.6-3) experimental; urgency=low
+
+  * -runtime package is unnecessary so merge it into lib
+
+ -- Daniel Glassey <wdg@debian.org>  Wed,  3 Sep 2003 20:49:58 +0100
+
+sword (1.5.6-2) experimental; urgency=low
+
+  * Brown paper bug - get shlibs right
+
+ -- Daniel Glassey <wdg@debian.org>  Fri, 29 Aug 2003 11:25:55 +0100
+
+sword (1.5.6-1) experimental; urgency=low
+
+  * Release is done now
+  * Upload to experimental for now til gs and bt are ready
+  * don't need the c102 suffix now
+  * don't build with icu til we get 2.6 packaged and into experimental
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 28 Aug 2003 17:38:40 +0100
+
+sword (1.5.5.99-2) unstable; urgency=low
+
+  * Another prerelease build
+  * split config files out into separate package so we can have different
+    sword libs installed at the same time later on
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 16 Jul 2003 14:48:22 +0100
+
+sword (1.5.5.99-1) unstable; urgency=low
+
+  * Build a pre-release from a make dist from cvs
+  * change lib version for imminent 1.5.6
+  * depend on icu 2.6 to test that
+  * api docs have been moved out into separate source
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 10 Jul 2003 12:45:18 +0100
+
+sword (1.5.5-4) unstable; urgency=low
+
+  * debian/control remove extra blank line that stops building on woody
+
+ -- Daniel Glassey <wdg@debian.org>  Thu,  1 May 2003 09:59:14 +0100
+
+sword (1.5.5-3) unstable; urgency=low
+
+  * libsword-dev now depends on icu stuff so apps that build with it don't
+      have to
+  * conflict with libsword1 since both include config files (may split these
+      out into separate package for 1.5.6), Closes #189647
+
+ -- Daniel Glassey <wdg@debian.org>  Sat, 19 Apr 2003 16:01:05 +0100
+
+sword (1.5.5-2) unstable; urgency=low
+
+  * Close the new upstream bug, Closes: #175322
+  * uses autotools-dev to get the uptodate config.guess and
+    config.sub, hopefully will sort out mips problem, Closes: #187703
+  * Utilities are now really included - bug 157115 tagged for woody
+  * debian/control - change section of libsword-dev to libdevel
+  * debian/rules - 
+      remove alpha compiler flags since it is ok with gcc3.2, Closes: #142703
+      use confflags like autotools-dev says
+      copy the config.guess and .sub from autotools-dev
+
+ -- Daniel Glassey <wdg@debian.org>  Sat,  5 Apr 2003 12:53:06 +0100
+
+sword (1.5.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Rename library package to libsword2c102 since it is a new
+     libver from 1.5.3 and it is part of the gcc3.2 transition
+  * build with icu support now that icu has made the transition
+     so build-depend on libicu21-dev and icu
+  * build depend on debhelper >= 4.0.0
+
+ -- Daniel Glassey <wdg@debian.org>  Tue, 26 Mar 2003 18:42:28 +0000
+
+sword (1.5.4+cvs20021008-1) unstable; urgency=low
+
+  * try and build a package from cvs
+
+ -- Daniel Glassey <wdg@debian.org>  Tue,  8 Oct 2002 19:08:46 +0100
+
+sword (1.5.4-1) unstable; urgency=low
+
+  * new upstream version
+  * bump shlibs version since old version was released with woody
+  * package now libsword2 instead of libsword1
+
+ -- Daniel Glassey <wdg@debian.org>  Sat, 28 Sep 2002 13:31:47 +0100
+
+sword (1.5.3-3) unstable; urgency=high
+
+  * problem integrating hppa patch messed up rules, trying again
+  * updating README.Debian to mention apt-gettable archive on
+     crosswire
+
+ -- Daniel Glassey <wdg@debian.org>  Sun, 14 Apr 2002 15:19:14 +0100
+
+sword (1.5.3-2) unstable; urgency=low
+
+  * make sure will build on gcc-3.0, sorry, Closes: #142617
+  * alpha won't compile with -g flag so compiling without it
+     see bug 142703
+
+ -- Daniel Glassey <wdg@debian.org>  Sat, 13 Apr 2002 13:04:28 +0100
+
+sword (1.5.3-1) unstable; urgency=high
+
+  * New upstream release
+
+ -- Daniel Glassey <wdg@debian.org>  Tue,  2 Apr 2002 21:38:58 +0100
+
+sword (1.5.2-10) unstable; urgency=low
+
+  * -9 failed on hppa, using namespace std needed in testblocks.cpp
+     fix tested on sarti
+
+ -- Daniel Glassey <wdg@debian.org>  Sat,  9 Feb 2002 18:20:40 +0000
+
+sword (1.5.2-9) unstable; urgency=low
+
+  * make the diatheke configure executable in debian/rules
+        Closes: #132863
+  * make diatheke description useful debian/control
+  * bump shlibs version to 1.5.2-9
+  * debian/rules dh_shlibdeps changed to -ldebian/tmp/usr/lib
+  * compzip.cpp #include string.h and stdlib.h added for gcc 3.0 
+  * README.Debian mention #sword irc channel
+
+ -- Daniel Glassey <wdg@debian.org>  Fri,  8 Feb 2002 08:59:29 +0000
+
+sword (1.5.2-8) unstable; urgency=low
+
+  * rwphtml change greek_str to signed char
+  * migrate to automake 1.5
+  * move utilities to separate package libsword-runtime, Closes: #130909
+  * new package containing diatheke from apps/console/diatheke, Closes: #130908
+  * Bump standards version to 3.5.6.0
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 24 Jan 2002 20:01:16 +0000
+
+sword (1.5.2-7) unstable; urgency=low
+
+  * Rename roman.cpp to romanc.cpp, Closes #130038
+  * Update README.Debian to mention apt-gettable module archive
+     deb http://www.crosswire.org/~glasseyes/debian unstable main
+
+ -- Daniel Glassey <wdg@debian.org>  Wed, 23 Jan 2002 18:53:18 +0000
+
+sword (1.5.2-6) unstable; urgency=low
+
+  * remove -Werror, autobuilders not happy (fair enough, I can check
+     through the build logs for warnings myself :) )
+  * rawstr, rawstr4 more signed char in findoffset, Closes: #130038
+  * c++ comments so roman.c -> roman.cpp, Closes: #129886
+
+ -- Daniel Glassey <wdg@debian.org>  Mon, 21 Jan 2002 20:19:31 +0000
+
+sword (1.5.2-5) unstable; urgency=low
+
+  * char signedness fixes
+     (in response to debian-devel-announce from Gerhard Tonn
+     swkey: persist to signed char
+     swmodule: createModule to signed char
+               createSearchFramework to signed char
+     versekey: book,testament to signed char
+     swmgr: setCipherKey to signed char
+     filemgr: trunc to signed char
+     rawtext: createSearchFramework to signed char
+     rawstr: findoffset to signed char
+     rawstr4: findoffset to signed char
+              in gettext make localsize to unsigned int      
+  * use -Werror in Makefile.cfg to catch any more
+  *  anything else is either already fixed or will be fixed in the
+        imminent version 1.5.3
+
+ -- Daniel Glassey <wdg@debian.org>  Thu, 17 Jan 2002 23:55:08 +0000
+
+sword (1.5.2-4) unstable; urgency=low
+
+  * Change maintainer to wdg@debian.org 
+  * change shlibs to libsword1 >= 1.5.2-4 (gnomesword bug 123418)
+      by dh_makeshlibs -V 'libsword1 (>= 1.5.2-4)' in debian/rules
+  * remove reference to cheatah in package description
+
+ -- Daniel Glassey <wdg@debian.org>  Tue, 11 Dec 2001 22:36:44 +0000
+
+sword (1.5.2-3) unstable; urgency=low
+
+  * oops, include gifs in html documentation as well 
+  * chmod 755 before executing configure, closes #122658
+  * remove autoconf from build-depends
+
+ -- Daniel Glassey <wdg@debian.org>  Wed,  5 Dec 2001 00:25:07 +0000
+
+sword (1.5.2-2) unstable; urgency=low
+
+  * Backport endian solution from CVS, Closes: #103732
+  * include some module utilities in the dev package
+  * use the latest config.* from /usr/share/misc
+
+ -- Daniel Glassey <wdg@debian.org>  Mon,  3 Dec 2001 19:11:08 +0000
+
+sword (1.5.2-1.1) unstable; urgency=low
+
+  * NMU to satisfy build-dependencies.
+  * Fix gcc 3.0 compile failures.  Closes: #108707.
+
+ -- LaMont Jones <lamont@debian.org>  Tue, 14 Aug 2001 09:25:42 -0600
+
+sword (1.5.2-1) unstable; urgency=low
+
+  * New upstream release
+  * final 1.5.2 release
+
+ -- Daniel Glassey <wdg@debian.org>  Mon,  2 Jul 2001 22:53:50 +0000
+
+sword (1.5.1.99-1) unstable; urgency=low
+
+  * New upstream release
+  * prerelease of 1.5.2
+  * change maintainer address to wdg@debian.org
+  * add libsword-dev.manpages
+
+ -- Daniel Glassey <wdg@debian.org>  Mon, 25 Jun 2001 18:32:04 +0000
+
+sword (1.5.1a-4) unstable; urgency=low
+
+  * Merged with Ivan Moore's latest package (1.5.1a-2 in Debian)
+  * Now recommends frontend and doesn't depend on modules
+
+ -- Daniel Glassey <danglassey@yahoo.com>  Mon, 22 Jan 2001 22:22:10 +0000
+
+sword (1.5.1a-3) unstable; urgency=low
+
+  * use autoconf to determine platform
+  * add zlib to build-depends
+  * up standards version to 3.2.1
+  * module creation progs added to dev
+
+ -- Daniel Glassey <danglassey@yahoo.com>  Mon, 15 Jan 2001 18:53:14 +0000
+
+sword (1.5.1a-2) unstable; urgency=low
+
+  * recommend text, suggest dict and comm. install locales.
+
+ -- Daniel Glassey <danglassey@yahoo.com>  Mon,  4 Dec 2000 21:32:33 +0000
+
+sword (1.5.1a-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Daniel Glassey <danglassey@yahoo.com>  Thu, 23 Nov 2000 20:06:03 +0000
+
+sword (1.5.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Daniel Glassey <danglassey@yahoo.com>  Mon, 28 Aug 2000 21:34:49 +0100
+
+sword (1.4.6-2) unstable; urgency=low
+
+  * Change of maintainer
+
+ -- Daniel Glassey <danglassey@yahoo.com>  Mon, 28 Aug 2000 19:14:22 +0100
+
+sword (1.4.6-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 20 Jan 2000 19:30:16 -0700
+
+sword (1.4.4-4) unstable; urgency=low
+
+  * Removing mods.conf file
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 07:30:16 -0400
+
+sword (1.4.4-3) unstable; urgency=low
+
+  * Fixing minor pathing bug with mods.conf files
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 04:45:16 -0400
+
+sword (1.4.4-2) unstable; urgency=low
+
+  * Fixing alot of things.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Fri, 01 Oct 1999 01:30:16 -0400
+
+sword (1.4.4-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Ivan E. Moore II <rkrusty@debian.org>  Thu, 30 Sep 1999 08:30:16 -0400
+
+Local variables:
+mode: debian-changelog
+End:
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..983e778
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,106 @@
+Source: sword
+Build-Depends: debhelper (>= 9),
+               cmake,
+               libz-dev,
+               pkg-config,
+               libcurl4-gnutls-dev,
+               libclucene-dev,
+               libicu-dev,
+               chrpath,
+	       perl
+Section: libs
+Priority: optional
+Maintainer: CrossWire Packages <pkg-crosswire-devel@lists.alioth.debian.org>
+Uploaders: Daniel Glassey <wdg@debian.org>,
+ Dimitri John Ledkov <xnox@debian.org>,
+ Jonathan Marsden <jmarsden@fastmail.fm>
+Standards-Version: 3.9.3
+Homepage: http://www.crosswire.org/sword/
+
+Package: libsword10
+Architecture: any
+Depends: libsword-common, ${shlibs:Depends}, ${misc:Depends}
+Recommends: sword-frontend
+Description: API/library for bible software
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list 
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ text modules.
+ .
+ This package contains the core libraries for the project.
+ It also contains utilities for generating data modules.
+ .
+ Please read the README.Debian for more information on how to obtain other
+ modules for SWORD.
+
+Package: libsword-dev
+Architecture: any
+Section: libdevel
+Depends: libsword10 (= ${binary:Version}), ${misc:Depends}
+Recommends: libsword-utils
+Description: Development files for libsword
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list 
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ text modules.
+ .
+ This package contains the static libraries and headers for developing 
+ applications that use the SWORD library.
+
+Package: libsword-common
+Architecture: all
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsword6, libsword7, libsword8
+Replaces: libsword6, libsword7, libsword8
+Description: common settings and module repository for libsword
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list 
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ text modules.
+ .
+ This package contains sword configuration and global module repository.
+
+Package: libsword-utils
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libsword6, libsword7, libsword8
+Replaces: libsword6, libsword7, libsword8
+Description: conversion utilities for bible documents in SWORD supported formats
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list 
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ text modules.
+ .
+ This package contains utilities to convert documents in various
+ formats into those suitable to be used with SWORD library.
+
+Package: libsword-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libsword10 (= ${binary:Version}), ${misc:Depends}
+Description: API/library for bible software - Debug Files
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list 
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ text modules.
+ .
+ This package contains the debug symbols for the libsword library.
+
+Package: diatheke
+Architecture: any
+Section: text
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: command line bible browsing and search tool
+ The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris,
+ MacOSX etc.) API/library for Bible software with a constantly growing list 
+ of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 
+ text modules.
+ .
+ This package contains a command line utility for SWORD, allowing
+ bible browsing and searching. This tool is used mostly only for
+ library testing. Nicer front-ends are Xiphos (Gtk), Bibletime (Qt)
+ and others.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..aba3e52
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,105 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: The SWORD Project
+Upstream-Contact: Members of the SWORD Project team <sword-feedback@crosswire.org>
+  The CrossWire Bible Society
+  P. O. Box 2528
+  Tempe, AZ  85280-2528
+Source: http://www.crosswire.org/sword/software/swordapi.jsp
+Comment: Note that the original source tarball was repackaged to
+ remove some non-free files, and other convenience copies of
+ libraries.  There is a get-orig-source rule in debian/rules
+ which does this repacking.  The files removed are:
+ .
+ src/utilfuns/zlib/[a-tv-z]* # an old copy of the zlib library
+ src/utilfuns/zlib/uncompr.c # more of zlib
+ include/zlib.h              # zlib header file
+ src/utilfuns/regex.c # modified GNU C library
+ include/regex.h # modified GNU C library header file
+ src/utilfuns/win32/* # a non-free dirent for Windows 
+ bindings/gsoap/include/stdsoap.h # non-free header file
+
+Files: *
+Copyright: 1996-2009 CrossWire Bible Society
+License: GPL-2
+
+Files: include/installmgr.h
+       include/rawverse.h
+       include/defs.h
+       include/rawverse.h
+       include/rawverse4.h
+       include/sysdata.h
+       include/ftpparse.h
+       include/nullim.h
+       include/multimapwdef.h
+       include/entriesblk.h
+       bindings/swig/searcher.h
+       bindings/swig/rendercallback.h
+       bindings/swig/markupcallback.h
+       bindings/swig/package/searcher.h
+       bindings/swig/package/rendercallback.h
+       bindings/swig/package/autogen.sh
+       bindings/swig/package/markupcallback.h
+       bindings/bcppmake/MainCLXTest.h
+       bindings/bcppmake/MainTest.h
+       bindings/autogen.sh
+Copyright: Unknown
+License: Unknown
+ Probable copyright holder CrossWire Bible Society.
+ Probable intended license GPL-2 .
+ include/ftpparse.h - C++ wrapper
+
+Files: include/untgz.h src/utilfuns/zlib/untgz.c
+Copyright: Pedro A. Aranda Guti\irrez <paag@tid.es>
+           Jean-loup Gailly <jloup@gzip.org>
+Comment: The author of zlib has made changes to untgz.c, it is shipped in the
+ zlib Debian tarball, but is not installed/compiled. So I think we can assume the
+ zlib/libpng license.
+License: ZLIB
+
+Files: include/sapphire.h src/modules/common/sapphire.cpp
+Copyright: Michael Paul Johnson
+License: Public Domain
+
+Files: bindings/corba/java/src/org/crosswire/util/Base64.java
+Copyright: Robert Harder <rob@iharder.net>
+License: Public Domain - Base64
+
+Files: debian/*
+Copyright: 2009 CrossWire Packaging Team <pkg-crosswire-devel@lists.alioth.debian.org>
+            -2008 Daniel Glassey <wdg@debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-2
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+License: Public Domain
+ Dedicated to the Public Domain the author and inventor
+ (Michael Paul Johnson).  This code comes with no warranty.
+ Use it at your own risk.
+
+License: Public Domain - Base64
+ I am placing this code in the Public Domain. Do with it as you will.
+ This software comes with no guarantees or warranties but with
+ plenty of well-wishing instead!
+
+License: ZLIB
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
diff --git a/debian/dfsg.sh b/debian/dfsg.sh
new file mode 100755
index 0000000..2cfde87
--- /dev/null
+++ b/debian/dfsg.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+format=`echo $3 | sed "s/\(.*\.\)\(.*\)/\2/"`
+newname=`echo $3 | sed "s/\(\.orig\)/\+dfsg\1/"`
+case $format in
+    gz)
+        compr=gzip
+        ;;
+    bz2)
+        compr=bzip2
+        ;;
+    lzma)
+        compr=lzma
+        ;;
+    xz)
+        compr=xz
+        ;;
+esac
+$compr -d -c $3 | tar --wildcards --delete `cat debian/files.non-dfsg` | \
+$compr -9 -f > $newname
+rm -f $3
diff --git a/debian/diatheke.docs b/debian/diatheke.docs
new file mode 100644
index 0000000..a998c82
--- /dev/null
+++ b/debian/diatheke.docs
@@ -0,0 +1 @@
+utilities/diatheke/README
diff --git a/debian/diatheke.examples b/debian/diatheke.examples
new file mode 100644
index 0000000..19b8430
--- /dev/null
+++ b/debian/diatheke.examples
@@ -0,0 +1,3 @@
+utilities/diatheke/cgi/*.pl 
+utilities/diatheke/cgi/*.html 
+utilities/diatheke/tcl/*.tcl
diff --git a/debian/diatheke.install b/debian/diatheke.install
new file mode 100644
index 0000000..f8e6aa8
--- /dev/null
+++ b/debian/diatheke.install
@@ -0,0 +1 @@
+usr/bin/diatheke
diff --git a/debian/diatheke.manpages b/debian/diatheke.manpages
new file mode 100644
index 0000000..78e26a3
--- /dev/null
+++ b/debian/diatheke.manpages
@@ -0,0 +1 @@
+debian/man/diatheke.1
diff --git a/debian/files.non-dfsg b/debian/files.non-dfsg
new file mode 100644
index 0000000..27dd492
--- /dev/null
+++ b/debian/files.non-dfsg
@@ -0,0 +1,7 @@
+*/src/utilfuns/zlib/[a-tv-z]*
+*/src/utilfuns/zlib/uncompr.c
+*/include/zlib.h
+*/src/utilfuns/regex.c
+*/include/internal/regex/regex.h
+*/src/utilfuns/win32
+*/bindings/gsoap/include/stdsoap.h
diff --git a/debian/libsword-common.dirs b/debian/libsword-common.dirs
new file mode 100644
index 0000000..fdab68f
--- /dev/null
+++ b/debian/libsword-common.dirs
@@ -0,0 +1,2 @@
+usr/share/sword/mods.d
+usr/share/sword/modules
diff --git a/debian/libsword-common.install b/debian/libsword-common.install
new file mode 100644
index 0000000..11a3638
--- /dev/null
+++ b/debian/libsword-common.install
@@ -0,0 +1,3 @@
+usr/share/sword/
+samples/recommended/sword.conf etc/
+samples/mods.d/globals.conf usr/share/sword/mods.d/
diff --git a/debian/libsword-common.lintian-overrides b/debian/libsword-common.lintian-overrides
new file mode 100644
index 0000000..d603da8
--- /dev/null
+++ b/debian/libsword-common.lintian-overrides
@@ -0,0 +1,2 @@
+# This directory is to install SWORD modules by the administrator
+libsword-common binary: package-contains-empty-directory usr/share/sword/modules/
diff --git a/debian/libsword-dev.install b/debian/libsword-dev.install
new file mode 100644
index 0000000..8119ce0
--- /dev/null
+++ b/debian/libsword-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/lib/libsword.a
+usr/lib/pkgconfig
diff --git a/debian/libsword-dev.links b/debian/libsword-dev.links
new file mode 100644
index 0000000..78477fe
--- /dev/null
+++ b/debian/libsword-dev.links
@@ -0,0 +1 @@
+usr/lib/libsword.so.10 usr/lib/libsword.so
diff --git a/debian/libsword-utils.install b/debian/libsword-utils.install
new file mode 100644
index 0000000..6b06025
--- /dev/null
+++ b/debian/libsword-utils.install
@@ -0,0 +1,16 @@
+usr/bin/addld
+usr/bin/imp2ld
+usr/bin/imp2gbs
+usr/bin/imp2vs
+usr/bin/installmgr
+usr/bin/mkfastmod
+usr/bin/mod2imp
+usr/bin/mod2osis
+usr/bin/mod2vpl
+usr/bin/mod2zmod
+usr/bin/osis2mod
+usr/bin/tei2mod
+usr/bin/vpl2mod
+usr/bin/vs2osisref
+usr/bin/vs2osisreftxt
+usr/bin/xml2gbs
diff --git a/debian/libsword-utils.links b/debian/libsword-utils.links
new file mode 100644
index 0000000..7f9153f
--- /dev/null
+++ b/debian/libsword-utils.links
@@ -0,0 +1,3 @@
+usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2osis.1.gz
+usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2vpl.1.gz
+usr/share/man/man1/mod2imp.1.gz usr/share/man/man1/mod2zmod.1.gz
diff --git a/debian/libsword-utils.manpages b/debian/libsword-utils.manpages
new file mode 100644
index 0000000..1148885
--- /dev/null
+++ b/debian/libsword-utils.manpages
@@ -0,0 +1,14 @@
+debian/man/imp2gbs.1
+debian/man/imp2ld.1
+debian/man/imp2vs.1
+debian/man/installmgr.1
+debian/man/mod2imp.1
+debian/man/addld.1
+debian/man/mkfastmod.1
+debian/man/osis2mod.1
+debian/man/tei2mod.1
+debian/man/vpl2mod.1
+debian/man/vs2osisref.1
+debian/man/vs2osisreftxt.1
+debian/man/xml2gbs.1
+
diff --git a/debian/libsword10.docs b/debian/libsword10.docs
new file mode 100644
index 0000000..546a37e
--- /dev/null
+++ b/debian/libsword10.docs
@@ -0,0 +1 @@
+doc/translation-template.conf
diff --git a/debian/libsword10.install b/debian/libsword10.install
new file mode 100644
index 0000000..ad0b175
--- /dev/null
+++ b/debian/libsword10.install
@@ -0,0 +1 @@
+usr/lib/libsword.so.10
diff --git a/debian/man/addld.1.pod b/debian/man/addld.1.pod
new file mode 100644
index 0000000..b4bb838
--- /dev/null
+++ b/debian/man/addld.1.pod
@@ -0,0 +1,66 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+addld - Lexicon & Dictionary module creation tool for SWORD Project
+
+=head1 SYNOPSIS
+
+B<addld> -a FILE key [PATH]
+B<addld> -d FILE key
+B<addld> -l FILE target_key link_name
+B<addld> -c FILE
+
+
+=head1 DESCRIPTION
+
+A command line utility to create and manipule Lexicon & Dictionary SWORD
+modules. It can be used to add, delete and link L&D keys within module.
+It can also be used to create new L&D modules.
+
+=over
+
+=item B<-a FILE key [PATH]>
+
+The form is used to add a key to a L&D module. Optionaly path can be
+used to the file with the entry.
+
+=item B<-d FILE key>
+
+This form is used to delete a key from a file.
+
+=item B<-l FILE target_key link_name>
+
+This form is used to link two keys in the module.
+
+=item B<-c FILE>
+
+This is used to create a new module
+
+=back
+
+=head1 OPTIONS
+
+To use 4-byte L&D instead of 2-byte, insert a 4 immediately after the '-'.
+
+To use zLD instead of 2-byte, insert a z immediately after the '-'.
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/diatheke.1 b/debian/man/diatheke.1
new file mode 100644
index 0000000..aebcdf7
--- /dev/null
+++ b/debian/man/diatheke.1
@@ -0,0 +1,201 @@
+.\" diatheke man page
+.\" (C)2006 Eeli Kaikkonen
+.\" You may do whatever you wish with this file.
+.\" Version 0.8
+.TH DIATHEKE 1 "2009-02-01" "diatheke 4.2.1" "Diatheke man page"
+.SH NAME
+diatheke \- a command line Bible reader
+.SH SYNOPSIS
+.\" for synopsis format see man man
+.B diatheke
+.B \-b
+.I module_name
+[\fB\-o \fIoption_filters\fR]
+[\fB\-m \fImaximum_verses\fR]
+[\fB\-f \fIoutput_format\fR]
+[\fB\-e \fIoutput_encoding\fR]
+[\fB\-t \fIscript\fR]
+[\fB\-v \fIvariant_number\fR]
+[\fB\-l \fIlocale\fR]
+.B \-k
+.I query_key
+
+.B diatheke
+.B \-b
+.I module_name
+\fB\-s regex\fR|\fBmultiword\fR|\fBphrase\fR
+[\fB\-r \fIsearch_range\fR]
+[\fB\-l \fIlocale\fR]
+.B \-k
+.I search_string
+
+.B diatheke
+.B \-b system
+.B \-k modulelist\fR|\fBmodulelistnames\fR|\fBlocalelist
+
+.B diatheke
+.B \-b info
+.B \-k
+.I module_name
+.SH DESCRIPTION
+.I diatheke
+prints Bible verses or other text from the modules which the Sword library uses.
+.SH OPTIONS
+.TP
+.B \-b
+Module name. May be "system" or "info" (see QUERY KEYS) or one of the names obtained by
+using "diatheke \-b system \-k modulelist".
+.TP
+.B \-s
+Search type. One of
+regex
+(regular expression, see regex(7)),
+multiword
+(like "word [AND word]..."),
+phrase
+(exact text).
+.TP
+.B \-r
+Search range. A valid Bible key range value (see \-k). For example: Matt-John, Rom,
+gen-psalms, 1Thess 1:5-2:6.
+.TP
+.B \-o
+Module option filters. A combination of "fmhcvalsrbx". See MODULE OPTIONS.
+.TP
+.B \-m
+Maximum number of verses returned. Any integer value.
+.TP
+.B \-f
+Output format. One of GBF, ThML, RTF, HTML, OSIS, CGI, plain (default).
+This currently works only if there is a Sword library filter from the original format to
+the specified output format. HTML and CGI are for generating text for a webpage.
+.TP
+.B \-e
+Output character encoding. One of Latin1, UTF16, HTML, RTF, UTF8 (default).
+This currently works only for module contents, not for system key contents
+or key texts.
+.TP
+.B \-t
+.\" TODO
+Script. (This seems to be broken in version 4.2.1,
+it should allow e.g. Greek->Latin1 character
+transliteration with "\-t Latin".)
+.TP
+.B \-v
+Variant. The text may contain variant readings. One of \-1 (all), 0, 1.
+.TP
+.B \-l
+Locale. Sword may have different locales installed. Default is en. Localization
+affects input and output keys.
+.TP
+.B \-k
+Query key. It must be the last argument because all following
+arguments are added to the key. See QUERY KEYS for different kinds of keys.
+.SH MODULE OPTIONS
+By default the optional features of modules are not shown in the returned
+text. These options make them visible if the module supports them.
+.TP
+.B n
+Strong's numbers. These numbers refer to the Strong's dictionaries of the New and
+Old Testaments. Some Bible texts attach these numbers to words.
+.TP
+.B f
+Footnotes.
+.TP
+.B m
+Morphology of the Greek/Hebrew words. Morphology is shown as a code which refers
+to an entry in some dictionary-type module.
+.TP
+.B h
+Section headings.
+.TP
+.B c
+Hebrew cantillation.
+.TP
+.B v
+Hebrew vowels.
+.TP
+.B a
+Greek accents.
+.TP
+.B l
+Lemmas (the base forms of the words).
+.TP
+.B s
+Scripture cross-references.
+.TP
+.B r
+Arabic shaping.
+.TP
+.B b
+Bi-directional reordering.
+.TP
+.B x
+Red Words of Christ.
+.SH QUERY KEYS
+.TP
+.B Bible texts and Commentaries
+use verse keys. Examples: john 1:1, j1:1 jh1 (the first chapter of John), jh
+(the whole book of Gospel of John), joh 1:1-3 ( a verse range), joh 1:0
+(one verse backwards from
+1:1, which is the last verse of the previous book or possibly an introduction to John),
+joh 1:100 (which is 100 verses
+forward from the first verse of John 1:1), 1234 (which is the 1234th verse from
+the beginning of the Bible).
+.TP
+.B Lexicons and Dictionaries
+use word keys. Any word can be used and similar or next entry alphabetically is returned.
+Some dictionaries like Strong's use numbered entries.
+.TP
+.B system
+is not a module but when used with \-b allows one of these keys:
+modulelist
+(list of the available modules with short descriptions),
+modulelistnames
+(list of the names of the available modules),
+localelist
+(list of the available Sword locales).
+.TP
+.B info
+is not a module but when used with \-b allows a module name as a key
+and gives some information about that module.
+.SH EXAMPLES
+.TP
+diatheke \-b KJV \-k joh1:1
+Shows John 1:1 in King James Version.
+.TP
+diatheke \-b RWP \-k Matthew 2:2
+Shows Matthew 2:2 in Robertson's Word Pictures commentary.
+.TP
+diatheke \-b WebstersDict \-k bible
+Show entry "bible" in Websters Dictionary.
+.TP
+diatheke \-b system \-k modulelist
+Shows the list of available modules.
+.TP
+diatheke \-b KJV \-o fmslx \-f OSIS \-e Latin1 \-k john 1:1-3
+Shows John 1:1-3 from KJV in OSIS XML format in iso8859-1 encoding with footnotes,
+morphology, cross-references, lemmas and words of Christ in red. (The module may  not
+support all options and those have no effect. KJV includes only ASCII characters so
+encoding has no effect.)
+.TP
+diatheke \-b GerLut \-l de \-m 10 \-k Offenbarung
+Shows the first 10 verses of Revelation in German GerLut version,
+both input and output keys are localized.
+.TP
+diatheke \-b KJV \-s phrase \-r Mt \-k love
+Shows those verse keys which include phrase "love" in Gospel of Matthew in KJV module.
+.SH DIAGNOSTICS
+Currently diatheke exits always with status 0. If only Bible verse key and
+module name are shown it means that the module did not have any content in
+that range. If only module name is shown the key may have been bad. If
+nothing is shown the book name may have been bad. If Segmentation fault
+is shown diatheke has been bad.
+.SH SEE ALSO
+.I http://www.crosswire.org/sword/
+.SH COPYRIGHT
+Sword library: \(co 1994-2006 Crosswire Bible Society,
+released under GPL licence.
+Diatheke: written by Chris Little,
+\(co 1999-2006 Crosswire Bible Society, released under GPL licence.
+This manpage was written by Eeli Kaikkonen and may be used freely.
diff --git a/debian/man/imp2gbs.1.pod b/debian/man/imp2gbs.1.pod
new file mode 100644
index 0000000..62c8b41
--- /dev/null
+++ b/debian/man/imp2gbs.1.pod
@@ -0,0 +1,65 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+imp2gbs - general book module creation tool
+
+=head1 SYNOPSIS
+
+B<imp2gbs> [input file] [OPTIONS]
+
+=head1 DESCRIPTION
+
+A command line utility to convert imp (import) formatted general book into SWORD
+module. 
+
+=head1 OPTIONS
+
+=over
+
+=item B<-o [PATH]>
+
+Specify the output path, if different from the input file's.
+
+=item B<-a>
+
+Create augment module. Default is to create new module.
+
+=item B<-O>
+
+Overwrite entries of same key. Default is to append.
+
+=item B<-U>
+
+A key filter which converts toUpper.
+
+=item B<-g>
+
+A key filter which strips greek diacritics.
+
+=item B<-l [levels]>
+
+A key filter which uses Pseudo-Lexicon n-level generation using first character,
+e.g. -l 2 "Abbey" -> "A/AB/Abbey".
+
+=back
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/imp2ld.1.pod b/debian/man/imp2ld.1.pod
new file mode 100644
index 0000000..021ebad
--- /dev/null
+++ b/debian/man/imp2ld.1.pod
@@ -0,0 +1,49 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+imp2ld - Lexicon, Dictionary, Daily Devotional and Glossary module creation tool
+
+=head1 SYNOPSIS
+
+B<imp2ld> <FILE> [modulename] [4 | 2 | z]
+
+=head1 DESCRIPTION
+
+A command line utility to convert imp formatted file into lexicon, dictionary,
+daily devotional or glossary SWORD module. 
+
+=head1 OPTIONS
+
+=over
+
+=item B<[modulename]>
+
+Specify the output modulename.
+
+=item B<[4 | 2 | z>
+
+Specify output module driver. Default is 4.
+
+
+=back
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/imp2vs.1.pod b/debian/man/imp2vs.1.pod
new file mode 100644
index 0000000..80b676b
--- /dev/null
+++ b/debian/man/imp2vs.1.pod
@@ -0,0 +1,44 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+imp2vs - Bible/Commentary module creation tool
+
+=head1 SYNOPSIS
+
+B<imp2vs> <FILE> [PATH]
+
+=head1 DESCRIPTION
+
+A command line utility to convert imp formatted file Bible/Commentary SWORD
+module.
+
+=head1 OPTIONS
+
+=over
+
+=item B<[PATH]>
+
+Specify path for the output module if different from the input file.
+
+=back
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/installmgr.1.pod b/debian/man/installmgr.1.pod
new file mode 100644
index 0000000..244e8ba
--- /dev/null
+++ b/debian/man/installmgr.1.pod
@@ -0,0 +1,106 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+installmgr - install, list, update and remove SWORD modules
+
+=head1 SYNOPSIS
+
+B<installmgr> -init
+
+B<installmgr> -l
+
+B<installmgr> -u [ModuleName]
+
+B<installmgr> -s
+
+B<installmgr> [-r | -rl | -rd] [RemoteSrcName]
+
+B<installmgr> -ri [RemoteSrcName] [ModuleName]
+
+B<installmgr> -ll [PATH]
+
+B<installmgr> -li [PATH] [ModuleName]
+
+=head1 DESCRIPTION
+
+A command line utility to manipulate SWORD modules. It can be used to install,
+remove, list and update SWORD modules, from local and network locations.
+
+Please note modules will be installed into /usr/share/sword without using
+APT. If you use this utility you will not be able to uninstall these modules
+using apt-get, aptitude, synaptic and similar tools.  
+
+=head1 OPTIONS
+
+=over
+
+=item B<-init>
+
+Creates basic user configuration file. This will overwrite existing one.
+
+=item B<-l>
+
+Lists currently installed SWORD modules.
+
+=item B<-u [ModuleName]>
+
+Uninstalls module.
+
+=item B<-s>
+
+Lists available remote sources
+
+=item B<[-r | -rl | -rd] [RemoteSrcName]>
+
+These are used to manipulate remote sources.
+
+=over
+
+=item -r
+
+Refreshes remote source.
+
+=item -rl
+
+Lists available modules from the remote source.
+
+=item -rd
+
+Lists new/updated modules from the remote source.
+
+=back
+
+=item B<-ri [RemoteSrcName] [ModuleName]>
+
+Install module from remote source.
+
+=item B<-ll [PATH]>
+
+List available modules at a specified local path.
+
+=item B<-li [PATH] [ModuleName]>
+
+Install module from local path.
+
+=back
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/mkfastmod.1.pod b/debian/man/mkfastmod.1.pod
new file mode 100644
index 0000000..5a503c1
--- /dev/null
+++ b/debian/man/mkfastmod.1.pod
@@ -0,0 +1,28 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+mkfastmod - creates a search index for a module
+
+=head1 SYNOPSIS
+
+B<mkfastmod> module
+
+=head1 DESCRIPTION
+
+A command line utility which creates a search index for a module.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/mod2imp.1.pod b/debian/man/mod2imp.1.pod
new file mode 100644
index 0000000..e7c0905
--- /dev/null
+++ b/debian/man/mod2imp.1.pod
@@ -0,0 +1,85 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+mod2imp, mod2osis, mod2vpl, mod2zmod - export SWORD modules
+
+=head1 SYNOPSIS
+
+B<mod2imp> [modulename]
+
+B<mod2osis> [modulename]
+
+B<mod2vpl> [modulename] [0 |1]
+
+B<mod2zmod> [modulename] [PATH] [blocktype [compressiontype [cipherkey]]]
+
+=head1 DESCRIPTION
+
+These utilities export SWORD modules into various formats. B<mod2imp> exports a
+module into SWORD imp (import) format. B<mod2osis> exports a module into OSIS
+format. B<mod2vpl> exports into verse per line format. B<mod2zmod> produces
+compressed SWORD modules.
+
+=head1 OPTIONS
+
+=over
+
+=item B<[modulename]>
+
+Specify the modulename to export.
+
+=item B<[0 | 1]>
+
+Only applies to B<mod2vpl>. 1 - prepends verse reference to each line, 0 -
+doesn't.
+
+=item B<[PATH]>
+
+Only applies to B<mod2zmod>. Path where to create compressed module.
+
+=item B<[blocktype [compressiontype [cipherkey]]]>
+
+Only applies to B<mod2zmod>. Valid blocktypes are (default 4):
+
+=over
+
+=item 2 - verses
+
+=item 3 - chapters
+
+=item 4 -books
+
+=back
+
+Compression types are (default 1):
+
+=over
+
+=item 1 - LZSS
+
+=item 2 - Zip
+
+=back
+
+=back
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/osis2mod.1.pod b/debian/man/osis2mod.1.pod
new file mode 100644
index 0000000..2234527
--- /dev/null
+++ b/debian/man/osis2mod.1.pod
@@ -0,0 +1,74 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+osis2mod - create SWORD module from OSIS
+
+=head1 SYNOPSIS
+
+B<osis2mod> PATH OSISDOC [OPTIONS]
+
+=head1 DESCRIPTION
+
+This utility will create a SWORD module in the specified path from the
+OSIS formated input.
+
+=head1 OPTIONS
+
+=over
+
+=item B<-a>
+
+Augment module if exists (default is to create a new one).
+
+=item B<-z | -Z>
+
+Use compression. z - for ZIP; Z - for LZSS. By default no compression is
+used.
+
+=item B<-b N>
+
+Specify block size. Valid values are (default 4):
+
+=over
+
+=item 2 - verses
+
+=item 3 - chapters
+
+=item 4 -books
+
+=back
+
+=item B<-c CIPHER_KEY>
+
+Encipher module using supplied key. By default no enciphering is used.
+
+=item B<-N>
+
+Do not convert UFT-8 no normalize UTF-8 to NFC. Default is to convert to UTF-8,
+if needed, and then normalize to NFC.
+
+Note: all UTF-8 texts should be normalized to NFC.
+
+=back
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/tei2mod.1.pod b/debian/man/tei2mod.1.pod
new file mode 100644
index 0000000..38bf7d0
--- /dev/null
+++ b/debian/man/tei2mod.1.pod
@@ -0,0 +1,81 @@
+#  This is a man page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+tei2mod - tool to convert TEI P5 source into a SWORD module
+
+=head1 SYNOPSIS
+
+B<tei2mod> outputpath teisource [OPTIONS]
+
+
+=head1 DESCRIPTION
+
+This utility is used to create SWORD module from a slightly modified
+TEI (Text Encoding Initiative) P5 formatted XML source document. The
+resulting module will be saved in the outputpath specified.
+
+=head1 OPTIONS
+
+=over
+
+=item B<-z>
+
+Specifies use of ZIP compression.  The default is no compression.
+
+=item B<-Z>
+
+Specifies use of LZSS compression.  The default is no compression.
+
+=item B<-s [2|4]>
+
+Specifies maximum text size per entry.  The default is 4.
+
+=item B<-c cipher_key>
+
+Specifies that the output will be enciphered with the supplied
+cipher_key.  The default is plain text output (no encipherment).
+
+=item B<-N>
+
+Disables conversion to UTF-8 and normalization of UTF-8 to NFC.  The
+default is to convert to UTF-8, if needed, and then normalize to NFC.
+Note that all UTF-8 texts should be normalized to NFC.
+
+=back
+
+=head1 NOTE
+
+The input format is a subset of TEI P5 with added elements borrowed
+from OSIS for verse references.  The resulting custom TEI schema is
+available at http://www.crosswire.org/osis/teiP5osis.1.4.xsd
+
+=head1 AUTHORS
+
+This man page was written by Jonathan Marsden <jmarsden@fastmail.fm>
+for the Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=over
+
+=item http://www.crosswire.org/wiki/TEI_Dictionaries
+
+=item http://www.crosswire.org/osis/teiP5osis.1.4.xsd
+
+=item http://www.tei-c.org/release/doc/tei-p5-doc/html/index.html
+
+=back
+
+=cut
diff --git a/debian/man/vpl2mod.1.pod b/debian/man/vpl2mod.1.pod
new file mode 100644
index 0000000..32e8bcb
--- /dev/null
+++ b/debian/man/vpl2mod.1.pod
@@ -0,0 +1,68 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+vpl2mod - tool to convert verse per line source to SWORD module
+
+=head1 SYNOPSIS
+
+B<vpl2mod> SOURCE PATH [0|1] [0|1]
+
+
+=head1 DESCRIPTION
+
+This utility is used to create SWORD module from the verse per line formated
+source. The resulting module will be saved in the path specified.
+
+=head1 OPTIONS
+
+=over
+
+=item B<[0|1] [0|1]>
+
+The first option indicates whether to prepend verse references or not.
+The second option is to indicate whether module is NT only or not.
+
+=back
+
+=head1 NOTE
+
+With no verse references source file must contain exactly 31102 lines. This is
+KJV verse count plus heading for the module, testament, book and chapter. An
+example snippet follows:
+
+ MODULE HEADER
+ OLD TESTAMENT HEADER
+ GENESIS HEADER
+ CHAPTER 1 HEADER
+ In the beginning...
+
+This example implies there must also be a chapter 2 header, Exodus header, New
+Testament header, etc. If there is no text for the header, a black line must, at
+least, hold place.
+
+With verse references, source file must simply contain any number of lines, that
+begin with the verse reference for which it is an entry, e.g.:
+
+ gen 1:0 CHPATER 1 HEADER
+ get 1:1 In the beginning...
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/vs2osisref.1.pod b/debian/man/vs2osisref.1.pod
new file mode 100644
index 0000000..4205df7
--- /dev/null
+++ b/debian/man/vs2osisref.1.pod
@@ -0,0 +1,33 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+vs2osisref - a tool to convert verse references from English to OSIS
+
+=head1 SYNOPSIS
+
+vs2osisref VERSEREF [verse_context]
+
+=head1 DESCRIPTION
+
+Returns the osisRef of a given (text form) verse reference.
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/man/vs2osisreftxt.1.pod b/debian/man/vs2osisreftxt.1.pod
new file mode 100644
index 0000000..720a4ee
--- /dev/null
+++ b/debian/man/vs2osisreftxt.1.pod
@@ -0,0 +1,38 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+vs2osisreftxt - a tool that probably does something with OSIS refs
+
+=head1 SYNOPSIS
+
+vs2osisreftxt STRING [local_name] [test-in-set-verse]
+
+=head1 DESCRIPTION
+
+Apart from synopsis, little is know what this does. Probably something
+to do with parsing verses or verse references to/from string to/from
+OSIS in a given locale or something along the lines. Email me if you
+can give better description of what this util does.
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+L<vs2osisref>
+
+=cut
diff --git a/debian/man/xml2gbs.1.pod b/debian/man/xml2gbs.1.pod
new file mode 100644
index 0000000..7b518b9
--- /dev/null
+++ b/debian/man/xml2gbs.1.pod
@@ -0,0 +1,54 @@
+#  This is manual page in Perl POD format. Read more at
+#  http://perldoc.perl.org/perlpod.html or run command:
+#
+#     perldoc perlpod | less
+#
+#  To check the syntax:
+#
+#     podchecker *.pod
+#
+#  Create manual page with command:
+#
+#    pod2man PAGE.N.pod > PAGE.N
+
+=head1 NAME
+
+xml2gbs - OSIS/ThML General Book module creation tool
+
+=head1 SYNOPSIS
+
+B<xml2gbs> [OPTIONS] SOURCE [MODULENAME]
+
+
+=head1 DESCRIPTION
+
+This is a tool to create SWORD general book modules from OSIS/ThML sourse. A
+module name can be optionally specified.
+
+=head1 OPTIONS
+
+=over
+
+=item B<-l>
+
+Use long div names in the ThML files.
+
+=item B<-i>
+
+exports to IMP formal instead of creating a module.
+
+=item B<-fT|-fO>
+
+Set the importer to ThML or OSIS format respectively. By default it attempts to
+autodetect.
+
+=back
+
+=head1 Authors
+
+This manual page was written by Dmitrijs Ledkovs <dmitrij.ledkov@gmail.com> for
+Debian project but may be used by others.
+
+=head1 SEE ALSO
+
+=cut
diff --git a/debian/patches/12_fix_compiler_warnings.diff b/debian/patches/12_fix_compiler_warnings.diff
new file mode 100644
index 0000000..dbcf8b5
--- /dev/null
+++ b/debian/patches/12_fix_compiler_warnings.diff
@@ -0,0 +1,1083 @@
+Remove compiler warnings so SWORD will compile with -Wall -Werror
+--- a/src/mgr/filemgr.cpp
++++ b/src/mgr/filemgr.cpp
+@@ -409,7 +409,7 @@
+ 
+ 
+ int FileMgr::copyFile(const char *sourceFile, const char *targetFile) {
+-	int sfd, dfd, len;
++  int sfd, dfd, len;
+ 	char buf[4096];
+ 
+ 	if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1)
+--- a/src/utilfuns/zlib/untgz.c
++++ b/src/utilfuns/zlib/untgz.c
+@@ -262,7 +262,7 @@
+ 	int    remaining = 0;
+ 	FILE   *outfile = NULL;
+ 	char   fname[BLOCKSIZE];
+-	time_t tartime;
++	time_t tartime = 0;
+   
+ 	while (1) {
+ 		len = gzread(in, &buffer, BLOCKSIZE);
+--- a/tests/testblocks.cpp
++++ b/tests/testblocks.cpp
+@@ -34,14 +34,18 @@
+ void addEntry(EntriesBlock *eb) {
+ 	string input;
+ 	string body;
+-	char line[1024];
++	char line[1024], *c;
+ 	std::cout << "\nEnter new Entry's text. '.' on an empty line to finish:\n";
+ 	do {
+ 		std::cout << "> ";
+-		fgets(line, 1000, stdin);
+-		input = line;
+-		if (input.compare("."))
+-			body.append(input);
++		c = fgets(line, 1000, stdin);
++		if (c == NULL) {
++			std::cerr << "ERROR: fgets failed during addEntry\n";
++		} else {
++			input = line;
++			if (input.compare("."))
++				body.append(input);
++		}
+ 	}
+ 	while (input.compare("."));
+ 	std::cout << "Adding new entry.  Index is: " << eb->addEntry(body.c_str()) << "\n\n";
+@@ -77,29 +81,33 @@
+ 
+ 	EntriesBlock *eb = new EntriesBlock();
+ 	string input;
+-	char line[1024];
++	char line[1024], *c;
+ 
+ 	std::cout << "Initial entry count should be 0: " << eb->getCount() << "\n";
+ 
+ 	do {
+ 		std::cout << "[" << eb->getCount() << "] > ";
+-		fgets(line, 1000, stdin);
+-		input = line;
+-		if (input.length() > 0) {
+-			switch (input[0]) {
+-				case 'a': addEntry(eb); break;
+-				case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
+-				case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
+-				case 's': printSize(eb); break;
+-				case 'q': break;
+-				case '?':
+-				default:
+-					std::cout << "\n a - add a new entry\n";
+-					std::cout << " p <entry_index> - print entry\n";
+-					std::cout << " r <entry_index> - remove entry\n";
+-					std::cout << " s - print size of raw data\n";
+-					std::cout << " q - quit\n\n";
+-					break;
++		c = fgets(line, 1000, stdin);
++		if (c == NULL) {
++			std::cerr << "ERROR: fgets failed in main\n";
++		} else {
++			input = line;
++			if (input.length() > 0) {
++				switch (input[0]) {
++					case 'a': addEntry(eb); break;
++					case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
++					case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
++					case 's': printSize(eb); break;
++					case 'q': break;
++					case '?':
++					default:
++						std::cout << "\n a - add a new entry\n";
++						std::cout << " p <entry_index> - print entry\n";
++						std::cout << " r <entry_index> - remove entry\n";
++						std::cout << " s - print size of raw data\n";
++						std::cout << " q - quit\n\n";
++						break;
++				}
+ 			}
+ 		}
+ 	}
+--- a/utilities/stepdump.cpp
++++ b/utilities/stepdump.cpp
+@@ -163,33 +163,56 @@
+ 
+ 
+ void readVersion(int fd, Version *versionRecord) {
++	int r;
+ 
+ 	cout << "\n\nReading Version Record (" << 16/*sizeof(struct Version)*/ << " bytes)\n\n";
+ // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+ //	read(fd, &versionRecord, sizeof(struct Version));
+ 
+ 	cout << "Version Record Information\n";
+-	read(fd, &(versionRecord->versionRecordSize), 2);
++	r = read(fd, &(versionRecord->versionRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tversionRecordSize: " << versionRecord->versionRecordSize << "\n";
+-	read(fd, &(versionRecord->publisherID), 2);
++	r = read(fd, &(versionRecord->publisherID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tpublisherID: " << versionRecord->publisherID << "\n";
+-	read(fd, &(versionRecord->bookID), 2);
++	r = read(fd, &(versionRecord->bookID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tbookID: " << versionRecord->bookID << "\n";
+-	read(fd, &(versionRecord->setID), 2);
++	r = read(fd, &(versionRecord->setID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tsetID: " << versionRecord->setID << "\n";
+-	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
++	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tconversionProgramVerMajor: " << (int)versionRecord->conversionProgramVerMajor << "\n";
+-	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
++	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tconversionProgramVerMinor: " << (int)versionRecord->conversionProgramVerMinor << "\n";
+-	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tleastCompatSTEPVerMajor: " << (int)versionRecord->leastCompatSTEPVerMajor << "\n";
+-	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tleastCompatSTEPVerMinor: " << (int)versionRecord->leastCompatSTEPVerMinor << "\n";
+-	read(fd, &(versionRecord->encryptionType), 1);
++	r = read(fd, &(versionRecord->encryptionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tencryptionType: " << (int)versionRecord->encryptionType << "\n";
+-	read(fd, &(versionRecord->editionID), 1);
++	r = read(fd, &(versionRecord->editionID), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\teditionID: " << (int)versionRecord->editionID << "\n";
+-	read(fd, &(versionRecord->modifiedBy), 2);
++	r = read(fd, &(versionRecord->modifiedBy), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 	cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n";
+ 
+ 	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+@@ -197,33 +220,49 @@
+ 	if (skip) {
+ 		cout << "\nSkipping " << skip << " unknown bytes.\n";
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readVersion");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
+-
++	int r;
+ 	cout << "\n\nReading Viewable Header Record (" << 16/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+ 
+ // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+ //	read(fd, &viewableHeaderRecord, sizeof(struct ViewableHeader));
+ 
+ 	cout << "Viewable Header Record Information\n";
+-	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
++	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tviewableHeaderRecordSize: " << viewableHeaderRecord->viewableHeaderRecordSize << "\n";
+-	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
++	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tviewableBlocksCount: " << viewableHeaderRecord->viewableBlocksCount << "\n";
+-	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
++	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tglossBlocksCount: " << viewableHeaderRecord->glossBlocksCount << "\n";
+-	read(fd, &(viewableHeaderRecord->compressionType), 1);
++	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tcompressionType: " << (int)viewableHeaderRecord->compressionType << "(0 - none; 1 - LZSS)\n";
+-	read(fd, &(viewableHeaderRecord->reserved1), 1);
++	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\treserved1: " << (int)viewableHeaderRecord->reserved1 << "\n";
+-	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
++	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\tblockEntriesSize: " << viewableHeaderRecord->blockEntriesSize << "\n";
+-	read(fd, &(viewableHeaderRecord->reserved2), 2);
++	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 	cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n";
+ 
+ 	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+@@ -231,18 +270,23 @@
+ 	if (skip) {
+ 		cout << "\nSkipping " << skip << " unknown bytes.\n";
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readViewableHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
++	int r;
+ 	unsigned long size = vb->size;
+ 
+ 	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+ 	lseek(fd, vb->offset, SEEK_SET);
+-	read(fd, *buf, vb->size);
++	r = read(fd, *buf, vb->size);
++	if (r != vb->size)
++		perror("ERROR: read failed in readViewableBlocktext");
+ 
+ 	compress->zBuf(&size, *buf);
+ 	strcpy(*buf, compress->Buf());
+@@ -252,30 +296,41 @@
+ 
+ 
+ void readViewableBlock(int fd, ViewableBlock *vb) {
+-
++	int r;
+ 	cout << "\n\nReading Viewable Block (" << 12/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+ 
+ // DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+ //	read(fd, &vb, sizeof(struct ViewableBlock));
+ 
+ 	cout << "Viewable Block Information\n";
+-	read(fd, &(vb->offset), 4);
++	r = read(fd, &(vb->offset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ 	cout << "\toffset: " << vb->offset << "\n";
+-	read(fd, &(vb->uncompressedSize), 4);
++	r = read(fd, &(vb->uncompressedSize), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ 	cout << "\tuncompressedSize: " << vb->uncompressedSize << "\n";
+-	read(fd, &(vb->size), 4);
++	r = read(fd, &(vb->size), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ 	cout << "\tsize: " << vb->size << "\n";
+ }
+ 
+ 
+ void readHeaderControlWordAreaText(int fd, char **buf) {
++	int r;
+ 	long headerControlWordAreaSize;
+-	read(fd, &headerControlWordAreaSize, 4);
++	r = read(fd, &headerControlWordAreaSize, 4);
++	if (r != 4)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 	cout << "Reading Header Control Word Area (" << headerControlWordAreaSize << " bytes)\n\n";
+ 
+ 	*buf = new char [headerControlWordAreaSize + 1];
+ 
+-	read(fd, *buf, headerControlWordAreaSize);
++	r = read(fd, *buf, headerControlWordAreaSize);
++	if (r != headerControlWordAreaSize)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 	(*buf)[headerControlWordAreaSize] = 0;
+ 
+ 	cout << "headerControlWordArea:\n" << *buf << "\n";
+--- a/utilities/treeidxutil.cpp
++++ b/utilities/treeidxutil.cpp
+@@ -58,27 +58,33 @@
+ 
+ 
+ void setLocalName(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Node Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in setLocalName\n";
+ 	treeKey->setLocalName(buf);
+ 	treeKey->save();
+ }
+ 
+ 
+ void assurePath(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter path: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in assurePath\n";
+ 	treeKey->assureKeyPath(buf);
+ }
+ 
+ 
+ void appendSibbling(TreeKeyIdx *treeKey) {
+ 	if (treeKey->getOffset()) {
+-		char buf[1023];
++	  char buf[1023], *c;
+ 		std::cout << "Enter New Sibbling Name: ";
+-		fgets(buf, 1000, stdin);
++		c = fgets(buf, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in appendSibbling\n";
+ 		treeKey->append();
+ 		treeKey->setLocalName(buf);
+ 		treeKey->save();
+@@ -88,9 +94,11 @@
+ 
+ 
+ void appendChild(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Child Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in appendChild\n";
+ 	treeKey->appendChild();
+ 	treeKey->setLocalName(buf);
+ 	treeKey->save();
+@@ -123,11 +131,13 @@
+ 	TreeKeyIdx root = *treeKey;
+ 
+ 	std::string input;
+-	char line[1024];
++	char line[1024], *c;
+ 
+ 	do {
+ 		std::cout << "[" << treeKey->getText() << "] > ";
+-		fgets(line, 1000, stdin);
++		c = fgets(line, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in main\n";
+ 		input = line;
+ 		if (input.length() > 0) {
+ 			switch (input[0]) {
+--- a/utilities/gbfidx.cpp
++++ b/utilities/gbfidx.cpp
+@@ -55,7 +55,7 @@
+ int main(int argc, char **argv)
+ {
+ 	long pos, offset;
+-	int num1, num2, rangemax;
++	int num1, num2, rangemax, w;
+ 	char startflag = 0;
+ 	short size;
+ 
+@@ -67,18 +67,30 @@
+ 	num1 = key1.getChapter();
+ 	num2 = key1.getVerse();
+ 	pos  = 0;
+-	write(bfp, &pos, 4);  /* Book    offset for testament intros */
++	w = write(bfp, &pos, 4);  /* Book    offset for testament intros */
++	if (w != 4)
++		perror("ERROR: write failed in main");
+ 	pos = 4;
+-	write(cfp, &pos, 4);  /* Chapter offset for testament intro */
++	w = write(cfp, &pos, 4);  /* Chapter offset for testament intro */
++	if (w != 4)
++		perror("ERROR: write failed in main");
+ 
+ 
+ /*	Right now just zero out intros until parsing correctly */
+ 	pos = 0;
+ 	size = 0;
+-	write(vfp, &pos, 4);  /* Module intro */
+-	write(vfp, &size, 2);
+-	write(vfp, &pos, 4);  /* Testament intro */
+-	write(vfp, &size, 2);
++	w = write(vfp, &pos, 4);  /* Module intro */
++	if (w != 4)
++		perror("ERROR: write failed in main");
++	w = write(vfp, &size, 2);
++	if (w != 2)
++		perror("ERROR: write failed in main");
++	w = write(vfp, &pos, 4);  /* Testament intro */
++	if (w != 4)
++		perror("ERROR: write failed in main");
++	w = write(vfp, &size, 2);
++	if (w != 2)
++		perror("ERROR: write failed in main");
+ 
+ 	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
+ 		if (!startflag) {
+@@ -122,6 +134,7 @@
+ 
+ void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
+ {
++	int w;
+ 	long pos;
+ 	short tmp;
+ 
+@@ -129,26 +142,48 @@
+ 		if (key1.getVerse() == 1) {	// new chapter
+ 			if (key1.getChapter() == 1) {	// new book
+ 				pos = lseek(cfp, 0, SEEK_CUR);
+-				write(bfp, &pos, 4);
++				w = write(bfp, &pos, 4);
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
+ 				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
+-				write(cfp, &pos, 4);
+-				write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
+-				write(vfp, &chapsize, 2);
++				w = write(cfp, &pos, 4);
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
++				w = write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
++				w = write(vfp, &chapsize, 2);
++				if (w != 2)
++					perror("ERROR: write failed in writeidx");
+ 			}
+ 			pos = lseek(vfp, 0, SEEK_CUR);
+-			write(cfp, &pos, 4);
+-			write(vfp, &chapoffset, 4);  /* Chapter intro */
+-			write(vfp, &chapsize, 2);
++			w = write(cfp, &pos, 4);
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &chapoffset, 4);  /* Chapter intro */
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &chapsize, 2);
++			if (w != 2)
++				perror("ERROR: write failed in writeidx");
+ 		}
+ 		if (key1 >= key2) {
+-			write(vfp, &offset, 4);
+-			write(vfp, &size, 2);
++			w = write(vfp, &offset, 4);
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &size, 2);
++			if (w != 2)
++				perror("ERROR: write failed in writeidx");
+ 		}
+ 		else	{
+ 			pos = 0;
+ 			tmp = 0;
+-			write(vfp, &pos, 4);
+-			write(vfp, &tmp, 2);
++			w = write(vfp, &pos, 4);
++			if (w != 4)
++				perror("ERROR: write failed in writeidx");
++			w = write(vfp, &tmp, 2);
++			if (w != 2)
++				perror("ERROR: write failed in writeidx");
+ 		}
+ 	}
+ }
+--- a/utilities/genbookutil.cpp
++++ b/utilities/genbookutil.cpp
+@@ -58,9 +58,11 @@
+ 
+ 
+ void setLocalName(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Node Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in setLocalName\n";
+ 	SWBuf name = buf;
+ 	treeKey->setLocalName(name.trim());
+ 	treeKey->save();
+@@ -68,18 +70,22 @@
+ 
+ 
+ void gotoPath(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter Path: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in gotoPath\n";
+ 	SWBuf path = buf;
+ 	(*treeKey) = path.trim();
+ }
+ 
+ 
+ void assurePath(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter Path: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in assurePath\n";
+ 	SWBuf path = buf;
+ 	treeKey->assureKeyPath(path.trim());
+ }
+@@ -96,10 +102,12 @@
+ 	SWBuf body;
+ 	TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+ 	if (treeKey->getOffset()) {
+-		char buf[1023];
++	  char buf[1023], *c;
+ 		std::cout << "Enter New Entry Text ('.' on a line by itself to end): \n";
+ 		do {
+-			fgets(buf, 1000, stdin);
++			c = fgets(buf, 1000, stdin);
++			if (c == NULL)
++				std::cerr << "ERROR: fgets failed in setEntryText\n";
+ 			SWBuf text = buf;
+ 			text.trim();
+ 			if ((text[0] == '.') && (text[1] == 0))
+@@ -116,9 +124,11 @@
+ 
+ void appendSibbling(TreeKeyIdx *treeKey) {
+ 	if (treeKey->getOffset()) {
+-		char buf[1023];
++	  char buf[1023], *c;
+ 		std::cout << "Enter New Sibbling Name: ";
+-		fgets(buf, 1000, stdin);
++		c = fgets(buf, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in appendSibbling\n";
+ 		SWBuf name = buf;
+ 		treeKey->append();
+ 		treeKey->setLocalName(name.trim());
+@@ -129,9 +139,11 @@
+ 
+ 
+ void appendChild(TreeKeyIdx *treeKey) {
+-	char buf[1023];
++  char buf[1023], *c;
+ 	std::cout << "Enter New Child Name: ";
+-	fgets(buf, 1000, stdin);
++	c = fgets(buf, 1000, stdin);
++	if (c == NULL)
++		std::cerr << "ERROR: fgets failed in appendChild\n";
+ 	SWBuf name = buf;
+ 	treeKey->appendChild();
+ 	treeKey->setLocalName(name.trim());
+@@ -173,11 +185,13 @@
+ 	treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+ 
+ 	SWBuf input;
+-	char line[1024];
++	char line[1024], *c;
+ 
+ 	do {
+ 		std::cout << "[" << treeKey->getText() << "] > ";
+-		fgets(line, 1000, stdin);
++		c = fgets(line, 1000, stdin);
++		if (c == NULL)
++			std::cerr << "ERROR: fgets failed in main\n";
+ 		input = line;
+ 		input.trim();
+ 		if (input.length() > 0) {
+--- a/utilities/vpl2mod.cpp
++++ b/utilities/vpl2mod.cpp
+@@ -76,14 +76,18 @@
+ 			break;
+ 	}
+ 	
+-	int size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
++	int r, size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
+ 
+ 	*buf = new char [ size + 1 ];
+ 
+ 	if (size > 0) {
+ 		lseek(fd, index, SEEK_SET);
+-		read(fd, *buf, size);
+-		read(fd, &ch, 1);   //pop terminating char
++		r = read(fd, *buf, size);
++		if (r != size)
++			std::cerr <<"ERROR: short read in readline\n";
++		r = read(fd, &ch, 1);   //pop terminating char
++		if (r != size)
++			std::cerr <<"ERROR: short read of terminating char in readline\n";
+ 		(*buf)[size] = 0;
+ 
+ 		// clean up any trailing junk on buf
+--- a/utilities/installmgr.cpp
++++ b/utilities/installmgr.cpp
+@@ -74,8 +74,10 @@
+ 		cout << "then type yes at the prompt\n\n";
+ 		cout << "enable? [no] ";
+ 
+-		char prompt[10];
+-		fgets(prompt, 9, stdin);
++		char prompt[10], *c;
++		c = fgets(prompt, 9, stdin);
++		if (c == NULL)
++			std::cerr <<"ERROR: fgets failed in isUserDisclaimerConfirmed\n";
+ 		confirmed = (!strcmp(prompt, "yes\n"));
+ 		cout << "\n";
+ 	}
+--- a/utilities/step2vpl.cpp
++++ b/utilities/step2vpl.cpp
+@@ -228,93 +228,169 @@
+ 
+ 
+ void readVersion(int fd, Version *versionRecord) {
++	int r;
+ 
+-	read(fd, &(versionRecord->versionRecordSize), 2);
+-	read(fd, &(versionRecord->publisherID), 2);
+-	read(fd, &(versionRecord->bookID), 2);
+-	read(fd, &(versionRecord->setID), 2);
+-	read(fd, &(versionRecord->conversionProgramVerMajor), 1);
+-	read(fd, &(versionRecord->conversionProgramVerMinor), 1);
+-	read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
+-	read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
+-	read(fd, &(versionRecord->encryptionType), 1);
+-	read(fd, &(versionRecord->editionID), 1);
+-	read(fd, &(versionRecord->modifiedBy), 2);
++	r = read(fd, &(versionRecord->versionRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++
++	r = read(fd, &(versionRecord->publisherID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->bookID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->setID), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->encryptionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->editionID), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readVersion");
++	r = read(fd, &(versionRecord->modifiedBy), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVersion");
+ 
+ 	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readVersion");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord) {
++	int r;
+ 
+-	read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
+-	read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
+-	read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
+-	read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
+-	read(fd, &(sectionsHeaderRecord->reserved), 4);
++	r = read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionsHeader");
++	r = read(fd, &(sectionsHeaderRecord->reserved), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionsHeader");
+ 
+ 	int skip = sectionsHeaderRecord->sectionsHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readSectionsHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
++	int r;
+ 
+-	read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
+-	read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
+-	read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
+-	read(fd, &(viewableHeaderRecord->compressionType), 1);
+-	read(fd, &(viewableHeaderRecord->reserved1), 1);
+-	read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
+-	read(fd, &(viewableHeaderRecord->reserved2), 2);
++	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
++	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readViewableHeader");
+ 
+ 	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readViewableHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord) {
++	int r;
+ 
+-	read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
+-	read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
+-	read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
+-	read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
+-	read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
+-	read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
+-	read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
++	r = read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readVSyncHeader");
++	r = read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readVSyncHeader");
+ 
+ 	int skip = vSyncHeaderRecord->vSyncHeaderRecordSize - 16/*sizeof(VSyncHeader)*/;
+ 
+ 	if (skip) {
+ 		char *skipbuf = new char[skip];
+-		read(fd, skipbuf, skip);
++		r = read(fd, skipbuf, skip);
++		if (r != skip)
++			perror("ERROR: read failed in readVSyncHeader");
+ 		delete [] skipbuf;
+ 	}
+ }
+ 
+ 
+ void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
++	int r;
+ 	unsigned long size = vb->size;
+ 
+ 	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+ 	lseek(fd, vb->offset, SEEK_SET);
+-	read(fd, *buf, vb->size);
++	r = read(fd, *buf, vb->size);
++	if (r != vb->size)
++		perror("ERROR: read failed in readViewableBlockText");
+ 
+ 	compress->zBuf(&size, *buf);
+ 	strcpy(*buf, compress->Buf());
+@@ -322,35 +398,53 @@
+ 
+ 
+ void readViewableBlock(int fd, ViewableBlock *vb) {
++	int r;
+ 
+-	read(fd, &(vb->offset), 4);
+-	read(fd, &(vb->uncompressedSize), 4);
+-	read(fd, &(vb->size), 4);
++	r = read(fd, &(vb->offset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
++	r = read(fd, &(vb->uncompressedSize), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
++	r = read(fd, &(vb->size), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readViewableBlock");
+ }
+ 
+ 
+ void readHeaderControlWordAreaText(int fd, char **buf) {
++	int r;
+ 	long headerControlWordAreaSize;
+-	read(fd, &headerControlWordAreaSize, 4);
++	r = read(fd, &headerControlWordAreaSize, 4);
++	if (r != 4)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 
+ 	*buf = new char [headerControlWordAreaSize + 1];
+ 
+-	read(fd, *buf, headerControlWordAreaSize);
++	r = read(fd, *buf, headerControlWordAreaSize);
++	if (r != headerControlWordAreaSize)
++		perror("ERROR: read failed in readHeaderControlWordAreaText");
+ 	(*buf)[headerControlWordAreaSize] = 0;
+ 
+ }
+ 
+ void readVSyncBooksInfo(int fd, VSyncHeader *vSyncHeaderRecord, VSyncBooksInfo **vSyncBooksInfo) {
+ 
++	int r;
+ 	int bookCount = vSyncHeaderRecord->endBookNumber - vSyncHeaderRecord->startBookNumber;
+ 	*vSyncBooksInfo = new VSyncBooksInfo[bookCount];
+ 	for (int i = 0; i <= bookCount; i++) {
+-		read(fd, &(*vSyncBooksInfo)[i].offset, 4);
+-		read(fd, &(*vSyncBooksInfo)[i].count, 2);
++		r = read(fd, &(*vSyncBooksInfo)[i].offset, 4);
++		if (r != 4)
++			perror("ERROR: read failed in readVSyncBooksInfo");
++		r = read(fd, &(*vSyncBooksInfo)[i].count, 2);
++		if (r != 2)
++			perror("ERROR: read failed in readVSyncBooksInfo");
+ 	}
+ }
+ 
+ void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo) {
++	int r;
+ 	VSyncPoint vSyncPoint;
+ 
+ 	lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET);
+@@ -361,9 +455,15 @@
+ 		char *sectionName;
+ 		char *verseText;
+ 
+-		read(fdvsync, &(vSyncPoint.chapter), 2);
+-		read(fdvsync, &(vSyncPoint.verse), 2);
+-		read(fdvsync, &(vSyncPoint.offset), 4);
++		r = read(fdvsync, &(vSyncPoint.chapter), 2);
++		if (r != 2)
++			perror("ERROR: read failed in displayBook");
++		r = read(fdvsync, &(vSyncPoint.verse), 2);
++		if (r != 2)
++			perror("ERROR: read failed in displayBook");
++		r = read(fdvsync, &(vSyncPoint.offset), 4);
++		if (r != 4)
++			perror("ERROR: read failed in displayBook");
+ 		vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE);
+ 		lseek(fdsections, vSyncPoint.offset, SEEK_SET);
+ 		readSectionLevelInfo(fdsections, &sectionLevelInfo);
+@@ -418,26 +518,50 @@
+ 
+ 
+ void readSectionName(int fd, SectionLevelInfo *sli, char **name) {
++	int r;
+ 	short size;
+ 	lseek(fd, sli->nameOffset, SEEK_SET);
+-	read(fd, &size, 2);
++	r = read(fd, &size, 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionName");
+ 	*name = new char [ size + 1 ];
+-	read(fd, *name, size);
++	r = read(fd, *name, size);
++	if (r != size)
++		perror("ERROR: read failed in readSectionName");
+ 	(*name)[size] = 0;
+ }
+ 
+ void readSectionLevelInfo(int fd, SectionLevelInfo *sli) {
++	int r;
+ 
+-	read(fd, &(sli->parentOffset), 4);
+-	read(fd, &(sli->previousOffset), 4);
+-	read(fd, &(sli->nextOffset), 4);
+-	read(fd, &(sli->viewableOffset), 4);
++	r = read(fd, &(sli->parentOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->previousOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->nextOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->viewableOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
+ 	sli->viewableOffset = VIEWABLEBLOCKSTART + (VIEWABLEBLOCKSIZE * sli->viewableOffset);
+-	read(fd, &(sli->startLevel), 2);
+-	read(fd, &(sli->level), 1);
+-	read(fd, &(sli->nameOffset), 4);
+-	read(fd, &(sli->outSync_1), 4);
+-	read(fd, &(sli->outSync_2), 2);
++	r = read(fd, &(sli->startLevel), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->level), 1);
++	if (r != 1)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->nameOffset), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->outSync_1), 4);
++	if (r != 4)
++		perror("ERROR: read failed in readSectionLevelInfo");
++	r = read(fd, &(sli->outSync_2), 2);
++	if (r != 2)
++		perror("ERROR: read failed in readSectionLevelInfo");
+ }
+ 
+ void cleanBuf(char *buf) {
+--- a/utilities/cipherraw.cpp
++++ b/utilities/cipherraw.cpp
+@@ -53,7 +53,7 @@
+ 	SWCipher *zobj;
+ 	VerseKey key;
+ 	RawVerse *rawdrv;
+-	int ofd[2], oxfd[2];
++	int ofd[2], oxfd[2], w;
+ 	long tmpoff = 0, offset, loffset = 0, lzoffset = 0;
+ 	unsigned short size, lsize = 0, lzsize;
+ 	char *tmpbuf;
+@@ -79,10 +79,18 @@
+ 	delete [] tmpbuf;
+ 
+ 	printf("\n");
+-	write(oxfd[0], &lzoffset, 4);
+-	write(oxfd[0], &lzsize, 2);
+-	write(oxfd[1], &lzoffset, 4);
+-	write(oxfd[1], &lzsize, 2);
++	w = write(oxfd[0], &lzoffset, 4);
++	if (w < 0)
++		perror("ERROR: write failed in main");
++	w = write(oxfd[0], &lzsize, 2);
++	if (w < 0)
++		perror("ERROR: write failed in main");
++	w = write(oxfd[1], &lzoffset, 4);
++	if (w < 0)
++		perror("ERROR: write failed in main");
++	w = write(oxfd[1], &lzsize, 2);
++	if (w < 0)
++		perror("ERROR: write failed in main");
+ 
+ 	key.setAutoNormalize(false);
+ 	key.setIntros(true);
+@@ -94,8 +102,10 @@
+ 			printf("using previous offset,size %d\n", size);
+ 			offset = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
+ 			printf("%ld %ld %d \n", offset, lzoffset, lzsize);
+-			write(oxfd[key.getTestament() - 1], &lzoffset, 4);
+-			write(oxfd[key.getTestament() - 1], &lzsize, 2);
++			if (write(oxfd[key.getTestament() - 1], &lzoffset, 4) < 0)
++                            perror("ERROR: write failed in main");
++			if (write(oxfd[key.getTestament() - 1], &lzsize, 2) < 0)
++                            perror("ERROR: write failed in main");
+ 		}
+ 		else {
+ 			lsize   = size;
+@@ -112,13 +122,17 @@
+ 			offset = lseek(ofd[key.getTestament() - 1], 0, SEEK_CUR);
+ 			tmpoff = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
+ 			printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size);
+-			write(oxfd[key.getTestament() - 1], &offset, 4);
++			if (write(oxfd[key.getTestament() - 1], &offset, 4) < 0)
++                            perror("ERROR: write failed in main");
+ 			unsigned long ulSize = size;
+-			if (size) 
+-				write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size);
++			if (size) {
++                            if (write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size) < 0)
++                            perror("ERROR: write failed in main");
++                        }
+ 			size = (unsigned int)ulSize;
+ 			lzoffset = offset;
+-			write(oxfd[key.getTestament() - 1], &size, 2);
++			if (write(oxfd[key.getTestament() - 1], &size, 2) < 0)
++                            perror("ERROR: write failed in main");
+ 			lzsize = size;
+ 		}
+ 	}
+--- a/utilities/lexdump.c
++++ b/utilities/lexdump.c
+@@ -45,7 +45,7 @@
+ 
+ int main(int argc, char **argv) {
+ 	char *tmpbuf;
+-	int idxfd, datfd;
++	int idxfd, datfd, r;
+ 	long offset;
+ 	unsigned int size;
+ 	char datbuf[255];
+@@ -64,11 +64,17 @@
+ 
+ 	offset = atoi(argv[2]) * 6;
+ 	lseek(idxfd, offset, SEEK_SET);
+-	read(idxfd, &offset, 4);
+-	read(idxfd, &size, 2);
++	r = read(idxfd, &offset, 4);
++	if (r != 4)
++		perror("ERROR: read failed in main");
++	r = read(idxfd, &size, 2);
++	if (r != 2)
++		perror("ERROR: read failed in main");
+ 	printf("offset: %ld; size: %d\n", offset, size);
+ 	lseek(datfd, offset, SEEK_SET);
+-	read(datfd, datbuf, 40);
++	r = read(datfd, datbuf, 40);
++	if (r != 40)
++		perror("ERROR: read failed in main");
+ 	datbuf[40] = 0;
+ 	printf("%s\n", datbuf);
+ 	close(datfd);
diff --git a/debian/patches/13_curl.diff b/debian/patches/13_curl.diff
new file mode 100644
index 0000000..8cd9df8
--- /dev/null
+++ b/debian/patches/13_curl.diff
@@ -0,0 +1,19 @@
+revno: 2452
+svn revno: 2506 (on /trunk)
+committer: scribe
+timestamp: Sat 2010-03-20 11:49:54 +0000
+message:
+  applied Karl's patch to fix libcurl problem with status reporter data.
+
+--- a/src/mgr/curlftpt.cpp
++++ b/src/mgr/curlftpt.cpp
+@@ -186,6 +186,9 @@
+ 		// it seems CURL tries to use this option data later for some reason, so we unset here
+ 		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
+ 
++		// it seems CURL tries to use this option data later for some reason, so we unset here
++		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
++
+ 		if(CURLE_OK != res) {
+ 			retVal = -1;
+ 		}
diff --git a/debian/patches/16_gcc4.6_sword.patch b/debian/patches/16_gcc4.6_sword.patch
new file mode 100644
index 0000000..9e32095
--- /dev/null
+++ b/debian/patches/16_gcc4.6_sword.patch
@@ -0,0 +1,339 @@
+Description: gcc-4.6 -Wunused-but-set-variable fixes
+Origin: commit, revision id: dmitrijs.ledkovs@credativ.co.uk-20110805200647-l3i6n1uwjuyjv525
+Author: Dmitrijs Ledkovs <dmitrijs.ledkovs@credativ.co.uk>
+Last-Update: 2011-08-05
+X-Bzr-Revision-Id: dmitrijs.ledkovs@credativ.co.uk-20110805200647-l3i6n1uwjuyjv525
+
+=== modified file 'src/mgr/swmgr.cpp'
+Index: debian/src/mgr/swmgr.cpp
+===================================================================
+--- debian.orig/src/mgr/swmgr.cpp
++++ debian/src/mgr/swmgr.cpp
+@@ -889,7 +889,6 @@ SWModule *SWMgr::CreateMod(const char *n
+ 	if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom"))) {
+ 		SWCompress *compress = 0;
+ 		int blockType = CHAPTERBLOCKS;
+-		int blockNum = 1;
+ 		misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (SWBuf)"CHAPTER";
+ 		if (!stricmp(misc1.c_str(), "VERSE"))
+ 			blockType = VERSEBLOCKS;
+@@ -898,9 +897,6 @@ SWModule *SWMgr::CreateMod(const char *n
+ 		else if (!stricmp(misc1.c_str(), "BOOK"))
+ 			blockType = BOOKBLOCKS;
+ 		
+-		misc1 = ((entry = section.find("BlockNumber")) != section.end()) ? (*entry).second : (SWBuf)"1";
+-		blockNum = atoi(misc1.c_str());
+-
+ 		misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (SWBuf)"LZSS";
+ #ifndef EXCLUDEZLIB
+ 		if (!stricmp(misc1.c_str(), "ZIP"))
+Index: debian/src/modules/filters/gbfrtf.cpp
+===================================================================
+--- debian.orig/src/modules/filters/gbfrtf.cpp
++++ debian/src/modules/filters/gbfrtf.cpp
+@@ -42,7 +42,6 @@ char GBFRTF::processText(SWBuf &text, co
+ 	SWBuf strongnum;
+ 	SWBuf strongtense;
+ 	bool hideText = false;
+-	int wordLen = 0;
+ 	int wordCount = 0;
+ 
+ 	const char *from;
+@@ -50,7 +49,6 @@ char GBFRTF::processText(SWBuf &text, co
+ 	from = orig.c_str();
+ 	for (text = ""; *from; from++) {
+ 		if (*from == '<') {
+-			wordLen = wordCount;
+ 			wordCount = 0;
+ 			intoken = true;
+ 			tokpos = 0;
+Index: debian/src/modules/filters/gbfwordjs.cpp
+===================================================================
+--- debian.orig/src/modules/filters/gbfwordjs.cpp
++++ debian/src/modules/filters/gbfwordjs.cpp
+@@ -57,7 +57,6 @@ char GBFWordJS::processText(SWBuf &text,
+ 		char token[2112]; // cheese.  Fix.
+ 		int tokpos = 0;
+ 		bool intoken = false;
+-		bool lastspace = false;
+ 		int word = 1;
+ 		char val[128];
+ 		char wordstr[5];
+@@ -152,14 +151,11 @@ char GBFWordJS::processText(SWBuf &text,
+ 						else strong << 1;
+ 
+ 						SWModule *sLex = 0;
+-						SWModule *sMorph = 0;
+ 						if (gh == 'G') {
+ 							sLex = defaultGreekLex;
+-							sMorph = defaultGreekParse;
+ 						}
+ 						if (gh == 'H') {
+ 							sLex = defaultHebLex;
+-							sMorph = defaultHebParse;
+ 						}
+ 						SWBuf lexName = "";
+ 						if (sLex) {
+@@ -223,7 +219,6 @@ char GBFWordJS::processText(SWBuf &text,
+ 			}
+ 			else	{
+ 				text += *from;
+-				lastspace = (*from == ' ');
+ 			}
+ 		}
+ 
+Index: debian/src/modules/filters/osislemma.cpp
+===================================================================
+--- debian.orig/src/modules/filters/osislemma.cpp
++++ debian/src/modules/filters/osislemma.cpp
+@@ -44,7 +44,6 @@ OSISLemma::~OSISLemma() {
+ char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+ 	SWBuf token;
+ 	bool intoken = false;
+-	bool lastspace = false;
+ 
+ 	const SWBuf orig = text;
+ 	const char * from = orig.c_str();
+@@ -90,7 +89,6 @@ char OSISLemma::processText(SWBuf &text,
+ 			}
+ 			else	{
+ 				text.append(*from);
+-				lastspace = (*from == ' ');
+ 			}
+ 		}
+ 	}
+Index: debian/src/modules/filters/osismorph.cpp
+===================================================================
+--- debian.orig/src/modules/filters/osismorph.cpp
++++ debian/src/modules/filters/osismorph.cpp
+@@ -45,7 +45,6 @@ char OSISMorph::processText(SWBuf &text,
+ 		char token[2048]; // cheese.  Fix.
+ 		int tokpos = 0;
+ 		bool intoken = false;
+-		bool lastspace = false;
+ 		SWBuf orig = text;
+ 		const char *from = orig.c_str();
+ 		
+@@ -90,7 +89,6 @@ char OSISMorph::processText(SWBuf &text,
+ 			}
+ 			else	{
+ 				text.append(*from);
+-				lastspace = (*from == ' ');
+ 			}
+ 		}
+ 	}
+Index: debian/src/modules/filters/osisruby.cpp
+===================================================================
+--- debian.orig/src/modules/filters/osisruby.cpp
++++ debian/src/modules/filters/osisruby.cpp
+@@ -44,7 +44,6 @@ OSISRuby::~OSISRuby() {
+ char OSISRuby::processText(SWBuf &text, const SWKey *key, const SWModule *module) {

+ 	SWBuf token;

+ 	bool intoken = false;

+-	bool lastspace = false;

+ 

+ 	const SWBuf orig = text;

+ 	const char * from = orig.c_str();

+@@ -83,7 +82,6 @@ char OSISRuby::processText(SWBuf &text,
+ 			}

+ 			else	{

+ 				text.append(*from);

+-				lastspace = (*from == ' ');

+ 			}

+ 		}

+ 	}

+Index: debian/src/modules/filters/osisstrongs.cpp
+===================================================================
+--- debian.orig/src/modules/filters/osisstrongs.cpp
++++ debian/src/modules/filters/osisstrongs.cpp
+@@ -49,7 +49,6 @@ OSISStrongs::~OSISStrongs() {
+ char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+ 	SWBuf token;
+ 	bool intoken = false;
+-	bool lastspace = false;
+ 	int wordNum = 1;
+ 	char wordstr[5];
+ 	const char *wordStart = 0;
+@@ -280,7 +279,6 @@ char OSISStrongs::processText(SWBuf &tex
+ 		}
+ 		else	{
+ 			text.append(*from);
+-			lastspace = (*from == ' ');
+ 		}
+ 	}
+ 	return 0;
+Index: debian/src/modules/filters/osiswordjs.cpp
+===================================================================
+--- debian.orig/src/modules/filters/osiswordjs.cpp
++++ debian/src/modules/filters/osiswordjs.cpp
+@@ -59,7 +59,6 @@ char OSISWordJS::processText(SWBuf &text
+ 		char token[2112]; // cheese.  Fix.
+ 		int tokpos = 0;
+ 		bool intoken = false;
+-		bool lastspace = false;
+ 		int wordNum = 1;
+ 		char wordstr[5];
+ 		SWBuf modName = (module)?module->Name():"";
+@@ -186,7 +185,6 @@ char OSISWordJS::processText(SWBuf &text
+ 			}
+ 			else	{
+ 				text.append(*from);
+-				lastspace = (*from == ' ');
+ 			}
+ 		}
+ 	}
+Index: debian/src/modules/filters/thmlwordjs.cpp
+===================================================================
+--- debian.orig/src/modules/filters/thmlwordjs.cpp
++++ debian/src/modules/filters/thmlwordjs.cpp
+@@ -58,7 +58,6 @@ char ThMLWordJS::processText(SWBuf &text
+ 		char token[2112]; // cheese.  Fix.
+ 		int tokpos = 0;
+ 		bool intoken = false;
+-		bool lastspace = false;
+ 		int word = 1;
+ 		char val[128];
+ 		char *valto;
+@@ -166,14 +165,11 @@ char ThMLWordJS::processText(SWBuf &text
+ 						else strong << 1;
+ 
+ 						SWModule *sLex = 0;
+-						SWModule *sMorph = 0;
+ 						if (gh == 'G') {
+ 							sLex = defaultGreekLex;
+-							sMorph = defaultGreekParse;
+ 						}
+ 						if (gh == 'H') {
+ 							sLex = defaultHebLex;
+-							sMorph = defaultHebParse;
+ 						}
+ 						SWBuf lexName = "";
+ 						if (sLex) {
+@@ -204,16 +200,6 @@ char ThMLWordJS::processText(SWBuf &text
+ 							textStr += lastAppendLen;
+ 							SWBuf spanStart = "";
+ 
+-
+-
+-/*
+-							if (sMorph) {
+-								SWBuf popMorph = "<a onclick=\"";
+-								popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->Name(), morph.c_str(), wordID.c_str(), morph.c_str());
+-								morph = popMorph;
+-							}
+-*/
+-
+ 							// 'p' = 'fillpop' to save bandwidth
+ 							const char *m = strchr(morph.c_str(), ':');
+ 							if (m) m++;
+@@ -237,7 +223,6 @@ char ThMLWordJS::processText(SWBuf &text
+ 			}
+ 			else	{
+ 				text += *from;
+-				lastspace = (*from == ' ');
+ 			}
+ 		}
+ 
+Index: debian/src/modules/filters/utf8html.cpp
+===================================================================
+--- debian.orig/src/modules/filters/utf8html.cpp
++++ debian/src/modules/filters/utf8html.cpp
+@@ -34,14 +34,11 @@ UTF8HTML::UTF8HTML() {
+ char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+ {
+ 	unsigned char *from;
+-	int len;
+         char digit[10];
+         unsigned long ch;
+ 	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+ 		return (char)-1;
+ 
+-	len = strlen(text.c_str()) + 2;						// shift string to right of buffer
+-
+ 	SWBuf orig = text;
+   	from = (unsigned char *)orig.c_str();
+ 
+Index: debian/src/modules/filters/utf8latin1.cpp
+===================================================================
+--- debian.orig/src/modules/filters/utf8latin1.cpp
++++ debian/src/modules/filters/utf8latin1.cpp
+@@ -36,14 +36,12 @@ char UTF8Latin1::processText(SWBuf &text
+ {
+   unsigned char *from;
+ 
+-  int len;
+   unsigned long uchar;
+   unsigned char significantFirstBits, subsequent;
+   
+   if ((unsigned long)key < 2) {// hack, we're en(1)/de(0)ciphering
+ 	return (char)-1;
+   }
+-  len = strlen(text.c_str()) + 1;						// shift string to right of buffer
+ 
+   SWBuf orig = text;
+   from = (unsigned char*)orig.c_str();
+Index: debian/src/utilfuns/url.cpp
+===================================================================
+--- debian.orig/src/utilfuns/url.cpp
++++ debian/src/utilfuns/url.cpp
+@@ -133,7 +133,6 @@ void URL::parse () {
+  //3.Get the hostname part. This is the part from pos up to the first slash
+ 	bool checkPath   = true;
+ 	bool checkParams = true;
+-	bool checkAnchor = true;
+ 
+ 	end = strchr(urlPtr, '/');
+ 	if (!end) {
+@@ -145,7 +144,6 @@ void URL::parse () {
+ 		end = strchr(urlPtr, '#');
+ 	}
+ 	if (!end) {
+-		checkAnchor = false;
+ 		end = urlPtr+strlen(urlPtr);
+ 	}
+ 	 
+@@ -160,7 +158,6 @@ void URL::parse () {
+ 			end = strchr(urlPtr, '#');
+ 		}
+ 		if (!end) {
+-			checkAnchor = false;
+ 			end = urlPtr+strlen(urlPtr);
+ 		}
+ 
+@@ -174,14 +171,6 @@ void URL::parse () {
+ 		SWBuf paramName;
+ 		SWBuf paramValue;
+ 				
+-/*
+-		end = strchr(urlPtr, '#');
+-		if (!end) {
+-			checkAnchor = false;
+-			end = urlPtr+strlen(urlPtr);
+-		}
+-*/
+-		//end = (start && strchr(start, '?')) ? strchr(start, '?')+1 :0;
+ 		end = urlPtr;
+ 		while (end) {
+ 			paramName = "";
+Index: debian/utilities/osis2mod.cpp
+===================================================================
+--- debian.orig/utilities/osis2mod.cpp
++++ debian/utilities/osis2mod.cpp
+@@ -1416,7 +1416,6 @@ int main(int argc, char **argv) {
+ 	const char* osisDoc    = argv[2];
+ 	int append             = 0;
+ 	SWBuf compType         = "";
+-	bool isCommentary      = false;
+ 	int iType              = 4;
+ 	int entrySize          = 0;
+ 	SWBuf cipherKey        = "";
+@@ -1464,9 +1463,6 @@ int main(int argc, char **argv) {
+ 			}
+ 			usage(*argv, "-s requires one of <2|4>");
+ 		}
+-		else if (!strcmp(argv[i], "-C")) {
+-			isCommentary = true;
+-		}
+ 		else if (!strcmp(argv[i], "-d")) {
+ 			if (i+1 < argc) debug |= atoi(argv[++i]);
+ 			else usage(*argv, "-d requires <flags>");
diff --git a/debian/patches/2631_fix_curl.patch b/debian/patches/2631_fix_curl.patch
new file mode 100644
index 0000000..acc2296
--- /dev/null
+++ b/debian/patches/2631_fix_curl.patch
@@ -0,0 +1,30 @@
+Description: types.h is no longer part of cURL stable
+Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2631
+Author: chrislit
+Last-Update: 2011-07-03
+X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2631
+
+=== modified file 'src/mgr/curlftpt.cpp'
+--- old/src/mgr/curlftpt.cpp	2010-03-20 11:49:54 +0000
++++ new/src/mgr/curlftpt.cpp	2011-07-03 09:40:30 +0000
+@@ -26,7 +26,6 @@
+ #include <fcntl.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+
+=== modified file 'src/mgr/curlhttpt.cpp'
+--- old/src/mgr/curlhttpt.cpp	2009-10-21 23:46:40 +0000
++++ new/src/mgr/curlhttpt.cpp	2011-07-03 09:40:30 +0000
+@@ -25,7 +25,6 @@
+ #include <cctype>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <swlog.h>
+
diff --git a/debian/patches/2661.patch b/debian/patches/2661.patch
new file mode 100644
index 0000000..19214f2
--- /dev/null
+++ b/debian/patches/2661.patch
@@ -0,0 +1,102 @@
+Description: Commiting patch from GHellings to support both CLucene 0.9x and 2.x
+ Leaving the CMake stuff for Greg to commit himself so CMake blame stays with him ;)
+Origin: commit, revision id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2661,
+ http://thread.gmane.org/gmane.comp.literature.sword.devel/21816
+Author: scribe, Tom Callaway, Deji Akingunola
+Last-Update: 2011-10-29
+X-Bzr-Revision-Id: svn-v4:bcd7d363-81e1-0310-97ec-a550e20fc99c:trunk:2661
+
+=== modified file 'src/modules/swmodule.cpp'
+--- a/src/modules/swmodule.cpp
++++ b/src/modules/swmodule.cpp
+@@ -40,7 +40,6 @@
+ 
+ #ifdef USELUCENE
+ #include <CLucene.h>
+-#include <CLucene/CLBackwards.h>
+ 
+ //Lucence includes
+ //#include "CLucene.h"
+@@ -59,6 +58,9 @@
+ 
+ using std::vector;
+ 
++extern size_t lucene_utf8towcs(wchar_t *, const char *,  size_t maxslen);
++extern size_t lucene_wcstoutf8 (char *,  const wchar_t *, size_t maxslen);
++
+ SWORD_NAMESPACE_START
+ 
+ SWDisplay SWModule::rawdisp;
+@@ -1144,7 +1146,7 @@
+ 
+ 			lucene_utf8towcs(wcharBuffer, keyText, MAX_CONV_SIZE); //keyText must be utf8
+ //			doc->add( *(new Field("key", wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED)));
+-			doc->add( *Field::Text(_T("key"), wcharBuffer ) );
++			doc->add(*_CLNEW Field(_T("key"), wcharBuffer, Field::STORE_YES | Field::INDEX_TOKENIZED) );
+ 
+ 
+ 			if (includeKeyInSearch) {
+@@ -1155,11 +1157,11 @@
+ 			}
+ 
+ 			lucene_utf8towcs(wcharBuffer, content, MAX_CONV_SIZE); //content must be utf8
+-			doc->add( *Field::UnStored(_T("content"), wcharBuffer) );
++			doc->add(*_CLNEW Field(_T("content"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED));
+ 
+ 			if (strong.length() > 0) {
+ 				lucene_utf8towcs(wcharBuffer, strong, MAX_CONV_SIZE);
+-				doc->add( *Field::UnStored(_T("lemma"), wcharBuffer) );
++				doc->add(*_CLNEW Field(_T("lemma"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ //printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str());
+ 			}
+ 
+@@ -1280,12 +1282,12 @@
+ 
+ //printf("proxBuf after (%s).\nprox: %s\nproxLem: %s\n", (const char *)*key, proxBuf.c_str(), proxLem.c_str());
+ 
+-			doc->add( *Field::UnStored(_T("prox"), wcharBuffer) );
++			doc->add(*_CLNEW Field(_T("prox"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ 			good = true;
+ 		}
+ 		if (proxLem.length() > 0) {
+ 			lucene_utf8towcs(wcharBuffer, proxLem, MAX_CONV_SIZE); //keyText must be utf8
+-			doc->add( *Field::UnStored(_T("proxlem"), wcharBuffer) );
++			doc->add(*_CLNEW Field(_T("proxlem"), wcharBuffer, Field::STORE_NO | Field::INDEX_TOKENIZED) );
+ 			good = true;
+ 		}
+ 		if (good) {
+@@ -1303,20 +1305,32 @@
+ 	//coreWriter->optimize();
+ 	coreWriter->close();
+ 
++#ifdef CLUCENE2
++	d = FSDirectory::getDirectory(target.c_str());
++#endif
+ 	if (IndexReader::indexExists(target.c_str())) {
++#ifndef CLUCENE2
+ 		d = FSDirectory::getDirectory(target.c_str(), false);
++#endif
+ 		if (IndexReader::isLocked(d)) {
+ 			IndexReader::unlock(d);
+ 		}
+-
+ 		fsWriter = new IndexWriter( d, an, false);
+-	} else {
++	}
++	else {
++#ifndef CLUCENE2
+ 		d = FSDirectory::getDirectory(target.c_str(), true);
++#endif
+ 		fsWriter = new IndexWriter(d, an, true);
+ 	}
+ 
+ 	Directory *dirs[] = { ramDir, 0 };
++#ifdef CLUCENE2
++	lucene::util::ConstValueArray< lucene::store::Directory *>dirsa(dirs, 1);
++	fsWriter->addIndexes(dirsa);
++#else
+ 	fsWriter->addIndexes(dirs);
++#endif
+ 	fsWriter->close();
+ 
+ 	delete ramDir;
diff --git a/debian/patches/cmake_backport.patch b/debian/patches/cmake_backport.patch
new file mode 100644
index 0000000..be70454
--- /dev/null
+++ b/debian/patches/cmake_backport.patch
@@ -0,0 +1,508 @@
+Description: Backport of latest cmake
+Origin: commit, revision id: dmitrij.ledkov@ubuntu.com-20120322235020-h7adn8axsyjujaj3
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+Last-Update: 2012-03-22
+X-Bzr-Revision-Id: dmitrij.ledkov@ubuntu.com-20120322235020-h7adn8axsyjujaj3
+
+=== modified file 'CMakeLists.txt'
+Index: sword/CMakeLists.txt
+===================================================================
+--- sword.orig/CMakeLists.txt	2012-03-23 00:14:16.541890418 +0000
++++ sword/CMakeLists.txt	2012-03-23 00:32:45.377920112 +0000
+@@ -38,6 +38,7 @@
+ # This will look for various libraries that libsword builds against.  There is no REQUIRED
+ # attribute added here, since all of the libraries here are not, in actuality, required.
+ #
++MESSAGE(STATUS "\n-- SEARCHING FOR SYTEM PACKAGES")
+ # Find our packages
+ FIND_PACKAGE(ZLIB QUIET)
+ FIND_PACKAGE(ICU QUIET)
+@@ -77,30 +78,18 @@
+ 	IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+ 		SET_TARGET_PROPERTIES(sword_static PROPERTIES 
+ 			OUTPUT_NAME "sword")
+-		MESSAGE(STATUS "Building Static library with name sword")
++		#MESSAGE(STATUS "Building Static library with name sword")
+ 	ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
+-		MESSAGE(STATUS "Building Static library with name
+-		sword_static")
++		#MESSAGE(STATUS "Building Static library with name
++		#sword_static")
+ 	ENDIF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*")
++	MESSAGE(STATUS "Building Static library.")
+ ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE)
+ 
+ ################################################################################################
+ # Some random user settings
+ #
+ 
+-IF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
+-	SET_TARGET_PROPERTIES(sword
+-		PROPERTIES COMPILE_FLAGS "-pg"
+-	)
+-ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
+-
+-IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
+-	SET_TARGET_PROPERTIES(sword
+-		PROPERTIES COMPILE_FLAGS "-g -finstrument-functions"
+-	)
+-	TARGET_LINK_LIBRARIES(libsword fnccheck)
+-ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
+-
+ IF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
+ 	ADD_DEFINITIONS(-DGLOBCONFPATH="${SWORD_GLOBAL_CONF_DIR}/sword.conf")
+ ENDIF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "")
+@@ -123,33 +112,41 @@
+ ENDIF(BUILDING_SHARED)
+ 
+ ###############################################################################################
+-# Some options are only needed if we're going to be building a debug option into the library
+-# These are generally only for developer building and testing
++# The buildflags depend on the CMAKE_BUILD_TYPE supplied at the command line.
++# For a full lists of different flags see http://cmake.org/Wiki/CMake_Useful_Variables
++#
++# Cmake has sane defaults for None aka '', DEBUG, RELEASE, RELWITHDEBINFO for known compilers.
++#
++# You can override these variables on the command-line or here.
++# We provide our own defaults below
+ #
+-# Debug testing
+-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-	SET(SWORD_CFLAGS "-g3 -Wall -Werror -O0")
+-ELSE(CMAKE_BUILD_TYPE STREQUAL "Debug")
+-	SET(SWORD_CFLAGS "-O3")
+-ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
++# Note the below two initialisations done for us by cmake:
++#
++#SET(CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS}"   or "$ENV{CFLAGS}" or "" )
++#SET(CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS}" or "$ENV{CXXFLAGS}" or "" )
+ 
+ IF(SWORD_ENABLE_WARNINGS STREQUAL "Yes")
+-	SET(SWORD_CFLAGS "${SWORD_CFLAGS} -Werror")
++	SET(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}")
++	SET(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}")
+ ENDIF(SWORD_ENABLE_WARNINGS STREQUAL "Yes")
+ 
+-IF(BUILDING_SHARED)
+-	SET_TARGET_PROPERTIES(sword
+-		PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS}
+-	)
+-ENDIF(BUILDING_SHARED)
++IF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
++	SET(CMAKE_C_FLAGS   "-pg ${CMAKE_C_FLAGS}")
++	SET(CMAKE_CXX_FLAGS "-pg ${CMAKE_CXX_FLAGS}")
++ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes")
+ 
+-IF(BUILDING_STATIC)
+-	SET_TARGET_PROPERTIES(sword_static
+-		PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS}
+-	)
+-ENDIF(BUILDING_STATIC)
++IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
++	SET(CMAKE_C_FLAGS   "-g -finstrument-functions ${CMAKE_C_FLAGS}")
++	SET(CMAKE_CXX_FLAGS "-g -finstrument-functions ${CMAKE_CXX_FLAGS}")
++	TARGET_LINK_LIBRARIES(libsword fnccheck)
++ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes")
+ 
+-MESSAGE(STATUS "Setting CFlags for compile to ${SWORD_CFLAGS}")
++SET(CMAKE_C_FLAGS_DEBUG            "-g3 -Wall -O0 ${CMAKE_C_FLAGS}")
++SET(CMAKE_C_FLAGS_RELEASE          "-O3 ${CMAKE_C_FLAGS}")
++SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O3 -g ${CMAKE_C_FLAGS}")
++SET(CMAKE_CXX_FLAGS_DEBUG          "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}")
++SET(CMAKE_CXX_FLAGS_RELEASE        "-O3 ${CMAKE_CXX_FLAGS}")
++SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}")
+ 
+ ##############################################################################################
+ # Setting libraries and includes
+@@ -167,11 +164,19 @@
+ 	INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR})
+ 	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY})
+ 	LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR})
++	ADD_DEFINITIONS(-DUSELUCENE)
++	IF(CLUCENE2)
++		ADD_DEFINITIONS(-DCLUCENE2)
++	ENDIF(CLUCENE2)
+ ENDIF(WITH_CLUCENE)
+ IF(WITH_ICU)
+ 	INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
++	ADD_DEFINITIONS(${ICU_DEFINITIONS})
+ 	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+ ENDIF(WITH_ICU)
++IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
++	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
++ENDIF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+ 
+ IF(BUILDING_SHARED)
+ 	TARGET_LINK_LIBRARIES(sword ${SWORD_LINK_LIBRARIES})
+@@ -219,9 +224,9 @@
+ # Bindings are good, right?
+ #
+ 
+-IF(NOT SWORD_BINDINGS STREQUAL "")
++IF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS)
+ 	INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/bindings.cmake")
+-ENDIF(NOT SWORD_BINDINGS STREQUAL "")
++ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS)
+ 
+ ##############################################################################################
+ # Utilities are hawt
+Index: sword/cmake/FindCLucene.cmake
+===================================================================
+--- sword.orig/cmake/FindCLucene.cmake	2012-03-23 00:14:16.485890416 +0000
++++ sword/cmake/FindCLucene.cmake	2012-03-23 00:32:45.381920113 +0000
+@@ -63,7 +63,7 @@
+ 	NAMES clucene clucene-core
+ 	PATHS ${TRIAL_LIBRARY_PATHS})
+ IF (CLUCENE_LIBRARY)
+-	MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
++	#MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
+ ENDIF (CLUCENE_LIBRARY)
+ FIND_PATH(CLUCENE_INCLUDE_DIR
+ 	NAMES CLucene.h
+@@ -71,7 +71,7 @@
+ 	ONLY_CMAKE_FIND_ROOT_PATH)
+ 
+ IF (CLUCENE_INCLUDE_DIR)
+-	MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
++	#MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
+ ENDIF (CLUCENE_INCLUDE_DIR)
+ 
+ IF(WIN32)
+@@ -83,22 +83,29 @@
+ FIND_PATH(CLUCENE_LIBRARY_DIR
+ 	NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+ IF (CLUCENE_LIBRARY_DIR)
+-	MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
++	SET(CLUCENE_INCLUDE_DIR ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR})
++	#MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
+ 	FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
+ 	STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
+ 	IF (CLMATCH)
+ 		STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})
+-	IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+-		MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
++		IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
++			MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+ 			SET(CLUCENE_GOOD_VERSION FALSE)
+-	ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+-	IF (CLUCENE_VERSION STREQUAL "0.9.17")
+-		MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
++		ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}")
++		IF (CLUCENE_VERSION STREQUAL "0.9.17")
++			MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+ 			SET(CLUCENE_GOOD_VERSION FALSE)
+-	ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
++		ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
++		IF (CLUCENE_VERSION VERSION_GREATER "2.0")
++			MESSAGE (STATUS "Found CLucene 2, enabling compatibility mode")
++			SET(CLUCENE2 TRUE)
++		ELSE (CLUCENE_VERSION VERSION_GREATER "2.0")
++			SET(CLUCENE2 FALSE)
++		ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0")
+ 	ENDIF (CLMATCH)
+ ELSE (CLUCENE_LIBRARY_DIR)
+-	MESSAGE(STATUS "CLucene library dir not found.")
++	#MESSAGE(STATUS "CLucene library dir not found.")
+ ENDIF (CLUCENE_LIBRARY_DIR)
+ 
+ IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
+@@ -107,11 +114,11 @@
+ 
+ IF(CLucene_FOUND)
+ 	IF(NOT CLucene_FIND_QUIETLY)
+-		MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}")
++		MESSAGE(STATUS "CLucene: Yes ${CLUCENE_LIBRARY}")
+ 	ENDIF(NOT CLucene_FIND_QUIETLY)
+ ELSE(CLucene_FOUND)
+ 	IF(CLucene_FIND_REQUIRED)
+-		MESSAGE(FATAL_ERROR "Could not find CLucene.")
++		MESSAGE(FATAL_ERROR "CLucene: No")
+ 	ENDIF(CLucene_FIND_REQUIRED)
+ ENDIF(CLucene_FOUND)
+ 
+Index: sword/cmake/FindICU.cmake
+===================================================================
+--- sword.orig/cmake/FindICU.cmake	2012-03-23 00:14:16.473890416 +0000
++++ sword/cmake/FindICU.cmake	2012-03-23 00:32:45.381920113 +0000
+@@ -5,6 +5,7 @@
+ #  ICU_INCLUDE_DIRS   - Directory to include to get ICU headers
+ #                       Note: always include ICU headers as, e.g., 
+ #                       unicode/utypes.h
++#  ICU_DEFINITIONS    - Definitions
+ #  ICU_LIBRARIES      - Libraries to link against for the common ICU
+ #  ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
+ #                       (note: in addition to ICU_LIBRARIES)
+@@ -13,6 +14,7 @@
+ find_program(
+   ICU_CONFIG_BIN
+   icu-config
++  HINTS "${ICU_CONFIG_BIN_PATH}"
+ )
+ find_program(
+      ICU_GENRB
+@@ -20,25 +22,26 @@
+ )
+ 
+ if(ICU_CONFIG_BIN)
+-  MESSAGE(STATUS "icu-config found at ${ICU_CONFIG_BIN}: Using that for configuration")
+-  MESSAGE(STATUS "genrb found at ${ICU_GENRB}: Using that for generating transliteration data")
++  MESSAGE(STATUS "[ICU] icu-config: Yes ${ICU_CONFIG_BIN}")
++  MESSAGE(STATUS "[ICU] genrb: Yes ${ICU_GENRB}")
+ 
+   # Get include directories
+-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--cppflags"
+-    OUTPUT_VARIABLE ICU_INCLUDE_DIR
++  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--cppflags"
++    OUTPUT_VARIABLE ICU_CPPFLAGS
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+   )
+   # Sanitize output
++  string(REGEX MATCHALL "-I[^ ]*\ |-I[^ ]*$" ICU_INCLUDE_DIR ${ICU_CPPFLAGS})
++  string(REGEX MATCHALL "-D[^ ]*\ |-D[^ ]*$" ICU_DEFINITIONS ${ICU_CPPFLAGS})
+   string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR})
+-  string(REGEX REPLACE "^[ 	]+" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR})
+ 
+-     # Try to get the Libraries we need
+-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags"
++  # Try to get the Libraries we need
++  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags"
+     OUTPUT_VARIABLE ICU_LIBRARY_RAW
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+   )
+   
+-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags-icuio"
++  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-icuio"
+      OUTPUT_VARIABLE ICU_LIBRARY_IO_RAW
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+   )
+@@ -49,7 +52,7 @@
+      set(ICU_LIBRARY "${ICU_LIBRARY} ${ICU_LIBRARY_IO_RAW}")
+      
+      # Get the version
+-     execute_process(COMMAND "${ICU_CONFIG_BIN}" "--version"
++     execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--version"
+ 	  OUTPUT_VARIABLE ICU_VERSION
+ 	  OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+@@ -95,4 +98,5 @@
+   set(ICU_LIBRARIES)
+   set(ICU_I18N_LIBRARIES)
+   set(ICU_INCLUDE_DIRS)
++  MESSAGE(STATUS "ICU: No")
+ endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+Index: sword/cmake/FindRegex.cmake
+===================================================================
+--- sword.orig/cmake/FindRegex.cmake	2012-03-23 00:14:16.509890417 +0000
++++ sword/cmake/FindRegex.cmake	2012-03-23 00:32:45.381920113 +0000
+@@ -27,8 +27,14 @@
+ 		 )
+ ENDIF(NOT REGEX_INCLUDE_DIR)
+ 
++FIND_LIBRARY(REGEX_LIBRARY
++	NAMES regex gnurx)
++
+ IF(REGEX_INCLUDE_DIR)
+ 	SET(REGEX_FOUND 1)
++	MESSAGE(STATUS "System regex.h: Yes")
++ELSE(REGEX_INCLUDE_DIR)
++	MESSAGE(STATUS "System regex.h: No")
+ ENDIF(REGEX_INCLUDE_DIR)
+ 
+ MARK_AS_ADVANCED(
+Index: sword/cmake/bindings.cmake
+===================================================================
+--- sword.orig/cmake/bindings.cmake	2012-03-23 00:14:16.497890418 +0000
++++ sword/cmake/bindings.cmake	2012-03-23 00:32:45.381920113 +0000
+@@ -5,15 +5,16 @@
+ # I will try to get them integrated into the system if I can.  If there are bindings that you need
+ # other than the Python|Perl/Swig bindings, then you should probably speak up now.
+ 
++MESSAGE(STATUS "\n-- CONFIGURING SWIG BINDINGS")
+ #####################################################################################################
+ # SWIG
+ # We need to find the SWIG executable in order to be able to do this, right?
+ FIND_PACKAGE(SWIG)
+ 
+ IF(NOT SWIG_FOUND)
+-	MESSAGE(FATAL_ERROR "Swig not found.  Bindings will not be built.")
++	MESSAGE(FATAL_ERROR "Swig: no")
+ ELSE(NOT SWIG_FOUND)
+-	MESSAGE(STATUS "Swig found at ${SWIG_EXECUTABLE}")
++	MESSAGE(STATUS "Swig: yes")
+ 	
+ 	SET(SWORD_SWIG_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/bindings/swig")
+ 	SET(SWORD_SWIG_BINARY "${CMAKE_CURRENT_BINARY_DIR}/bindings/swig")
+@@ -72,7 +73,7 @@
+ 			VERBATIM
+ 		)
+ 		
+-		MESSAGE(STATUS "Configured for building Python bindings.")
++		MESSAGE(STATUS "Python: yes")
+ 	ENDIF(SWORD_BINDINGS MATCHES ".*Python.*")
+ 	
+ 	IF(SWORD_BINDINGS MATCHES ".*Perl.*")
+@@ -127,9 +128,9 @@
+ 				VERBATIM
+ 			)
+ 			
+-			MESSAGE(STATUS "Configured for building Perl bindings.")
++			MESSAGE(STATUS "Perl: yes")
+ 		ELSE(PERL_FOUND)
+-			MESSAGE(FATAL_ERROR "Perl not found. Can't create perl bindings without Perl to bind")
++			MESSAGE(FATAL_ERROR "Perl: not found")
+ 		ENDIF(PERL_FOUND)
+ 	ENDIF(SWORD_BINDINGS MATCHES ".*Perl.*")
+ ENDIF(NOT SWIG_FOUND)
+Index: sword/cmake/install.cmake
+===================================================================
+--- sword.orig/cmake/install.cmake	2012-03-23 00:14:16.461890416 +0000
++++ sword/cmake/install.cmake	2012-03-23 00:32:45.381920113 +0000
+@@ -1,6 +1,7 @@
+ #####################################################################
+ # First, install the library itself
+ # 
++MESSAGE(STATUS "\n-- CONFIGURING INSTALLATION DESTINATIONS")
+ IF(NOT CMAKE_INSTALL_PREFIX)
+ 	IF(APPLE)
+ 		SET(SWORD_INSTALL_DIR "/opt/local")
+@@ -22,6 +23,9 @@
+ 	INSTALL(TARGETS sword_static
+ 		DESTINATION ${SWORD_INSTALL_DIR}/lib)
+ ENDIF(BUILDING_STATIC)
++# Install the locales
++INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/locales.d
++	DESTINATION ${SWORD_INSTALL_DIR}/share/sword)
+ 
+ # Install the headers
+ INSTALL(FILES ${SWORD_INSTALL_HEADERS}
+@@ -32,7 +36,7 @@
+ 		DESTINATION "${SWORD_INSTALL_DIR}/include/sword")
+ ENDIF(SWORD_INTERNAL_REGEX)
+ 
+-MESSAGE(STATUS "Installation destination: ${SWORD_INSTALL_DIR}")
++MESSAGE(STATUS "Destination: ${SWORD_INSTALL_DIR}")
+ 
+ # Configuration files, of course
+ SET(prefix 		${SWORD_INSTALL_DIR})
+@@ -62,7 +66,7 @@
+ 
+ # Need to build/install the 
+ IF(WITH_ICU AND ICU_GENRB)
+-      ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}")
++      ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
+       FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu")
+       FOREACH(translit ${translit_SOURCES})
+ 	  STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit})
+@@ -86,6 +90,6 @@
+ 	  ENDIF(BUILDING_SHARED)
+ 	  
+ 	  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
+-	       DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}")
++	       DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
+      ENDFOREACH(translit ${translit_SOURCES})
+-ENDIF(WITH_ICU AND ICU_GENRB)
+\ No newline at end of file
++ENDIF(WITH_ICU AND ICU_GENRB)
+Index: sword/cmake/muxsources.cmake
+===================================================================
+--- sword.orig/cmake/muxsources.cmake	2012-03-23 00:14:16.529890418 +0000
++++ sword/cmake/muxsources.cmake	2012-03-23 00:32:45.385920113 +0000
+@@ -10,73 +10,74 @@
+ # a ZLIB at all, and allowing a user to disable it does not bring about use
+ # of some internal fall-back but just leaves the ability to read ZLIB files
+ # out of the library altogether
++MESSAGE(STATUS "\n-- CONFIGURING SOURCE LIST")
+ IF(SWORD_NO_ZLIB STREQUAL "Yes")
+-	MESSAGE(STATUS "ZLib support excluded")
++	MESSAGE(STATUS "ZLib: excluded by use option")
+ 	ADD_DEFINITIONS(-DEXCLUDEZLIB)
+ 	SET(WITH_ZLIB 0)
+ ELSE(SWORD_NO_ZLIB STREQUAL "Yes")
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_used_SOURCES})
+ 	IF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes")
+-		MESSAGE(STATUS "No system ZLib found or user forcing internal")
++		MESSAGE(STATUS "ZLib: internal")
+ 		SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_nofound_SOURCES})
+ 		SET(WITH_INTERNAL_ZLIB 1)
+ 	ELSE(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes")
+-		MESSAGE(STATUS "Using system ZLib: ${ZLIB_LIBRARY}")
++		MESSAGE(STATUS "ZLib: system ${ZLIB_LIBRARY}")
+ 		SET(WITH_ZLIB 1)
+ 	ENDIF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes")
+ ENDIF(SWORD_NO_ZLIB STREQUAL "Yes")
+ 
+ # Check for if we've found ICU
+ IF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes")
+-	MESSAGE(STATUS "cURL found , using ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}")
++	MESSAGE(STATUS "cURL: system ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}")
+ 	ADD_DEFINITIONS(-DCURLAVAILABLE)
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_found_SOURCES})
+ 	SET(WITH_CURL 1)
+ ELSE(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes")
+-	MESSAGE(STATUS "cURL not found or being ignored")
++	MESSAGE(STATUS "cURL: no")
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_nofound_SOURCES})
+ 	SET(WITH_CURL 0)
+ ENDIF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes")
+ 
+ # And for CLucene
+ IF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes")
+-	MESSAGE(STATUS "CLucene found, using ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}")
++	MESSAGE(STATUS "CLucene: yes ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}")
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_found_SOURCES})
+ 	SET(WITH_CLUCENE 1)
+ ELSE(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes")
+-	MESSAGE(STATUS "CLucene not found or being ignored")
++	MESSAGE(STATUS "CLucene: no")
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_nofound_SOURCES})
+ 	SET(WITH_CLUCENE 0)
+ ENDIF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes")
+ 
+ # Alert the user if PkgConfig is unavailalbe
+ IF(NOT PKG_CONFIG_FOUND)
+-	MESSAGE(STATUS "PkgConfig not found on the system.  Proceeding without it.")
++	MESSAGE(STATUS "PkgConfig: no")
+ 	SET(WITH_PKG_CONFIG 1)
+ ELSE(NOT PKG_CONFIG_FOUND)
+-	MESSAGE(STATUS "PkgConfig found. Using.")
++	MESSAGE(STATUS "PkgConfig: yes")
+ 	SET(WITH_PKG_CONFIG 0)
+ ENDIF(NOT PKG_CONFIG_FOUND)
+ 
+ # ICU needs some lovin' too
+ IF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+-	MESSAGE(STATUS "ICU Found, using ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}")
++	MESSAGE(STATUS "ICU: yes ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}")
+ 	ADD_DEFINITIONS(-D_ICU_)
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_icu_found_SOURCES})
+ 	SET(WITH_ICU 1)
+ ELSE(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+-	MESSAGE(STATUS "ICU not found or ignored.")
++	MESSAGE(STATUS "ICU: no")
+ 	SET(WITH_ICU 0)
+ ENDIF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No")
+ 
+ # Internal or external regex.h
+ IF(REGEX_FOUND)
+-	MESSAGE(STATUS "System Regex found: ${REGEX_INCLUDE_DIR}")
++	MESSAGE(STATUS "Regex.h: system ${REGEX_INCLUDE_DIR}")
+ 	INCLUDE_DIRECTORIES(${REGEX_INCLUDE_DIR})
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_external_regex_SOURCES})
+ 	SET(WITH_REGEX 1)
+ ELSE(REGEX_FOUND)
+-	MESSAGE(STATUS "Using internal regex")
++	MESSAGE(STATUS "Regex.h: internal")
+ 	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include/internal/regex)
+ 	SET(sword_SOURCES ${sword_SOURCES} ${sword_internal_regex_SOURCES})
+ 	SET(WITH_REGEX 0)
+Index: sword/cmake/sources.cmake
+===================================================================
+--- sword.orig/cmake/sources.cmake	2012-03-23 00:14:16.449890415 +0000
++++ sword/cmake/sources.cmake	2012-03-23 00:33:05.417920649 +0000
+@@ -417,4 +417,4 @@
+ 	translit_Latin_Gothic.txt
+ 	translit_Latin_Ugaritic.txt
+ 	translit_swordindex.txt
+-)
+\ No newline at end of file
++)
diff --git a/debian/patches/dso-missing-shared.patch b/debian/patches/dso-missing-shared.patch
new file mode 100644
index 0000000..1b9c1b4
--- /dev/null
+++ b/debian/patches/dso-missing-shared.patch
@@ -0,0 +1,15 @@
+Description: clucene-shared is missing
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/707537
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -190,7 +190,7 @@
+ ENDIF(WITH_CURL)
+ IF(WITH_CLUCENE)
+ 	INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR})
+-	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY})
++	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY} -lclucene-shared)
+ 	LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR})
+ 	ADD_DEFINITIONS(-DUSELUCENE)
+ 	IF(CLUCENE2)
diff --git a/debian/patches/fix-ftbfs-gcc4.7.diff b/debian/patches/fix-ftbfs-gcc4.7.diff
new file mode 100644
index 0000000..2299820
--- /dev/null
+++ b/debian/patches/fix-ftbfs-gcc4.7.diff
@@ -0,0 +1,25 @@
+Partially fix ftbfs with gcc-4.7
+Index: sword-1.6.2+dfsg/include/multimapwdef.h
+===================================================================
+--- sword-1.6.2+dfsg.orig/include/multimapwdef.h	2004-05-04 21:01:39.000000000 +0000
++++ sword-1.6.2+dfsg/include/multimapwdef.h	2012-04-16 20:07:17.256834065 +0000
+@@ -19,14 +19,14 @@
+ 	}
+ 
+ 	T& operator[](const Key& k) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, T()));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, T()));
+ 		}
+-		return (*(find(k))).second;
++		return (*(this->find(k))).second;
+ 	}
+ 	bool has(const Key& k, const T &val) const {
+-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++		typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
++		typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
+ 		for (; start!=end; start++) {
+ 			if (start->second == val)
+ 				return true;
diff --git a/debian/patches/fix-ftbfs-icu.patch b/debian/patches/fix-ftbfs-icu.patch
new file mode 100644
index 0000000..f4f1438
--- /dev/null
+++ b/debian/patches/fix-ftbfs-icu.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBFS by requesting libraries only from icu-config
+Author: Dmitrijs Ledkovs <xnox@debian.org>, Daniel Glassey <dglassey@gmail.com>
+Bug-Debian: http://bugs.debian.org/676097
+
+Index: b/cmake/FindICU.cmake
+===================================================================
+--- a/cmake/FindICU.cmake
++++ b/cmake/FindICU.cmake
+@@ -36,7 +36,7 @@
+   string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR})
+ 
+   # Try to get the Libraries we need
+-  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags"
++  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-libsonly"
+     OUTPUT_VARIABLE ICU_LIBRARY_RAW
+     OUTPUT_STRIP_TRAILING_WHITESPACE
+   )
diff --git a/debian/patches/icu_in_soname.patch b/debian/patches/icu_in_soname.patch
new file mode 100644
index 0000000..d392d15
--- /dev/null
+++ b/debian/patches/icu_in_soname.patch
@@ -0,0 +1,24 @@
+Description: Set icu folder name using SONAME instead of upstream version string
+Author: Dmitrijs Ledkovs <xnox@debian.org>
+
+Index: sword/cmake/install.cmake
+===================================================================
+--- sword.orig/cmake/install.cmake	2012-04-03 08:12:47.999839147 +0100
++++ sword/cmake/install.cmake	2012-04-07 14:12:20.241257963 +0100
+@@ -66,7 +66,7 @@
+ 
+ # Need to build/install the 
+ IF(WITH_ICU AND ICU_GENRB)
+-      ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
++      ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}")
+       FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu")
+       FOREACH(translit ${translit_SOURCES})
+ 	  STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit})
+@@ -90,6 +90,6 @@
+ 	  ENDIF(BUILDING_SHARED)
+ 	  
+ 	  INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}"
+-	       DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}")
++	       DESTINATION "${libdir}/sword/${SWORD_SOVERSION}_icu_${ICU_VERSION}")
+      ENDFOREACH(translit ${translit_SOURCES})
+ ENDIF(WITH_ICU AND ICU_GENRB)
diff --git a/debian/patches/multiarch-clucene.patch b/debian/patches/multiarch-clucene.patch
new file mode 100644
index 0000000..1693a1a
--- /dev/null
+++ b/debian/patches/multiarch-clucene.patch
@@ -0,0 +1,13 @@
+Description: add multiarch location
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
+
+--- sword-1.6.2+dfsg.orig/cmake/FindCLucene.cmake
++++ sword-1.6.2+dfsg/cmake/FindCLucene.cmake
+@@ -46,6 +46,7 @@ SET(TRIAL_LIBRARY_PATHS
+ 	/opt/local/lib${LIB_SUFFIX}
+ 	/usr/lib${LIB_SUFFIX}
+ 	/usr/lib64
++	/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+ 	/sw/lib${LIB_SUFFIX}
+ 	/usr/pkg/lib${LIB_SUFFIX}
+ 	${WIN_CLUCENE_SEARCH_PATH}
diff --git a/debian/patches/no-included-zconf.h.diff b/debian/patches/no-included-zconf.h.diff
new file mode 100644
index 0000000..5205051
--- /dev/null
+++ b/debian/patches/no-included-zconf.h.diff
@@ -0,0 +1,292 @@
+--- a/include/zconf.h
++++ /dev/null
+@@ -1,279 +0,0 @@
+-/* zconf.h -- configuration of the zlib compression library
+- * Copyright (C) 1995-2002 Jean-loup Gailly.
+- * For conditions of distribution and use, see copyright notice in zlib.h 
+- */
+-
+-/* @(#) $Id: zconf.h 1688 2005-01-01 04:42:26Z scribe $ */
+-
+-#ifndef _ZCONF_H
+-#define _ZCONF_H
+-
+-/*
+- * If you *really* need a unique prefix for all types and library functions,
+- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+- */
+-#ifdef Z_PREFIX
+-#  define deflateInit_	z_deflateInit_
+-#  define deflate	z_deflate
+-#  define deflateEnd	z_deflateEnd
+-#  define inflateInit_ 	z_inflateInit_
+-#  define inflate	z_inflate
+-#  define inflateEnd	z_inflateEnd
+-#  define deflateInit2_	z_deflateInit2_
+-#  define deflateSetDictionary z_deflateSetDictionary
+-#  define deflateCopy	z_deflateCopy
+-#  define deflateReset	z_deflateReset
+-#  define deflateParams	z_deflateParams
+-#  define inflateInit2_	z_inflateInit2_
+-#  define inflateSetDictionary z_inflateSetDictionary
+-#  define inflateSync	z_inflateSync
+-#  define inflateSyncPoint z_inflateSyncPoint
+-#  define inflateReset	z_inflateReset
+-#  define compress	z_compress
+-#  define compress2	z_compress2
+-#  define uncompress	z_uncompress
+-#  define adler32	z_adler32
+-#  define crc32		z_crc32
+-#  define get_crc_table z_get_crc_table
+-
+-#  define Byte		z_Byte
+-#  define uInt		z_uInt
+-#  define uLong		z_uLong
+-#  define Bytef	        z_Bytef
+-#  define charf		z_charf
+-#  define intf		z_intf
+-#  define uIntf		z_uIntf
+-#  define uLongf	z_uLongf
+-#  define voidpf	z_voidpf
+-#  define voidp		z_voidp
+-#endif
+-
+-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+-#  define WIN32
+-#endif
+-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
+-#  ifndef __32BIT__
+-#    define __32BIT__
+-#  endif
+-#endif
+-#if defined(__MSDOS__) && !defined(MSDOS)
+-#  define MSDOS
+-#endif
+-
+-/*
+- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+- * than 64k bytes at a time (needed on systems with 16-bit int).
+- */
+-#if defined(MSDOS) && !defined(__32BIT__)
+-#  define MAXSEG_64K
+-#endif
+-#ifdef MSDOS
+-#  define UNALIGNED_OK
+-#endif
+-
+-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
+-#  define STDC
+-#endif
+-#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
+-#  ifndef STDC
+-#    define STDC
+-#  endif
+-#endif
+-
+-#ifndef STDC
+-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+-#    define const
+-#  endif
+-#endif
+-
+-/* Some Mac compilers merge all .h files incorrectly: */
+-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
+-#  define NO_DUMMY_DECL
+-#endif
+-
+-/* Old Borland C incorrectly complains about missing returns: */
+-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+-#  define NEED_DUMMY_RETURN
+-#endif
+-
+-
+-/* Maximum value for memLevel in deflateInit2 */
+-#ifndef MAX_MEM_LEVEL
+-#  ifdef MAXSEG_64K
+-#    define MAX_MEM_LEVEL 8
+-#  else
+-#    define MAX_MEM_LEVEL 9
+-#  endif
+-#endif
+-
+-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+- * created by gzip. (Files created by minigzip can still be extracted by
+- * gzip.)
+- */
+-#ifndef MAX_WBITS
+-#  define MAX_WBITS   15 /* 32K LZ77 window */
+-#endif
+-
+-/* The memory requirements for deflate are (in bytes):
+-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
+- plus a few kilobytes for small objects. For example, if you want to reduce
+- the default memory requirements from 256K to 128K, compile with
+-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+- Of course this will generally degrade compression (there's no free lunch).
+-
+-   The memory requirements for inflate are (in bytes) 1 << windowBits
+- that is, 32K for windowBits=15 (default value) plus a few kilobytes
+- for small objects.
+-*/
+-
+-                        /* Type declarations */
+-
+-#ifndef OF /* function prototypes */
+-#  ifdef STDC
+-#    define OF(args)  args
+-#  else
+-#    define OF(args)  ()
+-#  endif
+-#endif
+-
+-/* The following definitions for FAR are needed only for MSDOS mixed
+- * model programming (small or medium model with some far allocations).
+- * This was tested only with MSC; for other MSDOS compilers you may have
+- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
+- * just define FAR to be empty.
+- */
+-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
+-   /* MSC small or medium model */
+-#  define SMALL_MEDIUM
+-#  ifdef _MSC_VER
+-#    define FAR _far
+-#  else
+-#    define FAR far
+-#  endif
+-#endif
+-#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
+-#  ifndef __32BIT__
+-#    define SMALL_MEDIUM
+-#    define FAR _far
+-#  endif
+-#endif
+-
+-/* Compile with -DZLIB_DLL for Windows DLL support */
+-#if defined(ZLIB_DLL)
+-#  if defined(_WINDOWS) || defined(WINDOWS)
+-#    ifdef FAR
+-#      undef FAR
+-#    endif
+-#    include <windows.h>
+-#    define ZEXPORT  WINAPI
+-#    ifdef WIN32
+-#      define ZEXPORTVA  WINAPIV
+-#    else
+-#      define ZEXPORTVA  FAR _cdecl _export
+-#    endif
+-#  endif
+-#  if defined (__BORLANDC__)
+-#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
+-#      include <windows.h>
+-#      define ZEXPORT __declspec(dllexport) WINAPI
+-#      define ZEXPORTRVA __declspec(dllexport) WINAPIV
+-#    else
+-#      if defined (_Windows) && defined (__DLL__)
+-#        define ZEXPORT _export
+-#        define ZEXPORTVA _export
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#if defined (__BEOS__)
+-#  if defined (ZLIB_DLL)
+-#    define ZEXTERN extern __declspec(dllexport)
+-#  else
+-#    define ZEXTERN extern __declspec(dllimport)
+-#  endif
+-#endif
+-
+-#ifndef ZEXPORT
+-#  define ZEXPORT
+-#endif
+-#ifndef ZEXPORTVA
+-#  define ZEXPORTVA
+-#endif
+-#ifndef ZEXTERN
+-#  define ZEXTERN extern
+-#endif
+-
+-#ifndef FAR
+-#   define FAR
+-#endif
+-
+-#if !defined(MACOS) && !defined(TARGET_OS_MAC) && !defined(VCL)
+-typedef unsigned char  Byte;  /* 8 bits */
+-#endif
+-typedef unsigned int   uInt;  /* 16 bits or more */
+-typedef unsigned long  uLong; /* 32 bits or more */
+-
+-#ifdef SMALL_MEDIUM
+-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+-#  define Bytef Byte FAR
+-#else
+-   typedef unsigned char FAR Bytef;
+-#endif
+-typedef char  FAR charf;
+-typedef int   FAR intf;
+-typedef uInt  FAR uIntf;
+-typedef uLong FAR uLongf;
+-
+-#ifdef STDC
+-   typedef void FAR *voidpf;
+-   typedef void     *voidp;
+-#else
+-   typedef Byte FAR *voidpf;
+-   typedef Byte     *voidp;
+-#endif
+-
+-#ifdef HAVE_UNISTD_H
+-#  include <sys/types.h> /* for off_t */
+-#  include <unistd.h>    /* for SEEK_* and off_t */
+-#  define z_off_t  off_t
+-#endif
+-#ifndef SEEK_SET
+-#  define SEEK_SET        0       /* Seek from beginning of file.  */
+-#  define SEEK_CUR        1       /* Seek from current position.  */
+-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
+-#endif
+-#ifndef z_off_t
+-#  define  z_off_t long
+-#endif
+-
+-/* MVS linker does not support external names larger than 8 bytes */
+-#if defined(__MVS__)
+-#   pragma map(deflateInit_,"DEIN")
+-#   pragma map(deflateInit2_,"DEIN2")
+-#   pragma map(deflateEnd,"DEEND")
+-#   pragma map(inflateInit_,"ININ")
+-#   pragma map(inflateInit2_,"ININ2")
+-#   pragma map(inflateEnd,"INEND")
+-#   pragma map(inflateSync,"INSY")
+-#   pragma map(inflateSetDictionary,"INSEDI")
+-#   pragma map(inflate_blocks,"INBL")
+-#   pragma map(inflate_blocks_new,"INBLNE")
+-#   pragma map(inflate_blocks_free,"INBLFR")
+-#   pragma map(inflate_blocks_reset,"INBLRE")
+-#   pragma map(inflate_codes_free,"INCOFR")
+-#   pragma map(inflate_codes,"INCO")
+-#   pragma map(inflate_fast,"INFA")
+-#   pragma map(inflate_flush,"INFLU")
+-#   pragma map(inflate_mask,"INMA")
+-#   pragma map(inflate_set_dictionary,"INSEDI2")
+-#   pragma map(inflate_copyright,"INCOPY")
+-#   pragma map(inflate_trees_bits,"INTRBI")
+-#   pragma map(inflate_trees_dynamic,"INTRDY")
+-#   pragma map(inflate_trees_fixed,"INTRFI")
+-#   pragma map(inflate_trees_free,"INTRFR")
+-#endif
+-
+-#endif /* _ZCONF_H */
+--- a/cmake/sources.cmake
++++ b/cmake/sources.cmake
+@@ -394,7 +394,6 @@
+ 	include/versekey.h
+ 	include/versetreekey.h
+ 	include/zcom.h
+-	include/zconf.h
+ 	include/zipcomprs.h
+ 	include/zld.h
+ 	include/zstr.h
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f081236
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,12 @@
+12_fix_compiler_warnings.diff
+13_curl.diff
+#16_gcc4.6_sword.patch
+#2631_fix_curl.patch
+#cmake_backport.patch
+#icu_in_soname.patch
+#fix-ftbfs-gcc4.7.diff
+#fix-ftbfs-icu.patch
+#2661.patch
+multiarch-clucene.patch
+no-included-zconf.h.diff
+dso-missing-shared.patch
diff --git a/debian/python-sword.install b/debian/python-sword.install
new file mode 100644
index 0000000..607c065
--- /dev/null
+++ b/debian/python-sword.install
@@ -0,0 +1 @@
+usr/lib/python*
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..122ff73
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,48 @@
+#!/usr/bin/make -f
+DH_VERBOSE := 1
+ppa:=$(shell sed -n "1s/.*~.*/yes/p" debian/changelog)
+ver:=$(shell dpkg-parsechangelog | sed -nr "2s/Version: (.*)-.*/\1/p")
+bd :=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+WFLAGS   := -Wall -Werror
+CFLAGS    = $(shell dpkg-buildflags --get CFLAGS) $(WFLAGS)
+CXXFLAGS  = $(shell dpkg-buildflags --get CXXFLAGS) $(WFLAGS)
+
+%:
+	dh $@
+override_dh_auto_configure:
+	dh_auto_configure -Scmake -- \
+	-DLIBSWORD_LIBRARY_TYPE="Shared Static" \
+	-DLIBSWORD_SOVERSION=10 \
+	-DSWORD_GLOBAL_CONF_DIR='/etc' \
+	-DCMAKE_BUILD_TYPE=NONE \
+	-DSWORD_BUILD_TESTS="Yes" \
+	-DCLucene_FIND_REQUIRED="Yes"
+debian/man/%.1: debian/man/%.1.pod
+	pod2man --release="SWORD $(ver)" --center "Sword Module Utilities" $< > $@
+override_dh_auto_build: $(basename $(wildcard debian/man/*.pod))
+	dh_auto_build -Scmake --parallel
+override_dh_auto_test:
+	$(shell cd tests/testsuite && ./runall.sh 1>&2)
+override_dh_auto_install:
+	dh_auto_install -Scmake
+override_dh_install:
+	chrpath -d debian/tmp/usr/bin/* debian/tmp/usr/lib/*so*
+	dh_install --list-missing
+	# Fixes FTBFS if running binary-arch target only
+	-chmod -x debian/libsword-common/usr/share/sword/locales.d/*
+override_dh_strip:
+	dh_strip --dbg-package=libsword-dbg
+override_dh_makeshlibs:
+	dh_makeshlibs -V
+override_dh_clean:
+	dh_clean $(patsubst %.pod, %, $(wildcard debian/man/*.pod))
+
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+SOURCE_DIR = $(dir $(MAKEFILE))/..
+get-orig-source:
+	chmod +x $(SOURCE_DIR)/debian/dfsg.sh
+	cd $(SOURCE_DIR) && uscan --force-download --rename --destdir .
+
+override_dh_builddeb:
+	dh_builddeb $(if $(ppa),-- -Zlzma)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..ba1db0e
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts=dversionmangle=s/\+dfsg\d*// \
+  http://www.crosswire.org/ftpmirror/pub/sword/source/v([\d\.]+)/sword-(.*)\.tar\.gz \
+debian ./debian/dfsg.sh
diff --git a/depcomp b/depcomp
new file mode 100755
index 0000000..4ebd5b3
--- /dev/null
+++ b/depcomp
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2013-05-30.07; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+
+# 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, or (at your option)
+# any later version.
+
+# 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 General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/distignore b/distignore
new file mode 100644
index 0000000..ab9b218
--- /dev/null
+++ b/distignore
@@ -0,0 +1,5 @@
+sword/examples/windoze/delphi20/ojbcwin
+sword/olb/all.c
+sword/olb/online.h
+sword/autom4te.cache
+
diff --git a/doc/Doxyfile b/doc/Doxyfile
new file mode 100644
index 0000000..49901f5
--- /dev/null
+++ b/doc/Doxyfile
@@ -0,0 +1,1380 @@
+#******************************************************************************
+# 
+# Doxyfile doxygen generation file for SWORD API docs
+#
+# Submitted by GHellings.
+#
+# Doxyfile 1.5.5 
+#
+# $Id: usrinst.sh 2327 2009-04-22 11:42:33Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+#
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = "The SWORD Project"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
+# This could be handy for archiving the generated documentation or 
+# if some version control system is used.
+
+PROJECT_NUMBER = "1.7.2"
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+# base path where the generated documentation will be put. 
+# If a relative path is entered, it will be relative to the location 
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+# documentation generated by doxygen is written. Doxygen will use this 
+# information to generate all constant output in the proper language. 
+# The default language is English, other supported languages are: 
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, 
+# and Ukrainian.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
+# include brief member descriptions after the members that are listed in 
+# the file and class documentation (similar to JavaDoc). 
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
+# the brief description of a member or function before the detailed description. 
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
+# Doxygen will generate a detailed section even if there is only a brief 
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
+# path before files name in the file list and in the header files. If set 
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
+# can be used to strip a user-defined part of the path. Stripping is 
+# only done if one of the specified strings matches the left-hand part of 
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
+# (but less readable) file names. This can be useful is your file systems 
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+# will interpret the first line (until the first dot) of a JavaDoc-style 
+# comment as the brief description. If set to NO, the JavaDoc 
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
+# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
+# comments) as a brief description. This used to be the default behaviour. 
+# The new default is to treat a multi-line C++ comment block as a detailed 
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
+# member inherits the documentation from any documented member that it 
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that acts 
+# as commands in the documentation. An alias has the form "name=value". 
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
+# put the command \sideeffect (or @sideeffect) in the documentation, which 
+# will result in a user-defined paragraph with heading "Side Effects:". 
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
+# For instance, some of the names that are used will be different. The list 
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
+# the same type (for instance a group of public functions) to be put as a 
+# subgroup of that type (e.g. under the Public Functions section). Set it to 
+# NO to prevent subgrouping. Alternatively, this can be done per class using 
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
+# documentation are documented, even if no documentation was available. 
+# Private class members and static file members will be hidden unless 
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file 
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
+# defined locally in source files will be included in the documentation. 
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
+# undocumented members of documented classes, files or namespaces. 
+# If set to NO (the default) these members will be included in the 
+# various overviews, but no documentation section is generated. 
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
+# undocumented classes that are normally visible in the class hierarchy. 
+# If set to NO (the default) these classes will be included in the various 
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
+# friend (class|struct|union) declarations. 
+# If set to NO (the default) these declarations will be included in the 
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
+# documentation blocks found inside the body of a function. 
+# If set to NO (the default) these blocks will be appended to the 
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation 
+# that is typed after a \internal command is included. If the tag is set 
+# to NO (the default) then the documentation will be excluded. 
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
+# file names in lower-case letters. If set to YES upper-case letters are also 
+# allowed. This is useful if you have classes or files whose names only differ 
+# in case and if your file system supports case sensitive file names. Windows 
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
+# will show members with their full class and namespace scopes in the 
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
+# will put a list of the files that are included by a file in the documentation 
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
+# will sort the (detailed) documentation of file and class members 
+# alphabetically by member name. If set to NO the members will appear in 
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = YES
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or 
+# disable (NO) the todo list. This list is created by putting \todo 
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or 
+# disable (NO) the test list. This list is created by putting \test 
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or 
+# disable (NO) the bug list. This list is created by putting \bug 
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
+# disable (NO) the deprecated list. This list is created by putting 
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional 
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
+# the initial value of a variable or define consists of for it to appear in 
+# the documentation. If the initializer consists of more lines than specified 
+# here it will be hidden. Use a value of 0 to hide initializers completely. 
+# The appearance of the initializer of individual variables and defines in the 
+# documentation can be controlled using \showinitializer or \hideinitializer 
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
+# at the bottom of the documentation of classes and structs. If set to YES the 
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated 
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are 
+# generated by doxygen. Possible values are YES and NO. If left blank 
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
+# potential errors in the documentation, such as not documenting some 
+# parameters in a documented function, or documenting parameters that 
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that 
+# doxygen can produce. The string should contain the $file, $line, and $text 
+# tags, which will be replaced by the file and line number from which the 
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning 
+# and error messages should be written. If left blank the output is written 
+# to stderr.
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain 
+# documented source files. You may enter file names like "myfile.cpp" or 
+# directories like "/usr/src/myproject". Separate the files or directories 
+# with spaces.
+
+INPUT                  = src include utilities
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the 
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank the following patterns are tested: 
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = 
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
+# should be searched for input files as well. Possible values are YES and NO. 
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should 
+# excluded from the INPUT source files. This way you can easily exclude a 
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the 
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or 
+# directories that contain example code fragments that are included (see 
+# the \include command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
+# and *.h) to filter out the source-files in the directories. If left 
+# blank all files are included.
+
+EXAMPLE_PATTERNS       = examples 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
+# searched for input files to be used with the \include or \dontinclude 
+# commands irrespective of the value of the RECURSIVE tag. 
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = YES
+
+# The IMAGE_PATH tag can be used to specify one or more files or 
+# directories that contain image that are included in the documentation (see 
+# the \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should 
+# invoke to filter for each input file. Doxygen will invoke the filter program 
+# by executing (via popen()) the command <filter> <input-file>, where <filter> 
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
+# input file. Doxygen will then use the output that the filter program writes 
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
+# INPUT_FILTER) will be used to filter the input files when producing source 
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body 
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = YES
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
+# doxygen to hide any special comment blocks from generated source code 
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# then for each documented function all documented 
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES (the default) 
+# then for each documented function all documented entities 
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.  Otherwise they will link to the documentstion.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
+# will generate a verbatim copy of the header file for each class for 
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
+# of all compounds will be generated. Enable this if the project 
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = YES
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all 
+# classes will be put under the same header in the alphabetical index. 
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard header.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
+# each generated HTML page. If it is left blank doxygen will generate a 
+# standard footer.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+# style sheet that is used by each HTML page. It can be used to 
+# fine-tune the look of the HTML output. If the tag is left blank doxygen 
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        = 
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
+# files or namespaces will be aligned in HTML using tables. If set to 
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
+# will be generated that can be used as input for tools like the 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
+# be used to specify the file name of the resulting .chm file. You 
+# can add a path in front of the file if the result should not be 
+# written to the html output directory.
+
+CHM_FILE               = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
+# be used to specify the location (absolute path including file name) of 
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           = 
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
+# controls if a separate .chi index file is generated (YES) or that 
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
+# controls whether a binary table of contents is generated (YES) or a 
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members 
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
+# top of each HTML page. The value NO (the default) enables the index and 
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20]) 
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
+# generated containing a tree-like index structure (just like the one that 
+# is generated for HTML Help). For this to work a browser that supports 
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
+# used to set the initial width (in pixels) of the frame in which the tree 
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
+# invoked. If left blank `latex' will be used as the default command name.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
+# generate index for LaTeX. If left blank `makeindex' will be used as the 
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
+# LaTeX documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used 
+# by the printer. Possible values are: a4, a4wide, letter, legal and 
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = letter
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
+# the generated latex document. The header should contain everything until 
+# the first chapter. If it is left blank doxygen will generate a 
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
+# contain links (just like the HTML output) instead of page references 
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
+# plain latex in the generated Makefile. Set this option to YES to get a 
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
+# command to the generated LaTeX files. This will instruct LaTeX to keep 
+# running if errors occur, instead of asking the user for help. 
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
+# include the index chapters (such as File Index, Compound Index, etc.) 
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
+# RTF documents. This may be useful for small projects and may help to 
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
+# will contain hyperlink fields. The RTF file will 
+# contain links (just like the HTML output) instead of page references. 
+# This makes the output suitable for online browsing using WORD or other 
+# programs which support those fields. 
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's 
+# config file, i.e. a series of assignments. You only have to provide 
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an rtf document. 
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to 
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
+# then it will generate one additional man file for each entity 
+# documented in the real man page(s). These additional files 
+# only source the real man page, but without them the man command 
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will 
+# generate an XML file that captures the structure of 
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify an XML DTD, 
+# which can be used by a validating XML parser to check the 
+# syntax of the XML files.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
+# generate an AutoGen Definitions (see autogen.sf.net) file 
+# that captures the structure of the code including all 
+# documentation. Note that this feature is still experimental 
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
+# generate a Perl module file that captures the structure of 
+# the code including all documentation. Note that this 
+# feature is still experimental and incomplete at the 
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
+# nicely formatted so it can be parsed by a human reader.  This is useful 
+# if you want to understand what is going on.  On the other hand, if this 
+# tag is set to NO the size of the Perl module output will be much smaller 
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file 
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
+# This is useful so different doxyrules.make files included by the same 
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor   
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
+# evaluate all C-preprocessor directives found in the sources and include 
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
+# names in the source code. If set to NO (the default) only conditional 
+# compilation will be performed. Macro expansion can be done in a controlled 
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
+# then the macro expansion is limited to the macros specified with the 
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that 
+# contain include files that are not input files but should be processed by 
+# the preprocessor.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
+# patterns (like *.h and *.hpp) to filter out the header-files in the 
+# directories. If left blank, the patterns specified with FILE_PATTERNS will 
+# be used.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that 
+# are defined before the preprocessor is started (similar to the -D option of 
+# gcc). The argument of the tag is a list of macros of the form: name 
+# or name=definition (no spaces). If the definition and the = are 
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
+# this tag can be used to specify a list of macro names that should be expanded. 
+# The macro definition that is found in the sources will be used. 
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
+# doxygen's preprocessor will remove all function-like macros that are alone 
+# on a line, have an all uppercase name, and do not end with a semicolon. Such 
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references   
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles. 
+# Optionally an initial location of the external documentation 
+# can be added for each tagfile. The format of a tag file without 
+# this location is as follows: 
+#   TAGFILES = file1 file2 ... 
+# Adding location for the tag files is done as follows: 
+#   TAGFILES = file1=loc1 "file2 = loc2" ... 
+# where "loc1" and "loc2" can be relative or absolute paths or 
+# URLs. If a location is present for each tag, the installdox tool 
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen 
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
+# in the class index. If set to NO only the inherited external classes 
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
+# in the modules index. If set to NO, only the current project's groups will 
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script 
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool   
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide 
+# inheritance and usage relations if the target is undocumented 
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = NO
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
+# available from the path. This tool is part of Graphviz, a graph visualization 
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = YES
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect inheritance relations. Setting this tag to YES will force the 
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for each documented class showing the direct and 
+# indirect implementation dependencies (inheritance, containment, and 
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
+# Language.
+
+UML_LOOK               = YES
+
+# If set to YES, the inheritance and collaboration graphs will show the 
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
+# tags are set to YES then doxygen will generate a graph for each documented 
+# file showing the direct and indirect include dependencies of the file with 
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
+# documented header file showing the documented files that directly or 
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be 
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that 
+# contain dot files that are included in the documentation (see the 
+# \dotfile command).
+
+DOTFILE_DIRS           = 
+
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 75
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
+# graphs generated by dot. A depth value of 3 means that only nodes reachable 
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is enabled by default, which results in a transparent 
+# background. Warning: Depending on the platform used, enabling this option 
+# may lead to badly anti-aliased labels on the edges of a graph (i.e. they 
+# become hard to read).
+
+DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
+# generate a legend page explaining the meaning of the various boxes and 
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
+# remove the intermediate dot files that are used to generate 
+# the various graphs.
+
+DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = YES
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..4fff12c
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,4 @@
+swdocdir = $(top_srcdir)/doc
+
+EXTRA_DIST += $(swdocdir)/translation-template.conf
+
diff --git a/doc/README b/doc/README
new file mode 100644
index 0000000..2a781bf
--- /dev/null
+++ b/doc/README
@@ -0,0 +1,11 @@
+See README and INSTALL in root directory of the sword package
+
+No real good docs for developers yet, but see tutorials and primers on
+our website and wiki at:
+
+http://www.crosswire.org/sword
+http://www.crosswire.org/wiki
+
+
+Thanks!  More to come, Lord willing!
+
diff --git a/doc/translation-template.conf b/doc/translation-template.conf
new file mode 100644
index 0000000..65afbf3
--- /dev/null
+++ b/doc/translation-template.conf
@@ -0,0 +1,817 @@
+# Enter a comment here like:
+# Farsi also known as Persian
+# Provided by Peter Von Kaehne
+# 5 December 2006
+
+[Meta]
+
+# Enter here the appropriate locale code, e.g. de, no, it, fr etc..
+Name=
+
+# Enter a string here to present to a user for choosing this locale, e.g. Farsi
+Description=
+
+# The encoding of your locale (usually, UTF-8)
+Encoding=UTF-8
+
+
+[Text]
+
+# Insert after the = characters the translated booknames.
+
+# Gen
+Genesis=
+# Exod
+Exodus=
+# Lev
+Leviticus=
+# Num
+Numbers=
+# Deut
+Deuteronomy=
+# Josh
+Joshua=
+# Judg
+Judges=
+# Ruth
+Ruth=
+# 1Sam
+I Samuel=
+# 2Sam
+II Samuel=
+# 1Kgs
+I Kings=
+# 2Kgs
+II Kings=
+# 1Chr
+I Chronicles=
+# 2Chr
+II Chronicles=
+# Ezra
+Ezra=
+# Neh
+Nehemiah=
+# Esth
+Esther=
+# Job
+Job=
+# Ps
+Psalms=
+# Prov
+Proverbs=
+# Eccl
+Ecclesiastes=
+#Song
+Song of Solomon=
+# Isa
+Isaiah=
+# Jer
+Jeremiah=
+# Lam
+Lamentations=
+# Ezek
+Ezekiel=
+# Dan
+Daniel=
+# Hos
+Hosea=
+# Joel
+Joel=
+# Amos
+Amos=
+# Obad
+Obadiah=
+# Jonah
+Jonah=
+# Mic
+Micah=
+# Nah
+Nahum=
+# Hab
+Habakkuk=
+# Zeph
+Zephaniah=
+# Hag
+Haggai=
+# Zech
+Zechariah=
+# Mal
+Malachi=
+
+
+# Matt
+Matthew=
+# Mark
+Mark=
+# Luke
+Luke=
+# John
+John=
+# Acts
+Acts=
+# Rom
+Romans=
+# 1Cor
+I Corinthians=
+# 2Cor
+II Corinthians=
+# Gal
+Galatians=
+# Eph
+Ephesians=
+# Phil
+Philippians=
+# Col
+Colossians=
+# 1Thess
+I Thessalonians=
+# 2Thess
+II Thessalonians=
+# 1Tim
+I Timothy=
+# 2Tim
+II Timothy=
+# Titus
+Titus=
+# Phlm
+Philemon=
+# Heb
+Hebrews=
+# Jas
+James=
+# 1Pet
+I Peter=
+# 2Pet
+II Peter=
+# 1John
+I John=
+# 2John
+II John=
+# 3John
+III John=
+# Jude
+Jude=
+# Rev
+Revelation of John=
+
+
+#Apocr
+
+
+# 1Esd
+I Esdras=
+# 2Esd
+II Esdras=
+# Tob
+Tobit=
+# Jdt
+Judith=
+# AddEsth
+Additions to Esther=
+# EsthGr
+Esther (Greek)=
+# Wis
+Wisdom=
+# Sir
+Sirach=
+# Bar
+Baruch=
+# PrAzar
+Prayer of Azariah=
+# Sus
+Susanna=
+# Bel
+Bel and the Dragon=
+# PrMan
+Prayer of Manasses=
+# 1Macc
+I Maccabees=
+# 2Macc
+II Maccabees=
+# 3Macc
+III Maccabees=
+# 4Macc
+IV Maccabees=
+# AddPs
+Additional Psalm=
+
+
+# These aren't yet included but probably will soon,
+# so if you'd like to get a headstart now, you may but don't
+# complain if the strings change before final release! :)
+
+# Jub
+Jubilees=
+# SirP
+Sirach (Prologue)=
+# 1En
+I Enoch=
+# 1Meq
+I Meqabyan=
+# 2Meq
+II Meqabyan=
+# 3Meq
+III Meqabyan=
+# 2Bar
+II Baruch=
+# 4Bar
+IV Baruch=
+# DanGr
+Daniel (Greek)=
+# AddDan
+Additions to Daniel=
+# EpJer
+Epistle of Jeremiah=
+# EpLao
+Laodiceans=
+# Odes
+Odes=
+# PssSol
+Psalms of Solomon=
+
+
+[Book Abbrevs]
+
+# Here provide all abbreviation logic for your language.
+#
+# The format is ABBREV=OSISName
+#
+# They must be in what ICU will return as UPPERCASE
+# for your language.  They must also include AT LEAST one
+# entry for each entry from above which is EXACTLY your translation
+# converted to uppercase. e.g., if, above, you translated:
+#
+# Revelation of John=Rev of J
+#
+# then you MUST have here at least one entry for this
+# book as:
+#
+# REV OF J=Rev
+#
+# So, the first step should probably be to copy the section above,
+# and place it here; delete the "English Name=" of each line;
+# toUpper what is left (your translation); and finally append
+# =OSISName to the end of each line (osis names can be found as the
+# comment above each book or from the English examples given below)
+# 
+# This will be a good start.  All substrings of a bookname will be
+# matched (specific details follow later), so you will already have,
+# most likely, some abbreviation capability.
+#
+# Try it out by copying your locale.conf file to your SWORD locales.d/
+# folder where things are installed on your computer (NOT the locales.d/
+# folder in the sword source tree), then running:
+#
+# sword/tests/parsekey "<verseRef in your language>" <your_locale_name>
+#
+# This command (above) will also do a basic sanity check of your locale
+# so look for errors on first run.
+#
+# Add more abbreviations as you see fit, and keep testing with the
+# above simple test command.
+#
+# After adding all known abbrevs, you'll want to tune
+# the parsing logic for ambiguities.
+#
+# Tuning works as follows:
+#
+# If there is an entry:
+# 
+# JUDE=Jude
+#
+# then any bookString which matches:
+#
+# "JUDE".startsWith(bookString.toUpper())
+#
+# will point to Jude. e.g.,  "Jude", "Jud", "Ju", "J"
+#
+# If there are two books which match, then the first
+# ALPHABETICAL match will be taken, e.g.,
+#
+# JUDE=Jude
+# JUDGES=Judg
+#
+# "Jud" matches both and will point to Jude because
+# "JUDE" is alphabetically sorted before "JUDGES"
+#
+# So, if you want "Jud" to point to Judg instead, then tuning
+# the entries would result in:
+#
+# JUD=Judg
+# JUDE=Jude
+# JUDGES=Judg
+#
+# Since "Jud" now matches all 3 entries, and the first one
+# alphabetically now points to Judg, all is well.
+#
+#
+# Here is the standard English abbrevation logic.  
+# They are here as an example.  Please delete them and create
+# your own.
+#
+#
+
+1 BARUCH=Bar
+1 C=1Cor
+1 CHRONICLES=1Chr
+1 CORINTHIANS=1Cor
+1 E=1Esd
+1 ENOCH=1En
+1 ESDRAS=1Esd
+1 JN=1John
+1 JOHN=1John
+1 K=1Kgs
+1 KGDMS=1Sam
+1 KGS=1Kgs
+1 KING=1Kgs
+1 KINGDOMS=1Sam
+1 KINGS=1Kgs
+1 MACCABEES=1Macc
+1 MAKABIAN=1Meq
+1 MEQABYAN=1Meq
+1 P=1Pet
+1 PARALIPOMENON=1Chr
+1 PETER=1Pet
+1 PTR=1Pet
+1 SAMUEL=1Sam
+1 THESSALONIANS=1Thess
+1 TIMOTHY=1Tim
+1BARUCH=Bar
+1C=1Cor
+1CHR=1Chr
+1CHRONICLES=1Chr
+1COR=1Cor
+1CORINTHIANS=1Cor
+1E=1Esd
+1EN=1En
+1ENOCH=1En
+1ESD=1Esd
+1ESDRAS=1Esd
+1JN=1John
+1JOHN=1John
+1K=1Kgs
+1KGDMS=1Sam
+1KGS=1Kgs
+1KING=1Kgs
+1KINGDOMS=1Sam
+1KINGS=1Kgs
+1MACC=1Macc
+1MACCABEES=1Macc
+1MAKABIAN=1Meq
+1MEQ=1Meq
+1MEQABYAN=1Meq
+1P=1Pet
+1PARALIPOMENON=1Chr
+1PET=1Pet
+1PETER=1Pet
+1PTR=1Pet
+1SAM=1Sam
+1SAMUEL=1Sam
+1THESS=1Thess
+1THESSALONIANS=1Thess
+1TIM=1Tim
+1TIMOTHY=1Tim
+2 BARUCH=2Bar
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
+2 E=2Esd
+2 ESDRAS=2Esd
+2 JN=2John
+2 JOHN=2John
+2 K=2Kgs
+2 KGDMS=2Sam
+2 KGS=2Kgs
+2 KING=2Kgs
+2 KINGDOMS=2Sam
+2 KINGS=2Kgs
+2 MACCABEES=2Macc
+2 MAKABIAN=2Meq
+2 MEQABYAN=2Meq
+2 P=2Pet
+2 PARALIPOMENON=2Chr
+2 PETER=2Pet
+2 PTR=2Pet
+2 SAMUEL=2Sam
+2 THESSALONIANS=2Thess
+2 TIMOTHY=2Tim
+2BAR=2Bar
+2BARUCH=2Bar
+2C=2Cor
+2CHR=2Chr
+2CHRONICLES=2Chr
+2COR=2Cor
+2CORINTHIANS=2Cor
+2E=2Esd
+2ESD=2Esd
+2ESDRAS=2Esd
+2JN=2John
+2JOHN=2John
+2K=2Kgs
+2KGDMS=2Sam
+2KGS=2Kgs
+2KING=2Kgs
+2KINGDOMS=2Sam
+2KINGS=2Kgs
+2MACC=2Macc
+2MACCABEES=2Macc
+2MAKABIAN=2Meq
+2MEQ=2Meq
+2MEQABYAN=2Meq
+2P=2Pet
+2PARALIPOMENON=2Chr
+2PET=2Pet
+2PETER=2Pet
+2PTR=2Pet
+2SAM=2Sam
+2SAMUEL=2Sam
+2THESS=2Thess
+2THESSALONIANS=2Thess
+2TIM=2Tim
+2TIMOTHY=2Tim
+3 EZRA=1Esd
+3 JN=3John
+3 JOHN=3John
+3 KGDMS=1Kgs
+3 KGS=1Kgs
+3 KINGDOMS=1Kgs
+3 KINGS=1Kgs
+3 MACCABEES=3Macc
+3 MAKABIAN=3Meq
+3 MEQABYAN=3Meq
+3EZRA=1Esd
+3JN=3John
+3JOHN=3John
+3KGDMS=1Kgs
+3KGS=1Kgs
+3KINGDOMS=1Kgs
+3KINGS=1Kgs
+3MACC=3Macc
+3MACCABEES=3Macc
+3MAKABIAN=3Meq
+3MEQ=3Meq
+3MEQABYAN=3Meq
+4 BARUCH=4Bar
+4 EZRA=2Esd
+4 KGDMS=2Kgs
+4 KGS=2Kgs
+4 KINGDOMS=2Kgs
+4 KINGS=2Kgs
+4 MACCABEES=4Macc
+4BAR=4Bar
+4BARUCH=4Bar
+4EZRA=2Esd
+4KGDMS=2Kgs
+4KGS=2Kgs
+4KINGDOMS=2Kgs
+4KINGS=2Kgs
+4MACC=4Macc
+4MACCABEES=4Macc
+5APOCSYRPSS=AddPs
+ACTS=Acts
+ADDDAN=AddDan
+ADDESTH=AddEsth
+ADDITIONAL PSALM=AddPs
+ADDITIONS TO DANIEL=AddDan
+ADDITIONS TO ESTHER=AddEsth
+ADDPS=AddPs
+AMOS=Amos
+APOCALYPSE OF JOHN=Rev
+AZA=PrAzar
+AZAR=PrAzar
+AZARIAH=PrAzar
+BAR=Bar
+BARUCH=Bar
+BEL=Bel
+BEL AND THE DRAGON=Bel
+C=Col
+CANTICLE OF CANTICLES=Song
+COL=Col
+COLOSSIANS=Col
+D=Deut
+DAN=Dan
+DANGR=DanGr
+DANIEL=Dan
+DANIEL (ADDITIONS)=AddDan
+DANIEL (GREEK)=DanGr
+DEUT=Deut
+DEUTERONOMY=Deut
+DT=Deut
+E=Exod
+ECCL=Eccl
+ECCLESIASTES=Eccl
+ECCLESIASTICUS=Sir
+ECCLUS=Sir
+EK=Ezek
+ENOCH=1En
+EPH=Eph
+EPHESIANS=Eph
+EPISTLE OF JEREMIAH=EpJer
+EPJ=EpJer
+EPJER=EpJer
+EPLAO=EpLao
+ES=Esth
+ESDRAS A=1Esd
+ESDRAS B=2Esd
+ESDRASA=1Esd
+ESDRASB=2Esd
+ESG=EsthGr
+ESTER=Esth
+ESTH=Esth
+ESTHER=Esth
+ESTHER (ADDITIONS)=AddEsth
+ESTHER (GREEK)=EsthGr
+ESTHGR=EsthGr
+ETHIOPIC APOCALYPSE OF ENOCH=1En
+EXOD=Exod
+EXODUS=Exod
+EZEK=Ezek
+EZEKIEL=Ezek
+EZK=Ezek
+EZRA=Ezra
+FIVE APOCRYPHAL SYRIAC PSALMS=AddPs
+G=Gen
+GAL=Gal
+GALATIANS=Gal
+GEN=Gen
+GENESIS=Gen
+GN=Gen
+GRDAN=DanGr
+GREEK DANIEL=DanGr
+GREEK ESTHER=EsthGr
+GRESTH=EsthGr
+H=Heb
+HAB=Hab
+HABAKKUK=Hab
+HAG=Hag
+HAGGAI=Hag
+HEB=Heb
+HEBREWS=Heb
+HOS=Hos
+HOSEA=Hos
+I=Isa
+I BARUCH=Bar
+I C=1Cor
+I CHRONICLES=1Chr
+I CORINTHIANS=1Cor
+I E=1Esd
+I ENOCH=1En
+I ESDRAS=1Esd
+I JN=1John
+I JOHN=1John
+I K=1Kgs
+I KGDMS=1Sam
+I KGS=1Kgs
+I KING=1Kgs
+I KINGDOMS=1Sam
+I KINGS=1Kgs
+I MACCABEES=1Macc
+I MAKABIAN=1Meq
+I MEQABYAN=1Meq
+I P=1Pet
+I PARALIPOMENON=1Chr
+I PETER=1Pet
+I PTR=1Pet
+I SAMUEL=1Sam
+I THESSALONIANS=1Thess
+I TIMOTHY=1Tim
+IBARUCH=Bar
+IC=1Cor
+ICHRONICLES=1Chr
+ICORINTHIANS=1Cor
+IE=1Esd
+IENOCH=1En
+IESDRAS=1Esd
+II BARUCH=2Bar
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II E=2Esd
+II ESDRAS=2Esd
+II JN=2John
+II JOHN=2John
+II K=2Kgs
+II KGDMS=2Sam
+II KGS=2Kgs
+II KING=2Kgs
+II KINGDOMS=2Sam
+II KINGS=2Kgs
+II MACCABEES=2Macc
+II MAKABIAN=2Meq
+II MEQABYAN=2Meq
+II P=2Pet
+II PARALIPOMENON=2Chr
+II PETER=2Pet
+II PTR=2Pet
+II SAMUEL=2Sam
+II THESSALONIANS=2Thess
+II TIMOTHY=2Tim
+IIBARUCH=2Bar
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+IIE=2Esd
+IIESDRAS=2Esd
+III EZRA=1Esd
+III JN=3John
+III JOHN=3John
+III KGDMS=1Kgs
+III KGS=1Kgs
+III KINGDOMS=1Kgs
+III KINGS=1Kgs
+III MACCABEES=3Macc
+III MAKABIAN=3Meq
+III MEQABYAN=3Meq
+IIIEZRA=1Esd
+IIIJN=3John
+IIIJOHN=3John
+IIIKGDMS=1Kgs
+IIIKGS=1Kgs
+IIIKINGDOMS=1Kgs
+IIIKINGS=1Kgs
+IIIMACCABEES=3Macc
+IIIMAKABIAN=3Meq
+IIIMEQABYAN=3Meq
+IIJN=2John
+IIJOHN=2John
+IIK=2Kgs
+IIKGDMS=2Sam
+IIKGS=2Kgs
+IIKING=2Kgs
+IIKINGDOMS=2Sam
+IIKINGS=2Kgs
+IIMACCABEES=2Macc
+IIMAKABIAN=2Meq
+IIMEQABYAN=2Meq
+IIP=2Pet
+IIPARALIPOMENON=2Chr
+IIPETER=2Pet
+IIPTR=2Pet
+IISAMUEL=2Sam
+IITHESSALONIANS=2Thess
+IITIMOTHY=2Tim
+IJN=1John
+IJOHN=1John
+IK=1Kgs
+IKGDMS=1Sam
+IKGS=1Kgs
+IKING=1Kgs
+IKINGDOMS=1Sam
+IKINGS=1Kgs
+IMACCABEES=1Macc
+IMAKABIAN=1Meq
+IMEQABYAN=1Meq
+IP=1Pet
+IPARALIPOMENON=1Chr
+IPETER=1Pet
+IPTR=1Pet
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+IV BARUCH=4Bar
+IV EZRA=2Esd
+IV KGDMS=2Kgs
+IV KGS=2Kgs
+IV KINGDOMS=2Kgs
+IV KINGS=2Kgs
+IV MACCABEES=4Macc
+IVBARUCH=4Bar
+IVEZRA=2Esd
+IVKGDMS=2Kgs
+IVKGS=2Kgs
+IVKINGDOMS=2Kgs
+IVKINGS=2Kgs
+IVMACCABEES=4Macc
+J=Josh
+JAMES=Jas
+JAS=Jas
+JB=Job
+JD=Judg
+JDGS=Judg
+JDT=Jdt
+JER=Jer
+JEREMIAH=Jer
+JHN=John
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JOL=Joel
+JONAH=Jonah
+JOSH=Josh
+JOSHUA=Josh
+JS=Josh
+JU=Jude
+JUB=Jub
+JUBILEES=Jub
+JUDE=Jude
+JUDG=Judg
+JUDGES=Judg
+JUDITH=Jdt
+L=Luke
+LAM=Lam
+LAMENTATIONS=Lam
+LAO=EpLao
+LAODICEANS=EpLao
+LE=Lev
+LETJER=EpJer
+LETTER OF JEREMIAH=EpJer
+LEV=Lev
+LEVITICUS=Lev
+LK=Luke
+LUKE=Luke
+LV=Lev
+MA=Matt
+MAL=Mal
+MALACHI=Mal
+MAN=PrMan
+MANASSEH=PrMan
+MANASSES=PrMan
+MARK=Mark
+MATT=Matt
+MATTHEW=Matt
+MIC=Mic
+MICAH=Mic
+MK=Mark
+MRK=Mark
+MT=Matt
+N=Num
+NAH=Nah
+NAHUM=Nah
+NAM=Nah
+NEH=Neh
+NEHEMIAH=Neh
+NM=Num
+NUM=Num
+NUMBERS=Num
+OBAD=Obad
+OBADIAH=Obad
+ODES=Odes
+P=Ps
+PARALEIPOMENA JEREMIOU=4Bar
+PARALIPOMENA OF JEREMIAH=4Bar
+PHIL=Phil
+PHILEMON=Phlm
+PHILIPPIANS=Phil
+PHLM=Phlm
+PHM=Phlm
+PHP=Phil
+PR=Prov
+PRA=PrAzar
+PRAYER OF AZARIAH=PrAzar
+PRAYER OF MANASSEH=PrMan
+PRAYER OF MANASSES=PrMan
+PRAZAR=PrAzar
+PRM=PrMan
+PRMAN=PrMan
+PROV=Prov
+PROVERBS=Prov
+PS=Ps
+PSALM=Ps
+PSALMS=Ps
+PSALMS OF SOLOMON=PssSol
+PSM=Ps
+PSS=Ps
+PSSSOL=PssSol
+QOHELET=Eccl
+QOHELETH=Eccl
+REV=Rev
+REVELATION OF JOHN=Rev
+ROM=Rom
+ROMANS=Rom
+RUTH=Ruth
+S=Song
+SI=Sir
+SIP=SirP
+SIR=Sir
+SIRACH=Sir
+SIRACH (PROLOGUE)=SirP
+SIRP=SirP
+SNG=Song
+SOLOMON=Song
+SONG=Song
+SONG OF SOLOMON=Song
+SONG OF SONGS=Song
+SONG OF THE THREE CHILDREN=PrAzar
+SUS=Sus
+SUSANNA=Sus
+SYRIAC APOCALYPSE OF BARUCH=2Bar
+T=Titus
+TB=Tob
+TBT=Tob
+TITUS=Titus
+TOB=Tob
+TOBIT=Tob
+WIS=Wis
+WISDOM=Wis
+WISDOM OF BEN SIRA=Sir
+WISDOM OF JESUS SON OF SIRACH=Sir
+WISDOM OF SOLOMON=Wis
+ZECH=Zech
+ZECHARIAH=Zech
+ZEPH=Zeph
+ZEPHANIAH=Zeph
+
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..3160def
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS = 1.6
+
+SUBDIRS = cmdline
diff --git a/examples/Makefile.in b/examples/Makefile.in
new file mode 100644
index 0000000..31f1f33
--- /dev/null
+++ b/examples/Makefile.in
@@ -0,0 +1,649 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = examples
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+AUTOMAKE_OPTIONS = 1.6
+SUBDIRS = cmdline
+all: all-recursive
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign examples/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/examples/classes/Makefile b/examples/classes/Makefile
new file mode 100644
index 0000000..aca68d0
--- /dev/null
+++ b/examples/classes/Makefile
@@ -0,0 +1,10 @@
+TARGETS= ciphercng swmgrex verseranges lastVerseInChapter verseposition showchapter
+all: $(TARGETS)
+
+clean:
+	rm $(TARGETS)
+
+.cpp:
+	g++ -O0 -g -Wall -Werror `pkg-config --cflags sword` $< -o $@ `pkg-config --libs sword`
+
+
diff --git a/examples/classes/README b/examples/classes/README
new file mode 100644
index 0000000..53a65b7
--- /dev/null
+++ b/examples/classes/README
@@ -0,0 +1,4 @@
+These examples use a standard Makefile which exemplifies how you can compile
+your own code against the SWORD engine.
+This does, however, require SWORD to be installed before a 'make' in this
+folder will be successful.
diff --git a/examples/classes/ciphercng.cpp b/examples/classes/ciphercng.cpp
new file mode 100644
index 0000000..f1ce5e8
--- /dev/null
+++ b/examples/classes/ciphercng.cpp
@@ -0,0 +1,69 @@
+/******************************************************************************
+ *
+ *  ciphercng.cpp -	This example demonstrates how to change the cipher key
+ *			of a module. The change is only in effect for this
+ *			run.  This DOES NOT change the cipherkey in the
+ *			module's .conf file.
+ *
+ * $Id: ciphercng.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <iostream>
+
+#include <swmgr.h>
+#include <swmodule.h>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <modName>\n", *argv);
+		exit(-1);
+	}
+
+	SWMgr manager;		// create a default manager that looks in the current directory for mods.conf
+	ModMap::iterator it;
+	it = manager.Modules.find(argv[1]);
+
+	if (it == manager.Modules.end()) {
+		fprintf(stderr, "%s: couldn't find module: %s\n", *argv, argv[1]);
+		exit(-1);
+	}
+
+	SWModule *module = (*it).second;
+	string key;
+
+	cout << "\nPress [CTRL-C] to end\n\n";
+	while (true) {
+		cout << "\nModule text:\n";
+		module->setKey("1jn 1:9");
+		cout << "[ " << module->getKeyText() << " ]\n";
+		cout << module->renderText();
+		cout << "\n\nEnter new cipher key: ";
+		cin >> key;
+		cout << "\nSetting key to: " << key;
+		manager.setCipherKey(argv[1], key.c_str());
+	}
+
+	return 0;
+}
diff --git a/examples/classes/lastVerseInChapter.cpp b/examples/classes/lastVerseInChapter.cpp
new file mode 100644
index 0000000..aac905c
--- /dev/null
+++ b/examples/classes/lastVerseInChapter.cpp
@@ -0,0 +1,56 @@
+/******************************************************************************
+ *
+ *  lastVerseInChapter.cpp -	This example demonstrates how to navigate
+ *				verses using VerseKey.  It uselessly iterates
+ *				every chapter of the KJV, finds the last verse
+ *				and prints out the sole verse in the KJV which
+ *				ends in a ',' -- just for fun.
+ *
+ * $Id: lastVerseInChapter.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <iostream>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+	SWMgr library;
+
+	SWModule *book = library.getModule("KJV");
+
+	VerseKey *vk = (VerseKey *) book->getKey();
+	for (;!vk->popError();vk->setChapter(vk->getChapter()+1)) {
+		vk->setVerse(vk->getVerseMax());
+		SWBuf text = book->stripText();
+		text = text.trim();
+		if (text.endsWith(",")) {
+			cout << vk->getText() << ":\n\n";
+			cout << text << endl;
+		}
+	}
+
+	return 0;
+}
+
diff --git a/examples/classes/showchapter.cpp b/examples/classes/showchapter.cpp
new file mode 100644
index 0000000..f170b51
--- /dev/null
+++ b/examples/classes/showchapter.cpp
@@ -0,0 +1,57 @@
+/******************************************************************************
+ *
+ *  showchapter.cpp -	
+ *
+ * $Id: showchapter.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <iostream>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+	SWMgr library;
+	SWModule *kjv = library.getModule("KJV");
+
+	kjv->setKey(argc > 1 ? argv[1] : "Jn.3.16");
+
+	VerseKey *key = (VerseKey *)kjv->getKey();
+
+	int curVerse = key->getVerse();
+	int curChapter = key->getChapter();
+	int curBook = key->getBook();
+
+	for (key->setVerse(1);
+				(key->getBook()    == curBook)    &&
+				(key->getChapter() == curChapter) &&
+				!kjv->popError();
+				(*kjv)++) {
+		if (key->getVerse() == curVerse) cout << "* ";
+		cout << key->getVerse() << " " << kjv->stripText() << "\n";
+	}
+
+	return 0;
+}
+
diff --git a/examples/classes/swmgrex.cpp b/examples/classes/swmgrex.cpp
new file mode 100644
index 0000000..7fc9f73
--- /dev/null
+++ b/examples/classes/swmgrex.cpp
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
+ *  swmgrex.cpp -	Class SWMgr manages installed modules for a frontend.
+ *			The developer may use this class to query what modules
+ *			are installed and to retrieve an (SWModule *) for any
+ *			one of these modules
+ *
+ *			SWMgr makes its modules available as an STL Map.
+ *			The Map definition is typedef'ed as ModMap
+ *			ModMap consists of:	FIRST : SWBuf moduleName
+ *              				SECOND: SWModule *module
+ *
+ * $Id: swmgrex.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+
+#include <swmgr.h>
+#include <swmodule.h>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+	SWMgr manager;		// create a default manager that looks in the current directory for mods.conf
+
+	cout << "\nInstalled Modules:\n\n";
+
+	ModMap::iterator modIterator;
+
+// Loop thru all installed modules and print out information
+
+	for (modIterator = manager.Modules.begin(); modIterator != manager.Modules.end(); modIterator++) {
+		SWBuf   modName  = (*modIterator).first;  // mod.conf section name (stored in module->Name())
+		SWModule *module  = (*modIterator).second;
+
+		cout << modName << "(" << module->getName() << ") | " << module->getType() << "\n";
+	}
+
+// Print out a verse from the first module:
+
+	cout << "\n" << manager.Modules.begin()->second->getKeyText() << ":\n";
+	cout << manager.Modules.begin()->second->renderText();
+	cout << " (" << manager.Modules.begin()->second->getName() << ")\n";
+
+// Print out the same verse from the second module (less confusing):
+
+	modIterator = manager.Modules.begin();	// get first module
+	modIterator++;				// increment to next module
+
+	SWModule *mod = modIterator->second;
+
+	cout << "\n" << mod->getKeyText() << ":\n";
+//	cout << (const char *)(*mod);		// we could do this, the same as above
+	mod->display();				// instead of casting mod to const char * to get its contents, we'll call the default display method that writes to stdout;
+	cout << " (" << mod->getName() << ")\n\n";
+
+	return 0;
+
+}
diff --git a/examples/classes/verseposition.cpp b/examples/classes/verseposition.cpp
new file mode 100644
index 0000000..8e63cb5
--- /dev/null
+++ b/examples/classes/verseposition.cpp
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ *  verseposition.cpp -	
+ *
+ * $Id: verseposition.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+        const char *modName = "HunKar";
+        SWMgr library;
+        SWModule *book = library.getModule(modName);
+        if (!book) {
+                cerr << "Can't find module: " << modName << endl;
+                return -1;
+        }
+        VerseKey* key = ((VerseKey *)book->getKey());
+
+        key->setIntros(true);
+        book->setSkipConsecutiveLinks(true);
+        book->setPosition(TOP);
+
+        cout << *key << endl;
+
+        return 0;
+}
diff --git a/examples/classes/verseranges.cpp b/examples/classes/verseranges.cpp
new file mode 100644
index 0000000..557855a
--- /dev/null
+++ b/examples/classes/verseranges.cpp
@@ -0,0 +1,127 @@
+/******************************************************************************
+ *
+ *  verseranges.cpp -	This example demonstrates how to work with contiguous
+ *			verse ranges using VerseKey
+ *
+ * $Id: verseranges.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+	cout << "\n";
+
+	const char *modName = "KJVA";
+	SWMgr manager;
+	SWModule *bible = manager.getModule(modName);
+	if (!bible) {
+		cout << modName << " not installed for example.  Please install.\n\n";
+		exit(-1);
+	}
+
+	VerseKey *vk = (VerseKey *)bible->createKey();
+
+	// let's set verse ranges for a variety of different contiguous regions
+
+	// set a verse range for the whole Bible
+	vk->setLowerBound(*vk);	// vk initially points to TOP, so we don't need to set position first
+	vk->setPosition(BOTTOM);
+	vk->setUpperBound(*vk);
+	cout << vk->getRangeText() << "\n";
+
+
+	vk->clearBounds();
+
+
+	// Old Testament
+	vk->setPosition(TOP);
+	vk->setLowerBound(*vk);
+
+	vk->setTestament(2);
+	(*vk)--;
+
+	vk->setUpperBound(*vk);
+	cout << vk->getRangeText() << "\n";
+
+
+	vk->clearBounds();
+
+
+	// New Testament
+	vk->setPosition(TOP);
+	vk->setTestament(2);
+	vk->setLowerBound(*vk);
+	vk->setPosition(BOTTOM);
+	vk->setUpperBound(*vk);
+	cout << vk->getRangeText() << "\n";
+
+
+	vk->clearBounds();
+
+
+	// Current Book
+	vk->setText("John 3:16");
+	vk->setChapter(1); vk->setVerse(1);
+	vk->setLowerBound(*vk);
+	vk->setChapter(vk->getChapterMax()); vk->setVerse(vk->getVerseMax());
+	vk->setUpperBound(*vk);
+	cout << vk->getRangeText() << "\n";
+
+
+	// -------------------------
+	// Shorter syntax using the parser and based on book names, and requires intimate knowledge of VersificationMgr
+	// You're probably better off using the above code, but this is here for completeness
+	//
+	const VersificationMgr::System *refSys = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(vk->getVersificationSystem());
+
+
+	// whole Bible
+	VerseKey vkBible(refSys->getBook(0)->getOSISName(), refSys->getBook(refSys->getBookCount()-1)->getOSISName(), refSys->getName());
+	cout << vkBible.getRangeText() << "\n";
+
+	// OT
+	VerseKey vkOT(refSys->getBook(0)->getOSISName(), refSys->getBook(refSys->getBMAX()[0]-1)->getOSISName(), refSys->getName());
+	cout << vkOT.getRangeText() << "\n";
+
+	// NT
+	VerseKey vkNT(refSys->getBook(refSys->getBMAX()[0])->getOSISName(), refSys->getBook(refSys->getBookCount()-1)->getOSISName(), refSys->getName());
+	cout << vkNT.getRangeText() << "\n";
+
+	// Current Book
+	vk->setText("John 3:16");
+	VerseKey vkCurrentBook(vk->getBookName(), vk->getBookName(), refSys->getName());
+	cout << vkCurrentBook.getRangeText() << "\n";
+
+
+	delete vk;
+
+	cout << endl;
+
+	return 0;
+}
+
diff --git a/examples/cmdline/CMakeLists.txt b/examples/cmdline/CMakeLists.txt
new file mode 100644
index 0000000..bfbb995
--- /dev/null
+++ b/examples/cmdline/CMakeLists.txt
@@ -0,0 +1,34 @@
+##################################################################################
+# These are some examples.  If you want examples to be built, you need to define
+# SWORD_BUILD_EXAMPLES="Yes".  These will not be installed, so don't worry about
+# that.
+# 
+MESSAGE(STATUS "\n-- CONFIGURING LIBRARY EXAMPLES")
+SET(example_PROGRAMS
+	listoptions
+	lookup
+	outplain
+	outrender
+	search
+	verserangeparse
+)
+
+FOREACH(DEMO ${example_PROGRAMS})
+	ADD_EXECUTABLE("${DEMO}"	"${DEMO}.cpp")
+	TARGET_LINK_LIBRARIES("${DEMO}" sword)
+ENDFOREACH(DEMO ${example_PROGRAMS})
+
+##################################################################################
+# This example uses pthreads explicity.  I don't know if it supports anything else,
+# but until I find out, I will force it to find PTHREADS only
+# 
+
+FIND_PACKAGE(Threads)
+
+IF(CMAKE_USE_PTHREADS_INIT OR CMAKE_HP_PTHREADS_INIT)
+	ADD_EXECUTABLE(threaded_search	threaded_search.cpp)
+	TARGET_LINK_LIBRARIES(threaded_search
+		sword
+		${CMAKE_THREAD_LIBS_INIT}
+	)
+ENDIF(CMAKE_USE_PTHREADS_INIT OR CMAKE_HP_PTHREADS_INIT)
diff --git a/examples/cmdline/Makefile.am b/examples/cmdline/Makefile.am
new file mode 100644
index 0000000..1b14b67
--- /dev/null
+++ b/examples/cmdline/Makefile.am
@@ -0,0 +1,17 @@
+AUTOMAKE_OPTIONS = 1.6
+AM_CPPFLAGS = -I $(top_srcdir)/include
+if USE_INTERNAL_REGEX
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+endif
+LDADD = $(top_builddir)/lib/libsword.la
+
+noinst_PROGRAMS = lookup search threaded_search listoptions verserangeparse outplain outrender
+
+lookup_SOURCES = lookup.cpp
+search_SOURCES = search.cpp
+listoptions_SOURCES = listoptions.cpp
+verserangeparse_SOURCES = verserangeparse.cpp
+threaded_search_SOURCES = threaded_search.cpp
+outplain_SOURCES = outplain.cpp
+outrender_SOURCES = outrender.cpp
+threaded_search_LDADD = $(LDADD) -lpthread
diff --git a/examples/cmdline/Makefile.in b/examples/cmdline/Makefile.in
new file mode 100644
index 0000000..a3cb2f4
--- /dev/null
+++ b/examples/cmdline/Makefile.in
@@ -0,0 +1,686 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex
+noinst_PROGRAMS = lookup$(EXEEXT) search$(EXEEXT) \
+	threaded_search$(EXEEXT) listoptions$(EXEEXT) \
+	verserangeparse$(EXEEXT) outplain$(EXEEXT) outrender$(EXEEXT)
+subdir = examples/cmdline
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_listoptions_OBJECTS = listoptions.$(OBJEXT)
+listoptions_OBJECTS = $(am_listoptions_OBJECTS)
+listoptions_LDADD = $(LDADD)
+listoptions_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_lookup_OBJECTS = lookup.$(OBJEXT)
+lookup_OBJECTS = $(am_lookup_OBJECTS)
+lookup_LDADD = $(LDADD)
+lookup_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_outplain_OBJECTS = outplain.$(OBJEXT)
+outplain_OBJECTS = $(am_outplain_OBJECTS)
+outplain_LDADD = $(LDADD)
+outplain_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_outrender_OBJECTS = outrender.$(OBJEXT)
+outrender_OBJECTS = $(am_outrender_OBJECTS)
+outrender_LDADD = $(LDADD)
+outrender_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_search_OBJECTS = search.$(OBJEXT)
+search_OBJECTS = $(am_search_OBJECTS)
+search_LDADD = $(LDADD)
+search_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_threaded_search_OBJECTS = threaded_search.$(OBJEXT)
+threaded_search_OBJECTS = $(am_threaded_search_OBJECTS)
+threaded_search_DEPENDENCIES = $(LDADD)
+am_verserangeparse_OBJECTS = verserangeparse.$(OBJEXT)
+verserangeparse_OBJECTS = $(am_verserangeparse_OBJECTS)
+verserangeparse_LDADD = $(LDADD)
+verserangeparse_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) $(outplain_SOURCES) \
+	$(outrender_SOURCES) $(search_SOURCES) \
+	$(threaded_search_SOURCES) $(verserangeparse_SOURCES)
+DIST_SOURCES = $(listoptions_SOURCES) $(lookup_SOURCES) \
+	$(outplain_SOURCES) $(outrender_SOURCES) $(search_SOURCES) \
+	$(threaded_search_SOURCES) $(verserangeparse_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+AUTOMAKE_OPTIONS = 1.6
+AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1)
+LDADD = $(top_builddir)/lib/libsword.la
+lookup_SOURCES = lookup.cpp
+search_SOURCES = search.cpp
+listoptions_SOURCES = listoptions.cpp
+verserangeparse_SOURCES = verserangeparse.cpp
+threaded_search_SOURCES = threaded_search.cpp
+outplain_SOURCES = outplain.cpp
+outrender_SOURCES = outrender.cpp
+threaded_search_LDADD = $(LDADD) -lpthread
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/cmdline/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign examples/cmdline/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+listoptions$(EXEEXT): $(listoptions_OBJECTS) $(listoptions_DEPENDENCIES) $(EXTRA_listoptions_DEPENDENCIES) 
+	@rm -f listoptions$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(listoptions_OBJECTS) $(listoptions_LDADD) $(LIBS)
+
+lookup$(EXEEXT): $(lookup_OBJECTS) $(lookup_DEPENDENCIES) $(EXTRA_lookup_DEPENDENCIES) 
+	@rm -f lookup$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(lookup_OBJECTS) $(lookup_LDADD) $(LIBS)
+
+outplain$(EXEEXT): $(outplain_OBJECTS) $(outplain_DEPENDENCIES) $(EXTRA_outplain_DEPENDENCIES) 
+	@rm -f outplain$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(outplain_OBJECTS) $(outplain_LDADD) $(LIBS)
+
+outrender$(EXEEXT): $(outrender_OBJECTS) $(outrender_DEPENDENCIES) $(EXTRA_outrender_DEPENDENCIES) 
+	@rm -f outrender$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(outrender_OBJECTS) $(outrender_LDADD) $(LIBS)
+
+search$(EXEEXT): $(search_OBJECTS) $(search_DEPENDENCIES) $(EXTRA_search_DEPENDENCIES) 
+	@rm -f search$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(search_OBJECTS) $(search_LDADD) $(LIBS)
+
+threaded_search$(EXEEXT): $(threaded_search_OBJECTS) $(threaded_search_DEPENDENCIES) $(EXTRA_threaded_search_DEPENDENCIES) 
+	@rm -f threaded_search$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(threaded_search_OBJECTS) $(threaded_search_LDADD) $(LIBS)
+
+verserangeparse$(EXEEXT): $(verserangeparse_OBJECTS) $(verserangeparse_DEPENDENCIES) $(EXTRA_verserangeparse_DEPENDENCIES) 
+	@rm -f verserangeparse$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(verserangeparse_OBJECTS) $(verserangeparse_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listoptions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lookup.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outplain.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outrender.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threaded_search.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verserangeparse.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/examples/cmdline/bcppmake/cmdline.bpg b/examples/cmdline/bcppmake/cmdline.bpg
new file mode 100644
index 0000000..943790e
--- /dev/null
+++ b/examples/cmdline/bcppmake/cmdline.bpg
@@ -0,0 +1,81 @@
+#------------------------------------------------------------------------------

+VERSION = BWS.01

+#------------------------------------------------------------------------------

+!ifndef ROOT

+ROOT = $(MAKEDIR)\..

+!endif

+#------------------------------------------------------------------------------

+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**

+DCC = $(ROOT)\bin\dcc32.exe $**

+BRCC = $(ROOT)\bin\brcc32.exe $**

+#------------------------------------------------------------------------------

+PROJECTS = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \

+	   listoptions.exe lookup.exe outplain.exe outrender.exe search.exe \

+	   verserangeparse.exe threaded_search.exe

+#------------------------------------------------------------------------------

+default: $(PROJECTS)

+#------------------------------------------------------------------------------

+

+libsword.lib: ..\..\..\lib\bcppmake\libsword.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+icuuc.lib: ..\..\..\..\icu-sword\as_is\borland\icuuc.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+icuin.lib: ..\..\..\..\icu-sword\as_is\borland\icuin.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+xml2gbs.exe: xml2gbs.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+osis2mod.exe: osis2mod.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+tei2mod.exe: tei2mod.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+installmgr.exe: installmgr.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+clucene.lib: ..\..\..\..\biblecs\clucene\clucene.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+libcurl.lib: ..\..\..\..\biblecs\apps\InstallMgr\libcurl.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+verserangeparse.exe: verserangeparse.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+threaded_search.exe: threaded_search.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+search.exe: search.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+outrender.exe: outrender.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+outplain.exe: outplain.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+lookup.exe: lookup.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+listoptions.exe: listoptions.bpr

+  $(ROOT)\bin\bpr2mak $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

diff --git a/examples/cmdline/bcppmake/listoptions.bpf b/examples/cmdline/bcppmake/listoptions.bpf
new file mode 100644
index 0000000..9e2ee47
--- /dev/null
+++ b/examples/cmdline/bcppmake/listoptions.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\listoptions.cpp");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\..\lib\libsword.lib");

+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/examples/cmdline/bcppmake/listoptions.bpr b/examples/cmdline/bcppmake/listoptions.bpr
new file mode 100644
index 0000000..753553e
--- /dev/null
+++ b/examples/cmdline/bcppmake/listoptions.bpr
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="listoptions.exe"/>

+    <OBJFILES value="..\listoptions.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib 

+      ..\..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="listoptions.bpf"/>

+    <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>

diff --git a/examples/cmdline/bcppmake/lookup.bpf b/examples/cmdline/bcppmake/lookup.bpf
new file mode 100644
index 0000000..d7722c5
--- /dev/null
+++ b/examples/cmdline/bcppmake/lookup.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\lookup.cpp");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\..\lib\libsword.lib");

+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/examples/cmdline/bcppmake/lookup.bpr b/examples/cmdline/bcppmake/lookup.bpr
new file mode 100644
index 0000000..4b642c3
--- /dev/null
+++ b/examples/cmdline/bcppmake/lookup.bpr
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="lookup.exe"/>

+    <OBJFILES value="..\lookup.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib 

+      ..\..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="lookup.bpf"/>

+    <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>

diff --git a/examples/cmdline/bcppmake/outplain.bpf b/examples/cmdline/bcppmake/outplain.bpf
new file mode 100644
index 0000000..edce864
--- /dev/null
+++ b/examples/cmdline/bcppmake/outplain.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\outplain.cpp");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\..\lib\libsword.lib");

+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/examples/cmdline/bcppmake/outplain.bpr b/examples/cmdline/bcppmake/outplain.bpr
new file mode 100644
index 0000000..089d890
--- /dev/null
+++ b/examples/cmdline/bcppmake/outplain.bpr
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="outplain.exe"/>

+    <OBJFILES value="..\outplain.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib 

+      ..\..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="outplain.bpf"/>

+    <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>

diff --git a/examples/cmdline/bcppmake/outrender.bpf b/examples/cmdline/bcppmake/outrender.bpf
new file mode 100644
index 0000000..0ca9e33
--- /dev/null
+++ b/examples/cmdline/bcppmake/outrender.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\outrender.cpp");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\..\lib\libsword.lib");

+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/examples/cmdline/bcppmake/outrender.bpr b/examples/cmdline/bcppmake/outrender.bpr
new file mode 100644
index 0000000..6c2438a
--- /dev/null
+++ b/examples/cmdline/bcppmake/outrender.bpr
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="outrender.exe"/>

+    <OBJFILES value="..\outrender.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib 

+      ..\..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="outrender.bpf"/>

+    <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>

diff --git a/examples/cmdline/bcppmake/search.bpf b/examples/cmdline/bcppmake/search.bpf
new file mode 100644
index 0000000..438ee60
--- /dev/null
+++ b/examples/cmdline/bcppmake/search.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\search.cpp");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\..\lib\libsword.lib");

+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main

diff --git a/examples/cmdline/bcppmake/search.bpr b/examples/cmdline/bcppmake/search.bpr
new file mode 100644
index 0000000..23a79ca
--- /dev/null
+++ b/examples/cmdline/bcppmake/search.bpr
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="search.exe"/>

+    <OBJFILES value="..\search.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib 

+      ..\..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="search.bpf"/>

+    <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>

diff --git a/examples/cmdline/bcppmake/threaded_search.bpf b/examples/cmdline/bcppmake/threaded_search.bpf
new file mode 100644
index 0000000..f69800a
--- /dev/null
+++ b/examples/cmdline/bcppmake/threaded_search.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\threaded_search.cpp");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\..\lib\libsword.lib");

+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/examples/cmdline/bcppmake/threaded_search.bpr b/examples/cmdline/bcppmake/threaded_search.bpr
new file mode 100644
index 0000000..a666afa
--- /dev/null
+++ b/examples/cmdline/bcppmake/threaded_search.bpr
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="threaded_search.exe"/>

+    <OBJFILES value="..\threaded_search.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib 

+      ..\..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="threaded_search.bpf"/>

+    <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>

diff --git a/examples/cmdline/bcppmake/verserangeparse.bpf b/examples/cmdline/bcppmake/verserangeparse.bpf
new file mode 100644
index 0000000..6e2bc5a
--- /dev/null
+++ b/examples/cmdline/bcppmake/verserangeparse.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\verserangeparse.cpp");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\..\lib\libsword.lib");

+USELIB("..\..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/examples/cmdline/bcppmake/verserangeparse.bpr b/examples/cmdline/bcppmake/verserangeparse.bpr
new file mode 100644
index 0000000..89de5ae
--- /dev/null
+++ b/examples/cmdline/bcppmake/verserangeparse.bpr
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="verserangeparse.exe"/>

+    <OBJFILES value="..\verserangeparse.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\..\lib\libsword.lib 

+      ..\..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="verserangeparse.bpf"/>

+    <INCLUDEPATH value="..\;..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\icu-sword\source\common;..\..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..\..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\..\icu-sword\source\common -I..\..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>

diff --git a/examples/cmdline/listoptions.cpp b/examples/cmdline/listoptions.cpp
new file mode 100644
index 0000000..c5525e9
--- /dev/null
+++ b/examples/cmdline/listoptions.cpp
@@ -0,0 +1,52 @@
+/******************************************************************************
+ *
+ *  listoptions.cpp -	Simple example to show how to see which 'options' are
+ *			available from the installed set of modules and their
+ *			possible settings.
+ *			Options in SWORD refer to things like "Strong's
+ *			Numbers", "Morphology", etc.
+ * 
+ * $Id: listoptions.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <swmgr.h>
+
+
+using sword::SWMgr;
+using sword::StringList;
+using std::cout;
+
+
+int main(int argc, char **argv)
+{
+	SWMgr library;
+
+	StringList options = library.getGlobalOptions();
+	for (StringList::const_iterator it = options.begin(); it != options.end(); ++it) {
+		cout << *it << " (" << library.getGlobalOptionTip(*it) << ")\n";
+		StringList optionValues = library.getGlobalOptionValues(*it);
+		for (StringList::const_iterator it2 = optionValues.begin(); it2 != optionValues.end(); ++it2) {
+			cout << "\t" << *it2 << "\n";
+		}
+	}
+
+	return 0;
+
+}
+
diff --git a/examples/cmdline/lookup.cpp b/examples/cmdline/lookup.cpp
new file mode 100644
index 0000000..505b5e1
--- /dev/null
+++ b/examples/cmdline/lookup.cpp
@@ -0,0 +1,118 @@
+/******************************************************************************
+ *
+ *  lookup.cpp -	Simple example of how to retrieve an entry from a
+ *			SWORD module
+ *
+ * $Id: lookup.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <iostream>
+#include <stdlib.h>
+#include <swmgr.h>
+#include <swmodule.h>
+#include <swfilter.h>
+#include <markupfiltmgr.h>
+#include <versekey.h>
+
+
+using sword::SWMgr;
+using sword::MarkupFilterMgr;
+using sword::SWModule;
+using sword::FMT_WEBIF;
+using sword::FMT_HTMLHREF;
+using sword::FMT_RTF;
+using sword::ModMap;
+using sword::AttributeTypeList;
+using sword::AttributeList;
+using sword::AttributeValue;
+using sword::VerseKey;
+using sword::FilterList;
+
+
+int main(int argc, char **argv)
+{
+	
+	SWMgr manager(new MarkupFilterMgr(FMT_WEBIF));
+//	SWMgr manager(new MarkupFilterMgr(FMT_HTMLHREF));
+	SWModule *target;
+
+	if (argc != 3) {
+		fprintf(stderr, "\nusage: %s <modname> <\"lookup key\">\n"
+							 "\tExample: lookup KJV \"James 1:19\"\n\n", argv[0]);
+ 
+		exit(-1);
+	}
+
+	target = manager.getModule(argv[1]);
+	if (!target) {
+		fprintf(stderr, "Could not find module [%s].  Available modules:\n", argv[1]);
+		ModMap::iterator it;
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) {
+			fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription());
+		}
+		exit(-1);
+	}
+
+	// turn all filters to default values
+	manager.setGlobalOption("Headings", "On");
+	manager.setGlobalOption("Strong's Numbers", "On");
+	manager.setGlobalOption("Lemmas", "Off");
+//	manager.setGlobalOption("Greek Accents", "Off");
+
+	VerseKey *vk = dynamic_cast<VerseKey *>(target->getKey());
+
+	if (vk) {
+	//	vk->AutoNormalize(false);
+		vk->setIntros(true);
+		vk->setText(argv[2]);
+	}
+	else {
+		target->setKey(argv[2]);
+	}
+
+	target->renderText();		// force an entry lookup to resolve key to something in the index
+
+	std::cout << "==Raw=Entry===============\n";
+	std::cout << target->getKeyText() << ":\n";
+	std::cout << target->getRawEntry();
+	std::cout << "\n";
+	std::cout << "==Render=Entry============\n";
+	std::cout << target->getRenderHeader();
+	std::cout << "\n";
+	std::cout << target->renderText();
+	std::cout << "\n";
+	std::cout << "==========================\n";
+	std::cout << "Entry Attributes:\n\n";
+	AttributeTypeList::iterator i1;
+	AttributeList::iterator i2;
+	AttributeValue::iterator i3;
+	for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); ++i1) {
+		std::cout << "[ " << i1->first << " ]\n";
+		for (i2 = i1->second.begin(); i2 != i1->second.end(); ++i2) {
+			std::cout << "\t[ " << i2->first << " ]\n";
+			for (i3 = i2->second.begin(); i3 != i2->second.end(); ++i3) {
+				std::cout << "\t\t" << i3->first << " = " << i3->second << "\n";
+			}
+		}
+	}
+	std::cout << std::endl;
+
+	return 0;
+}
+
diff --git a/examples/cmdline/outplain.cpp b/examples/cmdline/outplain.cpp
new file mode 100644
index 0000000..5245fda
--- /dev/null
+++ b/examples/cmdline/outplain.cpp
@@ -0,0 +1,73 @@
+/******************************************************************************
+ *
+ *  outplain.cpp -	This example shows how to output the plain text
+ *			entries from a SWORD module. This small program
+ *			outputs a SWORD module in 'imp' format, e.g.:
+ *
+ * $$$Gen.1.1
+ * In the beginning God created
+ * the heavens and the earth
+ *
+ * $$$Gen.1.2
+ * ...
+ *
+ * Class SWMgr manages installed modules for a frontend.
+ * The developer may use this class to query what modules are installed
+ * and to retrieve an (SWModule *) for any one of these modules
+ *
+ * SWMgr makes its modules available as an STL Map.
+ * The Map definition is typedef'ed as ModMap
+ * ModMap consists of: FIRST : SWBuf moduleName
+ *                     SECOND: SWModule *module
+ *
+ * $Id: outplain.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <markupfiltmgr.h>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+	SWMgr manager(new MarkupFilterMgr(sword::FMT_HTMLHREF, sword::ENC_UTF16));
+
+	const char *bookName = (argc > 1) ? argv[1] : "WLC";
+	SWModule *b = manager.getModule(bookName);
+	if (!b) return -1;
+	SWModule &book = *b;
+	book.setProcessEntryAttributes(false);
+	VerseKey *vk = SWDYNAMIC_CAST(VerseKey, book.getKey());
+	for (book = TOP; !book.popError() && !book.getRawEntryBuf().size(); book++);
+	if (!book.getRawEntryBuf().size()) return -2; 	// empty module
+	for (;!book.popError(); book++) {
+		cout << "$$$";
+		if (vk) cout << vk->getOSISRef();
+		else    cout << book.getKeyText();
+		cout << "\n" << book.stripText() << "\n\n";
+	}
+
+	return 0;
+}
diff --git a/examples/cmdline/outrender.cpp b/examples/cmdline/outrender.cpp
new file mode 100644
index 0000000..192b29d
--- /dev/null
+++ b/examples/cmdline/outrender.cpp
@@ -0,0 +1,66 @@
+/******************************************************************************
+ *
+ *  outrender.cpp -	This example show how to choose an output render
+ *			markup and render entries from a SWORD module. The
+ *			following snippet outputs a module in HTML output
+ *			encoded as UTF8.
+ *
+ * $Id: outrender.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <markupfiltmgr.h>
+
+
+using namespace sword;
+using namespace std;
+
+
+int main(int argc, char **argv) {
+
+	SWMgr manager(new MarkupFilterMgr(sword::FMT_HTMLHREF, sword::ENC_UTF16));
+
+	const char *bookName = (argc > 1) ? argv[1] : "WLC";
+
+	SWModule *b = manager.getModule(bookName);
+	if (!b) return -1;
+
+	SWModule &book = *b;
+	book.setProcessEntryAttributes(false);
+	VerseKey *vk = SWDYNAMIC_CAST(VerseKey, book.getKey());
+
+	// find the first non-zero entry
+	for (book = TOP; !book.popError() && !book.getRawEntryBuf().size(); book++);
+	if (!book.getRawEntryBuf().size()) return -2; 	// empty module
+
+	for (;!book.popError(); book++) {
+
+		cout << "$$$";
+		if (vk) cout << vk->getOSISRef();
+		else    cout << book.getKeyText();
+
+		cout << "\n" << book.renderText() << "\n\n";
+	}
+
+	return 0;
+}
+
diff --git a/examples/cmdline/search.cpp b/examples/cmdline/search.cpp
new file mode 100644
index 0000000..f437430
--- /dev/null
+++ b/examples/cmdline/search.cpp
@@ -0,0 +1,130 @@
+/******************************************************************************
+ *
+ *  search.cpp -	This simple example shows how to perform a search on a
+ *			SWORD module. It amounts to a simple commandline
+ *			search tool with a usage like:
+ *
+ *				search KJV "swift hear slow speak"
+ *
+ * $Id: search.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <rawtext.h>
+#include <swmgr.h>
+#include <versekey.h>
+#include <markupfiltmgr.h>
+#include <regex.h> // GNU
+#include <iostream>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+/*
+ *			>=0 - regex
+ *			-1  - phrase
+ *			-2  - multiword
+ *			-3  - entryAttrib (eg. Word//Lemma/G1234/)
+ *			-4  - Lucene
+ */
+
+char SEARCH_TYPE=-2;
+
+char printed = 0;
+void percentUpdate(char percent, void *userData) {
+	char maxHashes = *((char *)userData);
+	
+	while ((((float)percent)/100) * maxHashes > printed) {
+		std::cerr << "=";
+		printed++;
+		std::cerr.flush();
+	}
+/*
+	std::cout << (int)percent << "% ";
+*/
+	std::cout.flush();
+}
+
+
+int main(int argc, char **argv)
+{
+//	SWMgr manager(0, 0, true, new MarkupFilterMgr(FMT_RTF, ENC_RTF));
+	SWMgr manager;
+	SWModule *target;
+	ListKey listkey;
+	ListKey scope;
+	ModMap::iterator it;
+
+	if ((argc < 3) || (argc > 5)) {
+		fprintf(stderr, "\nusage: %s <modname> <\"search string\"> [\"search_scope\"] [\"search again for string in previous result set\"]\n"
+							 "\tExample: search KJV \"swift hear slow speak\"\n\n", argv[0]);
+
+		exit(-1);
+	}
+
+
+	SWBuf searchTerm = argv[2];
+	manager.setGlobalOption("Greek Accents", "Off");
+	manager.setGlobalOption("Strong's Numbers", "On");
+	manager.setGlobalOption("Hebrew Vowel Points", "Off");
+	manager.filterText("Greek Accents", searchTerm);
+
+	it = manager.Modules.find(argv[1]);
+	if (it == manager.Modules.end()) {
+		fprintf(stderr, "Could not find module [%s].  Available modules:\n", argv[1]);
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) {
+			fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription());
+		}
+		exit(-1);
+	}
+
+	target = (*it).second;
+
+	if (argc > 3) {			// if min / max specified
+		SWKey *k = target->getKey();
+		VerseKey *parser = SWDYNAMIC_CAST(VerseKey, k);
+		VerseKey kjvParser;
+		if (!parser) parser = &kjvParser;	// use standard KJV parsing as fallback
+		scope = parser->parseVerseList(argv[3], *parser, true);
+		scope.setPersist(true);
+		target->setKey(scope);
+	}
+
+	std::cerr << "[0=================================50===============================100]\n ";
+	char lineLen = 70;
+	listkey = target->search(searchTerm.c_str(), SEARCH_TYPE, /*SEARCHFLAG_MATCHWHOLEENTRY*/ REG_ICASE, 0, 0, &percentUpdate, &lineLen);
+	std::cerr << std::endl;
+	if (argc > 4) {			// if min / max specified
+		scope = listkey;
+		scope.setPersist(true);
+		target->setKey(scope);
+		printed = 0;
+		std::cerr << " ";
+		listkey = target->search(argv[4], SEARCH_TYPE, /*SEARCHFLAG_MATCHWHOLEENTRY*/ REG_ICASE, 0, 0, &percentUpdate, &lineLen);
+		std::cerr << std::endl;
+	}
+	listkey.sort();
+	while (!listkey.popError()) {
+		std::cout << (const char *)listkey << std::endl;
+		listkey++;
+	}
+
+	return 0;
+
+}
diff --git a/examples/cmdline/threaded_search.cpp b/examples/cmdline/threaded_search.cpp
new file mode 100755
index 0000000..a3710a9
--- /dev/null
+++ b/examples/cmdline/threaded_search.cpp
@@ -0,0 +1,156 @@
+/******************************************************************************
+ *
+ *  threaded_search.cpp -	This example shows how to do a thread search
+ *
+ * $Id: threaded_search.cpp 2923 2013-07-28 20:05:37Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <rawtext.h>
+#include <swmgr.h>
+#include <regex.h> // GNU
+#include <listkey.h>
+#include <versekey.h>
+#include <iostream>
+
+#include <pthread.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWMgr;
+using sword::ListKey;
+using sword::SWModule;
+using sword::VerseKey;
+using sword::SWKey;
+using sword::ModMap;
+#endif
+
+int cms_currentProgress;
+
+class SearchThread {
+public:
+	SearchThread();	
+	~SearchThread();
+
+	char* searchedText;
+	SWModule* module;
+	ListKey searchResult;
+	bool isSearching;
+
+	void startThread();
+	void search();
+};
+
+void* dummy(void* p) {
+	SearchThread* searchThread = (SearchThread*)p;		
+	searchThread->search();	
+
+	return NULL;
+}
+
+void percentUpdate(char percent, void* userData)  {
+	cms_currentProgress = (int)percent;
+	std::cout << cms_currentProgress << "% ";
+}
+
+SearchThread::SearchThread() {
+	isSearching = false;
+	module = 0;
+	searchedText = 0;
+	cms_currentProgress = -1;
+}
+
+SearchThread::~SearchThread() {
+}
+
+void SearchThread::startThread()  {
+	std::cout << "startThread" << std::endl;
+	std::cout.flush();
+
+	pthread_attr_t* attr = new pthread_attr_t;
+	pthread_attr_init(attr);
+	pthread_attr_setdetachstate(attr, PTHREAD_CREATE_DETACHED);
+
+	pthread_t *thread= new pthread_t;
+	isSearching = true;
+	int i = pthread_create(thread, attr, &dummy, this); 
+
+	std::cout << "Created the thread: " << i << std::endl;
+	std::cout.flush();
+}	
+
+void SearchThread::search()  {
+	
+	if (!module) {
+		std::cout << "Return." << std::endl;
+		return;
+	}
+
+	ListKey scopeList = VerseKey().parseVerseList("Luke;John;Revelation","", true);
+	for (int i=0; i < scopeList.getCount(); ++i) {
+		std::cout << (const char*)*scopeList.getElement(i) << std::endl;
+	}
+	SWKey* scope = &scopeList;
+
+	searchResult = module->search(searchedText, -2, REG_ICASE, scope, 0, &percentUpdate);
+
+	if (!scope)
+		std::cout << "bad scope!" << std::endl;
+	isSearching = false;
+}
+
+int main(int argc, char **argv) {
+	SWMgr manager;
+	ModMap::iterator it;
+
+	SearchThread* searchThread = new SearchThread();
+
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s <modname> <searched text>\n", argv[0]);
+		exit(-1);
+	}
+
+	it = manager.Modules.find(argv[1]);
+	if (it == manager.Modules.end()) {
+		fprintf(stderr, "Could not find module [%s].  Available modules:\n",  argv[1]);
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); ++it) {
+			fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription());
+		}
+		exit(-1);
+	}
+	
+	searchThread->searchedText = argv[2];
+	searchThread->module = (*it).second;
+	searchThread->startThread();
+	
+	std::cout << "Start loop" << std::endl;
+	std::cout.flush();
+	while (true) {
+		if (!searchThread->isSearching)
+			break;
+		else 
+			std::cout.flush();
+	};
+
+	std::cout << std::endl << "Number of found items: " << searchThread->searchResult.getCount() << std::endl;
+	std::cout << "Finished program" << std::endl;
+	std::cout.flush();
+
+	delete searchThread;
+	exit(0);
+}
+
diff --git a/examples/cmdline/verserangeparse.cpp b/examples/cmdline/verserangeparse.cpp
new file mode 100644
index 0000000..d5fd18b
--- /dev/null
+++ b/examples/cmdline/verserangeparse.cpp
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  verserangeparse.cpp -	This example shows
+ *				how to parse a verse reference
+ *
+ * $Id: verserangeparse.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <swmgr.h>
+#include <versekey.h>
+#include <listkey.h>
+#include <swmodule.h>
+#include <markupfiltmgr.h>
+
+using sword::SWMgr;
+using sword::VerseKey;
+using sword::ListKey;
+using sword::SWModule;
+using sword::SW_POSITION;
+using sword::FMT_PLAIN;
+using sword::MarkupFilterMgr;
+using std::cout;
+using std::endl;
+
+int main(int argc, char **argv)
+{
+	const char *range = (argc > 1) ? argv[1] : "Mat 2:10,12-15";
+
+	VerseKey parser;
+	ListKey result;
+
+	result = parser.parseVerseList(range, parser, true);
+
+	// let's iterate the key and display
+	for (result = TOP; !result.popError(); result++) {
+		cout << result << "\n";
+	}
+	cout << endl;
+
+	// Now let's output a module with the entries from the result
+	
+	// we'll initialize our library of books
+	SWMgr library(new MarkupFilterMgr(FMT_PLAIN));	// render plain without fancy markup
+
+	// Let's get a book;
+	SWModule *book = library.getModule("KJV");
+
+	// couldn't find our test module
+	if (!book) return -1;
+
+	// now let's iterate the book and display
+	for (result = TOP; !result.popError(); result++) {
+		book->setKey(result);
+		cout << "*** " << book->getKeyText() << ": " << book->renderText() << "\n";
+	}
+
+	return 0;
+}
diff --git a/examples/simple.cpp b/examples/simple.cpp
new file mode 100644
index 0000000..c46346b
--- /dev/null
+++ b/examples/simple.cpp
@@ -0,0 +1,54 @@
+/******************************************************************************
+ *
+ *  simple.cpp -	This is about the simplest useful example of using the
+ *			SWORD engine.
+ *
+ * After sword is installed, it should compile with something similar to:
+ *
+ *	g++ -o simple simple.cpp `pkg-config --cflags --libs sword`
+ *
+ * If you'd like to choose the type of tag markup which sword will output
+ *	for you, include:
+ *
+ *	#include <markupfiltmgr.h>
+ *
+ * and change your instantiation of SWMgr, below, to (e.g., for HTML):
+ *
+ *	SWMgr library(0, 0, true, new MarkupFilterMgr(FMT_HTMLHREF));
+ *
+ * $Id: simple.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <iostream>
+
+
+using namespace sword;
+using std::cout;
+
+
+int main(int argc, char **argv) {
+	SWMgr library;
+	SWModule *darby = library.getModule("Darby");
+	darby->setKey("James 1:19");
+	cout << darby->RenderText();
+
+	return 0;
+}
+
diff --git a/include/Makefile b/include/Makefile
new file mode 100644
index 0000000..fc04b62
--- /dev/null
+++ b/include/Makefile
@@ -0,0 +1,5 @@
+
+root := ..
+
+all:
+	make -C ${root}
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..de34949
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,184 @@
+swincludedir = $(top_srcdir)/include
+
+pkginclude_HEADERS =  $(swincludedir)/canon.h
+pkginclude_HEADERS += $(swincludedir)/canon_abbrevs.h
+pkginclude_HEADERS += $(swincludedir)/cipherfil.h
+pkginclude_HEADERS += $(swincludedir)/curlftpt.h
+pkginclude_HEADERS += $(swincludedir)/curlhttpt.h
+pkginclude_HEADERS += $(swincludedir)/defs.h
+pkginclude_HEADERS += $(swincludedir)/echomod.h
+pkginclude_HEADERS += $(swincludedir)/encfiltmgr.h
+pkginclude_HEADERS += $(swincludedir)/entriesblk.h
+pkginclude_HEADERS += $(swincludedir)/femain.h
+pkginclude_HEADERS += $(swincludedir)/filemgr.h
+pkginclude_HEADERS += $(swincludedir)/versificationmgr.h
+pkginclude_HEADERS += $(swincludedir)/flatapi.h
+pkginclude_HEADERS += $(swincludedir)/ftpparse.h
+pkginclude_HEADERS += $(swincludedir)/remotetrans.h
+pkginclude_HEADERS += $(swincludedir)/ftplibftpt.h
+pkginclude_HEADERS += $(swincludedir)/ftplib.h
+
+pkginclude_HEADERS += $(swincludedir)/gbffootnotes.h
+pkginclude_HEADERS += $(swincludedir)/gbfheadings.h
+pkginclude_HEADERS += $(swincludedir)/gbfhtml.h
+pkginclude_HEADERS += $(swincludedir)/gbfxhtml.h
+pkginclude_HEADERS += $(swincludedir)/gbfhtmlhref.h
+pkginclude_HEADERS += $(swincludedir)/gbfwebif.h
+pkginclude_HEADERS += $(swincludedir)/gbfmorph.h
+pkginclude_HEADERS += $(swincludedir)/gbfosis.h
+pkginclude_HEADERS += $(swincludedir)/gbfplain.h
+pkginclude_HEADERS += $(swincludedir)/gbfredletterwords.h
+pkginclude_HEADERS += $(swincludedir)/gbfrtf.h
+pkginclude_HEADERS += $(swincludedir)/gbfstrongs.h
+pkginclude_HEADERS += $(swincludedir)/gbfwordjs.h
+pkginclude_HEADERS += $(swincludedir)/gbfthml.h
+pkginclude_HEADERS += $(swincludedir)/greeklexattribs.h
+
+pkginclude_HEADERS += $(swincludedir)/hebrewmcim.h
+pkginclude_HEADERS += $(swincludedir)/hrefcom.h
+pkginclude_HEADERS += $(swincludedir)/installmgr.h
+pkginclude_HEADERS += $(swincludedir)/latin1utf16.h
+pkginclude_HEADERS += $(swincludedir)/latin1utf8.h
+pkginclude_HEADERS += $(swincludedir)/listkey.h
+pkginclude_HEADERS += $(swincludedir)/localemgr.h
+pkginclude_HEADERS += $(swincludedir)/lzsscomprs.h
+pkginclude_HEADERS += $(swincludedir)/markupfiltmgr.h
+pkginclude_HEADERS += $(swincludedir)/multimapwdef.h
+pkginclude_HEADERS += $(swincludedir)/nullim.h
+
+pkginclude_HEADERS += $(swincludedir)/osisglosses.h
+pkginclude_HEADERS += $(swincludedir)/osisenum.h
+pkginclude_HEADERS += $(swincludedir)/osisheadings.h
+pkginclude_HEADERS += $(swincludedir)/osishtmlhref.h
+pkginclude_HEADERS += $(swincludedir)/osisxhtml.h
+pkginclude_HEADERS += $(swincludedir)/osiswebif.h
+pkginclude_HEADERS += $(swincludedir)/osismorph.h
+pkginclude_HEADERS += $(swincludedir)/osismorphsegmentation.h
+pkginclude_HEADERS += $(swincludedir)/osisplain.h
+pkginclude_HEADERS += $(swincludedir)/osisrtf.h
+pkginclude_HEADERS += $(swincludedir)/osisosis.h
+pkginclude_HEADERS += $(swincludedir)/osisstrongs.h
+pkginclude_HEADERS += $(swincludedir)/osisfootnotes.h   
+pkginclude_HEADERS += $(swincludedir)/osislemma.h   
+pkginclude_HEADERS += $(swincludedir)/osisredletterwords.h   
+pkginclude_HEADERS += $(swincludedir)/osisscripref.h   
+pkginclude_HEADERS += $(swincludedir)/osiswordjs.h   
+pkginclude_HEADERS += $(swincludedir)/osisvariants.h   
+pkginclude_HEADERS += $(swincludedir)/osisxlit.h   
+
+pkginclude_HEADERS += $(swincludedir)/papyriplain.h
+pkginclude_HEADERS += $(swincludedir)/rawcom.h
+pkginclude_HEADERS += $(swincludedir)/rawcom4.h
+pkginclude_HEADERS += $(swincludedir)/rawfiles.h
+pkginclude_HEADERS += $(swincludedir)/rawgenbook.h
+pkginclude_HEADERS += $(swincludedir)/rawld.h
+pkginclude_HEADERS += $(swincludedir)/rawld4.h
+pkginclude_HEADERS += $(swincludedir)/rawstr.h
+pkginclude_HEADERS += $(swincludedir)/rawstr4.h
+pkginclude_HEADERS += $(swincludedir)/rawtext.h
+pkginclude_HEADERS += $(swincludedir)/rawtext4.h
+pkginclude_HEADERS += $(swincludedir)/rawverse.h
+pkginclude_HEADERS += $(swincludedir)/rawverse4.h
+if USE_INTERNAL_REGEX
+pkginclude_HEADERS += $(swincludedir)/internal/regex/regex.h
+endif
+pkginclude_HEADERS += $(swincludedir)/roman.h
+pkginclude_HEADERS += $(swincludedir)/rtfhtml.h
+pkginclude_HEADERS += $(swincludedir)/sapphire.h
+pkginclude_HEADERS += $(swincludedir)/scsuutf8.h
+pkginclude_HEADERS += $(swincludedir)/strkey.h
+pkginclude_HEADERS += $(swincludedir)/swbasicfilter.h
+pkginclude_HEADERS += $(swincludedir)/swbuf.h
+pkginclude_HEADERS += $(swincludedir)/swcacher.h
+pkginclude_HEADERS += $(swincludedir)/swcipher.h
+pkginclude_HEADERS += $(swincludedir)/swcom.h
+pkginclude_HEADERS += $(swincludedir)/swcomprs.h
+pkginclude_HEADERS += $(swincludedir)/swconfig.h
+pkginclude_HEADERS += $(swincludedir)/swdisp.h
+pkginclude_HEADERS += $(swincludedir)/swfilter.h
+pkginclude_HEADERS += $(swincludedir)/swfiltermgr.h
+pkginclude_HEADERS += $(swincludedir)/swgenbook.h
+pkginclude_HEADERS += $(swincludedir)/swinputmeth.h
+pkginclude_HEADERS += $(swincludedir)/swkey.h
+pkginclude_HEADERS += $(swincludedir)/swld.h
+pkginclude_HEADERS += $(swincludedir)/swlocale.h
+pkginclude_HEADERS += $(swincludedir)/swlog.h
+pkginclude_HEADERS += $(swincludedir)/swmacs.h
+pkginclude_HEADERS += $(swincludedir)/swmgr.h
+pkginclude_HEADERS += $(swincludedir)/stringmgr.h
+pkginclude_HEADERS += $(swincludedir)/swmodule.h
+pkginclude_HEADERS += $(swincludedir)/swoptfilter.h
+pkginclude_HEADERS += $(swincludedir)/swobject.h
+pkginclude_HEADERS += $(swincludedir)/swsearchable.h
+pkginclude_HEADERS += $(swincludedir)/swtext.h
+pkginclude_HEADERS += $(swincludedir)/swversion.h
+pkginclude_HEADERS += $(swincludedir)/sysdata.h
+
+pkginclude_HEADERS += $(swincludedir)/thmlfootnotes.h
+pkginclude_HEADERS += $(swincludedir)/thmlgbf.h
+pkginclude_HEADERS += $(swincludedir)/thmlheadings.h
+pkginclude_HEADERS += $(swincludedir)/thmlhtml.h
+pkginclude_HEADERS += $(swincludedir)/thmlxhtml.h
+pkginclude_HEADERS += $(swincludedir)/thmlhtmlhref.h
+pkginclude_HEADERS += $(swincludedir)/thmlwebif.h
+pkginclude_HEADERS += $(swincludedir)/thmllemma.h
+pkginclude_HEADERS += $(swincludedir)/thmlmorph.h
+pkginclude_HEADERS += $(swincludedir)/thmlosis.h
+pkginclude_HEADERS += $(swincludedir)/thmlplain.h
+pkginclude_HEADERS += $(swincludedir)/thmlrtf.h
+pkginclude_HEADERS += $(swincludedir)/thmlscripref.h
+pkginclude_HEADERS += $(swincludedir)/thmlstrongs.h
+pkginclude_HEADERS += $(swincludedir)/thmlvariants.h
+pkginclude_HEADERS += $(swincludedir)/thmlwordjs.h
+
+pkginclude_HEADERS += $(swincludedir)/teiplain.h
+pkginclude_HEADERS += $(swincludedir)/teirtf.h
+pkginclude_HEADERS += $(swincludedir)/teixhtml.h
+pkginclude_HEADERS += $(swincludedir)/teihtmlhref.h
+
+pkginclude_HEADERS += $(swincludedir)/treekey.h
+pkginclude_HEADERS += $(swincludedir)/treekeyidx.h
+pkginclude_HEADERS += $(swincludedir)/unicodertf.h
+pkginclude_HEADERS += $(swincludedir)/url.h
+pkginclude_HEADERS += $(swincludedir)/untgz.h
+pkginclude_HEADERS += $(swincludedir)/utf16utf8.h
+pkginclude_HEADERS += $(swincludedir)/utf8arshaping.h
+pkginclude_HEADERS += $(swincludedir)/utf8bidireorder.h
+pkginclude_HEADERS += $(swincludedir)/utf8cantillation.h
+pkginclude_HEADERS += $(swincludedir)/utf8greekaccents.h
+pkginclude_HEADERS += $(swincludedir)/utf8hebrewpoints.h
+pkginclude_HEADERS += $(swincludedir)/utf8arabicpoints.h
+pkginclude_HEADERS += $(swincludedir)/utf8html.h
+pkginclude_HEADERS += $(swincludedir)/utf8latin1.h
+pkginclude_HEADERS += $(swincludedir)/utf8nfc.h
+pkginclude_HEADERS += $(swincludedir)/utf8nfkd.h
+pkginclude_HEADERS += $(swincludedir)/utf8transliterator.h
+pkginclude_HEADERS += $(swincludedir)/utf8utf16.h
+pkginclude_HEADERS += $(swincludedir)/utilstr.h
+pkginclude_HEADERS += $(swincludedir)/utilxml.h
+
+pkginclude_HEADERS += $(swincludedir)/versekey.h
+pkginclude_HEADERS += $(swincludedir)/versetreekey.h
+pkginclude_HEADERS += $(swincludedir)/zcom.h
+pkginclude_HEADERS += $(swincludedir)/zipcomprs.h
+pkginclude_HEADERS += $(swincludedir)/zld.h
+pkginclude_HEADERS += $(swincludedir)/zstr.h
+pkginclude_HEADERS += $(swincludedir)/ztext.h
+pkginclude_HEADERS += $(swincludedir)/zverse.h
+
+pkginclude_HEADERS += $(swincludedir)/canon_kjva.h
+pkginclude_HEADERS += $(swincludedir)/canon_leningrad.h
+pkginclude_HEADERS += $(swincludedir)/canon_mt.h
+pkginclude_HEADERS += $(swincludedir)/canon_nrsv.h
+pkginclude_HEADERS += $(swincludedir)/canon_nrsva.h
+pkginclude_HEADERS += $(swincludedir)/canon_synodal.h
+pkginclude_HEADERS += $(swincludedir)/canon_synodalprot.h
+pkginclude_HEADERS += $(swincludedir)/canon_vulg.h
+pkginclude_HEADERS += $(swincludedir)/canon_german.h
+pkginclude_HEADERS += $(swincludedir)/canon_luther.h
+pkginclude_HEADERS += $(swincludedir)/canon_catholic.h
+pkginclude_HEADERS += $(swincludedir)/canon_catholic2.h
+pkginclude_HEADERS += $(swincludedir)/canon_lxx.h
+pkginclude_HEADERS += $(swincludedir)/canon_orthodox.h
+pkginclude_HEADERS += $(swincludedir)/canon_null.h
+
diff --git a/include/SwordAPI.pas b/include/SwordAPI.pas
new file mode 100644
index 0000000..07342bc
--- /dev/null
+++ b/include/SwordAPI.pas
@@ -0,0 +1,71 @@
+{******************************************************************************
+ *
+ *  SwordAPI.pas -	
+ *  
+ * $Id: SwordAPI.pas 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ *}
+unit SwordAPI;
+
+interface
+const
+	DLLNAME = 'sword32.dll';
+
+type
+    paramt = record
+           path, name, disc: pchar;
+    end;
+    pparamt = ^paramt;
+
+function  NewModule(modtype: PChar; params: pparamt): integer; stdcall; external DLLNAME;
+procedure DeleteModule(hmod: integer); stdcall; external DLLNAME;
+function  ModGetTextLen(hmod: integer): integer; stdcall; external DLLNAME;
+procedure ModGetText(hmod: integer; buf: PChar; size: integer); stdcall; external DLLNAME;
+procedure ModGetKeyText(hmod: integer; buf: PChar; size: integer); stdcall; external DLLNAME;
+function  ModGetKey(hmod: integer):integer; stdcall; external DLLNAME;
+function  ModSetKeyText(hmod: integer; keytext: PChar):char; stdcall; external DLLNAME;
+function  ModSetKeyKey(hmod: integer; hkey: integer):char; stdcall; external DLLNAME;
+function  ModSearch(hmod: integer; stext: PChar):integer; stdcall; external DLLNAME;
+procedure YoYo(x:integer; y:integer); stdcall; external DLLNAME;
+procedure ModInc(hmod: integer); stdcall; external DLLNAME;
+procedure ModDec(hmod: integer); stdcall; external DLLNAME;
+function  ModError(hmod:integer): integer; stdcall; external DLLNAME;
+function  NewKey(keytype:PChar):integer;stdcall; external DLLNAME;
+procedure DeleteKey(hkey: integer); stdcall; external DLLNAME;
+function  KeyGetPersist(hkey: integer): integer; stdcall; external DLLNAME;
+procedure KeySetPersist(hkey: integer; value: integer); stdcall; external DLLNAME;
+function  KeyError(hkey:integer): integer; stdcall; external DLLNAME;
+procedure KeyGetText(hkey: integer; buf: PChar; size: integer); stdcall; external DLLNAME;
+procedure KeySetText(hkey: integer; keytext: PChar); stdcall; external DLLNAME;
+procedure KeySetKey(hkey: integer; hkey: integer); stdcall; external DLLNAME;
+procedure KeyInc(hkey: integer); stdcall; external DLLNAME;
+procedure KeyDec(hkey: integer); stdcall; external DLLNAME;
+function  VerseKeyGetTestament(hkey: integer): integer; stdcall; external DLLNAME;
+function  VerseKeyGetBook(hkey: integer): integer; stdcall; external DLLNAME;
+function  VerseKeyGetChapter(hkey: integer): integer; stdcall; external DLLNAME;
+function  VerseKeyGetVerse(hkey: integer): integer; stdcall; external DLLNAME;
+procedure VerseKeySetTestament(hkey: integer; value: integer); stdcall; external DLLNAME;
+procedure VerseKeySetBook(hkey: integer; value: integer); stdcall; external DLLNAME;
+procedure VerseKeySetChapter(hkey: integer; value: integer); stdcall; external DLLNAME;
+procedure VerseKeySetVerse(hkey: integer; value: integer); stdcall; external DLLNAME;
+function  VerseKeyGetAutoNormalize(hkey: integer): integer; stdcall; external DLLNAME;
+procedure VerseKeySetAutoNormalize(hkey: integer; value: integer); stdcall; external DLLNAME;
+procedure VerseKeyNormalize(hkey: integer); stdcall; external DLLNAME;
+
+implementation
+
+end.
diff --git a/include/bz2comprs.h b/include/bz2comprs.h
new file mode 100644
index 0000000..c1e1648
--- /dev/null
+++ b/include/bz2comprs.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  bz2comprs.h -	Bzip2Compress, a driver class that provides bzip2
+ *			compression (Burrows–Wheeler with Huffman coding)
+ *
+ * $Id: bz2comprs.h 2858 2013-07-08 03:08:10Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef BZ2COMPRS_H
+#define BZ2COMPRS_H
+
+#include <swcomprs.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT Bzip2Compress : public SWCompress {
+
+protected:
+public:
+	Bzip2Compress();
+	virtual ~Bzip2Compress();
+
+	virtual void Encode(void);
+	virtual void Decode(void);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/canon.h b/include/canon.h
new file mode 100644
index 0000000..8f6a977
--- /dev/null
+++ b/include/canon.h
@@ -0,0 +1,341 @@
+/******************************************************************************
+ *
+ *  canon.h -	Canonical text information to be included by VerseKey.cpp
+ *
+ * $Id: canon.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef CANON_H
+#define CANON_H
+
+#include <canon_abbrevs.h>
+
+SWORD_NAMESPACE_START
+
+
+/******************************************************************************
+ * [on]tbooks - initialize static instance for all canonical text names
+ *		and chapmax
+ */
+struct sbook otbooks[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 10},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 3},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"", "", "", 0}
+};
+struct sbook ntbooks[] = {
+  {"Matthew", "Matt", "Matt", 28},
+  {"Mark", "Mark", "Mark", 16},
+  {"Luke", "Luke", "Luke", 24},
+  {"John", "John", "John", 21},
+  {"Acts", "Acts", "Acts", 28},
+  {"Romans", "Rom", "Rom", 16},
+  {"I Corinthians", "1Cor", "1Cor", 16},
+  {"II Corinthians", "2Cor", "2Cor", 13},
+  {"Galatians", "Gal", "Gal", 6},
+  {"Ephesians", "Eph", "Eph", 6},
+  {"Philippians", "Phil", "Phil", 4},
+  {"Colossians", "Col", "Col", 4},
+  {"I Thessalonians", "1Thess", "1Thess", 5},
+  {"II Thessalonians", "2Thess", "2Thess", 3},
+  {"I Timothy", "1Tim", "1Tim", 6},
+  {"II Timothy", "2Tim", "2Tim", 4},
+  {"Titus", "Titus", "Titus", 3},
+  {"Philemon", "Phlm", "Phlm", 1},
+  {"Hebrews", "Heb", "Heb", 13},
+  {"James", "Jas", "Jas", 5},
+  {"I Peter", "1Pet", "1Pet", 5},
+  {"II Peter", "2Pet", "2Pet", 3},
+  {"I John", "1John", "1John", 5},
+  {"II John", "2John", "2John", 1},
+  {"III John", "3John", "3John", 1},
+  {"Jude", "Jude", "Jude", 1},
+  {"Revelation of John", "Rev", "Rev", 22},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+  36, 47, 31,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 24,
+  34, 17,
+  // Psalms
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  7, 8, 6, 7, 5, 11, 15, 50, 14, 9,
+  13, 31, 6, 10, 22, 12, 14, 9, 11, 12,
+  24, 11, 22, 22, 28, 12, 40, 22, 13, 17,
+  13, 11, 5, 26, 17, 11, 9, 14, 20, 23,
+  19, 9, 6, 7, 23, 13, 11, 11, 17, 12,
+  8, 12, 11, 10, 13, 20, 7, 35, 36, 5,
+  24, 20, 28, 23, 10, 12, 20, 72, 13, 19,
+  16, 8, 18, 12, 13, 17, 7, 18, 52, 17,
+  16, 15, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 28, 22, 35, 45, 48, 43, 13, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 13,
+  10, 7, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 16, 20, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 13, 13, 14,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 22, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 12, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
+  // Hosea
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
+  // Joel
+  20, 32, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  17, 10, 10, 11,
+  // Micah
+  16, 13, 12, 13, 15, 16, 20,
+  // Nahum
+  15, 13, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 18, 6,
+  // -----------------------------------------------------------------
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  14,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 17, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_abbrevs.h b/include/canon_abbrevs.h
new file mode 100644
index 0000000..a5fc320
--- /dev/null
+++ b/include/canon_abbrevs.h
@@ -0,0 +1,550 @@
+/******************************************************************************
+ *
+ *  canon_abbrevs.h -	Canonical text information to be included by
+ *			 VerseKey.cpp
+ *
+ * $Id: canon_abbrevs.h 2970 2013-08-22 07:03:11Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef CANON_ABBREVS_H
+#define CANON_ABBREVS_H
+
+SWORD_NAMESPACE_START
+
+
+/******************************************************************************
+ *	Abbreviations - MUST be in alphabetical order & by PRIORITY
+ *		RULE: first match of entire key
+ *			(e.g. key: "1CH"; match: "1CHRONICLES")
+ */
+
+const struct abbrev builtin_abbrevs[] = {
+  {"1 BARUCH", "Bar"},		// Baruch
+  {"1 C", "1Cor"},		// I Corinthians
+  {"1 CHRONICLES", "1Chr"},		// I Chronicles
+  {"1 CORINTHIANS", "1Cor"},		// I Corinthians
+  {"1 E", "1Esd"},		// I Esdras
+  {"1 ENOCH", "1En"},		// I Enoch
+  {"1 ESDRAS", "1Esd"},		// I Esdras
+  {"1 JN", "1John"},		// I John
+  {"1 JOHN", "1John"},		// I John
+  {"1 K", "1Kgs"},		// I Kings
+  {"1 KGDMS", "1Sam"},		// I Samuel
+  {"1 KGS", "1Kgs"},		// I Kings
+  {"1 KING", "1Kgs"},		// I Kings
+  {"1 KINGDOMS", "1Sam"},		// I Samuel
+  {"1 KINGS", "1Kgs"},		// I Kings
+  {"1 MACCABEES", "1Macc"},		// I Maccabees
+  {"1 MAKABIAN", "1Meq"},		// I Meqabyan
+  {"1 MEQABYAN", "1Meq"},		// I Meqabyan
+  {"1 P", "1Pet"},		// I Peter
+  {"1 PARALIPOMENON", "1Chr"},		// I Chronicles
+  {"1 PETER", "1Pet"},		// I Peter
+  {"1 PTR", "1Pet"},		// I Peter
+  {"1 SAMUEL", "1Sam"},		// I Samuel
+  {"1 THESSALONIANS", "1Thess"},		// I Thessalonians
+  {"1 TIMOTHY", "1Tim"},		// I Timothy
+  {"1BARUCH", "Bar"},		// Baruch
+  {"1C", "1Cor"},		// I Corinthians
+  {"1CHR", "1Chr"},		// I Chronicles
+  {"1CHRONICLES", "1Chr"},		// I Chronicles
+  {"1COR", "1Cor"},		// I Corinthians
+  {"1CORINTHIANS", "1Cor"},		// I Corinthians
+  {"1E", "1Esd"},		// I Esdras
+  {"1EN", "1En"},		// I Enoch
+  {"1ENOCH", "1En"},		// I Enoch
+  {"1ESD", "1Esd"},		// I Esdras
+  {"1ESDRAS", "1Esd"},		// I Esdras
+  {"1JN", "1John"},		// I John
+  {"1JOHN", "1John"},		// I John
+  {"1K", "1Kgs"},		// I Kings
+  {"1KGDMS", "1Sam"},		// I Samuel
+  {"1KGS", "1Kgs"},		// I Kings
+  {"1KING", "1Kgs"},		// I Kings
+  {"1KINGDOMS", "1Sam"},		// I Samuel
+  {"1KINGS", "1Kgs"},		// I Kings
+  {"1MACC", "1Macc"},		// I Maccabees
+  {"1MACCABEES", "1Macc"},		// I Maccabees
+  {"1MAKABIAN", "1Meq"},		// I Meqabyan
+  {"1MEQ", "1Meq"},		// I Meqabyan
+  {"1MEQABYAN", "1Meq"},		// I Meqabyan
+  {"1P", "1Pet"},		// I Peter
+  {"1PARALIPOMENON", "1Chr"},		// I Chronicles
+  {"1PET", "1Pet"},		// I Peter
+  {"1PETER", "1Pet"},		// I Peter
+  {"1PTR", "1Pet"},		// I Peter
+  {"1SAM", "1Sam"},		// I Samuel
+  {"1SAMUEL", "1Sam"},		// I Samuel
+  {"1THESS", "1Thess"},		// I Thessalonians
+  {"1THESSALONIANS", "1Thess"},		// I Thessalonians
+  {"1TIM", "1Tim"},		// I Timothy
+  {"1TIMOTHY", "1Tim"},		// I Timothy
+  {"2 BARUCH", "2Bar"},		// 2Baruch
+  {"2 C", "2Cor"},		// II Corinthians
+  {"2 CHRONICLES", "2Chr"},		// II Chronicles
+  {"2 CORINTHIANS", "2Cor"},		// II Corinthians
+  {"2 E", "2Esd"},		// II Esdras
+  {"2 ESDRAS", "2Esd"},		// II Esdras
+  {"2 JN", "2John"},		// II John
+  {"2 JOHN", "2John"},		// II John
+  {"2 K", "2Kgs"},		// II Kings
+  {"2 KGDMS", "2Sam"},		// II Samuel
+  {"2 KGS", "2Kgs"},		// II Kings
+  {"2 KING", "2Kgs"},		// II Kings
+  {"2 KINGDOMS", "2Sam"},		// II Samuel
+  {"2 KINGS", "2Kgs"},		// II Kings
+  {"2 MACCABEES", "2Macc"},		// II Maccabees
+  {"2 MAKABIAN", "2Meq"},		// II Meqabyan
+  {"2 MEQABYAN", "2Meq"},		// II Meqabyan
+  {"2 P", "2Pet"},		// II Peter
+  {"2 PARALIPOMENON", "2Chr"},		// II Chronicles
+  {"2 PETER", "2Pet"},		// II Peter
+  {"2 PTR", "2Pet"},		// II Peter
+  {"2 SAMUEL", "2Sam"},		// II Samuel
+  {"2 THESSALONIANS", "2Thess"},		// II Thessalonians
+  {"2 TIMOTHY", "2Tim"},		// II Timothy
+  {"2BAR", "2Bar"},		// 2Baruch
+  {"2BARUCH", "2Bar"},		// 2Baruch
+  {"2C", "2Cor"},		// II Corinthians
+  {"2CHR", "2Chr"},		// II Chronicles
+  {"2CHRONICLES", "2Chr"},		// II Chronicles
+  {"2COR", "2Cor"},		// II Corinthians
+  {"2CORINTHIANS", "2Cor"},		// II Corinthians
+  {"2E", "2Esd"},		// II Esdras
+  {"2ESD", "2Esd"},		// II Esdras
+  {"2ESDRAS", "2Esd"},		// II Esdras
+  {"2JN", "2John"},		// II John
+  {"2JOHN", "2John"},		// II John
+  {"2K", "2Kgs"},		// II Kings
+  {"2KGDMS", "2Sam"},		// II Samuel
+  {"2KGS", "2Kgs"},		// II Kings
+  {"2KING", "2Kgs"},		// II Kings
+  {"2KINGDOMS", "2Sam"},		// II Samuel
+  {"2KINGS", "2Kgs"},		// II Kings
+  {"2MACC", "2Macc"},		// II Maccabees
+  {"2MACCABEES", "2Macc"},		// II Maccabees
+  {"2MAKABIAN", "2Meq"},		// II Meqabyan
+  {"2MEQ", "2Meq"},		// II Meqabyan
+  {"2MEQABYAN", "2Meq"},		// II Meqabyan
+  {"2P", "2Pet"},		// II Peter
+  {"2PARALIPOMENON", "2Chr"},		// II Chronicles
+  {"2PET", "2Pet"},		// II Peter
+  {"2PETER", "2Pet"},		// II Peter
+  {"2PTR", "2Pet"},		// II Peter
+  {"2SAM", "2Sam"},		// II Samuel
+  {"2SAMUEL", "2Sam"},		// II Samuel
+  {"2THESS", "2Thess"},		// II Thessalonians
+  {"2THESSALONIANS", "2Thess"},		// II Thessalonians
+  {"2TIM", "2Tim"},		// II Timothy
+  {"2TIMOTHY", "2Tim"},		// II Timothy
+  {"3 EZRA", "1Esd"},		// I Esdras
+  {"3 JN", "3John"},		// III John
+  {"3 JOHN", "3John"},		// III John
+  {"3 KGDMS", "1Kgs"},		// I Kings
+  {"3 KGS", "1Kgs"},		// I Kings
+  {"3 KINGDOMS", "1Kgs"},		// I Kings
+  {"3 KINGS", "1Kgs"},		// I Kings
+  {"3 MACCABEES", "3Macc"},		// III Maccabees
+  {"3 MAKABIAN", "3Meq"},		// III Meqabyan
+  {"3 MEQABYAN", "3Meq"},		// III Meqabyan
+  {"3EZRA", "1Esd"},		// I Esdras
+  {"3JN", "3John"},		// III John
+  {"3JOHN", "3John"},		// III John
+  {"3KGDMS", "1Kgs"},		// I Kings
+  {"3KGS", "1Kgs"},		// I Kings
+  {"3KINGDOMS", "1Kgs"},		// I Kings
+  {"3KINGS", "1Kgs"},		// I Kings
+  {"3MACC", "3Macc"},		// III Maccabees
+  {"3MACCABEES", "3Macc"},		// III Maccabees
+  {"3MAKABIAN", "3Meq"},		// III Meqabyan
+  {"3MEQ", "3Meq"},		// III Meqabyan
+  {"3MEQABYAN", "3Meq"},		// III Meqabyan
+  {"4 BARUCH", "4Bar"},		// IV Baruch
+  {"4 KGDMS", "2Kgs"},		// II Kings
+  {"4 KGS", "2Kgs"},		// II Kings
+  {"4 KINGDOMS", "2Kgs"},		// II Kings
+  {"4 KINGS", "2Kgs"},		// II Kings
+  {"4 MACCABEES", "4Macc"},		// IV Maccabees
+  {"4BAR", "4Bar"},		// IV Baruch
+  {"4BARUCH", "4Bar"},		// IV Baruch
+  {"4KGDMS", "2Kgs"},		// II Kings
+  {"4KGS", "2Kgs"},		// II Kings
+  {"4KINGDOMS", "2Kgs"},		// II Kings
+  {"4KINGS", "2Kgs"},		// II Kings
+  {"4MACC", "4Macc"},		// IV Maccabees
+  {"4MACCABEES", "4Macc"},		// IV Maccabees
+  {"5APOCSYRPSS", "AddPs"},		// Additional Psalm
+  {"ACTS", "Acts"},		// Acts
+  {"ADDDAN", "AddDan"},		// Additions to Daniel
+  {"ADDESTH", "AddEsth"},		// Additions to Esther
+  {"ADDITIONAL PSALM", "AddPs"},		// Additional Psalm
+  {"ADDITIONS TO DANIEL", "AddDan"},		// Additions to Daniel
+  {"ADDITIONS TO ESTHER", "AddEsth"},		// Additions to Esther
+  {"ADDPS", "AddPs"},		// Additional Psalm
+  {"AMOS", "Amos"},		// Amos
+  {"APOCALYPSE OF JOHN", "Rev"},		// Revelation of John
+  {"AZA", "PrAzar"},		// Prayer of Azariah
+  {"AZAR", "PrAzar"},		// Prayer of Azariah
+  {"AZARIAH", "PrAzar"},		// Prayer of Azariah
+  {"BAR", "Bar"},		// Baruch
+  {"BARUCH", "Bar"},		// Baruch
+  {"BEL", "Bel"},		// Bel and the Dragon
+  {"BEL AND THE DRAGON", "Bel"},		// Bel and the Dragon
+  {"C", "Col"},		// Colossians
+  {"CANTICLE OF CANTICLES", "Song"},		// Song of Solomon
+  {"COL", "Col"},		// Colossians
+  {"COLOSSIANS", "Col"},		// Colossians
+  {"D", "Deut"},		// Deuteronomy
+  {"DAN", "Dan"},		// Daniel
+  {"DANGR", "DanGr"},		// Daniel (Greek)
+  {"DANIEL", "Dan"},		// Daniel
+  {"DANIEL (ADDITIONS)", "AddDan"},		// Additions to Daniel
+  {"DANIEL (GREEK)", "DanGr"},		// Daniel (Greek)
+  {"DEUT", "Deut"},		// Deuteronomy
+  {"DEUTERONOMY", "Deut"},		// Deuteronomy
+  {"DT", "Deut"},		// Deuteronomy
+  {"E", "Exod"},		// Exodus
+  {"ECCL", "Eccl"},		// Ecclesiastes
+  {"ECCLESIASTES", "Eccl"},		// Ecclesiastes
+  {"ECCLESIASTICUS", "Sir"},		// Sirach
+  {"ECCLUS", "Sir"},		// Sirach
+  {"EK", "Ezek"},		// Ezekiel
+  {"ENOCH", "1En"},		// I Enoch
+  {"EPH", "Eph"},		// Ephesians
+  {"EPHESIANS", "Eph"},		// Ephesians
+  {"EPISTLE OF JEREMIAH", "EpJer"},		// Epistle of Jeremiah
+  {"EPJ", "EpJer"},		// Epistle of Jeremiah
+  {"EPJER", "EpJer"},		// Epistle of Jeremiah
+  {"EPLAO", "EpLao"},		// Laodiceans
+  {"ES", "Esth"},		// Esther
+  {"ESDRAS A", "1Esd"},		// I Esdras
+  {"ESDRAS B", "Ezra"},		// II Esdras
+  {"ESDRASA", "1Esd"},		// I Esdras
+  {"ESDRASB", "Ezra"},		// II Esdras
+  {"ESG", "EsthGr"},		// Esther (Greek)
+  {"ESTER", "Esth"},		// Esther
+  {"ESTH", "Esth"},		// Esther
+  {"ESTHER", "Esth"},		// Esther
+  {"ESTHER (ADDITIONS)", "AddEsth"},		// Additions to Esther
+  {"ESTHER (GREEK)", "EsthGr"},		// Esther (Greek)
+  {"ESTHGR", "EsthGr"},		// Esther (Greek)
+  {"ETHIOPIC APOCALYPSE OF ENOCH", "1En"},		// I Enoch
+  {"EXOD", "Exod"},		// Exodus
+  {"EXODUS", "Exod"},		// Exodus
+  {"EZEK", "Ezek"},		// Ezekiel
+  {"EZEKIEL", "Ezek"},		// Ezekiel
+  {"EZK", "Ezek"},		// Ezekiel
+  {"EZRA", "Ezra"},		// Ezra
+  {"FIVE APOCRYPHAL SYRIAC PSALMS", "AddPs"},		// Additional Psalm
+  {"G", "Gen"},		// Genesis
+  {"GAL", "Gal"},		// Galatians
+  {"GALATIANS", "Gal"},		// Galatians
+  {"GEN", "Gen"},		// Genesis
+  {"GENESIS", "Gen"},		// Genesis
+  {"GN", "Gen"},		// Genesis
+  {"GRDAN", "DanGr"},		// Daniel (Greek)
+  {"GREEK DANIEL", "DanGr"},		// Daniel (Greek)
+  {"GREEK ESTHER", "EsthGr"},		// Esther (Greek)
+  {"GRESTH", "EsthGr"},		// Esther (Greek)
+  {"H", "Heb"},		// Hebrews
+  {"HAB", "Hab"},		// Habakkuk
+  {"HABAKKUK", "Hab"},		// Habakkuk
+  {"HAG", "Hag"},		// Haggai
+  {"HAGGAI", "Hag"},		// Haggai
+  {"HEB", "Heb"},		// Hebrews
+  {"HEBREWS", "Heb"},		// Hebrews
+  {"HOS", "Hos"},		// Hosea
+  {"HOSEA", "Hos"},		// Hosea
+  {"I", "Isa"},		// Isaiah
+  {"I BARUCH", "Bar"},		// Baruch
+  {"I C", "1Cor"},		// I Corinthians
+  {"I CHRONICLES", "1Chr"},		// I Chronicles
+  {"I CORINTHIANS", "1Cor"},		// I Corinthians
+  {"I E", "1Esd"},		// I Esdras
+  {"I ENOCH", "1En"},		// I Enoch
+  {"I ESDRAS", "1Esd"},		// I Esdras
+  {"I JN", "1John"},		// I John
+  {"I JOHN", "1John"},		// I John
+  {"I K", "1Kgs"},		// I Kings
+  {"I KGDMS", "1Sam"},		// I Samuel
+  {"I KGS", "1Kgs"},		// I Kings
+  {"I KING", "1Kgs"},		// I Kings
+  {"I KINGDOMS", "1Sam"},		// I Samuel
+  {"I KINGS", "1Kgs"},		// I Kings
+  {"I MACCABEES", "1Macc"},		// I Maccabees
+  {"I MAKABIAN", "1Meq"},		// I Meqabyan
+  {"I MEQABYAN", "1Meq"},		// I Meqabyan
+  {"I P", "1Pet"},		// I Peter
+  {"I PARALIPOMENON", "1Chr"},		// I Chronicles
+  {"I PETER", "1Pet"},		// I Peter
+  {"I PTR", "1Pet"},		// I Peter
+  {"I SAMUEL", "1Sam"},		// I Samuel
+  {"I THESSALONIANS", "1Thess"},		// I Thessalonians
+  {"I TIMOTHY", "1Tim"},		// I Timothy
+  {"IBARUCH", "Bar"},		// Baruch
+  {"IC", "1Cor"},		// I Corinthians
+  {"ICHRONICLES", "1Chr"},		// I Chronicles
+  {"ICORINTHIANS", "1Cor"},		// I Corinthians
+  {"IE", "1Esd"},		// I Esdras
+  {"IENOCH", "1En"},		// I Enoch
+  {"IESDRAS", "1Esd"},		// I Esdras
+  {"II BARUCH", "2Bar"},		// 2Baruch
+  {"II C", "2Cor"},		// II Corinthians
+  {"II CHRONICLES", "2Chr"},		// II Chronicles
+  {"II CORINTHIANS", "2Cor"},		// II Corinthians
+  {"II E", "2Esd"},		// II Esdras
+  {"II ESDRAS", "2Esd"},		// II Esdras
+  {"II JN", "2John"},		// II John
+  {"II JOHN", "2John"},		// II John
+  {"II K", "2Kgs"},		// II Kings
+  {"II KGDMS", "2Sam"},		// II Samuel
+  {"II KGS", "2Kgs"},		// II Kings
+  {"II KING", "2Kgs"},		// II Kings
+  {"II KINGDOMS", "2Sam"},		// II Samuel
+  {"II KINGS", "2Kgs"},		// II Kings
+  {"II MACCABEES", "2Macc"},		// II Maccabees
+  {"II MAKABIAN", "2Meq"},		// II Meqabyan
+  {"II MEQABYAN", "2Meq"},		// II Meqabyan
+  {"II P", "2Pet"},		// II Peter
+  {"II PARALIPOMENON", "2Chr"},		// II Chronicles
+  {"II PETER", "2Pet"},		// II Peter
+  {"II PTR", "2Pet"},		// II Peter
+  {"II SAMUEL", "2Sam"},		// II Samuel
+  {"II THESSALONIANS", "2Thess"},		// II Thessalonians
+  {"II TIMOTHY", "2Tim"},		// II Timothy
+  {"IIBARUCH", "2Bar"},		// 2Baruch
+  {"IIC", "2Cor"},		// II Corinthians
+  {"IICHRONICLES", "2Chr"},		// II Chronicles
+  {"IICORINTHIANS", "2Cor"},		// II Corinthians
+  {"IIE", "2Esd"},		// II Esdras
+  {"IIESDRAS", "2Esd"},		// II Esdras
+  {"III EZRA", "1Esd"},		// I Esdras
+  {"III JN", "3John"},		// III John
+  {"III JOHN", "3John"},		// III John
+  {"III KGDMS", "1Kgs"},		// I Kings
+  {"III KGS", "1Kgs"},		// I Kings
+  {"III KINGDOMS", "1Kgs"},		// I Kings
+  {"III KINGS", "1Kgs"},		// I Kings
+  {"III MACCABEES", "3Macc"},		// III Maccabees
+  {"III MAKABIAN", "3Meq"},		// III Meqabyan
+  {"III MEQABYAN", "3Meq"},		// III Meqabyan
+  {"IIIEZRA", "1Esd"},		// I Esdras
+  {"IIIJN", "3John"},		// III John
+  {"IIIJOHN", "3John"},		// III John
+  {"IIIKGDMS", "1Kgs"},		// I Kings
+  {"IIIKGS", "1Kgs"},		// I Kings
+  {"IIIKINGDOMS", "1Kgs"},		// I Kings
+  {"IIIKINGS", "1Kgs"},		// I Kings
+  {"IIIMACCABEES", "3Macc"},		// III Maccabees
+  {"IIIMAKABIAN", "3Meq"},		// III Meqabyan
+  {"IIIMEQABYAN", "3Meq"},		// III Meqabyan
+  {"IIJN", "2John"},		// II John
+  {"IIJOHN", "2John"},		// II John
+  {"IIK", "2Kgs"},		// II Kings
+  {"IIKGDMS", "2Sam"},		// II Samuel
+  {"IIKGS", "2Kgs"},		// II Kings
+  {"IIKING", "2Kgs"},		// II Kings
+  {"IIKINGDOMS", "2Sam"},		// II Samuel
+  {"IIKINGS", "2Kgs"},		// II Kings
+  {"IIMACCABEES", "2Macc"},		// II Maccabees
+  {"IIMAKABIAN", "2Meq"},		// II Meqabyan
+  {"IIMEQABYAN", "2Meq"},		// II Meqabyan
+  {"IIP", "2Pet"},		// II Peter
+  {"IIPARALIPOMENON", "2Chr"},		// II Chronicles
+  {"IIPETER", "2Pet"},		// II Peter
+  {"IIPTR", "2Pet"},		// II Peter
+  {"IISAMUEL", "2Sam"},		// II Samuel
+  {"IITHESSALONIANS", "2Thess"},		// II Thessalonians
+  {"IITIMOTHY", "2Tim"},		// II Timothy
+  {"IJN", "1John"},		// I John
+  {"IJOHN", "1John"},		// I John
+  {"IK", "1Kgs"},		// I Kings
+  {"IKGDMS", "1Sam"},		// I Samuel
+  {"IKGS", "1Kgs"},		// I Kings
+  {"IKING", "1Kgs"},		// I Kings
+  {"IKINGDOMS", "1Sam"},		// I Samuel
+  {"IKINGS", "1Kgs"},		// I Kings
+  {"IMACCABEES", "1Macc"},		// I Maccabees
+  {"IMAKABIAN", "1Meq"},		// I Meqabyan
+  {"IMEQABYAN", "1Meq"},		// I Meqabyan
+  {"IP", "1Pet"},		// I Peter
+  {"IPARALIPOMENON", "1Chr"},		// I Chronicles
+  {"IPETER", "1Pet"},		// I Peter
+  {"IPTR", "1Pet"},		// I Peter
+  {"ISA", "Isa"},		// Isaiah
+  {"ISAIAH", "Isa"},		// Isaiah
+  {"ISAMUEL", "1Sam"},		// I Samuel
+  {"ITHESSALONIANS", "1Thess"},		// I Thessalonians
+  {"ITIMOTHY", "1Tim"},		// I Timothy
+  {"IV BARUCH", "4Bar"},		// IV Baruch
+  {"IV KGDMS", "2Kgs"},		// II Kings
+  {"IV KGS", "2Kgs"},		// II Kings
+  {"IV KINGDOMS", "2Kgs"},		// II Kings
+  {"IV KINGS", "2Kgs"},		// II Kings
+  {"IV MACCABEES", "4Macc"},		// IV Maccabees
+  {"IVBARUCH", "4Bar"},		// IV Baruch
+  {"IVKGDMS", "2Kgs"},		// II Kings
+  {"IVKGS", "2Kgs"},		// II Kings
+  {"IVKINGDOMS", "2Kgs"},		// II Kings
+  {"IVKINGS", "2Kgs"},		// II Kings
+  {"IVMACCABEES", "4Macc"},		// IV Maccabees
+  {"J", "Josh"},		// Joshua
+  {"JAMES", "Jas"},		// James
+  {"JAS", "Jas"},		// James
+  {"JB", "Job"},		// Job
+  {"JD", "Judg"},		// Judges
+  {"JDGS", "Judg"},		// Judges
+  {"JDT", "Jdt"},		// Judith
+  {"JER", "Jer"},		// Jeremiah
+  {"JEREMIAH", "Jer"},		// Jeremiah
+  {"JHN", "John"},		// John
+  {"JN", "John"},		// John
+  {"JO", "John"},		// John
+  {"JOB", "Job"},		// Job
+  {"JOEL", "Joel"},		// Joel
+  {"JOHN", "John"},		// John
+  {"JOL", "Joel"},		// Joel
+  {"JONAH", "Jonah"},		// Jonah
+  {"JOSH", "Josh"},		// Joshua
+  {"JOSHUA", "Josh"},		// Joshua
+  {"JS", "Josh"},		// Joshua
+  {"JU", "Jude"},		// Jude
+  {"JUB", "Jub"},		// Jubilees
+  {"JUBILEES", "Jub"},		// Jubilees
+  {"JUDE", "Jude"},		// Jude
+  {"JUDG", "Judg"},		// Judges
+  {"JUDGES", "Judg"},		// Judges
+  {"JUDITH", "Jdt"},		// Judith
+  {"L", "Luke"},		// Luke
+  {"LAM", "Lam"},		// Lamentations
+  {"LAMENTATIONS", "Lam"},		// Lamentations
+  {"LAO", "EpLao"},		// Laodiceans
+  {"LAODICEANS", "EpLao"},		// Laodiceans
+  {"LE", "Lev"},		// Leviticus
+  {"LETJER", "EpJer"},		// Epistle of Jeremiah
+  {"LETTER OF JEREMIAH", "EpJer"},		// Epistle of Jeremiah
+  {"LEV", "Lev"},		// Leviticus
+  {"LEVITICUS", "Lev"},		// Leviticus
+  {"LK", "Luke"},		// Luke
+  {"LUKE", "Luke"},		// Luke
+  {"LV", "Lev"},		// Leviticus
+  {"MA", "Matt"},		// Matthew
+  {"MAL", "Mal"},		// Malachi
+  {"MALACHI", "Mal"},		// Malachi
+  {"MAN", "PrMan"},		// Prayer of Manasses
+  {"MANASSEH", "PrMan"},		// Prayer of Manasses
+  {"MANASSES", "PrMan"},		// Prayer of Manasses
+  {"MARK", "Mark"},		// Mark
+  {"MATT", "Matt"},		// Matthew
+  {"MATTHEW", "Matt"},		// Matthew
+  {"MIC", "Mic"},		// Micah
+  {"MICAH", "Mic"},		// Micah
+  {"MK", "Mark"},		// Mark
+  {"MRK", "Mark"},		// Mark
+  {"MT", "Matt"},		// Matthew
+  {"N", "Num"},		// Numbers
+  {"NAH", "Nah"},		// Nahum
+  {"NAHUM", "Nah"},		// Nahum
+  {"NAM", "Nah"},		// Nahum
+  {"NEH", "Neh"},		// Nehemiah
+  {"NEHEMIAH", "Neh"},		// Nehemiah
+  {"NM", "Num"},		// Numbers
+  {"NUM", "Num"},		// Numbers
+  {"NUMBERS", "Num"},		// Numbers
+  {"OBAD", "Obad"},		// Obadiah
+  {"OBADIAH", "Obad"},		// Obadiah
+  {"ODES", "Odes"},		// Odes
+  {"P", "Ps"},		// Psalms
+  {"PARALEIPOMENA JEREMIOU", "4Bar"},		// IV Baruch
+  {"PARALIPOMENA OF JEREMIAH", "4Bar"},		// IV Baruch
+  {"PHIL", "Phil"},		// Philippians
+  {"PHILEMON", "Phlm"},		// Philemon
+  {"PHILIPPIANS", "Phil"},		// Philippians
+  {"PHLM", "Phlm"},		// Philemon
+  {"PHLP", "Phil"},		// Philippians
+  {"PHM", "Phlm"},		// Philemon
+  {"PHP", "Phil"},		// Philippians
+  {"PR", "Prov"},		// Proverbs
+  {"PRA", "PrAzar"},		// Prayer of Azariah
+  {"PRAYER OF AZARIAH", "PrAzar"},		// Prayer of Azariah
+  {"PRAYER OF MANASSEH", "PrMan"},		// Prayer of Manasses
+  {"PRAYER OF MANASSES", "PrMan"},		// Prayer of Manasses
+  {"PRAZAR", "PrAzar"},		// Prayer of Azariah
+  {"PRM", "PrMan"},		// Prayer of Manasses
+  {"PRMAN", "PrMan"},		// Prayer of Manasses
+  {"PROV", "Prov"},		// Proverbs
+  {"PROVERBS", "Prov"},		// Proverbs
+  {"PS", "Ps"},		// Psalms
+//  {"PS 151", "AddPs"},		// Additional Psalm
+//  {"PS151", "AddPs"},		// Additional Psalm
+  {"PSALM", "Ps"},		// Psalms
+//  {"PSALM 151", "AddPs"},		// Additional Psalm
+//  {"PSALM151", "AddPs"},		// Additional Psalm
+  {"PSALMS", "Ps"},		// Psalms
+  {"PSALMS OF SOLOMON", "PssSol"},		// Psalms of Solomon
+  {"PSM", "Ps"},		// Psalms
+  {"PSS", "Ps"},		// Psalms
+  {"PSSSOL", "PssSol"},		// Psalms of Solomon
+  {"QOHELET", "Eccl"},		// Ecclesiastes
+  {"QOHELETH", "Eccl"},		// Ecclesiastes
+  {"REV", "Rev"},		// Revelation of John
+  {"REVELATION OF JOHN", "Rev"},		// Revelation of John
+  {"ROM", "Rom"},		// Romans
+  {"ROMANS", "Rom"},		// Romans
+  {"RUTH", "Ruth"},		// Ruth
+  {"S", "Song"},		// Song of Solomon
+//  {"S3Y", "PrAzar"},		// Prayer of Azariah
+  {"SI", "Sir"},		// Sirach
+  {"SIP", "SirP"},		// Sirach (Prologue)
+  {"SIR", "Sir"},		// Sirach
+  {"SIRACH", "Sir"},		// Sirach
+  {"SIRACH (PROLOGUE)", "SirP"},		// Sirach (Prologue)
+  {"SIRP", "SirP"},		// Sirach (Prologue)
+  {"SNG", "Song"},		// Song of Solomon
+  {"SOLOMON", "Song"},		// Song of Solomon
+  {"SONG", "Song"},		// Song of Solomon
+  {"SONG OF SOLOMON", "Song"},		// Song of Solomon
+  {"SONG OF SONGS", "Song"},		// Song of Solomon
+  {"SONG OF THE THREE CHILDREN", "PrAzar"},		// Prayer of Azariah
+  {"SUS", "Sus"},		// Susanna
+  {"SUSANNA", "Sus"},		// Susanna
+  {"SYRIAC APOCALYPSE OF BARUCH", "2Bar"},		// 2Baruch
+  {"T", "Titus"},		// Titus
+  {"TB", "Tob"},		// Tobit
+  {"TBT", "Tob"},		// Tobit
+  {"TITUS", "Titus"},		// Titus
+  {"TOB", "Tob"},		// Tobit
+  {"TOBIT", "Tob"},		// Tobit
+  {"WIS", "Wis"},		// Wisdom
+  {"WISDOM", "Wis"},		// Wisdom
+  {"WISDOM OF BEN SIRA", "Sir"},		// Sirach
+  {"WISDOM OF JESUS SON OF SIRACH", "Sir"},		// Sirach
+  {"WISDOM OF SIRACH", "Sir"},		// Sirach
+  {"WISDOM OF SOLOMON", "Wis"},		// Wisdom
+  {"ZECH", "Zech"},		// Zechariah
+  {"ZECHARIAH", "Zech"},		// Zechariah
+  {"ZEPH", "Zeph"},		// Zephaniah
+  {"ZEPHANIAH", "Zeph"},		// Zephaniah
+  {"", ""}
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_catholic.h b/include/canon_catholic.h
new file mode 100644
index 0000000..cadec81
--- /dev/null
+++ b/include/canon_catholic.h
@@ -0,0 +1,341 @@
+/******************************************************************************
+ *
+ *  canon_catholic.h -	Versification data for the Catholic system
+ *
+ * $Id: canon_catholic.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2010-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_CATHOLIC_H
+#define CANON_CATHOLIC_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Catholic
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Tob Jdt Esth 1Macc 2Macc Job Ps Prov Eccl Song Wis Sir Isa Jer Lam Bar Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+/******************************************************************************
+ * [on]tbooks_catholic - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_catholic[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Esther", "Esth", "Esth", 10},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Baruch", "Bar", "Bar", 6},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 14},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 4},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 3},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_catholic[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 66, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 32, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 20, 32, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 54,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
+  // Tobit
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
+  // Judith
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // I Maccabees
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 53, 49, 41, 24,
+  // II Maccabees
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 39,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 14, 14, 24, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 24,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  9, 29, 22, 35, 45, 48, 43, 14, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 17, 16, 12, 14, 14,
+  // Wisdom
+  16, 24, 19, 20, 23, 25, 30, 21, 19, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
+  // Sirach
+  30, 18, 31, 31, 17, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
+  27, 25, 35, 23, 26, 20, 25, 25, 16, 29,
+  30,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 24, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Baruch
+  22, 35, 38, 37, 9, 72,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 100, 34, 30, 29, 28, 27, 27, 21,
+  45, 13, 64, 43,
+  // Hosea
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
+  // Joel
+  20, 27, 5, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  16, 11, 10, 11,
+  // Micah
+  16, 13, 12, 14, 14, 16, 20,
+  // Nahum
+  14, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  17, 17, 10, 16, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 49,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_catholic2.h b/include/canon_catholic2.h
new file mode 100644
index 0000000..e0a5a20
--- /dev/null
+++ b/include/canon_catholic2.h
@@ -0,0 +1,344 @@
+/******************************************************************************
+ *
+ *  canon_catholic2.h -	Versification data for the Catholic2 system
+ *
+ * $Id: canon_catholic2.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2010-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_CATHOLIC2_H
+#define CANON_CATHOLIC2_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Catholic2
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Tob Jdt Esth 1Macc 2Macc Job Ps Prov Eccl Song Wis Sir Isa Jer Lam Bar Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+// This is identical to the Catholic system, except that it employs a 16 chapter version of Esther, rather than 10.
+
+/******************************************************************************
+ * [on]tbooks_catholic - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_catholic2[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Esther", "Esth", "Esth", 16},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Baruch", "Bar", "Bar", 6},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 14},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 4},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 3},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_catholic2[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 66, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 32, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 20, 32, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 54,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
+  // Tobit
+  22, 14, 17, 21, 23, 19, 17, 21, 6, 14,
+  19, 22, 18, 15,
+  // Judith
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 13,
+  12, 6, 18, 19, 19, 24, 
+  // I Maccabees
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 53, 49, 41, 24,
+  // II Maccabees
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 39,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 14, 14, 24, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 24,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  9, 29, 22, 35, 45, 48, 43, 14, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 17, 16, 12, 14, 14,
+  // Wisdom
+  16, 24, 19, 20, 23, 25, 30, 21, 19, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
+  // Sirach
+  30, 18, 31, 31, 17, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
+  27, 25, 35, 23, 26, 20, 25, 25, 16, 29,
+  30,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 24, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Baruch
+  22, 35, 38, 37, 9, 72,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 100, 34, 30, 29, 28, 27, 27, 21,
+  45, 13, 64, 43,
+  // Hosea
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
+  // Joel
+  20, 27, 5, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  16, 11, 10, 11,
+  // Micah
+  16, 13, 12, 14, 14, 16, 20,
+  // Nahum
+  14, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  17, 17, 10, 16, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 49,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_german.h b/include/canon_german.h
new file mode 100644
index 0000000..ef6c835
--- /dev/null
+++ b/include/canon_german.h
@@ -0,0 +1,310 @@
+/******************************************************************************
+ *
+ *  canon_german.h -	Versification data for the German system
+ *
+ * $Id: canon_german.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_GERMAN_H
+#define CANON_GERMAN_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: German
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+/******************************************************************************
+ * [on]tbooks_german - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_german[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 10},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 4},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 3},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_german[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 20, 32, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 54,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 39, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 12, 14, 14,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
+  // Hosea
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
+  // Joel
+  20, 27, 5, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  16, 11, 10, 11,
+  // Micah
+  16, 13, 12, 14, 14, 16, 20,
+  // Nahum
+  14, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 40, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_kjva.h b/include/canon_kjva.h
new file mode 100644
index 0000000..e97dd01
--- /dev/null
+++ b/include/canon_kjva.h
@@ -0,0 +1,366 @@
+/******************************************************************************
+ *
+ *  canon_kjva.h -	Versification data for the KJVA system
+ *
+ * $Id: canon_kjva.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_KJVA_H
+#define CANON_KJVA_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: KJVA
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal 1Esd 2Esd Tob Jdt AddEsth Wis Sir Bar PrAzar Sus Bel PrMan 1Macc 2Macc Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+/******************************************************************************
+ * [on]tbooks_kjva - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_kjva[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 10},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 3},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"II Esdras", "2Esd", "2Esd", 16},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Additions to Esther", "AddEsth", "AddEsth", 16},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Baruch", "Bar", "Bar", 6},
+  {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+  {"Susanna", "Sus", "Sus", 1},
+  {"Bel and the Dragon", "Bel", "Bel", 1},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"", "", "", 0}
+};
+
+// for ntbooks_kjva, use ntbooks
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_kjva[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+  36, 47, 31,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 24,
+  34, 17,
+  // Psalms
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  7, 8, 6, 7, 5, 11, 15, 50, 14, 9,
+  13, 31, 6, 10, 22, 12, 14, 9, 11, 12,
+  24, 11, 22, 22, 28, 12, 40, 22, 13, 17,
+  13, 11, 5, 26, 17, 11, 9, 14, 20, 23,
+  19, 9, 6, 7, 23, 13, 11, 11, 17, 12,
+  8, 12, 11, 10, 13, 20, 7, 35, 36, 5,
+  24, 20, 28, 23, 10, 12, 20, 72, 13, 19,
+  16, 8, 18, 12, 13, 17, 7, 18, 52, 17,
+  16, 15, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 28, 22, 35, 45, 48, 43, 13, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 13,
+  10, 7, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 16, 20, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 13, 13, 14,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 22, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 12, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
+  // Hosea
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
+  // Joel
+  20, 32, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  17, 10, 10, 11,
+  // Micah
+  16, 13, 12, 13, 15, 16, 20,
+  // Nahum
+  15, 13, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 18, 6,
+  // I Esdras
+  58, 30, 24, 63, 73, 34, 15, 96, 55,
+  // II Esdras
+  40, 48, 36, 52, 56, 59, 70, 63, 47, 59,
+  46, 51, 58, 48, 63, 78,
+  // Tobit
+  22, 14, 17, 21, 22, 17, 18, 21, 6, 12,
+  19, 22, 18, 15,
+  // Judith
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 13, 25,
+  // Additions to Esther
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 13,
+  12, 6, 18, 19, 16, 24,
+  // Wisdom
+  16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
+  // Sirach
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 31, 26, 20, 26, 31, 34, 35, 30,
+  24, 25, 33, 22, 26, 20, 25, 25, 16, 29,
+  30,
+  // Baruch
+  22, 35, 37, 37, 9, 73,
+  // Prayer of Azariah
+  68,
+  // Susanna
+  64,
+  // Bel and the Dragon
+  42,
+  // Prayer of Manasses
+  1,
+  // I Maccabees
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24,
+  // II Maccabees
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  14,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 17, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_leningrad.h b/include/canon_leningrad.h
new file mode 100644
index 0000000..edd576b
--- /dev/null
+++ b/include/canon_leningrad.h
@@ -0,0 +1,243 @@
+/******************************************************************************
+ *
+ *  canon_leningrad.h -	Versification data for the Leningrad system
+ *
+ * $Id: canon_leningrad.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_LENINGRAD_H
+#define CANON_LENINGRAD_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Leningrad
+// Book order: Gen Exod Lev Num Deut Josh Judg 1Sam 2Sam 1Kgs 2Kgs Isa Jer Ezek Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal 1Chr 2Chr Ps Job Prov Ruth Song Eccl Lam Esth Dan Ezra Neh
+
+/******************************************************************************
+ * [on]tbooks_leningrad - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_leningrad[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 4},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 3},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Job", "Job", "Job", 42},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Esther", "Esth", "Esth", 10},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"", "", "", 0}
+};
+
+// for ntbooks_mt, use ntbooks_null
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_leningrad[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 20, 32, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 54,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Hosea
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
+  // Joel
+  20, 27, 5, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  16, 11, 10, 11,
+  // Micah
+  16, 13, 12, 14, 14, 16, 20,
+  // Nahum
+  14, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24,
+  // I Chronicles
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ruth
+  22, 23, 18, 22,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 12, 14, 14,
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Daniel
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 38, 17, 19, 19, 72, 18, 37, 40,
+  36, 47, 31
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_luther.h b/include/canon_luther.h
new file mode 100644
index 0000000..f007358
--- /dev/null
+++ b/include/canon_luther.h
@@ -0,0 +1,381 @@
+/******************************************************************************
+ *
+ *  canon_luther.h -	Versification data for the Luther system
+ *
+ * $Id: canon_luther.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_LUTHER_H
+#define CANON_LUTHER_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Luther
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Jdt Wis Tob Sir Bar 1Macc 2Macc AddEsth AddDan PrMan Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm 1Pet 2Pet 1John 2John 3John Heb Jas Jude Rev
+
+/******************************************************************************
+ * [on]tbooks_luther - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_luther[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 10},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 4},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 3},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Baruch", "Bar", "Bar", 6},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"Additions to Esther", "AddEsth", "AddEsth", 7},
+  {"Additions to Daniel", "AddDan", "AddDan", 3},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"", "", "", 0}
+};
+
+struct sbook ntbooks_luther[] = {
+  {"Matthew", "Matt", "Matt", 28},
+  {"Mark", "Mark", "Mark", 16},
+  {"Luke", "Luke", "Luke", 24},
+  {"John", "John", "John", 21},
+  {"Acts", "Acts", "Acts", 28},
+  {"Romans", "Rom", "Rom", 16},
+  {"I Corinthians", "1Cor", "1Cor", 16},
+  {"II Corinthians", "2Cor", "2Cor", 13},
+  {"Galatians", "Gal", "Gal", 6},
+  {"Ephesians", "Eph", "Eph", 6},
+  {"Philippians", "Phil", "Phil", 4},
+  {"Colossians", "Col", "Col", 4},
+  {"I Thessalonians", "1Thess", "1Thess", 5},
+  {"II Thessalonians", "2Thess", "2Thess", 3},
+  {"I Timothy", "1Tim", "1Tim", 6},
+  {"II Timothy", "2Tim", "2Tim", 4},
+  {"Titus", "Titus", "Titus", 3},
+  {"Philemon", "Phlm", "Phlm", 1},
+  {"I Peter", "1Pet", "1Pet", 5},
+  {"II Peter", "2Pet", "2Pet", 3},
+  {"I John", "1John", "1John", 5},
+  {"II John", "2John", "2John", 1},
+  {"III John", "3John", "3John", 1},
+  {"Hebrews", "Heb", "Heb", 13},
+  {"James", "Jas", "Jas", 5},
+  {"Jude", "Jude", "Jude", 1},
+  {"Revelation of John", "Rev", "Rev", 22},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_luther[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 20, 32, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 54,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 39, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 38, 17, 19, 19, 73, 18, 37, 40,
+  36, 47, 31,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 12, 14, 14,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
+  // Hosea
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
+  // Joel
+  20, 27, 5, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  16, 11, 10, 11,
+  // Micah
+  16, 13, 12, 14, 14, 16, 20,
+  // Nahum
+  14, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24,
+  // Judith
+  11, 18, 12, 14, 26, 20, 24, 28, 15, 21,
+  17, 21, 31, 16, 16, 31,
+  // Wisdom
+  16, 25, 19, 20, 24, 27, 30, 21, 19, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 21,
+  // Tobit
+  25, 23, 25, 22, 29, 23, 20, 23, 12, 13,
+  20, 22, 22, 17,
+  // Sirach
+  38, 23, 34, 36, 18, 37, 40, 22, 25, 34,
+  35, 19, 32, 27, 21, 30, 31, 33, 27, 33,
+  31, 33, 37, 47, 34, 28, 33, 30, 35, 27,
+  40, 28, 32, 31, 26, 28, 34, 39, 41, 32,
+  29, 26, 37, 26, 32, 23, 31, 28, 20, 31,
+  38,
+  // Baruch
+  22, 35, 38, 37, 9, 73,
+  // I Maccabees
+  68, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 54, 49, 41, 24,
+  // II Maccabees
+  36, 33, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 40,
+  // Additions to Esther
+  4, 8, 12, 12, 16, 9, 8,
+  // Additions to Daniel
+  64, 41, 66,
+  // Prayer of Manasses
+  16,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 40, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_lxx.h b/include/canon_lxx.h
new file mode 100644
index 0000000..574ea63
--- /dev/null
+++ b/include/canon_lxx.h
@@ -0,0 +1,403 @@
+/******************************************************************************
+ *
+ *  canon_lxx.h -	Versification data for the LXX system
+ *
+ * $Id: canon_lxx.h 2936 2013-08-02 18:00:19Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_LXX_H
+#define CANON_LXX_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: LXX
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Esth Jdt Tob 1Macc 2Macc 3Macc 4Macc Ps PrMan Prov Eccl Song Job Wis Sir PssSol Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek PrAzar Sus Dan Bel 1En Odes Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+// This is a compromise versification system, intended to allow encoding of Bibles using a number of slightly varying LXX-based versification systems. In particular, it was produced in consultation with OTs:
+// Rahlfs', Swete's, Tischendorf's, & Thomson's editions of the LXX
+// the NETS, SAAS (OSB OT), Brenton, & Asser translations
+// R. H. Charles' & James H. Charlesworth's anthologies of Apocrypha & Pseudepigrapha
+// Henry E. J. Howard's Pentateuch and R. R. Ottley's Isaiah translations from the LXX
+
+// In addition to the LXX OT, the GNT has been included in this system to facilitate production of modern Bibles such as the OSB, which are translated from the LXX but include the NT as well. The following NTs were consulted in producing this versification system:
+// Antoniades' Patriarchal GNT and its translation, the EOB
+// the NKJV (OSB NT) & NRSV translations
+
+// All of these Bibles & texts should be accomodated by this versification definition without requiring that any extra verses be appended; as a consequence, no Bible will include every verse of this system.
+
+
+/******************************************************************************
+ * [on]tbooks_lxx - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_lxx[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 16},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Tobit", "Tob", "Tob", 14},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"III Maccabees", "3Macc", "3Macc", 7},
+  {"IV Maccabees", "4Macc", "4Macc", 18},
+  {"Psalms", "Ps", "Ps", 151},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Job", "Job", "Job", 42},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Psalms of Solomon", "PssSol", "PssSol", 18},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Amos", "Amos", "Amos", 9},
+  {"Micah", "Mic", "Mic", 7},
+  {"Joel", "Joel", "Joel", 4},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Baruch", "Bar", "Bar", 5},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+  {"Susanna", "Sus", "Sus", 1},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Bel and the Dragon", "Bel", "Bel", 1},
+  {"I Enoch", "1En", "1En", 108},
+  {"Odes", "Odes", "Odes", 14},
+  {"", "", "", 0}
+};
+
+// for ntbooks_lxx, use ntbooks
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+int vm_lxx[] = {
+  // Genesis
+  31, 25, 25, 26, 32, 23, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 39, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 33, 20, 31, 29, 44, 36, 30, 23, 23,
+  57, 39, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 40, 21, 29, 23, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 40, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 34, 45, 41, 50, 28, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 26, 24, 19, 19, 27, 69, 29, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 16, 27, 26, 35, 33, 43,
+  23, 24, 33, 15, 64, 10, 18, 28, 54, 9,
+  49, 34, 16, 36,
+  // Judges
+  36, 23, 31, 24, 32, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 32, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 43,
+  16, 23, 29, 23, 44, 25, 12, 25, 11, 32,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 26, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 44, 26,
+  22, 51, 41, 25,
+  // I Kings
+  53, 71, 39, 34, 32, 38, 51, 66, 28, 33,
+  44, 54, 34, 31, 34, 42, 24, 46, 21, 43,
+  43, 54,
+  // II Kings
+  22, 25, 27, 44, 27, 35, 20, 29, 37, 36,
+  21, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 41, 81, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 18, 17, 23, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 31, 31,
+  // I Esdras
+  58, 30, 24, 63, 73, 34, 15, 96, 55,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 37, 23, 19, 19, 73, 18, 38, 40,
+  36, 47, 31,
+  // Esther
+  22, 23, 15, 17, 22, 14, 10, 17, 35, 13,
+  17, 7, 30, 19, 24, 24,
+  // Judith
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
+  // Tobit
+  22, 14, 17, 21, 23, 19, 18, 21, 6, 14,
+  19, 22, 19, 15,
+  // I Maccabees
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 54, 49, 41, 24,
+  // II Maccabees
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 39,
+  // III Maccabees
+  29, 33, 30, 21, 51, 41, 23,
+  // IV Maccabees
+  35, 24, 21, 26, 38, 35, 25, 29, 32, 21,
+  27, 20, 27, 20, 32, 25, 24, 24,
+  // Psalms
+  6, 13, 9, 9, 13, 11, 18, 10, 40, 8,
+  9, 6, 7, 6, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 6, 27, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 14, 12, 12, 19, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 7, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+  29, 22, 36, 45, 48, 43, 14, 31, 7, 10,
+  10, 9, 26, 18, 19, 2, 29, 176, 7, 8,
+  9, 4, 8, 5, 7, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 26, 9, 8, 24, 15, 10,
+  8, 12, 15, 22, 10, 11, 20, 14, 9, 6,
+  7,
+  // Prayer of Manasses
+  15,
+  // Proverbs
+  35, 23, 38, 28, 23, 40, 28, 37, 25, 33,
+  31, 31, 27, 36, 38, 33, 30, 24, 29, 30,
+  31, 31, 36, 77, 31, 29, 29, 30, 49, 35,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 17, 20, 12, 30, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 17, 13, 14, 15,
+  // Job
+  22, 18, 26, 21, 27, 30, 22, 22, 35, 22,
+  20, 25, 28, 22, 35, 23, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 34, 24, 41, 35, 32,
+  34, 22,
+  // Wisdom
+  16, 25, 19, 20, 24, 27, 30, 21, 19, 21,
+  27, 27, 19, 31, 19, 29, 21, 25, 22,
+  // Sirach
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 31, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 40,
+  31, 26, 33, 31, 26, 31, 31, 35, 35, 30,
+  27, 27, 33, 24, 26, 20, 25, 25, 16, 29,
+  30,
+  // Psalms of Solomon
+  8, 41, 16, 29, 22, 9, 10, 40, 20, 9,
+  9, 8, 12, 10, 15, 15, 51, 14,
+  // Hosea
+  11, 25, 5, 19, 15, 12, 16, 14, 17, 15,
+  12, 15, 16, 10,
+  // Amos
+  15, 16, 15, 13, 27, 15, 17, 14, 15,
+  // Micah
+  16, 13, 12, 14, 15, 16, 20,
+  // Joel
+  20, 32, 21, 21,
+  // Obadiah
+  21,
+  // Jonah
+  17, 11, 10, 11,
+  // Nahum
+  15, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 21,
+  // Haggai
+  15, 24,
+  // Zechariah
+  21, 17, 11, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24, 6,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 23, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 26, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 20, 12, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 42, 10, 39, 28, 46, 64, 31, 33,
+  47, 44, 24, 22, 19, 32, 24, 40, 44, 26,
+  22, 22, 32, 30, 28, 28, 16, 44, 38, 46,
+  63, 34,
+  // Baruch
+  22, 35, 38, 37, 9,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Epistle of Jeremiah
+  73,
+  // Ezekiel
+  28, 13, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Prayer of Azariah
+  68,
+  // Susanna
+  64,
+  // Daniel
+  21, 49, 100, 37, 31, 29, 28, 27, 27, 21,
+  45, 13,
+  // Bel and the Dragon
+  42,
+  // I Enoch
+  9, 3, 1, 1, 10, 8, 6, 4, 11, 22,
+  2, 6, 10, 25, 12, 4, 8, 16, 3, 8,
+  10, 14, 4, 6, 7, 6, 5, 3, 2, 3,
+  3, 6, 4, 3, 1, 4, 6, 6, 14, 10,
+  9, 3, 4, 1, 6, 8, 4, 10, 4, 5,
+  5, 9, 7, 10, 4, 8, 3, 6, 3, 25,
+  13, 16, 12, 2, 12, 3, 13, 5, 30, 4,
+  17, 37, 8, 17, 9, 14, 9, 17, 6, 8,
+  10, 20, 11, 6, 10, 6, 4, 3, 77, 43,
+  19, 17, 14, 11, 7, 8, 10, 16, 16, 13,
+  9, 11, 15, 13, 2, 19, 3, 15,
+  // Odes
+  19, 43, 10, 20, 20, 19, 45, 88, 79, 88,
+  55, 32, 79, 46,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  52, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 26, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 9, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_mt.h b/include/canon_mt.h
new file mode 100644
index 0000000..306d7c3
--- /dev/null
+++ b/include/canon_mt.h
@@ -0,0 +1,243 @@
+/******************************************************************************
+ *
+ *  canon_mt.h -	Versification data for the Masoretic Text (MT) system
+ *
+ * $Id: canon_mt.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_MT_H
+#define CANON_MT_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: MT
+// Book order: Gen Exod Lev Num Deut Josh Judg 1Sam 2Sam 1Kgs 2Kgs Isa Jer Ezek Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Ps Job Prov Ruth Song Eccl Lam Esth Dan Ezra Neh 1Chr 2Chr
+
+/******************************************************************************
+ * [on]tbooks_mt - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_mt[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 4},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 3},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Job", "Job", "Job", 42},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Esther", "Esth", "Esth", 10},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"", "", "", 0}
+};
+
+// for ntbooks_mt, use ntbooks_null
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_mt[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  54, 33, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 28, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 30, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 23, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 35, 28, 32, 22, 29,
+  35, 41, 30, 25, 19, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 31, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 29, 26, 22, 19, 19, 26, 69, 28, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  16, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 32, 44, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 20, 32, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 54,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  20, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 23, 20, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 11, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 25, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 44,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Hosea
+  9, 25, 5, 19, 15, 11, 16, 14, 17, 15,
+  11, 15, 15, 10,
+  // Joel
+  20, 27, 5, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  16, 11, 10, 11,
+  // Micah
+  16, 13, 12, 14, 14, 16, 20,
+  // Nahum
+  14, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  17, 17, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24,
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 21, 18,
+  7, 9, 6, 7, 5, 11, 15, 51, 15, 10,
+  14, 32, 6, 10, 22, 12, 14, 9, 11, 13,
+  25, 11, 22, 23, 28, 13, 40, 23, 14, 18,
+  14, 12, 5, 27, 18, 12, 10, 15, 21, 23,
+  21, 11, 7, 9, 24, 14, 12, 12, 18, 14,
+  9, 13, 12, 11, 14, 20, 8, 36, 37, 6,
+  24, 20, 28, 23, 11, 13, 21, 72, 13, 20,
+  17, 8, 19, 13, 14, 17, 7, 19, 53, 17,
+  16, 16, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 29, 22, 35, 45, 48, 43, 14, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 14,
+  10, 8, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 32,
+  26, 17,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ruth
+  22, 23, 18, 22,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 12, 14, 14,
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Daniel
+  21, 49, 33, 34, 30, 29, 28, 27, 27, 21,
+  45, 13,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 38, 17, 19, 19, 72, 18, 37, 40,
+  36, 47, 31,
+  // I Chronicles
+  54, 55, 24, 43, 41, 66, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 17, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 14, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_nrsv.h b/include/canon_nrsv.h
new file mode 100644
index 0000000..6959512
--- /dev/null
+++ b/include/canon_nrsv.h
@@ -0,0 +1,271 @@
+/******************************************************************************
+ *
+ *  canon_nrsv.h -	Versification data for the NRSV system
+ *
+ * $Id: canon_nrsv.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_NRSV_H
+#define CANON_NRSV_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: NRSV
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+/******************************************************************************
+ * [on]tbooks_nrsv - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+// for otbooks_nrsv, use otbooks
+
+// for ntbooks_nrsv, use ntbooks
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_nrsv[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+  36, 47, 31,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 24,
+  34, 17,
+  // Psalms
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  7, 8, 6, 7, 5, 11, 15, 50, 14, 9,
+  13, 31, 6, 10, 22, 12, 14, 9, 11, 12,
+  24, 11, 22, 22, 28, 12, 40, 22, 13, 17,
+  13, 11, 5, 26, 17, 11, 9, 14, 20, 23,
+  19, 9, 6, 7, 23, 13, 11, 11, 17, 12,
+  8, 12, 11, 10, 13, 20, 7, 35, 36, 5,
+  24, 20, 28, 23, 10, 12, 20, 72, 13, 19,
+  16, 8, 18, 12, 13, 17, 7, 18, 52, 17,
+  16, 15, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 28, 22, 35, 45, 48, 43, 13, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 13,
+  10, 7, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 16, 20, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 13, 13, 14,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 22, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 12, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
+  // Hosea
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
+  // Joel
+  20, 32, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  17, 10, 10, 11,
+  // Micah
+  16, 13, 12, 13, 15, 16, 20,
+  // Nahum
+  15, 13, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 18, 6,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_nrsva.h b/include/canon_nrsva.h
new file mode 100644
index 0000000..3a4c39a
--- /dev/null
+++ b/include/canon_nrsva.h
@@ -0,0 +1,375 @@
+/******************************************************************************
+ *
+ *  canon_nrsva.h -	Versification data for the NRSVA system
+ *
+ * $Id: canon_nrsva.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_NRSVA_H
+#define CANON_NRSVA_H
+
+SWORD_NAMESPACE_START
+
+// Versification system: NRSVA
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Esth Job Ps Prov Eccl Song Isa Jer Lam Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal Tob Jdt EsthGr Wis Sir Bar PrAzar Sus Bel 1Macc 2Macc 1Esd PrMan AddPs 3Macc 2Esd 4Macc Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+/******************************************************************************
+ * [on]tbooks_nrsva - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_nrsva[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 10},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 3},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Esther (Greek)", "EsthGr", "EsthGr", 16},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Baruch", "Bar", "Bar", 6},
+  {"Prayer of Azariah", "PrAzar", "PrAzar", 1},
+  {"Susanna", "Sus", "Sus", 1},
+  {"Bel and the Dragon", "Bel", "Bel", 1},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"Additional Psalm", "AddPs", "AddPs", 1},
+  {"III Maccabees", "3Macc", "3Macc", 7},
+  {"II Esdras", "2Esd", "2Esd", 16},
+  {"IV Maccabees", "4Macc", "4Macc", 18},
+  {"", "", "", 0}
+};
+
+// for ntbooks_nrsva, use ntbooks
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_nrsva[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  // Leviticus
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 33, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 16,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 15, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 42,
+  15, 23, 29, 22, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+  36, 47, 31,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 30, 24,
+  34, 17,
+  // Psalms
+  6, 12, 8, 8, 12, 10, 17, 9, 20, 18,
+  7, 8, 6, 7, 5, 11, 15, 50, 14, 9,
+  13, 31, 6, 10, 22, 12, 14, 9, 11, 12,
+  24, 11, 22, 22, 28, 12, 40, 22, 13, 17,
+  13, 11, 5, 26, 17, 11, 9, 14, 20, 23,
+  19, 9, 6, 7, 23, 13, 11, 11, 17, 12,
+  8, 12, 11, 10, 13, 20, 7, 35, 36, 5,
+  24, 20, 28, 23, 10, 12, 20, 72, 13, 19,
+  16, 8, 18, 12, 13, 17, 7, 18, 52, 17,
+  16, 15, 5, 23, 11, 13, 12, 9, 9, 5,
+  8, 28, 22, 35, 45, 48, 43, 13, 31, 7,
+  10, 10, 9, 8, 18, 19, 2, 29, 176, 7,
+  8, 9, 4, 8, 5, 6, 5, 6, 8, 8,
+  3, 18, 3, 3, 21, 26, 9, 8, 24, 13,
+  10, 7, 12, 15, 21, 10, 20, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 16, 20, 12, 29, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 16, 13, 13, 14,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 22, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 12, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 30, 37, 31, 28, 28, 27, 27, 21,
+  45, 13,
+  // Hosea
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 16, 9,
+  // Joel
+  20, 32, 21,
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  17, 10, 10, 11,
+  // Micah
+  16, 13, 12, 13, 15, 16, 20,
+  // Nahum
+  15, 13, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  15, 23,
+  // Zechariah
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 18, 6,
+  // Tobit
+  22, 14, 17, 21, 22, 18, 16, 21, 6, 13,
+  18, 22, 17, 15,
+  // Judith
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
+  // Esther (Greek)
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 13,
+  12, 6, 18, 19, 16, 24,
+  // Wisdom
+  16, 24, 19, 20, 23, 25, 30, 21, 18, 21,
+  26, 27, 19, 31, 19, 29, 21, 25, 22,
+  // Sirach
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 30, 31,
+  28, 27, 27, 34, 26, 29, 30, 26, 28, 25,
+  31, 24, 33, 31, 26, 31, 31, 34, 35, 30,
+  22, 25, 33, 23, 26, 20, 25, 25, 16, 29,
+  30,
+  // Baruch
+  22, 35, 37, 37, 9, 73,
+  // Prayer of Azariah
+  68,
+  // Susanna
+  64,
+  // Bel and the Dragon
+  42,
+  // I Maccabees
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24,
+  // II Maccabees
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39,
+  // I Esdras
+  58, 30, 24, 63, 73, 34, 15, 96, 55,
+  // Prayer of Manasses
+  15,
+  // Additional Psalm
+  7,
+  // III Maccabees
+  29, 33, 30, 21, 51, 41, 23,
+  // II Esdras
+  40, 48, 36, 52, 56, 59, 140, 63, 47, 59,
+  46, 51, 58, 48, 63, 78,
+  // IV Maccabees
+  35, 24, 21, 26, 38, 35, 23, 29, 32, 21,
+  27, 19, 27, 20, 32, 25, 24, 24,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_null.h b/include/canon_null.h
new file mode 100644
index 0000000..03c72da
--- /dev/null
+++ b/include/canon_null.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ *  canon_null.h -	Versification data for the null system
+ *
+ * $Id: canon_null.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_NULL_H
+#define CANON_NULL_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: null
+// Book order:
+// This is not a real versification system. Rather, use these [on]tbooks values for other versifications that are missing entire testaments.
+
+/******************************************************************************
+ * [on]tbooks_null - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_null[] = {
+  {"", "", "", 0}
+};
+
+struct sbook ntbooks_null[] = {
+  {"", "", "", 0}
+};
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_orthodox.h b/include/canon_orthodox.h
new file mode 100644
index 0000000..dad23ca
--- /dev/null
+++ b/include/canon_orthodox.h
@@ -0,0 +1,370 @@
+/******************************************************************************
+ *
+ *  canon_orthodox.h -	Versification data for the Orthodox system
+ *
+ * $Id: canon_orthodox.h 2936 2013-08-02 18:00:19Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_ORTHODOX_H
+#define CANON_ORTHODOX_H
+
+SWORD_NAMESPACE_START
+
+
+// Versification system: Orthodox
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr 1Esd Ezra Neh Tob Jdt Esth 1Macc 2Macc 3Macc Ps PrMan Job Prov Eccl Song Wis Sir Hos Amos Mic Joel Obad Jonah Nah Hab Zeph Hag Zech Mal Isa Jer Bar Lam EpJer Ezek Sus Dan Bel 4Macc Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev
+
+// This versification system is based on the LXX versification system, q.v. for more information on the method of its compilation.
+// However, this versification system differs from the LXX system in that the book order follows that seen in modern Orthodox Bibles and books seen in some editions of the LXX but absent from modern Orthodox Bibles have been omitted.
+
+
+/******************************************************************************
+ * [on]tbooks_orthodox - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_orthodox[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Esther", "Esth", "Esth", 16},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"III Maccabees", "3Macc", "3Macc", 7},
+  {"Psalms", "Ps", "Ps", 151},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"Job", "Job", "Job", 42},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Amos", "Amos", "Amos", 9},
+  {"Micah", "Mic", "Mic", 7},
+  {"Joel", "Joel", "Joel", 4},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Baruch", "Bar", "Bar", 5},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Susanna", "Sus", "Sus", 1},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Bel and the Dragon", "Bel", "Bel", 1},
+  {"IV Maccabees", "4Macc", "4Macc", 18},
+  {"", "", "", 0}
+};
+
+// for ntbooks_orthodox, use ntbooks
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+int vm_orthodox[] = {
+  // Genesis
+  31, 25, 25, 26, 32, 23, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 39, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 33, 20, 31, 29, 44, 36, 30, 23, 23,
+  57, 39, 34, 34, 28, 34, 31, 22, 33, 26,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 29, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  37, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 40, 21, 29, 23, 38,
+  // Leviticus
+  17, 16, 17, 35, 26, 40, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 16, 34, 45, 41, 50, 28, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 40, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 19, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 26, 24, 19, 19, 27, 69, 29, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 24, 16, 27, 26, 35, 33, 43,
+  23, 24, 33, 15, 64, 10, 18, 28, 54, 9,
+  49, 34, 16, 36,
+  // Judges
+  36, 23, 31, 24, 32, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 32, 30, 48,
+  25,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 43,
+  16, 23, 29, 23, 44, 25, 12, 25, 11, 32,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 26, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 44, 26,
+  22, 51, 41, 25,
+  // I Kings
+  53, 71, 39, 34, 32, 38, 51, 66, 28, 33,
+  44, 54, 34, 31, 34, 42, 24, 46, 21, 43,
+  43, 54,
+  // II Kings
+  22, 25, 27, 44, 27, 35, 20, 29, 37, 36,
+  21, 22, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 41, 81, 40, 40, 44, 14,
+  47, 41, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  18, 18, 17, 23, 14, 42, 22, 18, 31, 19,
+  23, 16, 23, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 31, 31,
+  // I Esdras
+  58, 30, 24, 63, 73, 34, 15, 96, 55,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 37, 23, 19, 19, 73, 18, 38, 40,
+  36, 47, 31,
+  // Tobit
+  22, 14, 17, 21, 23, 19, 18, 21, 6, 14,
+  19, 22, 19, 15,
+  // Judith
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25,
+  // Esther
+  22, 23, 15, 17, 22, 14, 10, 17, 35, 13,
+  17, 7, 30, 19, 24, 24,
+  // I Maccabees
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 54, 49, 41, 24,
+  // II Maccabees
+  36, 32, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 39,
+  // III Maccabees
+  29, 33, 30, 21, 51, 41, 23,
+  // Psalms
+  6, 13, 9, 9, 13, 11, 18, 10, 40, 8,
+  9, 6, 7, 6, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 6, 27, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 14, 12, 12, 19, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 7, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+  29, 22, 36, 45, 48, 43, 14, 31, 7, 10,
+  10, 9, 26, 18, 19, 2, 29, 176, 7, 8,
+  9, 4, 8, 5, 7, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 26, 9, 8, 24, 15, 10,
+  8, 12, 15, 22, 10, 11, 20, 14, 9, 6,
+  7,
+  // Prayer of Manasses
+  15,
+  // Job
+  22, 18, 26, 21, 27, 30, 22, 22, 35, 22,
+  20, 25, 28, 22, 35, 23, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 34, 24, 41, 35, 32,
+  34, 22,
+  // Proverbs
+  35, 23, 38, 28, 23, 40, 28, 37, 25, 33,
+  31, 31, 27, 36, 38, 33, 30, 24, 29, 30,
+  31, 31, 36, 77, 31, 29, 29, 30, 49, 35,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 17, 20, 12, 30, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  17, 17, 11, 16, 17, 13, 14, 15,
+  // Wisdom
+  16, 25, 19, 20, 24, 27, 30, 21, 19, 21,
+  27, 27, 19, 31, 19, 29, 21, 25, 22,
+  // Sirach
+  30, 18, 31, 31, 15, 37, 36, 19, 18, 31,
+  34, 18, 26, 27, 20, 30, 32, 33, 31, 32,
+  28, 27, 28, 34, 26, 29, 30, 26, 28, 40,
+  31, 26, 33, 31, 26, 31, 31, 35, 35, 30,
+  27, 27, 33, 24, 26, 20, 25, 25, 16, 29,
+  30,
+  // Hosea
+  11, 25, 5, 19, 15, 12, 16, 14, 17, 15,
+  12, 15, 16, 10,
+  // Amos
+  15, 16, 15, 13, 27, 15, 17, 14, 15,
+  // Micah
+  16, 13, 12, 14, 15, 16, 20,
+  // Joel
+  20, 32, 21, 21,
+  // Obadiah
+  21,
+  // Jonah
+  17, 11, 10, 11,
+  // Nahum
+  15, 14, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 21,
+  // Haggai
+  15, 24,
+  // Zechariah
+  21, 17, 11, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 24, 6,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 23, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 26, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 20, 12, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 23, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 42, 10, 39, 28, 46, 64, 31, 33,
+  47, 44, 24, 22, 19, 32, 24, 40, 44, 26,
+  22, 22, 32, 30, 28, 28, 16, 44, 38, 46,
+  63, 34,
+  // Baruch
+  22, 35, 38, 37, 9,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Epistle of Jeremiah
+  73,
+  // Ezekiel
+  28, 13, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  37, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Susanna
+  64,
+  // Daniel
+  21, 49, 100, 37, 31, 29, 28, 27, 27, 21,
+  45, 13,
+  // Bel and the Dragon
+  42,
+  // IV Maccabees
+  35, 24, 21, 26, 38, 35, 25, 29, 32, 21,
+  27, 20, 27, 20, 32, 25, 24, 24,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  52, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 41, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 26, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 14,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 9, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_synodal.h b/include/canon_synodal.h
new file mode 100644
index 0000000..c153d81
--- /dev/null
+++ b/include/canon_synodal.h
@@ -0,0 +1,400 @@
+/******************************************************************************
+ *
+ *  canon_synodal.h -	Versification data for the Synodal system
+ *
+ * $Id: canon_synodal.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_SYNODAL_H
+#define CANON_SYNODAL_H
+
+SWORD_NAMESPACE_START
+
+// Versification system: Synodal
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr PrMan Ezra Neh 1Esd Tob Jdt Esth Job Ps Prov Eccl Song Wis Sir Isa Jer Lam EpJer Bar Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal 1Macc 2Macc 3Macc 2Esd Matt Mark Luke John Acts Jas 1Pet 2Pet 1John 2John 3John Jude Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Rev
+
+// This versification data is based on the Synodal and Slavonic translations from rusbible.ru (of early 2009) and the BFBS Synodal database, as supplied by Konstantin Maslyuk. The three data sets were compared. The two Synodal sets were in agreement on all substantive matters. The Slavonic data set had numerous deviations from the Synodal sets, so all points of disagreement were verified against a printed Synodal translation (from the Judson Press, printed 1900) and demonstrated that the two Synodal data sets were in all cases correct (and also showed that the printed edition itself has some errors in verse numbers). In select instances, printed editions of a Polish translation and an OCS Bible, which employ very similar versifications, were also consulted.
+
+// Some details that may not be immediately obvious:
+// The Prologue to Sirach is neither a separate book nor a separate chapter of Sirach. It should be placed within the introduction of Sirach (Sir.0.0).
+// The Prayer of Manasseh (PrMan) is a separate book, following 2Chr. This is primarily for referencing purposes, but also because PrMan is explicitly NOT the final chapter of 2Chr, though it is often printed as an appendix to that book.
+// The first, second, and third books of Ezra or Esdras (so named according to Slavonic Orthodox tradition)  have the OSIS names Ezra, 1Esd, and 2Esd, respectively. This is due to the strange history of the books of Ezra/Esdras in the eastern & western Churches and the standard naming conventions proscribed by the SBL (which BTG & OSIS follow).
+// The Epistle of Jeremiah and Baruch are two separate books.
+
+/******************************************************************************
+ * [on]tbooks_synodal - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_synodal[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Esther", "Esth", "Esth", 10},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 151},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Epistle of Jeremiah", "EpJer", "EpJer", 1},
+  {"Baruch", "Bar", "Bar", 5},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 14},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 3},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"III Maccabees", "3Macc", "3Macc", 7},
+  {"II Esdras", "2Esd", "2Esd", 16},
+  {"", "", "", 0}
+};
+
+struct sbook ntbooks_synodal[] = {
+  {"Matthew", "Matt", "Matt", 28},
+  {"Mark", "Mark", "Mark", 16},
+  {"Luke", "Luke", "Luke", 24},
+  {"John", "John", "John", 21},
+  {"Acts", "Acts", "Acts", 28},
+  {"James", "Jas", "Jas", 5},
+  {"I Peter", "1Pet", "1Pet", 5},
+  {"II Peter", "2Pet", "2Pet", 3},
+  {"I John", "1John", "1John", 5},
+  {"II John", "2John", "2John", 1},
+  {"III John", "3John", "3John", 1},
+  {"Jude", "Jude", "Jude", 1},
+  {"Romans", "Rom", "Rom", 16},
+  {"I Corinthians", "1Cor", "1Cor", 16},
+  {"II Corinthians", "2Cor", "2Cor", 13},
+  {"Galatians", "Gal", "Gal", 6},
+  {"Ephesians", "Eph", "Eph", 6},
+  {"Philippians", "Phil", "Phil", 4},
+  {"Colossians", "Col", "Col", 4},
+  {"I Thessalonians", "1Thess", "1Thess", 5},
+  {"II Thessalonians", "2Thess", "2Thess", 3},
+  {"I Timothy", "1Tim", "1Tim", 6},
+  {"II Timothy", "2Tim", "2Tim", 4},
+  {"Titus", "Titus", "Titus", 3},
+  {"Philemon", "Phlm", "Phlm", 1},
+  {"Hebrews", "Heb", "Heb", 13},
+  {"Revelation of John", "Rev", "Rev", 22},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_synodal[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  
+  // Exodus
+  22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  
+  // Leviticus
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 56, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34, 
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 15, 34, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13, 
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+  30, 52, 29, 12, 
+  // Joshua
+  18, 24, 17, 24, 16, 26, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 36, 
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25, 
+  // Ruth
+  22, 23, 18, 22, 
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 43,
+  15, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13, 
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+  22, 51, 39, 25, 
+  // I Kings
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53, 
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30, 
+  // I Chronicles
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30, 
+  // II Chronicles
+  17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23, 
+  // Prayer of Manasses
+  12, 
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  
+  // Nehemiah
+  11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+  36, 47, 31, 
+  // I Esdras
+  58, 31, 24, 63, 70, 34, 15, 92, 55, 
+  // Tobit
+  22, 14, 17, 21, 22, 18, 17, 21, 6, 13,
+  18, 22, 18, 15, 
+  // Judith
+  16, 28, 10, 15, 24, 21, 32, 36, 14, 23,
+  23, 20, 20, 19, 14, 25, 
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 35, 27,
+  26, 17, 
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+  9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+  29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
+  10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
+  9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+  7, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+  7, 
+  // Proverbs
+  33, 22, 35, 29, 23, 35, 27, 36, 18, 32,
+  31, 28, 26, 35, 33, 33, 28, 25, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31, 
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14, 
+  // Song of Solomon
+  16, 17, 11, 16, 16, 12, 14, 14, 
+  // Wisdom
+  16, 24, 19, 20, 24, 27, 30, 21, 19, 21,
+  27, 28, 19, 31, 19, 29, 20, 25, 21, 
+  // Sirach
+  30, 18, 31, 35, 18, 37, 39, 22, 23, 34,
+  34, 18, 32, 27, 20, 31, 31, 33, 28, 31,
+  31, 31, 37, 37, 29, 27, 33, 30, 31, 27,
+  37, 25, 33, 26, 23, 29, 34, 39, 42, 32,
+  29, 26, 36, 27, 31, 23, 31, 28, 18, 31,
+  38, 
+  // Isaiah
+  31, 22, 25, 6, 30, 13, 25, 22, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 12, 25, 24, 
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34, 
+  // Lamentations
+  22, 22, 66, 22, 22, 
+  // Epistle of Jeremiah
+  72, 
+  // Baruch
+  22, 35, 38, 37, 9, 
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35, 
+  // Daniel
+  21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
+  45, 13, 64, 42, 
+  // Hosea
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 15, 10, 
+  // Joel
+  20, 32, 21, 
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15, 
+  // Obadiah
+  21, 
+  // Jonah
+  16, 11, 10, 11, 
+  // Micah
+  16, 13, 12, 13, 15, 16, 20, 
+  // Nahum
+  15, 13, 19, 
+  // Habakkuk
+  17, 20, 19, 
+  // Zephaniah
+  18, 15, 20, 
+  // Haggai
+  15, 23, 
+  // Zechariah
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21, 
+  // Malachi
+  14, 17, 18, 6, 
+  // I Maccabees
+  64, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 53, 53, 49, 41, 24, 
+  // II Maccabees
+  36, 33, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 45, 26, 46, 39, 
+  // III Maccabees
+  25, 24, 22, 16, 36, 37, 20, 
+  // II Esdras
+  40, 48, 36, 52, 56, 59, 70, 63, 47, 60,
+  46, 51, 58, 48, 63, 78, 
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20, 
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20, 
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53, 
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25, 
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 40, 38,
+  40, 30, 35, 27, 27, 32, 44, 31, 
+  // James
+  27, 26, 18, 17, 20, 
+  // I Peter
+  25, 25, 22, 19, 14, 
+  // II Peter
+  21, 22, 18, 
+  // I John
+  10, 29, 24, 21, 21, 
+  // II John
+  13, 
+  // III John
+  15, 
+  // Jude
+  25, 
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 26, 33, 24, 
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24, 
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  32, 21, 13, 
+  // Galatians
+  24, 21, 29, 31, 26, 18, 
+  // Ephesians
+  23, 22, 21, 32, 33, 24, 
+  // Philippians
+  30, 30, 21, 23, 
+  // Colossians
+  29, 23, 25, 18, 
+  // I Thessalonians
+  10, 20, 13, 18, 28, 
+  // II Thessalonians
+  12, 17, 18, 
+  // I Timothy
+  20, 15, 16, 16, 25, 21, 
+  // II Timothy
+  18, 26, 17, 22, 
+  // Titus
+  16, 15, 15, 
+  // Philemon
+  25, 
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25, 
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 17, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_synodalprot.h b/include/canon_synodalprot.h
new file mode 100644
index 0000000..07387bd
--- /dev/null
+++ b/include/canon_synodalprot.h
@@ -0,0 +1,316 @@
+/******************************************************************************
+ *
+ *  canon_synodalprot.h -	Versification data for the SynodalProt system
+ *
+ * $Id: canon_synodalprot.h 2930 2013-07-31 12:09:08Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_SYNODALPROT_H
+#define CANON_SYNODALPROT_H
+
+SWORD_NAMESPACE_START
+
+// Versification system: SynodalProt
+// This versification data is based on the synodal system. The only change is the removal of the deuterocanonical passages: PrMan, 1Esd, Tob, Jdt, Wis, Sir, EpJer, Bar, 1Macc, 2Macc, 3Macc, 2Esd, Dan 13-14, Ps 151, Josh 24:34-36, Prov 4:28-29, 13:14, 18:8, and Dan 3:24-90.
+
+/******************************************************************************
+ * [on]tbooks_synodalProt - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_synodalProt[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Esther", "Esth", "Esth", 10},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 12},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 3},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"", "", "", 0}
+};
+
+// for ntbooks_synodalprot, use ntbooks_synodal
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_synodalProt[] = {
+  // Genesis
+  31, 25, 24, 26, 32, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 33, 26,
+  
+  // Exodus
+  22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 38,
+  
+  // Leviticus
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 56, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 46, 34, 
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  35, 15, 34, 45, 41, 50, 13, 32, 22, 29,
+  35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13, 
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+  30, 52, 29, 12, 
+  // Joshua
+  18, 24, 17, 24, 16, 26, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  45, 34, 16, 33, 
+  // Judges
+  36, 23, 31, 24, 31, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  25, 
+  // Ruth
+  22, 23, 18, 22, 
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 43,
+  15, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13, 
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+  22, 51, 39, 25, 
+  // I Kings
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 53, 
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30, 
+  // I Chronicles
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  47, 40, 14, 17, 29, 43, 27, 17, 19, 8,
+  30, 19, 32, 31, 31, 32, 34, 21, 30, 
+  // II Chronicles
+  17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23, 
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+
+  // Nehemiah
+  11, 20, 32, 23, 19, 19, 73, 18, 38, 39,
+  36, 47, 31, 
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 3,
+  
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 22, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 35, 27,
+  26, 17, 
+  // Psalms
+  6, 12, 9, 9, 13, 11, 18, 10, 39, 7,
+  9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 5, 27, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 14, 12, 12, 18, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+  29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
+  10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
+  9, 4, 8, 5, 6, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 26, 9, 8, 24, 14, 10,
+  7, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31, 
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 12, 29, 17, 18, 20,
+  10, 14, 
+  // Song of Solomon
+  16, 17, 11, 16, 16, 12, 14, 14, 
+  // Isaiah
+  31, 22, 25, 6, 30, 13, 25, 22, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 25, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 12, 25, 24, 
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 21, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34, 
+  // Lamentations
+  22, 22, 66, 22, 22, 
+  // Ezekiel
+  28, 10, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35, 
+  // Daniel
+  21, 49, 33, 34, 31, 28, 28, 27, 27, 21,
+  45, 13,
+  // Hosea
+  11, 23, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 15, 10, 
+  // Joel
+  20, 32, 21, 
+  // Amos
+  15, 16, 15, 13, 27, 14, 17, 14, 15, 
+  // Obadiah
+  21, 
+  // Jonah
+  16, 11, 10, 11, 
+  // Micah
+  16, 13, 12, 13, 15, 16, 20, 
+  // Nahum
+  15, 13, 19, 
+  // Habakkuk
+  17, 20, 19, 
+  // Zephaniah
+  18, 15, 20, 
+  // Haggai
+  15, 23, 
+  // Zechariah
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21, 
+  // Malachi
+  14, 17, 18, 6, 
+  
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 27, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20, 
+  // Mark
+  45, 28, 35, 41, 43, 56, 37, 38, 50, 52,
+  33, 44, 37, 72, 47, 20, 
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53, 
+  // John
+  51, 25, 36, 54, 47, 71, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25, 
+  // Acts
+  26, 47, 26, 37, 42, 15, 60, 40, 43, 48,
+  30, 25, 52, 28, 41, 40, 34, 28, 40, 38,
+  40, 30, 35, 27, 27, 32, 44, 31, 
+  // James
+  27, 26, 18, 17, 20, 
+  // I Peter
+  25, 25, 22, 19, 14, 
+  // II Peter
+  21, 22, 18, 
+  // I John
+  10, 29, 24, 21, 21, 
+  // II John
+  13, 
+  // III John
+  15, 
+  // Jude
+  25, 
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 26, 33, 24, 
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24, 
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  32, 21, 13, 
+  // Galatians
+  24, 21, 29, 31, 26, 18, 
+  // Ephesians
+  23, 22, 21, 32, 33, 24, 
+  // Philippians
+  30, 30, 21, 23, 
+  // Colossians
+  29, 23, 25, 18, 
+  // I Thessalonians
+  10, 20, 13, 18, 28, 
+  // II Thessalonians
+  12, 17, 18, 
+  // I Timothy
+  20, 15, 16, 16, 25, 21, 
+  // II Timothy
+  18, 26, 17, 22, 
+  // Titus
+  16, 15, 15, 
+  // Philemon
+  25, 
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25, 
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 17, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21
+};
+
+
+SWORD_NAMESPACE_END
+
+
+#endif
diff --git a/include/canon_vulg.h b/include/canon_vulg.h
new file mode 100644
index 0000000..9fa8e04
--- /dev/null
+++ b/include/canon_vulg.h
@@ -0,0 +1,391 @@
+/******************************************************************************
+ *
+ *  canon_vulg.h -	Versification data for the Vulg system
+ *
+ * $Id: canon_vulg.h 2915 2013-07-23 16:55:54Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ */
+
+#ifndef CANON_VULG_H
+#define CANON_VULG_H
+
+SWORD_NAMESPACE_START
+
+// Versification system: Vulg
+// Book order: Gen Exod Lev Num Deut Josh Judg Ruth 1Sam 2Sam 1Kgs 2Kgs 1Chr 2Chr Ezra Neh Tob Jdt Esth Job Ps Prov Eccl Song Wis Sir Isa Jer Lam Bar Ezek Dan Hos Joel Amos Obad Jonah Mic Nah Hab Zeph Hag Zech Mal 1Macc 2Macc Matt Mark Luke John Acts Rom 1Cor 2Cor Gal Eph Phil Col 1Thess 2Thess 1Tim 2Tim Titus Phlm Heb Jas 1Pet 2Pet 1John 2John 3John Jude Rev PrMan 1Esd 2Esd AddPs EpLao
+
+// Because Bibles employing the Vulgate versification system, including different versions of the Vulgate itself, differ subtly in versification, this is not based on any single edition of the Vulgate, but on myriad editions on the Vulgate and translations of the Vulgate, electronic and print. The intention in creating this versification system was to encompas all of those editions so that none of them would require that verses be appended to verses within the versification system. As such, it is probable that every Bible will contain some empty verses (and most will have empty books). This versification system is explicitly NOT intended for the Nova Vulgata, which uses a quite dissimilar system.
+// The (canonical) prologue of Sirach must be placed within the introduction to that book or to its first chapter (rather than being chapter 1 itself).
+// EpJer should be chapter 6 of Bar, not a separate book.
+// The order of books proceeds as in the Stuttgart Vulgate. The Old Testament (including the proto- and deuterocanonical books) comes first, followed by the New Testament, and the Apocryphal books follow the NT in an appendix.
+
+/******************************************************************************
+ * [on]tbooks_vulg - initialize static instance for all canonical
+ *		 text names and chapmax
+ */
+struct sbook otbooks_vulg[] = {
+  {"Genesis", "Gen", "Gen", 50},
+  {"Exodus", "Exod", "Exod", 40},
+  {"Leviticus", "Lev", "Lev", 27},
+  {"Numbers", "Num", "Num", 36},
+  {"Deuteronomy", "Deut", "Deut", 34},
+  {"Joshua", "Josh", "Josh", 24},
+  {"Judges", "Judg", "Judg", 21},
+  {"Ruth", "Ruth", "Ruth", 4},
+  {"I Samuel", "1Sam", "1Sam", 31},
+  {"II Samuel", "2Sam", "2Sam", 24},
+  {"I Kings", "1Kgs", "1Kgs", 22},
+  {"II Kings", "2Kgs", "2Kgs", 25},
+  {"I Chronicles", "1Chr", "1Chr", 29},
+  {"II Chronicles", "2Chr", "2Chr", 36},
+  {"Ezra", "Ezra", "Ezra", 10},
+  {"Nehemiah", "Neh", "Neh", 13},
+  {"Tobit", "Tob", "Tob", 14},
+  {"Judith", "Jdt", "Jdt", 16},
+  {"Esther", "Esth", "Esth", 16},
+  {"Job", "Job", "Job", 42},
+  {"Psalms", "Ps", "Ps", 150},
+  {"Proverbs", "Prov", "Prov", 31},
+  {"Ecclesiastes", "Eccl", "Eccl", 12},
+  {"Song of Solomon", "Song", "Song", 8},
+  {"Wisdom", "Wis", "Wis", 19},
+  {"Sirach", "Sir", "Sir", 51},
+  {"Isaiah", "Isa", "Isa", 66},
+  {"Jeremiah", "Jer", "Jer", 52},
+  {"Lamentations", "Lam", "Lam", 5},
+  {"Baruch", "Bar", "Bar", 6},
+  {"Ezekiel", "Ezek", "Ezek", 48},
+  {"Daniel", "Dan", "Dan", 14},
+  {"Hosea", "Hos", "Hos", 14},
+  {"Joel", "Joel", "Joel", 3},
+  {"Amos", "Amos", "Amos", 9},
+  {"Obadiah", "Obad", "Obad", 1},
+  {"Jonah", "Jonah", "Jonah", 4},
+  {"Micah", "Mic", "Mic", 7},
+  {"Nahum", "Nah", "Nah", 3},
+  {"Habakkuk", "Hab", "Hab", 3},
+  {"Zephaniah", "Zeph", "Zeph", 3},
+  {"Haggai", "Hag", "Hag", 2},
+  {"Zechariah", "Zech", "Zech", 14},
+  {"Malachi", "Mal", "Mal", 4},
+  {"I Maccabees", "1Macc", "1Macc", 16},
+  {"II Maccabees", "2Macc", "2Macc", 15},
+  {"", "", "", 0}
+};
+
+struct sbook ntbooks_vulg[] = {
+  {"Matthew", "Matt", "Matt", 28},
+  {"Mark", "Mark", "Mark", 16},
+  {"Luke", "Luke", "Luke", 24},
+  {"John", "John", "John", 21},
+  {"Acts", "Acts", "Acts", 28},
+  {"Romans", "Rom", "Rom", 16},
+  {"I Corinthians", "1Cor", "1Cor", 16},
+  {"II Corinthians", "2Cor", "2Cor", 13},
+  {"Galatians", "Gal", "Gal", 6},
+  {"Ephesians", "Eph", "Eph", 6},
+  {"Philippians", "Phil", "Phil", 4},
+  {"Colossians", "Col", "Col", 4},
+  {"I Thessalonians", "1Thess", "1Thess", 5},
+  {"II Thessalonians", "2Thess", "2Thess", 3},
+  {"I Timothy", "1Tim", "1Tim", 6},
+  {"II Timothy", "2Tim", "2Tim", 4},
+  {"Titus", "Titus", "Titus", 3},
+  {"Philemon", "Phlm", "Phlm", 1},
+  {"Hebrews", "Heb", "Heb", 13},
+  {"James", "Jas", "Jas", 5},
+  {"I Peter", "1Pet", "1Pet", 5},
+  {"II Peter", "2Pet", "2Pet", 3},
+  {"I John", "1John", "1John", 5},
+  {"II John", "2John", "2John", 1},
+  {"III John", "3John", "3John", 1},
+  {"Jude", "Jude", "Jude", 1},
+  {"Revelation of John", "Rev", "Rev", 22},
+  {"Prayer of Manasses", "PrMan", "PrMan", 1},
+  {"I Esdras", "1Esd", "1Esd", 9},
+  {"II Esdras", "2Esd", "2Esd", 16},
+  {"Additional Psalm", "AddPs", "AddPs", 1},
+  {"Laodiceans", "EpLao", "EpLao", 1},
+  {"", "", "", 0}
+};
+
+/******************************************************************************
+ *	Maximum verses per chapter
+ */
+
+int vm_vulg[] = {
+  // Genesis
+  31, 25, 24, 26, 31, 22, 24, 22, 29, 32,
+  32, 20, 18, 24, 21, 16, 27, 33, 38, 18,
+  34, 24, 20, 67, 34, 35, 46, 22, 35, 43,
+  55, 32, 20, 31, 29, 43, 36, 30, 23, 23,
+  57, 38, 34, 34, 28, 34, 31, 22, 32, 25,
+  // Exodus
+  22, 25, 22, 31, 23, 30, 25, 32, 35, 29,
+  10, 51, 22, 31, 27, 36, 16, 27, 25, 26,
+  36, 31, 33, 18, 40, 37, 21, 43, 46, 38,
+  18, 35, 23, 35, 35, 38, 29, 31, 43, 36,
+  // Leviticus
+  17, 16, 17, 35, 19, 30, 38, 36, 24, 20,
+  47, 8, 59, 57, 33, 34, 16, 30, 37, 27,
+  24, 33, 44, 23, 55, 45, 34,
+  // Numbers
+  54, 34, 51, 49, 31, 27, 89, 26, 23, 36,
+  34, 15, 34, 45, 41, 50, 13, 32, 22, 30,
+  35, 41, 30, 25, 18, 65, 23, 31, 39, 17,
+  54, 42, 56, 29, 34, 13,
+  // Deuteronomy
+  46, 37, 29, 49, 33, 25, 26, 20, 29, 22,
+  32, 32, 18, 29, 23, 22, 20, 22, 21, 20,
+  23, 30, 25, 22, 19, 19, 26, 68, 29, 20,
+  30, 52, 29, 12,
+  // Joshua
+  18, 24, 17, 25, 16, 27, 26, 35, 27, 43,
+  23, 24, 33, 15, 63, 10, 18, 28, 51, 9,
+  43, 34, 16, 33,
+  // Judges
+  36, 23, 31, 24, 32, 40, 25, 35, 57, 18,
+  40, 15, 25, 20, 20, 31, 13, 31, 30, 48,
+  24,
+  // Ruth
+  22, 23, 18, 22,
+  // I Samuel
+  28, 36, 21, 22, 12, 21, 17, 22, 27, 27,
+  15, 25, 23, 52, 35, 23, 58, 30, 24, 43,
+  15, 23, 28, 23, 44, 25, 12, 25, 11, 31,
+  13,
+  // II Samuel
+  27, 32, 39, 12, 25, 23, 29, 18, 13, 19,
+  27, 31, 39, 33, 37, 23, 29, 33, 43, 26,
+  22, 51, 39, 25,
+  // I Kings
+  53, 46, 28, 34, 18, 38, 51, 66, 28, 29,
+  43, 33, 34, 31, 34, 34, 24, 46, 21, 43,
+  29, 54,
+  // II Kings
+  18, 25, 27, 44, 27, 33, 20, 29, 37, 36,
+  21, 21, 25, 29, 38, 20, 41, 37, 37, 21,
+  26, 20, 37, 20, 30,
+  // I Chronicles
+  54, 55, 24, 43, 26, 81, 40, 40, 44, 14,
+  46, 40, 14, 17, 29, 43, 27, 17, 19, 7,
+  30, 19, 32, 31, 31, 32, 34, 21, 30,
+  // II Chronicles
+  17, 18, 17, 22, 14, 42, 22, 18, 31, 19,
+  23, 16, 22, 15, 19, 14, 19, 34, 11, 37,
+  20, 12, 21, 27, 28, 23, 9, 27, 36, 27,
+  21, 33, 25, 33, 27, 23,
+  // Ezra
+  11, 70, 13, 24, 17, 22, 28, 36, 15, 44,
+  // Nehemiah
+  11, 20, 31, 23, 19, 19, 73, 18, 38, 39,
+  36, 46, 31,
+  // Tobit
+  25, 23, 25, 23, 28, 22, 20, 24, 12, 13,
+  21, 22, 23, 17,
+  // Judith
+  12, 18, 15, 17, 29, 21, 25, 34, 19, 20,
+  21, 20, 31, 18, 15, 31,
+  // Esther
+  22, 23, 15, 17, 14, 14, 10, 17, 32, 13,
+  12, 6, 18, 19, 19, 24,
+  // Job
+  22, 13, 26, 21, 27, 30, 21, 22, 35, 22,
+  20, 25, 28, 22, 35, 23, 16, 21, 29, 29,
+  34, 30, 17, 25, 6, 14, 23, 28, 25, 31,
+  40, 22, 33, 37, 16, 33, 24, 41, 35, 28,
+  25, 16,
+  // Psalms
+  6, 13, 9, 10, 13, 11, 18, 10, 39, 8,
+  9, 6, 7, 5, 11, 15, 51, 15, 10, 14,
+  32, 6, 10, 22, 12, 14, 9, 11, 13, 25,
+  11, 22, 23, 28, 13, 40, 23, 14, 18, 14,
+  12, 6, 26, 18, 12, 10, 15, 21, 23, 21,
+  11, 7, 9, 24, 13, 12, 12, 18, 14, 9,
+  13, 12, 11, 14, 20, 8, 36, 37, 6, 24,
+  20, 28, 23, 11, 13, 21, 72, 13, 20, 17,
+  8, 19, 13, 14, 17, 7, 19, 53, 17, 16,
+  16, 5, 23, 11, 13, 12, 9, 9, 5, 8,
+  29, 22, 35, 45, 48, 43, 14, 31, 7, 10,
+  10, 9, 26, 9, 10, 2, 29, 176, 7, 8,
+  9, 4, 8, 5, 7, 5, 6, 8, 8, 3,
+  18, 3, 3, 21, 27, 9, 8, 24, 14, 10,
+  8, 12, 15, 21, 10, 11, 9, 14, 9, 6,
+  // Proverbs
+  33, 22, 35, 27, 23, 35, 27, 36, 18, 32,
+  31, 28, 25, 35, 33, 33, 28, 24, 29, 30,
+  31, 29, 35, 34, 28, 28, 27, 28, 27, 33,
+  31,
+  // Ecclesiastes
+  18, 26, 22, 17, 19, 11, 30, 17, 18, 20,
+  10, 14,
+  // Song of Solomon
+  16, 17, 11, 16, 17, 12, 13, 14,
+  // Wisdom
+  16, 25, 19, 20, 24, 27, 30, 21, 19, 21,
+  27, 27, 19, 31, 19, 29, 20, 25, 20,
+  // Sirach
+  40, 23, 34, 36, 18, 37, 40, 22, 25, 34,
+  36, 19, 32, 27, 22, 31, 31, 33, 28, 33,
+  31, 33, 38, 47, 36, 28, 33, 30, 35, 27,
+  42, 28, 33, 31, 26, 28, 34, 39, 41, 32,
+  28, 26, 37, 27, 31, 23, 31, 28, 19, 31,
+  38,
+  // Isaiah
+  31, 22, 26, 6, 30, 13, 25, 22, 21, 34,
+  16, 6, 22, 32, 9, 14, 14, 7, 25, 6,
+  17, 25, 18, 23, 12, 21, 13, 29, 24, 33,
+  9, 20, 24, 17, 10, 22, 38, 22, 8, 31,
+  29, 25, 28, 28, 26, 13, 15, 22, 26, 11,
+  23, 15, 12, 17, 13, 12, 21, 14, 21, 22,
+  11, 12, 19, 12, 25, 24,
+  // Jeremiah
+  19, 37, 25, 31, 31, 30, 34, 22, 26, 25,
+  23, 17, 27, 22, 21, 21, 27, 23, 15, 18,
+  14, 30, 40, 10, 38, 24, 22, 17, 32, 24,
+  40, 44, 26, 22, 19, 32, 20, 28, 18, 16,
+  18, 22, 13, 30, 5, 28, 7, 47, 39, 46,
+  64, 34,
+  // Lamentations
+  22, 22, 66, 22, 22,
+  // Baruch
+  22, 35, 38, 37, 9, 72,
+  // Ezekiel
+  28, 9, 27, 17, 17, 14, 27, 18, 11, 22,
+  25, 28, 23, 23, 8, 63, 24, 32, 14, 49,
+  32, 31, 49, 27, 17, 21, 36, 26, 21, 26,
+  18, 32, 33, 31, 15, 38, 28, 23, 29, 49,
+  26, 20, 27, 31, 25, 24, 23, 35,
+  // Daniel
+  21, 49, 100, 34, 31, 28, 28, 27, 27, 21,
+  45, 13, 65, 42,
+  // Hosea
+  11, 24, 5, 19, 15, 11, 16, 14, 17, 15,
+  12, 14, 15, 10,
+  // Joel
+  20, 32, 21,
+  // Amos
+  15, 16, 15, 13, 27, 15, 17, 14, 15,
+  // Obadiah
+  21,
+  // Jonah
+  16, 11, 10, 11,
+  // Micah
+  16, 13, 12, 13, 14, 16, 20,
+  // Nahum
+  15, 13, 19,
+  // Habakkuk
+  17, 20, 19,
+  // Zephaniah
+  18, 15, 20,
+  // Haggai
+  14, 24,
+  // Zechariah
+  21, 13, 10, 14, 11, 15, 14, 23, 17, 12,
+  17, 14, 9, 21,
+  // Malachi
+  14, 17, 18, 6,
+  // I Maccabees
+  67, 70, 60, 61, 68, 63, 50, 32, 73, 89,
+  74, 54, 54, 49, 41, 24,
+  // II Maccabees
+  36, 33, 40, 50, 27, 31, 42, 36, 29, 38,
+  38, 46, 26, 46, 40,
+  // Matthew
+  25, 23, 17, 25, 48, 34, 29, 34, 38, 42,
+  30, 50, 58, 36, 39, 28, 26, 35, 30, 34,
+  46, 46, 39, 51, 46, 75, 66, 20,
+  // Mark
+  45, 28, 35, 40, 43, 56, 37, 39, 49, 52,
+  33, 44, 37, 72, 47, 20,
+  // Luke
+  80, 52, 38, 44, 39, 49, 50, 56, 62, 42,
+  54, 59, 35, 35, 32, 31, 37, 43, 48, 47,
+  38, 71, 56, 53,
+  // John
+  51, 25, 36, 54, 47, 72, 53, 59, 41, 42,
+  57, 50, 38, 31, 27, 33, 26, 40, 42, 31,
+  25,
+  // Acts
+  26, 47, 26, 37, 42, 15, 59, 40, 43, 48,
+  30, 25, 52, 27, 41, 40, 34, 28, 40, 38,
+  40, 30, 35, 27, 27, 32, 44, 31,
+  // Romans
+  32, 29, 31, 25, 21, 23, 25, 39, 33, 21,
+  36, 21, 14, 23, 33, 27,
+  // I Corinthians
+  31, 16, 23, 21, 13, 20, 40, 13, 27, 33,
+  34, 31, 13, 40, 58, 24,
+  // II Corinthians
+  24, 17, 18, 18, 21, 18, 16, 24, 15, 18,
+  33, 21, 13,
+  // Galatians
+  24, 21, 29, 31, 26, 18,
+  // Ephesians
+  23, 22, 21, 32, 33, 24,
+  // Philippians
+  30, 30, 21, 23,
+  // Colossians
+  29, 23, 25, 18,
+  // I Thessalonians
+  10, 20, 13, 18, 28,
+  // II Thessalonians
+  12, 17, 18,
+  // I Timothy
+  20, 15, 16, 16, 25, 21,
+  // II Timothy
+  18, 26, 17, 22,
+  // Titus
+  16, 15, 15,
+  // Philemon
+  25,
+  // Hebrews
+  14, 18, 19, 16, 14, 20, 28, 13, 28, 39,
+  40, 29, 25,
+  // James
+  27, 26, 18, 17, 20,
+  // I Peter
+  25, 25, 22, 19, 14,
+  // II Peter
+  21, 22, 18,
+  // I John
+  10, 29, 24, 21, 21,
+  // II John
+  13,
+  // III John
+  15,
+  // Jude
+  25,
+  // Revelation of John
+  20, 29, 22, 11, 14, 17, 17, 13, 21, 11,
+  19, 18, 18, 20, 8, 21, 18, 24, 21, 15,
+  27, 21,
+  // Prayer of Manasses
+  15,
+  // I Esdras
+  58, 31, 24, 63, 73, 34, 15, 97, 56,
+  // II Esdras
+  40, 48, 36, 52, 56, 59, 140, 63, 47, 60,
+  46, 51, 58, 48, 63, 78,
+  // Additional Psalm
+  7,
+  // Laodiceans
+  20
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/cipherfil.h b/include/cipherfil.h
new file mode 100644
index 0000000..99085ae
--- /dev/null
+++ b/include/cipherfil.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *
+ *  cipherfil.h -	
+ *
+ * $Id: cipherfil.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef CIPHERFIL_H
+#define CIPHERFIL_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+class SWCipher;
+
+class SWDLLEXPORT CipherFilter:public SWFilter {
+	SWCipher *cipher;
+public:
+	CipherFilter(const char *key);
+	virtual ~CipherFilter();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule * = 0);
+	virtual SWCipher *getCipher();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/config.h.in b/include/config.h.in
new file mode 100644
index 0000000..cde8a27
--- /dev/null
+++ b/include/config.h.in
@@ -0,0 +1,83 @@
+/* include/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#undef HAVE_VSNPRINTF
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
diff --git a/include/curlftpt.h b/include/curlftpt.h
new file mode 100644
index 0000000..069208b
--- /dev/null
+++ b/include/curlftpt.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ *  curlftpt.h  -	code for CURL impl of FTP Transport
+ *
+ * $Id: curlftpt.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef CURLFTPT_H
+#define CURLFTPT_H
+
+#include <defs.h>
+#include <remotetrans.h>
+
+SWORD_NAMESPACE_START
+
+class CURL;
+
+
+class SWDLLEXPORT CURLFTPTransport : public RemoteTransport {
+	CURL *session;
+
+public:
+	CURLFTPTransport(const char *host, StatusReporter *statusReporter = 0);
+	~CURLFTPTransport();
+	
+	virtual char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0);
+};
+
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/curlhttpt.h b/include/curlhttpt.h
new file mode 100644
index 0000000..8079583
--- /dev/null
+++ b/include/curlhttpt.h
@@ -0,0 +1,48 @@
+/******************************************************************************
+ *
+ *  curlhttpt.h  -	code for CURL impl of HTTP Transport
+ *
+ * $Id: curlhttpt.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef CURLHTTPT_H
+#define CURLHTTPT_H
+
+#include <defs.h>
+#include <remotetrans.h>
+
+SWORD_NAMESPACE_START
+
+class CURL;
+
+
+class SWDLLEXPORT CURLHTTPTransport : public RemoteTransport {
+	CURL *session;
+
+public:
+	CURLHTTPTransport(const char *host, StatusReporter *statusReporter = 0);
+	~CURLHTTPTransport();
+
+	virtual std::vector<struct DirEntry> getDirList(const char *dirURL);
+	virtual char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0);
+};
+
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/defs.h b/include/defs.h
new file mode 100644
index 0000000..fd1ebf5
--- /dev/null
+++ b/include/defs.h
@@ -0,0 +1,163 @@
+/******************************************************************************
+ *
+ *  defs.h -	Global defines, mostly platform-specific stuff
+ *
+ * $Id: defs.h 2942 2013-08-03 08:39:02Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
+#ifndef SWORDDEFS_H
+#define SWORDDEFS_H
+
+#ifdef NO_SWORD_NAMESPACE
+ #define SWORD_NAMESPACE_START namespace sword {
+ #define SWORD_NAMESPACE_END }; using namespace sword;
+#else
+ #define SWORD_NAMESPACE_START namespace sword {
+ #define SWORD_NAMESPACE_END }
+#endif
+
+SWORD_NAMESPACE_START
+
+#define SWTRY try
+#define SWCATCH(x) catch (x)
+
+#ifdef _WIN32_WCE
+#define SWTRY
+#define SWCATCH(x) if (0)
+#define GLOBCONFPATH "/Program Files/sword/sword.conf"
+#endif
+
+#ifdef ANDROID
+#define _NO_IOSTREAM_
+#undef SWTRY
+#undef SWCATCH
+#define SWTRY
+#define SWCATCH(x) if (0)
+#endif
+
+// _declspec works in BC++ 5 and later, as well as VC++
+#if defined(_MSC_VER)
+
+#  ifdef SWMAKINGDLL
+#    define SWDLLEXPORT _declspec( dllexport )
+#    define SWDLLEXPORT_DATA(type) _declspec( dllexport ) type
+#    define SWDLLEXPORT_CTORFN
+#  elif defined(SWUSINGDLL)
+#    define SWDLLEXPORT _declspec( dllimport )
+#    define SWDLLEXPORT_DATA(type) _declspec( dllimport ) type
+#    define SWDLLEXPORT_CTORFN
+#  else
+#    define SWDLLEXPORT
+#    define SWDLLEXPORT_DATA(type) type
+#    define SWDLLEXPORT_CTORFN
+#  endif
+
+#  define SWDEPRECATED __declspec(deprecated("** WARNING: deprecated method **"))
+
+
+#elif defined(__SWPM__)
+
+#  ifdef SWMAKINGDLL
+#    define SWDLLEXPORT _Export
+#    define SWDLLEXPORT_DATA(type) _Export type
+#    define SWDLLEXPORT_CTORFN
+#  elif defined(SWUSINGDLL)
+#    define SWDLLEXPORT _Export
+#    define SWDLLEXPORT_DATA(type) _Export type
+#    define SWDLLEXPORT_CTORFN
+#  else
+#    define SWDLLEXPORT
+#    define SWDLLEXPORT_DATA(type) type
+#    define SWDLLEXPORT_CTORFN
+#  endif
+
+#  define SWDEPRECATED 
+
+
+#elif defined(__GNUWIN32__)
+
+#  ifdef SWMAKINGDLL
+#    define SWDLLEXPORT __declspec( dllexport )
+#    define SWDLLEXPORT_DATA(type) __declspec( dllexport ) type
+#    define SWDLLEXPORT_CTORFN
+#  elif defined(SWUSINGDLL)
+#    define SWDLLEXPORT __declspec( dllimport )
+#    define SWDLLEXPORT_DATA(type) __declspec( dllimport ) type
+#    define SWDLLEXPORT_CTORFN
+#  else
+#    define SWDLLEXPORT
+#    define SWDLLEXPORT_DATA(type) type
+#    define SWDLLEXPORT_CTORFN
+#  endif
+
+#  define SWDEPRECATED  __attribute__((__deprecated__))
+
+
+#elif defined(__BORLANDC__)
+#  ifdef SWMAKINGDLL
+#    define SWDLLEXPORT _export
+#    define SWDLLEXPORT_DATA(type) __declspec( dllexport ) type
+#    define SWDLLEXPORT_CTORFN
+#  elif defined(SWUSINGDLL)
+#    define SWDLLEXPORT __declspec( dllimport )
+#    define SWDLLEXPORT_DATA(type) __declspec( dllimport ) type
+#    define SWDLLEXPORT_CTORFN
+#  else
+#    define SWDLLEXPORT
+#    define SWDLLEXPORT_DATA(type) type
+#    define SWDLLEXPORT_CTORFN
+#  endif
+
+#define COMMENT SLASH(/)
+#define SLASH(s) /##s
+#  define SWDEPRECATED COMMENT
+
+
+#elif defined(__GNUC__)
+#  define SWDLLEXPORT
+#  define SWDLLEXPORT_DATA(type) type
+#  define SWDLLEXPORT_CTORFN
+#  define SWDEPRECATED  __attribute__((__deprecated__))
+
+
+#else
+#  define SWDLLEXPORT
+#  define SWDLLEXPORT_DATA(type) type
+#  define SWDLLEXPORT_CTORFN
+#  define SWDEPRECATED
+#endif
+
+
+// For ostream, istream ofstream
+#if defined(__BORLANDC__) && defined( _RTLDLL )
+#  define SWDLLIMPORT __import
+#else
+#  define SWDLLIMPORT
+#endif
+
+
+
+enum {DIRECTION_LTR = 0, DIRECTION_RTL, DIRECTION_BIDI};
+enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI, FMT_XHTML};
+enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_SCSU, ENC_UTF16, ENC_RTF, ENC_HTML};
+enum {BIB_BIBTEX = 0, /* possible future formats: BIB_MARCXML, BIB_MARC21, BIB_DCMI BIB_OSISHEADER, BIB_SBL_XHTML, BIB_MLA_XHTML, BIB_APA_XHTML, BIB_CHICAGO_XHTML */};
+
+SWORD_NAMESPACE_END
+#endif //SWORDDEFS_H
diff --git a/include/echomod.h b/include/echomod.h
new file mode 100644
index 0000000..978a3eb
--- /dev/null
+++ b/include/echomod.h
@@ -0,0 +1,42 @@
+/******************************************************************************
+ *
+ *  echomod.h -	code for class 'EchoMod' - a test module that just echo back
+ *		text of key.
+ *
+ * $Id: echomod.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ECHOMOD_H
+#define ECHOMOD_H
+
+#include <swtext.h>
+#include <defs.h>
+
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT EchoMod : public SWText
+{
+public:
+	EchoMod();
+	virtual ~EchoMod();
+	virtual SWBuf &getRawEntryBuf() const;
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/encfiltmgr.h b/include/encfiltmgr.h
new file mode 100644
index 0000000..bf62756
--- /dev/null
+++ b/include/encfiltmgr.h
@@ -0,0 +1,89 @@
+/******************************************************************************
+ *
+ *  encfiltmgr.h -	definition of class SWEncodingMgr, subclass of
+ *			used to transcode all module text to a requested
+ *			markup
+ *
+ * $Id: encfiltmgr.h 2846 2013-06-29 14:48:47Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ENCFILTERMGR_H
+#define ENCFILTERMGR_H
+
+#include <swfiltermgr.h>
+
+SWORD_NAMESPACE_START
+
+class SWFilter;
+
+/** This class is like a normal SWMgr,
+  * but you can additonally specify which encoding
+  * you want to use.
+  */
+
+class SWDLLEXPORT EncodingFilterMgr : public SWFilterMgr {
+
+protected:
+        SWFilter *latin1utf8;
+	SWFilter *scsuutf8;
+        SWFilter *targetenc;
+
+
+	/*
+	 * current encoding value
+	 */        
+        char encoding;
+
+public:
+
+
+	/** Constructor of SWEncodingMgr.
+	 *
+	 * @param encoding The desired encoding.
+	 */
+        EncodingFilterMgr (char encoding = ENC_UTF8);
+
+	/**
+	 * The destructor of SWEncodingMgr.
+	 */
+        ~EncodingFilterMgr();
+
+	/** Markup sets/gets the encoding after initialization
+	 * 
+	 * @param enc The new encoding or ENC_UNKNOWN if you just want to get the current markup.
+	 * @return The current (possibly changed) encoding format.
+	 */
+        char Encoding(char enc);
+
+	/**
+	 * Adds the raw filters which are defined in "section" to the SWModule object "module".
+	 * @param module To this module the raw filter(s) are added
+	 * @param section We use this section to get a list of filters we should apply to the module
+	 */
+        virtual void AddRawFilters(SWModule *module, ConfigEntMap &section);
+
+	/**
+	 * Adds the encoding filters which are defined in "section" to the SWModule object "module".
+	 * @param module To this module the encoding filter(s) are added
+	 * @param section We use this section to get a list of filters we should apply to the module
+	 */
+        virtual void AddEncodingFilters(SWModule *module, ConfigEntMap &section);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/entriesblk.h b/include/entriesblk.h
new file mode 100644
index 0000000..6ef7a1e
--- /dev/null
+++ b/include/entriesblk.h
@@ -0,0 +1,56 @@
+/******************************************************************************
+ *
+ *  entriesblk.h -	Implementation of EntriesBlock
+ *
+ * $Id: entriesblk.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ENTRIESBLK_H
+#define ENTRIESBLK_H
+
+#include <sysdata.h>
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT EntriesBlock {
+	static const int METAHEADERSIZE;
+	static const int METAENTRYSIZE;
+
+private:
+	char *block;
+	void setCount(int count);
+	void getMetaEntry(int index, unsigned long *offset, unsigned long *size);
+	void setMetaEntry(int index, unsigned long offset, unsigned long size);
+
+public:
+	EntriesBlock(const char *iBlock, unsigned long size);
+	EntriesBlock();
+	~EntriesBlock();
+
+	int getCount();
+	int addEntry(const char *entry);
+	const char *getEntry(int entryIndex);
+	unsigned long getEntrySize(int entryIndex);
+	void removeEntry(int entryIndex);
+	const char *getRawData(unsigned long *size);
+};
+
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/femain.h b/include/femain.h
new file mode 100644
index 0000000..3eec2c6
--- /dev/null
+++ b/include/femain.h
@@ -0,0 +1,34 @@
+/******************************************************************************
+ *
+ *  femain.h -	Implementation of FEMain
+ *
+ * $Id: femain.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef FEMAIN_H
+#define FEMAIN_H
+
+class FEMain
+{
+public:
+  FEMain ();
+  virtual ~FEMain ();
+  list < SWDisplay * >displays;	// so we can delete each display we create
+};
+
+#endif
diff --git a/include/filemgr.h b/include/filemgr.h
new file mode 100644
index 0000000..eedfbcc
--- /dev/null
+++ b/include/filemgr.h
@@ -0,0 +1,191 @@
+/******************************************************************************
+ *
+ *  filemgr.h -	definition of class FileMgr used for pooling file handles
+ *
+ * $Id: filemgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef FILEMGR_H
+#define FILEMGR_H
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <defs.h>
+#include <swcacher.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT FileMgr;
+
+struct SWDLLEXPORT DirEntry {
+public:
+	SWBuf name;
+	unsigned long size;
+	bool isDirectory;
+};
+/**
+* This class represents one file. It works with the FileMgr object.
+*/
+class SWDLLEXPORT FileDesc {
+
+	friend class FileMgr;
+
+	long offset;
+	int fd;			// -77 closed;
+	FileMgr *parent;
+	FileDesc *next;
+
+	FileDesc(FileMgr * parent, const char *path, int mode, int perms, bool tryDowngrade);
+	virtual ~FileDesc();
+
+public:
+	/** @return File handle.
+	*/
+	int getFd();
+
+	long seek(long offset, int whence);
+	long read(void *buf, long count);
+	long write(const void *buf, long count);
+
+	/** Path to file.
+	*/
+	char *path;
+	/** File access mode.
+	*/
+	int mode;
+	/** File permissions.
+	*/
+	int perms;
+	/**
+	*/
+	bool tryDowngrade;
+};
+
+/**
+*	This class ist used make file access operations easier.
+* It keeps a list of all open files internally and closes them
+* when the destructor is called.
+*/
+class SWDLLEXPORT FileMgr : public SWCacher {
+
+	friend class FileDesc;
+	friend class __staticsystemFileMgr;
+
+	FileDesc *files;
+	int sysOpen(FileDesc * file);
+protected:
+	static FileMgr *systemFileMgr;
+public:
+	static int CREAT;
+	static int APPEND;
+	static int TRUNC;
+	static int RDONLY;
+	static int RDWR;
+	static int WRONLY;
+	static int IREAD;
+	static int IWRITE;
+
+	/** Maximum number of open files set in the constructor.
+	* determines the max number of real system files that
+	* filemgr will open.  Adjust for tuning.
+	*/
+	int maxFiles;
+	
+	static FileMgr *getSystemFileMgr();
+	static void setSystemFileMgr(FileMgr *newFileMgr);
+
+	/** Constructor.
+	* @param maxFiles The number of files that this FileMgr may open in parallel, if necessary.
+	*/
+	FileMgr(int maxFiles = 35);
+
+	/**
+	* Destructor. Clean things up. Will close all files opened by this FileMgr object.
+	*/
+	~FileMgr();
+
+	/** Open a file and return a FileDesc for it.
+	* The file itself will only be opened when FileDesc::getFd() is called.
+	* @param path Filename.
+	* @param mode File access mode.
+	* @param tryDowngrade
+	* @return FileDesc object for the requested file.
+	*/
+	FileDesc *open(const char *path, int mode, bool tryDowngrade);
+
+	/** Open a file and return a FileDesc for it.
+	* The file itself will only be opened when FileDesc::getFd() is called.
+	* @param path Filename.
+	* @param mode File access mode.
+	* @param perms Permissions.
+	* @param tryDowngrade
+	* @return FileDesc object for the requested file.
+	*/
+	FileDesc *open(const char *path, int mode, int perms = IREAD | IWRITE, bool tryDowngrade = false);
+
+	/** Close a given file and delete its FileDesc object.
+	* Will only close the file if it was created by this FileMgr object.
+	* @param file The file to close.
+	*/
+	void close(FileDesc *file);
+
+	/** Cacher methods overridden
+	 */
+	virtual void flush();
+	virtual long resourceConsumption();
+
+	/** Checks for the existence of a file.
+	* @param ipath Path to file.
+	* @param ifileName Name of file to check for.
+	*/
+	static signed char existsFile(const char *ipath, const char *ifileName = 0);
+
+	/** Checks for the existence of a directory.
+	* @param ipath Path to directory.
+	* @param idirName Name of directory to check for.
+	*/
+	static signed char existsDir(const char *ipath, const char *idirName = 0);
+
+	/** Truncate a file at its current position
+	* leaving byte at current possition intact deleting everything afterward.
+	* @param file The file to operate on.
+	*/
+	signed char trunc(FileDesc *file);
+
+	static char isDirectory(const char *path);
+	static int createParent(const char *pName);
+	static int createPathAndFile(const char *fName);
+
+	/** attempts to open a file readonly
+	 * @param fName filename to open
+	 * @return fd; < 0 = error
+	 */
+	static int openFileReadOnly(const char *fName);
+	static int copyFile(const char *srcFile, const char *destFile);
+	static int copyDir(const char *srcDir, const char *destDir);
+	static int removeDir(const char *targetDir);
+	static int removeFile(const char *fName);
+	static char getLine(FileDesc *fDesc, SWBuf &line);
+
+};
+
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/flatapi.h b/include/flatapi.h
new file mode 100644
index 0000000..4c59ba6
--- /dev/null
+++ b/include/flatapi.h
@@ -0,0 +1,106 @@
+/******************************************************************************
+ *
+ *  flatapi.h -	This file contains an api usable by non-C++ environments
+ *
+ * $Id: flatapi.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWORDAPI_H
+#define SWORDAPI_H
+
+#include <defs.h>
+#include <inttypes.h>
+#ifdef __cplusplus
+#endif
+
+extern "C" {
+
+#define SWHANDLE intptr_t
+
+
+//-----------------------------------------------------------------
+// stringlist_iterator methods
+
+void SWDLLEXPORT stringlist_iterator_next(SWHANDLE hsli);
+const char * SWDLLEXPORT stringlist_iterator_val(SWHANDLE hsli);
+
+//-----------------------------------------------------------------
+// listkey_iterator methods
+
+void SWDLLEXPORT listkey_iterator_next(SWHANDLE lki);
+const char * SWDLLEXPORT listkey_iterator_val(SWHANDLE hsli);
+	
+//-----------------------------------------------------------------
+// modmap methods
+//
+void SWDLLEXPORT ModList_iterator_next(SWHANDLE hmmi);
+SWHANDLE SWDLLEXPORT ModList_iterator_val(SWHANDLE hmmi);
+
+
+//-----------------------------------------------------------------
+// SWMgr methods
+//
+SWHANDLE SWDLLEXPORT SWMgr_new(char filterType);
+// SWConfig *, SWConfig *, bool, SWFilterMgr *
+SWHANDLE SWDLLEXPORT SWMgr_newEx(SWHANDLE hiconfig, SWHANDLE hisysconfig, char autoload, SWHANDLE hfilterMgr);
+void     SWDLLEXPORT SWMgr_delete(SWHANDLE hmgr);
+SWHANDLE SWDLLEXPORT SWMgr_getConfig(SWHANDLE hmgr);
+SWHANDLE SWDLLEXPORT SWMgr_getModulesIterator(SWHANDLE hmgr);
+SWHANDLE SWDLLEXPORT SWMgr_getModuleByName(SWHANDLE hmgr, const char *name);
+const char *   SWDLLEXPORT SWMgr_getPrefixPath(SWHANDLE hmgr);
+const char *   SWDLLEXPORT SWMgr_getConfigPath(SWHANDLE hmgr);
+void     SWDLLEXPORT SWMgr_setGlobalOption(SWHANDLE hmgr, const char *option, const char *value);
+const char *   SWDLLEXPORT SWMgr_getGlobalOption(SWHANDLE hmgr, const char *option);
+const char *   SWDLLEXPORT SWMgr_getGlobalOptionTip(SWHANDLE hmgr, const char *option);
+// ret: forward_iterator
+SWHANDLE SWDLLEXPORT SWMgr_getGlobalOptionsIterator(SWHANDLE hmgr);
+// ret: forward_iterator
+SWHANDLE SWDLLEXPORT SWMgr_getGlobalOptionValuesIterator(SWHANDLE hmgr, const char *option);
+void     SWDLLEXPORT SWMgr_setCipherKey(SWHANDLE hmgr, const char *modName, const char *key);
+
+
+//-----------------------------------------------------------------
+// SWModule methods
+
+void  SWDLLEXPORT SWModule_terminateSearch(SWHANDLE hmodule);
+SWHANDLE SWDLLEXPORT SWModule_doSearch(SWHANDLE hmodule, const char *searchString, int type, int params,  void (*percent) (char, void *), void *percentUserData);
+char  SWDLLEXPORT SWModule_error(SWHANDLE hmodule);
+int   SWDLLEXPORT SWModule_getEntrySize(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_setKeyText(SWHANDLE hmodule, const char *key);
+const char * SWDLLEXPORT SWModule_getKeyText(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getName(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getDescription(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getType(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_previous(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_next(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_begin(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getStripText(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getRenderText(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getEntryAttributes(SWHANDLE hmodule, const char *level1, const char *level2, const char *level3);
+const char * SWDLLEXPORT SWModule_getPreverseHeader(SWHANDLE hmodule, const char *key, int pvHeading);
+const char * SWDLLEXPORT SWModule_getFootnoteType(SWHANDLE hmodule, const char *key, const char *note);
+const char * SWDLLEXPORT SWModule_getFootnoteBody(SWHANDLE hmodule, const char *key, const char *note);
+const char * SWDLLEXPORT SWModule_getFootnoteRefList(SWHANDLE hmodule, const char *key, const char *note);
+
+SWHANDLE SWDLLEXPORT listkey_getVerselistIterator(const char *list, const char *key, const char *v11n = "KJV");
+
+}
+#ifdef __cplusplus
+#endif
+
+#endif
diff --git a/include/ftplib.h b/include/ftplib.h
new file mode 100644
index 0000000..8eb722f
--- /dev/null
+++ b/include/ftplib.h
@@ -0,0 +1,131 @@
+/***************************************************************************/
+/* ftplib.h - header file for callable ftp access routines                 */
+/* Copyright (C) 1996, 1997 Thomas Pfau, pfau@cnj.digex.net                */
+/*  73 Catherine Street, South Bound Brook, NJ, 08880                      */
+/*                                                                         */
+/* This library is free software; you can redistribute it and/or           */
+/* modify it under the terms of the GNU Library 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       */
+/* Library General Public License for more details.                        */
+/*                                                                         */
+/* You should have received a copy of the GNU Library General Public       */
+/* License along with this progam; if not, write to the                    */
+/* Free Software Foundation, Inc., 59 Temple Place - Suite 330,            */
+/* Boston, MA 02111-1307, USA.                                             */
+/*                                                                         */
+/***************************************************************************/
+
+#if !defined(__FTPLIB_H)
+#define __FTPLIB_H
+
+#ifndef _FTPLIB_NO_COMPAT
+#define _FTPLIB_NO_COMPAT
+#endif
+
+
+#if defined(__unix__) || defined(VMS)
+#define GLOBALDEF
+#define GLOBALREF extern
+#elif defined(_WIN32)
+#if defined BUILDING_LIBRARY
+#define GLOBALDEF __declspec(dllexport)
+#define GLOBALREF __declspec(dllexport)
+#else
+#define GLOBALREF __declspec(dllimport)
+#endif
+#endif
+
+/* FtpAccess() type codes */
+#define FTPLIB_DIR 1
+#define FTPLIB_DIR_VERBOSE 2
+#define FTPLIB_FILE_READ 3
+#define FTPLIB_FILE_WRITE 4
+
+/* FtpAccess() mode codes */
+#define FTPLIB_ASCII 'A'
+#define FTPLIB_IMAGE 'I'
+#define FTPLIB_TEXT FTPLIB_ASCII
+#define FTPLIB_BINARY FTPLIB_IMAGE
+
+/* connection modes */
+#define FTPLIB_PASSIVE 1
+#define FTPLIB_PORT 2
+/* connection option names */
+#define FTPLIB_CONNMODE 1
+#define FTPLIB_CALLBACK 2
+#define FTPLIB_IDLETIME 3
+#define FTPLIB_CALLBACKARG 4
+#define FTPLIB_CALLBACKBYTES 5
+#define FTPLIB_CALLBACK_WRITER 6
+#define FTPLIB_CALLBACK_WRITERARG 7
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct NetBuf netbuf;
+typedef int (*FtpCallback)(netbuf *nControl, int xfered, void *arg);
+typedef int (*FtpCallbackWriter)(netbuf *nControl, const void *buffer, size_t size, void *arg);
+
+/* v1 compatibility stuff */
+#if !defined(_FTPLIB_NO_COMPAT)
+netbuf *DefaultNetbuf;
+
+#define ftplib_lastresp FtpLastResponse(DefaultNetbuf)
+#define ftpInit FtpInit
+#define ftpOpen(x) FtpConnect(x, &DefaultNetbuf)
+#define ftpLogin(x,y) FtpLogin(x, y, DefaultNetbuf)
+#define ftpSite(x) FtpSite(x, DefaultNetbuf)
+#define ftpMkdir(x) FtpMkdir(x, DefaultNetbuf)
+#define ftpChdir(x) FtpChdir(x, DefaultNetbuf)
+#define ftpRmdir(x) FtpRmdir(x, DefaultNetbuf)
+#define ftpNlst(x, y) FtpNlst(x, y, DefaultNetbuf)
+#define ftpDir(x, y) FtpDir(x, y, DefaultNetbuf)
+#define ftpGet(x, y, z) FtpGet(x, y, z, DefaultNetbuf)
+#define ftpPut(x, y, z) FtpPut(x, y, z, DefaultNetbuf)
+#define ftpRename(x, y) FtpRename(x, y, DefaultNetbuf)
+#define ftpDelete(x) FtpDelete(x, DefaultNetbuf)
+#define ftpQuit() FtpQuit(DefaultNetbuf)
+#endif /* (_FTPLIB_NO_COMPAT) */
+/* end v1 compatibility stuff */
+
+GLOBALREF int ftplib_debug;
+GLOBALREF void FtpInit(void);
+GLOBALREF char *FtpLastResponse(netbuf *nControl);
+GLOBALREF int FtpConnect(const char *host, netbuf **nControl);
+GLOBALREF int FtpOptions(int opt, long val, netbuf *nControl);
+GLOBALREF int FtpLogin(const char *user, const char *pass, netbuf *nControl);
+GLOBALREF int FtpAccess(const char *path, int typ, int mode, netbuf *nControl,
+    netbuf **nData);
+GLOBALREF int FtpRead(void *buf, int max, netbuf *nData);
+GLOBALREF int FtpWrite(void *buf, int len, netbuf *nData);
+GLOBALREF int FtpClose(netbuf *nData);
+GLOBALREF int FtpSite(const char *cmd, netbuf *nControl);
+GLOBALREF int FtpSysType(char *buf, int max, netbuf *nControl);
+GLOBALREF int FtpMkdir(const char *path, netbuf *nControl);
+GLOBALREF int FtpChdir(const char *path, netbuf *nControl);
+GLOBALREF int FtpCDUp(netbuf *nControl);
+GLOBALREF int FtpRmdir(const char *path, netbuf *nControl);
+GLOBALREF int FtpPwd(char *path, int max, netbuf *nControl);
+GLOBALREF int FtpNlst(const char *output, const char *path, netbuf *nControl);
+GLOBALREF int FtpDir(const char *output, const char *path, netbuf *nControl);
+GLOBALREF int FtpSize(const char *path, int *size, char mode, netbuf *nControl);
+GLOBALREF int FtpModDate(const char *path, char *dt, int max, netbuf *nControl);
+GLOBALREF int FtpGet(const char *output, const char *path, char mode,
+  netbuf *nControl);
+GLOBALREF int FtpPut(const char *input, const char *path, char mode,
+  netbuf *nControl);
+GLOBALREF int FtpRename(const char *src, const char *dst, netbuf *nControl);
+GLOBALREF int FtpDelete(const char *fnm, netbuf *nControl);
+GLOBALREF void FtpQuit(netbuf *nControl);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* __FTPLIB_H */
diff --git a/include/ftplibftpt.h b/include/ftplibftpt.h
new file mode 100644
index 0000000..135cd83
--- /dev/null
+++ b/include/ftplibftpt.h
@@ -0,0 +1,49 @@
+/******************************************************************************
+ *
+ *  ftplibftpt.h -	code for ftplib impl of FTP Transport
+ *			(FTPLibFTPTransport)
+ *
+ * $Id: ftplibftpt.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef FTPLIBFTPT_H
+#define FTPLIBFTPT_H
+
+#include <defs.h>
+#include <remotetrans.h>
+
+typedef struct NetBuf netbuf;
+
+SWORD_NAMESPACE_START
+
+
+class SWDLLEXPORT FTPLibFTPTransport : public RemoteTransport {
+	netbuf *ftpConnection;
+
+	char assureLoggedIn();
+
+public:
+	FTPLibFTPTransport(const char *host, StatusReporter *statusReporter = 0);
+	~FTPLibFTPTransport();
+	char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0);
+};
+
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/ftpparse.h b/include/ftpparse.h
new file mode 100644
index 0000000..3da3c1b
--- /dev/null
+++ b/include/ftpparse.h
@@ -0,0 +1,53 @@
+#ifndef FTPPARSE_H
+#define FTPPARSE_H
+
+#include <time.h>
+
+/*
+ftpparse(&fp,buf,len) tries to parse one line of LIST output.
+
+The line is an array of len characters stored in buf.
+It should not include the terminating CR LF; so buf[len] is typically CR.
+
+If ftpparse() can't find a filename, it returns 0.
+
+If ftpparse() can find a filename, it fills in fp and returns 1.
+fp is a struct ftpparse, defined below.
+The name is an array of fp.namelen characters stored in fp.name;
+fp.name points somewhere within buf.
+*/
+
+struct ftpparse {
+  char *name; /* not necessarily 0-terminated */
+  int namelen;
+  int flagtrycwd; /* 0 if cwd is definitely pointless, 1 otherwise */
+  int flagtryretr; /* 0 if retr is definitely pointless, 1 otherwise */
+  int sizetype;
+  long size; /* number of octets */
+  int mtimetype;
+  time_t mtime; /* modification time */
+  int idtype;
+  char *id; /* not necessarily 0-terminated */
+  int idlen;
+} ;
+
+#define FTPPARSE_SIZE_UNKNOWN 0
+#define FTPPARSE_SIZE_BINARY 1 /* size is the number of octets in TYPE I */
+#define FTPPARSE_SIZE_ASCII 2 /* size is the number of octets in TYPE A */
+
+#define FTPPARSE_MTIME_UNKNOWN 0
+#define FTPPARSE_MTIME_LOCAL 1 /* time is correct */
+#define FTPPARSE_MTIME_REMOTEMINUTE 2 /* time zone and secs are unknown */
+#define FTPPARSE_MTIME_REMOTEDAY 3 /* time zone and time of day are unknown */
+/*
+When a time zone is unknown, it is assumed to be GMT. You may want
+to use localtime() for LOCAL times, along with an indication that the
+time is correct in the local time zone, and gmtime() for REMOTE* times.
+*/
+
+#define FTPPARSE_ID_UNKNOWN 0
+#define FTPPARSE_ID_FULL 1 /* unique identifier for files on this FTP server */
+
+extern int ftpparse(struct ftpparse *,char *,int);
+
+#endif
diff --git a/include/gbffootnotes.h b/include/gbffootnotes.h
new file mode 100644
index 0000000..15351ad
--- /dev/null
+++ b/include/gbffootnotes.h
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *
+ *  gbffootnotes.h -	Implementation of GBFFootnotes
+ *
+ * $Id: gbffootnotes.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFFOOTNOTES_H
+#define GBFFOOTNOTES_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides footnotes in a GBF text
+  */
+class SWDLLEXPORT GBFFootnotes : public SWOptionFilter {
+public:
+	GBFFootnotes();
+	virtual ~GBFFootnotes();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfheadings.h b/include/gbfheadings.h
new file mode 100644
index 0000000..6c7ee31
--- /dev/null
+++ b/include/gbfheadings.h
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *
+ *  gbfheadings.h -	Implementation of GBFHeadings
+ *
+ * $Id: gbfheadings.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFHEADINGS_H
+#define GBFHEADINGS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+  /** This Filter shows/hides headings in a GBF text
+  */
+class SWDLLEXPORT GBFHeadings : public SWOptionFilter {
+public:
+	GBFHeadings();
+	virtual ~GBFHeadings();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfhtml.h b/include/gbfhtml.h
new file mode 100644
index 0000000..433d6f3
--- /dev/null
+++ b/include/gbfhtml.h
@@ -0,0 +1,48 @@
+/******************************************************************************
+ *
+ *  gbfhtml.h -	Implementation of GBFHTML
+ *
+ * $Id: gbfhtml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFHTML_H
+#define GBFHTML_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts GBF  text to HTML text 
+ */
+class SWDLLEXPORT GBFHTML : public SWBasicFilter {
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+		bool hasFootnotePreTag;
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	GBFHTML();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfhtmlhref.h b/include/gbfhtmlhref.h
new file mode 100644
index 0000000..5934fa6
--- /dev/null
+++ b/include/gbfhtmlhref.h
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ *  gbfhtmlhref.h -	Implementation of GBFHTMLHREF
+ *
+ * $Id: gbfhtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFHTMLHREF_H
+#define GBFHTMLHREF_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts GBF  text to HTML text with hrefs
+ */
+class SWDLLEXPORT GBFHTMLHREF : public SWBasicFilter {
+	bool renderNoteNumbers;
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key);
+		bool hasFootnotePreTag;
+		SWBuf version;
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	GBFHTMLHREF();
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfmorph.h b/include/gbfmorph.h
new file mode 100644
index 0000000..1352b9c
--- /dev/null
+++ b/include/gbfmorph.h
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *
+ *  gbfmorph.h -	Implementation of GBFMorph
+ *
+ * $Id: gbfmorph.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFMORPH_H
+#define GBFMORPH_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+  /** This Filter shows/hides morph tags in a GBF text
+  */
+class SWDLLEXPORT GBFMorph : public SWOptionFilter {
+public:
+	GBFMorph();
+	virtual ~GBFMorph();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfosis.h b/include/gbfosis.h
new file mode 100644
index 0000000..7462118
--- /dev/null
+++ b/include/gbfosis.h
@@ -0,0 +1,70 @@
+/***************************************************************************
+ *
+ *  gbfosis.h -	Implementation of GBFOSIS
+ *
+ * $Id: gbfosis.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFOSIS_H
+#define GBFOSIS_H
+
+#include <swfilter.h>
+#include <stack>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+
+class SWDLLEXPORT QuoteStack {
+private:
+	class QuoteInstance {
+	public:
+		char startChar;
+		char level;
+		SWBuf uniqueID;
+		char continueCount;
+		QuoteInstance(char startChar = '\"', char level = 1, SWBuf uniqueID = "", char continueCount = 0) {
+			this->startChar     = startChar;
+			this->level         = level;
+			this->uniqueID      = uniqueID;
+			this->continueCount = continueCount;
+		}
+		void pushStartStream(SWBuf &text);
+	};
+
+	typedef std::stack<QuoteInstance> QuoteInstanceStack;
+	QuoteInstanceStack quotes;
+public:
+	QuoteStack();
+	virtual ~QuoteStack();
+	void handleQuote(char *buf, char *quotePos, SWBuf &text);
+	void clear();
+	bool empty() { return quotes.empty(); }
+};
+
+/** this filter converts GBF text to OSIS text
+ */
+class SWDLLEXPORT GBFOSIS : public SWFilter {
+public:
+	GBFOSIS();
+	virtual ~GBFOSIS();
+	char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif /* THMLOSIS_H */
diff --git a/include/gbfplain.h b/include/gbfplain.h
new file mode 100644
index 0000000..c661d29
--- /dev/null
+++ b/include/gbfplain.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  gbfplain.h -	Implementation of GBFPlain
+ *
+ * $Id: gbfplain.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997k-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFPLAIN_H
+#define GBFPLAIN_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+  /** This filter converts GBF text to plain text
+  */
+class SWDLLEXPORT GBFPlain : public SWFilter {
+public:
+	GBFPlain();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfredletterwords.h b/include/gbfredletterwords.h
new file mode 100644
index 0000000..4fa1963
--- /dev/null
+++ b/include/gbfredletterwords.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *
+ *  gbfredletterwords.h -	Implementation of GBFRedLetterWords
+ *
+ * $Id: gbfredletterwords.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFSREDLETTERWORDS_H
+#define GBFREDLETTERWORDS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides "red letter tags" (marking the
+ * words of Jesus) in a GBF text. Turn this off if you don't want
+ * to have this kind of markup in the text.
+ */
+class SWDLLEXPORT GBFRedLetterWords : public SWOptionFilter {
+public:
+	GBFRedLetterWords();
+	virtual ~GBFRedLetterWords();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfrtf.h b/include/gbfrtf.h
new file mode 100644
index 0000000..6305767
--- /dev/null
+++ b/include/gbfrtf.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  gbfrtf.h -	Implementation of GBFRTF
+ *
+ * $Id: gbfrtf.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFRTF_H
+#define GBFRTF_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts GBF text into RTF text
+ */
+class SWDLLEXPORT GBFRTF : public SWFilter {
+public:
+	GBFRTF();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfstrongs.h b/include/gbfstrongs.h
new file mode 100644
index 0000000..14534a3
--- /dev/null
+++ b/include/gbfstrongs.h
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *
+ *  gbfstrongs.h -	Implementation of GBFStrongs
+ *
+ * $Id: gbfstrongs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFSTRONGS_H
+#define GBFSTRONGS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides strong's numbers in a GBF text
+ */
+class SWDLLEXPORT GBFStrongs : public SWOptionFilter {
+public:
+	GBFStrongs();
+	virtual ~GBFStrongs();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfthml.h b/include/gbfthml.h
new file mode 100644
index 0000000..2659a81
--- /dev/null
+++ b/include/gbfthml.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  gbfhtml.h -	Implementation of GBFHTML
+ *
+ * $Id: gbfthml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFTHML_H
+#define GBFTHML_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts GBF text into ThML text
+ */
+class SWDLLEXPORT GBFThML : public SWFilter {
+public:
+	GBFThML();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfwebif.h b/include/gbfwebif.h
new file mode 100644
index 0000000..5ecf512
--- /dev/null
+++ b/include/gbfwebif.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ *  gbfwebif.h -	Implementation of GBFWEBIF
+ *
+ * $Id: gbfwebif.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFWEBIF_H
+#define GBFWEBIF_H
+
+#include <gbfxhtml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts GBF text to classed XHTML for web interfaces
+ */
+class SWDLLEXPORT GBFWEBIF : public GBFXHTML {
+	const SWBuf baseURL;
+	const SWBuf passageStudyURL;
+
+protected:
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	GBFWEBIF();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfwordjs.h b/include/gbfwordjs.h
new file mode 100644
index 0000000..ef93792
--- /dev/null
+++ b/include/gbfwordjs.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *
+ *  gbfwordjs.h -	Implementation of GBFWordJS
+ *
+ * $Id: gbfwordjs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFWORDSJS_H
+#define GBFWORDSJS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+class SWMgr;
+  /** This Filter shows/hides strong's numbers in a GBF text
+  */
+class SWDLLEXPORT GBFWordJS : public SWOptionFilter {
+     SWModule *defaultGreekLex;
+     SWModule *defaultHebLex;
+     SWModule *defaultGreekParse;
+     SWModule *defaultHebParse;
+     SWMgr *mgr;
+
+public:
+	GBFWordJS();
+	virtual ~GBFWordJS();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+	void setDefaultModules(SWModule *defaultGreekLex = 0, SWModule *defaultHebLex = 0, SWModule *defaultGreekParse = 0, SWModule *defaultHebParse = 0) {
+		this->defaultGreekLex   = defaultGreekLex;
+		this->defaultHebLex     = defaultHebLex;
+		this->defaultGreekParse = defaultGreekParse;
+		this->defaultHebParse   = defaultHebParse;
+	}
+	void setMgr(SWMgr *mgr) { this->mgr = mgr; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/gbfxhtml.h b/include/gbfxhtml.h
new file mode 100644
index 0000000..616ccd0
--- /dev/null
+++ b/include/gbfxhtml.h
@@ -0,0 +1,52 @@
+/******************************************************************************
+ *
+ *  gbfxhtml.h -	Implementation of GBFXHTML
+ *
+ * $Id: gbfxhtml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFXHTML_H
+#define GBFXHTML_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts GBF text to classed XHTML text
+ */
+class SWDLLEXPORT GBFXHTML : public SWBasicFilter {
+	bool renderNoteNumbers;
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key);
+		bool hasFootnotePreTag;
+		SWBuf version;
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	GBFXHTML();
+	virtual const char *getHeader() const;
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/greeklexattribs.h b/include/greeklexattribs.h
new file mode 100644
index 0000000..4055b5a
--- /dev/null
+++ b/include/greeklexattribs.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  greeklexattribs.h -	Implementation of GreekLexAttribs
+ *
+ * $Id: greeklexattribs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GREEKLEXATTRIBS_H
+#define GREEKLEXATTRIBS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to plain text
+ */
+class SWDLLEXPORT GreekLexAttribs : public SWOptionFilter {
+public:
+	GreekLexAttribs();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/hebrewmcim.h b/include/hebrewmcim.h
new file mode 100644
index 0000000..ffcb9a1
--- /dev/null
+++ b/include/hebrewmcim.h
@@ -0,0 +1,54 @@
+/******************************************************************************
+ *
+ *  hebrewmcim.h -	Implementation of HebrewMCIM
+ *
+ * $Id: hebrewmcim.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef HEBREWMCIM_H
+#define HEBREWMCIM_H
+
+/**
+ * Title: Keyboard mapping for Michigan-Claremont Hebrew input
+ * Description:
+ * Copyright:    Copyright (c) 2001 CrossWire Bible Society under the terms of the GNU GPL
+ * Company:
+ * @author Troy A. Griffitts
+ * @version 1.0
+ */
+
+#include <swinputmeth.h>
+#include <map>
+#include <defs.h>
+SWORD_NAMESPACE_START
+
+
+class SWDLLEXPORT HebrewMCIM : public SWInputMethod {
+
+    void init();
+    int subst[255];
+    map<int, int> subst2[12];
+    map<int, int*> multiChars;
+
+public:
+    HebrewMCIM();
+    int *translate(char in);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/hrefcom.h b/include/hrefcom.h
new file mode 100644
index 0000000..638b561
--- /dev/null
+++ b/include/hrefcom.h
@@ -0,0 +1,53 @@
+/******************************************************************************
+ *
+ *  hrefcom.h -	code for class 'HREFCom'- a module that produces HTML HREFs
+ *	       	pointing to actual text desired.  Uses standard
+ *		files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: hrefcom.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef HREFCOM_H
+#define HREFCOM_H
+
+#include <rawverse.h>
+#include <swcom.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT HREFCom:public RawVerse, public SWCom {
+	char *prefix;
+
+public:
+
+
+	HREFCom(const char *ipath, const char *prefix, const char *iname = 0,
+			const char *idesc = 0, SWDisplay * idisp = 0);
+	virtual ~HREFCom();
+	virtual SWBuf &getRawEntryBuf() const;
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/installmgr.h b/include/installmgr.h
new file mode 100644
index 0000000..56ebf7e
--- /dev/null
+++ b/include/installmgr.h
@@ -0,0 +1,276 @@
+/******************************************************************************
+ *
+ *  installmgr.h -	Implementation of InstallMgr
+ *
+ * $Id: installmgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef INSTALLMGR_H
+#define INSTALLMGR_H
+
+#include <defs.h>
+#include <swbuf.h>
+#include <map>
+#include <set>
+
+SWORD_NAMESPACE_START
+
+class SWMgr;
+class SWModule;
+class SWConfig;
+class RemoteTransport;
+class StatusReporter;
+
+/** A remote installation source configuration
+*/
+class SWDLLEXPORT InstallSource {
+	SWMgr *mgr;
+public:
+	InstallSource(const char *type, const char *confEnt = 0);
+	virtual ~InstallSource();
+	SWBuf getConfEnt() {
+		return caption +"|" + source + "|" + directory + "|" + u + "|" + p + "|" + uid;
+	}
+	SWBuf caption;
+	SWBuf source;
+	SWBuf directory;
+	SWBuf u;
+	SWBuf p;
+	SWBuf uid;
+
+	SWBuf type;
+	SWBuf localShadow;
+	void *userData;
+	SWMgr *getMgr();
+	void flush();
+};
+
+/** A standard map of remote install sources.
+ */
+typedef std::map<SWBuf, InstallSource *> InstallSourceMap;
+
+/** Class to handle installation and maintenance of a SWORD library of books.
+ */
+class SWDLLEXPORT InstallMgr {
+
+protected:
+	bool userDisclaimerConfirmed;
+	std::set<SWBuf> defaultMods;
+	char *privatePath;
+	SWBuf confPath;
+	StatusReporter *statusReporter;
+	bool passive;
+	SWBuf u, p;
+
+	/** override this method and provide your own custom RemoteTransport subclass
+         */
+	virtual RemoteTransport *createFTPTransport(const char *host, StatusReporter *statusReporter);
+
+	/** override this method and provide your own custom HTTP RemoteTransport
+         */
+	virtual RemoteTransport *createHTTPTransport(const char *host, StatusReporter *statusReporter);
+
+
+	/** we have a transport member to set as current running transport so we
+	 *  can ask it to terminate below, if user requests
+         */
+	RemoteTransport *transport;
+
+public:
+
+	static const int MODSTAT_OLDER;
+	static const int MODSTAT_SAMEVERSION;
+	static const int MODSTAT_UPDATED;
+	static const int MODSTAT_NEW;
+	static const int MODSTAT_CIPHERED;
+	static const int MODSTAT_CIPHERKEYPRESENT;
+
+	SWConfig *installConf;
+
+        /** all remote sources configured for this installmgr.  Use this to gain access
+         *  to individual remote sources.
+         */
+	InstallSourceMap sources;
+
+	/** Username and Password supplied here can be used to identify your frontend
+	 *  by supplying a valid anon password like installmgr@macsword.com
+	 *  This will get overridden if a password is required and provided in an indivual
+	 *  source configuration.
+         */
+	InstallMgr(const char *privatePath = "./", StatusReporter *statusReporter = 0, SWBuf u="ftp", SWBuf p="installmgr@user.com");
+	virtual ~InstallMgr();
+
+	/** Call to re-read InstallMgr.conf
+         */
+	void readInstallConf();
+
+	/** Call to dump sources and other settings to InstallMgr.conf
+         */
+	void saveInstallConf();
+
+	/** Removes all configured sources from memory.  Call saveInstallConf() to persist
+         */
+	void clearSources();
+
+        /** call to delete all files of a locally installed module.
+         */
+	virtual int removeModule(SWMgr *manager, const char *modName);
+
+        /** mostly an internally used method to remote download from a remote source to a local destination
+         */
+	virtual int remoteCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer = false, const char *suffix = "");
+
+        /** call to install a module from a local path (fromLocation) or remote InstallSource (is) (leave the other 0)
+         */
+	virtual int installModule(SWMgr *destMgr, const char *fromLocation, const char *modName, InstallSource *is = 0);
+
+        /** call to obtain and locally cache the available content list of the remote source
+         */
+	virtual int refreshRemoteSource(InstallSource *is);
+
+        /** call to populate installmgr configuration with all known
+         *  remote sources from the master list at CrossWire
+         */
+	virtual int refreshRemoteSourceConfiguration();
+
+	/** Override this and provide an input mechanism to allow your users
+	 *  to confirm that they understand this important disclaimer.
+	 *  This method will be called immediately before attempting to perform
+	 *  any network function.
+	 *  If you would like your confirmation to always show at a predefined
+	 *  time before attempting network operations, then you can call this
+	 *  method yourself at the desired time.
+	 *
+	 *  Return true if your user confirms.
+         *
+	 *  User disclaimer should ask user for confirmation of 2 critical items:
+	 *  and the default answer should be NO
+	 *  (possibly the wrong language for the disclaimer)
+	 *
+
+A sample impl:
+
+	static bool confirmed = false;
+        if (!confirmed) {
+		cout << "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
+		cout << "                -=+* WARNING *+=- -=+* WARNING *+=-\n\n\n";
+		cout << "Although Install Manager provides a convenient way for installing\n";
+		cout << "and upgrading SWORD components, it also uses a systematic method\n";
+		cout << "for accessing sites which gives packet sniffers a target to lock\n";
+		cout << "into for singling out users. \n\n\n";
+		cout << "IF YOU LIVE IN A PERSECUTED COUNTRY AND DO NOT WISH TO RISK DETECTION,\n";
+		cout << "YOU SHOULD *NOT* USE INSTALL MANAGER'S REMOTE SOURCE FEATURES.\n\n\n";
+		cout << "Also, Remote Sources other than CrossWire may contain less than\n";
+		cout << "quality modules, modules with unorthodox content, or even modules\n";
+		cout << "which are not legitimately distributable.  Many repositories\n";
+		cout << "contain wonderfully useful content.  These repositories simply\n";
+		cout << "are not reviewed or maintained by CrossWire and CrossWire\n";
+		cout << "cannot be held responsible for their content. CAVEAT EMPTOR.\n\n\n";
+		cout << "If you understand this and are willing to enable remote source features\n";
+		cout << "then type yes at the prompt\n\n";
+		cout << "enable? [no] ";
+
+		char prompt[10];
+		fgets(prompt, 9, stdin);
+		confirmed = (!strcmp(prompt, "yes\n"));
+        }
+        return confirmed;
+
+         */
+	virtual bool isUserDisclaimerConfirmed() const { return userDisclaimerConfirmed; }
+
+	/** Preferred method of reporting user disclaimer confirmation is to override the above method
+	 * instead of using the setter below. This is provided for clients who don't wish to inherit
+	 * InstallMgr and override method.
+	 */
+	void setUserDisclaimerConfirmed(bool val) { userDisclaimerConfirmed = val; }
+
+
+	/** override this and provide an input mechanism to allow your users
+	 * to enter the decipher code for a module.
+	 * return true you added the cipher code to the config.
+	 * default to return 'aborted'
+
+A sample implementation, roughly taken from the windows installmgr:
+
+	SectionMap::iterator section;
+	ConfigEntMap::iterator entry;
+	SWBuf tmpBuf;
+	section = config->Sections.find(modName);
+	if (section != config->Sections.end()) {
+		entry = section->second.find("CipherKey");
+		if (entry != section->second.end()) {
+			entry->second = GET_USER_INPUT();
+			config->Save();
+
+			// LET'S SHOW THE USER SOME SAMPLE TEXT FROM THE MODULE
+			SWMgr *mgr = new SWMgr();
+			SWModule *mod = mgr->getModule(modName);
+			mod->setKey("Ipet 2:12");
+			tmpBuf = mod->StripText();
+			mod->setKey("gen 1:10");
+			tmpBuf += "\n\n";
+			tmpBuf += mod->StripText();
+			SOME_DIALOG_CONTROL->SETTEXT(tmpBuf.c_str());
+			delete mgr;
+
+			// if USER CLICKS OK means we should return true
+			return true;
+		}
+	}
+	return false;
+}
+	*/
+		virtual bool getCipherCode(const char *modName, SWConfig *config) { (void) modName; (void) config; return false; }
+
+
+
+	/** whether or not to use passive mode when doing ftp transfers
+         */
+	void setFTPPassive(bool passive) { this->passive = passive; }
+	bool isFTPPassive() { return passive; }
+
+        /** call from another thread to terminate the installation process
+         */
+	void terminate();
+
+	/************************************************************************
+	 * getModuleStatus - compare the modules of two SWMgrs and return a
+	 * 	vector describing the status of each.  See MODSTAT_*
+	 */
+	static std::map<SWModule *, int> getModuleStatus(const SWMgr &base, const SWMgr &other);
+
+	/************************************************************************
+	 * isDefaultModule - allows an installation to provide a set of modules
+	 *   in installMgr.conf like:
+	 *     [General]
+	 *     DefaultMod=KJV
+	 *     DefaultMod=StrongsGreek
+	 *     DefaultMod=Personal
+	 *   This method allows a user interface to ask if a module is specified
+	 *   as a default in the above way.  The logic is, if no modules are
+	 *   installed then all default modules should be automatically selected for install
+	 *   to help the user select a basic foundation of useful modules
+	 */
+	bool isDefaultModule(const char *modName);
+};
+
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/latin1utf16.h b/include/latin1utf16.h
new file mode 100644
index 0000000..a8f982a
--- /dev/null
+++ b/include/latin1utf16.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  latin1utf16.h -	Implementation of Latin1UTF16
+ *
+ * $Id: latin1utf16.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef LATIN1UTF16_H
+#define LATIN1UTF16_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts Latin-1 encoded text to UTF-16
+ */
+class SWDLLEXPORT Latin1UTF16 : public SWFilter {
+public:
+	Latin1UTF16();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/latin1utf8.h b/include/latin1utf8.h
new file mode 100644
index 0000000..09767e9
--- /dev/null
+++ b/include/latin1utf8.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  latin1utf8.h -	Implementation of Latin1UTF8
+ *
+ * $Id: latin1utf8.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef LATIN1UTF8_H
+#define LATIN1UTF8_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts Latin-1 encoded text to UTF-8
+ */
+class SWDLLEXPORT Latin1UTF8 : public SWFilter {
+public:
+	Latin1UTF8();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/listkey.h b/include/listkey.h
new file mode 100644
index 0000000..a388a06
--- /dev/null
+++ b/include/listkey.h
@@ -0,0 +1,157 @@
+/******************************************************************************
+ *
+ *  listkey.h -	code for base class 'listkey'.  listkey is the basis for all
+ *		types of keys for indexing into modules
+ *		(e.g. verse, word, place, etc.)
+ *
+ * $Id: listkey.h 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWLSTKEY_H
+#define SWLSTKEY_H
+
+#include <swkey.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+  /** ListKey is the basis for all
+  * types of keys that have lists of specified indexes
+  * (e.g. a list of verses, place, etc.)
+  */
+class SWDLLEXPORT ListKey : public SWKey {
+
+	static SWClass classdef;
+	void init();
+
+protected:
+	int arraypos;
+	int arraymax;
+	int arraycnt;
+	SWKey **array;
+
+public:
+
+	/** initializes instance of ListKey
+	 *
+	 * @param ikey text key
+	 */
+	ListKey(const char *ikey = 0);
+	ListKey(ListKey const &k);
+
+	/** cleans up instance of ListKey
+	 */
+	virtual ~ListKey();
+
+	virtual SWKey *clone() const;
+	
+	/** Clears out elements of list
+	 */
+	virtual void clear();
+	// deprecated, use clear(), instead
+	SWDEPRECATED virtual void ClearList() { clear(); }
+
+
+	/** Returns number of key elements in list
+	 * @return number of key elements in list
+	 */
+	virtual int getCount() const;
+	//deprecated, use getCount
+	SWDEPRECATED virtual int Count() { return getCount(); }
+	
+	/** Removes current element from list
+	 */
+	virtual void remove();
+	// deprecated use remove
+	SWDEPRECATED virtual void Remove() { remove(); }
+
+	
+	/** Sets container to subkey element number and repositions that subkey to either top or bottom
+	 *
+	 * @param ielement - element number to set to
+	 * @param pos - set the subkey element to position (TOP) or BOTTOM
+	 * @return error status
+	 * deprecated use setToElement
+	 */
+	virtual char setToElement(int ielement, SW_POSITION = TOP);
+	// deprecated use setToElement
+	SWDEPRECATED virtual char SetToElement(int ielement, SW_POSITION pos = TOP) { return setToElement(ielement, pos); }
+
+
+	
+	/** Gets a key element number
+	 *
+	 * @param pos element number to get (or default current)
+	 * @return Key or null on error
+	 */
+	virtual SWKey *getElement(int pos = -1);
+	virtual const SWKey *getElement(int pos = -1) const;
+	
+	// deprecated, use above function
+	SWDEPRECATED virtual SWKey *GetElement(int pos = -1) { return getElement(pos); }
+
+	/** Adds an element to the list
+	 * @param ikey the element to add
+	 */
+	ListKey & operator <<(const SWKey &ikey) { add(ikey); return *this; }
+	virtual void add(const SWKey &ikey);
+
+	/** Equates this ListKey to another ListKey object
+	 *
+	 * @param ikey other ListKey object
+	 */
+	virtual void copyFrom(const ListKey & ikey);
+	virtual void copyFrom(const SWKey & ikey) { SWKey::copyFrom(ikey); }
+
+	/** Positions this key
+	 *
+	 * @param pos position
+	 * @return *this
+	 */
+	virtual void setPosition(SW_POSITION pos);
+	
+	/** Decrements a number of elements
+	 */
+	virtual void decrement(int step = 1);
+	
+	/** Increments a number of elements
+	 */
+	virtual void increment(int step = 1);
+
+	virtual bool isTraversable() const { return true; }
+	virtual long getIndex() const { return arraypos; }
+	virtual const char *getRangeText() const;
+	virtual const char *getOSISRefRangeText() const;
+	virtual const char *getShortText() const;
+
+	/**
+	 * Returns the index for the new one given as as parameter.
+	 * The first parameter is the new index.
+	 */
+	virtual void setIndex(long index) { setToElement(index); }
+	virtual const char *getText() const;
+	virtual void setText(const char *ikey);
+	virtual void sort();
+
+	SWKEY_OPERATORS
+	ListKey & operator =(const ListKey &key) { copyFrom(key); return *this; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/localemgr.h b/include/localemgr.h
new file mode 100644
index 0000000..ac9492c
--- /dev/null
+++ b/include/localemgr.h
@@ -0,0 +1,119 @@
+/******************************************************************************
+ *
+ *  localemgr.h -	definition of class LocaleMgr used to interact with
+ *			registered locales for a sword installation
+ *
+ * $Id: localemgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef LOCALEMGR_H
+#define LOCALEMGR_H
+
+#include <map>
+#include <list>
+
+#include <defs.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+class SWLocale;
+ 
+typedef std::list<SWBuf> StringList;
+typedef std::map < SWBuf, SWLocale *, std::less < SWBuf > > LocaleMap;
+/**
+* The LocaleMgr class handles all the different locales of Sword.
+* It provides functions to get a list of all available locales,
+* to get the default locale name and to get it.
+* The other functions are not interesting for frontend programmers.
+*
+* To get the default locale name use @see getDefaultLocaleName
+* To set the default locale name use @see setDefaultLocaleName
+* To get the locale for a language name use @see getLocale
+* To get a list of availble locales use @see getAvailableLocales
+*/
+class SWDLLEXPORT LocaleMgr {
+private:
+	void deleteLocales();
+	char *defaultLocaleName;
+	LocaleMgr(const LocaleMgr &);
+	friend class __staticsystemLocaleMgr;
+protected:
+	LocaleMap *locales;
+	static LocaleMgr *systemLocaleMgr;
+
+public:
+
+	/** Default constructor of  LocaleMgr
+	* You do normally not need this constructor, use LocaleMgr::getSystemLocaleMgr() instead.
+	*/
+	LocaleMgr(const char *iConfigPath = 0);
+
+	/**
+	* Default destructor of LocaleMgr
+	*/
+	virtual ~LocaleMgr();
+
+	/** Get the locale connected with the name "name".
+	*
+	* @param name The name of the locale you want to have. For example use getLocale("de") to get the locale for the German language.
+	* @return Returns the locale object if the locale with the name given as parameter was found. If it wasn't found return NULL.
+	*/
+	virtual SWLocale *getLocale(const char *name);
+
+	/** Get the list of available locales.
+	*
+	* @return Returns a list of strings, which contains the names of the available locales.
+	*/
+	virtual StringList getAvailableLocales();
+
+	/** Returns translated text.
+	* This function uses both parameters to return the translated version of the given text.
+	*
+	* @param text The text to translate into the language given by the first parameter.
+	* @param localeName The name of the locale Sword should use
+	* @return Returns the translated text.
+	*/
+	virtual const char *translate(const char *text, const char *localeName = 0);
+
+	/** Get the default locale name. To set it use @see setDefaultLocaleName
+	*
+	* @return Returns the default locale name
+	*/
+	virtual const char *getDefaultLocaleName();
+
+	/** Set the new standard locale of Sword.
+	*
+	* @param name The name of the new default locale  
+	*/
+	virtual void setDefaultLocaleName(const char *name);
+
+	/** The LocaleMgr object used globally in the Sword world.
+	* Do not create your own LocaleMgr, use this static object instead.
+	*/
+	static LocaleMgr *getSystemLocaleMgr();
+	static void setSystemLocaleMgr(LocaleMgr *newLocaleMgr);
+
+	/** Augment this localmgr with all locale.conf files in a directory
+	*/
+	virtual void loadConfigDir(const char *ipath);
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/lzsscomprs.h b/include/lzsscomprs.h
new file mode 100644
index 0000000..b960a55
--- /dev/null
+++ b/include/lzsscomprs.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  lzsscomprs.h -	definition of Class SWCompress used for data
+ *			compression
+ *
+ * $Id: lzsscomprs.h 2935 2013-08-02 11:06:30Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef LZSSCOMPRS_H
+#define LZSSCOMPRS_H
+
+#include <swcomprs.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT LZSSCompress : public SWCompress
+{
+class Private;
+	Private *p;
+public:
+	LZSSCompress ();
+	virtual ~LZSSCompress();
+	virtual void Encode(void);
+	virtual void Decode(void);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/markupfiltmgr.h b/include/markupfiltmgr.h
new file mode 100644
index 0000000..abef624
--- /dev/null
+++ b/include/markupfiltmgr.h
@@ -0,0 +1,77 @@
+/******************************************************************************
+ *
+ *  markupfiltmgr.h -	definition of class SWMarkupMgr, subclass of
+ *			used to transcode all module text to a requested
+ *			markup
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef MARKUPFILTMGR_H
+#define MARKUPFILTMGR_H
+
+#include <encfiltmgr.h>
+
+SWORD_NAMESPACE_START
+
+/** This class is like a normal SWEncodingMgr,
+* but you can additonally specify which markup
+* you want to use.
+*/
+class SWDLLEXPORT MarkupFilterMgr : public EncodingFilterMgr {
+protected:
+        SWFilter* fromthml;
+        SWFilter* fromgbf;
+        SWFilter* fromplain;
+        SWFilter* fromosis;
+        SWFilter* fromtei;
+
+				/**
+	 			* current markup value
+	 			*/
+        char markup;
+
+        void CreateFilters(char markup);
+public:
+	/** Constructor of SWMarkupMgr.
+	 *
+	 * @param encoding The desired encoding.
+	 * @param markup The desired markup format.
+	 */
+        MarkupFilterMgr(char markup = FMT_THML, char encoding = ENC_UTF8);
+
+	/**
+	 * The destructor of SWMarkupMgr.
+	 */
+        ~MarkupFilterMgr();
+
+	/** Markup sets/gets the markup after initialization
+	 * 
+	 * @param m The new markup or FMT_UNKNOWN if you just want to get the current markup.
+	 * @return The current (possibly changed) markup format.
+	 */
+        char Markup(char m = FMT_UNKNOWN);
+
+	/**
+	 * Adds the render filters which are defined in "section" to the SWModule object "module".
+	 * @param module To this module the render filter(s) are added
+	 * @param section We use this section to get a list of filters we should apply to the module
+	 */	
+        virtual void AddRenderFilters(SWModule *module, ConfigEntMap &section);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/multimapwdef.h b/include/multimapwdef.h
new file mode 100644
index 0000000..956a231
--- /dev/null
+++ b/include/multimapwdef.h
@@ -0,0 +1,61 @@
+/******************************************************************************
+ *
+ *  multimapwdef.h -	Implementation of multimapwithdefault
+ *
+ * $Id: multimapwdef.h 2935 2013-08-02 11:06:30Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef MULTIMAPWDEF_H
+#define MULTIMAPWDEF_H
+
+#include <map>
+
+SWORD_NAMESPACE_START
+
+// multmap that still lets you use [] to reference FIRST
+// entry of a key if multiples exist
+template <class Key, class T, class Compare>
+class multimapwithdefault : public std::multimap<Key, T, Compare> {
+public:
+	typedef std::pair<const Key, T> value_type;
+	T& getWithDefault(const Key& k, const T& defaultValue) {
+		if (find(k) == this->end()) {
+			insert(value_type(k, defaultValue));
+		}
+		return (*(find(k))).second;
+	}
+
+	T& operator[](const Key& k) {
+		if (this->find(k) == this->end()) {
+			this->insert(value_type(k, T()));
+		}
+		return (*(this->find(k))).second;
+	}
+	bool has(const Key& k, const T &val) const {
+		typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
+		typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
+		for (; start!=end; start++) {
+			if (start->second == val)
+				return true;
+		}
+		return false;
+	}
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/nullim.h b/include/nullim.h
new file mode 100644
index 0000000..b07c99e
--- /dev/null
+++ b/include/nullim.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ *  nullim.h -	Implementation of NullIM
+ *
+ * $Id: nullim.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef NULLIM_H
+#define NULLIM_H
+
+#include <swinputmeth.h>
+#include <defs.h>
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT NullIM : public SWInputMethod {
+
+public:
+	NullIM();
+	int * translate(char ch);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisenum.h b/include/osisenum.h
new file mode 100644
index 0000000..29b312d
--- /dev/null
+++ b/include/osisenum.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  osisenum.h -	Implementation of OSISEnum
+ *
+ * $Id: osisenum.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISENUM_H
+#define OSISENUM_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISEnum : public SWOptionFilter {
+public:
+	OSISEnum();
+	virtual ~OSISEnum();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisfootnotes.h b/include/osisfootnotes.h
new file mode 100644
index 0000000..c5105d6
--- /dev/null
+++ b/include/osisfootnotes.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  osisfootnotes.h -	Implementation of OSISFootnotes
+ *
+ * $Id: osisfootnotes.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISFOOTNOTES_H
+#define OSISFOOTNOTES_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISFootnotes : public SWOptionFilter {
+public:
+	OSISFootnotes();
+	virtual ~OSISFootnotes();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisglosses.h b/include/osisglosses.h
new file mode 100644
index 0000000..028638d
--- /dev/null
+++ b/include/osisglosses.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  osisglosses.h -	Implementation of OSISGlosses
+ *
+ * $Id: osisglosses.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISGLOSSES_H
+#define OSISGLOSSES_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISGlosses : public SWOptionFilter {
+public:
+	OSISGlosses();
+	virtual ~OSISGlosses();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisheadings.h b/include/osisheadings.h
new file mode 100644
index 0000000..2b4a56d
--- /dev/null
+++ b/include/osisheadings.h
@@ -0,0 +1,41 @@
+/******************************************************************************
+ *
+ *  osisheadings.h -	Implementation of OSISHeadings
+ *
+ * $Id: osisheadings.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISHEADINGS_H
+#define OSISHEADINGS_H
+
+#include <swoptfilter.h>
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISHeadings : public SWOptionFilter, public SWBasicFilter {
+public:
+	OSISHeadings();
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osishtmlhref.h b/include/osishtmlhref.h
new file mode 100644
index 0000000..dedd79b
--- /dev/null
+++ b/include/osishtmlhref.h
@@ -0,0 +1,68 @@
+/******************************************************************************
+ *
+ *  osishtmlhref.h -	Implementation of OSISHTMLHREF
+ *
+ * $Id: osishtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISHTMLHREF_H
+#define OSISHTMLHREF_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts OSIS text to HTML text with hrefs
+ */
+class SWDLLEXPORT OSISHTMLHREF : public SWBasicFilter {
+private:
+	bool morphFirst;
+	bool renderNoteNumbers;
+protected:
+	// used by derived classes so we have it in the header
+	class TagStacks;
+	class SWDLLEXPORT MyUserData : public BasicFilterUserData {
+	public:
+		bool osisQToTick;
+		bool inBold;	// TODO: obsolete. left for binary compat for 1.6.x
+		bool inXRefNote;
+		bool BiblicalText;
+		int suspendLevel;
+		SWBuf wordsOfChristStart;
+		SWBuf wordsOfChristEnd;
+                TagStacks *tagStacks;	// TODO: modified to wrap all TagStacks necessary for this filter until 1.7.x
+//                TagStack *hiStack;	// TODO: commented out for binary compat for 1.6.x	 wrapped in tagStacks until 1.7.x
+		SWBuf lastTransChange;
+		SWBuf w;
+		SWBuf fn;
+		SWBuf version;
+		MyUserData(const SWModule *module, const SWKey *key);
+		~MyUserData();
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	OSISHTMLHREF();
+	void setMorphFirst(bool val = true) { morphFirst = val; }
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osislemma.h b/include/osislemma.h
new file mode 100644
index 0000000..e8ee747
--- /dev/null
+++ b/include/osislemma.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  osislemma.h -	Implementation of OSISLemma
+ *
+ * $Id: osislemma.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISLEMMA_H
+#define OSISLEMMA_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISLemma : public SWOptionFilter {
+public:
+	OSISLemma();
+	virtual ~OSISLemma();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osismorph.h b/include/osismorph.h
new file mode 100644
index 0000000..b7454fd
--- /dev/null
+++ b/include/osismorph.h
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *
+ *  osismorph.h -	Implementation of OSISMorph
+ *
+ * $Id: osismorph.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISMORPH_H
+#define OSISMORPH_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides morph tags in a OSIS text
+ */
+class SWDLLEXPORT OSISMorph : public SWOptionFilter {
+public:
+	OSISMorph();
+	virtual ~OSISMorph();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osismorphsegmentation.h b/include/osismorphsegmentation.h
new file mode 100644
index 0000000..d039011
--- /dev/null
+++ b/include/osismorphsegmentation.h
@@ -0,0 +1,44 @@
+/******************************************************************************
+ *
+ *  osismorphsegmentation.h -	Implementation of OSISMorphSegmentation
+ *
+ * $Id: osismorphsegmentation.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ * CrossWire Bible Society
+ * P. O. Box 2528
+ * Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISMORPHSEGMENTATION_H
+#define OSISMORPHSEGMENTATION_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/*  This filters toggles splitting of morphemes
+ *  (for morpheme segmented Hebrew in the WLC)
+ */
+
+class SWDLLEXPORT OSISMorphSegmentation : public SWOptionFilter {
+
+public:
+	OSISMorphSegmentation();
+	virtual ~OSISMorphSegmentation();
+
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisosis.h b/include/osisosis.h
new file mode 100644
index 0000000..831864d
--- /dev/null
+++ b/include/osisosis.h
@@ -0,0 +1,56 @@
+/******************************************************************************
+ *
+ *  osisosis.h -	Implementation of OSISOSIS
+ *
+ * $Id: osisosis.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISOSIS_H
+#define OSISOSIS_H
+
+#include <swbasicfilter.h>
+#include <utilxml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts internal OSIS text to public OSIS text
+ */
+class SWDLLEXPORT OSISOSIS : public SWBasicFilter {
+private:
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		bool osisQToTick;
+		bool inBold;
+		SWBuf lastTransChange;
+		SWBuf w;
+		SWBuf fn;
+		XMLTag startTag;
+		MyUserData(const SWModule *module, const SWKey *key);
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual char processText(SWBuf &text, const SWKey *key, const SWModule *module);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	OSISOSIS();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisplain.h b/include/osisplain.h
new file mode 100644
index 0000000..5d728ca
--- /dev/null
+++ b/include/osisplain.h
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ *  osisplain.h -	Implementation of OSISPlain
+ *
+ * $Id: osisplain.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISPLAIN_H
+#define OSISPLAIN_H
+
+#include <swbasicfilter.h>
+#include <utilxml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts OSIS text to plain text
+ */
+class SWDLLEXPORT OSISPlain : public SWBasicFilter {
+public:
+protected:
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	OSISPlain();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisredletterwords.h b/include/osisredletterwords.h
new file mode 100644
index 0000000..f8bdf07
--- /dev/null
+++ b/include/osisredletterwords.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  osisredletterwords.h -	Implementation of OSISRedLetterWords
+ *
+ * $Id: osisredletterwords.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISREDLETTERWORDS_H
+#define OSISREDLETTERWORDS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISRedLetterWords : public SWOptionFilter {
+public:
+	OSISRedLetterWords();
+	virtual ~OSISRedLetterWords();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisreferencelinks.h b/include/osisreferencelinks.h
new file mode 100644
index 0000000..4c75850
--- /dev/null
+++ b/include/osisreferencelinks.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  osisreferencelinks.h -	SWFilter descendant to toggle OSIS reference
+ *				links with specified type/subType
+ *
+ * $Id: osisreferencelinks.h 2995 2013-12-28 06:32:26Z greg.hellings $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *      CrossWire Bible Society
+ *      P. O. Box 2528
+ *      Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISREFERENCELINKS_H
+#define OSISREFERENCELINKS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter hides reference links with a particular type/subtype in an OSIS text
+ */
+class SWDLLEXPORT OSISReferenceLinks : public SWOptionFilter {
+	SWBuf optionName;
+	SWBuf optionTip;
+	SWBuf type;
+	SWBuf subType;
+public:
+
+	/**
+	 * @param optionName - name of this option
+	 * @param optionTip - user help tip for this option
+	 * @param type - which reference types to hide
+	 * @param subType - which reference subTypes to hide (optional)
+	 * @param defaultValue - default value of option "On" or "Off" (optional)
+	 */
+	OSISReferenceLinks(const char *optionName, const char *optionTip, const char *type, const char *subType = 0, const char *defaultValue = "On");
+	virtual ~OSISReferenceLinks();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
+
+
diff --git a/include/osisrtf.h b/include/osisrtf.h
new file mode 100644
index 0000000..8392356
--- /dev/null
+++ b/include/osisrtf.h
@@ -0,0 +1,44 @@
+/******************************************************************************
+ *
+ *  osisrtf.h -	Implementation of OSISRTF
+ *
+ * $Id: osisrtf.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISRTF_H
+#define OSISRTF_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts OSIS text to RTF text
+ */
+class SWDLLEXPORT OSISRTF : public SWBasicFilter {
+private:
+
+protected:
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+public:
+	OSISRTF();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisscripref.h b/include/osisscripref.h
new file mode 100644
index 0000000..5cb5d89
--- /dev/null
+++ b/include/osisscripref.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  osisscripref.h -	Implementation of OSISScripRef
+ *
+ * $Id: osisscripref.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISSCRIPREF_H
+#define OSISSCRIPREF_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISScripref : public SWOptionFilter {
+public:
+	OSISScripref();
+	virtual ~OSISScripref();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisstrongs.h b/include/osisstrongs.h
new file mode 100644
index 0000000..36a4c6d
--- /dev/null
+++ b/include/osisstrongs.h
@@ -0,0 +1,40 @@
+/***************************************************************************
+ *
+ *  osisstrongs.h -	Implementation of OSISStrongs
+ *
+ * $Id: osisstrongs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISSTRONGS_H
+#define OSISSTRONGS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+  /** This Filter shows/hides strong's numbers in a OSIS text
+  */
+class SWDLLEXPORT OSISStrongs : public SWOptionFilter {
+public:
+	OSISStrongs();
+	virtual ~OSISStrongs();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisvariants.h b/include/osisvariants.h
new file mode 100644
index 0000000..e561d70
--- /dev/null
+++ b/include/osisvariants.h
@@ -0,0 +1,42 @@
+/******************************************************************************
+ *
+ *  osisvariants.h -	Implementation of OSISVariants
+ *
+ * $Id: osisvariants.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISVARIANTS_H
+#define OSISVARIANTS_H
+
+#include <swoptfilter.h>
+#include <swmodule.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides textual variants
+ */
+class SWDLLEXPORT OSISVariants : public SWOptionFilter {
+
+public:
+	OSISVariants();
+	virtual ~OSISVariants();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osiswebif.h b/include/osiswebif.h
new file mode 100644
index 0000000..c58a379
--- /dev/null
+++ b/include/osiswebif.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  osiswebif.h -	Implementation of OSISWEBIF
+ *
+ * $Id: osiswebif.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISWEBIF_H
+#define OSISWEBIF_H
+
+#include <osisxhtml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts OSIS  text to HTML text with hrefs
+ */
+class SWDLLEXPORT OSISWEBIF : public OSISXHTML {
+	const SWBuf baseURL;
+	const SWBuf passageStudyURL;
+	bool javascript;
+
+protected:
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	OSISWEBIF();
+	void setJavascript(bool mode) { javascript = mode; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osiswordjs.h b/include/osiswordjs.h
new file mode 100644
index 0000000..fe6a316
--- /dev/null
+++ b/include/osiswordjs.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *
+ *  osiswordjs.h -	Implementation of OSISWordJS
+ *
+ * $Id: osiswordjs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISWORDSJS_H
+#define OSISWORDSJS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+class SWMgr;
+  /** This Filter shows/hides strong's numbers in a OSIS text
+  */
+class SWDLLEXPORT OSISWordJS : public SWOptionFilter {
+     SWModule *defaultGreekLex;
+     SWModule *defaultHebLex;
+     SWModule *defaultGreekParse;
+     SWModule *defaultHebParse;
+     SWMgr *mgr;
+
+public:
+	OSISWordJS();
+	virtual ~OSISWordJS();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+	void setDefaultModules(SWModule *defaultGreekLex = 0, SWModule *defaultHebLex = 0, SWModule *defaultGreekParse = 0, SWModule *defaultHebParse = 0) {
+		this->defaultGreekLex   = defaultGreekLex;
+		this->defaultHebLex     = defaultHebLex;
+		this->defaultGreekParse = defaultGreekParse;
+		this->defaultHebParse   = defaultHebParse;
+	}
+	void setMgr(SWMgr *mgr) { this->mgr = mgr; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisxhtml.h b/include/osisxhtml.h
new file mode 100644
index 0000000..4065dcc
--- /dev/null
+++ b/include/osisxhtml.h
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  osisxhtml.h -	Render filter for classed XHTML of an OSIS module
+ *
+ * $Id: osisxhtml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISXHTML_H
+#define OSISXHTML_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts OSIS text to classed XHTML
+ */
+class SWDLLEXPORT OSISXHTML : public SWBasicFilter {
+private:
+	bool morphFirst;
+	bool renderNoteNumbers;
+protected:
+
+	class TagStack;
+	// used by derived classes so we have it in the header
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+
+
+	class MyUserData : public BasicFilterUserData {
+	public:
+		bool osisQToTick;
+		bool inXRefNote;
+		bool BiblicalText;
+		int suspendLevel;
+		SWBuf wordsOfChristStart;
+		SWBuf wordsOfChristEnd;
+		TagStack *quoteStack;
+		TagStack *hiStack;
+		TagStack *titleStack;
+		TagStack *lineStack;
+		int consecutiveNewlines;
+		SWBuf lastTransChange;
+		SWBuf w;
+		SWBuf fn;
+		SWBuf version;
+
+		MyUserData(const SWModule *module, const SWKey *key);
+		~MyUserData();
+		void outputNewline(SWBuf &buf);
+	};
+public:
+	OSISXHTML();
+	void setMorphFirst(bool val = true) { morphFirst = val; }
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+	virtual const char *getHeader() const;
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/osisxlit.h b/include/osisxlit.h
new file mode 100644
index 0000000..041981e
--- /dev/null
+++ b/include/osisxlit.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  osisxlit.h -	Implementation of OSISXlit
+ *
+ * $Id: osisxlit.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISXLIT_H
+#define OSISXLIT_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a OSIS text
+ */
+class SWDLLEXPORT OSISXlit : public SWOptionFilter {
+public:
+	OSISXlit();
+	virtual ~OSISXlit();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/papyriplain.h b/include/papyriplain.h
new file mode 100644
index 0000000..602b87d
--- /dev/null
+++ b/include/papyriplain.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  papyriplain.h -	Implementation of PapyriPlain
+ *
+ * $Id: papyriplain.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef PAPYRIPLAIN_H
+#define PAPYRIPLAIN_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+  /** This filter converts Papyri text to plain text
+  */
+class SWDLLEXPORT PapyriPlain : public SWOptionFilter {
+public:
+	PapyriPlain();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawcom.h b/include/rawcom.h
new file mode 100644
index 0000000..26241a1
--- /dev/null
+++ b/include/rawcom.h
@@ -0,0 +1,68 @@
+/******************************************************************************
+ *
+ *  rawcom.h -	code for class 'RawCom'- a module that reads raw commentary
+ *		files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawcom.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWCOM_H
+#define RAWCOM_H
+
+#include <rawverse.h>
+#include <swcom.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT RawCom : public RawVerse, public SWCom {
+
+
+public:
+    
+	RawCom(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
+			const char *ilang = 0, const char *versification = "KJV");
+	virtual ~RawCom();
+
+	virtual SWBuf &getRawEntryBuf() const;
+
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse::createModule(path, v11n); }
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+
+	virtual bool isLinked(const SWKey *k1, const SWKey *k2) const;
+	virtual bool hasEntry(const SWKey *k) const;
+
+
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/rawcom4.h b/include/rawcom4.h
new file mode 100644
index 0000000..e5e39c4
--- /dev/null
+++ b/include/rawcom4.h
@@ -0,0 +1,67 @@
+/******************************************************************************
+ *
+ *  rawcom4.h -	code for class 'RawCom4'- a module that reads raw commentary
+ *		files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawcom4.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWCOM4_H
+#define RAWCOM4_H
+
+#include <rawverse4.h>
+#include <swcom.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT RawCom4 : public RawVerse4, public SWCom {
+
+
+public:
+    
+	RawCom4(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
+			const char *ilang = 0, const char *versification = "KJV");
+	virtual ~RawCom4();
+
+	virtual SWBuf &getRawEntryBuf() const;
+
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse4::createModule(path, v11n); }
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+
+	virtual bool isLinked(const SWKey *k1, const SWKey *k2) const;
+	virtual bool hasEntry(const SWKey *k) const;
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/rawfiles.h b/include/rawfiles.h
new file mode 100644
index 0000000..e7db160
--- /dev/null
+++ b/include/rawfiles.h
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
+ *  rawfiles.h -	code for class 'RawFiles'- a module that produces HTML
+ *			HREFs pointing to actual text desired.  Uses standard
+ *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawfiles.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWFILES_H
+#define RAWFILES_H
+
+#include <rawverse.h>
+#include <swcom.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT RawFiles : public RawVerse, public SWCom {
+
+	const char *getNextFilename();
+
+public:
+
+
+	RawFiles(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN,
+			const char *ilang = 0);
+	virtual ~RawFiles();
+	virtual SWBuf &getRawEntryBuf() const;
+
+	// write interface ----------------------------
+	/** Is the module writable? :)
+	* @return yes or no
+	*/
+	virtual bool isWritable() const;
+
+	/** Creates a new module
+	* @param path The first parameter is path of the new module
+	* @return error
+	*/
+	static char createModule(const char *);
+
+	/** Modify the current module entry text
+	* - only if module @ref isWritable
+	* @return *this
+	*/
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+
+	/** Link the current module entry to another module entry
+	* - only if module @ref isWritable
+	* @return *this
+	*/
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+
+	/** Delete current module entry - only if module @ref isWritable
+	*
+	*/
+	virtual void deleteEntry();
+	// end write interface ------------------------
+
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawgenbook.h b/include/rawgenbook.h
new file mode 100644
index 0000000..400f3da
--- /dev/null
+++ b/include/rawgenbook.h
@@ -0,0 +1,68 @@
+/******************************************************************************
+ *
+ *  rawgenbook.h -	code for class 'RawGenBook'- a module that reads raw
+ *			text files:
+ *			ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawgenbook.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWGENBOOK_H
+#define RAWGENBOOK_H
+
+#include <swgenbook.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class FileDesc;
+
+class SWDLLEXPORT RawGenBook : public SWGenBook {
+	char *path;
+	FileDesc *bdtfd;
+	bool verseKey;
+
+public:
+  
+    
+	RawGenBook(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *keyType = "TreeKey");
+	virtual ~RawGenBook();
+	virtual SWBuf &getRawEntryBuf() const;
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *ipath);
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey * linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	virtual SWKey *createKey() const;
+	// end write interface ------------------------
+
+	virtual bool hasEntry(const SWKey *k) const;
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawld.h b/include/rawld.h
new file mode 100644
index 0000000..7e0aa25
--- /dev/null
+++ b/include/rawld.h
@@ -0,0 +1,70 @@
+/******************************************************************************
+ *
+ *  rawld.cpp -	code for class 'RawLD'- a module that reads raw lexicon and
+ *		dictionary files: *.dat *.idx
+ *
+ * $Id: rawld.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWLD_H
+#define RAWLD_H
+
+#include <rawstr.h>
+#include <swld.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT RawLD : public RawStr, public SWLD {
+	char getEntry(long away = 0) const;
+
+public:
+
+
+	RawLD(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool caseSensitive = false, bool strongsPadding = true);
+
+	virtual ~RawLD();
+	virtual SWBuf &getRawEntryBuf() const;
+
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path) { return RawStr::createModule (path); }
+
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+	virtual long getEntryCount() const;
+	virtual long getEntryForKey(const char *key) const;
+	virtual char *getKeyForEntry(long entry) const;
+
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawld4.h b/include/rawld4.h
new file mode 100644
index 0000000..cc2110b
--- /dev/null
+++ b/include/rawld4.h
@@ -0,0 +1,70 @@
+/******************************************************************************
+ *
+ *  rawld4.cpp -	code for class 'RawLD4'- a module that reads raw
+ *			lexicon and dictionary files: *.dat *.idx
+ *
+ * $Id: rawld4.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWLD4_H
+#define RAWLD4_H
+
+#include <rawstr4.h>
+#include <swld.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT RawLD4 : public RawStr4, public SWLD {
+	char getEntry(long away = 0) const;
+
+public:
+
+
+	RawLD4(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0, bool caseSensitive = false, bool strongsPadding = true);
+
+	virtual ~RawLD4();
+	virtual SWBuf &getRawEntryBuf() const;
+
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path) { return RawStr4::createModule(path); }
+
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+	virtual long getEntryCount() const;
+	virtual long getEntryForKey(const char *key) const;
+	virtual char *getKeyForEntry(long entry) const;
+
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawstr.h b/include/rawstr.h
new file mode 100644
index 0000000..58fc141
--- /dev/null
+++ b/include/rawstr.h
@@ -0,0 +1,63 @@
+/*****************************************************************************
+ *
+ *  rawstr.h -	code for class 'RawStr'- a module that reads raw text
+ *		files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *		and provides lookup and parsing functions based on
+ *		class StrKey
+ *
+ * $Id: rawstr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWSTR_H
+#define RAWSTR_H
+
+#include <defs.h>
+#include <sysdata.h>
+
+SWORD_NAMESPACE_START
+
+class SWBuf;
+class FileDesc;
+
+class SWDLLEXPORT RawStr {
+	static int instance;		// number of instantiated RawStr objects or derivitives
+	char *path;
+	bool caseSensitive;
+	mutable long lastoff;	 // for caching and optimizing
+	
+
+protected:
+	FileDesc *idxfd;
+	FileDesc *datfd;
+	void doSetText(const char *key, const char *buf, long len = -1);
+	void doLinkEntry(const char *destkey, const char *srckey);
+	static const int IDXENTRYSIZE;
+
+public:
+	static char nl;
+	RawStr(const char *ipath, int fileMode = -1, bool caseSensitive = false);
+	virtual ~RawStr();
+	void getIDXBuf(long ioffset, char **buf) const;
+	void getIDXBufDat(long ioffset, char **buf) const;
+	signed char findOffset(const char *key, __u32 *start, __u16 *size, long away = 0, __u32 *idxoff = 0) const;
+	void readText(__u32 start, __u16 *size, char **idxbuf, SWBuf &buf) const;
+	static signed char createModule(const char *path);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawstr4.h b/include/rawstr4.h
new file mode 100644
index 0000000..7767cb9
--- /dev/null
+++ b/include/rawstr4.h
@@ -0,0 +1,62 @@
+/*****************************************************************************
+ *
+ *  rawstr4.h -	code for class 'RawStr4'- a module that reads raw text
+ *		files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *		and provides lookup and parsing functions based on
+ *		class StrKey
+ *
+ * $Id: rawstr4.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWSTR4_H
+#define RAWSTR4_H
+
+#include <defs.h>
+#include <sysdata.h>
+
+SWORD_NAMESPACE_START
+
+class FileDesc;
+class SWBuf;
+
+class SWDLLEXPORT RawStr4 {
+	static int instance;		// number of instantiated RawStr4 objects or derivitives
+	char *path;
+	bool caseSensitive;
+	mutable long lastoff;		// for caching and optimizations
+
+protected:
+	static const int IDXENTRYSIZE;
+	
+	FileDesc *idxfd;
+	FileDesc *datfd;
+	void doSetText(const char *key, const char *buf, long len = -1);
+	void doLinkEntry(const char *destkey, const char *srckey);
+public:
+	char nl;
+	RawStr4(const char *ipath, int fileMode = -1, bool caseSensitive = false);
+	virtual ~RawStr4();
+	void getIDXBuf(long ioffset, char **buf) const;
+	void getIDXBufDat(long ioffset, char **buf) const;
+	signed char findOffset(const char *key, __u32 *start, __u32 *size, long away = 0, __u32 *idxoff = 0) const;
+	void readText(__u32 start, __u32 *size, char **idxbuf, SWBuf &buf) const;
+	static signed char createModule(const char *path);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawtext.h b/include/rawtext.h
new file mode 100644
index 0000000..55dcac1
--- /dev/null
+++ b/include/rawtext.h
@@ -0,0 +1,62 @@
+/******************************************************************************
+ *
+ *  rawtext.h -	code for class 'RawText'- a module that reads raw text files:
+ *		ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawtext.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWTEXT_H
+#define RAWTEXT_H
+
+#include <rawverse.h>
+#include <swtext.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class RawStr;
+
+class SWDLLEXPORT RawText : public SWText, public RawVerse {
+
+public:
+  
+	RawText(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV");
+	virtual ~RawText();
+	virtual SWBuf &getRawEntryBuf() const;
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse::createModule(path, v11n); }
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+
+	virtual bool isLinked(const SWKey *k1, const SWKey *k2) const;
+	virtual bool hasEntry(const SWKey *k) const;
+	
+
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawtext4.h b/include/rawtext4.h
new file mode 100644
index 0000000..6de04b3
--- /dev/null
+++ b/include/rawtext4.h
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
+ *  rawtext4.h -	code for class 'RawText4'- a module that reads raw
+ *			text files:
+ *			ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawtext4.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWTEXT4_H
+#define RAWTEXT4_H
+
+#include <rawverse4.h>
+#include <rawstr4.h>
+#include <swtext.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class RawStr;
+
+class SWDLLEXPORT RawText4 : public SWText, public RawVerse4 {
+
+public:
+  
+	RawText4(const char *ipath, const char *iname = 0, const char *idesc = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, const char *versification = "KJV");
+	virtual ~RawText4();
+	virtual SWBuf &getRawEntryBuf() const;
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path, const char *v11n = "KJV") { return RawVerse4::createModule(path, v11n); }
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+
+	virtual bool isLinked(const SWKey *k1, const SWKey *k2) const;
+	virtual bool hasEntry(const SWKey *k) const;
+
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawverse.h b/include/rawverse.h
new file mode 100644
index 0000000..0b63491
--- /dev/null
+++ b/include/rawverse.h
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *
+ *  rawverse.h -	code for class 'RawVerse'- a module that reads raw text
+ *			files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *			and provides lookup and parsing functions based on
+ *			class VerseKey
+ *
+ * $Id: rawverse.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RAWVERSE_H
+#define RAWVERSE_H
+
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class FileDesc;
+class SWBuf;
+
+class SWDLLEXPORT RawVerse {
+
+
+	static int instance;		// number of instantiated RawVerse objects or derivitives
+protected:
+	FileDesc *idxfp[2];
+	FileDesc *textfp[2];
+
+	char *path;
+	void doSetText(char testmt, long idxoff, const char *buf, long len = -1);
+	void doLinkEntry(char testmt, long destidxoff, long srcidxoff);
+
+public:
+	static const char *nl;
+	RawVerse(const char *ipath, int fileMode = -1);
+	virtual ~RawVerse();
+	void findOffset(char testmt, long idxoff, long *start,	unsigned short *end) const;
+	void readText(char testmt, long start, unsigned short size, SWBuf &buf) const;
+	static char createModule(const char *path, const char *v11n = "KJV");
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rawverse4.h b/include/rawverse4.h
new file mode 100644
index 0000000..a78ed71
--- /dev/null
+++ b/include/rawverse4.h
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ *  rawverse4.h -	code for class 'RawVerse4'- a module that reads raw
+ *			text files:  ot and nt using indexs ??.bks ??.cps
+ *			??.vss and provides lookup and parsing functions based
+ *			on class VerseKey
+ *
+ * $Id: rawverse4.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef RAWVERSE4_H
+#define RAWVERSE4_H
+
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class FileDesc;
+class SWBuf;
+
+class SWDLLEXPORT RawVerse4 {
+
+
+	static int instance;		// number of instantiated RawVerse objects or derivitives
+protected:
+	FileDesc *idxfp[2];
+	FileDesc *textfp[2];
+
+	char *path;
+	void doSetText(char testmt, long idxoff, const char *buf, long len = -1);
+	void doLinkEntry(char testmt, long destidxoff, long srcidxoff);
+
+public:
+	static const char *nl;
+	RawVerse4(const char *ipath, int fileMode = -1);
+	virtual ~RawVerse4();
+	void findOffset(char testmt, long idxoff, long *start,	unsigned long *end) const;
+	void readText(char testmt, long start, unsigned long size, SWBuf &buf) const;
+	static char createModule(const char *path, const char *v11n = "KJV");
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/remotetrans.h b/include/remotetrans.h
new file mode 100644
index 0000000..d20d96b
--- /dev/null
+++ b/include/remotetrans.h
@@ -0,0 +1,84 @@
+/******************************************************************************
+ *
+ *  remotetrans.h -	code for Remote Transport
+ *
+ * $Id: remotetrans.h 2932 2013-07-31 14:07:01Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef REMOTETRANS_H
+#define REMOTETRANS_H
+
+#include <vector>
+#include <defs.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+/** Class for reporting status
+*/
+class SWDLLEXPORT StatusReporter {
+public:
+	virtual ~StatusReporter() {};
+	/** Messages before stages of a batch download */
+	virtual void preStatus(long totalBytes, long completedBytes, const char *message);
+
+	/** frequently called throughout a download, to report status */
+	SWDEPRECATED virtual void statusUpdate(double dtTotal, double dlNow);
+	virtual void update(unsigned long totalBytes, unsigned long completedBytes);
+};
+
+
+/**
+* A base class to be used for reimplementation of network services.
+*/
+class SWDLLEXPORT RemoteTransport {
+
+protected:
+	StatusReporter *statusReporter;
+	bool passive;
+	bool term;
+	SWBuf host;
+	SWBuf u;
+	SWBuf p;
+
+public:
+	RemoteTransport(const char *host, StatusReporter *statusReporter = 0);
+	virtual ~RemoteTransport();
+
+	/***********
+	 * override this method in your real impl
+	 *
+	 * if destBuf then write to buffer instead of file
+	 */
+	virtual char getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf = 0);
+
+
+	int copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix);
+
+	virtual std::vector<struct DirEntry> getDirList(const char *dirURL);
+	void setPassive(bool passive) { this->passive = passive; }
+	void setUser(const char *user) { u = user; }
+	void setPasswd(const char *passwd) { p = passwd; }
+	void terminate() { term = true; }
+};
+
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/roman.h b/include/roman.h
new file mode 100644
index 0000000..cdbb362
--- /dev/null
+++ b/include/roman.h
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  roman.h -	roman numeral functions
+ *
+ * $Id: roman.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+#ifndef ROMAN_H
+#define ROMAN_H
+
+#include <defs.h>
+SWORD_NAMESPACE_START
+
+/** Checks if a string is a roman numeral.
+*/
+char isroman(const char *, int maxchars = 0);
+/* char* to_rom(int num, char *p); */
+
+/** Converts a roman numeral to a string.
+* @param s Roman numeral to convert.
+*/
+int from_rom(const char *s);
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/rtfhtml.h b/include/rtfhtml.h
new file mode 100644
index 0000000..e29f7ef
--- /dev/null
+++ b/include/rtfhtml.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ *
+ *  rtfhtml.h -	Implementation of RTFHTML
+ *
+ * $Id: rtfhtml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef RTFHTML_H
+#define RTFHTML_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts RTF text into HTML text
+ */
+class SWDLLEXPORT RTFHTML : public SWFilter {
+public:
+	RTFHTML();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/sapphire.h b/include/sapphire.h
new file mode 100644
index 0000000..96f3bf5
--- /dev/null
+++ b/include/sapphire.h
@@ -0,0 +1,82 @@
+/******************************************************************************
+ *
+ *  sapphire.h -	the Saphire II stream cipher class
+ *
+ * $Id: sapphire.h 2833 2013-06-29 06:40:28Z chrislit $
+ * 
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/******************************************************************************
+ *
+ * Original license notice & credits:
+ * Dedicated to the Public Domain the author and inventor
+ * (Michael Paul Johnson).  This code comes with no warranty.
+ * Use it at your own risk.
+ * Ported from the Pascal implementation of the Sapphire Stream
+ * Cipher 9 December 1994.
+ * Added hash-specific functions 27 December 1994.
+ * Made index variable initialization key-dependent,
+ * made the output function more resistant to cryptanalysis,
+ * and renamed to Sapphire II Stream Cipher 2 January 1995.
+ *
+ * unsigned char is assumed to be 8 bits.  If it is not, the
+ * results of assignments need to be reduced to 8 bits with
+ * & 0xFF or % 0x100, whichever is faster.
+ */  
+  
+#ifndef NULL
+#define NULL 0
+#endif	/*  */
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+  class sapphire 
+{
+  
+    // These variables comprise the state of the state machine.
+  unsigned char cards[256];	// A permutation of 0-255.
+  unsigned char rotor,		// Index that rotates smoothly
+    ratchet,			// Index that moves erratically
+    avalanche,			// Index heavily data dependent
+    last_plain,			// Last plain text byte
+    last_cipher;		// Last cipher text byte
+  
+    // This function is used by initialize(), which is called by the
+    // constructor.
+  unsigned char keyrand (int limit, unsigned char *user_key,
+			  unsigned char keysize, unsigned char *rsum,
+unsigned *keypos); public:sapphire (unsigned char
+				      *key = NULL,	// Calls initialize if a real
+				      unsigned char keysize = 0);	// key is provided.  If none
+  // is provided, call initialize
+  // before encrypt or decrypt.
+  ~sapphire ();			// Destroy cipher state information.
+  void initialize (unsigned char *key,	// User key is used to set
+		   unsigned char keysize);	// up state information.
+  void hash_init (void);	// Set up default hash.
+  unsigned char encrypt (unsigned char b = 0);	// Encrypt byte
+  // or get a random byte.
+  unsigned char decrypt (unsigned char b);	// Decrypt byte.
+  void hash_final (unsigned char *hash,	// Copy hash value to hash
+		   unsigned char hashlength = 20);	// Hash length (16-32)
+  void burn (void);		// Destroy cipher state information.
+};
+
+
+SWORD_NAMESPACE_END
diff --git a/include/scsuutf8.h b/include/scsuutf8.h
new file mode 100644
index 0000000..7a36733
--- /dev/null
+++ b/include/scsuutf8.h
@@ -0,0 +1,42 @@
+/******************************************************************************
+ *
+ *  scsuutf8.h - SWFilter descendant to convert a SCSU character to UTF-8
+ *
+ * $Id: scsuutf8.h 2846 2013-06-29 14:48:47Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SCSUUTF8_H
+#define SCSUUTF8_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts SCSU compressed (encoded) text to UTF-8
+ */
+class SWDLLEXPORT SCSUUTF8 : public SWFilter {
+  unsigned long c, d;
+  unsigned char* UTF8Output(unsigned long, unsigned char* text);
+  
+public:
+	SCSUUTF8();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/stringmgr.h b/include/stringmgr.h
new file mode 100644
index 0000000..c7f67f2
--- /dev/null
+++ b/include/stringmgr.h
@@ -0,0 +1,121 @@
+/******************************************************************************
+ *
+ *  stringmgr.h -	A class which provides string handling functions which
+ *			can be reimplemented by frontends
+ *
+ * $Id: stringmgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ	85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef STRINGMGR_H
+#define STRINGMGR_H
+
+#include <defs.h>
+#include <swbuf.h>
+#include <utilstr.h>
+
+SWORD_NAMESPACE_START
+
+/** StringMgr is a way to provide UTf8 handling by the Sword frontend
+ * Each platform, if it's up-to-date, should provide functions to handle unicode and utf8. This class makes it possible to implement Unicode support on the user-side and not in Sword itself.
+ */
+class SWDLLEXPORT StringMgr {
+public:
+
+	/** Sets the global StringMgr handle
+	* @param newStringMgr The new global StringMgr. This pointer will be deleted by this StringMgr
+	*/	
+	static void setSystemStringMgr(StringMgr *newStringMgr);
+   
+	/** Returns the global StringMgr handle
+	* @return The global string handle
+	*/
+	static StringMgr *getSystemStringMgr();
+
+	/** Checks whether Utf8 support is available.
+	* Override the function supportsUnicode() to tell whether your implementation has utf8 support.
+	* @return True if this implementation provides support for Utf8 handling or false if just latin1 handling is available
+	*/
+	static inline bool hasUTF8Support() {
+		return getSystemStringMgr()->supportsUnicode();
+	};
+	
+	/** Converts the param to an upper case Utf8 string
+	* @param text The text encoded in utf8 which should be turned into an upper case string
+	* @param max Max buffer size
+	* @return text buffer (only for convenience)
+	*/	
+	virtual char *upperUTF8(char *text, unsigned int max = 0) const;
+   
+	/** Converts the param to an uppercase latin1 string
+	* @param text The text encoded in latin1 which should be turned into an upper case string
+	* @param max Max buffer size
+	* @return text buffer (only for convenience)
+	*/	
+	virtual char *upperLatin1(char *text, unsigned int max = 0) const;
+	
+
+protected:
+	friend class __staticsystemStringMgr;
+	
+	/** Default constructor. Protected to make instances on user side impossible, because this is a Singleton
+	*/		
+	StringMgr();
+   
+	/** Copy constructor
+	*/	
+	StringMgr(const StringMgr &);
+   
+	/** Destructor
+	*/	
+	virtual ~StringMgr();
+	
+	virtual bool supportsUnicode() const;
+
+private:
+	static StringMgr *systemStringMgr;
+};
+
+inline char *toupperstr(char *t, unsigned int max = 0) {
+	return StringMgr::getSystemStringMgr()->upperUTF8(t, max);
+}
+	
+inline char *toupperstr_utf8(char *t, unsigned int max = 0) {
+	return StringMgr::getSystemStringMgr()->upperUTF8(t, max);
+}
+	
+/**
+ * Converts an SWBuf filled with UTF-8 to upper case
+ *
+ * @param b SWBuf to change to upper case
+ * 
+ * @return b for convenience
+ */
+inline SWBuf &toupperstr(SWBuf &b) {
+	char *utf8 = 0;
+	stdstr(&utf8, b.c_str(), 2);
+	toupperstr(utf8, (unsigned int)strlen(utf8)*2);
+	b = utf8;
+	delete [] utf8;
+	return b;
+}
+
+SWORD_NAMESPACE_END
+
+
+#endif //STRINGMGR_H
diff --git a/include/strkey.h b/include/strkey.h
new file mode 100644
index 0000000..8a10340
--- /dev/null
+++ b/include/strkey.h
@@ -0,0 +1,56 @@
+/******************************************************************************
+ *
+ *  strkey.h -	code for class 'strkey'- a standard Biblical verse key
+ *
+ * $Id: strkey.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef STRKEY_H
+#define STRKEY_H
+
+#include <swkey.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+  /** a standard string key class (used
+  * for modules that index on single strings (eg. cities,
+  * names, words, etc.)
+  */
+class SWDLLEXPORT StrKey:public SWKey
+{
+  static SWClass classdef;
+  void init ();
+public:
+  /** initializes instance of StrKey
+  *
+  * @param ikey text key (word, city, name, etc.)
+  */
+  StrKey (const char *ikey = 0);
+  /** cleans up instance of StrKey
+  */
+  virtual ~ StrKey ();
+
+  SWKEY_OPERATORS
+
+};
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/swbasicfilter.h b/include/swbasicfilter.h
new file mode 100644
index 0000000..29ea8a0
--- /dev/null
+++ b/include/swbasicfilter.h
@@ -0,0 +1,205 @@
+/******************************************************************************
+ *
+ *  swbasicfilter.h -	definition of class SWBasicFilter.  An SWFilter
+ *  		       	impl that provides some basic methods that
+ *  	       		many filter will need and can use as a starting
+ *     			point
+ *
+ * $Id: swbasicfilter.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWBASICFILTER_H
+#define SWBASICFILTER_H
+
+#include <swfilter.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+
+// not a protected inner class because MSVC++ sucks and can't handle it
+class SWDLLEXPORT BasicFilterUserData {
+public:
+	BasicFilterUserData(const SWModule *module, const SWKey *key) { this->module = module; this->key = key; suspendTextPassThru = false; supressAdjacentWhitespace = false; }
+	virtual ~BasicFilterUserData() {}
+	const SWModule *module;
+	const SWKey *key;
+	SWBuf lastTextNode;
+	SWBuf lastSuspendSegment;
+	bool suspendTextPassThru;
+	bool supressAdjacentWhitespace;
+};
+
+/** A filter providing commonly used functionality.
+ * This filter has facilities for handling SGML/HTML/XML like tokens and
+ * escape strings (like SGML entities). It has the facility for just
+ * substituting the given tokens and escape strings to other strings and for
+ * "manual" custom token handling.
+ *
+ * In this class the functions with arguments looking as <code>char
+ * **buf</code> write a character sequnce at address specified by
+ * <code>*buf</code> address and change <code>*buf</code> to point past
+ * the last char of the written sequence.
+ */
+class SWDLLEXPORT SWBasicFilter : public virtual SWFilter {
+
+class Private;
+
+	char *tokenStart;
+	char *tokenEnd;
+	char *escStart;
+	char *escEnd;
+	char escStartLen;
+	char escEndLen;
+	char tokenStartLen;
+	char tokenEndLen;
+	bool escStringCaseSensitive;
+	bool tokenCaseSensitive;
+	bool passThruUnknownToken;
+	bool passThruUnknownEsc;
+	bool passThruNumericEsc;
+	char processStages;
+
+
+	Private *p;
+public:
+
+	SWBasicFilter();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+	virtual ~SWBasicFilter();
+
+protected:
+
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new BasicFilterUserData(module, key);
+	}
+
+	// STAGEs
+	static const char INITIALIZE;	// flag for indicating processing before char loop
+	static const char PRECHAR;	// flag for indicating processing at top in char loop
+	static const char POSTCHAR;	// flag for indicating processing at bottom in char loop
+	static const char FINALIZE;	// flag for indicating processing after char loop
+
+
+	/** Sets the beginning of escape sequence (by default "&").*/
+	void setEscapeStart(const char *escStart);
+
+	/** Sets the end of escape sequence (by default ";").*/
+	void setEscapeEnd(const char *escEnd);
+
+	/** Sets the beginning of token start sequence (by default "<").*/
+	void setTokenStart(const char *tokenStart);
+
+	/** Sets the end of token start sequence (by default ">").*/
+	void setTokenEnd(const char *tokenEnd);
+
+	/** Sets whether to pass thru an unknown token unchanged
+	 *	or just remove it.
+	 * Default is false.*/
+	void setPassThruUnknownToken(bool val);
+
+	/** Sets whether to pass thru an unknown escape sequence unchanged
+	 *	or just remove it.
+	 *	Default is false.
+	 */
+	void setPassThruUnknownEscapeString(bool val);
+
+	/** Sets whether to pass thru a numeric escape sequence unchanged
+	 *	or allow it to be handled otherwise.
+	 * Default is false.*/
+	void setPassThruNumericEscapeString(bool val);
+
+	/** Are escapeStrings case sensitive or not? Call this
+	 *	function before addEscapeStingSubstitute()
+	 */
+	void setEscapeStringCaseSensitive(bool val);
+
+	/** Registers an esc control sequence that can pass unchanged
+	 */
+	void addAllowedEscapeString(const char *findString);
+
+	/** Unregisters an esc control sequence that can pass unchanged
+	 */
+	void removeAllowedEscapeString(const char *findString);
+
+	/** Registers an esc control sequence
+	 */
+	void addEscapeStringSubstitute(const char *findString, const char *replaceString);
+
+	/** Unregisters an esc control sequence
+	 */
+	void removeEscapeStringSubstitute(const char *findString);
+
+	/** This function performs the substitution of escapeStrings */
+	bool substituteEscapeString(SWBuf &buf, const char *escString);
+
+	/** This passes allowed escapeStrings */
+	bool passAllowedEscapeString(SWBuf &buf, const char *escString);
+
+	/** This appends escString to buf as an entity */
+	void appendEscapeString(SWBuf &buf, const char *escString);
+
+	/** Are tokens case sensitive (like in GBF) or not? Call this
+	 *	function before addTokenSubstitute()
+	 */
+	void setTokenCaseSensitive(bool val);
+
+	/** Registers a simple token substitutions.  Usually called from the
+	 *	c-tor of a subclass
+	 */
+	void addTokenSubstitute(const char *findString, const char *replaceString);
+
+	/** Unregisters a simple token substitute
+	 */
+	void removeTokenSubstitute(const char *findString);
+
+	/** This function performs the substitution of tokens */
+	bool substituteToken(SWBuf &buf, const char *token);
+
+	/** This function is called for every token encountered in the input text.
+	 * @param buf the output buffer
+	 * @param token the token (e.g. <code>"p align='left'"</code>
+	 * @param userData user storage space for data transient to 1 full buffer parse
+	 * @return subclasses should return true if they handled the token, or false if they did not.
+	 */
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+
+	virtual bool processStage(char /*stage*/, SWBuf &/*text*/, char *&/*from*/, BasicFilterUserData * /*userData*/) { return false; }
+	virtual void setStageProcessing(char stages) { processStages = stages; }	// see STATICs up above
+
+	/** This function is called for every escape sequence encountered in the input text.
+	 * @param buf the output buffer 
+	 * @param escString the escape sequence (e.g. <code>"amp"</code> for &amp;amp;)
+	 * @param userData user storage space for data transient to 1 full buffer parse
+	 * @return <code>false</code> if was not handled and should be handled in
+	 * @return subclasses should return true if they handled the esc seq, or false if they did not.
+	 */
+	virtual bool handleEscapeString(SWBuf &buf, const char *escString, BasicFilterUserData *userData);
+
+	/** This function is called for all numeric escape sequences. If passThrough
+	 * @param buf the output buffer 
+	 * @param escString the escape sequence (e.g. <code>"#235"</code> for &amp;235;)
+	 * @return subclasses should return true if they handled the esc seq, or false if they did not.
+         */
+	virtual bool handleNumericEscapeString(SWBuf &buf, const char *escString);
+
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swbuf.h b/include/swbuf.h
new file mode 100644
index 0000000..0344299
--- /dev/null
+++ b/include/swbuf.h
@@ -0,0 +1,463 @@
+/******************************************************************************
+ *
+ *  swbuf.h -	code for SWBuf used as a transport and utility for data buffers
+ *
+ * $Id: swbuf.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWBUF_H
+#define SWBUF_H
+
+#include <defs.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef __BORLANDC__
+#include <mem.h>
+#endif
+
+SWORD_NAMESPACE_START
+
+
+#define JUNKBUFSIZE 65534
+
+/**
+* This class is used as a transport and utility for data buffers.
+*
+* @warning This class does not perform pointer validity checks (for speed reasons). 
+*	Therefore, never try to pass an invalid string (const char* 0) as an argument-
+*	it will crash your program. You need to perform the checks yourself!
+*/
+class SWDLLEXPORT SWBuf {
+	char *buf;
+	char *end;
+	char *endAlloc;
+	char fillByte;
+	unsigned long allocSize;
+
+	inline void assureMore(size_t pastEnd) {
+		if (size_t(endAlloc-end) < pastEnd) {
+			assureSize(allocSize + pastEnd);
+		}
+	}
+
+	inline void assureSize(size_t checkSize) {
+		if (checkSize > allocSize) {
+			long size = (end - buf);
+			checkSize += 128;
+			buf = (char *)((allocSize) ? realloc(buf, checkSize) : malloc(checkSize));
+			allocSize = checkSize;
+			end = (buf + size);
+			*end = 0;
+			endAlloc = buf + allocSize - 1;
+		}
+	}
+
+	inline void init(size_t initSize) {
+		fillByte = ' ';
+		allocSize = 0;
+		buf = nullStr;
+		end = buf;
+		endAlloc = buf;
+		if (initSize)
+			assureSize(initSize);
+	}
+
+
+public:
+
+	static char *nullStr;
+
+	/******************************************************************************
+	* SWBuf Constructor - Creates an empty SWBuf object
+	*
+	*/
+	inline SWBuf() {
+		init(0);
+	}
+
+	/**
+	* SWBuf Constructor - Creates an SWBuf initialized
+	* 		to a value from a const char *
+ 	*
+ 	*/
+	SWBuf(const char *initVal, unsigned long initSize = 0);
+//	SWBuf(unsigned long initSize);
+
+	/**
+	* SWBuf Constructor - Creates an SWBuf initialized
+	* 		to a value from a char
+	*
+	*/
+	SWBuf(char initVal, unsigned long initSize = 0);
+
+	/**
+	* SWBuf Constructor - Creates an SWBuf initialized
+	* 		to a value from another SWBuf
+	*
+	*/
+	SWBuf(const SWBuf &other, unsigned long initSize = 0);
+
+	/******************************************************************************
+	* SWBuf Destructor - Cleans up instance of SWBuf
+	*/
+	inline ~SWBuf() {
+		if ((buf) && (buf != nullStr))
+			free(buf);
+	}
+
+	/**
+	* SWBuf::setFillByte - Set the fillByte character
+	*
+	* @param ch This character is used when the SWBuf is (re)sized.
+	*   The memory will be filled with this character. \see setSize() \see resize()
+	*/
+	inline void setFillByte(char ch) { fillByte = ch; }
+
+	/**
+	* SWBuf::getFillByte - Get the fillByte character
+	*
+	* @return The character used for filling memory. \see setFillByte.
+	*/
+	inline char getFillByte() { return fillByte; }
+
+	/**
+	* @return a pointer to the buffer content (null-terminated string)
+	*/
+	inline const char *c_str() const{ return buf; }
+
+	/**
+	*	@param pos The position of the requested character.
+	* @return The character at the specified position
+	*/
+	inline char &charAt(unsigned long pos) { return ((pos <= (unsigned long)(end - buf)) ? buf[pos] : (*nullStr)); }
+
+	/** 
+	* @return size() and length() return only the number of characters of the string.
+	* Add one for the following null and one for each char to be appended!
+	*/
+	inline unsigned long size() const { return length(); }
+
+	/** 
+	 * set's the size of the buffer.  This is a quick inline method which checks
+	 * for changes before actually calling setSize().
+	 * @param newSize new size of the buffer
+	 */
+	inline void size(unsigned long newSize) { if (end - buf - newSize) setSize(newSize); }
+
+	/**
+	* @return size() and length() return only the number of characters of the string.
+	*/
+	inline unsigned long length() const { return end - buf; }
+
+	/**
+	* SWBuf::set - sets this buf to a new value
+	* If the allocated memory is bigger than the new string, it will NOT be resized.
+	* @param newVal the value to set this buffer to. 
+	*/
+	inline void set(const SWBuf &newVal) {
+		unsigned long len = newVal.length() + 1;
+		assureSize(len);
+//		const char *n = newVal.c_str();
+//		for (end = buf;len;len--) *end++ = *n++;
+		memcpy(buf, newVal.c_str(), len);
+		end = buf + (len - 1);
+	}
+
+	/**
+	* SWBuf::set - sets this buf to a new value.
+	* If the allocated memory is bigger than the new string, it will NOT be resized.
+	* @param newVal the value to set this buffer to. 
+	*/
+	inline void set(const char *newVal) {
+		if (newVal) {
+			unsigned long len = strlen(newVal) + 1;
+			assureSize(len);
+			memcpy(buf, newVal, len);
+			end = buf + (len - 1);
+		}
+		else {
+			assureSize(1);
+			end = buf;
+			*end = 0;
+		}
+	}
+
+	/**
+	* SWBuf::setFormatted - sets this buf to a formatted string.
+	* If the allocated memory is bigger than the new string, it will NOT be resized.
+	*
+	* @warning This function can only write at most JUNKBUFSIZE to the string per call.
+	*
+	* @warning This function is not very fast. For loops with many iterations you might
+	*  consider replacing it by other calls. 
+	*  Example: 
+	*    \code SWBuf buf.setFormatted("<%s>", stringVal); \endcode 
+	*  should be replaced by: 
+	*    \code buf.set("<"); buf.append(stringVal); buf.append(">"); \endcode
+	*  This will produce much faster results.
+	*
+	* @param format The format string. Same syntax as printf, for example.
+	* @param ... Add all arguments here.
+	*/
+	SWBuf &setFormatted(const char *format, ...);
+
+	/**
+	* SWBuf::setSize - Size this buffer to a specific length.
+	* @param len The new size of the buffer. One byte for the null will be added.
+	*/
+	void setSize(unsigned long len);
+	/**
+	* SWBuf::resize - Resize this buffer to a specific length.
+	* @param len The new size of the buffer. One byte for the null will be added.
+	*/
+	inline void resize(unsigned long len) { setSize(len); }
+
+	/**
+	* SWBuf::append - appends a value to the current value of this SWBuf.
+	* If the allocated memory is not enough, it will be resized accordingly.
+	* @param str Append this.
+	* @param max Append only max chars.
+	*/
+	SWBuf &append(const char *str, long max = -1);
+
+	/**
+	* SWBuf::append - appends a value to the current value of this SWBuf
+	* If the allocated memory is not enough, it will be resized accordingly.
+	* @param str Append this.
+	* @param max Append only max chars.
+	*/
+	inline SWBuf &append(const SWBuf &str, long max = -1) { return append(str.c_str(), max); }
+
+	/**
+	* SWBuf::append - appends a value to the current value of this SWBuf
+	* If the allocated memory is not enough, it will be resized accordingly.
+	* @param ch Append this.
+	*/
+	inline SWBuf &append(char ch) {
+		assureMore(1);
+		*end++ = ch;
+		*end = 0;
+		return *this;
+	}
+	inline SWBuf &append(const unsigned char ch) {
+		assureMore(1);
+		*end++ = ch;
+		*end = 0;
+		return *this;
+	}
+
+	/**
+	* SWBuf::append - appends a wide charachter value to the current value of this SWBuf
+	* If the allocated memory is not enough, it will be resized accordingly.
+	* NOTE: This is dangerous, as wchar_t is currently different sizes on different
+	* platforms (stupid windoze; stupid c++ spec for not mandating 4byte).
+	* @param ch Append this.
+	*/
+	inline SWBuf &append(wchar_t wch) {
+		assureMore(sizeof(wchar_t)*2);
+		for (unsigned int i = 0; i < sizeof(wchar_t); i++) *end++ = ((char *)&wch)[i];
+		for (unsigned int i = 0; i < sizeof(wchar_t); i++) end[i] = 0;
+		return *this;
+	}
+
+	/**
+	* SWBuf::appendFormatted - appends formatted strings to the current value of this SWBuf.
+	*
+	* @warning This function can only write at most JUNKBUFSIZE to the string per call.
+	*
+	* @warning This function is not very fast. For loops with many iterations you might
+	*  consider replacing it by other calls. 
+	*  Example: 
+	*    \code SWBuf buf.appendFormatted("<%s>", stringVal); \endcode 
+	*  should be replaced by: 
+	*    \code buf.append("<"); buf.append(stringVal); buf.append(">"); \endcode
+	*  This will produce much faster results.
+	*
+	* @param format The format string. Same syntax as printf, for example.
+	* @param ... Add all arguments here.
+	*/
+	SWBuf &appendFormatted(const char *format, ...);
+	
+	/** 
+	* SWBuf::insert - inserts the given string at position into this string
+	* @param pos The position where to insert. pos=0 inserts at the beginning, pos=1 after the first char, etc. Using pos=length() is the same as calling append(s)
+	* @param str string to be inserted
+	* @param start start from this position in the string to be inserted
+	* @param max Insert only max chars.
+	*/
+	void insert(unsigned long pos, const char* str, unsigned long start = 0, signed long max = -1);
+
+	/** 
+	* SWBuf::insert - inserts the given string at position into this string
+	* @param pos The position where to insert. pos=0 inserts at the beginning, pos=1 after the first char, etc. Using pos=length() is the same as calling append(s)
+	* @param str string to be inserted
+	* @param start start from this position in the string to be inserted
+	* @param max Insert only max chars.
+	*/
+	inline void insert(unsigned long pos, const SWBuf &str, unsigned long start = 0, signed long max = -1) {
+		insert(pos, str.c_str(), start, max);
+	};
+
+	/** 
+	* SWBuf::insert - inserts the given character at position into this string
+	* @param pos The position where to insert. pos=0 inserts at the beginning, pos=1 after the first char, etc. Using pos=length() is the same as calling append(s)
+	* @param c Insert this.
+	*/
+	inline void insert(unsigned long pos, char c) {
+		insert(pos, SWBuf(c));
+	}
+
+	/** SWBuf::getRawData
+	*
+	* @warning be careful! Probably setSize needs to be called in conjunction before and maybe after
+	*
+	* @return Pointer to the allocated memory of the SWBuf.
+	*/
+	inline char *getRawData() { return buf; }
+
+	inline operator const char *() const { return c_str(); }
+	inline char &operator[](unsigned long pos) { return charAt(pos); }
+	inline char &operator[](long pos) { return charAt((unsigned long)pos); }
+	inline char &operator[](unsigned int pos) { return charAt((unsigned long)pos); }
+	inline char &operator[](int pos) { return charAt((unsigned long)pos); }
+	inline SWBuf &operator =(const char *newVal) { set(newVal); return *this; }
+	inline SWBuf &operator =(const SWBuf &other) { set(other); return *this; }
+	inline SWBuf &operator +=(const char *str) { append(str); return *this; }
+	inline SWBuf &operator +=(char ch) { append(ch); return *this; }
+
+	/**
+	 * Decrease the buffer size, discarding the last characters
+	 * @param len how many bytes to decrease the buffer size
+	 */
+	inline SWBuf &operator -=(unsigned long len) { setSize(length()-len); return *this; }
+
+	/**
+	 * Decrease the buffer size, discarding the last character
+	 */
+	inline SWBuf &operator --(int) { operator -=(1); return *this; }
+
+	/**
+	 * Shift the buffer to the left, discarding the first bytes, decreasing the buffer size
+	 */
+	inline SWBuf &operator <<(unsigned long n) { if (n && length()) { n = (n<=length())?n:(length()-1); memmove(buf, buf+n, length()-n); (*this)-=n; } return *this; }
+
+	/**
+	 * Shift the buffer to the right, increasing the buffer size
+	 */
+	inline SWBuf &operator >>(unsigned long n) { setSize(length()+n); memmove(buf+n, buf, length()-n); return *this; }
+
+	/**
+	 * Concatenate another buffer to the end of this buffer
+	 */
+	inline SWBuf operator +(const SWBuf &other) const {
+		SWBuf retVal = buf;
+		retVal += other;
+		return retVal;
+	}
+
+	/**
+	 * Concatenate a byte to the end of this buffer
+	 */
+	inline SWBuf operator +(char ch) const { return (*this) + SWBuf(ch); }
+
+	/**
+	 * Trim whitespace from the start of this buffer, shifting the buffer left as necessary
+	 */
+	inline SWBuf &trimStart() { while (size() && (strchr("\t\r\n ", *(buf)))) *this << 1; return *this; }
+
+	/**
+	 * Trim whitespace from the end of this buffer, decreasing the size as necessary
+	 */
+	inline SWBuf &trimEnd() { while (size() && (strchr("\t\r\n ", *(end-1)))) setSize(size()-1); return *this; }
+
+	/**
+	 * Trim whitespace from the start and end of this buffer, shifting left and decreasing size as necessary
+	 */
+	inline SWBuf &trim() { trimStart(); return trimEnd(); }
+
+
+	/**
+	 * Strip a prefix from this buffer up to a separator byte.
+	 * Returns the prefix and modifies this buffer, shifting left to remove prefix
+	 * @param separator to use (e.g. ':')
+	 * @param endOfStringAsSeparator - also count end of string as separator.
+	 *                                 this is useful for tokenizing entire string like:
+	 *                                 x|y|z
+	 *                                 if true it will also include 'z'.
+	 *
+	 * @return prefix if separator character found; otherwise, null and leaves buffer unmodified
+	 */
+	inline const char *stripPrefix(char separator, bool endOfStringAsSeparator = false) { const char *m = strchr(buf, separator); if (!m && endOfStringAsSeparator) { if (*buf) { operator >>(1); *buf=0; end = buf; return buf + 1;} else return buf; } if (m) { int len = m-buf; char *hold = new char[len]; memcpy(hold, buf, len); *this << (len+1); memcpy(end+1, hold, len); delete [] hold; end[len+1] = 0; } return (m) ? end+1 : 0; }  // safe.  we know we don't actually realloc and shrink buffer when shifting, so we can place our return val at end.
+
+	// this could be nicer, like replacing a contiguous series of target bytes with single replacement; offering replacement const char *
+	/**
+	 * Replace with a new byte value all occurances in this buffer of any byte value specified in a set
+	 * @param targets a set of bytes, any of which will be replaced
+	 * @param newByte value to use as replacement.
+	 *
+	 * Example: replaceBytes("abc", 'z');  // replaces all occurances of 'a', 'b', and 'c' with 'z'
+	 */
+	inline SWBuf &replaceBytes(const char *targets, char newByte) { for (unsigned int i = 0; (i < size()); i++) { if (strchr(targets, buf[i])) buf[i] = newByte; } return *this; }
+
+	/**
+	 * @return returns true if this buffer starts with the specified prefix
+	 */
+	inline bool startsWith(const SWBuf &prefix) const { return !strncmp(c_str(), prefix.c_str(), prefix.size()); }
+
+	/**
+	 * @return returns true if this buffer ends with the specified postfix
+	 */
+	inline bool endsWith(const SWBuf &postfix) const { return (size() >= postfix.size())?!strncmp(end-postfix.size(), postfix.c_str(), postfix.size()):false; }
+
+	/**
+	 * @return returns the index of a substring if it is found in this buffer; otherwise, returns < 0
+	 */
+	inline long indexOf(const SWBuf &needle) const { const char *ch = strstr(buf, needle.c_str()); return (ch) ? ch - buf : -1; }
+	
+	inline int compare(const SWBuf &other) const { return strcmp(c_str(), other.c_str()); }
+	inline bool operator ==(const SWBuf &other) const { return compare(other) == 0; }
+	inline bool operator !=(const SWBuf &other) const { return compare(other) != 0; }
+	inline bool operator > (const SWBuf &other) const { return compare(other) > 0; }
+	inline bool operator < (const SWBuf &other) const { return compare(other) < 0; }
+	inline bool operator <=(const SWBuf &other) const { return compare(other) <= 0; }
+	inline bool operator >=(const SWBuf &other) const { return compare(other) >= 0; }
+
+	/**
+	 * @return returns true if this buffer starts with the specified prefix
+	 */
+	inline bool startsWith(const char *prefix) const { return !strncmp(c_str(), prefix, strlen(prefix)); }
+
+	/**
+	 * @return returns true if this buffer ends with the specified postfix
+	 */
+	inline bool endsWith(const char *postfix) const { unsigned int psize = strlen(postfix); return (size() >= psize)?!strncmp(end-psize, postfix, psize):false; }
+
+	// be sure we've been given a valid pointer to compare.  If not, we return !=; specifically less-than, for lack of better options
+	inline int compare(const char *other) const { return (other?strcmp(c_str(), other):-1); }
+	inline bool operator ==(const char *other) const { return compare(other) == 0; }
+	inline bool operator !=(const char *other) const { return compare(other) != 0; }
+	inline bool operator > (const char *other) const { return other && compare(other) > 0; }
+	inline bool operator < (const char *other) const { return other && compare(other) < 0; }
+	inline bool operator <=(const char *other) const { return other && compare(other) <= 0; }
+	inline bool operator >=(const char *other) const { return other && compare(other) >= 0; }
+};
+
+
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swcacher.h b/include/swcacher.h
new file mode 100644
index 0000000..55374e8
--- /dev/null
+++ b/include/swcacher.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  swcacher.h -	definition of class SWCacher used to provide an
+ *			interface for objects that cache and want a standard
+ *			interface for cleaning up.
+ *
+ * $Id: swcacher.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWCACHER_H
+#define SWCACHER_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+/** used to provide an interface for objects that cache and want
+ *	a standard interface for cleaning up.
+ */
+class SWDLLEXPORT  SWCacher {
+public:
+	SWCacher();
+	virtual ~SWCacher();
+	virtual void flush();
+	virtual long resourceConsumption();
+	virtual long lastAccess();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swcipher.h b/include/swcipher.h
new file mode 100644
index 0000000..46e10b4
--- /dev/null
+++ b/include/swcipher.h
@@ -0,0 +1,54 @@
+/******************************************************************************
+ *
+ *  swcipher.h -	definition of Class SWCipher used for data
+ *			cipher/decipher
+ *
+ * $Id: swcipher.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWCIPHER_H
+#define SWCIPHER_H
+
+#include <sapphire.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT SWCipher
+{
+
+  sapphire master;
+  sapphire work;
+
+  char *buf;
+  bool cipher;
+  unsigned long len;
+protected:
+public:
+    SWCipher (unsigned char *key);
+  virtual void setCipherKey (const char *key);
+    virtual ~ SWCipher ();
+  virtual char *Buf (const char *buf = 0, unsigned long len = 0);
+  virtual char *cipherBuf (unsigned long *len, const char *buf = 0);
+  virtual void Encode (void);
+  virtual void Decode (void);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swcom.h b/include/swcom.h
new file mode 100644
index 0000000..ec2222b
--- /dev/null
+++ b/include/swcom.h
@@ -0,0 +1,86 @@
+/******************************************************************************
+ *
+ *  swcom.h -	code for base class 'SWCom'.  SWCom is the basis for all
+ *		types of commentary modules.
+ *		It is traditionally close to the same as the SWText
+ *		module type, but has defaults set which more
+ *		closely represent how a commentary will be used and how
+ *		the bulk of our commentaries expect to be used.  For example,
+ *		most commentaries consist of entries for a range of text
+ *		(Matt.1.1-6: "Matthew begins with by telling us...").  This
+ *		same entry will be returned when any verse between Matt.1.1-6
+ *		is requested from the engine.  This is done with verse linking.
+ *		Since linking is used heavily in commentaries, the flag
+ *		skipConsecutiveLinks is defaulted to true so when the
+ *		commentary is incremented, it will go to the next ENTRY,
+ *		not the next verse (likely Matt.1.7, from our example above).
+ *
+ * $Id: swcom.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWCOM_H
+#define SWCOM_H
+
+#include <swmodule.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class VerseKey;
+class SWKey;
+
+  /** The basis for all commentary modules
+  */
+class SWDLLEXPORT SWCom : public SWModule {
+
+	mutable VerseKey *tmpVK1;
+	mutable VerseKey *tmpVK2;
+        mutable bool tmpSecond;
+	char *versification;
+
+protected:
+	VerseKey &getVerseKey(const SWKey *key = 0) const;
+
+
+public:
+
+	/** Initializes data for instance of SWCom
+	*/
+	SWCom(const char *imodname = 0, const char *imoddesc = 0,
+			SWDisplay *idisp = 0, SWTextEncoding enc = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup mark = FMT_UNKNOWN, const char *ilang = 0,
+			const char *versification = "KJV");
+
+	virtual ~SWCom();
+	virtual SWKey *createKey() const;
+
+	virtual long getIndex() const;
+	virtual void setIndex(long iindex);
+
+
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swcomprs.h b/include/swcomprs.h
new file mode 100644
index 0000000..9b06fe1
--- /dev/null
+++ b/include/swcomprs.h
@@ -0,0 +1,50 @@
+/******************************************************************************
+ *
+ *  swcomprs.h -	definition of Class SWCompress used for data
+ *			compression
+ *
+ * $Id: swcomprs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWCOMPRS_H
+#define SWCOMPRS_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT SWCompress
+{
+  void Init ();
+  void cycleStream ();
+protected:
+  char *buf, *zbuf, direct;	// 0 - encode; 1 - decode
+  unsigned long zlen, zpos, pos, slen;
+public:
+    SWCompress ();
+    virtual ~ SWCompress ();
+  virtual char *Buf (const char *buf = 0, unsigned long *len = 0);
+  virtual char *zBuf (unsigned long *len, char *buf = 0);
+  virtual unsigned long GetChars (char *buf, unsigned long len);	// override for other than buffer compression
+  virtual unsigned long SendChars (char *buf, unsigned long len);	// override for other than buffer compression
+  virtual void Encode (void);	// override to provide compression algorythm
+  virtual void Decode (void);	// override to provide compression algorythm
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swconfig.h b/include/swconfig.h
new file mode 100644
index 0000000..71fe735
--- /dev/null
+++ b/include/swconfig.h
@@ -0,0 +1,89 @@
+/******************************************************************************
+ *
+ *  swconfig.h -	definition of Class SWConfig used for saving and
+ *			retrieval of configuration information
+ *
+ * $Id: swconfig.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWCONFIG_H
+#define SWCONFIG_H
+
+#include <map>
+
+#include <defs.h>
+#include <multimapwdef.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+typedef multimapwithdefault < SWBuf, SWBuf, std::less < SWBuf > >ConfigEntMap;
+typedef std::map < SWBuf, ConfigEntMap, std::less < SWBuf > >SectionMap;
+
+/** The class to read and save settings using a file on disk.
+*
+*/
+class SWDLLEXPORT SWConfig {
+private:
+	char getline(int fd, SWBuf &line);
+public:
+	/** The filename used by this SWConfig object
+	*
+	*/
+	SWBuf filename;
+	/** Map of available sections
+	* The map of available sections.
+	*/
+	SectionMap Sections;
+
+	/** Constructor of SWConfig
+	* @param ifilename The file, which should be used for this config.
+	*/
+	SWConfig(const char *ifilename);
+	SWConfig();
+	virtual ~SWConfig();
+
+	/** Load from disk
+	* Load the content from disk.
+	*/
+	virtual void Load();
+
+	/** Save to disk
+	* Save the content of this config object to disk.
+	*/
+	virtual void Save();
+
+	/** Merges the values of addFrom
+	* @param addFrom The config which values should be merged to this config object. Already existing values will be overwritten.
+	*/
+	virtual void augment(SWConfig &addFrom);
+	virtual SWConfig & operator +=(SWConfig &addFrom) { augment(addFrom); return *this; }
+
+	/** Get a section
+	* This is an easy way to get and store config values.
+	* The following will work:\n
+	*
+	* @code
+	* SWConfig config("/home/user/.setttings");
+	* config["Colors"]["Background"] = "red";
+	* @endcode
+	*/
+	virtual ConfigEntMap & operator [](const char *section);
+	};
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swdisp.h b/include/swdisp.h
new file mode 100644
index 0000000..f18e03d
--- /dev/null
+++ b/include/swdisp.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  swdisp.h -	code for base class 'swdisp'.  swdisp is the basis for all
+ *		types of displays (e.g. raw textout, curses, xwindow, etc.)
+ *
+ * $Id: swdisp.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWDISP_H
+#define SWDISP_H
+
+#include <swobject.h>
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWModule;
+
+/** swdisp is the basis for all types of displays
+* (e.g. raw textout, curses, xwindow, etc.)
+*/
+class SWDLLEXPORT SWDisplay : public SWObject {
+  static SWClass classdef;
+public:
+  SWDisplay() { myclass = &classdef; };
+  virtual ~SWDisplay() {};
+  
+  /** casts a module to a character pointer and displays it to
+  * raw output (overriden for different display types and
+  * module types if necessary)
+  *
+  * @param imodule module to display
+  * @return error status
+  */
+  virtual char display(SWModule &imodule) = 0;
+  SWDEPRECATED char Display(SWModule &imodule) { return display(imodule); }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swfilter.h b/include/swfilter.h
new file mode 100644
index 0000000..4dbba82
--- /dev/null
+++ b/include/swfilter.h
@@ -0,0 +1,63 @@
+/******************************************************************************
+ *
+ *  swfilter.h -	definition of class SWFilter used to filter text between
+ *		       	different formats
+ *
+ * $Id: swfilter.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWFILTER_H
+#define SWFILTER_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWKey;
+class SWBuf;
+class SWModule;
+
+
+class SWModule;
+
+/** Base class for all filters in sword.
+* Filters are used to filter/convert text between different formats
+* like GBF, HTML, RTF ...
+*/
+class SWDLLEXPORT  SWFilter {
+public:
+	virtual ~SWFilter() {}
+
+	/** This method processes and appropriately modifies the text given it
+	 *	for a particular filter task
+	 *
+	 * @param text The text to be filtered/converted
+	 * @param key Current key That was used.
+	 * @param module Current module.
+	 * @return 0
+	 */
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0) = 0;
+
+	/** This method can supply a header associated with the processing done with this filter.
+	 *	A typical example is a suggested CSS style block for classed containers.
+	 */
+	virtual const char *getHeader() const { return ""; }
+};
+
+	SWORD_NAMESPACE_END
+#endif
diff --git a/include/swfiltermgr.h b/include/swfiltermgr.h
new file mode 100644
index 0000000..2160d5a
--- /dev/null
+++ b/include/swfiltermgr.h
@@ -0,0 +1,88 @@
+/******************************************************************************
+ *
+ *  swfiltermgr.h -	definition of class SWFilterMgr used as an interface to
+ *			manage filters on a module
+ *
+ * $Id: swfiltermgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWFILTERMGR_H
+#define SWFILTERMGR_H
+
+#include <defs.h>
+#include <swconfig.h>
+
+SWORD_NAMESPACE_START
+
+class SWModule;
+class SWMgr;
+
+/** Class to manage different kinds of filters.
+*/
+class SWDLLEXPORT SWFilterMgr {
+
+private:
+	SWMgr *parentMgr;
+
+public:
+  SWFilterMgr();
+  virtual ~SWFilterMgr();
+
+  virtual void setParentMgr(SWMgr *parentMgr);
+  virtual SWMgr *getParentMgr();
+
+  virtual void AddGlobalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start,
+				 ConfigEntMap::iterator end);
+  virtual void AddLocalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start,
+				ConfigEntMap::iterator end);
+
+
+  /**
+    * Adds the encoding filters which are defined in "section" to the SWModule object "module".
+    * @param module To this module the encoding filter(s) are added
+    * @param section We use this section to get a list of filters we should apply to the module
+    */
+  virtual void AddEncodingFilters(SWModule *module, ConfigEntMap &section);
+
+
+    /**
+    * Adds the render filters which are defined in "section" to the SWModule object "module".
+    * @param module To this module the render filter(s) are added
+    * @param section We use this section to get a list of filters we should apply to the module
+    */
+  virtual void AddRenderFilters(SWModule *module, ConfigEntMap &section);
+
+
+  /**
+    * Adds the strip filters which are defined in "section" to the SWModule object "module".
+    * @param module To this module the strip filter(s) are added
+    * @param section We use this section to get a list of filters we should apply to the module
+    */
+  virtual void AddStripFilters(SWModule *module, ConfigEntMap &section);
+
+
+  /**
+    * Adds the raw filters which are defined in "section" to the SWModule object "module".
+    * @param module To this module the raw filter(s) are added
+    * @param section We use this section to get a list of filters we should apply to the module
+    */
+  virtual void AddRawFilters(SWModule *module, ConfigEntMap &section);
+
+};
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swgenbook.h b/include/swgenbook.h
new file mode 100644
index 0000000..b463fff
--- /dev/null
+++ b/include/swgenbook.h
@@ -0,0 +1,62 @@
+/******************************************************************************
+ *
+ *  swgenbook.h -	Implementation of SWGenBook
+ *
+ * $Id: swgenbook.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWGENBOOK_H
+#define SWGENBOOK_H
+
+#include <defs.h>
+
+#include <swmodule.h>
+#include <treekey.h>
+
+
+SWORD_NAMESPACE_START
+
+/** The basis for all Book modules.
+*/
+class SWDLLEXPORT SWGenBook : public SWModule {
+
+protected:
+	mutable char *entkeytxt;
+	mutable TreeKey *tmpTreeKey;
+	TreeKey &getTreeKey(const SWKey *k = 0) const;
+
+public:
+	/** Initializes data for instance of SWGenBook
+	*/
+	SWGenBook(const char *imodname = 0, const char *imoddesc = 0,
+			SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0);
+
+	virtual ~SWGenBook();
+	virtual SWKey *createKey() const = 0;
+
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swinputmeth.h b/include/swinputmeth.h
new file mode 100644
index 0000000..b1ad274
--- /dev/null
+++ b/include/swinputmeth.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ *  swinputmeth.h -	Implementation of SWInputMethod
+ *
+ * $Id: swinputmeth.h 2833 2013-06-29 06:40:28Z chrislit $
+ * 
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWINPUTMETHOD_H
+#define SWINPUTMETHOD_H
+
+#include <defs.h>
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT SWInputMethod {
+
+private:
+    int state;
+
+protected:
+    virtual void setState(int state);
+
+public:
+    SWInputMethod();
+    virtual ~SWInputMethod() {}
+
+    virtual int *translate(char in) = 0;
+    virtual int getState();
+    virtual void clearState();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swkey.h b/include/swkey.h
new file mode 100644
index 0000000..89786f0
--- /dev/null
+++ b/include/swkey.h
@@ -0,0 +1,232 @@
+/******************************************************************************
+ *
+ *  swkey.h -	code for base class 'swkey'.  swkey is the basis for all
+ *		types of keys for indexing into modules (e.g. verse, word,
+ *		place, etc.)
+ *
+ * $Id: swkey.h 2926 2013-07-31 02:06:33Z scribe $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWKEY_H
+#define SWKEY_H
+
+#include <swobject.h>
+
+#include <defs.h>
+#include <sysdata.h>
+#include <utilstr.h>
+
+SWORD_NAMESPACE_START
+
+#define KEYERR_OUTOFBOUNDS 1
+
+#define SWKEY_OPERATORS \
+  SWKey &operator =(const char *ikey) { setText(ikey); return *this; } \
+  SWKey &operator =(const SWKey &ikey) { positionFrom(ikey); return *this; } \
+  SWKey &operator =(SW_POSITION pos) { setPosition(pos); return *this; } \
+  operator const char *() const { return getText(); } \
+  bool operator ==(const SWKey &ikey) { return equals(ikey); } \
+  bool operator !=(const SWKey &ikey) { return !equals(ikey); } \
+  virtual bool operator >(const SWKey &ikey) { return (compare(ikey) > 0); } \
+  virtual bool operator <(const SWKey &ikey) { return (compare(ikey) < 0); } \
+  virtual bool operator >=(const SWKey &ikey) { return (compare(ikey) > -1); }  \
+  virtual bool operator <=(const SWKey &ikey) { return (compare(ikey) < 1); } \
+  SWKey &operator -=(int steps) { decrement(steps); return *this; } \
+  SWKey &operator +=(int steps) { increment(steps); return *this; } \
+  SWKey &operator ++()    { increment(1); return *this; } \
+  SWKey  operator ++(int) { SWKey temp = *this; increment(1); return temp; } \
+  SWKey &operator --()    { decrement(1); return *this; } \
+  SWKey  operator --(int) { SWKey temp = *this; decrement(1); return temp; }
+
+
+/** For use with = operator to position key.
+*/
+class SW_POSITION {
+	char pos;
+public:
+	SW_POSITION(char ipos) { pos = ipos; }
+	operator char() { return pos; }
+};
+
+#define POS_TOP ((char)1)
+#define POS_BOTTOM ((char)2)
+
+#define TOP SW_POSITION(POS_TOP)
+#define BOTTOM SW_POSITION(POS_BOTTOM)
+
+class SWLocale;
+
+/** SWKey is used for positioning an SWModule to a specific entry.
+ *	It always represents a possible location into a module and can additionally represent
+ *	a domain of entries (e.g. "John 3:16" in the domain "John 1:1 - Mark 5:25")
+ */
+class SWDLLEXPORT SWKey : public SWObject {
+
+	class LocaleCache {
+	public:
+		char *name;
+		SWLocale *locale;
+			LocaleCache() {
+			name = 0;
+			locale = 0;
+		}
+		 virtual ~LocaleCache() {
+			if (name)
+			delete[]name;
+		}
+	};
+	static LocaleCache localeCache;
+	// for caching; don't use directly, call getPrivateLocale()
+	mutable SWLocale *locale;
+
+
+	long index;
+	static SWClass classdef;
+	void init();
+
+
+protected:
+	char *keytext;
+	mutable char *rangeText;
+	mutable bool boundSet;
+	bool persist;
+	mutable char error;
+
+	char *localeName;
+	SWLocale *getPrivateLocale() const;
+
+
+public:
+
+	// misc storage for whatever
+	__u64 userData;
+
+	/** initializes instance of SWKey from a string
+	 * All keys can be reduced to a string representation which should be able
+	 *	to be used to again set the key to the same position
+	 * @param ikey string to use for initializing this new key
+	 */
+	SWKey(const char *ikey = 0);
+
+	/** Copy Constructor
+	 * @param k The SWKey object to copy.
+	 */
+	SWKey(const SWKey &k);
+
+	/** Destructor, cleans up this instance of SWKey
+	 */
+	virtual ~SWKey();
+
+	/** Returns a new exact clone of this SWKey object.  This allocates
+	 * a new SWKey which must be deleted by the caller
+	 * @return new clone of this key
+	 */
+	virtual SWKey *clone() const;
+
+
+	/** Gets whether this key should persist in any module to which it is set
+	 * otherwise just a copy will be used in the module.
+	 * @return 1 - persists in module; 0 - a copy is attempted
+	 */
+	bool isPersist() const;
+	SWDEPRECATED char Persist() const { return isPersist(); }
+
+	/** Sets whether this key should persist in any module to which it is set
+	 * otherwise just a copy will be used in the module.
+	 * @param ipersist value which to set persist;
+	 * @return 1 - persists in module; 0 - a copy is attempted
+	 */
+	SWDEPRECATED char Persist(signed char ipersist) { setPersist(ipersist!=0); return isPersist(); }
+	void setPersist(bool ipersist);
+
+	/** Gets and clears error status
+	 * @return error status
+	 */
+	SWDEPRECATED char Error() { return popError(); }
+	virtual char popError();
+	virtual void setError(char err) { error = err; }
+
+	/** Sets this SWKey with a character string
+	 * @param ikey string used to set this key
+	 */
+	virtual void setText(const char *ikey);
+
+	/** Copies as much info (position, range, etc.) as possible from another SWKey object
+	 * @param ikey other SWKey object from which to copy
+	 */
+	virtual void copyFrom(const SWKey &ikey);
+	virtual void positionFrom(const SWKey &ikey) { copyFrom(ikey); }
+
+	/** returns string representation of this key
+	 */
+	virtual const char *getText() const;
+	virtual const char *getShortText() const { return getText(); }
+	virtual const char *getRangeText() const;
+	virtual const char *getOSISRefRangeText() const;
+	virtual bool isBoundSet() const { return boundSet; }
+	virtual void clearBound() const { boundSet = false; }
+
+	/** Compares this key object to another SWKey object
+	 * @param ikey key to compare with this one
+	 * @return >0 if this key is greater than compare key;
+	 *	<0 if this key is smaller than compare key;
+	 *	0 if the keys are the same
+	 */
+	virtual int compare(const SWKey &ikey);
+
+	/** test equality of this SWKey object's position with another SWKey
+	 * @param ikey key to compare with this one
+	 * @return true if the key positions are equal
+	 */
+	virtual bool equals(const SWKey &ikey) { return !compare(ikey); }
+
+	virtual void setPosition(SW_POSITION);
+
+	/** Decrements key a number of entry positions
+	 * This is only valid if isTraversable is true
+	 * @param steps Number of entries to jump backward
+	 */
+	virtual void decrement(int steps = 1);
+
+	/** Increments key a number of entry positions
+	 * This is only valid if isTraversable is true
+	 * @param steps Number of entries to jump forward
+	 */
+	virtual void increment(int steps = 1);
+
+	/** Whether or not this key can be ++ -- incremented
+	 */
+	virtual bool isTraversable() const { return false; }
+
+	char *getLocale() const { return localeName; }
+	void setLocale(const char *name) { stdstr(&localeName, name); locale = 0;	} // this will force an on demand lookup of our locale
+
+	/** Use this function to get an index position within a module.
+	 */
+	virtual long getIndex() const { return index; }
+
+	/** See documentation for @ref Index()
+	 */
+	virtual void setIndex(long iindex) { index = iindex; }
+
+	SWKEY_OPERATORS
+
+	};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swld.h b/include/swld.h
new file mode 100644
index 0000000..397a0bc
--- /dev/null
+++ b/include/swld.h
@@ -0,0 +1,75 @@
+/******************************************************************************
+ *
+ *  swld.h -	code for base class 'SWLD'.  SWLD is the basis for all
+ *		types of Lexicon and Dictionary modules (hence the 'LD').
+ *
+ * $Id: swld.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWLD_H
+#define SWLD_H
+
+#include <swmodule.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+  /** the basis for all types of Lexicon and
+  * Dictionary modules (hence the 'LD').
+  */
+class SWDLLEXPORT SWLD : public SWModule {
+protected:
+	mutable char *entkeytxt;
+	static void strongsPad(char *buf);
+	bool strongsPadding;
+public:
+	/** Initializes data for instance of SWLD
+	*/
+	SWLD(const char *imodname = 0, const char *imoddesc = 0,
+			SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool strongsPadding = true);
+	
+	virtual ~SWLD();
+	virtual SWKey *createKey() const;
+
+	/** Sets/gets module KeyText, getting from saved text if key is persistent
+	*
+	* @param ikeytext value which to set keytext;
+	*  [0] - only get
+	* @return pointer to keytext
+	*/
+	virtual const char *getKeyText() const;
+	virtual void setPosition(SW_POSITION pos);
+
+
+	virtual long getEntryCount() const = 0;
+	virtual long getEntryForKey(const char *key) const = 0;
+	virtual char *getKeyForEntry(long entry) const = 0;
+	
+	virtual bool hasEntry(const SWKey *k) const;
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swlocale.h b/include/swlocale.h
new file mode 100644
index 0000000..94ee17a
--- /dev/null
+++ b/include/swlocale.h
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
+ *  swlocale.h -	definition of Class SWLocale used for retrieval
+ *		       	of locale lookups
+ *
+ * $Id: swlocale.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWLOCALE_H
+#define SWLOCALE_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWConfig;
+static const int ENDOFABBREVS = -2;
+
+/** SWLocale is used for the localisation of the booknames
+* The SWLocale is a class which holds the information of one language.
+* Every language supported by SWORD has one SWLocale object, 
+* get the name of the Language using @see getname of this class.
+* Another functions useful for frontend developers is @see getDescription.
+*/
+class SWDLLEXPORT SWLocale {
+
+class Private;
+
+	Private *p;
+
+	SWConfig *localeSource;
+
+	char *name;
+	char *description;
+	char *encoding;
+	struct abbrev *bookAbbrevs;
+	int abbrevsCnt;
+	const char **bookLongNames;
+	const char **bookPrefAbbrev;
+
+public:
+	SWLocale(const char *ifilename);
+	virtual ~SWLocale();
+
+	/**
+	* This function is used to get the name of the languages which this object is handling.
+	* @return The name of the managed language. A possible example is "de".
+	*/
+	virtual const char *getName();
+	/**
+	* @return The description. A possible example is "German".
+	*/
+	virtual const char *getDescription();
+	virtual const char *getEncoding();
+	virtual const char *translate(const char *text);
+	virtual void augment(SWLocale &addFrom);
+	virtual SWLocale & operator +=(SWLocale &addFrom) { augment(addFrom); return *this; }
+	virtual const struct abbrev *getBookAbbrevs(int *retSize);
+	static const char *DEFAULT_LOCALE_NAME;
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swlog.h b/include/swlog.h
new file mode 100644
index 0000000..ab6fc58
--- /dev/null
+++ b/include/swlog.h
@@ -0,0 +1,64 @@
+/******************************************************************************
+ *
+ *  swlog.h -	definition of class SWLog used for logging messages
+ *
+ * $Id: swlog.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+#ifndef swlogH
+#define swlogH
+//---------------------------------------------------------------------------
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT SWLog {
+protected:
+	char logLevel;
+	static SWLog *systemLog;
+
+public:
+
+	static const int LOG_ERROR;
+	static const int LOG_WARN;
+	static const int LOG_INFO;
+	static const int LOG_TIMEDINFO;
+	static const int LOG_DEBUG;
+
+	static SWLog *getSystemLog();
+	static void setSystemLog(SWLog *newLogger);
+
+	SWLog() { logLevel = 1;	/*default to show only errors*/}
+	virtual ~SWLog() {};
+
+	void setLogLevel(char level) { logLevel = level; }
+	char getLogLevel() const { return logLevel; }
+	void logWarning(const char *fmt, ...) const;
+	void logError(const char *fmt, ...) const;
+	void logInformation(const char *fmt, ...) const;
+	virtual void logTimedInformation(const char *fmt, ...) const;
+	void logDebug(const char *fmt, ...) const;
+
+	// Override this method if you want to have a custom logger
+	virtual void logMessage(const char *message, int level) const;
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swmacs.h b/include/swmacs.h
new file mode 100644
index 0000000..8502912
--- /dev/null
+++ b/include/swmacs.h
@@ -0,0 +1,33 @@
+/******************************************************************************
+ *
+ *  swmacs.h -	generic macros
+ *
+ * $Id: swmacs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWMACS_H
+#define SWMACS_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+// Maximum positive value of a signed numeric type
+#define MAXPOS(x) ((x)((unsigned x)(1L << (sizeof(x)*8-1)) - 1))
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swmgr.h b/include/swmgr.h
new file mode 100644
index 0000000..5c98d11
--- /dev/null
+++ b/include/swmgr.h
@@ -0,0 +1,365 @@
+/******************************************************************************
+ *
+ *  swmgr.h -	definition of class SWMgr used to interact with an install
+ *		base of sword modules.
+ *
+ * $Id: swmgr.h 2941 2013-08-03 07:08:24Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/** @mainpage The SWORD Project - API documentation
+ * This is the API documentation for The SWORD Project.
+ * It describes the structure of the SWORD library and documents the functions of the classes.
+ * From time to time this documentation gives programming examples, too.
+ *
+ * SWORD provides a simple to use engine for working with many types of texts including Bibles,
+ *	commentaries, lexicons, glossaries, daily devotionals, and others.
+ *
+ * Some main classes:
+ *
+ * SWMgr gives access to an installed library of modules (books).
+ * SWModule represents an individual module
+ * SWKey represents a location into a module (e.g. "John 3:16")
+ *
+ * An API Primer can be found at:
+ *
+ * http://crosswire.org/sword/develop/swordapi/apiprimer.jsp
+ *
+ * If you're interested in working on a client which uses SWORD, please first have a look at
+ *	some of the existing ones.  They can always use help, and will also prove to be good examples
+ *	if you decide to start a new project.
+ *
+ * Well known frontends are:
+ *	-BibleTime (http://www.bibletime.info)
+ *	-BPBible (http://bpbible.com)
+ *	-Eloquent (http://www.macsword.com)
+ *	-PocketSword (http://crosswire.org/pocketsword/)
+ *	-SWORD for Windows (http://crosswire.org/sword/software/biblecs/)
+ *	-Xiphos (http://xiphos.org) 
+ */
+
+#ifndef SWMGR_H
+#define SWMGR_H
+
+#include <map>
+#include <list>
+#include <swbuf.h>
+#include <swconfig.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWModule;
+class SWFilter;
+class SWOptionFilter;
+class SWFilterMgr;
+class SWBuf;
+class SWKey;
+
+typedef std::map < SWBuf, SWModule *, std::less < SWBuf > >ModMap;
+typedef std::map < SWBuf, SWFilter * >FilterMap;
+typedef std::map < SWBuf, SWOptionFilter * >OptionFilterMap;
+typedef std::list < SWBuf >StringList;
+typedef std::list < SWFilter* >FilterList;
+typedef std::list < SWOptionFilter* >OptionFilterList;
+
+class FileDesc;
+class SWOptionFilter;
+
+/** SWMgr exposes an installed module set
+ *
+ * SWMgr exposes an installed module set and can be asked to configure the desired
+ *	markup and options which modules will produce.
+ *
+ * @version $Id: swmgr.h 2941 2013-08-03 07:08:24Z chrislit $
+ */
+class SWDLLEXPORT SWMgr {
+private:
+	bool mgrModeMultiMod;
+	bool augmentHome;
+	void commonInit(SWConfig *iconfig, SWConfig *isysconfig, bool autoload, SWFilterMgr *filterMgr, bool multiMod = false);
+
+protected:
+	SWFilterMgr *filterMgr;		//made protected because because BibleTime needs it
+	SWConfig *myconfig;		//made protected because because BibleTime needs it
+	SWConfig *mysysconfig;
+	SWConfig *homeConfig;
+	void CreateMods(bool multiMod = false);
+	virtual SWModule *createModule(const char *name, const char *driver, ConfigEntMap &section);
+	void DeleteMods();
+	char configType;		// 0 = file; 1 = directory
+	OptionFilterMap optionFilters;
+	FilterMap cipherFilters;
+	SWFilter *gbfplain;
+	SWFilter *thmlplain;
+	SWFilter *osisplain;
+	SWFilter *teiplain;
+	SWOptionFilter *transliterator;
+	FilterList cleanupFilters;
+	FilterMap extraFilters;
+	StringList options;
+	virtual void init(); // use to initialize before loading modules
+	virtual char AddModToConfig(FileDesc *conffd, const char *fname);
+	virtual void loadConfigDir(const char *ipath);
+	virtual void AddGlobalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end);
+	virtual void AddLocalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end);
+	StringList augPaths;
+
+	/**
+	 * Called to add appropriate Encoding Filters to a module.  Override to do special actions,
+	 *	if desired.	See the module.conf Encoding= entry.
+	 * @param module module to which to add Encoding Filters
+	 * @param section configuration information from module.conf
+	 */
+	virtual void AddEncodingFilters(SWModule *module, ConfigEntMap &section);
+
+	/**
+	 * Called to add appropriate Render Filters to a module.  Override to do special actions,
+	 *	if desired.	See the module.conf SourceType= entry.
+	 * @param module module to which to add Render Filters
+	 * @param section configuration information from module.conf
+	 */
+	virtual void AddRenderFilters(SWModule *module, ConfigEntMap &section);
+
+	/**
+	 * Called to add appropriate Strip Filters to a module.  Override to do special actions,
+	 *	if desired.	See the module.conf SourceType= entry.
+	 * @param module module to which to add Strip Filters
+	 * @param section configuration information from module.conf
+	 */
+	virtual void AddStripFilters(SWModule *module, ConfigEntMap &section);
+
+	// ones manually specified in .conf file
+	virtual void AddStripFilters(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end);
+
+	/**
+	 * Called to add appropriate Raw Filters to a module.  Override to do special actions,
+	 *	if desired.	See the module.conf CipherKey= entry.
+	 * @param module module to which to add Raw Filters
+	 * @param section configuration information from module.conf
+	 */
+	virtual void AddRawFilters(SWModule *module, ConfigEntMap &section);
+
+
+public:
+
+	// constants which represent module types used in SWModule::getType
+	static const char *MODTYPE_BIBLES;
+	static const char *MODTYPE_COMMENTARIES;
+	static const char *MODTYPE_LEXDICTS;
+	static const char *MODTYPE_GENBOOKS;
+	static const char *MODTYPE_DAILYDEVOS;
+
+
+	static bool isICU;
+	static const char *globalConfPath;
+	static SWBuf getHomeDir();
+
+	/**
+	 *
+	 */
+	static void findConfig(char *configType, char **prefixPath, char **configPath, StringList *augPaths = 0, SWConfig **providedSysConf = 0);
+
+	SWConfig *config;
+	SWConfig *sysConfig;
+
+	/** The path to main module set and locales
+	 */
+	char *prefixPath;
+
+	/** path to main module set configuration 
+	 */
+	char *configPath;
+
+	/** The map of available modules.
+	 *	This map exposes the installed modules.
+	 *	Here's an example how to iterate over the map and check the module type of each module.
+	 *
+	 *@code
+	 * ModMap::iterator it;
+	 * SWModule *curMod = 0;
+	 *
+	 * for (it = Modules.begin(); it != Modules.end(); it++) {
+	 *      curMod = (*it).second;
+	 *      if (!strcmp(curMod->Type(), "Biblical Texts")) {
+	 *           // do something with curMod
+	 *      }
+	 *      else if (!strcmp(curMod->Type(), "Commentaries")) {
+	 *           // do something with curMod
+	 *      }
+	 *      else if (!strcmp(curMod->Type(), "Lexicons / Dictionaries")) {
+	 *           // do something with curMod
+	 *      }
+	 * }
+	 * @endcode
+	 */
+	ModMap Modules;
+
+	/** Gets a specific module by name.  e.g. SWModule *kjv = myManager.getModule("KJV");
+	 * @param modName the name of the module to retrieve
+	 * @return the module, if found, otherwise 0
+	 */
+	SWModule *getModule(const char *modName) { ModMap::iterator it = Modules.find(modName); return ((it != Modules.end()) ? it->second : 0); }
+	const SWModule *getModule(const char *modName) const { ModMap::const_iterator it = Modules.find(modName); return ((it != Modules.end()) ? it->second : 0); }
+
+
+	/** Constructs an instance of SWMgr
+	 *
+	 * @param iconfig manually supply a configuration.  If not supplied, SWMgr will look on the system
+	 *	using a complex hierarchical search.  See README for detailed specifics.
+	 * @param isysconfig
+	 * @param autoload whether or not to immediately load modules on construction of this SWMgr.
+	 *	If you reimplemented SWMgr you can set this to false and call SWMgr::Load() after you have
+	 *	completed the contruction and setup of your SWMgr subclass.
+	 * @param filterMgr an SWFilterMgr subclass to use to manager filters on modules
+	 *	SWMgr TAKES OWNERSHIP FOR DELETING THIS OBJECT
+	 *	For example, this will create an SWMgr and cause its modules to produce HTMLHREF formatted output
+	 *	when asked for renderable text:
+	 *
+	 *	SWMgr *myMgr = new SWMgr(0, 0, true, new MarkupFilterMgr(FMT_HTMLHREF));
+	 */
+	SWMgr(SWConfig *iconfig = 0, SWConfig *isysconfig = 0, bool autoload = true, SWFilterMgr *filterMgr = 0, bool multiMod = false);
+
+	/**
+	 */
+	SWMgr(SWFilterMgr *filterMgr, bool multiMod = false);
+
+	/**
+	 * @param iConfigPath provide a custom path to use for module set location, instead of
+	 *	searching the system for it.
+	 */
+	SWMgr(const char *iConfigPath, bool autoload = true, SWFilterMgr *filterMgr = 0, bool multiMod = false, bool augmentHome = true);
+
+	/** The destructor of SWMgr.
+	 * This function cleans up the modules and deletes the created object.
+	 * Destroying the SWMgr causes all retrieved SWModule object to be invalid, so
+	 *	be sure to destroy only when retrieved objects are no longer needed.
+	 */
+	virtual ~SWMgr();
+
+	/**
+	 * Adds books from a new path to the library
+	 * @param path the path in which to search for books
+	 * @param multiMod whether or not to keep multiple copies of the same book if found in different paths
+	 *		default - false, uses last found version of the book
+	 */
+	virtual void augmentModules(const char *path, bool multiMod = false);
+
+	void deleteModule(const char *);
+
+	/** Looks for any newly installed module.conf file in the path provided,
+	 *	displays the copyright information to the user, and then copies the
+	 *	module.conf to the main module set's mods.d directory
+	 * @param dir where to search for new modules
+	 */
+	virtual void InstallScan(const char *dir);
+
+	/** Load all modules.  Should only be manually called if SWMgr was constructed
+	 *	without autoload; otherwise, this will be called on SWMgr construction
+	 * Reimplement this function to supply special functionality when modules are
+	 * initially loaded.
+	 */
+	virtual signed char Load();
+
+	/** Change the values of global options (e.g. Footnotes, Strong's Number, etc.)
+	 * @param option The name of the option, for which you want to change the
+	 * value. Well known and often used values are "Footnotes" or "Strong's Numbers"
+	 * @param value new value. Common values are "On" and "Off"
+	 */
+	virtual void setGlobalOption(const char *option, const char *value);
+
+	/** Get the current value of the given option
+	 * @param option the name of the option, who's value is desired
+	 * @return the value of the given option
+	 */
+	virtual const char *getGlobalOption(const char *option);
+
+	/** Gets a brief description for the given option
+	 * @param option the name of the option, who's tip is desired
+	 * @return description text
+	 * @see setGlobalOption, getGlobalOption, getGlobalOptions
+	 */
+	virtual const char *getGlobalOptionTip(const char *option);
+
+	/** Gets a list of all available option names
+	 * @return list of option names
+	 */
+	virtual StringList getGlobalOptions();
+
+	/** Gets a list of legal values to which a specific option 
+	 *	may be set
+	 * @param option the name of the option, who's legal values are desired
+	 * @return a list of legal values for the given option
+	 */
+	virtual StringList getGlobalOptionValues(const char *option);
+
+	/** Filters a buffer thru a named filter
+	 * @param filterName
+	 * @param text buffer to filter
+	 * @param key context key if filter needs this for processing
+	 * @param module context module if filter needs this for processing
+	 * @return error status
+	 */
+	virtual char filterText(const char *filterName, SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+
+	/**
+	 * Sets the cipher key for the given module. This function updates the key
+	 * at runtime, but it does not write to the config file.
+	 * To write the new unlock key to the config file use code like this:
+	 *
+	 * @code
+	 * SectionMap::iterator section;
+	 * ConfigEntMap::iterator entry;
+	 * DIR *dir = opendir(configPath);
+	 * struct dirent *ent;
+	 * char* modFile;
+	 * if (dir) {    // find and update .conf file
+	 *   rewinddir(dir);
+	 *   while ((ent = readdir(dir)))
+	 *   {
+	 *     if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, "..")))
+	 *     {
+	 *       modFile = m_backend->configPath;
+	 *       modFile += "/";
+	 *       modFile += ent->d_name;
+	 *       SWConfig *myConfig = new SWConfig( modFile );
+	 *       section = myConfig->Sections.find( m_module->Name() );
+	 *       if ( section != myConfig->Sections.end() )
+	 *       {
+	 *         entry = section->second.find("CipherKey");
+	 *         if (entry != section->second.end())
+	 *         {
+	 *           entry->second = unlockKey;//set cipher key
+	 *           myConfig->Save();//save config file
+	 *         }
+	 *       }
+	 *       delete myConfig;
+	 *     }
+	 *   }
+	 * }
+	 * closedir(dir);
+	 * @endcode
+	 *
+	 * @param modName For this module we change the unlockKey
+	 * @param key This is the new unlck key we use for te module.
+	 */
+	virtual signed char setCipherKey(const char *modName, const char *key);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swmodule.h b/include/swmodule.h
new file mode 100644
index 0000000..9c733dc
--- /dev/null
+++ b/include/swmodule.h
@@ -0,0 +1,725 @@
+/******************************************************************************
+ *
+ *  swmodule.h -	code for base class 'module'.  Module is the basis for
+ *		  	all types of modules (e.g. texts, commentaries, maps,
+ *		  	lexicons, etc.)
+ *
+ * $Id: swmodule.h 2944 2013-08-03 09:43:40Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWMODULE_H
+#define SWMODULE_H
+
+#include <swdisp.h>
+#include <listkey.h>
+#include <swconfig.h>
+
+#include <swcacher.h>
+#include <swsearchable.h>
+#ifndef	_WIN32_WCE
+#include <iostream>
+#endif
+
+#include <list>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWOptionFilter;
+class SWFilter;
+
+#define SEARCHFLAG_MATCHWHOLEENTRY 4096
+
+#define SWMODULE_OPERATORS \
+	SWDEPRECATED operator const char *() { static SWBuf unsafeTmp = renderText(); return unsafeTmp.c_str(); } \
+	operator SWBuf() { return renderText(); } \
+	operator SWKey &() { return *getKey(); } \
+	operator SWKey *() { return getKey(); } \
+	SWModule &operator <<(const char *inbuf) { setEntry(inbuf); return *this; } \
+	SWModule &operator <<(const SWKey *sourceKey) { linkEntry(sourceKey); return *this; } \
+	SWModule &operator -=(int steps) { decrement(steps); return *this; } \
+	SWModule &operator +=(int steps) { increment(steps); return *this; } \
+	SWModule &operator ++(int) { return *this += 1; } \
+	SWModule &operator --(int) { return *this -= 1; } \
+	SWModule &operator =(SW_POSITION p) { setPosition(p); return *this; }
+
+
+typedef std::list < SWFilter * >FilterList;
+typedef std::list < SWOptionFilter * >OptionFilterList;
+typedef std::map < SWBuf, SWBuf, std::less < SWBuf > > AttributeValue;
+typedef std::map < SWBuf, AttributeValue, std::less < SWBuf > > AttributeList;
+typedef std::map < SWBuf, AttributeList, std::less < SWBuf > > AttributeTypeList;
+
+#define SWTextDirection char
+#define SWTextEncoding char
+#define SWTextMarkup char
+
+/**
+ * The class SWModule is the base class for all modules used in Sword.
+ * It provides functions to look up a text passage, to search in the module,
+ * to switch on/off the state of optional things like Strong's numbers or
+ * footnotes.
+ *
+ * SWModule has also functions to write to the data files.
+ */
+
+// TODO: should all SWModule decendents be SWCachers?  Only some really
+// cache data.  But if we don't do this, then we need another mechanism to
+// check if we are an SWCacher.  Maybe make SWModule extend SWObject (which
+// it probably should anyway.  But then we need to add all the cheezy
+// heirarchy info to all the decendent classes for our SWDYNAMIC_CAST and
+// then we can see if we implement SWCacher so we know whether or not to add
+// to the yet to be developed cachemgr.
+// Just leave for now.  This lets us always able to call module->flush()
+// to manually flush a cache, and doesn't hurt if there is no work done.
+
+
+class SWDLLEXPORT SWModule : public SWCacher, public SWSearchable {
+
+class StdOutDisplay : public SWDisplay {
+     char display(SWModule &imodule)
+     {
+     #ifndef	_WIN32_WCE
+          std::cout << imodule.renderText();
+     #endif
+          return 0;
+     }
+};
+
+protected:
+
+	ConfigEntMap ownConfig;
+	ConfigEntMap *config;
+	mutable AttributeTypeList entryAttributes;
+	mutable bool procEntAttr;
+
+	mutable char error;
+	bool skipConsecutiveLinks;
+
+	/** the current key */
+	SWKey *key;
+
+	ListKey listKey;
+	char *modname;
+	char *moddesc;
+	char *modtype;
+	char *modlang;
+
+	char direction;
+	char markup;
+	char encoding;
+
+	/** this module's display object */
+	SWDisplay *disp;
+
+	static StdOutDisplay rawdisp;
+	mutable SWBuf entryBuf;
+
+	/** filters to be executed to remove all markup (for searches) */
+	FilterList *stripFilters;
+
+	/** filters to be executed immediately upon fileread */
+	FilterList *rawFilters;
+
+	/** filters to be executed to format for display */
+	FilterList *renderFilters;
+
+	/** filters to be executed to change markup to user prefs */
+	OptionFilterList *optionFilters;
+
+	/** filters to be executed to decode text for display */
+	FilterList *encodingFilters;
+
+	mutable int entrySize;
+	mutable long entryIndex;	 // internal common storage for index
+
+	static void prepText(SWBuf &buf);
+
+
+public:
+
+	/**
+	 * Set this bool to false to terminate the search which is executed by this module (search()).
+	 * This is useful for threaded applications to terminate the search from another thread.
+	 */
+	bool terminateSearch;
+
+	/** SWModule c-tor
+	 *
+	 * @param imodname Internal name for module; see also getName()
+	 * @param imoddesc Name to display to user for module; see also getDescription()
+	 * @param idisp Display object to use for displaying; see also getDisplay()
+	 * @param imodtype Type of module (e.g. Biblical Text, Commentary, etc.); see also getType()
+	 * @param encoding Encoding of the module (e.g. UTF-8)
+	 * @param dir Direction of text flow (e.g. Right to Left for Hebrew)
+	 * @param markup Source Markup of the module (e.g. OSIS)
+	 * @param modlang Language of the module (e.g. en)
+	 */
+	SWModule(const char *imodname = 0, const char *imoddesc = 0, SWDisplay * idisp = 0, const char *imodtype = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char *modlang = 0);
+
+	/** SWModule d-tor
+	 */
+	virtual ~SWModule();
+
+	/** Gets and clears error status
+	 *
+	 * @return error status
+	 */
+	virtual char popError();
+	SWDEPRECATED virtual char Error() { return popError(); }
+
+	/**
+	 * @return  True if this module is encoded in Unicode, otherwise returns false.
+	 */
+	virtual bool isUnicode() const { return (encoding == (char)ENC_UTF8 || encoding == (char)ENC_SCSU); }
+
+	// These methods are useful for modules that come from a standard SWORD install (most do).
+	// SWMgr will call setConfig.  The user may use getConfig and getConfigEntry (if they
+	// are not comfortable with, or don't wish to use  stl maps).
+	virtual void setConfig(ConfigEntMap *config);
+	virtual const ConfigEntMap &getConfig() const { return *config; }
+	virtual const char *getConfigEntry(const char *key) const;
+
+	/**
+	 * Returns bibliographic data for a module in the requested format
+	 *
+	 * @param bibFormat format of the bibliographic data
+	 * @return bibliographic data in the requested format as a string (BibTeX by default)
+	 */
+	virtual SWBuf getBibliography(unsigned char bibFormat = BIB_BIBTEX) const;
+
+	/**
+	 * @return The size of the text entry for the module's current key position.
+	 */
+	virtual int getEntrySize() const { return entrySize; }
+
+	/**
+	 * Sets a key to this module for position to a particular record
+	 *
+	 * @param ikey key with which to set this module
+	 * @return error status
+	 */
+	virtual char setKey(const SWKey *ikey);
+
+	/**
+	 * Sets a key to this module for position to a particular record
+	 * @param ikey The SWKey which should be used as new key.
+	 * @return Error status
+	 */
+	char setKey(const SWKey &ikey) { return setKey(&ikey); }
+	/**
+	 * @deprecated Use setKey() instead.
+	 */
+	SWDEPRECATED char SetKey(const SWKey *ikey) { return setKey(ikey); }
+	/**
+	 * @deprecated Use setKey() instead.
+	 */
+	SWDEPRECATED char SetKey(const SWKey &ikey) { return setKey(ikey); }
+	/**
+	 * @deprecated Use setKey() instead.
+	 */
+	SWDEPRECATED char Key(const SWKey & ikey) { return setKey(ikey); }
+
+	/** Gets the current module key
+	 * @return the current key of this module
+	 */
+	virtual SWKey *getKey() const;
+	/**
+	 * @deprecated Use getKey() instead.
+	 */
+	SWDEPRECATED SWKey &Key() const { return *getKey(); }
+
+	/**
+	 * Sets/gets module KeyText
+	 * @deprecated Use getKeyText/setKey
+	 * @param ikeytext Value which to set keytext; [0]-only get
+	 * @return pointer to keytext
+	 */
+	SWDEPRECATED const char *KeyText(const char *ikeytext = 0) { if (ikeytext) setKey(ikeytext); return *getKey(); }
+
+	/**
+	 * gets the key text for the module.
+	 * do we really need this?
+	 */
+
+	virtual const char *getKeyText() const {
+		return *getKey();
+	}
+
+
+	virtual long getIndex() const { return entryIndex; }
+	virtual void setIndex(long iindex) { entryIndex = iindex; }
+	// deprecated, use getIndex()
+	SWDEPRECATED long Index() const { return getIndex(); }
+	// deprecated, use setIndex(...)
+	SWDEPRECATED long Index(long iindex) { setIndex(iindex); return getIndex(); }
+
+	/** Calls this module's display object and passes itself
+	 *
+	 * @return error status
+	 */
+	virtual char display();
+	SWDEPRECATED char Display() { return display(); }
+
+	/** Gets display driver
+	 *
+	 * @return pointer to SWDisplay class for this module
+	 */
+	virtual SWDisplay *getDisplay() const;
+
+	/** Sets display driver
+	 *
+	 * @param idisp pointer to SWDisplay class to assign to this module
+	 */
+	virtual void setDisplay(SWDisplay * idisp);
+
+	/**
+	 * @deprecated Use get/setDisplay() instead.
+	 */
+	SWDEPRECATED SWDisplay *Disp(SWDisplay * idisp = 0) { if (idisp)	setDisplay(idisp); return getDisplay();	}
+
+	/** Gets module name
+	 *
+	 * @return pointer to modname
+	 */
+	const char *getName() const;
+	SWDEPRECATED const char *Name() const { return getName(); }
+
+	/** Sets module name
+	 *
+	 * @param imodname Value which to set modname; [0]-only get
+	 * @return pointer to modname
+	 */
+	SWDEPRECATED const char *Name(const char *imodname) { stdstr(&modname, imodname); return getName(); }
+
+	/** Gets module description
+	 *
+	 * @return pointer to moddesc
+	 */
+	const char *getDescription() const;
+	SWDEPRECATED const char *Description() const { return getDescription(); }
+
+	/** Sets module description
+	 *
+	 * @param imoddesc Value which to set moddesc; [0]-only get
+	 * @return pointer to moddesc
+	 */
+	SWDEPRECATED const char *Description(const char *imoddesc) { stdstr(&moddesc, imoddesc); return getDescription(); }
+
+	/** Gets module type
+	 *
+	 * @return pointer to modtype
+	 */
+	const char *getType() const;
+	SWDEPRECATED const char *Type() const { return getType(); }
+
+	/** Sets module type
+	 *
+	 * @param imodtype Value which to set modtype; [0]-only get
+	 * @return pointer to modtype
+	 */
+	SWDEPRECATED const char *Type(const char *imodtype) { setType(imodtype); return getType(); }
+	void setType(const char *imodtype) { stdstr(&modtype, imodtype); }
+
+	/** Sets/gets module direction
+	 *
+	 * @param newdir Value which to set direction; [-1]-only get
+	 * @return new direction
+	 */
+	virtual char getDirection() const;
+	SWDEPRECATED char Direction(signed char newdir = -1) { char retVal = getDirection(); if (newdir != -1) return direction = newdir; return retVal; }
+
+	/** Sets/gets module encoding
+	 *
+	 * @param enc Value which to set encoding; [-1]-only get
+	 * @return Encoding
+	 */
+	char getEncoding() const { return encoding; }
+	SWDEPRECATED char Encoding(signed char enc = -1) { char retVal = getEncoding(); if (enc != -1) encoding = enc; return retVal; }
+
+	/** Sets/gets module markup
+	 *
+	 * @param markup Value which to set markup; [-1]-only get
+	 * @return Markup
+	 */
+	char getMarkup() const { return markup; }
+	SWDEPRECATED char Markup(signed char imarkup = -1) { char retVal = getMarkup(); if (imarkup != -1) markup = imarkup; return retVal; }
+
+	/** Sets/gets module language
+	 *
+	 * @param imodlang Value which to set modlang; [0]-only get
+	 * @return pointer to modlang
+	 */
+	const char *getLanguage() const { return modlang; }
+	SWDEPRECATED const char *Lang(char *imodlang = 0) { if (imodlang != 0) stdstr(&modlang, imodlang); return getLanguage(); }
+
+
+	// search interface -------------------------------------------------
+
+	/** Searches a module for a string
+	 *
+	 * @param istr string for which to search
+	 * @param searchType type of search to perform
+	 *			>=0 - regex
+	 *			-1  - phrase
+	 *			-2  - multiword
+	 *			-3  - entryAttrib (eg. Word//Strongs/G1234/)
+	 *			-4  - Lucene
+	 * @param flags options flags for search
+	 * @param scope Key containing the scope. VerseKey or ListKey are useful here.
+	 * @param justCheckIfSupported if set, don't search,
+	 * only tell if this function supports requested search.
+	 * @param percent Callback function to get the current search status in %.
+	 * @param percentUserData User data that is given to the callback function as parameter.
+	 *
+	 * @return ListKey set to verses that contain istr
+	 */
+	virtual ListKey &search(const char *istr, int searchType = 0, int flags = 0,
+			SWKey * scope = 0,
+			bool * justCheckIfSupported = 0,
+			void (*percent) (char, void *) = &nullPercent,
+			void *percentUserData = 0);
+
+	// for backward compat-- deprecated
+	SWDEPRECATED ListKey &Search(const char *istr, int searchType = 0, int flags = 0, SWKey * scope = 0, bool * justCheckIfSupported = 0, void (*percent) (char, void *) = &nullPercent, void *percentUserData = 0) {	return search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData);	}
+
+
+	/** Allocates a key of specific type for module
+	 * The different reimplementations of SWModule (e.g. SWText) support SWKey implementations,
+	 * which support special.  This functions returns a SWKey object which works with the current
+	 * implementation of SWModule. For example for the SWText class it returns a VerseKey object.
+	 * @see VerseKey, ListKey, SWText, SWLD, SWCom
+	 * @return pointer to allocated key. Caller is responsible for deleting the object
+	 */
+	virtual SWKey *createKey() const;
+	SWDEPRECATED SWKey *CreateKey() const { return createKey(); }
+
+	/** This function is reimplemented by the different kinds
+	 * of module objects
+	 * @return the raw module text of the current entry
+	 */
+	virtual SWBuf &getRawEntryBuf() const = 0;
+
+	const char *getRawEntry() const { return getRawEntryBuf().c_str(); }
+
+	// write interface ----------------------------
+	/** Is the module writable? :)
+	 * @return yes or no
+	 */
+	virtual bool isWritable() const { return false; }
+
+	/** Creates a new, empty module
+	 * @param path path where to create the new module
+	 * @return error
+	 */
+	static signed char createModule(const char *path);
+
+	/** Modify the current module entry text - only if module isWritable()
+	 */
+	virtual void setEntry(const char *inbuf, long len= -1);
+
+	/** Link the current module entry to another module entry - only if
+	 *	module isWritable()
+	 */
+	virtual void linkEntry(const SWKey *sourceKey);
+
+	/** Delete current module entry - only if module isWritable()
+	 */
+	virtual void deleteEntry() {}
+
+	// end write interface ------------------------
+
+	/** Decrements module key a number of entries
+	 * @param steps Number of entries to jump backward
+	 */
+	virtual void decrement(int steps = 1);
+
+	/** Increments module key a number of entries
+	 * @param steps Number of entries to jump forward
+	 */
+	virtual void increment(int steps = 1);
+
+	/** Positions this modules to a logical position entry
+	 * @param pos position (e.g. TOP, BOTTOM)
+	 */
+	virtual void setPosition(SW_POSITION pos);
+
+	/** OptionFilterBuffer a text buffer
+	 * @param filters the FilterList of filters to iterate
+	 * @param buf the buffer to filter
+	 * @param key key location from where this buffer was extracted
+	 */
+	virtual void filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) const;
+
+	/** FilterBuffer a text buffer
+	 * @param filters the FilterList of filters to iterate
+	 * @param buf the buffer to filter
+	 * @param key key location from where this buffer was extracted
+	 */
+	virtual void filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) const;
+
+	/** Adds a RenderFilter to this module's renderFilters queue.
+	 *	Render Filters are called when the module is asked to produce
+	 *	renderable text.
+	 * @param newfilter the filter to add
+	 * @return *this
+	 */
+	virtual SWModule &addRenderFilter(SWFilter *newFilter) {
+		renderFilters->push_back(newFilter);
+		return *this;
+	}
+	SWDEPRECATED SWModule &AddRenderFilter(SWFilter *newFilter) { return addRenderFilter(newFilter); }
+
+	/** Retrieves a container of render filters associated with this
+	 *	module.
+	 * @return container of render filters
+	 */
+	virtual const FilterList &getRenderFilters() const {
+		return *renderFilters;
+	}
+
+	/** Removes a RenderFilter from this module's renderFilters queue
+	 * @param oldfilter the filter to remove
+	 * @return *this
+	 */
+	virtual SWModule &removeRenderFilter(SWFilter *oldFilter) {
+		renderFilters->remove(oldFilter);
+		return *this;
+	}
+	SWDEPRECATED SWModule &RemoveRenderFilter(SWFilter *oldFilter) {	return removeRenderFilter(oldFilter); }
+
+	/** Replaces a RenderFilter in this module's renderfilters queue
+	 * @param oldfilter the filter to remove
+	 * @param newfilter the filter to add in its place
+	 * @return *this
+	 */
+	virtual SWModule &replaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) {
+		FilterList::iterator iter;
+		for (iter = renderFilters->begin(); iter != renderFilters->end(); iter++) {
+			if (*iter == oldFilter)
+				*iter = newFilter;
+		}
+		return *this;
+	}
+	SWDEPRECATED SWModule &ReplaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) { return replaceRenderFilter(oldFilter, newFilter); }
+
+	/** RenderFilter run a buf through this module's Render Filters
+	 * @param buf the buffer to filter
+	 * @param key key location from where this buffer was extracted
+	 */
+	virtual void renderFilter(SWBuf &buf, const SWKey *key) const {
+		filterBuffer(renderFilters, buf, key);
+	}
+
+	/** Adds an EncodingFilter to this module's @see encodingFilters queue.
+	 *	Encoding Filters are called immediately when the module is read
+	 *	from data source, to assure we have desired internal data stream
+	 *	(e.g. UTF-8 for text modules)
+	 * @param newfilter the filter to add
+	 * @return *this
+	 */
+	virtual SWModule &addEncodingFilter(SWFilter *newFilter) {
+		encodingFilters->push_back(newFilter);
+		return *this;
+	}
+	SWDEPRECATED SWModule &AddEncodingFilter(SWFilter *newFilter) { return addEncodingFilter(newFilter); }
+
+	/** Removes an EncodingFilter from this module's encodingFilters queue
+	 * @param oldfilter the filter to remove
+	 * @return *this
+	 */
+	virtual SWModule &removeEncodingFilter(SWFilter *oldFilter) {
+		encodingFilters->remove(oldFilter);
+		return *this;
+	}
+	SWDEPRECATED SWModule &RemoveEncodingFilter(SWFilter *oldFilter) { return removeEncodingFilter(oldFilter); }
+
+	/** Replaces an EncodingFilter in this module's encodingfilters queue
+	 * @param oldfilter the filter to remove
+	 * @param newfilter the filter to add in its place
+	 * @return *this
+	 */
+	virtual SWModule &replaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) {
+		FilterList::iterator iter;
+		for (iter = encodingFilters->begin(); iter != encodingFilters->end(); iter++) {
+			if (*iter == oldFilter)
+				*iter = newFilter;
+		}
+		return *this;
+	}
+	SWDEPRECATED SWModule &ReplaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) { return replaceEncodingFilter(oldFilter, newFilter); }
+
+	/** encodingFilter run a buf through this module's Encoding Filters
+	 * @param buf the buffer to filter
+	 * @param key key location from where this buffer was extracted
+	 */
+	virtual void encodingFilter(SWBuf &buf, const SWKey *key) const {
+		filterBuffer(encodingFilters, buf, key);
+	}
+
+	/** Adds a StripFilter to this module's stripFilters queue.
+	 *	Strip filters are called when a module is asked to render
+	 *	an entry without any markup (like when searching).
+	 * @param newfilter the filter to add
+	 * @return *this
+	 */
+	virtual SWModule &addStripFilter(SWFilter *newFilter) {
+		stripFilters->push_back(newFilter);
+		return *this;
+	}
+	SWDEPRECATED SWModule &AddStripFilter(SWFilter *newFilter) { return addStripFilter(newFilter);	}
+
+	/** Adds a RawFilter to this module's rawFilters queue
+	 * @param newFilter the filter to add
+	 * @return *this
+	 */
+	virtual SWModule &addRawFilter(SWFilter *newfilter) {
+		rawFilters->push_back(newfilter);
+		return *this;
+	}
+	SWDEPRECATED SWModule &AddRawFilter(SWFilter *newFilter) { return addRawFilter(newFilter); }
+
+	/** StripFilter run a buf through this module's Strip Filters
+	 * @param buf the buffer to filter
+	 * @param key key location from where this buffer was extracted
+	 */
+	virtual void stripFilter(SWBuf &buf, const SWKey *key) const {
+		filterBuffer(stripFilters, buf, key);
+	}
+
+
+	/** RawFilter a text buffer
+	 * @param buf the buffer to filter
+	 * @param key key location from where this buffer was extracted
+	 */
+	virtual void rawFilter(SWBuf &buf, const SWKey *key) const {
+		filterBuffer(rawFilters, buf, key);
+	}
+
+	/** Adds an OptionFilter to this module's optionFilters queue.
+	 *	Option Filters are used to turn options in the text on
+	 *	or off, or so some other state (e.g. Strong's Number,
+	 *	Footnotes, Cross References, etc.)
+	 * @param newfilter the filter to add
+	 * @return *this
+	 */
+	virtual SWModule &addOptionFilter(SWOptionFilter *newFilter) {
+		optionFilters->push_back(newFilter);
+		return *this;
+	}
+	SWDEPRECATED SWModule &AddOptionFilter(SWOptionFilter *newFilter) { return addOptionFilter(newFilter); }
+
+	/** OptionFilter a text buffer
+	 * @param buf the buffer to filter
+	 * @param key key location from where this buffer was extracted
+	 */
+	virtual void optionFilter(SWBuf &buf, const SWKey *key) const {
+		filterBuffer(optionFilters, buf, key);
+	}
+
+	/** Produces plain text, without markup, of the current module entry,
+	 *	or supplied text
+	 *
+	 * @param buf buf to massage instead of current module entry;
+	 *	if buf is 0, the current text will be used
+	 * @param len max len to process
+	 * @return result buffer
+	 */
+	virtual const char *stripText(const char *buf = 0, int len = -1);
+	SWDEPRECATED const char *StripText(const char *buf = 0, int len = -1) { return stripText(buf, len); }
+
+	/** Produces renderable text of the current module entry or supplied text
+	 *
+	 * @param buf buffer to massage instead of current module entry;
+	 *	if buf is 0, the current module position text will be used
+	 * @param len max len to process
+	 * @param render for internal use
+	 * @return result buffer
+	 */
+	SWBuf renderText(const char *buf = 0, int len = -1, bool render = true);
+	SWDEPRECATED const char *RenderText(const char *buf = 0, int len = -1, bool render = true) { return renderText(buf, len, render); }
+
+	/** Produces any header data which might be useful which is associated with the
+	 *	processing done with this filter.  A typical example is a suggested
+	 *	CSS style block for classed containers.
+	 */
+	virtual const char *getRenderHeader() const;
+
+	/** Produces plain text, without markup, of the module entry at the supplied key
+	 * @param tmpKey desired module entry
+	 * @return result buffer
+	 */
+	virtual const char *stripText(const SWKey *tmpKey);
+
+	/** Produces renderable text of the module entry at the supplied key
+	 * @param tmpKey key to use to grab text
+	 * @return this module's text at specified key location massaged by Render filters
+	 */
+	SWBuf renderText(const SWKey *tmpKey);
+
+	/** Whether or not to only hit one entry when iterating encounters
+	 *	consecutive links when iterating
+	 * @param val = true means only include entry once in iteration
+	 */
+	virtual void setSkipConsecutiveLinks(bool val) { skipConsecutiveLinks = val; }
+
+	/** Whether or not to only hit one entry when iterating encounters
+	 *	consecutive links when iterating
+	 */
+	virtual bool isSkipConsecutiveLinks() { return skipConsecutiveLinks; }
+	SWDEPRECATED bool getSkipConsecutiveLinks() { return isSkipConsecutiveLinks(); }
+	
+	virtual bool isLinked(const SWKey *, const SWKey *) const { return false; }
+	virtual bool hasEntry(const SWKey *) const { return false; }
+
+	/** Entry Attributes are special data pertaining to the current entry.
+	 *	To see what Entry Attributes exists for a specific entry of a module,
+	 *	the example examples/cmdline/lookup.cpp is a good utility which
+	 *	displays this information.  It is also useful as an example of how
+	 *	to access such.
+	 */
+	virtual AttributeTypeList &getEntryAttributes() const { return entryAttributes; }
+
+	/** Processing Entry Attributes can be expensive.  This method allows
+	 * turning the processing off if they are not desired.  Some internal
+	 * engine processing turns them off (like searching) temporarily for
+	 * optimization.
+	 */
+	virtual void setProcessEntryAttributes(bool val) const { procEntAttr = val; }
+	SWDEPRECATED void processEntryAttributes(bool val) const { setProcessEntryAttributes(val); }
+
+	/** Whether or not we're processing Entry Attributes
+	 */
+	virtual bool isProcessEntryAttributes() const { return procEntAttr; }
+
+
+	// SWSearchable Interface Impl -----------------------------------------------
+	virtual signed char createSearchFramework(
+			void (*percent) (char, void *) = &nullPercent,
+			void *percentUserData = 0);
+	virtual void deleteSearchFramework();
+	virtual bool hasSearchFramework();
+
+	// OPERATORS -----------------------------------------------------------------
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swobject.h b/include/swobject.h
new file mode 100644
index 0000000..8866c37
--- /dev/null
+++ b/include/swobject.h
@@ -0,0 +1,66 @@
+/******************************************************************************
+ *
+ *  swobject.h -	definition for SWObject used as lowest base class for
+ *			many SWORD objects
+ *
+ * $Id: swobject.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWOBJECT_H
+#define SWOBJECT_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+#define SWDYNAMIC_CAST(className, object) (className *)((object)?((object->getClass()->isAssignableFrom(#className))?object:0):0)
+
+/**
+* Class used for SWDYNAMIC_CAST to save the inheritance order.
+*/
+class SWDLLEXPORT SWClass {
+private:
+	const char **descends;
+
+public:
+	SWClass(const char **descends) {
+		this->descends = descends;
+	}
+
+	bool isAssignableFrom(const char *className) const;
+};
+
+/** Base class for major Sword classes.
+* SWObject is the base class for major Sword classes like SWKey.
+* It is used because dynamic_cast is not available on all plattforms supported
+* by Sword. Use SWDYNAMIC_CAST(classname, object) instead of dynamic_cast<classname>(object).
+*/
+class SWDLLEXPORT SWObject {
+protected:
+	SWClass * myclass;
+     
+public:
+	/** Use this to get the class definition and inheritance order.
+	* @return The class definition of this object
+	*/
+	const SWClass *getClass () const {
+		return myclass;
+	}
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swoptfilter.h b/include/swoptfilter.h
new file mode 100644
index 0000000..0f2aed5
--- /dev/null
+++ b/include/swoptfilter.h
@@ -0,0 +1,93 @@
+/***************************************************************************
+ *
+ *  swoptfilter.h -	Implenetation of SWOptionFilter
+ *
+ * $Id: swoptfilter.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWOPTFILTER_H
+#define SWOPTFILTER_H
+
+#include <swfilter.h>
+#include <swbuf.h>
+#include <list>
+
+SWORD_NAMESPACE_START
+
+/**
+* The type definitoin for option types
+*/
+typedef std::list < SWBuf > StringList;
+
+
+  /** Base class for all option filters.
+  */
+class SWDLLEXPORT SWOptionFilter : public virtual SWFilter {
+protected:
+	SWBuf optionValue;
+	const char *optName;
+	const char *optTip;
+	const StringList *optValues;
+	bool option;
+	bool isBooleanVal;
+public:
+
+	SWOptionFilter();
+	SWOptionFilter(const char *oName, const char *oTip, const StringList *oValues);
+	virtual ~SWOptionFilter();
+
+
+	/** many options are simple Off/On boolean type, and frontends may wish to show these
+	 * with checkmarks or the like to the end user.  This is a convenience method
+	 * to allow a frontend to check if this filter has only Off/On values
+	 */
+	bool isBoolean() { return isBooleanVal; }
+
+	/** gets the name of the option of this filter
+	 * @return option name
+	 */
+	virtual const char *getOptionName() { return optName; }
+
+	/** gets a short explanation of the option of this filter;
+	 * it could be presented to the user in frontend programs
+	 * @return option tip/explanation
+	 */
+	virtual const char *getOptionTip() { return optTip; }
+
+	/** returns a list of the possible option values
+	 * 
+	 * @return list of option values
+	 */
+	virtual StringList getOptionValues() { return *optValues; }
+
+	/** @return The value of the current option.
+	*/
+	virtual const char *getOptionValue();
+
+	/** sets the value of the option of this filter,
+	 * e.g maybe a strong's filter mioght be set to "on" / "off" -
+	 * that would mean to show or not to show the strongs in the text,
+	 * see also getOptionValues()
+	 * @param ival the new option value
+	 */
+	virtual void setOptionValue(const char *ival);
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swsearchable.h b/include/swsearchable.h
new file mode 100644
index 0000000..16102a8
--- /dev/null
+++ b/include/swsearchable.h
@@ -0,0 +1,102 @@
+/******************************************************************************
+ *
+ *  swsearchable.h -	definition of class SWSearchable used to provide an
+ *			interface for objects that be searched.
+ *
+ * $Id: swsearchable.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWSEARCHABLE_H
+#define SWSEARCHABLE_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class ListKey;
+class SWKey;
+
+/** used to provide an interface for objects that be searched.
+ */
+class SWDLLEXPORT SWSearchable {
+public:
+	SWSearchable();
+	virtual ~SWSearchable();
+
+	/**
+	* This is the default callback function for searching.
+	* This function is a placeholder and does nothing.
+	* You can define your own function for search progress
+	* evaluation, and pass it over to Search().
+	*/
+	static void nullPercent(char percent, void *userData);
+
+	// search interface -------------------------------------------------
+
+	/**
+	 * Searches a module for a string
+	 * @param istr string for which to search
+	 * @param searchType type of search to perform
+	 *			>=0 - regex
+	 *			-1  - phrase
+	 *			-2  - multiword
+	 *			-3  - entryAttrib (eg. Word//Strongs/G1234/)
+	 *			-4  - Lucene
+	 * @param flags options flags for search
+	 * @param scope Key containing the scope. VerseKey or ListKey are useful here.
+	 * @param justCheckIfSupported if set, don't search,
+	 * only tell if this function supports requested search.
+	 * @param percent Callback function to get the current search status in %.
+	 * @param percentUserData User data that is given to the callback function as parameter.
+	 *
+	 * @return ListKey set to verses that contain istr
+	 */
+
+	virtual ListKey &search(const char *istr, int searchType = 0, int flags = 0,
+			SWKey * scope = 0,
+			bool * justCheckIfSupported = 0,
+			void (*percent) (char, void *) = &nullPercent,
+			void *percentUserData = 0) = 0;
+
+	/**
+	 * ask the object to build any indecies it wants for optimal searching
+	 */
+	virtual signed char createSearchFramework(
+			void (*percent) (char, void *) = &nullPercent,
+			void *percentUserData = 0);	// special search framework
+
+	virtual void deleteSearchFramework();
+	
+	/**
+	 * was SWORD compiled with code to optimize searching for this driver?
+	 */
+	virtual bool hasSearchFramework() { return false; }
+
+	/**
+	 * Check if the search is optimally supported (e.g. if index files are
+	 * presnt and working)
+	 * This function checks whether the search framework may work in the
+	 * best way.
+	 * @return true if the the search is optimally supported, false if
+	 * it's not working in the best way.
+	 */
+	virtual bool isSearchOptimallySupported(const char *istr, int searchType, int flags, SWKey *scope);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/swtext.h b/include/swtext.h
new file mode 100644
index 0000000..11520a4
--- /dev/null
+++ b/include/swtext.h
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  swtext.h -	code for base class 'SWText'.  SWText is the basis for all
+ *		types of text modules
+ *
+ * $Id: swtext.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWTEXT_H
+#define SWTEXT_H
+
+#include <swmodule.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class VerseKey;
+
+/** The basis for all text modules
+ */
+class SWDLLEXPORT SWText : public SWModule {
+
+	// for conversion if we have been set with a different internal key type
+	mutable VerseKey *tmpVK1;
+	mutable VerseKey *tmpVK2;
+        mutable bool tmpSecond;
+	char *versification;
+
+protected:
+	VerseKey &getVerseKey(const SWKey* key=0) const;
+	
+public:
+	/** Initializes data for instance of SWText
+	*/
+	SWText(const char *imodname = 0, const char *imoddesc = 0,
+			SWDisplay *idisp = 0,
+			SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0,
+			const char *versification = "KJV");
+
+	virtual ~SWText();
+	/** Create the correct key (VerseKey) for use with SWText
+	*/
+	virtual SWKey *createKey() const;
+
+	virtual long getIndex() const;
+	virtual void setIndex(long iindex);
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/swversion.h b/include/swversion.h
new file mode 100644
index 0000000..2235a66
--- /dev/null
+++ b/include/swversion.h
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  swversion.h -	definition of class SWVersion used to compare version
+ *			info
+ *
+ * $Id: swversion.h 3007 2014-01-14 04:47:16Z greg.hellings $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWVERSION_H
+#define SWVERSION_H
+
+#define SWORD_VERSION_NUM 107002000
+#define SWORD_VERSION_STR "1.7.2"
+#define SWORD_VERSION_MAJOR 1
+#define SWORD_VERSION_MINOR 7
+#define SWORD_VERSION_MICRO 2
+#define SWORD_VERSION_NANO 0
+
+#include <defs.h>
+SWORD_NAMESPACE_START
+
+/** A basic tool class to handle program version numbers.
+*/
+class SWDLLEXPORT SWVersion {
+	public:
+	/** The different version subnumbers.
+	*/
+	int major, minor, minor2, minor3;
+	/**The constructor.
+	* @param version Version string to be parsed.
+	*/
+	SWVersion(const char *version = "0.0");
+	/** Compare 2 Versions with each other.
+	* @param vi Version number to compare with.
+	* @return >0:this>vi; 0:this==vi; <0:this<vi
+	*/
+	int compare(const SWVersion &vi) const;
+	/** @return The parsed version number text.
+	*/
+	const char *getText() const;
+	/** @return The parsed version number text.
+	*/
+	operator const char *() const { return getText(); }
+	bool operator>(const SWVersion &vi) const {return (compare(vi) > 0);}
+	bool operator<(const SWVersion &vi) const {return (compare(vi) < 0);}
+	bool operator>=(const SWVersion &vi) const {return (compare(vi) >= 0);}
+	bool operator<=(const SWVersion &vi) const {return (compare(vi) <= 0);}
+	bool operator==(const SWVersion &vi) const {return (compare(vi) == 0);}
+
+	/** Current sword library version.
+	* Use this to check (e.g. at compile time) if the
+	* version of the sword lib is recent enough for your program.
+	*/
+	static SWVersion currentVersion;
+};
+
+SWORD_NAMESPACE_END
+#endif
+
diff --git a/include/swversion.h.in b/include/swversion.h.in
new file mode 100644
index 0000000..919380f
--- /dev/null
+++ b/include/swversion.h.in
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  swversion.h -	definition of class SWVersion used to compare version
+ *			info
+ *
+ * $Id: swversion.h.in 2959 2013-08-13 03:55:38Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SWVERSION_H
+#define SWVERSION_H
+
+#define SWORD_VERSION_NUM @SWORD_VERSION_NUM@
+#define SWORD_VERSION_STR "@SWORD_VERSION_STR@"
+#define SWORD_VERSION_MAJOR @SWORD_VERSION_MAJOR@
+#define SWORD_VERSION_MINOR @SWORD_VERSION_MINOR@
+#define SWORD_VERSION_MICRO @SWORD_VERSION_MICRO@
+#define SWORD_VERSION_NANO @SWORD_VERSION_NANO@
+
+#include <defs.h>
+SWORD_NAMESPACE_START
+
+/** A basic tool class to handle program version numbers.
+*/
+class SWDLLEXPORT SWVersion {
+	public:
+	/** The different version subnumbers.
+	*/
+	int major, minor, minor2, minor3;
+	/**The constructor.
+	* @param version Version string to be parsed.
+	*/
+	SWVersion(const char *version = "0.0");
+	/** Compare 2 Versions with each other.
+	* @param vi Version number to compare with.
+	* @return >0:this>vi; 0:this==vi; <0:this<vi
+	*/
+	int compare(const SWVersion &vi) const;
+	/** @return The parsed version number text.
+	*/
+	const char *getText() const;
+	/** @return The parsed version number text.
+	*/
+	operator const char *() const { return getText(); }
+	bool operator>(const SWVersion &vi) const {return (compare(vi) > 0);}
+	bool operator<(const SWVersion &vi) const {return (compare(vi) < 0);}
+	bool operator>=(const SWVersion &vi) const {return (compare(vi) >= 0);}
+	bool operator<=(const SWVersion &vi) const {return (compare(vi) <= 0);}
+	bool operator==(const SWVersion &vi) const {return (compare(vi) == 0);}
+
+	/** Current sword library version.
+	* Use this to check (e.g. at compile time) if the
+	* version of the sword lib is recent enough for your program.
+	*/
+	static SWVersion currentVersion;
+};
+
+SWORD_NAMESPACE_END
+#endif
+
diff --git a/include/sysdata.h b/include/sysdata.h
new file mode 100644
index 0000000..b95b836
--- /dev/null
+++ b/include/sysdata.h
@@ -0,0 +1,108 @@
+/******************************************************************************
+ *
+ *  sysdata.h -	
+ *
+ * $Id: sysdata.h 2833 2013-06-29 06:40:28Z chrislit $
+ * 
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef SIZEDTYPES_H
+#define SIZEDTYPES_H
+/*
+ * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
+ * header files exported to user space
+ */
+#ifdef USE_AUTOTOOLS
+#include "config.h"
+#endif
+
+
+typedef signed char __s8;
+typedef unsigned char __u8;
+
+typedef signed short __s16;
+typedef unsigned short __u16;
+
+typedef signed int __s32;
+typedef unsigned int __u32;
+
+#ifdef __GNUC__
+__extension__ typedef __signed__ long long __s64;
+__extension__ typedef unsigned long long __u64;
+#elif defined(__BORLANDC__)
+typedef signed __int64 __s64;
+typedef unsigned __int64 __u64;
+#else
+typedef signed long long __s64;
+typedef unsigned long long __u64;
+#endif
+
+#undef __swswap16
+#undef __swswap32
+#undef __swswap64
+
+#define __swswap16(x) \
+	((__u16)( \
+		(((__u16)(x) & (__u16)0x00ffU) << 8) | \
+		(((__u16)(x) & (__u16)0xff00U) >> 8) ))
+
+		
+#define __swswap32(x) \
+	((__u32)( \
+		(((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
+		(((__u32)(x) & (__u32)0x0000ff00UL) <<  8) | \
+		(((__u32)(x) & (__u32)0x00ff0000UL) >>  8) | \
+		(((__u32)(x) & (__u32)0xff000000UL) >> 24) ))
+
+		
+#define __swswap64(x) \
+	((__u64)( \
+		(__u64)(((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
+		(__u64)(((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
+		(__u64)(((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
+		(__u64)(((__u64)(x) & (__u64)0x00000000ff000000ULL) <<  8) | \
+		   (__u64)(((__u64)(x) & (__u64)0x000000ff00000000ULL) >>  8) | \
+		(__u64)(((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
+		(__u64)(((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
+		(__u64)(((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56) ))
+		
+
+
+
+#ifndef WORDS_BIGENDIAN
+
+#define swordtoarch16(x) (x)
+#define swordtoarch32(x) (x)
+#define swordtoarch64(x) (x)
+#define archtosword16(x) (x)
+#define archtosword32(x) (x)
+#define archtosword64(x) (x)
+
+#else 
+
+#define swordtoarch16(x) __swswap16(x)
+#define swordtoarch32(x) __swswap32(x)
+#define swordtoarch64(x) __swswap64(x)
+#define archtosword16(x) __swswap16(x)
+#define archtosword32(x) __swswap32(x)
+#define archtosword64(x) __swswap64(x)
+
+
+#endif
+
+
+#endif
diff --git a/include/teihtmlhref.h b/include/teihtmlhref.h
new file mode 100644
index 0000000..99b2755
--- /dev/null
+++ b/include/teihtmlhref.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  teihtmlhref.h -	Implementation of TEIHTMLHREF
+ *
+ * $Id: teihtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef TEIHTMLHREF_H
+#define TEIHTMLHREF_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts TEI text to HTMLHREF text
+ */
+class SWDLLEXPORT TEIHTMLHREF : public SWBasicFilter {
+private:
+	bool renderNoteNumbers;
+
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		bool BiblicalText;
+		SWBuf lastHi;
+		
+		SWBuf version;
+		MyUserData(const SWModule *module, const SWKey *key);
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	TEIHTMLHREF();
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/teiplain.h b/include/teiplain.h
new file mode 100644
index 0000000..c6376e5
--- /dev/null
+++ b/include/teiplain.h
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ *  teiplain.h -	Implementation of TEIPlain
+ *
+ * $Id: teiplain.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef TEIPLAIN_H
+#define TEIPLAIN_H
+
+#include <swbasicfilter.h>
+#include <utilxml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts TEI text to plain text
+ */
+class SWDLLEXPORT TEIPlain : public SWBasicFilter {
+public:
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		SWBuf w;
+		XMLTag tag;
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	TEIPlain();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/teirtf.h b/include/teirtf.h
new file mode 100644
index 0000000..e9793d3
--- /dev/null
+++ b/include/teirtf.h
@@ -0,0 +1,53 @@
+/******************************************************************************
+ *
+ *  teirtf.h -	Implementation of TEIRTF
+ *
+ * $Id: teirtf.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef TEIRTF_H
+#define TEIRTF_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts TEI text to RTF text
+ */
+class SWDLLEXPORT TEIRTF : public SWBasicFilter {
+private:
+
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		bool BiblicalText;
+		bool inOsisRef;
+		SWBuf w;
+		SWBuf version;
+		MyUserData(const SWModule *module, const SWKey *key);
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	TEIRTF();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/teixhtml.h b/include/teixhtml.h
new file mode 100644
index 0000000..c948608
--- /dev/null
+++ b/include/teixhtml.h
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  teixhtml.h -	Implementation of TEIXHTML
+ *
+ * $Id: teixhtml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef TEIXHTML_H
+#define TEIXHTML_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts TEI text to XHTML text
+ */
+class SWDLLEXPORT TEIXHTML : public SWBasicFilter {
+private:
+	bool renderNoteNumbers;
+
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		bool BiblicalText;
+		SWBuf lastHi;
+		
+		SWBuf version;
+		MyUserData(const SWModule *module, const SWKey *key);
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	TEIXHTML();
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlfootnotes.h b/include/thmlfootnotes.h
new file mode 100644
index 0000000..133ff2e
--- /dev/null
+++ b/include/thmlfootnotes.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlfootnotes.h -	Implementation of ThMLFootnotes
+ *
+ * $Id: thmlfootnotes.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLFOOTNOTES_H
+#define THMLFOOTNOTES_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides footnotes in a ThML text
+ */
+class SWDLLEXPORT ThMLFootnotes : public SWOptionFilter {
+public:
+	ThMLFootnotes();
+	virtual ~ThMLFootnotes();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlgbf.h b/include/thmlgbf.h
new file mode 100644
index 0000000..03cd88d
--- /dev/null
+++ b/include/thmlgbf.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlgbf.h -	Implementation of ThMLGBF
+ *
+ * $Id: thmlgbf.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLGBF_H
+#define THMLGBF_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to GBF text
+ */
+class SWDLLEXPORT ThMLGBF : public SWFilter {
+protected:
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+public:
+	ThMLGBF();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlheadings.h b/include/thmlheadings.h
new file mode 100644
index 0000000..2cbe4cb
--- /dev/null
+++ b/include/thmlheadings.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlheadings.h -	Implementation of ThMLHeadings
+ *
+ * $Id: thmlheadings.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLHEADINGS_H
+#define THMLHEADINGS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides headings in a ThML text
+ */
+class SWDLLEXPORT ThMLHeadings : public SWOptionFilter {
+public:
+	ThMLHeadings();
+	virtual ~ThMLHeadings();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlhtml.h b/include/thmlhtml.h
new file mode 100644
index 0000000..2f32cc4
--- /dev/null
+++ b/include/thmlhtml.h
@@ -0,0 +1,48 @@
+/******************************************************************************
+ *
+ *  thmlhtml.h -	Implementation of ThMLHTML
+ *
+ * $Id: thmlhtml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLHTML_H
+#define THMLHTML_H
+
+#include <swbasicfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to HTML text
+ */
+class SWDLLEXPORT ThMLHTML : public SWBasicFilter {
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+		bool SecHead;
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	ThMLHTML();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlhtmlhref.h b/include/thmlhtmlhref.h
new file mode 100644
index 0000000..8ce802e
--- /dev/null
+++ b/include/thmlhtmlhref.h
@@ -0,0 +1,57 @@
+/******************************************************************************
+ *
+ *  thmlhtmlhref.h -	Implementation of ThMLHTMLHREF
+ *
+ * $Id: thmlhtmlhref.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef _THMLHTMLHREF_H
+#define _THMLHTMLHREF_H
+
+#include <swbasicfilter.h>
+#include <utilxml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to HTML text with hrefs
+ */
+class SWDLLEXPORT ThMLHTMLHREF : public SWBasicFilter {
+	SWBuf imgPrefix;
+	bool renderNoteNumbers;
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {}
+		bool inscriptRef;
+		bool SecHead;
+		bool BiblicalText;
+		SWBuf version;
+		XMLTag startTag;
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	ThMLHTMLHREF();
+	virtual const char *getImagePrefix() { return imgPrefix.c_str(); }
+	virtual void setImagePrefix(const char *newImgPrefix) { imgPrefix = newImgPrefix; }
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+};
+SWORD_NAMESPACE_END
+#endif /* _THMLHTMLHREF_H */
diff --git a/include/thmllemma.h b/include/thmllemma.h
new file mode 100644
index 0000000..54efbc6
--- /dev/null
+++ b/include/thmllemma.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmllemma.h -	Implementation of ThMLLemma
+ *
+ * $Id: thmllemma.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLLEMMA_H
+#define THMLLEMMA_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides lemmas in a ThML text
+ */
+class SWDLLEXPORT ThMLLemma : public SWOptionFilter {
+public:
+	ThMLLemma();
+	virtual ~ThMLLemma();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlmorph.h b/include/thmlmorph.h
new file mode 100644
index 0000000..bdb1f54
--- /dev/null
+++ b/include/thmlmorph.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlmorph.h -	Implementation of ThMLMorph
+ *
+ * $Id: thmlmorph.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLMORPH_H
+#define THMLMORPH_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides morph tags in a ThML text
+ */
+class SWDLLEXPORT ThMLMorph : public SWOptionFilter {
+public:
+	ThMLMorph();
+	virtual ~ThMLMorph();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlosis.h b/include/thmlosis.h
new file mode 100644
index 0000000..23a7386
--- /dev/null
+++ b/include/thmlosis.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlosis.h -	Implementation of ThMLOSIS
+ *
+ * $Id: thmlosis.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLOSIS_H
+#define THMLOSIS_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to OSIS text
+ */
+class SWDLLEXPORT ThMLOSIS : public SWFilter {
+public:
+	ThMLOSIS();
+	virtual ~ThMLOSIS();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif /* THMLOSIS_H */
diff --git a/include/thmlplain.h b/include/thmlplain.h
new file mode 100644
index 0000000..df0d4bc
--- /dev/null
+++ b/include/thmlplain.h
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  thmlplain.h -	Implementation of ThMLPlain
+ *
+ * $Id: thmlplain.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLPLAIN_H
+#define THMLPLAIN_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to plain text
+ */
+class SWDLLEXPORT ThMLPlain : public SWFilter {
+public:
+	ThMLPlain();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlrtf.h b/include/thmlrtf.h
new file mode 100644
index 0000000..9b7d3f2
--- /dev/null
+++ b/include/thmlrtf.h
@@ -0,0 +1,53 @@
+/******************************************************************************
+ *
+ *  thmlrtf.h -	Implementation of ThMLRTF
+ *
+ * $Id: thmlrtf.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLRTF_H
+#define THMLRTF_H
+
+#include <swbasicfilter.h>
+#include <utilxml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to RTF text
+ */
+class SWDLLEXPORT ThMLRTF : public SWBasicFilter {
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key);
+		bool SecHead;
+		SWBuf version;
+		bool BiblicalText;
+		XMLTag startTag;
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+public:
+	ThMLRTF();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlscripref.h b/include/thmlscripref.h
new file mode 100644
index 0000000..9c5ecea
--- /dev/null
+++ b/include/thmlscripref.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlscripref.h -	Implementation of ThMLScripRef
+ *
+ * $Id: thmlscripref.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLSCRIPREF_H
+#define THMLSCRIPREF_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides scripture references in a ThML text
+ */
+class SWDLLEXPORT ThMLScripref : public SWOptionFilter {
+public:
+	ThMLScripref();
+	virtual ~ThMLScripref();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlstrongs.h b/include/thmlstrongs.h
new file mode 100644
index 0000000..8ea6963
--- /dev/null
+++ b/include/thmlstrongs.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlstrongs.h -	Implementation of ThMLStrongs
+ *
+ * $Id: thmlstrongs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLSTRONGS_H
+#define THMLSTRONGS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides strong's numbers in a ThML text
+ */
+class SWDLLEXPORT ThMLStrongs : public SWOptionFilter {
+public:
+	ThMLStrongs();
+	virtual ~ThMLStrongs();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlvariants.h b/include/thmlvariants.h
new file mode 100644
index 0000000..4251c62
--- /dev/null
+++ b/include/thmlvariants.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  thmlvariants.h -	Implementation of ThMLVariants
+ *
+ * $Id: thmlvariants.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLVARIANTS_H
+#define THMLVARIANTS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides textual variants
+ */
+class SWDLLEXPORT ThMLVariants : public SWOptionFilter {
+public:
+	ThMLVariants();
+	virtual ~ThMLVariants();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlwebif.h b/include/thmlwebif.h
new file mode 100644
index 0000000..5efeddd
--- /dev/null
+++ b/include/thmlwebif.h
@@ -0,0 +1,44 @@
+/******************************************************************************
+ *
+ *  thmlwebif.h -	Implementation of ThMLWEBIF
+ *
+ * $Id: thmlwebif.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef _ThMLWEBIF_H
+#define _ThMLWEBIF_H
+
+#include <thmlxhtml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to HTML text with hrefs
+ */
+class SWDLLEXPORT ThMLWEBIF : public ThMLXHTML {
+	const SWBuf baseURL;
+	const SWBuf passageStudyURL;
+
+protected:
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	ThMLWEBIF();
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/thmlwordjs.h b/include/thmlwordjs.h
new file mode 100644
index 0000000..ae80292
--- /dev/null
+++ b/include/thmlwordjs.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *
+ *  thmlwordjs.h -	Implementation of ThMLWordJS
+ *
+ * $Id: thmlwordjs.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLWORDSJS_H
+#define THMLWORDSJS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+class SWMgr;
+  /** This Filter shows/hides strong's numbers in a ThML text
+  */
+class SWDLLEXPORT ThMLWordJS : public SWOptionFilter {
+     SWModule *defaultGreekLex;
+     SWModule *defaultHebLex;
+     SWModule *defaultGreekParse;
+     SWModule *defaultHebParse;
+     SWMgr *mgr;
+
+public:
+	ThMLWordJS();
+	virtual ~ThMLWordJS();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+	void setDefaultModules(SWModule *defaultGreekLex = 0, SWModule *defaultHebLex = 0, SWModule *defaultGreekParse = 0, SWModule *defaultHebParse = 0) {
+		this->defaultGreekLex   = defaultGreekLex;
+		this->defaultHebLex     = defaultHebLex;
+		this->defaultGreekParse = defaultGreekParse;
+		this->defaultHebParse   = defaultHebParse;
+	}
+	void setMgr(SWMgr *mgr) { this->mgr = mgr; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/thmlxhtml.h b/include/thmlxhtml.h
new file mode 100644
index 0000000..b0b5ef3
--- /dev/null
+++ b/include/thmlxhtml.h
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ *  thmlxhtml.h -	Implementation of ThMLXHTML
+ *
+ * $Id: thmlxhtml.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef _THMLXHTML_H
+#define _THMLXHTML_H
+
+#include <swbasicfilter.h>
+#include <utilxml.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to classed XHTML
+ */
+class SWDLLEXPORT ThMLXHTML : public SWBasicFilter {
+	SWBuf imgPrefix;
+	bool renderNoteNumbers;
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key);//: BasicFilterUserData(module, key) {}
+		bool inscriptRef;
+		bool SecHead;
+		bool BiblicalText;
+		SWBuf version;
+		XMLTag startTag;
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	ThMLXHTML();
+	virtual const char *getImagePrefix() { return imgPrefix.c_str(); }
+	virtual void setImagePrefix(const char *newImgPrefix) { imgPrefix = newImgPrefix; }
+	virtual const char *getHeader() const;
+	void setRenderNoteNumbers(bool val = true) { renderNoteNumbers = val; }
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/treekey.h b/include/treekey.h
new file mode 100644
index 0000000..02b944e
--- /dev/null
+++ b/include/treekey.h
@@ -0,0 +1,142 @@
+/******************************************************************************
+ *
+ *  treekey.h -	code for class 'TreeKey'
+ *
+ * $Id: treekey.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef TREEKEY_H
+#define TREEKEY_H
+
+#include <swkey.h>
+#include <swbuf.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+/**
+ * Class TreeKey
+ * The base class for all tree-based key implementations in Sword.
+ */
+class SWDLLEXPORT TreeKey : public SWKey {
+	static SWClass classdef;
+	void init();
+
+protected:
+	// hold on to setText until we've done a snap action: getText or navigation
+	// if we set, and then write out userData, we want to assure the path exists.
+	// This better conforms to the SWORD write methodology: mod.setKey, mod.setEntry
+	mutable SWBuf unsnappedKeyText;
+
+	// called whenever position of this key is changed.  Should we move this
+	// to a more base class?
+	void positionChanged() { if (posChangeListener) posChangeListener->positionChanged(); }
+
+public:
+
+	class PositionChangeListener {
+		TreeKey *treeKey;
+	public:
+		PositionChangeListener() {}
+		virtual ~PositionChangeListener() {}
+		virtual void positionChanged() = 0;
+		TreeKey *getTreeKey() { return treeKey; }
+		void setTreeKey(TreeKey *tk) { treeKey = tk; }
+	} *posChangeListener;
+
+	void setPositionChangeListener(PositionChangeListener *pcl) { posChangeListener = pcl; posChangeListener->setTreeKey(this); }
+
+//	TreeKey (const char *ikey = 0);
+//	TreeKey (const SWKey * ikey);
+//	TreeKey (TreeKey const &k);
+	TreeKey () { init(); };
+	~TreeKey () {};
+
+
+	virtual const char *getLocalName() = 0;
+	virtual const char *setLocalName(const char *) = 0;
+
+	virtual int getLevel() { long bm = getOffset(); int level = 0; do { level++; } while (parent()); setOffset(bm); return level; }
+
+	virtual const char *getUserData(int *size = 0) const = 0;
+	virtual void setUserData(const char *userData, int size = 0) = 0;
+
+	/** Go to the root node
+	*/
+	virtual void root() = 0;
+
+	/** Go to the parent of the current node
+	* @return success or failure
+	*/
+	virtual bool parent() = 0;
+
+	/** Go to the first child of the current node
+	* @return success or failure
+	*/
+	virtual bool firstChild() = 0;
+
+	/** Go to the next sibling of the current node
+	* @return success or failure
+	*/
+	virtual bool nextSibling() = 0;
+
+	/** Go to the previous sibling of the current node
+	* @return success or failure
+	*/
+	virtual bool previousSibling() = 0;
+
+	/** Does the current node have children?
+	* @return whether or not it does
+	*/
+	virtual bool hasChildren() = 0;
+
+	virtual void append() = 0;
+	virtual void appendChild() = 0;
+	virtual void insertBefore() = 0;
+
+	virtual void remove() = 0;
+
+
+	virtual void setOffset(unsigned long offset) = 0;
+	virtual unsigned long getOffset() const = 0;
+
+	virtual void setText(const char *ikey) = 0;
+	virtual void setPosition(SW_POSITION p) = 0;
+	virtual const char *getText() const = 0;
+	virtual int compare(const SWKey &ikey) = 0;
+	virtual void decrement(int steps = 1) = 0;
+	virtual void increment(int steps = 1) = 0;
+	virtual bool isTraversable() const { return true; }
+	virtual long getIndex() const { return getOffset(); }
+	virtual void setIndex(long iindex) { setOffset(iindex); }
+
+	/** Set the key to this path.  If the path doesn't exist, then
+	 *	nodes are created as necessary
+	 * @param keyPath path to set/create; if unsupplied, then use any unsnapped setText value.
+	 */
+	virtual void assureKeyPath(const char *keyPath = 0);
+	virtual void save() {}
+
+	SWKEY_OPERATORS
+
+	};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/treekeyidx.h b/include/treekeyidx.h
new file mode 100644
index 0000000..e818bfc
--- /dev/null
+++ b/include/treekeyidx.h
@@ -0,0 +1,127 @@
+/******************************************************************************
+ *
+ *  treekeyidx.h -	code for class 'TreeKeyIdx'
+ *
+ * $Id: treekeyidx.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef TREEKEYIDX_H
+#define TREEKEYIDX_H
+
+#include <treekey.h>
+#include <sysdata.h>
+
+SWORD_NAMESPACE_START
+
+class FileDesc;
+
+/**
+ * Class TreeKeyIdx
+ * The TreeKey implementation used for all tree-based modules in Sword, such as GenBooks.
+ */
+class SWDLLEXPORT TreeKeyIdx : public TreeKey {
+		
+	class TreeNode {
+	public:
+		TreeNode();
+		~TreeNode();
+		void clear();
+		__s32 offset;
+		__s32 parent;
+		__s32 next;
+		__s32 firstChild;
+		char *name;
+		__u16 dsize;
+		char *userData;
+	} currentNode;
+
+	static SWClass classdef;
+
+	char *path;
+
+	FileDesc *idxfd;
+	FileDesc *datfd;
+
+	void init();
+
+	void getTreeNodeFromDatOffset(long ioffset, TreeNode *buf) const;
+	char getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const;
+	void saveTreeNode(TreeNode *node);
+	void saveTreeNodeOffsets(TreeNode *node);
+
+
+public:
+	TreeKeyIdx(const TreeKeyIdx &ikey);
+	TreeKeyIdx(const char *idxPath, int fileMode = -1);
+	virtual ~TreeKeyIdx();
+
+	virtual SWKey *clone() const;
+
+	virtual const char *getLocalName();
+	virtual const char *setLocalName(const char *);
+
+	virtual const char *getUserData(int *size = 0) const;
+	virtual void setUserData(const char *userData, int size = 0);
+
+	virtual void root();
+	virtual bool parent();
+
+	virtual bool firstChild();
+	virtual bool nextSibling();
+	virtual bool previousSibling();
+
+	virtual bool hasChildren();
+
+	virtual void append();
+	virtual void appendChild();
+	virtual void insertBefore();
+
+	virtual void remove();
+	virtual void save();
+
+	virtual void copyFrom(const TreeKeyIdx &ikey);
+	virtual void copyFrom(const SWKey &ikey);
+
+	void setOffset(unsigned long offset);
+	unsigned long getOffset() const;
+
+	virtual int getLevel();
+
+
+	// OPERATORS ------------------------------------------------------------
+
+
+	virtual SWKey &operator = (const TreeKeyIdx &ikey) { copyFrom(ikey); return *this; }
+	SWKEY_OPERATORS
+
+	virtual void setText(const char *ikey);
+	virtual void setPosition(SW_POSITION p);
+	virtual const char *getText() const;
+	virtual int _compare (const TreeKeyIdx & ikey);
+	virtual int compare(const SWKey &ikey);
+	virtual void decrement(int steps = 1);
+	virtual void increment(int steps = 1);
+	virtual bool isTraversable() const { return true; }
+
+	static signed char create(const char *path);
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/unicodertf.h b/include/unicodertf.h
new file mode 100644
index 0000000..a07757c
--- /dev/null
+++ b/include/unicodertf.h
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  unicodertf.h -	Implementation of UnicodeRTF
+ *
+ * $Id: unicodertf.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UNICODERTF_H
+#define UNICODERTF_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts UTF-8 text into RTF Unicode tags
+ */
+class SWDLLEXPORT UnicodeRTF : public SWFilter {
+public:
+	UnicodeRTF();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/untgz.h b/include/untgz.h
new file mode 100644
index 0000000..24ac8cf
--- /dev/null
+++ b/include/untgz.h
@@ -0,0 +1,10 @@
+#ifndef UNTGZ_H
+#define UNTGZ_H
+
+#include "zlib.h"
+
+int untargz(int fd, const char *dest);
+int untar(gzFile in, const char *dest);
+
+#endif
+
diff --git a/include/url.h b/include/url.h
new file mode 100644
index 0000000..f0850a3
--- /dev/null
+++ b/include/url.h
@@ -0,0 +1,94 @@
+/******************************************************************************
+ *
+ *  url.h -	code for an URL parser utility class
+ *
+ * $Id: url.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef URL_H
+#define URL_H
+
+#include <swbuf.h>
+#include <map>
+
+SWORD_NAMESPACE_START
+
+/** URL provides URL parsing
+ * The URL class provides an interface to work on the data of an URL like "http://www.crosswire.org/index.jsp?page=test&amp;user=nobody"
+ */
+class SWDLLEXPORT URL {
+public:
+	typedef std::map<SWBuf, SWBuf> ParameterMap;
+	
+	/** Constructor.
+	 * @param url The url string which should be parsed into protocol, hostname, path and paramters
+	 */
+	URL(const char *url);
+	
+	/** Get the protocol.
+	* @return The protocol, e.g. "http" for an url like "http://www.crosswire.org/index.jsp?page=help"
+	*/
+	const char *getProtocol() const;
+	/** Get the hostname
+	* @return The hostname, e.g. "www.crosswire.org" for an url like "http://www.crosswire.org/index.jsp?page=help"
+	*/
+	const char *getHostName() const;
+	/** Get the path
+	* @return The path, e.g. "/index.jsp" for an url like "http://www.crosswire.org/index.jsp?page=help"
+	*/
+	const char *getPath() const;
+	
+	/** All available paramters
+	* @return The map which contains the parameters and their values
+	*/
+	const ParameterMap &getParameters() const;
+	
+	/**
+	 * Returns the value of an URL parameter. For the URL "http://www.crosswire.org/index.jsp?page=test&amp;user=nobody" the value of the parameter "page" would be "test".
+	 * If the parameter is not set an empty string is returned.
+	 * @param name The name of the paramter.
+	 * @return The value of the given paramter of an empty string if the name could not be found in the list of available paramters
+	 */
+	const char *getParameterValue(const char *name) const;
+	
+	/** Encodes and URL
+	* Encodes a string into a valid URL, e.g. changes http://www.crosswire.org/test.jsp?force=1&help=1 into
+	* http://www.crosswire.org/test.jsp?force=1&amp;help=1
+	* This function works on the data of the buf parameter.
+	*
+	* WARNING: It doesn't check if the URL is encoded already, so http://www.crosswire.org/test.jsp?force=1&amp;help=1 becomes http://www.crosswire.org/test.jsp?force=1&amp;amp;help=1
+	*/
+	static const SWBuf encode(const char *urlText);	
+	static const SWBuf decode(const char *encodedText);
+	
+private:
+	/** Parse
+	 * Parse the URL into protocol, hostname, path, page and paramters
+	 */
+	void parse();
+		
+	SWBuf url;
+	SWBuf protocol;
+	SWBuf hostname;
+	SWBuf path;
+	ParameterMap parameterMap;
+};
+
+SWORD_NAMESPACE_END
+
+#endif //URL_H
diff --git a/include/utf16utf8.h b/include/utf16utf8.h
new file mode 100644
index 0000000..c22cd40
--- /dev/null
+++ b/include/utf16utf8.h
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  utf16utf8.h -	Implementation of UTF16UTF8
+ *
+ * $Id: utf16utf8.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF16UTF8_H
+#define UTF16UTF8_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts UTF-16 encoded text to UTF-8
+ */
+class SWDLLEXPORT UTF16UTF8 : public SWFilter {
+public:
+	UTF16UTF8();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8arabicpoints.h b/include/utf8arabicpoints.h
new file mode 100644
index 0000000..aca0c6c
--- /dev/null
+++ b/include/utf8arabicpoints.h
@@ -0,0 +1,41 @@
+/******************************************************************************
+ *
+ *  utf8arabicpoints.h -	SWFilter descendant to remove UTF-8 Arabic
+ *				vowel points
+ *
+ * $Id: utf8arabicpoints.h 2865 2013-07-08 13:44:37Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8ARABICPOINTS_H
+#define UTF8ARABICPOINTS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides Arabic vowel points in UTF8 text
+ */
+class SWDLLEXPORT UTF8ArabicPoints : public SWOptionFilter {
+public:
+	UTF8ArabicPoints();
+	virtual ~UTF8ArabicPoints();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8arshaping.h b/include/utf8arshaping.h
new file mode 100644
index 0000000..6534050
--- /dev/null
+++ b/include/utf8arshaping.h
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ *  utf8arshaping.h -	Implementation of UTF8arShaping
+ *
+ * $Id: utf8arshaping.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8ARSHAPING_H
+#define UTF8ARSHAPING_H
+
+#include <swfilter.h>
+
+#include <unicode/utypes.h>
+#include <unicode/ucnv.h>
+#include <unicode/uchar.h>
+#include <unicode/ushape.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter controls the arabic shaping of UTF-8 text
+ * FIXME: is that correct? how to control it?
+ */
+class SWDLLEXPORT UTF8arShaping : public SWFilter {
+private:
+	UConverter* conv;
+	UErrorCode err;
+public:
+	UTF8arShaping();
+	~UTF8arShaping();  
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
+
+
diff --git a/include/utf8bidireorder.h b/include/utf8bidireorder.h
new file mode 100644
index 0000000..9ca90fd
--- /dev/null
+++ b/include/utf8bidireorder.h
@@ -0,0 +1,49 @@
+/******************************************************************************
+ *
+ *  utf8bidireorder.h -	Implementation of UTF8BiDiReorder
+ *
+ * $Id: utf8bidireorder.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8BIDIREORDER_H
+#define UTF8BIDIREORDER_H
+
+#include <swfilter.h>
+
+#include <unicode/utypes.h>
+#include <unicode/ucnv.h>
+#include <unicode/uchar.h>
+#include <unicode/ubidi.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter reorders UTF-8 text according to Unicode BiDi
+ */
+class SWDLLEXPORT UTF8BiDiReorder : public SWFilter {
+private:
+	UConverter* conv;
+	UErrorCode err;
+public:
+	UTF8BiDiReorder();
+	~UTF8BiDiReorder();  
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
+
diff --git a/include/utf8cantillation.h b/include/utf8cantillation.h
new file mode 100644
index 0000000..9b32489
--- /dev/null
+++ b/include/utf8cantillation.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  utf8cantillation.h -	Implementation of UTF8Cantillation
+ *
+ * $Id: utf8cantillation.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8CANTILLATION_H
+#define UTF8CANTILLATION_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+  /** This Filter shows/hides Hebrew cantillation marks in UTF8 text
+  */
+class SWDLLEXPORT UTF8Cantillation : public SWOptionFilter {
+public:
+	UTF8Cantillation();
+	virtual ~UTF8Cantillation();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8greekaccents.h b/include/utf8greekaccents.h
new file mode 100644
index 0000000..83ec957
--- /dev/null
+++ b/include/utf8greekaccents.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  utf8greekaccents.h -	Implementation of UTF8GreekAccents
+ *
+ * $Id: utf8greekaccents.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8GREEKACCENTS_H
+#define UTF8GREEKACCENTS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+  /** This Filter shows/hides Greek Accents marks in UTF8 text
+  */
+class SWDLLEXPORT UTF8GreekAccents : public SWOptionFilter {
+public:
+	UTF8GreekAccents();
+	virtual ~UTF8GreekAccents();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8hebrewpoints.h b/include/utf8hebrewpoints.h
new file mode 100644
index 0000000..4b97ddb
--- /dev/null
+++ b/include/utf8hebrewpoints.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  utf8hebrewpoints.h -	Implementation of UTF8HebrewPoints
+ *
+ * $Id: utf8hebrewpoints.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8HEBREWPOINTS_H
+#define UTF8HEBREWPOINTS_H
+
+#include <swoptfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This Filter shows/hides Hebrew vowel points in UTF8 text
+ */
+class SWDLLEXPORT UTF8HebrewPoints : public SWOptionFilter {
+public:
+	UTF8HebrewPoints();
+	virtual ~UTF8HebrewPoints();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8html.h b/include/utf8html.h
new file mode 100644
index 0000000..83c152a
--- /dev/null
+++ b/include/utf8html.h
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  utf8html.h -	Implementation of UTF8HTML
+ *
+ * $Id: utf8html.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8HTML_H
+#define UTF8HTML_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts UTF-8 text into HTML escape sequences
+ */
+class SWDLLEXPORT UTF8HTML : public SWFilter {
+public:
+	UTF8HTML();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8latin1.h b/include/utf8latin1.h
new file mode 100644
index 0000000..b3d9ac1
--- /dev/null
+++ b/include/utf8latin1.h
@@ -0,0 +1,40 @@
+/******************************************************************************
+ *
+ *  utf8latin1.h -	 Implementation of UTF8Latin1
+ *
+ * $Id: utf8latin1.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8Latin1_H
+#define UTF8Latin1_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts UTF-8 encoded text to Latin-1
+ */
+class SWDLLEXPORT UTF8Latin1 : public SWFilter {
+	char replacementChar;
+public:
+	UTF8Latin1(char rchar = '?');
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8nfc.h b/include/utf8nfc.h
new file mode 100644
index 0000000..c8798cc
--- /dev/null
+++ b/include/utf8nfc.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ *  utf8nfc.h -	Implementation of UTF8NFC
+ *
+ * $Id: utf8nfc.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8NFC_H
+#define UTF8NFC_H
+
+#include <swfilter.h>
+
+#include <unicode/utypes.h>
+#include <unicode/ucnv.h>
+#include <unicode/uchar.h>
+#include <unicode/unorm.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT UTF8NFC : public SWFilter {
+private:
+	UConverter* conv;
+	UChar *source, *target;
+	UErrorCode err;
+public:
+	UTF8NFC();
+	~UTF8NFC();  
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8nfkd.h b/include/utf8nfkd.h
new file mode 100644
index 0000000..347225e
--- /dev/null
+++ b/include/utf8nfkd.h
@@ -0,0 +1,47 @@
+/******************************************************************************
+ *
+ *  utf8nfkd.h -	Implementation of UTF8NFKD
+ *
+ * $Id: utf8nfkd.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8NFKD_H
+#define UTF8NFKD_H
+
+#include <swfilter.h>
+
+#include <unicode/utypes.h>
+#include <unicode/ucnv.h>
+#include <unicode/uchar.h>
+#include <unicode/unorm.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT UTF8NFKD : public SWFilter {
+private:
+	UConverter* conv;
+	UChar *source, *target;
+	UErrorCode err;
+public:
+	UTF8NFKD();
+	~UTF8NFKD();  
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8transliterator.h b/include/utf8transliterator.h
new file mode 100644
index 0000000..130a519
--- /dev/null
+++ b/include/utf8transliterator.h
@@ -0,0 +1,98 @@
+/******************************************************************************
+ *
+ *  utf8transliterator.h -	Implementation of UTF8Transliterator
+ *
+ * $Id: utf8transliterator.h 2906 2013-07-17 22:34:43Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8TRANSLITERATOR_H
+#define UTF8TRANSLITERATOR_H
+
+enum scriptEnum {SE_OFF, SE_LATIN, 
+/*one-way (to) transliterators*/ 
+SE_IPA, SE_BASICLATIN, SE_SBL, SE_TC, SE_BETA, SE_BGREEK, SE_SERA, SE_HUGOYE, SE_UNGEGN, SE_ISO, SE_ALALC, SE_BGN, 
+/*two-way transliterators*/ 
+SE_GREEK, SE_HEBREW, SE_CYRILLIC, SE_ARABIC, SE_SYRIAC, SE_KATAKANA, SE_HIRAGANA, SE_HANGUL, SE_DEVANAGARI, SE_TAMIL, SE_BENGALI, SE_GURMUKHI, SE_GUJARATI, SE_ORIYA, SE_TELUGU, SE_KANNADA, SE_MALAYALAM, SE_THAI, SE_GEORGIAN, SE_ARMENIAN, SE_ETHIOPIC, SE_GOTHIC, SE_UGARITIC, SE_COPTIC, SE_MEROITIC, SE_LINEARB, SE_CYPRIOT, SE_RUNIC, SE_OGHAM, SE_THAANA, SE_GLAGOLITIC, SE_CHEROKEE,
+/*SE_TENGWAR, SE_CIRTH,*/
+/*one-way (from) transliterators*/
+SE_JAMO, SE_HAN, SE_KANJI
+};
+
+#define NUMSCRIPTS 49
+#define NUMTARGETSCRIPTS 2 //NUMSCRIPTS-3//6
+
+#include <swoptfilter.h>
+
+#include <unicode/unistr.h>
+
+#include <unicode/translit.h>
+
+#include <defs.h>
+#include <map>
+
+SWORD_NAMESPACE_START
+
+class SWModule;
+
+struct SWTransData {
+	UnicodeString resource;
+	UTransDirection dir;
+};
+typedef std::map<const UnicodeString, SWTransData> SWTransMap;
+typedef std::pair<UnicodeString, SWTransData> SWTransPair;
+
+/** This Filter uses ICU for transliteration
+*/
+class SWDLLEXPORT UTF8Transliterator : public SWOptionFilter {
+private:
+
+	unsigned char option;
+
+	static const char optionstring[NUMTARGETSCRIPTS][16];
+
+	static const char optName[];
+	static const char optTip[];
+	StringList options;
+
+#ifdef ICU_CUSTOM_RESOURCE_BUILDING
+	static const char SW_RB_RULE_BASED_IDS[];
+	static const char SW_RB_RULE[];
+	static const char SW_RESDATA[];
+	static SWTransMap transMap;
+	UErrorCode utf8status;
+
+	void Load(UErrorCode &status);
+	void registerTrans(const UnicodeString& ID, const UnicodeString& resource, UTransDirection dir, UErrorCode &status);	
+	bool checkTrans(const UnicodeString& ID, UErrorCode &status);
+#endif
+	bool addTrans(const char* newTrans, SWBuf* transList);
+	Transliterator *createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status);
+
+public:
+	UTF8Transliterator();
+	~UTF8Transliterator();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+	virtual const char *getOptionName() { return optName; }
+	virtual const char *getOptionTip() { return optTip; }
+	virtual void setOptionValue(const char *ival);
+	virtual const char *getOptionValue();
+	virtual StringList getOptionValues() { return options; }
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utf8utf16.h b/include/utf8utf16.h
new file mode 100644
index 0000000..afa1c26
--- /dev/null
+++ b/include/utf8utf16.h
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  utf8utf16.h -	Implementation of UTF8UTF16
+ *
+ * $Id: utf8utf16.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTF8UTF16_H
+#define UTF8UTF16_H
+
+#include <swfilter.h>
+
+SWORD_NAMESPACE_START
+
+/** This filter converts UTF-8 encoded text to UTF-16
+ */
+class SWDLLEXPORT UTF8UTF16 : public SWFilter {
+public:
+	UTF8UTF16();
+	virtual char processText(SWBuf &text, const SWKey *key = 0, const SWModule *module = 0);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utilstr.h b/include/utilstr.h
new file mode 100644
index 0000000..573b4a1
--- /dev/null
+++ b/include/utilstr.h
@@ -0,0 +1,104 @@
+/******************************************************************************
+ *
+ *  utilstr.h -	prototypes for string utility functions
+ *
+ * $Id: utilstr.h 2981 2013-09-15 00:05:26Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTILSTR_H
+#define UTILSTR_H
+
+#include <defs.h>
+#include <sysdata.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+/** stdstr - clone a string
+*/
+SWDLLEXPORT char *stdstr (char **iistr, const char *istr, unsigned int memPadFactor = 1);
+SWDLLEXPORT char *strstrip (char *istr);
+SWDLLEXPORT const char *stristr (const char *s1, const char *s2);
+SWDLLEXPORT int strnicmp(const char *s1, const char *s2, int len);
+SWDLLEXPORT int stricmp(const char *s1, const char *s2);
+
+/******************************************************************************
+ * SW_toupper - array of uppercase values for any given Latin-1 value
+ *
+ * use this instead of toupper() for fast lookups on accented characters
+ */
+extern const unsigned char SW_toupper_array[256];
+#define SW_toupper(c) SW_toupper_array[(unsigned char)c]
+
+/******************************************************************************
+ * getUniCharFromUTF8 - retrieves the next Unicode codepoint from a UTF8 string
+ * 					and increments buf to start of next codepoint
+ *
+ * ENT:	buf - address of a utf8 buffer
+ *
+ * RET:	buf - incremented past last byte used in computing the current codepoint
+ * 		unicode codepoint value (0 with buf incremented is invalid UTF8 byte
+ */
+
+__u32 getUniCharFromUTF8(const unsigned char **buf);
+
+
+/******************************************************************************
+ * getUTF8FromUniChar - retrieves us UTF8 string from a
+ * 					Unicode codepoint
+ *
+ * ENT:	uchar - unicode codepoint value
+ *
+ * RET:	buf - a UTF8 string which consists of the proper UTF8 sequence of
+ * 				bytes for the given Unicode codepoint
+ */
+
+SWBuf getUTF8FromUniChar(__u32 uchar);
+
+
+/******************************************************************************
+ * assureValidUTF8 - iterates the supplied UTF-8 buffer and checks for validity
+ * 					replacing invalid bytes if necessary and returning a
+ *					verified UTF8 buffer, leaving the original input
+ *					unchanged.
+ *
+ * ENT:	buf - a utf8 buffer
+ *
+ * RET:	input buffer validated and any problems fixed by substituting a
+ * 		replacement character for bytes not valid.
+ */
+SWBuf assureValidUTF8(const char *buf);
+
+/****
+ * This can be called to convert a UTF8 stream to an SWBuf which manages
+ *	a wchar_t[]
+ *	access buffer with (wchar_t *)SWBuf::getRawData();
+ * 
+ */
+SWBuf utf8ToWChar(const char *buf);
+
+/****
+ * This can be called to convert a wchar_t[] to a UTF-8 SWBuf
+ * 
+ */
+SWBuf wcharToUTF8(const wchar_t *buf);
+
+
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/utilxml.h b/include/utilxml.h
new file mode 100644
index 0000000..d385628
--- /dev/null
+++ b/include/utilxml.h
@@ -0,0 +1,93 @@
+/******************************************************************************
+ *
+ *  utilxml.h -	definition of class that deal with xml constructs 
+ *
+ * $Id: utilxml.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef UTILXML_H
+#define UTILXML_H
+
+#include <defs.h>
+#include <swbuf.h>
+#include <list>
+#include <map>
+
+SWORD_NAMESPACE_START
+
+typedef std::map<SWBuf, SWBuf> StringPairMap;
+typedef std::list<SWBuf> StringList;
+
+/** Simple XML helper class.
+*/
+class SWDLLEXPORT XMLTag {
+private:
+	mutable char *buf;
+	char *name;
+	mutable bool parsed;
+	mutable bool empty;
+	mutable bool endTag;
+	mutable StringPairMap attributes;
+	mutable SWBuf junkBuf;
+	
+	void parse() const;
+	const char *getPart(const char *buf, int partNum = 0, char partSplit = '|') const;
+	
+public:
+	XMLTag(const char *tagString = 0);
+	XMLTag(const XMLTag& tag);
+	~XMLTag();
+
+	void setText(const char *tagString);
+	inline const char *getName() const { return (name) ? name : SWBuf::nullStr; }
+
+	inline bool isEmpty() const {
+		if (!parsed)
+			parse();
+
+		return empty;
+	}
+	inline void setEmpty(bool value) {
+		if (!parsed)
+			parse();
+		empty = value;
+		if (value)
+			endTag = false;
+	}
+
+	/***
+	 * if an eID is provided, then we check to be sure we have an attribute <tag eID="xxx"/> value xxx equiv to what is given us
+	 * otherwise, we return if we're a simple XML end </tag>.
+	 */
+	bool isEndTag(const char *eID = 0) const;
+
+	const StringList getAttributeNames() const;
+	int getAttributePartCount(const char *attribName, char partSplit = '|') const;
+
+	// return values should not be considered to persist beyond the return of the function.
+	const char *getAttribute(const char *attribName, int partNum = -1, char partSplit = '|') const;
+	const char *setAttribute(const char *attribName, const char *attribValue, int partNum = -1, char partSplit = '|');
+	const char *toString() const;
+	inline operator const char *() const { return toString(); }
+	inline XMLTag & operator =(const char *tagString) { setText(tagString); return *this; }
+	inline XMLTag & operator =(const XMLTag &other) { setText(other.toString()); return *this; }
+};
+
+SWORD_NAMESPACE_END
+#endif
+
diff --git a/include/versekey.h b/include/versekey.h
new file mode 100644
index 0000000..acddc9d
--- /dev/null
+++ b/include/versekey.h
@@ -0,0 +1,484 @@
+/******************************************************************************
+ *
+ *  versekey.h -	code for class 'VerseKey'- a standard Biblical verse
+ *			key
+ *
+ * $Id: versekey.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ	85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef VERSEKEY_H
+#define VERSEKEY_H
+
+#include <swkey.h>
+#include <swmacs.h>
+#include <listkey.h>
+#include <versificationmgr.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+#define POS_MAXVERSE ((char)3)
+#define POS_MAXCHAPTER ((char)4)
+#define POS_MAXBOOK ((char)5)
+
+#define MAXVERSE SW_POSITION(POS_MAXVERSE)
+#define MAXCHAPTER SW_POSITION(POS_MAXCHAPTER)
+#define MAXBOOK SW_POSITION(POS_MAXBOOK)
+
+
+
+/**
+ * Class VerseKey
+ * The SWKey implementation used for verse based modules like Bibles or commentaries.
+ */
+class SWDLLEXPORT VerseKey : public SWKey {
+
+	static SWClass classdef;
+
+	/** number of instantiated VerseKey objects or derivitives
+	*/
+	static int instance;
+	ListKey internalListKey;
+
+	const VersificationMgr::System *refSys;
+
+	/** flag for auto normalization
+	*/
+	char autonorm;
+
+	/** flag for intros on/off
+	*/
+	char intros;
+
+	/** initializes this VerseKey()
+	*/
+	void init(const char *v11n = "KJV");
+
+	// bounds caching is mutable, thus const
+	void initBounds() const;
+
+	// private with no bounds check
+	void setFromOther(const VerseKey &vk);
+
+	void checkBounds();
+
+	// internal upper/lower bounds optimizations
+	mutable long lowerBound, upperBound;	// if autonorms is on
+	mutable VerseKey *tmpClone;
+
+	typedef struct { int test; int book; int chap; int verse; char suffix; } VerseComponents;
+
+	mutable VerseComponents lowerBoundComponents, upperBoundComponents;	// if autonorms is off, we can't optimize with index
+
+protected:
+
+	/** The Testament: 0 - Module Heading; 1 - Old; 2 - New
+	*/
+	signed char testament;
+	signed char book;
+	signed int chapter;
+	signed int verse;
+	signed char suffix;
+
+	/************************************************************************
+	 * VerseKey::getBookFromAbbrev - Attempts to find a book no from a name or
+	 *                           abbreviation
+	 *
+	 * ENT:	@param abbr - key for which to search;
+	 * RET:	@return book number or < 0 = not valid
+	 */
+	virtual int getBookFromAbbrev(const char *abbr) const;
+
+	/** Refresh keytext based on testament|book|chapter|verse
+	* default auto normalization to true
+	* default display headings option is false
+	*/
+	void freshtext() const;
+	/**	Parse a character array into testament|book|chapter|verse
+	*
+	*/
+	virtual char parse(bool checkNormalize = true);
+public:
+#if 0
+	static long otbks[];
+	static long otcps[];
+	static long ntbks[];
+	static long ntcps[];
+#endif
+	int BMAX[2];
+
+	/**
+	* VerseKey Constructor - initializes Instance of VerseKey
+	*
+	* @param ikey text key (will take various forms of 'BOOK CH:VS'.
+	* See parse() for more detailed information)
+	*/
+	VerseKey(const char *ikey = 0);
+
+	/**
+	* VerseKey Constructor - initializes instance of VerseKey
+	*
+	* @param ikey base key (will take various forms of 'BOOK CH:VS'.
+	*	See parse() for more detailed information)
+	*/
+	VerseKey(const SWKey *ikey);
+
+	/** VerseKey Constructor - initializes instance of VerseKey
+	* with boundariess - see also LowerBound()
+	* and UpperBound()
+	* @param min the lower boundary of the new	VerseKey
+	* @param max the upper boundary of the new	VerseKey
+	*/
+	VerseKey(const char *min, const char *max, const char *v11n = "KJV");
+
+	/**	VerseKey Copy Constructor - will create a new VerseKey
+	* based on an existing SWKey
+	*
+	* @param k the	VerseKey to copy from
+	*/
+	VerseKey(const SWKey &k);
+
+	/**	VerseKey Copy Constructor - will create a new VerseKey
+	* based on an existing one
+	*
+	* @param k the	VerseKey to copy from
+	*/
+	VerseKey(const VerseKey &k);
+
+	/**	VerseKey Destructor
+	* Cleans up an instance of VerseKey
+	*/
+	virtual ~VerseKey();
+
+	/** sets the lower boundary for this VerseKey
+	*
+	* @param lb the new lower boundary for this VerseKey
+	*/
+	void setLowerBound(const VerseKey &lb);
+	SWDEPRECATED VerseKey &LowerBound(const VerseKey &lb) { setLowerBound(lb); return getLowerBound(); }
+
+	/** sets the upper boundary for this VerseKey
+	* @param ub the new upper boundary for this VerseKey
+	* @return the upper boundary the key was set to
+	*/
+	void setUpperBound(const VerseKey &ub);
+	SWDEPRECATED VerseKey &UpperBound(const VerseKey &ub) { setUpperBound(ub); return getUpperBound(); }
+
+	/** gets the lower boundary of this VerseKey
+	* @return the lower boundary of this VerseKey
+	*/
+	VerseKey &getLowerBound() const;
+	SWDEPRECATED VerseKey &LowerBound() const { return getLowerBound(); }
+
+	/** gets the upper boundary of this VerseKey
+	* @return the upper boundary of this VerseKey
+	*/
+	VerseKey &getUpperBound() const;
+	SWDEPRECATED VerseKey &UpperBound() const { return getUpperBound(); }
+
+	/** clears the boundaries of this VerseKey
+	*/
+	void clearBounds();
+	SWDEPRECATED void ClearBounds() { clearBounds(); }
+
+	/** Creates a new SWKey based on the current VerseKey
+	* see also the Copy Constructor
+	*/
+	virtual SWKey *clone() const;
+
+	/** refreshes keytext before returning if cast to
+	* a (char *) is requested
+	*/
+	virtual const char *getText() const;
+	virtual const char *getShortText() const;
+	virtual void setText(const char *ikey, bool checkNormalize) { SWKey::setText(ikey); parse(checkNormalize); }
+	virtual void setText(const char *ikey) { SWKey::setText(ikey); parse(); }
+	virtual void copyFrom(const SWKey &ikey);
+
+	/** Equates this VerseKey to another VerseKey
+	*/
+	virtual void copyFrom(const VerseKey &ikey);
+
+	/** Only repositions this VerseKey to another VerseKey
+	*/
+	virtual void positionFrom(const SWKey &ikey);
+
+	/** Positions this key
+	*
+	* @param newpos Position to set to.
+	* @return *this
+	*/
+	virtual void setPosition(SW_POSITION newpos);
+
+	/** Decrements key a number of verses
+	*
+	* @param steps Number of verses to jump backward
+	* @return *this
+	*/
+	virtual void decrement(int steps = 1);
+
+	/** Increments key a number of verses
+	*
+	* @param steps Number of verses to jump forward
+	* @return *this
+	*/
+	virtual void increment(int steps = 1);
+	virtual bool isTraversable() const { return true; }
+
+	/** Get/Set position of this key by Book Name
+	 */
+	virtual const char *getBookName() const;
+	virtual void setBookName(const char *bname);
+
+	virtual const char *getBookAbbrev() const;
+	/** Gets testament
+	*
+	* @return value of testament
+	*/
+	virtual char getTestament() const;
+	/**
+	* @deprecated Use getTestament() instead.
+	*/
+	SWDEPRECATED char Testament() const { return getTestament(); }	// deprecated
+	virtual int getTestamentMax() const { return 2; }
+
+	/** Gets book
+	*
+	* @return value of book
+	*/
+	virtual char getBook() const;
+	/**
+	* @deprecated Use getBook() instead.
+	*/
+	SWDEPRECATED char Book() const { return getBook(); }	// deprecated
+	virtual int getBookMax() const { return BMAX[testament-1]; }
+
+	/** Gets chapter
+	*
+	* @return value of chapter
+	*/
+	virtual int getChapter() const;
+	/**
+	* @deprecated Use getChapter() instead.
+	*/
+	SWDEPRECATED int Chapter() const { return getChapter(); }	// deprecated
+	virtual int getChapterMax() const;
+
+	/** Gets verse
+	*
+	* @return value of verse
+	*/
+	virtual int getVerse() const;
+	/**
+	* @deprecated Use getVerse() instead.
+	*/
+	SWDEPRECATED int Verse() const { return getVerse(); }		// deprecated
+	virtual int getVerseMax() const;
+
+	/** Gets verse suffix
+	*
+	* @return value of verse suffix
+	*/
+	virtual char getSuffix() const;
+
+	/** Sets testament
+	*
+	* @param itestament value which to set testament
+	*/
+	virtual void setTestament(char itestament);
+	/**
+	* @deprecated Use setTestament() instead.
+	*/
+	SWDEPRECATED char Testament(char itestament) { char retVal = getTestament(); setTestament(itestament); return retVal; } // deprecated
+
+	/** Sets book
+	*
+	* @param ibook value which to set book
+	*/
+	virtual void setBook(char ibook);
+	/**
+	* @deprecated Use setBook() instead.
+	*/
+	SWDEPRECATED char Book(char ibook) { char retVal = getBook(); setBook(ibook); return retVal; } // deprecated
+
+	/** Sets chapter
+	*
+	* @param ichapter value which to set chapter
+	*/
+	virtual void setChapter(int ichapter);
+	/**
+	* @deprecated Use setChapter() instead.
+	*/
+	SWDEPRECATED int Chapter(int ichapter) { char retVal = getChapter(); setChapter(ichapter); return retVal; } // deprecated
+
+	/** Sets verse
+	*
+	* @param iverse value which to set verse
+	*/
+	virtual void setVerse(int iverse);
+	/**
+	* @deprecated Use setVerse() instead.
+	*/
+	SWDEPRECATED int Verse(int iverse) { char retVal = getVerse(); setVerse(iverse); return retVal; } // deprecated;
+
+	/** Sets/gets verse suffix
+	*
+	* @param isuffix value which to set verse suffix
+	*/
+	virtual void setSuffix(char isuffix);
+
+	/** checks limits and normalizes if necessary (e.g.
+	* Matthew 29:47 = Mark 2:2).	If last verse is
+	* exceeded, key is set to last Book CH:VS
+	*
+	* @return *this
+	*/
+	virtual void normalize(bool autocheck = false);
+	SWDEPRECATED void Normalize(char autocheck = 0) { normalize(autocheck!=0); }
+
+	/** Sets flag that tells VerseKey to
+	* automatically normalize itself when modified
+	*
+	* @param iautonorm value which to set autonorm
+	* [MAXPOS(char)] - only get
+	* @return if unchanged -> value of autonorm,
+	* if changed -> previous value of autonorm
+	*/
+	virtual void setAutoNormalize(bool iautonorm);
+	virtual bool isAutoNormalize() const;
+
+	/**
+	* @deprecated Use setAutoNormalize() instead.
+	*/
+	SWDEPRECATED char AutoNormalize(char iautonorm) { char retVal = isAutoNormalize()?1:0; setAutoNormalize(iautonorm!=0); return retVal; }	// deprecated
+	/**
+	* @deprecated Use isAutoNormalize() instead.
+	*/
+	SWDEPRECATED char AutoNormalize() const { return isAutoNormalize()?1:0; }	// deprecated
+
+
+	/** Sets/gets flag that tells VerseKey to include
+	* chapter/book/testament/module intros
+	*
+	* @deprecated Use setIntros() and isIntros() instead.
+	* @param iheadings value which to set intros
+	* [MAXPOS(char)] - only get
+	* @return if unchanged -> value of intros,
+	* if changed -> previous value of intros
+	*/
+	SWDEPRECATED char Headings(char iheadings = MAXPOS(char)) { char retVal = isIntros(); if (iheadings != MAXPOS(char)) setIntros(iheadings!=0); return retVal; }
+
+	/** The Intros property determine whether or not to include
+	* chapter/book/testament/module intros
+	*/
+	virtual void setIntros(bool val);
+	virtual bool isIntros() const;
+
+
+	/** Gets index based upon current verse
+	*
+	* @return offset
+	*/
+	virtual long getIndex() const;
+
+
+	/** Sets index based upon current verse
+	*
+	* @param iindex value to set index to
+	* @return offset
+	*/
+	virtual void setIndex(long iindex);
+
+
+	/** Gets index into current testament based upon current verse
+	*
+	* @return offset
+	*/
+	virtual long getTestamentIndex() const;
+
+	/**
+	* @deprecated Use getTestamentIndex()
+	*/
+	SWDEPRECATED long TestamentIndex() const { return getTestamentIndex(); }	// deprecated, use getTestamentIndex()
+
+	virtual const char *getOSISRef() const;
+	virtual const char *getOSISBookName() const;
+
+	/** Tries to parse a string and convert it into an OSIS reference
+	 * @param inRef reference string to try to parse
+	 * @param defaultKey @see ParseVerseList(..., defaultKey, ...)
+	 */
+	static const char *convertToOSIS(const char *inRef, const SWKey *defaultKey);
+
+	/******************************************************************************
+	 * VerseKey::parseVerseList - Attempts to parse a buffer into separate
+	 *				verse entries returned in a ListKey
+	 *
+	 * ENT:	buf		- buffer to parse;
+	 *	defaultKey	- if verse, chap, book, or testament is left off,
+	 *				pull info from this key (ie. Gen 2:3; 4:5;
+	 *				Gen would be used when parsing the 4:5 section)
+	 *	expandRange	- whether or not to expand eg. John 1:10-12 or just
+	 *				save John 1:10
+	 *
+	 * RET:	ListKey reference filled with verse entries contained in buf
+	 *
+	 * COMMENT: This code works but wreaks.  Rewrite to make more maintainable.
+	 */
+	virtual ListKey parseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false);
+	SWDEPRECATED ListKey ParseVerseList(const char *buf, const char *defaultKey = 0, bool expandRange = false, bool useChapterAsVerse = false) { return parseVerseList(buf, defaultKey, expandRange, useChapterAsVerse); }
+	virtual const char *getRangeText() const;
+	virtual const char *getOSISRefRangeText() const;
+	/** Compares another	SWKey object
+	*
+	* @param ikey key to compare with this one
+	* @return >0 if this	VerseKey is greater than compare	SWKey,
+	* <0 if this	VerseKey is smaller than compare	SWKey,
+	* 0 if the keys are the same
+	*/
+	virtual int compare(const SWKey &ikey);
+
+	/** Compares another	VerseKey object
+	*
+	* @param ikey key to compare with this one
+	* @return >0 if this	VerseKey is greater than compare	VerseKey,
+	* <0 if this	VerseKey is smaller than compare	VerseKey,
+	* 0 if the keys are the same
+	*/
+	virtual int _compare(const VerseKey &ikey);
+
+	virtual void setVersificationSystem(const char *name);
+	virtual const char *getVersificationSystem() const;
+
+	// DEBUG
+	void validateCurrentLocale() const;
+
+
+	// OPERATORS --------------------------------------------------------------------
+
+
+	SWKEY_OPERATORS
+
+	virtual SWKey &operator =(const VerseKey &ikey) { positionFrom(ikey); return *this; }
+};
+
+SWORD_NAMESPACE_END
+
+#endif //VERSEKEY_H
diff --git a/include/versetreekey.h b/include/versetreekey.h
new file mode 100644
index 0000000..60e2d69
--- /dev/null
+++ b/include/versetreekey.h
@@ -0,0 +1,127 @@
+/******************************************************************************
+ *
+ *  versetreekey.h -	code for class 'VerseTreeKey'- a standard Biblical
+ *			verse key
+ *
+ * $Id: versetreekey.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef VERSETREEKEY_H
+#define VERSETREEKEY_H
+
+#include <versekey.h>
+#include <treekey.h>
+#include <swmacs.h>
+#include <listkey.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+/**
+ * Class VerseKey
+ * The SWKey implementation used for verse based modules like Bibles or commentaries.
+ */
+class SWDLLEXPORT VerseTreeKey : public VerseKey, public TreeKey::PositionChangeListener {
+
+	static SWClass classdef;
+	TreeKey *treeKey;
+//	vector<struct sbook> books;
+
+	void init(TreeKey *treeKey);
+	void syncVerseToTree();
+	long lastGoodOffset;
+
+protected:
+	virtual int getBookFromAbbrev(const char *abbr) const;
+
+public:
+
+	/**
+	* VerseKey Constructor - initializes Instance of VerseKey
+	*
+	* @param treeKey a TreeKey which will form the basis of this VerseTreeKey
+	* @param ikey text key (will take various forms of 'BOOK CH:VS'.
+	* See parse() for more detailed information)
+	*/
+	VerseTreeKey(TreeKey *treeKey, const char *ikey = 0);
+	
+	/**
+	* VerseKey Constructor - initializes instance of VerseKey
+	*
+	* @param treeKey a TreeKey which will form the basis of this VerseTreeKey
+	* @param ikey base key (will take various forms of 'BOOK CH:VS'.
+	*	See parse() for more detailed information)
+	*/	
+	VerseTreeKey(TreeKey *treeKey, const SWKey *ikey);
+	
+	/** VerseKey Constructor - initializes instance of VerseKey
+	* with boundariess - see also LowerBound()
+	* and UpperBound()
+	* @param treeKey a TreeKey which will form the basis of this VerseTreeKey
+	* @param min the lower boundary of the new	VerseKey
+	* @param max the upper boundary of the new	VerseKey
+	*/	
+	VerseTreeKey(TreeKey *treeKey, const char *min, const char *max);
+	
+	/**	VerseKey Copy Constructor - will create a new	VerseKey
+	* based on an existing one
+	*
+	* @param k the	VerseKey to copy from
+	*/
+	VerseTreeKey(const VerseTreeKey &k);
+	
+
+	/**	VerseKey Destructor
+	* Cleans up an instance of VerseKey
+	*/
+	virtual ~VerseTreeKey();
+
+	/** Creates a new	SWKey based on the current	VerseKey
+	* see also the Copy Constructor
+	*/
+	virtual SWKey *clone() const;
+	
+	virtual bool isTraversable() const { return true; }
+
+	virtual TreeKey *getTreeKey();
+
+	// TreeKey::PositionChangeListener interface
+	virtual void positionChanged();
+	bool internalPosChange;
+
+	virtual void decrement(int steps = 1);
+	virtual void increment(int steps = 1);
+	
+	virtual void Normalize(char autocheck = 0);
+
+	virtual void setPosition(SW_POSITION newpos);
+	virtual long NewIndex() const;
+	// OPERATORS --------------------------------------------------------------------
+
+
+	SWKEY_OPERATORS
+
+	virtual SWKey & operator = (const VerseKey & ikey) { copyFrom(ikey); return *this; }
+//	virtual void copyFrom(const VerseTreeKey &ikey);
+};
+
+SWORD_NAMESPACE_END
+
+#endif //VERSETREEKEY_H
diff --git a/include/versificationmgr.h b/include/versificationmgr.h
new file mode 100644
index 0000000..4ed8a62
--- /dev/null
+++ b/include/versificationmgr.h
@@ -0,0 +1,164 @@
+/******************************************************************************
+ *
+ *  versification.h -	definition of class VersificationMgr used for managing
+ *			versification systems
+ *
+ * $Id: versificationmgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <list>
+#include <defs.h>
+#include <swcacher.h>
+#include <swbuf.h>
+
+
+#ifndef VERSIFICATIONMGR_H
+#define VERSIFICATIONMGR_H
+
+
+SWORD_NAMESPACE_START
+
+typedef std::list <SWBuf>StringList;
+
+struct sbook;
+class TreeKey;
+
+
+struct abbrev
+{
+	const char *ab;
+	const char *osis;
+};
+
+struct sbook {
+	/**Name of book
+	*/
+	const char *name;
+
+	/**OSIS name
+	*/
+	const char *osis;
+
+	/**Preferred Abbreviation
+	*/
+	const char *prefAbbrev;
+
+	/**Maximum chapters in book
+	*/
+	unsigned char chapmax;
+	/** Array[chapmax] of maximum verses in chapters
+	*/
+	int *versemax;
+};
+
+
+class SWDLLEXPORT VersificationMgr : public SWCacher {
+
+
+public:
+	class System;
+
+private:
+	friend class __staticsystemVersificationMgr;
+
+	class Private;
+	Private *p;
+
+	void init();
+
+protected:
+	static VersificationMgr *systemVersificationMgr;
+
+public:
+	class SWDLLEXPORT Book {
+		friend class System;
+		friend struct BookOffsetLess;
+		class Private;
+		Private *p;
+
+		/** book name */
+		SWBuf longName;
+
+		/** OSIS Abbreviation */
+		SWBuf osisName;
+
+		/** Preferred Abbreviation */
+		SWBuf prefAbbrev;
+
+		/** Maximum chapters in book */
+		unsigned int chapMax;
+
+		void init();
+
+	public:
+		Book() { init(); }
+		Book(const Book &other);
+		Book &operator =(const Book &other);
+		Book(const char *longName, const char *osisName, const char *prefAbbrev, int chapMax) {
+			this->longName = longName;
+			this->osisName = osisName;
+			this->prefAbbrev = prefAbbrev;
+			this->chapMax = chapMax;
+			init();
+		}
+		~Book();
+		const char *getLongName() const { return longName.c_str(); }
+		const char *getOSISName() const { return osisName.c_str(); }
+		const char *getPreferredAbbreviation() const { return prefAbbrev.c_str(); }
+		int getChapterMax() const { return chapMax; }
+		int getVerseMax(int chapter) const;
+	};
+
+	class SWDLLEXPORT System {
+		class Private;
+		Private *p;
+		SWBuf name;
+		int BMAX[2];
+		long ntStartOffset;
+		void init();
+	public:
+		System() { this->name = ""; init(); }
+		System(const System &other);
+		System &operator =(const System &other);
+		System(const char *name) { this->name = name; init(); }
+		~System();
+		const char *getName() const { return name.c_str(); }
+		const Book *getBookByName(const char *bookName) const;
+		int getBookNumberByOSISName(const char *bookName) const;
+		const Book *getBook(int number) const;
+		int getBookCount() const;
+		void loadFromSBook(const sbook *ot, const sbook *nt, int *chMax);
+		long getOffsetFromVerse(int book, int chapter, int verse) const;
+		char getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const;
+		const int *getBMAX() const { return BMAX; };
+		long getNTStartOffset() const { return ntStartOffset; }
+	};
+	VersificationMgr() { init(); }
+	~VersificationMgr();
+	static VersificationMgr *getSystemVersificationMgr();
+	static void setSystemVersificationMgr(VersificationMgr *newVersificationMgr);
+	const StringList getVersificationSystems() const;
+	const System *getVersificationSystem(const char *name) const;
+	void registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax);
+	void registerVersificationSystem(const char *name, const TreeKey *);
+};
+
+SWDLLEXPORT extern const struct abbrev builtin_abbrevs[];
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/xzcomprs.h b/include/xzcomprs.h
new file mode 100644
index 0000000..c468288
--- /dev/null
+++ b/include/xzcomprs.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  xzcomprs.h -	XzCompress, a driver class that provides xz (LZMA2)
+ *			compression
+ *
+ * $Id: xzcomprs.h 2850 2013-07-02 09:57:20Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef XZCOMPRS_H
+#define XZCOMPRS_H
+
+#include <swcomprs.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT XzCompress : public SWCompress {
+
+protected:
+public:
+	XzCompress();
+	virtual ~XzCompress();
+
+	virtual void Encode(void);
+	virtual void Decode(void);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/zcom.h b/include/zcom.h
new file mode 100644
index 0000000..560b650
--- /dev/null
+++ b/include/zcom.h
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
+ *  zcom.h - 	code for class 'zCom'- a module that reads compressed text
+ *     	       	files: ot and nt using indexs ??.vss
+ *
+ * $Id: zcom.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ZCOM_H
+#define ZCOM_H
+
+#include <swcom.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT zCom : public zVerse, public SWCom {
+
+	VerseKey *lastWriteKey;
+	bool sameBlock(VerseKey * lastWriteKey, VerseKey * key);
+	int blockType;
+
+
+public:
+
+	zCom(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			int blockType = CHAPTERBLOCKS, SWCompress *icomp = 0,
+			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0,
+			const char *versification = "KJV");
+	virtual ~zCom();
+	virtual SWBuf &getRawEntryBuf() const;
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path, int blockBound, const char *v11n = "KJV") {
+		return zVerse::createModule(path, blockBound, v11n);
+	}
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey * linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+
+	virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
+
+	// swcacher interface ----------------------
+	virtual void flush() { flushCache(); }
+	// end swcacher interface ----------------------
+
+	virtual bool isLinked(const SWKey *k1, const SWKey *k2) const;
+	virtual bool hasEntry(const SWKey *k) const;
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+
+#endif
diff --git a/include/zipcomprs.h b/include/zipcomprs.h
new file mode 100644
index 0000000..ce35e80
--- /dev/null
+++ b/include/zipcomprs.h
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  zipcomprs.h -	definition of Class ZipCompress used for data
+ *			compression
+ *
+ * $Id: zipcomprs.h 2850 2013-07-02 09:57:20Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ZIPCOMPRS_H
+#define ZIPCOMPRS_H
+
+#include <swcomprs.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT ZipCompress : public SWCompress {
+
+protected:
+public:
+	ZipCompress();
+	virtual ~ZipCompress();
+
+	virtual void Encode(void);
+	virtual void Decode(void);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/zld.h b/include/zld.h
new file mode 100644
index 0000000..5b7891f
--- /dev/null
+++ b/include/zld.h
@@ -0,0 +1,76 @@
+/******************************************************************************
+ *
+ *  zld.cpp -	code for class 'zLD'- a module that reads compressed lexicon
+ *		and dictionary files
+ *
+ * $Id: zld.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ZLD_H
+#define ZLD_H
+
+#include <zstr.h>
+#include <swld.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWDLLEXPORT zLD : public zStr, public SWLD {
+	char getEntry(long away = 0) const;
+
+public:
+
+
+	zLD(const char *ipath, const char *iname = 0, const char *idesc = 0, long blockCount = 200, SWCompress *icomp = 0, SWDisplay * idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN, SWTextDirection dir = DIRECTION_LTR, SWTextMarkup markup = FMT_UNKNOWN, const char* ilang = 0, bool caseSensitive = false, bool strongsPadding = true);
+	virtual ~zLD();
+	virtual SWBuf &getRawEntryBuf() const;
+
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+
+	// write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path) {
+		return zStr::createModule(path);
+	}
+
+	virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+	virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+	// end write interface ------------------------
+
+	virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
+  
+	// swcacher interface ----------------------
+	virtual void flush() { flushCache(); }
+	// end swcacher interface ----------------------
+
+	virtual long getEntryCount() const;
+	virtual long getEntryForKey(const char *key) const;
+	virtual char *getKeyForEntry(long entry) const;
+
+
+	// OPERATORS -----------------------------------------------------------------
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/zstr.h b/include/zstr.h
new file mode 100644
index 0000000..81ed63d
--- /dev/null
+++ b/include/zstr.h
@@ -0,0 +1,76 @@
+/*****************************************************************************
+ *
+ *  zstr.h -	code for class 'zStr'- a module that reads compressed text
+ *	       	files.
+ *		and provides lookup and parsing functions based on
+ *		class StrKey
+ *
+ * $Id: zstr.h 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ZSTR_H
+#define ZSTR_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class SWCompress;
+class EntriesBlock;
+class FileDesc;
+class SWBuf;
+
+class SWDLLEXPORT zStr {
+
+private:
+	static int instance;		// number of instantiated zStr objects or derivitives
+	mutable EntriesBlock *cacheBlock;
+	mutable long cacheBlockIndex;
+	mutable bool cacheDirty;
+	char *path;
+	bool caseSensitive;
+	mutable long lastoff;		// for caching and optimization
+	long blockCount;
+	SWCompress *compressor;
+
+protected:
+	FileDesc *idxfd;
+	FileDesc *datfd;
+	FileDesc *zdxfd;
+	FileDesc *zdtfd;
+	static const int IDXENTRYSIZE;
+	static const int ZDXENTRYSIZE;
+
+	void getCompressedText(long block, long entry, char **buf) const;
+	void flushCache() const;
+	void getKeyFromDatOffset(long ioffset, char **buf) const;
+	void getKeyFromIdxOffset(long ioffset, char **buf) const;
+
+public:
+	zStr(const char *ipath, int fileMode = -1, long blockCount = 100, SWCompress *icomp = 0, bool caseSensitive = false);
+	virtual ~zStr();
+	signed char findKeyIndex(const char *ikey, long *idxoff, long away = 0) const;
+	void getText(long index, char **idxbuf, char **buf) const;
+	void setText(const char *ikey, const char *buf, long len = -1);
+	void linkEntry(const char *destkey, const char *srckey);
+	virtual void rawZFilter(SWBuf &buf, char direction = 0) const { (void) buf; (void) direction; }
+	static signed char createModule (const char *path);
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/ztext.h b/include/ztext.h
new file mode 100644
index 0000000..c8855c9
--- /dev/null
+++ b/include/ztext.h
@@ -0,0 +1,93 @@
+/******************************************************************************
+ *
+ *  ztext.h -	code for class 'zText'- a module that reads compressed text
+ *		files: ot and nt using indexs ??.vss
+ *
+ * $Id: ztext.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef ZTEXT_H
+#define ZTEXT_H
+
+#include <zverse.h>
+#include <swtext.h>
+
+#include <defs.h>
+
+namespace lucene { namespace index {
+class IndexReader;
+}}
+
+namespace lucene { namespace search {
+class IndexSearcher;
+}}
+
+SWORD_NAMESPACE_START
+
+/*** SWModule implementation for compressed modules
+* This class handles compressed modules.
+* It should not be used in frontends, unless you are doing very special things.
+*/
+class SWDLLEXPORT zText:public zVerse, public SWText {
+
+	VerseKey *lastWriteKey;
+	bool sameBlock(VerseKey * lastWriteKey, VerseKey * key);
+	int blockType;
+
+
+public:
+    
+	zText(const char *ipath, const char *iname = 0, const char *idesc = 0,
+			int blockType = CHAPTERBLOCKS, SWCompress *icomp = 0,
+			SWDisplay *idisp = 0, SWTextEncoding encoding = ENC_UNKNOWN,
+			SWTextDirection dir = DIRECTION_LTR,
+			SWTextMarkup markup = FMT_UNKNOWN, const char *ilang = 0,
+			const char *versification = "KJV");
+
+	virtual ~zText();
+	virtual SWBuf &getRawEntryBuf() const;
+
+	virtual void increment(int steps = 1);
+	virtual void decrement(int steps = 1) { increment(-steps); }
+
+  // write interface ----------------------------
+	virtual bool isWritable() const;
+	static char createModule(const char *path, int blockBound, const char *v11n = "KJV") {
+		return zVerse::createModule(path, blockBound, v11n);
+	}
+
+     virtual void setEntry(const char *inbuf, long len = -1);	// Modify current module entry
+     virtual void linkEntry(const SWKey *linkKey);	// Link current module entry to other module entry
+	virtual void deleteEntry();	// Delete current module entry
+  // end write interface ------------------------
+  
+	virtual void rawZFilter(SWBuf &buf, char direction = 0) const { rawFilter(buf, (SWKey *)(long)direction); }// hack, use key as direction for enciphering
+
+	// swcacher interface ----------------------
+	virtual void flush() { flushCache(); }
+	// end swcacher interface ----------------------
+
+	virtual bool isLinked(const SWKey *k1, const SWKey *k2) const;
+	virtual bool hasEntry(const SWKey *k) const;
+	
+	SWMODULE_OPERATORS
+
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/include/zverse.h b/include/zverse.h
new file mode 100644
index 0000000..c5fe8ee
--- /dev/null
+++ b/include/zverse.h
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
+ *  rawverse.h -	code for class 'zVerse'- a module that reads raw text
+ *			files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *			and provides lookup and parsing functions based on
+ *			class VerseKey
+ *
+ * $Id: zverse.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#ifndef ZVERSE_H
+#define ZVERSE_H
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+class FileDesc;
+class SWCompress;
+class SWBuf;
+
+class SWDLLEXPORT zVerse {
+	SWCompress *compressor;
+
+protected:
+	static int instance;		// number of instantiated zVerse objects or derivitives
+
+	FileDesc *idxfp[2];
+	FileDesc *textfp[2];
+	FileDesc *compfp[2];
+	char *path;
+	void doSetText(char testmt, long idxoff, const char *buf, long len = 0);
+	void doLinkEntry(char testmt, long destidxoff, long srcidxoff);
+	void flushCache() const;
+	mutable char *cacheBuf;
+	mutable unsigned int cacheBufSize;
+	mutable char cacheTestament;
+	mutable long cacheBufIdx;
+	mutable bool dirtyCache;
+
+public:
+
+#define	VERSEBLOCKS 2
+#define	CHAPTERBLOCKS 3
+#define	BOOKBLOCKS 4
+
+	static const char uniqueIndexID[];
+	char nl;
+
+
+	// fileMode default = RDONLY
+	zVerse(const char *ipath, int fileMode = -1, int blockType = CHAPTERBLOCKS, SWCompress * icomp = 0);
+	virtual ~zVerse();
+
+	void findOffset(char testmt, long idxoff, long *start, unsigned short *size, unsigned long *buffnum) const;
+	void zReadText(char testmt, long start, unsigned short size, unsigned long buffnum, SWBuf &buf) const;
+	virtual void rawZFilter(SWBuf &buf, char direction = 0) const { (void) buf; (void) direction; }
+	static char createModule(const char *path, int blockBound, const char *v11n = "KJV");
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/install-sh b/install-sh
new file mode 100755
index 0000000..377bb86
--- /dev/null
+++ b/install-sh
@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2011-11-20.07; # UTC
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# 'make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
+
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chgrpcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
+stripcmd=
+
+src=
+dst=
+dir_arg=
+dst_arg=
+
+copy_on_change=false
+no_target_directory=
+
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) ;;
+
+    -C) copy_on_change=true;;
+
+    -d) dir_arg=true;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+	shift;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
+
+    -o) chowncmd="$chownprog $2"
+	shift;;
+
+    -s) stripcmd=$stripprog;;
+
+    -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
+	shift;;
+
+    -T) no_target_directory=true;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+  shift
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call 'install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names problematic for 'test' and other utilities.
+  case $src in
+    -* | [=\(\)!]) src=./$src;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dst_arg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+    dst=$dst_arg
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dst_arg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix='/';;
+	[-=\(\)!]*) prefix='./';;
+	*)  prefix='';;
+      esac
+
+      eval "$initialize_posix_glob"
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
+      shift
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test X"$d" = X && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..2e98cf7
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,38 @@
+AUTOMAKE_OPTIONS = 1.6
+
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+#TODO: Where else do we need this?
+if USE_INTERNAL_REGEX
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+endif
+
+AM_CPPFLAGS += -I$(includedir) -DUSE_AUTOTOOLS -DUNIX -Dunix -D__unix__
+
+# Global config directory
+globalconfdir := @sysconfdir@
+
+lib_LTLIBRARIES = libsword.la
+
+libsword_la_SOURCES =
+if HAVE_ICU
+ICUDEF = -DSWICU_DATA=\"${pkglibdir}/${VERSION}_icu_${ICU_VER}\" 
+else
+ICUDEF =
+endif
+
+AM_CPPFLAGS += $(ICUDEF)
+
+libsword_la_LDFLAGS = -release $(VERSION)
+
+include ../src/keys/Makefile.am
+include ../src/utilfuns/Makefile.am
+include ../src/mgr/Makefile.am
+include ../src/frontend/Makefile.am
+include ../src/modules/Makefile.am
+#include ../bindings/Makefile.am
+bindingsdir = $(top_srcdir)/bindings
+libsword_la_SOURCES += $(bindingsdir)/flatapi.cpp
+include ../include/Makefile.am
+
+
diff --git a/lib/Makefile.in b/lib/Makefile.in
new file mode 100644
index 0000000..70a06a6
--- /dev/null
+++ b/lib/Makefile.in
@@ -0,0 +1,2382 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+
+#TODO: Where else do we need this?
+@USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex
+DIST_COMMON = $(srcdir)/../src/keys/Makefile.am \
+	$(srcdir)/../src/utilfuns/Makefile.am \
+	$(srcdir)/../src/mgr/Makefile.am \
+	$(srcdir)/../src/frontend/Makefile.am \
+	$(srcdir)/../src/modules/Makefile.am \
+	$(srcdir)/../src/modules/common/Makefile.am \
+	$(srcdir)/../src/modules/filters/Makefile.am \
+	$(srcdir)/../src/modules/genbook/Makefile.am \
+	$(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am \
+	$(srcdir)/../src/modules/texts/Makefile.am \
+	$(srcdir)/../src/modules/texts/rawtext/Makefile.am \
+	$(srcdir)/../src/modules/texts/rawtext4/Makefile.am \
+	$(srcdir)/../src/modules/texts/ztext/Makefile.am \
+	$(srcdir)/../src/modules/comments/Makefile.am \
+	$(srcdir)/../src/modules/comments/rawcom/Makefile.am \
+	$(srcdir)/../src/modules/comments/rawcom4/Makefile.am \
+	$(srcdir)/../src/modules/comments/rawfiles/Makefile.am \
+	$(srcdir)/../src/modules/comments/zcom/Makefile.am \
+	$(srcdir)/../src/modules/comments/hrefcom/Makefile.am \
+	$(srcdir)/../src/modules/lexdict/Makefile.am \
+	$(srcdir)/../src/modules/lexdict/rawld/Makefile.am \
+	$(srcdir)/../src/modules/lexdict/rawld4/Makefile.am \
+	$(srcdir)/../src/modules/lexdict/zld/Makefile.am \
+	$(srcdir)/../include/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/depcomp \
+	$(am__pkginclude_HEADERS_DIST) README
+@HAVE_VSNPRINTF_FALSE@am__append_2 = -DNO_VSNPRINTF
+@USE_INTERNAL_REGEX_TRUE@am__append_3 = $(swincludedir)/internal/regex/regex.h
+subdir = lib
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libsword_la_LIBADD =
+am__libsword_la_SOURCES_DIST = $(keysdir)/swkey.cpp \
+	$(keysdir)/listkey.cpp $(keysdir)/strkey.cpp \
+	$(keysdir)/treekey.cpp $(keysdir)/treekeyidx.cpp \
+	$(keysdir)/versekey.cpp $(keysdir)/versetreekey.cpp \
+	$(utilfunsdir)/swobject.cpp $(utilfunsdir)/utilstr.cpp \
+	$(utilfunsdir)/utilxml.cpp $(utilfunsdir)/swversion.cpp \
+	$(utilfunsdir)/swbuf.cpp $(utilfunsdir)/ftpparse.c \
+	$(utilfunsdir)/url.cpp $(utilfunsdir)/zlib/untgz.c \
+	$(utilfunsdir)/ftplib.c $(utilfunsdir)/regex.c \
+	$(utilfunsdir)/roman.cpp $(mgrdir)/ftplibftpt.cpp \
+	$(mgrdir)/curlftpt.cpp $(mgrdir)/curlhttpt.cpp \
+	$(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp \
+	$(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp \
+	$(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp \
+	$(mgrdir)/versificationmgr.cpp $(mgrdir)/remotetrans.cpp \
+	$(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp \
+	$(mgrdir)/swcacher.cpp $(mgrdir)/swsearchable.cpp \
+	$(mgrdir)/installmgr.cpp $(mgrdir)/stringmgr.cpp \
+	$(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp \
+	$(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp \
+	$(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp \
+	$(commondir)/lzsscomprs.cpp $(commondir)/zipcomprs.cpp \
+	$(commondir)/bz2comprs.cpp $(commondir)/xzcomprs.cpp \
+	$(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \
+	$(commondir)/swcipher.cpp $(commondir)/zverse.cpp \
+	$(commondir)/zstr.cpp $(commondir)/entriesblk.cpp \
+	$(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp \
+	$(filtersdir)/swoptfilter.cpp $(filtersdir)/latin1utf8.cpp \
+	$(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp \
+	$(filtersdir)/utf16utf8.cpp $(filtersdir)/utf8html.cpp \
+	$(filtersdir)/utf8latin1.cpp $(filtersdir)/unicodertf.cpp \
+	$(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8cantillation.cpp \
+	$(filtersdir)/utf8hebrewpoints.cpp \
+	$(filtersdir)/utf8arabicpoints.cpp \
+	$(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \
+	$(filtersdir)/utf8transliterator.cpp $(filtersdir)/utf8nfc.cpp \
+	$(filtersdir)/utf8nfkd.cpp $(filtersdir)/utf8arshaping.cpp \
+	$(filtersdir)/utf8bidireorder.cpp \
+	$(filtersdir)/osisheadings.cpp $(filtersdir)/osisfootnotes.cpp \
+	$(filtersdir)/osishtmlhref.cpp $(filtersdir)/osisxhtml.cpp \
+	$(filtersdir)/osiswebif.cpp $(filtersdir)/osismorph.cpp \
+	$(filtersdir)/osisstrongs.cpp $(filtersdir)/osisplain.cpp \
+	$(filtersdir)/osisrtf.cpp $(filtersdir)/osislemma.cpp \
+	$(filtersdir)/osisredletterwords.cpp \
+	$(filtersdir)/osisscripref.cpp $(filtersdir)/osisvariants.cpp \
+	$(filtersdir)/osiswordjs.cpp \
+	$(filtersdir)/osismorphsegmentation.cpp \
+	$(filtersdir)/osisglosses.cpp $(filtersdir)/osisenum.cpp \
+	$(filtersdir)/osisxlit.cpp \
+	$(filtersdir)/osisreferencelinks.cpp $(filtersdir)/gbfhtml.cpp \
+	$(filtersdir)/gbfhtmlhref.cpp $(filtersdir)/gbfxhtml.cpp \
+	$(filtersdir)/gbfwebif.cpp $(filtersdir)/gbfplain.cpp \
+	$(filtersdir)/gbfrtf.cpp $(filtersdir)/gbfstrongs.cpp \
+	$(filtersdir)/gbffootnotes.cpp $(filtersdir)/gbfheadings.cpp \
+	$(filtersdir)/gbfredletterwords.cpp $(filtersdir)/gbfmorph.cpp \
+	$(filtersdir)/gbfwordjs.cpp $(filtersdir)/thmlstrongs.cpp \
+	$(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp \
+	$(filtersdir)/thmlmorph.cpp $(filtersdir)/thmllemma.cpp \
+	$(filtersdir)/thmlscripref.cpp $(filtersdir)/thmlvariants.cpp \
+	$(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp \
+	$(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp \
+	$(filtersdir)/thmlxhtml.cpp $(filtersdir)/thmlwebif.cpp \
+	$(filtersdir)/thmlwordjs.cpp $(filtersdir)/gbfthml.cpp \
+	$(filtersdir)/gbfosis.cpp $(filtersdir)/thmlosis.cpp \
+	$(filtersdir)/thmlplain.cpp $(filtersdir)/osisosis.cpp \
+	$(filtersdir)/rtfhtml.cpp $(filtersdir)/greeklexattribs.cpp \
+	$(filtersdir)/papyriplain.cpp $(filtersdir)/teiplain.cpp \
+	$(filtersdir)/teirtf.cpp $(filtersdir)/teihtmlhref.cpp \
+	$(filtersdir)/teixhtml.cpp $(genbookdir)/swgenbook.cpp \
+	$(rawgenbookdir)/rawgenbook.cpp $(textsdir)/swtext.cpp \
+	$(rawtextdir)/rawtext.cpp $(rawtext4dir)/rawtext4.cpp \
+	$(ztextdir)/ztext.cpp $(commentsdir)/swcom.cpp \
+	$(rawcomdir)/rawcom.cpp $(rawcom4dir)/rawcom4.cpp \
+	$(rawfilesdir)/rawfiles.cpp $(zcomdir)/zcom.cpp \
+	$(hrefcomdir)/hrefcom.cpp $(lexdictdir)/swld.cpp \
+	$(rawlddir)/rawld.cpp $(rawld4dir)/rawld4.cpp \
+	$(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp
+@HAVE_LIBZ_TRUE@am__objects_1 = untgz.lo
+@INTERNALFTPLIB_TRUE@am__objects_2 = ftplib.lo
+@USE_INTERNAL_REGEX_TRUE@am__objects_3 = regex.lo
+@WITHCURL_FALSE@am__objects_4 = ftplibftpt.lo
+@WITHCURL_TRUE@am__objects_4 = curlftpt.lo curlhttpt.lo
+@HAVE_LIBZ_TRUE@am__objects_5 = zipcomprs.lo bz2comprs.lo xzcomprs.lo
+am__objects_6 = utf8transliterator.lo utf8nfc.lo utf8nfkd.lo \
+	utf8arshaping.lo utf8bidireorder.lo
+@HAVE_ICUSWORD_TRUE@@HAVE_ICU_FALSE@am__objects_7 = $(am__objects_6)
+@HAVE_ICU_TRUE@am__objects_7 = $(am__objects_6)
+am__objects_8 = osisheadings.lo osisfootnotes.lo osishtmlhref.lo \
+	osisxhtml.lo osiswebif.lo osismorph.lo osisstrongs.lo \
+	osisplain.lo osisrtf.lo osislemma.lo osisredletterwords.lo \
+	osisscripref.lo osisvariants.lo osiswordjs.lo \
+	osismorphsegmentation.lo osisglosses.lo osisenum.lo \
+	osisxlit.lo osisreferencelinks.lo
+am__objects_9 = gbfhtml.lo gbfhtmlhref.lo gbfxhtml.lo gbfwebif.lo \
+	gbfplain.lo gbfrtf.lo gbfstrongs.lo gbffootnotes.lo \
+	gbfheadings.lo gbfredletterwords.lo gbfmorph.lo gbfwordjs.lo
+am__objects_10 = thmlstrongs.lo thmlfootnotes.lo thmlheadings.lo \
+	thmlmorph.lo thmllemma.lo thmlscripref.lo thmlvariants.lo \
+	thmlgbf.lo thmlrtf.lo thmlhtml.lo thmlhtmlhref.lo thmlxhtml.lo \
+	thmlwebif.lo thmlwordjs.lo
+am__objects_11 = gbfthml.lo gbfosis.lo thmlosis.lo thmlplain.lo \
+	osisosis.lo
+am__objects_12 = rtfhtml.lo greeklexattribs.lo papyriplain.lo
+am__objects_13 = teiplain.lo teirtf.lo teihtmlhref.lo teixhtml.lo
+am_libsword_la_OBJECTS = swkey.lo listkey.lo strkey.lo treekey.lo \
+	treekeyidx.lo versekey.lo versetreekey.lo swobject.lo \
+	utilstr.lo utilxml.lo swversion.lo swbuf.lo ftpparse.lo url.lo \
+	$(am__objects_1) $(am__objects_2) $(am__objects_3) roman.lo \
+	$(am__objects_4) swconfig.lo swmgr.lo swfiltermgr.lo \
+	encfiltmgr.lo markupfiltmgr.lo filemgr.lo versificationmgr.lo \
+	remotetrans.lo swlocale.lo localemgr.lo swcacher.lo \
+	swsearchable.lo installmgr.lo stringmgr.lo swdisp.lo swlog.lo \
+	swmodule.lo rawstr.lo rawstr4.lo swcomprs.lo lzsscomprs.lo \
+	$(am__objects_5) rawverse.lo rawverse4.lo swcipher.lo \
+	zverse.lo zstr.lo entriesblk.lo sapphire.lo swbasicfilter.lo \
+	swoptfilter.lo latin1utf8.lo latin1utf16.lo utf8utf16.lo \
+	utf16utf8.lo utf8html.lo utf8latin1.lo unicodertf.lo \
+	scsuutf8.lo utf8cantillation.lo utf8hebrewpoints.lo \
+	utf8arabicpoints.lo utf8greekaccents.lo cipherfil.lo \
+	$(am__objects_7) $(am__objects_8) $(am__objects_9) \
+	$(am__objects_10) $(am__objects_11) $(am__objects_12) \
+	$(am__objects_13) swgenbook.lo rawgenbook.lo swtext.lo \
+	rawtext.lo rawtext4.lo ztext.lo swcom.lo rawcom.lo rawcom4.lo \
+	rawfiles.lo zcom.lo hrefcom.lo swld.lo rawld.lo rawld4.lo \
+	zld.lo flatapi.lo
+libsword_la_OBJECTS = $(am_libsword_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libsword_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libsword_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(libsword_la_SOURCES)
+DIST_SOURCES = $(am__libsword_la_SOURCES_DIST)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__pkginclude_HEADERS_DIST = $(swincludedir)/canon.h \
+	$(swincludedir)/canon_abbrevs.h $(swincludedir)/cipherfil.h \
+	$(swincludedir)/curlftpt.h $(swincludedir)/curlhttpt.h \
+	$(swincludedir)/defs.h $(swincludedir)/echomod.h \
+	$(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h \
+	$(swincludedir)/femain.h $(swincludedir)/filemgr.h \
+	$(swincludedir)/versificationmgr.h $(swincludedir)/flatapi.h \
+	$(swincludedir)/ftpparse.h $(swincludedir)/remotetrans.h \
+	$(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \
+	$(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \
+	$(swincludedir)/gbfhtml.h $(swincludedir)/gbfxhtml.h \
+	$(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfwebif.h \
+	$(swincludedir)/gbfmorph.h $(swincludedir)/gbfosis.h \
+	$(swincludedir)/gbfplain.h $(swincludedir)/gbfredletterwords.h \
+	$(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h \
+	$(swincludedir)/gbfwordjs.h $(swincludedir)/gbfthml.h \
+	$(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h \
+	$(swincludedir)/hrefcom.h $(swincludedir)/installmgr.h \
+	$(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h \
+	$(swincludedir)/listkey.h $(swincludedir)/localemgr.h \
+	$(swincludedir)/lzsscomprs.h $(swincludedir)/markupfiltmgr.h \
+	$(swincludedir)/multimapwdef.h $(swincludedir)/nullim.h \
+	$(swincludedir)/osisglosses.h $(swincludedir)/osisenum.h \
+	$(swincludedir)/osisheadings.h $(swincludedir)/osishtmlhref.h \
+	$(swincludedir)/osisxhtml.h $(swincludedir)/osiswebif.h \
+	$(swincludedir)/osismorph.h \
+	$(swincludedir)/osismorphsegmentation.h \
+	$(swincludedir)/osisplain.h $(swincludedir)/osisrtf.h \
+	$(swincludedir)/osisosis.h $(swincludedir)/osisstrongs.h \
+	$(swincludedir)/osisfootnotes.h $(swincludedir)/osislemma.h \
+	$(swincludedir)/osisredletterwords.h \
+	$(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \
+	$(swincludedir)/osisvariants.h $(swincludedir)/osisxlit.h \
+	$(swincludedir)/papyriplain.h $(swincludedir)/rawcom.h \
+	$(swincludedir)/rawcom4.h $(swincludedir)/rawfiles.h \
+	$(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \
+	$(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \
+	$(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \
+	$(swincludedir)/rawtext4.h $(swincludedir)/rawverse.h \
+	$(swincludedir)/rawverse4.h \
+	$(swincludedir)/internal/regex/regex.h $(swincludedir)/roman.h \
+	$(swincludedir)/rtfhtml.h $(swincludedir)/sapphire.h \
+	$(swincludedir)/scsuutf8.h $(swincludedir)/strkey.h \
+	$(swincludedir)/swbasicfilter.h $(swincludedir)/swbuf.h \
+	$(swincludedir)/swcacher.h $(swincludedir)/swcipher.h \
+	$(swincludedir)/swcom.h $(swincludedir)/swcomprs.h \
+	$(swincludedir)/swconfig.h $(swincludedir)/swdisp.h \
+	$(swincludedir)/swfilter.h $(swincludedir)/swfiltermgr.h \
+	$(swincludedir)/swgenbook.h $(swincludedir)/swinputmeth.h \
+	$(swincludedir)/swkey.h $(swincludedir)/swld.h \
+	$(swincludedir)/swlocale.h $(swincludedir)/swlog.h \
+	$(swincludedir)/swmacs.h $(swincludedir)/swmgr.h \
+	$(swincludedir)/stringmgr.h $(swincludedir)/swmodule.h \
+	$(swincludedir)/swoptfilter.h $(swincludedir)/swobject.h \
+	$(swincludedir)/swsearchable.h $(swincludedir)/swtext.h \
+	$(swincludedir)/swversion.h $(swincludedir)/sysdata.h \
+	$(swincludedir)/thmlfootnotes.h $(swincludedir)/thmlgbf.h \
+	$(swincludedir)/thmlheadings.h $(swincludedir)/thmlhtml.h \
+	$(swincludedir)/thmlxhtml.h $(swincludedir)/thmlhtmlhref.h \
+	$(swincludedir)/thmlwebif.h $(swincludedir)/thmllemma.h \
+	$(swincludedir)/thmlmorph.h $(swincludedir)/thmlosis.h \
+	$(swincludedir)/thmlplain.h $(swincludedir)/thmlrtf.h \
+	$(swincludedir)/thmlscripref.h $(swincludedir)/thmlstrongs.h \
+	$(swincludedir)/thmlvariants.h $(swincludedir)/thmlwordjs.h \
+	$(swincludedir)/teiplain.h $(swincludedir)/teirtf.h \
+	$(swincludedir)/teixhtml.h $(swincludedir)/teihtmlhref.h \
+	$(swincludedir)/treekey.h $(swincludedir)/treekeyidx.h \
+	$(swincludedir)/unicodertf.h $(swincludedir)/url.h \
+	$(swincludedir)/untgz.h $(swincludedir)/utf16utf8.h \
+	$(swincludedir)/utf8arshaping.h \
+	$(swincludedir)/utf8bidireorder.h \
+	$(swincludedir)/utf8cantillation.h \
+	$(swincludedir)/utf8greekaccents.h \
+	$(swincludedir)/utf8hebrewpoints.h \
+	$(swincludedir)/utf8arabicpoints.h $(swincludedir)/utf8html.h \
+	$(swincludedir)/utf8latin1.h $(swincludedir)/utf8nfc.h \
+	$(swincludedir)/utf8nfkd.h \
+	$(swincludedir)/utf8transliterator.h \
+	$(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \
+	$(swincludedir)/utilxml.h $(swincludedir)/versekey.h \
+	$(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \
+	$(swincludedir)/zipcomprs.h $(swincludedir)/zld.h \
+	$(swincludedir)/zstr.h $(swincludedir)/ztext.h \
+	$(swincludedir)/zverse.h $(swincludedir)/canon_kjva.h \
+	$(swincludedir)/canon_leningrad.h $(swincludedir)/canon_mt.h \
+	$(swincludedir)/canon_nrsv.h $(swincludedir)/canon_nrsva.h \
+	$(swincludedir)/canon_synodal.h \
+	$(swincludedir)/canon_synodalprot.h \
+	$(swincludedir)/canon_vulg.h $(swincludedir)/canon_german.h \
+	$(swincludedir)/canon_luther.h \
+	$(swincludedir)/canon_catholic.h \
+	$(swincludedir)/canon_catholic2.h $(swincludedir)/canon_lxx.h \
+	$(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h
+HEADERS = $(pkginclude_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@ $(am__append_2)
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+AUTOMAKE_OPTIONS = 1.6
+AM_CPPFLAGS = -I$(top_srcdir)/include $(am__append_1) -I$(includedir) \
+	-DUSE_AUTOTOOLS -DUNIX -Dunix -D__unix__ $(ICUDEF) $(globdef) \
+	-D_FTPLIB_NO_COMPAT
+
+# Global config directory
+globalconfdir := @sysconfdir@
+lib_LTLIBRARIES = libsword.la
+libsword_la_SOURCES = $(keysdir)/swkey.cpp $(keysdir)/listkey.cpp \
+	$(keysdir)/strkey.cpp $(keysdir)/treekey.cpp \
+	$(keysdir)/treekeyidx.cpp $(keysdir)/versekey.cpp \
+	$(keysdir)/versetreekey.cpp $(utilfunsdir)/swobject.cpp \
+	$(utilfunsdir)/utilstr.cpp $(utilfunsdir)/utilxml.cpp \
+	$(utilfunsdir)/swversion.cpp $(utilfunsdir)/swbuf.cpp \
+	$(utilfunsdir)/ftpparse.c $(utilfunsdir)/url.cpp $(UNTGZ) \
+	$(ftpsrc) $(SWREGEX) $(utilfunsdir)/roman.cpp $(FTP_SOURCES) \
+	$(mgrdir)/swconfig.cpp $(mgrdir)/swmgr.cpp \
+	$(mgrdir)/swfiltermgr.cpp $(mgrdir)/encfiltmgr.cpp \
+	$(mgrdir)/markupfiltmgr.cpp $(mgrdir)/filemgr.cpp \
+	$(mgrdir)/versificationmgr.cpp $(mgrdir)/remotetrans.cpp \
+	$(mgrdir)/swlocale.cpp $(mgrdir)/localemgr.cpp \
+	$(mgrdir)/swcacher.cpp $(mgrdir)/swsearchable.cpp \
+	$(mgrdir)/installmgr.cpp $(mgrdir)/stringmgr.cpp \
+	$(frontenddir)/swdisp.cpp $(frontenddir)/swlog.cpp \
+	$(modulesdir)/swmodule.cpp $(commondir)/rawstr.cpp \
+	$(commondir)/rawstr4.cpp $(commondir)/swcomprs.cpp \
+	$(commondir)/lzsscomprs.cpp $(SWZLIB) \
+	$(commondir)/rawverse.cpp $(commondir)/rawverse4.cpp \
+	$(commondir)/swcipher.cpp $(commondir)/zverse.cpp \
+	$(commondir)/zstr.cpp $(commondir)/entriesblk.cpp \
+	$(commondir)/sapphire.cpp $(filtersdir)/swbasicfilter.cpp \
+	$(filtersdir)/swoptfilter.cpp $(filtersdir)/latin1utf8.cpp \
+	$(filtersdir)/latin1utf16.cpp $(filtersdir)/utf8utf16.cpp \
+	$(filtersdir)/utf16utf8.cpp $(filtersdir)/utf8html.cpp \
+	$(filtersdir)/utf8latin1.cpp $(filtersdir)/unicodertf.cpp \
+	$(filtersdir)/scsuutf8.cpp $(filtersdir)/utf8cantillation.cpp \
+	$(filtersdir)/utf8hebrewpoints.cpp \
+	$(filtersdir)/utf8arabicpoints.cpp \
+	$(filtersdir)/utf8greekaccents.cpp $(filtersdir)/cipherfil.cpp \
+	$(SWREALICUSRC) $(OSISFIL) $(GBFFIL) $(THMLFIL) $(CONVFIL) \
+	$(PLFIL) $(TEIFIL) $(genbookdir)/swgenbook.cpp \
+	$(rawgenbookdir)/rawgenbook.cpp $(textsdir)/swtext.cpp \
+	$(rawtextdir)/rawtext.cpp $(rawtext4dir)/rawtext4.cpp \
+	$(ztextdir)/ztext.cpp $(commentsdir)/swcom.cpp \
+	$(rawcomdir)/rawcom.cpp $(rawcom4dir)/rawcom4.cpp \
+	$(rawfilesdir)/rawfiles.cpp $(zcomdir)/zcom.cpp \
+	$(hrefcomdir)/hrefcom.cpp $(lexdictdir)/swld.cpp \
+	$(rawlddir)/rawld.cpp $(rawld4dir)/rawld4.cpp \
+	$(zlddir)/zld.cpp $(bindingsdir)/flatapi.cpp
+@HAVE_ICU_FALSE@ICUDEF = 
+@HAVE_ICU_TRUE@ICUDEF = -DSWICU_DATA=\"${pkglibdir}/${VERSION}_icu_${ICU_VER}\" 
+libsword_la_LDFLAGS = -release $(VERSION)
+keysdir = $(top_srcdir)/src/keys
+utilfunsdir = $(top_srcdir)/src/utilfuns
+@INTERNALFTPLIB_FALSE@ftpsrc = 
+@INTERNALFTPLIB_TRUE@ftpsrc = $(utilfunsdir)/ftplib.c
+@HAVE_LIBZ_FALSE@UNTGZ = 
+@HAVE_LIBZ_TRUE@UNTGZ = $(utilfunsdir)/zlib/untgz.c
+@USE_INTERNAL_REGEX_FALSE@SWREGEX = 
+@USE_INTERNAL_REGEX_TRUE@SWREGEX = $(utilfunsdir)/regex.c
+mgrdir = $(top_srcdir)/src/mgr
+@CONFDEF_FALSE@globdef = 
+@CONFDEF_TRUE@globdef = -DGLOBCONFPATH=\"${globalconfdir}/sword.conf\"
+@WITHCURL_FALSE@FTP_SOURCES = $(mgrdir)/ftplibftpt.cpp
+@WITHCURL_TRUE@FTP_SOURCES = $(mgrdir)/curlftpt.cpp \
+@WITHCURL_TRUE@	$(mgrdir)/curlhttpt.cpp
+frontenddir = $(top_srcdir)/src/frontend
+modulesdir = $(top_srcdir)/src/modules
+commondir = $(top_srcdir)/src/modules/common
+@HAVE_LIBZ_FALSE@SWZLIB = 
+@HAVE_LIBZ_TRUE@SWZLIB = $(commondir)/zipcomprs.cpp \
+@HAVE_LIBZ_TRUE@	$(commondir)/bz2comprs.cpp \
+@HAVE_LIBZ_TRUE@	$(commondir)/xzcomprs.cpp
+filtersdir = $(top_srcdir)/src/modules/filters
+GBFFIL = $(filtersdir)/gbfhtml.cpp $(filtersdir)/gbfhtmlhref.cpp \
+	$(filtersdir)/gbfxhtml.cpp $(filtersdir)/gbfwebif.cpp \
+	$(filtersdir)/gbfplain.cpp $(filtersdir)/gbfrtf.cpp \
+	$(filtersdir)/gbfstrongs.cpp $(filtersdir)/gbffootnotes.cpp \
+	$(filtersdir)/gbfheadings.cpp \
+	$(filtersdir)/gbfredletterwords.cpp $(filtersdir)/gbfmorph.cpp \
+	$(filtersdir)/gbfwordjs.cpp
+THMLFIL = $(filtersdir)/thmlstrongs.cpp \
+	$(filtersdir)/thmlfootnotes.cpp $(filtersdir)/thmlheadings.cpp \
+	$(filtersdir)/thmlmorph.cpp $(filtersdir)/thmllemma.cpp \
+	$(filtersdir)/thmlscripref.cpp $(filtersdir)/thmlvariants.cpp \
+	$(filtersdir)/thmlgbf.cpp $(filtersdir)/thmlrtf.cpp \
+	$(filtersdir)/thmlhtml.cpp $(filtersdir)/thmlhtmlhref.cpp \
+	$(filtersdir)/thmlxhtml.cpp $(filtersdir)/thmlwebif.cpp \
+	$(filtersdir)/thmlwordjs.cpp
+TEIFIL = $(filtersdir)/teiplain.cpp $(filtersdir)/teirtf.cpp \
+	$(filtersdir)/teihtmlhref.cpp $(filtersdir)/teixhtml.cpp
+CONVFIL = $(filtersdir)/gbfthml.cpp $(filtersdir)/gbfosis.cpp \
+	$(filtersdir)/thmlosis.cpp $(filtersdir)/thmlplain.cpp \
+	$(filtersdir)/osisosis.cpp
+OSISFIL = $(filtersdir)/osisheadings.cpp \
+	$(filtersdir)/osisfootnotes.cpp $(filtersdir)/osishtmlhref.cpp \
+	$(filtersdir)/osisxhtml.cpp $(filtersdir)/osiswebif.cpp \
+	$(filtersdir)/osismorph.cpp $(filtersdir)/osisstrongs.cpp \
+	$(filtersdir)/osisplain.cpp $(filtersdir)/osisrtf.cpp \
+	$(filtersdir)/osislemma.cpp \
+	$(filtersdir)/osisredletterwords.cpp \
+	$(filtersdir)/osisscripref.cpp $(filtersdir)/osisvariants.cpp \
+	$(filtersdir)/osiswordjs.cpp \
+	$(filtersdir)/osismorphsegmentation.cpp \
+	$(filtersdir)/osisglosses.cpp $(filtersdir)/osisenum.cpp \
+	$(filtersdir)/osisxlit.cpp \
+	$(filtersdir)/osisreferencelinks.cpp
+PLFIL = $(filtersdir)/rtfhtml.cpp $(filtersdir)/greeklexattribs.cpp \
+	$(filtersdir)/papyriplain.cpp
+SWICUSRC = $(filtersdir)/utf8transliterator.cpp \
+	$(filtersdir)/utf8nfc.cpp $(filtersdir)/utf8nfkd.cpp \
+	$(filtersdir)/utf8arshaping.cpp \
+	$(filtersdir)/utf8bidireorder.cpp
+@HAVE_ICUSWORD_FALSE@@HAVE_ICU_FALSE@DISTSWICUSRC = $(SWICUSRC)
+@HAVE_ICUSWORD_TRUE@@HAVE_ICU_FALSE@DISTSWICUSRC = 
+@HAVE_ICU_TRUE@DISTSWICUSRC = 
+@HAVE_ICUSWORD_FALSE@@HAVE_ICU_FALSE@SWREALICUSRC = 
+@HAVE_ICUSWORD_TRUE@@HAVE_ICU_FALSE@SWREALICUSRC = $(SWICUSRC)
+@HAVE_ICU_TRUE@SWREALICUSRC = $(SWICUSRC)
+EXTRA_DIST = $(DISTSWICUSRC)
+genbookdir = $(top_srcdir)/src/modules/genbook
+rawgenbookdir = $(top_srcdir)/src/modules/genbook/rawgenbook
+textsdir = $(top_srcdir)/src/modules/texts
+rawtextdir = $(top_srcdir)/src/modules/texts/rawtext
+rawtext4dir = $(top_srcdir)/src/modules/texts/rawtext4
+ztextdir = $(top_srcdir)/src/modules/texts/ztext
+commentsdir = $(top_srcdir)/src/modules/comments
+rawcomdir = $(top_srcdir)/src/modules/comments/rawcom
+rawcom4dir = $(top_srcdir)/src/modules/comments/rawcom4
+rawfilesdir = $(top_srcdir)/src/modules/comments/rawfiles
+zcomdir = $(top_srcdir)/src/modules/comments/zcom
+hrefcomdir = $(top_srcdir)/src/modules/comments/hrefcom
+lexdictdir = $(top_srcdir)/src/modules/lexdict
+rawlddir = $(top_srcdir)/src/modules/lexdict/rawld
+rawld4dir = $(top_srcdir)/src/modules/lexdict/rawld4
+zlddir = $(top_srcdir)/src/modules/lexdict/zld
+
+#include ../bindings/Makefile.am
+bindingsdir = $(top_srcdir)/bindings
+swincludedir = $(top_srcdir)/include
+pkginclude_HEADERS = $(swincludedir)/canon.h \
+	$(swincludedir)/canon_abbrevs.h $(swincludedir)/cipherfil.h \
+	$(swincludedir)/curlftpt.h $(swincludedir)/curlhttpt.h \
+	$(swincludedir)/defs.h $(swincludedir)/echomod.h \
+	$(swincludedir)/encfiltmgr.h $(swincludedir)/entriesblk.h \
+	$(swincludedir)/femain.h $(swincludedir)/filemgr.h \
+	$(swincludedir)/versificationmgr.h $(swincludedir)/flatapi.h \
+	$(swincludedir)/ftpparse.h $(swincludedir)/remotetrans.h \
+	$(swincludedir)/ftplibftpt.h $(swincludedir)/ftplib.h \
+	$(swincludedir)/gbffootnotes.h $(swincludedir)/gbfheadings.h \
+	$(swincludedir)/gbfhtml.h $(swincludedir)/gbfxhtml.h \
+	$(swincludedir)/gbfhtmlhref.h $(swincludedir)/gbfwebif.h \
+	$(swincludedir)/gbfmorph.h $(swincludedir)/gbfosis.h \
+	$(swincludedir)/gbfplain.h $(swincludedir)/gbfredletterwords.h \
+	$(swincludedir)/gbfrtf.h $(swincludedir)/gbfstrongs.h \
+	$(swincludedir)/gbfwordjs.h $(swincludedir)/gbfthml.h \
+	$(swincludedir)/greeklexattribs.h $(swincludedir)/hebrewmcim.h \
+	$(swincludedir)/hrefcom.h $(swincludedir)/installmgr.h \
+	$(swincludedir)/latin1utf16.h $(swincludedir)/latin1utf8.h \
+	$(swincludedir)/listkey.h $(swincludedir)/localemgr.h \
+	$(swincludedir)/lzsscomprs.h $(swincludedir)/markupfiltmgr.h \
+	$(swincludedir)/multimapwdef.h $(swincludedir)/nullim.h \
+	$(swincludedir)/osisglosses.h $(swincludedir)/osisenum.h \
+	$(swincludedir)/osisheadings.h $(swincludedir)/osishtmlhref.h \
+	$(swincludedir)/osisxhtml.h $(swincludedir)/osiswebif.h \
+	$(swincludedir)/osismorph.h \
+	$(swincludedir)/osismorphsegmentation.h \
+	$(swincludedir)/osisplain.h $(swincludedir)/osisrtf.h \
+	$(swincludedir)/osisosis.h $(swincludedir)/osisstrongs.h \
+	$(swincludedir)/osisfootnotes.h $(swincludedir)/osislemma.h \
+	$(swincludedir)/osisredletterwords.h \
+	$(swincludedir)/osisscripref.h $(swincludedir)/osiswordjs.h \
+	$(swincludedir)/osisvariants.h $(swincludedir)/osisxlit.h \
+	$(swincludedir)/papyriplain.h $(swincludedir)/rawcom.h \
+	$(swincludedir)/rawcom4.h $(swincludedir)/rawfiles.h \
+	$(swincludedir)/rawgenbook.h $(swincludedir)/rawld.h \
+	$(swincludedir)/rawld4.h $(swincludedir)/rawstr.h \
+	$(swincludedir)/rawstr4.h $(swincludedir)/rawtext.h \
+	$(swincludedir)/rawtext4.h $(swincludedir)/rawverse.h \
+	$(swincludedir)/rawverse4.h $(am__append_3) \
+	$(swincludedir)/roman.h $(swincludedir)/rtfhtml.h \
+	$(swincludedir)/sapphire.h $(swincludedir)/scsuutf8.h \
+	$(swincludedir)/strkey.h $(swincludedir)/swbasicfilter.h \
+	$(swincludedir)/swbuf.h $(swincludedir)/swcacher.h \
+	$(swincludedir)/swcipher.h $(swincludedir)/swcom.h \
+	$(swincludedir)/swcomprs.h $(swincludedir)/swconfig.h \
+	$(swincludedir)/swdisp.h $(swincludedir)/swfilter.h \
+	$(swincludedir)/swfiltermgr.h $(swincludedir)/swgenbook.h \
+	$(swincludedir)/swinputmeth.h $(swincludedir)/swkey.h \
+	$(swincludedir)/swld.h $(swincludedir)/swlocale.h \
+	$(swincludedir)/swlog.h $(swincludedir)/swmacs.h \
+	$(swincludedir)/swmgr.h $(swincludedir)/stringmgr.h \
+	$(swincludedir)/swmodule.h $(swincludedir)/swoptfilter.h \
+	$(swincludedir)/swobject.h $(swincludedir)/swsearchable.h \
+	$(swincludedir)/swtext.h $(swincludedir)/swversion.h \
+	$(swincludedir)/sysdata.h $(swincludedir)/thmlfootnotes.h \
+	$(swincludedir)/thmlgbf.h $(swincludedir)/thmlheadings.h \
+	$(swincludedir)/thmlhtml.h $(swincludedir)/thmlxhtml.h \
+	$(swincludedir)/thmlhtmlhref.h $(swincludedir)/thmlwebif.h \
+	$(swincludedir)/thmllemma.h $(swincludedir)/thmlmorph.h \
+	$(swincludedir)/thmlosis.h $(swincludedir)/thmlplain.h \
+	$(swincludedir)/thmlrtf.h $(swincludedir)/thmlscripref.h \
+	$(swincludedir)/thmlstrongs.h $(swincludedir)/thmlvariants.h \
+	$(swincludedir)/thmlwordjs.h $(swincludedir)/teiplain.h \
+	$(swincludedir)/teirtf.h $(swincludedir)/teixhtml.h \
+	$(swincludedir)/teihtmlhref.h $(swincludedir)/treekey.h \
+	$(swincludedir)/treekeyidx.h $(swincludedir)/unicodertf.h \
+	$(swincludedir)/url.h $(swincludedir)/untgz.h \
+	$(swincludedir)/utf16utf8.h $(swincludedir)/utf8arshaping.h \
+	$(swincludedir)/utf8bidireorder.h \
+	$(swincludedir)/utf8cantillation.h \
+	$(swincludedir)/utf8greekaccents.h \
+	$(swincludedir)/utf8hebrewpoints.h \
+	$(swincludedir)/utf8arabicpoints.h $(swincludedir)/utf8html.h \
+	$(swincludedir)/utf8latin1.h $(swincludedir)/utf8nfc.h \
+	$(swincludedir)/utf8nfkd.h \
+	$(swincludedir)/utf8transliterator.h \
+	$(swincludedir)/utf8utf16.h $(swincludedir)/utilstr.h \
+	$(swincludedir)/utilxml.h $(swincludedir)/versekey.h \
+	$(swincludedir)/versetreekey.h $(swincludedir)/zcom.h \
+	$(swincludedir)/zipcomprs.h $(swincludedir)/zld.h \
+	$(swincludedir)/zstr.h $(swincludedir)/ztext.h \
+	$(swincludedir)/zverse.h $(swincludedir)/canon_kjva.h \
+	$(swincludedir)/canon_leningrad.h $(swincludedir)/canon_mt.h \
+	$(swincludedir)/canon_nrsv.h $(swincludedir)/canon_nrsva.h \
+	$(swincludedir)/canon_synodal.h \
+	$(swincludedir)/canon_synodalprot.h \
+	$(swincludedir)/canon_vulg.h $(swincludedir)/canon_german.h \
+	$(swincludedir)/canon_luther.h \
+	$(swincludedir)/canon_catholic.h \
+	$(swincludedir)/canon_catholic2.h $(swincludedir)/canon_lxx.h \
+	$(swincludedir)/canon_orthodox.h $(swincludedir)/canon_null.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../src/keys/Makefile.am $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/../src/mgr/Makefile.am $(srcdir)/../src/frontend/Makefile.am $(srcdir)/../src/modules/Makefile.am $(srcdir)/../src/modules/common/Makefile.am $(srcdir)/../src/modules/filters/Makefile.am $(srcdir)/../src/modules/genbook/Makefile.am $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am $(srcdir)/../src/modules/texts/Makefile.am $(srcdir)/../src/modules/texts/rawtext/Makefile.am $(srcdir)/../src/modules/texts/rawtext4/Makefile.am $(srcdir)/../src/modules/texts/ztext/Makefile.am $(srcdir)/../src/modules/comments/Makefile.am $(srcdir)/../src/modules/comments/rawcom/Makefile.am $(srcdir)/../src/modules/comments/rawcom4/Makefile.am $(srcdir)/../src/modules/comments/rawfiles/Makefile.am $(srcdir)/../src/modules/comments/zcom/Makefile.am $(srcdir)/../src/modules/comments/hrefcom/Makefile.am $(srcdir)/../src/modules/lexdict/Makefile.am $(srcdir)/../src/modules/lexdict/rawld/Makefile.am $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am $(srcdir)/../src/modules/lexdict/zld/Makefile.am $(srcdir)/../include/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign lib/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/../src/keys/Makefile.am $(srcdir)/../src/utilfuns/Makefile.am $(srcdir)/../src/mgr/Makefile.am $(srcdir)/../src/frontend/Makefile.am $(srcdir)/../src/modules/Makefile.am $(srcdir)/../src/modules/common/Makefile.am $(srcdir)/../src/modules/filters/Makefile.am $(srcdir)/../src/modules/genbook/Makefile.am $(srcdir)/../src/modules/genbook/rawgenbook/Makefile.am $(srcdir)/../src/modules/texts/Makefile.am $(srcdir)/../src/modules/texts/rawtext/Makefile.am $(srcdir)/../src/modules/texts/rawtext4/Makefile.am $(srcdir)/../src/modules/texts/ztext/Makefile.am $(srcdir)/../src/modules/comments/Makefile.am $(srcdir)/../src/modules/comments/rawcom/Makefile.am $(srcdir)/../src/modules/comments/rawcom4/Makefile.am $(srcdir)/../src/modules/comments/rawfiles/Makefile.am $(srcdir)/../src/modules/comments/zcom/Makefile.am $(srcdir)/../src/modules/comments/hrefcom/Makefile.am $(srcdir)/../src/modules/lexdict/Makefile.am $(srcdir)/../src/modules/lexdict/rawld/Makefile.am $(srcdir)/../src/modules/lexdict/rawld4/Makefile.am $(srcdir)/../src/modules/lexdict/zld/Makefile.am $(srcdir)/../include/Makefile.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+libsword.la: $(libsword_la_OBJECTS) $(libsword_la_DEPENDENCIES) $(EXTRA_libsword_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libsword_la_LINK) -rpath $(libdir) $(libsword_la_OBJECTS) $(libsword_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bz2comprs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipherfil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curlftpt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curlhttpt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/encfiltmgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/entriesblk.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flatapi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftplib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftplibftpt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftpparse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbffootnotes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfheadings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfhtml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfhtmlhref.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfmorph.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfosis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfplain.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfredletterwords.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfrtf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfstrongs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfthml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfwebif.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfwordjs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfxhtml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/greeklexattribs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hrefcom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/installmgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latin1utf16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/latin1utf8.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listkey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localemgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzsscomprs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markupfiltmgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisenum.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisfootnotes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisglosses.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisheadings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osishtmlhref.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osislemma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osismorph.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osismorphsegmentation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisosis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisplain.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisredletterwords.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisreferencelinks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisrtf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisscripref.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisstrongs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisvariants.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiswebif.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiswordjs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisxhtml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osisxlit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/papyriplain.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawcom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawcom4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawfiles.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawgenbook.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawld.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawld4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawstr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawstr4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawtext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawtext4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawverse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawverse4.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remotetrans.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/roman.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rtfhtml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sapphire.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scsuutf8.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringmgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strkey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swbasicfilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swbuf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swcacher.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swcipher.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swcom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swcomprs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swconfig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swdisp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swfiltermgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swgenbook.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swkey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swld.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swlocale.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swlog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swmgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swmodule.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swobject.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swoptfilter.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swsearchable.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swtext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swversion.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teihtmlhref.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teiplain.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teirtf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teixhtml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlfootnotes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlgbf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlheadings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlhtml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlhtmlhref.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmllemma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlmorph.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlosis.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlplain.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlrtf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlscripref.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlstrongs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlvariants.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlwebif.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlwordjs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlxhtml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treekey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treekeyidx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicodertf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/untgz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf16utf8.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8arabicpoints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8arshaping.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8bidireorder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8cantillation.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8greekaccents.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8hebrewpoints.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8html.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8latin1.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8nfc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8nfkd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8transliterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8utf16.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilstr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilxml.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versekey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versetreekey.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versificationmgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xzcomprs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zcom.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zipcomprs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zld.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zstr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ztext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zverse.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+ftpparse.lo: $(utilfunsdir)/ftpparse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftpparse.lo -MD -MP -MF $(DEPDIR)/ftpparse.Tpo -c -o ftpparse.lo `test -f '$(utilfunsdir)/ftpparse.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftpparse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ftpparse.Tpo $(DEPDIR)/ftpparse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(utilfunsdir)/ftpparse.c' object='ftpparse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftpparse.lo `test -f '$(utilfunsdir)/ftpparse.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftpparse.c
+
+untgz.lo: $(utilfunsdir)/zlib/untgz.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT untgz.lo -MD -MP -MF $(DEPDIR)/untgz.Tpo -c -o untgz.lo `test -f '$(utilfunsdir)/zlib/untgz.c' || echo '$(srcdir)/'`$(utilfunsdir)/zlib/untgz.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/untgz.Tpo $(DEPDIR)/untgz.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(utilfunsdir)/zlib/untgz.c' object='untgz.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o untgz.lo `test -f '$(utilfunsdir)/zlib/untgz.c' || echo '$(srcdir)/'`$(utilfunsdir)/zlib/untgz.c
+
+ftplib.lo: $(utilfunsdir)/ftplib.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ftplib.lo -MD -MP -MF $(DEPDIR)/ftplib.Tpo -c -o ftplib.lo `test -f '$(utilfunsdir)/ftplib.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftplib.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ftplib.Tpo $(DEPDIR)/ftplib.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(utilfunsdir)/ftplib.c' object='ftplib.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ftplib.lo `test -f '$(utilfunsdir)/ftplib.c' || echo '$(srcdir)/'`$(utilfunsdir)/ftplib.c
+
+regex.lo: $(utilfunsdir)/regex.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT regex.lo -MD -MP -MF $(DEPDIR)/regex.Tpo -c -o regex.lo `test -f '$(utilfunsdir)/regex.c' || echo '$(srcdir)/'`$(utilfunsdir)/regex.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/regex.Tpo $(DEPDIR)/regex.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(utilfunsdir)/regex.c' object='regex.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o regex.lo `test -f '$(utilfunsdir)/regex.c' || echo '$(srcdir)/'`$(utilfunsdir)/regex.c
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+swkey.lo: $(keysdir)/swkey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swkey.lo -MD -MP -MF $(DEPDIR)/swkey.Tpo -c -o swkey.lo `test -f '$(keysdir)/swkey.cpp' || echo '$(srcdir)/'`$(keysdir)/swkey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swkey.Tpo $(DEPDIR)/swkey.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(keysdir)/swkey.cpp' object='swkey.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swkey.lo `test -f '$(keysdir)/swkey.cpp' || echo '$(srcdir)/'`$(keysdir)/swkey.cpp
+
+listkey.lo: $(keysdir)/listkey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT listkey.lo -MD -MP -MF $(DEPDIR)/listkey.Tpo -c -o listkey.lo `test -f '$(keysdir)/listkey.cpp' || echo '$(srcdir)/'`$(keysdir)/listkey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/listkey.Tpo $(DEPDIR)/listkey.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(keysdir)/listkey.cpp' object='listkey.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o listkey.lo `test -f '$(keysdir)/listkey.cpp' || echo '$(srcdir)/'`$(keysdir)/listkey.cpp
+
+strkey.lo: $(keysdir)/strkey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT strkey.lo -MD -MP -MF $(DEPDIR)/strkey.Tpo -c -o strkey.lo `test -f '$(keysdir)/strkey.cpp' || echo '$(srcdir)/'`$(keysdir)/strkey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/strkey.Tpo $(DEPDIR)/strkey.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(keysdir)/strkey.cpp' object='strkey.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o strkey.lo `test -f '$(keysdir)/strkey.cpp' || echo '$(srcdir)/'`$(keysdir)/strkey.cpp
+
+treekey.lo: $(keysdir)/treekey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT treekey.lo -MD -MP -MF $(DEPDIR)/treekey.Tpo -c -o treekey.lo `test -f '$(keysdir)/treekey.cpp' || echo '$(srcdir)/'`$(keysdir)/treekey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/treekey.Tpo $(DEPDIR)/treekey.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(keysdir)/treekey.cpp' object='treekey.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o treekey.lo `test -f '$(keysdir)/treekey.cpp' || echo '$(srcdir)/'`$(keysdir)/treekey.cpp
+
+treekeyidx.lo: $(keysdir)/treekeyidx.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT treekeyidx.lo -MD -MP -MF $(DEPDIR)/treekeyidx.Tpo -c -o treekeyidx.lo `test -f '$(keysdir)/treekeyidx.cpp' || echo '$(srcdir)/'`$(keysdir)/treekeyidx.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/treekeyidx.Tpo $(DEPDIR)/treekeyidx.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(keysdir)/treekeyidx.cpp' object='treekeyidx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o treekeyidx.lo `test -f '$(keysdir)/treekeyidx.cpp' || echo '$(srcdir)/'`$(keysdir)/treekeyidx.cpp
+
+versekey.lo: $(keysdir)/versekey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versekey.lo -MD -MP -MF $(DEPDIR)/versekey.Tpo -c -o versekey.lo `test -f '$(keysdir)/versekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versekey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/versekey.Tpo $(DEPDIR)/versekey.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(keysdir)/versekey.cpp' object='versekey.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versekey.lo `test -f '$(keysdir)/versekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versekey.cpp
+
+versetreekey.lo: $(keysdir)/versetreekey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versetreekey.lo -MD -MP -MF $(DEPDIR)/versetreekey.Tpo -c -o versetreekey.lo `test -f '$(keysdir)/versetreekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versetreekey.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/versetreekey.Tpo $(DEPDIR)/versetreekey.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(keysdir)/versetreekey.cpp' object='versetreekey.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versetreekey.lo `test -f '$(keysdir)/versetreekey.cpp' || echo '$(srcdir)/'`$(keysdir)/versetreekey.cpp
+
+swobject.lo: $(utilfunsdir)/swobject.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swobject.lo -MD -MP -MF $(DEPDIR)/swobject.Tpo -c -o swobject.lo `test -f '$(utilfunsdir)/swobject.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swobject.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swobject.Tpo $(DEPDIR)/swobject.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(utilfunsdir)/swobject.cpp' object='swobject.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swobject.lo `test -f '$(utilfunsdir)/swobject.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swobject.cpp
+
+utilstr.lo: $(utilfunsdir)/utilstr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utilstr.lo -MD -MP -MF $(DEPDIR)/utilstr.Tpo -c -o utilstr.lo `test -f '$(utilfunsdir)/utilstr.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilstr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utilstr.Tpo $(DEPDIR)/utilstr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(utilfunsdir)/utilstr.cpp' object='utilstr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utilstr.lo `test -f '$(utilfunsdir)/utilstr.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilstr.cpp
+
+utilxml.lo: $(utilfunsdir)/utilxml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utilxml.lo -MD -MP -MF $(DEPDIR)/utilxml.Tpo -c -o utilxml.lo `test -f '$(utilfunsdir)/utilxml.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilxml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utilxml.Tpo $(DEPDIR)/utilxml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(utilfunsdir)/utilxml.cpp' object='utilxml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utilxml.lo `test -f '$(utilfunsdir)/utilxml.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/utilxml.cpp
+
+swversion.lo: $(utilfunsdir)/swversion.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swversion.lo -MD -MP -MF $(DEPDIR)/swversion.Tpo -c -o swversion.lo `test -f '$(utilfunsdir)/swversion.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swversion.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swversion.Tpo $(DEPDIR)/swversion.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(utilfunsdir)/swversion.cpp' object='swversion.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swversion.lo `test -f '$(utilfunsdir)/swversion.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swversion.cpp
+
+swbuf.lo: $(utilfunsdir)/swbuf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swbuf.lo -MD -MP -MF $(DEPDIR)/swbuf.Tpo -c -o swbuf.lo `test -f '$(utilfunsdir)/swbuf.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swbuf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swbuf.Tpo $(DEPDIR)/swbuf.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(utilfunsdir)/swbuf.cpp' object='swbuf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swbuf.lo `test -f '$(utilfunsdir)/swbuf.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/swbuf.cpp
+
+url.lo: $(utilfunsdir)/url.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT url.lo -MD -MP -MF $(DEPDIR)/url.Tpo -c -o url.lo `test -f '$(utilfunsdir)/url.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/url.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/url.Tpo $(DEPDIR)/url.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(utilfunsdir)/url.cpp' object='url.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o url.lo `test -f '$(utilfunsdir)/url.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/url.cpp
+
+roman.lo: $(utilfunsdir)/roman.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT roman.lo -MD -MP -MF $(DEPDIR)/roman.Tpo -c -o roman.lo `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/roman.Tpo $(DEPDIR)/roman.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(utilfunsdir)/roman.cpp' object='roman.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o roman.lo `test -f '$(utilfunsdir)/roman.cpp' || echo '$(srcdir)/'`$(utilfunsdir)/roman.cpp
+
+ftplibftpt.lo: $(mgrdir)/ftplibftpt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ftplibftpt.lo -MD -MP -MF $(DEPDIR)/ftplibftpt.Tpo -c -o ftplibftpt.lo `test -f '$(mgrdir)/ftplibftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftplibftpt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ftplibftpt.Tpo $(DEPDIR)/ftplibftpt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/ftplibftpt.cpp' object='ftplibftpt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ftplibftpt.lo `test -f '$(mgrdir)/ftplibftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/ftplibftpt.cpp
+
+curlftpt.lo: $(mgrdir)/curlftpt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlftpt.lo -MD -MP -MF $(DEPDIR)/curlftpt.Tpo -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/curlftpt.Tpo $(DEPDIR)/curlftpt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/curlftpt.cpp' object='curlftpt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlftpt.lo `test -f '$(mgrdir)/curlftpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlftpt.cpp
+
+curlhttpt.lo: $(mgrdir)/curlhttpt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT curlhttpt.lo -MD -MP -MF $(DEPDIR)/curlhttpt.Tpo -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/curlhttpt.Tpo $(DEPDIR)/curlhttpt.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/curlhttpt.cpp' object='curlhttpt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o curlhttpt.lo `test -f '$(mgrdir)/curlhttpt.cpp' || echo '$(srcdir)/'`$(mgrdir)/curlhttpt.cpp
+
+swconfig.lo: $(mgrdir)/swconfig.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swconfig.lo -MD -MP -MF $(DEPDIR)/swconfig.Tpo -c -o swconfig.lo `test -f '$(mgrdir)/swconfig.cpp' || echo '$(srcdir)/'`$(mgrdir)/swconfig.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swconfig.Tpo $(DEPDIR)/swconfig.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/swconfig.cpp' object='swconfig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swconfig.lo `test -f '$(mgrdir)/swconfig.cpp' || echo '$(srcdir)/'`$(mgrdir)/swconfig.cpp
+
+swmgr.lo: $(mgrdir)/swmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swmgr.lo -MD -MP -MF $(DEPDIR)/swmgr.Tpo -c -o swmgr.lo `test -f '$(mgrdir)/swmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swmgr.Tpo $(DEPDIR)/swmgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/swmgr.cpp' object='swmgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swmgr.lo `test -f '$(mgrdir)/swmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swmgr.cpp
+
+swfiltermgr.lo: $(mgrdir)/swfiltermgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swfiltermgr.lo -MD -MP -MF $(DEPDIR)/swfiltermgr.Tpo -c -o swfiltermgr.lo `test -f '$(mgrdir)/swfiltermgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swfiltermgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swfiltermgr.Tpo $(DEPDIR)/swfiltermgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/swfiltermgr.cpp' object='swfiltermgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swfiltermgr.lo `test -f '$(mgrdir)/swfiltermgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/swfiltermgr.cpp
+
+encfiltmgr.lo: $(mgrdir)/encfiltmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT encfiltmgr.lo -MD -MP -MF $(DEPDIR)/encfiltmgr.Tpo -c -o encfiltmgr.lo `test -f '$(mgrdir)/encfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/encfiltmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/encfiltmgr.Tpo $(DEPDIR)/encfiltmgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/encfiltmgr.cpp' object='encfiltmgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o encfiltmgr.lo `test -f '$(mgrdir)/encfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/encfiltmgr.cpp
+
+markupfiltmgr.lo: $(mgrdir)/markupfiltmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT markupfiltmgr.lo -MD -MP -MF $(DEPDIR)/markupfiltmgr.Tpo -c -o markupfiltmgr.lo `test -f '$(mgrdir)/markupfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/markupfiltmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/markupfiltmgr.Tpo $(DEPDIR)/markupfiltmgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/markupfiltmgr.cpp' object='markupfiltmgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o markupfiltmgr.lo `test -f '$(mgrdir)/markupfiltmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/markupfiltmgr.cpp
+
+filemgr.lo: $(mgrdir)/filemgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filemgr.lo -MD -MP -MF $(DEPDIR)/filemgr.Tpo -c -o filemgr.lo `test -f '$(mgrdir)/filemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/filemgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/filemgr.Tpo $(DEPDIR)/filemgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/filemgr.cpp' object='filemgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filemgr.lo `test -f '$(mgrdir)/filemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/filemgr.cpp
+
+versificationmgr.lo: $(mgrdir)/versificationmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT versificationmgr.lo -MD -MP -MF $(DEPDIR)/versificationmgr.Tpo -c -o versificationmgr.lo `test -f '$(mgrdir)/versificationmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versificationmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/versificationmgr.Tpo $(DEPDIR)/versificationmgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/versificationmgr.cpp' object='versificationmgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o versificationmgr.lo `test -f '$(mgrdir)/versificationmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/versificationmgr.cpp
+
+remotetrans.lo: $(mgrdir)/remotetrans.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT remotetrans.lo -MD -MP -MF $(DEPDIR)/remotetrans.Tpo -c -o remotetrans.lo `test -f '$(mgrdir)/remotetrans.cpp' || echo '$(srcdir)/'`$(mgrdir)/remotetrans.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/remotetrans.Tpo $(DEPDIR)/remotetrans.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/remotetrans.cpp' object='remotetrans.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o remotetrans.lo `test -f '$(mgrdir)/remotetrans.cpp' || echo '$(srcdir)/'`$(mgrdir)/remotetrans.cpp
+
+swlocale.lo: $(mgrdir)/swlocale.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swlocale.lo -MD -MP -MF $(DEPDIR)/swlocale.Tpo -c -o swlocale.lo `test -f '$(mgrdir)/swlocale.cpp' || echo '$(srcdir)/'`$(mgrdir)/swlocale.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swlocale.Tpo $(DEPDIR)/swlocale.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/swlocale.cpp' object='swlocale.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swlocale.lo `test -f '$(mgrdir)/swlocale.cpp' || echo '$(srcdir)/'`$(mgrdir)/swlocale.cpp
+
+localemgr.lo: $(mgrdir)/localemgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT localemgr.lo -MD -MP -MF $(DEPDIR)/localemgr.Tpo -c -o localemgr.lo `test -f '$(mgrdir)/localemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/localemgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/localemgr.Tpo $(DEPDIR)/localemgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/localemgr.cpp' object='localemgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o localemgr.lo `test -f '$(mgrdir)/localemgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/localemgr.cpp
+
+swcacher.lo: $(mgrdir)/swcacher.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcacher.lo -MD -MP -MF $(DEPDIR)/swcacher.Tpo -c -o swcacher.lo `test -f '$(mgrdir)/swcacher.cpp' || echo '$(srcdir)/'`$(mgrdir)/swcacher.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swcacher.Tpo $(DEPDIR)/swcacher.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/swcacher.cpp' object='swcacher.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcacher.lo `test -f '$(mgrdir)/swcacher.cpp' || echo '$(srcdir)/'`$(mgrdir)/swcacher.cpp
+
+swsearchable.lo: $(mgrdir)/swsearchable.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swsearchable.lo -MD -MP -MF $(DEPDIR)/swsearchable.Tpo -c -o swsearchable.lo `test -f '$(mgrdir)/swsearchable.cpp' || echo '$(srcdir)/'`$(mgrdir)/swsearchable.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swsearchable.Tpo $(DEPDIR)/swsearchable.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/swsearchable.cpp' object='swsearchable.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swsearchable.lo `test -f '$(mgrdir)/swsearchable.cpp' || echo '$(srcdir)/'`$(mgrdir)/swsearchable.cpp
+
+installmgr.lo: $(mgrdir)/installmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installmgr.lo -MD -MP -MF $(DEPDIR)/installmgr.Tpo -c -o installmgr.lo `test -f '$(mgrdir)/installmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/installmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/installmgr.Tpo $(DEPDIR)/installmgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/installmgr.cpp' object='installmgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installmgr.lo `test -f '$(mgrdir)/installmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/installmgr.cpp
+
+stringmgr.lo: $(mgrdir)/stringmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT stringmgr.lo -MD -MP -MF $(DEPDIR)/stringmgr.Tpo -c -o stringmgr.lo `test -f '$(mgrdir)/stringmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/stringmgr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/stringmgr.Tpo $(DEPDIR)/stringmgr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(mgrdir)/stringmgr.cpp' object='stringmgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stringmgr.lo `test -f '$(mgrdir)/stringmgr.cpp' || echo '$(srcdir)/'`$(mgrdir)/stringmgr.cpp
+
+swdisp.lo: $(frontenddir)/swdisp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swdisp.lo -MD -MP -MF $(DEPDIR)/swdisp.Tpo -c -o swdisp.lo `test -f '$(frontenddir)/swdisp.cpp' || echo '$(srcdir)/'`$(frontenddir)/swdisp.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swdisp.Tpo $(DEPDIR)/swdisp.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(frontenddir)/swdisp.cpp' object='swdisp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swdisp.lo `test -f '$(frontenddir)/swdisp.cpp' || echo '$(srcdir)/'`$(frontenddir)/swdisp.cpp
+
+swlog.lo: $(frontenddir)/swlog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swlog.lo -MD -MP -MF $(DEPDIR)/swlog.Tpo -c -o swlog.lo `test -f '$(frontenddir)/swlog.cpp' || echo '$(srcdir)/'`$(frontenddir)/swlog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swlog.Tpo $(DEPDIR)/swlog.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(frontenddir)/swlog.cpp' object='swlog.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swlog.lo `test -f '$(frontenddir)/swlog.cpp' || echo '$(srcdir)/'`$(frontenddir)/swlog.cpp
+
+swmodule.lo: $(modulesdir)/swmodule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swmodule.lo -MD -MP -MF $(DEPDIR)/swmodule.Tpo -c -o swmodule.lo `test -f '$(modulesdir)/swmodule.cpp' || echo '$(srcdir)/'`$(modulesdir)/swmodule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swmodule.Tpo $(DEPDIR)/swmodule.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(modulesdir)/swmodule.cpp' object='swmodule.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swmodule.lo `test -f '$(modulesdir)/swmodule.cpp' || echo '$(srcdir)/'`$(modulesdir)/swmodule.cpp
+
+rawstr.lo: $(commondir)/rawstr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawstr.lo -MD -MP -MF $(DEPDIR)/rawstr.Tpo -c -o rawstr.lo `test -f '$(commondir)/rawstr.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawstr.Tpo $(DEPDIR)/rawstr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/rawstr.cpp' object='rawstr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawstr.lo `test -f '$(commondir)/rawstr.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr.cpp
+
+rawstr4.lo: $(commondir)/rawstr4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawstr4.lo -MD -MP -MF $(DEPDIR)/rawstr4.Tpo -c -o rawstr4.lo `test -f '$(commondir)/rawstr4.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawstr4.Tpo $(DEPDIR)/rawstr4.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/rawstr4.cpp' object='rawstr4.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawstr4.lo `test -f '$(commondir)/rawstr4.cpp' || echo '$(srcdir)/'`$(commondir)/rawstr4.cpp
+
+swcomprs.lo: $(commondir)/swcomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcomprs.lo -MD -MP -MF $(DEPDIR)/swcomprs.Tpo -c -o swcomprs.lo `test -f '$(commondir)/swcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/swcomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swcomprs.Tpo $(DEPDIR)/swcomprs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/swcomprs.cpp' object='swcomprs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcomprs.lo `test -f '$(commondir)/swcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/swcomprs.cpp
+
+lzsscomprs.lo: $(commondir)/lzsscomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT lzsscomprs.lo -MD -MP -MF $(DEPDIR)/lzsscomprs.Tpo -c -o lzsscomprs.lo `test -f '$(commondir)/lzsscomprs.cpp' || echo '$(srcdir)/'`$(commondir)/lzsscomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/lzsscomprs.Tpo $(DEPDIR)/lzsscomprs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/lzsscomprs.cpp' object='lzsscomprs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lzsscomprs.lo `test -f '$(commondir)/lzsscomprs.cpp' || echo '$(srcdir)/'`$(commondir)/lzsscomprs.cpp
+
+zipcomprs.lo: $(commondir)/zipcomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zipcomprs.lo -MD -MP -MF $(DEPDIR)/zipcomprs.Tpo -c -o zipcomprs.lo `test -f '$(commondir)/zipcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/zipcomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/zipcomprs.Tpo $(DEPDIR)/zipcomprs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/zipcomprs.cpp' object='zipcomprs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zipcomprs.lo `test -f '$(commondir)/zipcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/zipcomprs.cpp
+
+bz2comprs.lo: $(commondir)/bz2comprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bz2comprs.lo -MD -MP -MF $(DEPDIR)/bz2comprs.Tpo -c -o bz2comprs.lo `test -f '$(commondir)/bz2comprs.cpp' || echo '$(srcdir)/'`$(commondir)/bz2comprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bz2comprs.Tpo $(DEPDIR)/bz2comprs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/bz2comprs.cpp' object='bz2comprs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o bz2comprs.lo `test -f '$(commondir)/bz2comprs.cpp' || echo '$(srcdir)/'`$(commondir)/bz2comprs.cpp
+
+xzcomprs.lo: $(commondir)/xzcomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT xzcomprs.lo -MD -MP -MF $(DEPDIR)/xzcomprs.Tpo -c -o xzcomprs.lo `test -f '$(commondir)/xzcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/xzcomprs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/xzcomprs.Tpo $(DEPDIR)/xzcomprs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/xzcomprs.cpp' object='xzcomprs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o xzcomprs.lo `test -f '$(commondir)/xzcomprs.cpp' || echo '$(srcdir)/'`$(commondir)/xzcomprs.cpp
+
+rawverse.lo: $(commondir)/rawverse.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawverse.lo -MD -MP -MF $(DEPDIR)/rawverse.Tpo -c -o rawverse.lo `test -f '$(commondir)/rawverse.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawverse.Tpo $(DEPDIR)/rawverse.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/rawverse.cpp' object='rawverse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawverse.lo `test -f '$(commondir)/rawverse.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse.cpp
+
+rawverse4.lo: $(commondir)/rawverse4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawverse4.lo -MD -MP -MF $(DEPDIR)/rawverse4.Tpo -c -o rawverse4.lo `test -f '$(commondir)/rawverse4.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawverse4.Tpo $(DEPDIR)/rawverse4.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/rawverse4.cpp' object='rawverse4.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawverse4.lo `test -f '$(commondir)/rawverse4.cpp' || echo '$(srcdir)/'`$(commondir)/rawverse4.cpp
+
+swcipher.lo: $(commondir)/swcipher.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcipher.lo -MD -MP -MF $(DEPDIR)/swcipher.Tpo -c -o swcipher.lo `test -f '$(commondir)/swcipher.cpp' || echo '$(srcdir)/'`$(commondir)/swcipher.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swcipher.Tpo $(DEPDIR)/swcipher.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/swcipher.cpp' object='swcipher.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcipher.lo `test -f '$(commondir)/swcipher.cpp' || echo '$(srcdir)/'`$(commondir)/swcipher.cpp
+
+zverse.lo: $(commondir)/zverse.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zverse.lo -MD -MP -MF $(DEPDIR)/zverse.Tpo -c -o zverse.lo `test -f '$(commondir)/zverse.cpp' || echo '$(srcdir)/'`$(commondir)/zverse.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/zverse.Tpo $(DEPDIR)/zverse.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/zverse.cpp' object='zverse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zverse.lo `test -f '$(commondir)/zverse.cpp' || echo '$(srcdir)/'`$(commondir)/zverse.cpp
+
+zstr.lo: $(commondir)/zstr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zstr.lo -MD -MP -MF $(DEPDIR)/zstr.Tpo -c -o zstr.lo `test -f '$(commondir)/zstr.cpp' || echo '$(srcdir)/'`$(commondir)/zstr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/zstr.Tpo $(DEPDIR)/zstr.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/zstr.cpp' object='zstr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zstr.lo `test -f '$(commondir)/zstr.cpp' || echo '$(srcdir)/'`$(commondir)/zstr.cpp
+
+entriesblk.lo: $(commondir)/entriesblk.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT entriesblk.lo -MD -MP -MF $(DEPDIR)/entriesblk.Tpo -c -o entriesblk.lo `test -f '$(commondir)/entriesblk.cpp' || echo '$(srcdir)/'`$(commondir)/entriesblk.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/entriesblk.Tpo $(DEPDIR)/entriesblk.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/entriesblk.cpp' object='entriesblk.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o entriesblk.lo `test -f '$(commondir)/entriesblk.cpp' || echo '$(srcdir)/'`$(commondir)/entriesblk.cpp
+
+sapphire.lo: $(commondir)/sapphire.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sapphire.lo -MD -MP -MF $(DEPDIR)/sapphire.Tpo -c -o sapphire.lo `test -f '$(commondir)/sapphire.cpp' || echo '$(srcdir)/'`$(commondir)/sapphire.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sapphire.Tpo $(DEPDIR)/sapphire.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commondir)/sapphire.cpp' object='sapphire.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sapphire.lo `test -f '$(commondir)/sapphire.cpp' || echo '$(srcdir)/'`$(commondir)/sapphire.cpp
+
+swbasicfilter.lo: $(filtersdir)/swbasicfilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swbasicfilter.lo -MD -MP -MF $(DEPDIR)/swbasicfilter.Tpo -c -o swbasicfilter.lo `test -f '$(filtersdir)/swbasicfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swbasicfilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swbasicfilter.Tpo $(DEPDIR)/swbasicfilter.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/swbasicfilter.cpp' object='swbasicfilter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swbasicfilter.lo `test -f '$(filtersdir)/swbasicfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swbasicfilter.cpp
+
+swoptfilter.lo: $(filtersdir)/swoptfilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swoptfilter.lo -MD -MP -MF $(DEPDIR)/swoptfilter.Tpo -c -o swoptfilter.lo `test -f '$(filtersdir)/swoptfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swoptfilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swoptfilter.Tpo $(DEPDIR)/swoptfilter.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/swoptfilter.cpp' object='swoptfilter.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swoptfilter.lo `test -f '$(filtersdir)/swoptfilter.cpp' || echo '$(srcdir)/'`$(filtersdir)/swoptfilter.cpp
+
+latin1utf8.lo: $(filtersdir)/latin1utf8.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT latin1utf8.lo -MD -MP -MF $(DEPDIR)/latin1utf8.Tpo -c -o latin1utf8.lo `test -f '$(filtersdir)/latin1utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf8.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/latin1utf8.Tpo $(DEPDIR)/latin1utf8.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/latin1utf8.cpp' object='latin1utf8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o latin1utf8.lo `test -f '$(filtersdir)/latin1utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf8.cpp
+
+latin1utf16.lo: $(filtersdir)/latin1utf16.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT latin1utf16.lo -MD -MP -MF $(DEPDIR)/latin1utf16.Tpo -c -o latin1utf16.lo `test -f '$(filtersdir)/latin1utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf16.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/latin1utf16.Tpo $(DEPDIR)/latin1utf16.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/latin1utf16.cpp' object='latin1utf16.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o latin1utf16.lo `test -f '$(filtersdir)/latin1utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/latin1utf16.cpp
+
+utf8utf16.lo: $(filtersdir)/utf8utf16.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8utf16.lo -MD -MP -MF $(DEPDIR)/utf8utf16.Tpo -c -o utf8utf16.lo `test -f '$(filtersdir)/utf8utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8utf16.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8utf16.Tpo $(DEPDIR)/utf8utf16.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8utf16.cpp' object='utf8utf16.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8utf16.lo `test -f '$(filtersdir)/utf8utf16.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8utf16.cpp
+
+utf16utf8.lo: $(filtersdir)/utf16utf8.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf16utf8.lo -MD -MP -MF $(DEPDIR)/utf16utf8.Tpo -c -o utf16utf8.lo `test -f '$(filtersdir)/utf16utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf16utf8.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf16utf8.Tpo $(DEPDIR)/utf16utf8.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf16utf8.cpp' object='utf16utf8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf16utf8.lo `test -f '$(filtersdir)/utf16utf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf16utf8.cpp
+
+utf8html.lo: $(filtersdir)/utf8html.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8html.lo -MD -MP -MF $(DEPDIR)/utf8html.Tpo -c -o utf8html.lo `test -f '$(filtersdir)/utf8html.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8html.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8html.Tpo $(DEPDIR)/utf8html.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8html.cpp' object='utf8html.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8html.lo `test -f '$(filtersdir)/utf8html.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8html.cpp
+
+utf8latin1.lo: $(filtersdir)/utf8latin1.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8latin1.lo -MD -MP -MF $(DEPDIR)/utf8latin1.Tpo -c -o utf8latin1.lo `test -f '$(filtersdir)/utf8latin1.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8latin1.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8latin1.Tpo $(DEPDIR)/utf8latin1.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8latin1.cpp' object='utf8latin1.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8latin1.lo `test -f '$(filtersdir)/utf8latin1.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8latin1.cpp
+
+unicodertf.lo: $(filtersdir)/unicodertf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unicodertf.lo -MD -MP -MF $(DEPDIR)/unicodertf.Tpo -c -o unicodertf.lo `test -f '$(filtersdir)/unicodertf.cpp' || echo '$(srcdir)/'`$(filtersdir)/unicodertf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/unicodertf.Tpo $(DEPDIR)/unicodertf.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/unicodertf.cpp' object='unicodertf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unicodertf.lo `test -f '$(filtersdir)/unicodertf.cpp' || echo '$(srcdir)/'`$(filtersdir)/unicodertf.cpp
+
+scsuutf8.lo: $(filtersdir)/scsuutf8.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT scsuutf8.lo -MD -MP -MF $(DEPDIR)/scsuutf8.Tpo -c -o scsuutf8.lo `test -f '$(filtersdir)/scsuutf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/scsuutf8.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/scsuutf8.Tpo $(DEPDIR)/scsuutf8.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/scsuutf8.cpp' object='scsuutf8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o scsuutf8.lo `test -f '$(filtersdir)/scsuutf8.cpp' || echo '$(srcdir)/'`$(filtersdir)/scsuutf8.cpp
+
+utf8cantillation.lo: $(filtersdir)/utf8cantillation.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8cantillation.lo -MD -MP -MF $(DEPDIR)/utf8cantillation.Tpo -c -o utf8cantillation.lo `test -f '$(filtersdir)/utf8cantillation.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8cantillation.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8cantillation.Tpo $(DEPDIR)/utf8cantillation.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8cantillation.cpp' object='utf8cantillation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8cantillation.lo `test -f '$(filtersdir)/utf8cantillation.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8cantillation.cpp
+
+utf8hebrewpoints.lo: $(filtersdir)/utf8hebrewpoints.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8hebrewpoints.lo -MD -MP -MF $(DEPDIR)/utf8hebrewpoints.Tpo -c -o utf8hebrewpoints.lo `test -f '$(filtersdir)/utf8hebrewpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8hebrewpoints.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8hebrewpoints.Tpo $(DEPDIR)/utf8hebrewpoints.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8hebrewpoints.cpp' object='utf8hebrewpoints.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8hebrewpoints.lo `test -f '$(filtersdir)/utf8hebrewpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8hebrewpoints.cpp
+
+utf8arabicpoints.lo: $(filtersdir)/utf8arabicpoints.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8arabicpoints.lo -MD -MP -MF $(DEPDIR)/utf8arabicpoints.Tpo -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8arabicpoints.Tpo $(DEPDIR)/utf8arabicpoints.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8arabicpoints.cpp' object='utf8arabicpoints.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8arabicpoints.lo `test -f '$(filtersdir)/utf8arabicpoints.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arabicpoints.cpp
+
+utf8greekaccents.lo: $(filtersdir)/utf8greekaccents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8greekaccents.lo -MD -MP -MF $(DEPDIR)/utf8greekaccents.Tpo -c -o utf8greekaccents.lo `test -f '$(filtersdir)/utf8greekaccents.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8greekaccents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8greekaccents.Tpo $(DEPDIR)/utf8greekaccents.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8greekaccents.cpp' object='utf8greekaccents.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8greekaccents.lo `test -f '$(filtersdir)/utf8greekaccents.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8greekaccents.cpp
+
+cipherfil.lo: $(filtersdir)/cipherfil.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cipherfil.lo -MD -MP -MF $(DEPDIR)/cipherfil.Tpo -c -o cipherfil.lo `test -f '$(filtersdir)/cipherfil.cpp' || echo '$(srcdir)/'`$(filtersdir)/cipherfil.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cipherfil.Tpo $(DEPDIR)/cipherfil.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/cipherfil.cpp' object='cipherfil.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cipherfil.lo `test -f '$(filtersdir)/cipherfil.cpp' || echo '$(srcdir)/'`$(filtersdir)/cipherfil.cpp
+
+utf8transliterator.lo: $(filtersdir)/utf8transliterator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8transliterator.lo -MD -MP -MF $(DEPDIR)/utf8transliterator.Tpo -c -o utf8transliterator.lo `test -f '$(filtersdir)/utf8transliterator.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8transliterator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8transliterator.Tpo $(DEPDIR)/utf8transliterator.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8transliterator.cpp' object='utf8transliterator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8transliterator.lo `test -f '$(filtersdir)/utf8transliterator.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8transliterator.cpp
+
+utf8nfc.lo: $(filtersdir)/utf8nfc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8nfc.lo -MD -MP -MF $(DEPDIR)/utf8nfc.Tpo -c -o utf8nfc.lo `test -f '$(filtersdir)/utf8nfc.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8nfc.Tpo $(DEPDIR)/utf8nfc.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8nfc.cpp' object='utf8nfc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8nfc.lo `test -f '$(filtersdir)/utf8nfc.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfc.cpp
+
+utf8nfkd.lo: $(filtersdir)/utf8nfkd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8nfkd.lo -MD -MP -MF $(DEPDIR)/utf8nfkd.Tpo -c -o utf8nfkd.lo `test -f '$(filtersdir)/utf8nfkd.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfkd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8nfkd.Tpo $(DEPDIR)/utf8nfkd.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8nfkd.cpp' object='utf8nfkd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8nfkd.lo `test -f '$(filtersdir)/utf8nfkd.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8nfkd.cpp
+
+utf8arshaping.lo: $(filtersdir)/utf8arshaping.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8arshaping.lo -MD -MP -MF $(DEPDIR)/utf8arshaping.Tpo -c -o utf8arshaping.lo `test -f '$(filtersdir)/utf8arshaping.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arshaping.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8arshaping.Tpo $(DEPDIR)/utf8arshaping.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8arshaping.cpp' object='utf8arshaping.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8arshaping.lo `test -f '$(filtersdir)/utf8arshaping.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8arshaping.cpp
+
+utf8bidireorder.lo: $(filtersdir)/utf8bidireorder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT utf8bidireorder.lo -MD -MP -MF $(DEPDIR)/utf8bidireorder.Tpo -c -o utf8bidireorder.lo `test -f '$(filtersdir)/utf8bidireorder.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8bidireorder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/utf8bidireorder.Tpo $(DEPDIR)/utf8bidireorder.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/utf8bidireorder.cpp' object='utf8bidireorder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o utf8bidireorder.lo `test -f '$(filtersdir)/utf8bidireorder.cpp' || echo '$(srcdir)/'`$(filtersdir)/utf8bidireorder.cpp
+
+osisheadings.lo: $(filtersdir)/osisheadings.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisheadings.lo -MD -MP -MF $(DEPDIR)/osisheadings.Tpo -c -o osisheadings.lo `test -f '$(filtersdir)/osisheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisheadings.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisheadings.Tpo $(DEPDIR)/osisheadings.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisheadings.cpp' object='osisheadings.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisheadings.lo `test -f '$(filtersdir)/osisheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisheadings.cpp
+
+osisfootnotes.lo: $(filtersdir)/osisfootnotes.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisfootnotes.lo -MD -MP -MF $(DEPDIR)/osisfootnotes.Tpo -c -o osisfootnotes.lo `test -f '$(filtersdir)/osisfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisfootnotes.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisfootnotes.Tpo $(DEPDIR)/osisfootnotes.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisfootnotes.cpp' object='osisfootnotes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisfootnotes.lo `test -f '$(filtersdir)/osisfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisfootnotes.cpp
+
+osishtmlhref.lo: $(filtersdir)/osishtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osishtmlhref.lo -MD -MP -MF $(DEPDIR)/osishtmlhref.Tpo -c -o osishtmlhref.lo `test -f '$(filtersdir)/osishtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osishtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osishtmlhref.Tpo $(DEPDIR)/osishtmlhref.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osishtmlhref.cpp' object='osishtmlhref.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osishtmlhref.lo `test -f '$(filtersdir)/osishtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osishtmlhref.cpp
+
+osisxhtml.lo: $(filtersdir)/osisxhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisxhtml.lo -MD -MP -MF $(DEPDIR)/osisxhtml.Tpo -c -o osisxhtml.lo `test -f '$(filtersdir)/osisxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisxhtml.Tpo $(DEPDIR)/osisxhtml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisxhtml.cpp' object='osisxhtml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisxhtml.lo `test -f '$(filtersdir)/osisxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxhtml.cpp
+
+osiswebif.lo: $(filtersdir)/osiswebif.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osiswebif.lo -MD -MP -MF $(DEPDIR)/osiswebif.Tpo -c -o osiswebif.lo `test -f '$(filtersdir)/osiswebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswebif.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osiswebif.Tpo $(DEPDIR)/osiswebif.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osiswebif.cpp' object='osiswebif.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osiswebif.lo `test -f '$(filtersdir)/osiswebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswebif.cpp
+
+osismorph.lo: $(filtersdir)/osismorph.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osismorph.lo -MD -MP -MF $(DEPDIR)/osismorph.Tpo -c -o osismorph.lo `test -f '$(filtersdir)/osismorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorph.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osismorph.Tpo $(DEPDIR)/osismorph.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osismorph.cpp' object='osismorph.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osismorph.lo `test -f '$(filtersdir)/osismorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorph.cpp
+
+osisstrongs.lo: $(filtersdir)/osisstrongs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisstrongs.lo -MD -MP -MF $(DEPDIR)/osisstrongs.Tpo -c -o osisstrongs.lo `test -f '$(filtersdir)/osisstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisstrongs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisstrongs.Tpo $(DEPDIR)/osisstrongs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisstrongs.cpp' object='osisstrongs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisstrongs.lo `test -f '$(filtersdir)/osisstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisstrongs.cpp
+
+osisplain.lo: $(filtersdir)/osisplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisplain.lo -MD -MP -MF $(DEPDIR)/osisplain.Tpo -c -o osisplain.lo `test -f '$(filtersdir)/osisplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisplain.Tpo $(DEPDIR)/osisplain.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisplain.cpp' object='osisplain.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisplain.lo `test -f '$(filtersdir)/osisplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisplain.cpp
+
+osisrtf.lo: $(filtersdir)/osisrtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisrtf.lo -MD -MP -MF $(DEPDIR)/osisrtf.Tpo -c -o osisrtf.lo `test -f '$(filtersdir)/osisrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisrtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisrtf.Tpo $(DEPDIR)/osisrtf.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisrtf.cpp' object='osisrtf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisrtf.lo `test -f '$(filtersdir)/osisrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisrtf.cpp
+
+osislemma.lo: $(filtersdir)/osislemma.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osislemma.lo -MD -MP -MF $(DEPDIR)/osislemma.Tpo -c -o osislemma.lo `test -f '$(filtersdir)/osislemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislemma.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osislemma.Tpo $(DEPDIR)/osislemma.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osislemma.cpp' object='osislemma.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osislemma.lo `test -f '$(filtersdir)/osislemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/osislemma.cpp
+
+osisredletterwords.lo: $(filtersdir)/osisredletterwords.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisredletterwords.lo -MD -MP -MF $(DEPDIR)/osisredletterwords.Tpo -c -o osisredletterwords.lo `test -f '$(filtersdir)/osisredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisredletterwords.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisredletterwords.Tpo $(DEPDIR)/osisredletterwords.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisredletterwords.cpp' object='osisredletterwords.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisredletterwords.lo `test -f '$(filtersdir)/osisredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisredletterwords.cpp
+
+osisscripref.lo: $(filtersdir)/osisscripref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisscripref.lo -MD -MP -MF $(DEPDIR)/osisscripref.Tpo -c -o osisscripref.lo `test -f '$(filtersdir)/osisscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisscripref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisscripref.Tpo $(DEPDIR)/osisscripref.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisscripref.cpp' object='osisscripref.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisscripref.lo `test -f '$(filtersdir)/osisscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisscripref.cpp
+
+osisvariants.lo: $(filtersdir)/osisvariants.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisvariants.lo -MD -MP -MF $(DEPDIR)/osisvariants.Tpo -c -o osisvariants.lo `test -f '$(filtersdir)/osisvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisvariants.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisvariants.Tpo $(DEPDIR)/osisvariants.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisvariants.cpp' object='osisvariants.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisvariants.lo `test -f '$(filtersdir)/osisvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisvariants.cpp
+
+osiswordjs.lo: $(filtersdir)/osiswordjs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osiswordjs.lo -MD -MP -MF $(DEPDIR)/osiswordjs.Tpo -c -o osiswordjs.lo `test -f '$(filtersdir)/osiswordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswordjs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osiswordjs.Tpo $(DEPDIR)/osiswordjs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osiswordjs.cpp' object='osiswordjs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osiswordjs.lo `test -f '$(filtersdir)/osiswordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/osiswordjs.cpp
+
+osismorphsegmentation.lo: $(filtersdir)/osismorphsegmentation.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osismorphsegmentation.lo -MD -MP -MF $(DEPDIR)/osismorphsegmentation.Tpo -c -o osismorphsegmentation.lo `test -f '$(filtersdir)/osismorphsegmentation.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorphsegmentation.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osismorphsegmentation.Tpo $(DEPDIR)/osismorphsegmentation.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osismorphsegmentation.cpp' object='osismorphsegmentation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osismorphsegmentation.lo `test -f '$(filtersdir)/osismorphsegmentation.cpp' || echo '$(srcdir)/'`$(filtersdir)/osismorphsegmentation.cpp
+
+osisglosses.lo: $(filtersdir)/osisglosses.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisglosses.lo -MD -MP -MF $(DEPDIR)/osisglosses.Tpo -c -o osisglosses.lo `test -f '$(filtersdir)/osisglosses.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisglosses.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisglosses.Tpo $(DEPDIR)/osisglosses.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisglosses.cpp' object='osisglosses.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisglosses.lo `test -f '$(filtersdir)/osisglosses.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisglosses.cpp
+
+osisenum.lo: $(filtersdir)/osisenum.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisenum.lo -MD -MP -MF $(DEPDIR)/osisenum.Tpo -c -o osisenum.lo `test -f '$(filtersdir)/osisenum.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisenum.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisenum.Tpo $(DEPDIR)/osisenum.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisenum.cpp' object='osisenum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisenum.lo `test -f '$(filtersdir)/osisenum.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisenum.cpp
+
+osisxlit.lo: $(filtersdir)/osisxlit.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisxlit.lo -MD -MP -MF $(DEPDIR)/osisxlit.Tpo -c -o osisxlit.lo `test -f '$(filtersdir)/osisxlit.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxlit.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisxlit.Tpo $(DEPDIR)/osisxlit.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisxlit.cpp' object='osisxlit.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisxlit.lo `test -f '$(filtersdir)/osisxlit.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisxlit.cpp
+
+osisreferencelinks.lo: $(filtersdir)/osisreferencelinks.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisreferencelinks.lo -MD -MP -MF $(DEPDIR)/osisreferencelinks.Tpo -c -o osisreferencelinks.lo `test -f '$(filtersdir)/osisreferencelinks.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisreferencelinks.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisreferencelinks.Tpo $(DEPDIR)/osisreferencelinks.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisreferencelinks.cpp' object='osisreferencelinks.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisreferencelinks.lo `test -f '$(filtersdir)/osisreferencelinks.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisreferencelinks.cpp
+
+gbfhtml.lo: $(filtersdir)/gbfhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtml.lo -MD -MP -MF $(DEPDIR)/gbfhtml.Tpo -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfhtml.Tpo $(DEPDIR)/gbfhtml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfhtml.cpp' object='gbfhtml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfhtml.lo `test -f '$(filtersdir)/gbfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtml.cpp
+
+gbfhtmlhref.lo: $(filtersdir)/gbfhtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfhtmlhref.lo -MD -MP -MF $(DEPDIR)/gbfhtmlhref.Tpo -c -o gbfhtmlhref.lo `test -f '$(filtersdir)/gbfhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfhtmlhref.Tpo $(DEPDIR)/gbfhtmlhref.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfhtmlhref.cpp' object='gbfhtmlhref.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfhtmlhref.lo `test -f '$(filtersdir)/gbfhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfhtmlhref.cpp
+
+gbfxhtml.lo: $(filtersdir)/gbfxhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfxhtml.lo -MD -MP -MF $(DEPDIR)/gbfxhtml.Tpo -c -o gbfxhtml.lo `test -f '$(filtersdir)/gbfxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfxhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfxhtml.Tpo $(DEPDIR)/gbfxhtml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfxhtml.cpp' object='gbfxhtml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfxhtml.lo `test -f '$(filtersdir)/gbfxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfxhtml.cpp
+
+gbfwebif.lo: $(filtersdir)/gbfwebif.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfwebif.lo -MD -MP -MF $(DEPDIR)/gbfwebif.Tpo -c -o gbfwebif.lo `test -f '$(filtersdir)/gbfwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwebif.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfwebif.Tpo $(DEPDIR)/gbfwebif.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfwebif.cpp' object='gbfwebif.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfwebif.lo `test -f '$(filtersdir)/gbfwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwebif.cpp
+
+gbfplain.lo: $(filtersdir)/gbfplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfplain.lo -MD -MP -MF $(DEPDIR)/gbfplain.Tpo -c -o gbfplain.lo `test -f '$(filtersdir)/gbfplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfplain.Tpo $(DEPDIR)/gbfplain.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfplain.cpp' object='gbfplain.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfplain.lo `test -f '$(filtersdir)/gbfplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfplain.cpp
+
+gbfrtf.lo: $(filtersdir)/gbfrtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfrtf.lo -MD -MP -MF $(DEPDIR)/gbfrtf.Tpo -c -o gbfrtf.lo `test -f '$(filtersdir)/gbfrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfrtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfrtf.Tpo $(DEPDIR)/gbfrtf.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfrtf.cpp' object='gbfrtf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfrtf.lo `test -f '$(filtersdir)/gbfrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfrtf.cpp
+
+gbfstrongs.lo: $(filtersdir)/gbfstrongs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfstrongs.lo -MD -MP -MF $(DEPDIR)/gbfstrongs.Tpo -c -o gbfstrongs.lo `test -f '$(filtersdir)/gbfstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfstrongs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfstrongs.Tpo $(DEPDIR)/gbfstrongs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfstrongs.cpp' object='gbfstrongs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfstrongs.lo `test -f '$(filtersdir)/gbfstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfstrongs.cpp
+
+gbffootnotes.lo: $(filtersdir)/gbffootnotes.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbffootnotes.lo -MD -MP -MF $(DEPDIR)/gbffootnotes.Tpo -c -o gbffootnotes.lo `test -f '$(filtersdir)/gbffootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbffootnotes.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbffootnotes.Tpo $(DEPDIR)/gbffootnotes.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbffootnotes.cpp' object='gbffootnotes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbffootnotes.lo `test -f '$(filtersdir)/gbffootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbffootnotes.cpp
+
+gbfheadings.lo: $(filtersdir)/gbfheadings.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfheadings.lo -MD -MP -MF $(DEPDIR)/gbfheadings.Tpo -c -o gbfheadings.lo `test -f '$(filtersdir)/gbfheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfheadings.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfheadings.Tpo $(DEPDIR)/gbfheadings.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfheadings.cpp' object='gbfheadings.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfheadings.lo `test -f '$(filtersdir)/gbfheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfheadings.cpp
+
+gbfredletterwords.lo: $(filtersdir)/gbfredletterwords.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfredletterwords.lo -MD -MP -MF $(DEPDIR)/gbfredletterwords.Tpo -c -o gbfredletterwords.lo `test -f '$(filtersdir)/gbfredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfredletterwords.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfredletterwords.Tpo $(DEPDIR)/gbfredletterwords.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfredletterwords.cpp' object='gbfredletterwords.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfredletterwords.lo `test -f '$(filtersdir)/gbfredletterwords.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfredletterwords.cpp
+
+gbfmorph.lo: $(filtersdir)/gbfmorph.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfmorph.lo -MD -MP -MF $(DEPDIR)/gbfmorph.Tpo -c -o gbfmorph.lo `test -f '$(filtersdir)/gbfmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfmorph.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfmorph.Tpo $(DEPDIR)/gbfmorph.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfmorph.cpp' object='gbfmorph.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfmorph.lo `test -f '$(filtersdir)/gbfmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfmorph.cpp
+
+gbfwordjs.lo: $(filtersdir)/gbfwordjs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfwordjs.lo -MD -MP -MF $(DEPDIR)/gbfwordjs.Tpo -c -o gbfwordjs.lo `test -f '$(filtersdir)/gbfwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwordjs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfwordjs.Tpo $(DEPDIR)/gbfwordjs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfwordjs.cpp' object='gbfwordjs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfwordjs.lo `test -f '$(filtersdir)/gbfwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfwordjs.cpp
+
+thmlstrongs.lo: $(filtersdir)/thmlstrongs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlstrongs.lo -MD -MP -MF $(DEPDIR)/thmlstrongs.Tpo -c -o thmlstrongs.lo `test -f '$(filtersdir)/thmlstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlstrongs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlstrongs.Tpo $(DEPDIR)/thmlstrongs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlstrongs.cpp' object='thmlstrongs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlstrongs.lo `test -f '$(filtersdir)/thmlstrongs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlstrongs.cpp
+
+thmlfootnotes.lo: $(filtersdir)/thmlfootnotes.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlfootnotes.lo -MD -MP -MF $(DEPDIR)/thmlfootnotes.Tpo -c -o thmlfootnotes.lo `test -f '$(filtersdir)/thmlfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlfootnotes.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlfootnotes.Tpo $(DEPDIR)/thmlfootnotes.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlfootnotes.cpp' object='thmlfootnotes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlfootnotes.lo `test -f '$(filtersdir)/thmlfootnotes.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlfootnotes.cpp
+
+thmlheadings.lo: $(filtersdir)/thmlheadings.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlheadings.lo -MD -MP -MF $(DEPDIR)/thmlheadings.Tpo -c -o thmlheadings.lo `test -f '$(filtersdir)/thmlheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlheadings.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlheadings.Tpo $(DEPDIR)/thmlheadings.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlheadings.cpp' object='thmlheadings.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlheadings.lo `test -f '$(filtersdir)/thmlheadings.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlheadings.cpp
+
+thmlmorph.lo: $(filtersdir)/thmlmorph.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlmorph.lo -MD -MP -MF $(DEPDIR)/thmlmorph.Tpo -c -o thmlmorph.lo `test -f '$(filtersdir)/thmlmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlmorph.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlmorph.Tpo $(DEPDIR)/thmlmorph.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlmorph.cpp' object='thmlmorph.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlmorph.lo `test -f '$(filtersdir)/thmlmorph.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlmorph.cpp
+
+thmllemma.lo: $(filtersdir)/thmllemma.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmllemma.lo -MD -MP -MF $(DEPDIR)/thmllemma.Tpo -c -o thmllemma.lo `test -f '$(filtersdir)/thmllemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllemma.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmllemma.Tpo $(DEPDIR)/thmllemma.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmllemma.cpp' object='thmllemma.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmllemma.lo `test -f '$(filtersdir)/thmllemma.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmllemma.cpp
+
+thmlscripref.lo: $(filtersdir)/thmlscripref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlscripref.lo -MD -MP -MF $(DEPDIR)/thmlscripref.Tpo -c -o thmlscripref.lo `test -f '$(filtersdir)/thmlscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlscripref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlscripref.Tpo $(DEPDIR)/thmlscripref.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlscripref.cpp' object='thmlscripref.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlscripref.lo `test -f '$(filtersdir)/thmlscripref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlscripref.cpp
+
+thmlvariants.lo: $(filtersdir)/thmlvariants.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlvariants.lo -MD -MP -MF $(DEPDIR)/thmlvariants.Tpo -c -o thmlvariants.lo `test -f '$(filtersdir)/thmlvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlvariants.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlvariants.Tpo $(DEPDIR)/thmlvariants.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlvariants.cpp' object='thmlvariants.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlvariants.lo `test -f '$(filtersdir)/thmlvariants.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlvariants.cpp
+
+thmlgbf.lo: $(filtersdir)/thmlgbf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlgbf.lo -MD -MP -MF $(DEPDIR)/thmlgbf.Tpo -c -o thmlgbf.lo `test -f '$(filtersdir)/thmlgbf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlgbf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlgbf.Tpo $(DEPDIR)/thmlgbf.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlgbf.cpp' object='thmlgbf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlgbf.lo `test -f '$(filtersdir)/thmlgbf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlgbf.cpp
+
+thmlrtf.lo: $(filtersdir)/thmlrtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlrtf.lo -MD -MP -MF $(DEPDIR)/thmlrtf.Tpo -c -o thmlrtf.lo `test -f '$(filtersdir)/thmlrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlrtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlrtf.Tpo $(DEPDIR)/thmlrtf.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlrtf.cpp' object='thmlrtf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlrtf.lo `test -f '$(filtersdir)/thmlrtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlrtf.cpp
+
+thmlhtml.lo: $(filtersdir)/thmlhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlhtml.lo -MD -MP -MF $(DEPDIR)/thmlhtml.Tpo -c -o thmlhtml.lo `test -f '$(filtersdir)/thmlhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlhtml.Tpo $(DEPDIR)/thmlhtml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlhtml.cpp' object='thmlhtml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlhtml.lo `test -f '$(filtersdir)/thmlhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtml.cpp
+
+thmlhtmlhref.lo: $(filtersdir)/thmlhtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlhtmlhref.lo -MD -MP -MF $(DEPDIR)/thmlhtmlhref.Tpo -c -o thmlhtmlhref.lo `test -f '$(filtersdir)/thmlhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlhtmlhref.Tpo $(DEPDIR)/thmlhtmlhref.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlhtmlhref.cpp' object='thmlhtmlhref.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlhtmlhref.lo `test -f '$(filtersdir)/thmlhtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlhtmlhref.cpp
+
+thmlxhtml.lo: $(filtersdir)/thmlxhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlxhtml.lo -MD -MP -MF $(DEPDIR)/thmlxhtml.Tpo -c -o thmlxhtml.lo `test -f '$(filtersdir)/thmlxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlxhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlxhtml.Tpo $(DEPDIR)/thmlxhtml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlxhtml.cpp' object='thmlxhtml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlxhtml.lo `test -f '$(filtersdir)/thmlxhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlxhtml.cpp
+
+thmlwebif.lo: $(filtersdir)/thmlwebif.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlwebif.lo -MD -MP -MF $(DEPDIR)/thmlwebif.Tpo -c -o thmlwebif.lo `test -f '$(filtersdir)/thmlwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwebif.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlwebif.Tpo $(DEPDIR)/thmlwebif.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlwebif.cpp' object='thmlwebif.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlwebif.lo `test -f '$(filtersdir)/thmlwebif.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwebif.cpp
+
+thmlwordjs.lo: $(filtersdir)/thmlwordjs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlwordjs.lo -MD -MP -MF $(DEPDIR)/thmlwordjs.Tpo -c -o thmlwordjs.lo `test -f '$(filtersdir)/thmlwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwordjs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlwordjs.Tpo $(DEPDIR)/thmlwordjs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlwordjs.cpp' object='thmlwordjs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlwordjs.lo `test -f '$(filtersdir)/thmlwordjs.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlwordjs.cpp
+
+gbfthml.lo: $(filtersdir)/gbfthml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfthml.lo -MD -MP -MF $(DEPDIR)/gbfthml.Tpo -c -o gbfthml.lo `test -f '$(filtersdir)/gbfthml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfthml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfthml.Tpo $(DEPDIR)/gbfthml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfthml.cpp' object='gbfthml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfthml.lo `test -f '$(filtersdir)/gbfthml.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfthml.cpp
+
+gbfosis.lo: $(filtersdir)/gbfosis.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gbfosis.lo -MD -MP -MF $(DEPDIR)/gbfosis.Tpo -c -o gbfosis.lo `test -f '$(filtersdir)/gbfosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfosis.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gbfosis.Tpo $(DEPDIR)/gbfosis.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/gbfosis.cpp' object='gbfosis.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gbfosis.lo `test -f '$(filtersdir)/gbfosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/gbfosis.cpp
+
+thmlosis.lo: $(filtersdir)/thmlosis.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlosis.lo -MD -MP -MF $(DEPDIR)/thmlosis.Tpo -c -o thmlosis.lo `test -f '$(filtersdir)/thmlosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlosis.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlosis.Tpo $(DEPDIR)/thmlosis.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlosis.cpp' object='thmlosis.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlosis.lo `test -f '$(filtersdir)/thmlosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlosis.cpp
+
+thmlplain.lo: $(filtersdir)/thmlplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT thmlplain.lo -MD -MP -MF $(DEPDIR)/thmlplain.Tpo -c -o thmlplain.lo `test -f '$(filtersdir)/thmlplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/thmlplain.Tpo $(DEPDIR)/thmlplain.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/thmlplain.cpp' object='thmlplain.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o thmlplain.lo `test -f '$(filtersdir)/thmlplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/thmlplain.cpp
+
+osisosis.lo: $(filtersdir)/osisosis.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT osisosis.lo -MD -MP -MF $(DEPDIR)/osisosis.Tpo -c -o osisosis.lo `test -f '$(filtersdir)/osisosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisosis.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/osisosis.Tpo $(DEPDIR)/osisosis.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/osisosis.cpp' object='osisosis.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o osisosis.lo `test -f '$(filtersdir)/osisosis.cpp' || echo '$(srcdir)/'`$(filtersdir)/osisosis.cpp
+
+rtfhtml.lo: $(filtersdir)/rtfhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rtfhtml.lo -MD -MP -MF $(DEPDIR)/rtfhtml.Tpo -c -o rtfhtml.lo `test -f '$(filtersdir)/rtfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/rtfhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rtfhtml.Tpo $(DEPDIR)/rtfhtml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/rtfhtml.cpp' object='rtfhtml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rtfhtml.lo `test -f '$(filtersdir)/rtfhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/rtfhtml.cpp
+
+greeklexattribs.lo: $(filtersdir)/greeklexattribs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT greeklexattribs.lo -MD -MP -MF $(DEPDIR)/greeklexattribs.Tpo -c -o greeklexattribs.lo `test -f '$(filtersdir)/greeklexattribs.cpp' || echo '$(srcdir)/'`$(filtersdir)/greeklexattribs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/greeklexattribs.Tpo $(DEPDIR)/greeklexattribs.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/greeklexattribs.cpp' object='greeklexattribs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o greeklexattribs.lo `test -f '$(filtersdir)/greeklexattribs.cpp' || echo '$(srcdir)/'`$(filtersdir)/greeklexattribs.cpp
+
+papyriplain.lo: $(filtersdir)/papyriplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT papyriplain.lo -MD -MP -MF $(DEPDIR)/papyriplain.Tpo -c -o papyriplain.lo `test -f '$(filtersdir)/papyriplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/papyriplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/papyriplain.Tpo $(DEPDIR)/papyriplain.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/papyriplain.cpp' object='papyriplain.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o papyriplain.lo `test -f '$(filtersdir)/papyriplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/papyriplain.cpp
+
+teiplain.lo: $(filtersdir)/teiplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teiplain.lo -MD -MP -MF $(DEPDIR)/teiplain.Tpo -c -o teiplain.lo `test -f '$(filtersdir)/teiplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/teiplain.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/teiplain.Tpo $(DEPDIR)/teiplain.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/teiplain.cpp' object='teiplain.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teiplain.lo `test -f '$(filtersdir)/teiplain.cpp' || echo '$(srcdir)/'`$(filtersdir)/teiplain.cpp
+
+teirtf.lo: $(filtersdir)/teirtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teirtf.lo -MD -MP -MF $(DEPDIR)/teirtf.Tpo -c -o teirtf.lo `test -f '$(filtersdir)/teirtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/teirtf.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/teirtf.Tpo $(DEPDIR)/teirtf.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/teirtf.cpp' object='teirtf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teirtf.lo `test -f '$(filtersdir)/teirtf.cpp' || echo '$(srcdir)/'`$(filtersdir)/teirtf.cpp
+
+teihtmlhref.lo: $(filtersdir)/teihtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teihtmlhref.lo -MD -MP -MF $(DEPDIR)/teihtmlhref.Tpo -c -o teihtmlhref.lo `test -f '$(filtersdir)/teihtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/teihtmlhref.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/teihtmlhref.Tpo $(DEPDIR)/teihtmlhref.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/teihtmlhref.cpp' object='teihtmlhref.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teihtmlhref.lo `test -f '$(filtersdir)/teihtmlhref.cpp' || echo '$(srcdir)/'`$(filtersdir)/teihtmlhref.cpp
+
+teixhtml.lo: $(filtersdir)/teixhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT teixhtml.lo -MD -MP -MF $(DEPDIR)/teixhtml.Tpo -c -o teixhtml.lo `test -f '$(filtersdir)/teixhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/teixhtml.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/teixhtml.Tpo $(DEPDIR)/teixhtml.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(filtersdir)/teixhtml.cpp' object='teixhtml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o teixhtml.lo `test -f '$(filtersdir)/teixhtml.cpp' || echo '$(srcdir)/'`$(filtersdir)/teixhtml.cpp
+
+swgenbook.lo: $(genbookdir)/swgenbook.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swgenbook.lo -MD -MP -MF $(DEPDIR)/swgenbook.Tpo -c -o swgenbook.lo `test -f '$(genbookdir)/swgenbook.cpp' || echo '$(srcdir)/'`$(genbookdir)/swgenbook.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swgenbook.Tpo $(DEPDIR)/swgenbook.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(genbookdir)/swgenbook.cpp' object='swgenbook.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swgenbook.lo `test -f '$(genbookdir)/swgenbook.cpp' || echo '$(srcdir)/'`$(genbookdir)/swgenbook.cpp
+
+rawgenbook.lo: $(rawgenbookdir)/rawgenbook.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawgenbook.lo -MD -MP -MF $(DEPDIR)/rawgenbook.Tpo -c -o rawgenbook.lo `test -f '$(rawgenbookdir)/rawgenbook.cpp' || echo '$(srcdir)/'`$(rawgenbookdir)/rawgenbook.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawgenbook.Tpo $(DEPDIR)/rawgenbook.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawgenbookdir)/rawgenbook.cpp' object='rawgenbook.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawgenbook.lo `test -f '$(rawgenbookdir)/rawgenbook.cpp' || echo '$(srcdir)/'`$(rawgenbookdir)/rawgenbook.cpp
+
+swtext.lo: $(textsdir)/swtext.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swtext.lo -MD -MP -MF $(DEPDIR)/swtext.Tpo -c -o swtext.lo `test -f '$(textsdir)/swtext.cpp' || echo '$(srcdir)/'`$(textsdir)/swtext.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swtext.Tpo $(DEPDIR)/swtext.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(textsdir)/swtext.cpp' object='swtext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swtext.lo `test -f '$(textsdir)/swtext.cpp' || echo '$(srcdir)/'`$(textsdir)/swtext.cpp
+
+rawtext.lo: $(rawtextdir)/rawtext.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawtext.lo -MD -MP -MF $(DEPDIR)/rawtext.Tpo -c -o rawtext.lo `test -f '$(rawtextdir)/rawtext.cpp' || echo '$(srcdir)/'`$(rawtextdir)/rawtext.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawtext.Tpo $(DEPDIR)/rawtext.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawtextdir)/rawtext.cpp' object='rawtext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawtext.lo `test -f '$(rawtextdir)/rawtext.cpp' || echo '$(srcdir)/'`$(rawtextdir)/rawtext.cpp
+
+rawtext4.lo: $(rawtext4dir)/rawtext4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawtext4.lo -MD -MP -MF $(DEPDIR)/rawtext4.Tpo -c -o rawtext4.lo `test -f '$(rawtext4dir)/rawtext4.cpp' || echo '$(srcdir)/'`$(rawtext4dir)/rawtext4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawtext4.Tpo $(DEPDIR)/rawtext4.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawtext4dir)/rawtext4.cpp' object='rawtext4.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawtext4.lo `test -f '$(rawtext4dir)/rawtext4.cpp' || echo '$(srcdir)/'`$(rawtext4dir)/rawtext4.cpp
+
+ztext.lo: $(ztextdir)/ztext.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ztext.lo -MD -MP -MF $(DEPDIR)/ztext.Tpo -c -o ztext.lo `test -f '$(ztextdir)/ztext.cpp' || echo '$(srcdir)/'`$(ztextdir)/ztext.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ztext.Tpo $(DEPDIR)/ztext.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(ztextdir)/ztext.cpp' object='ztext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ztext.lo `test -f '$(ztextdir)/ztext.cpp' || echo '$(srcdir)/'`$(ztextdir)/ztext.cpp
+
+swcom.lo: $(commentsdir)/swcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swcom.lo -MD -MP -MF $(DEPDIR)/swcom.Tpo -c -o swcom.lo `test -f '$(commentsdir)/swcom.cpp' || echo '$(srcdir)/'`$(commentsdir)/swcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swcom.Tpo $(DEPDIR)/swcom.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(commentsdir)/swcom.cpp' object='swcom.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swcom.lo `test -f '$(commentsdir)/swcom.cpp' || echo '$(srcdir)/'`$(commentsdir)/swcom.cpp
+
+rawcom.lo: $(rawcomdir)/rawcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawcom.lo -MD -MP -MF $(DEPDIR)/rawcom.Tpo -c -o rawcom.lo `test -f '$(rawcomdir)/rawcom.cpp' || echo '$(srcdir)/'`$(rawcomdir)/rawcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawcom.Tpo $(DEPDIR)/rawcom.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawcomdir)/rawcom.cpp' object='rawcom.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawcom.lo `test -f '$(rawcomdir)/rawcom.cpp' || echo '$(srcdir)/'`$(rawcomdir)/rawcom.cpp
+
+rawcom4.lo: $(rawcom4dir)/rawcom4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawcom4.lo -MD -MP -MF $(DEPDIR)/rawcom4.Tpo -c -o rawcom4.lo `test -f '$(rawcom4dir)/rawcom4.cpp' || echo '$(srcdir)/'`$(rawcom4dir)/rawcom4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawcom4.Tpo $(DEPDIR)/rawcom4.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawcom4dir)/rawcom4.cpp' object='rawcom4.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawcom4.lo `test -f '$(rawcom4dir)/rawcom4.cpp' || echo '$(srcdir)/'`$(rawcom4dir)/rawcom4.cpp
+
+rawfiles.lo: $(rawfilesdir)/rawfiles.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawfiles.lo -MD -MP -MF $(DEPDIR)/rawfiles.Tpo -c -o rawfiles.lo `test -f '$(rawfilesdir)/rawfiles.cpp' || echo '$(srcdir)/'`$(rawfilesdir)/rawfiles.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawfiles.Tpo $(DEPDIR)/rawfiles.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawfilesdir)/rawfiles.cpp' object='rawfiles.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawfiles.lo `test -f '$(rawfilesdir)/rawfiles.cpp' || echo '$(srcdir)/'`$(rawfilesdir)/rawfiles.cpp
+
+zcom.lo: $(zcomdir)/zcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zcom.lo -MD -MP -MF $(DEPDIR)/zcom.Tpo -c -o zcom.lo `test -f '$(zcomdir)/zcom.cpp' || echo '$(srcdir)/'`$(zcomdir)/zcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/zcom.Tpo $(DEPDIR)/zcom.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(zcomdir)/zcom.cpp' object='zcom.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zcom.lo `test -f '$(zcomdir)/zcom.cpp' || echo '$(srcdir)/'`$(zcomdir)/zcom.cpp
+
+hrefcom.lo: $(hrefcomdir)/hrefcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hrefcom.lo -MD -MP -MF $(DEPDIR)/hrefcom.Tpo -c -o hrefcom.lo `test -f '$(hrefcomdir)/hrefcom.cpp' || echo '$(srcdir)/'`$(hrefcomdir)/hrefcom.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hrefcom.Tpo $(DEPDIR)/hrefcom.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(hrefcomdir)/hrefcom.cpp' object='hrefcom.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hrefcom.lo `test -f '$(hrefcomdir)/hrefcom.cpp' || echo '$(srcdir)/'`$(hrefcomdir)/hrefcom.cpp
+
+swld.lo: $(lexdictdir)/swld.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT swld.lo -MD -MP -MF $(DEPDIR)/swld.Tpo -c -o swld.lo `test -f '$(lexdictdir)/swld.cpp' || echo '$(srcdir)/'`$(lexdictdir)/swld.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/swld.Tpo $(DEPDIR)/swld.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(lexdictdir)/swld.cpp' object='swld.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o swld.lo `test -f '$(lexdictdir)/swld.cpp' || echo '$(srcdir)/'`$(lexdictdir)/swld.cpp
+
+rawld.lo: $(rawlddir)/rawld.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawld.lo -MD -MP -MF $(DEPDIR)/rawld.Tpo -c -o rawld.lo `test -f '$(rawlddir)/rawld.cpp' || echo '$(srcdir)/'`$(rawlddir)/rawld.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawld.Tpo $(DEPDIR)/rawld.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawlddir)/rawld.cpp' object='rawld.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawld.lo `test -f '$(rawlddir)/rawld.cpp' || echo '$(srcdir)/'`$(rawlddir)/rawld.cpp
+
+rawld4.lo: $(rawld4dir)/rawld4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT rawld4.lo -MD -MP -MF $(DEPDIR)/rawld4.Tpo -c -o rawld4.lo `test -f '$(rawld4dir)/rawld4.cpp' || echo '$(srcdir)/'`$(rawld4dir)/rawld4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/rawld4.Tpo $(DEPDIR)/rawld4.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(rawld4dir)/rawld4.cpp' object='rawld4.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rawld4.lo `test -f '$(rawld4dir)/rawld4.cpp' || echo '$(srcdir)/'`$(rawld4dir)/rawld4.cpp
+
+zld.lo: $(zlddir)/zld.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zld.lo -MD -MP -MF $(DEPDIR)/zld.Tpo -c -o zld.lo `test -f '$(zlddir)/zld.cpp' || echo '$(srcdir)/'`$(zlddir)/zld.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/zld.Tpo $(DEPDIR)/zld.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(zlddir)/zld.cpp' object='zld.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zld.lo `test -f '$(zlddir)/zld.cpp' || echo '$(srcdir)/'`$(zlddir)/zld.cpp
+
+flatapi.lo: $(bindingsdir)/flatapi.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT flatapi.lo -MD -MP -MF $(DEPDIR)/flatapi.Tpo -c -o flatapi.lo `test -f '$(bindingsdir)/flatapi.cpp' || echo '$(srcdir)/'`$(bindingsdir)/flatapi.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/flatapi.Tpo $(DEPDIR)/flatapi.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(bindingsdir)/flatapi.cpp' object='flatapi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o flatapi.lo `test -f '$(bindingsdir)/flatapi.cpp' || echo '$(srcdir)/'`$(bindingsdir)/flatapi.cpp
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
+	done
+
+uninstall-pkgincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-pkgincludeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgincludeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-pkgincludeHEADERS install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-libLTLIBRARIES \
+	uninstall-pkgincludeHEADERS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/lib/README b/lib/README
new file mode 100644
index 0000000..5b46484
--- /dev/null
+++ b/lib/README
@@ -0,0 +1,2 @@
+This is where the API Libraries will reside after a
+successful build.
diff --git a/lib/bcppmake/libsword.bdsproj b/lib/bcppmake/libsword.bdsproj
new file mode 100644
index 0000000..4f1abda
--- /dev/null
+++ b/lib/bcppmake/libsword.bdsproj
@@ -0,0 +1,689 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+	<PersonalityInfo>

+		<Option>

+			<Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+			<Option Name="ProjectType">CppStaticLibrary</Option>

+			<Option Name="Version">1.0</Option>

+			<Option Name="GUID">{42E205EF-ACE1-43B1-B144-7CC5BFF5A26A}</Option>

+		</Option>

+	</PersonalityInfo>

+	<CPlusPlusBuilder.Personality>

+		<BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="libsword.lib"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.Gn.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="UNICODE"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.4" value="USBINARY"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.6" value="USELUCENE"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.7" value="_WIN32"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.9" value="CURLAVAILABLE"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.10" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.11" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.12" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.13" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.14" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.15" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.16" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.17" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.18" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.19" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.20" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.21" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.22" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.23" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.24" value="..\..\..\icu-sword\source\common"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.26" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.27" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.28" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.29" value="..\..\..\icu-sword\source\i18n"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.30" value="..\..\..\biblecs\clucene\src"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.32" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.9" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tW.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="UNICODE"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.4" value="USBINARY"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.6" value="USELUCENE"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.7" value="_WIN32"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.10" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.11" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.12" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.13" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.14" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.15" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.16" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.17" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.18" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.19" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.20" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.21" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.22" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.23" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.24" value="..\..\..\icu-sword\source\common"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.26" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.27" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.28" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.29" value="..\..\..\icu-sword\source\i18n"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.30" value="..\..\..\biblecs\clucene\src"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.32" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.7" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.8" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.9" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.10" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.11" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.13" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.14" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.15" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.16" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.17" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.18" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.19" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.2" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.20" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.21" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.22" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.23" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.3" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.4" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.5" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.6" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.7" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.8" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.9" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.10" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.11" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.13" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.14" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.15" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.16" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.17" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.18" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.19" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.2" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.20" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.21" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.22" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.23" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.3" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.4" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.5" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.6" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.7" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.8" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.9" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.10" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.11" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.13" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.14" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.15" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.16" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.17" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.18" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.19" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.2" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.20" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.21" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.22" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.23" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.3" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.4" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.5" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.6" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.7" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.8" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.9" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.10" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.11" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.12" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.13" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.14" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.15" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.16" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.17" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.18" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.19" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.20" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.21" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.22" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.23" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.24" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.25" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.26" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.5" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.6" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.7" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.8" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.9" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="UNICODE"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.4" value="USBINARY"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.6" value="USELUCENE"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.7" value="_WIN32"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.10" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.11" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.12" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.13" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.14" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.15" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.16" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.17" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.18" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.19" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.20" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.21" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.22" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.23" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.24" value="..\..\..\icu-sword\source\common"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.26" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.27" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.28" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.29" value="..\..\..\icu-sword\source\i18n"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.30" value="..\..\..\biblecs\clucene\src"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.8" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.9" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.tie.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="$(BDS)\lib\psdk"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="UNICODE"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.4" value="USBINARY"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.6" value="USELUCENE"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.7" value="_WIN32"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.8" value="_CL_DISABLE_MULTITHREADING"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\..\src\modules\tests"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.10" value="..\..\src\modules\texts"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.11" value="..\..\src\modules\lexdict\rawld"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.12" value="..\..\src\modules\lexdict"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.13" value="..\..\src\modules\filters"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.14" value="..\..\src\modules\common"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.15" value="..\..\src\modules\comments\rawfiles"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.16" value="..\..\src\modules\comments\rawcom"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.17" value="..\..\src\modules\comments\hrefcom"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.18" value="..\..\src\modules\comments"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.19" value="..\..\src\modules"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="..\..\src\utilfuns\zlib"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.20" value="..\..\src\frontend"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.21" value="..\..\src\utilfuns"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.22" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.23" value="..\..\src\keys"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.24" value="..\..\..\icu-sword\source\common"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.25" value="..\..\apps\windoze\CBuilder5\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.26" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.27" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.28" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.29" value="..\..\..\icu-sword\source\i18n"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\src\modules\lexdict\zld"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.30" value="..\..\..\biblecs\clucene\src"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.31" value="..\..\..\biblecs\apps\InstallMgr\curl\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.32" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\src\modules\lexdict\rawld4"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="..\..\src\modules\comments\zcom"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="..\..\src\modules\genbook\rawgenbook"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.7" value="..\..\src\modules\genbook"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.8" value="..\..\src\modules\texts\ztext"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.9" value="..\..\src\modules\texts\rawtext"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+          <property category="win32.*.win32b.tlib" name="option.P.arg" value="512"/>

+          <property category="win32.*.win32b.tlib" name="option.P.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tlib" name="option.P.enabled" value="1"/>

+          <property category="win32.*.win32b.tlib" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tlib" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tlib" name="option.outputdir.enabled" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="libsword.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\frontend\swdisp.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swdisp" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\frontend\swlog.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swlog" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\keys\versekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="versekey" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\keys\strkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="strkey" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\keys\swkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swkey" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\keys\treekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="treekey" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\keys\treekeyidx.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="treekeyidx" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\keys\listkey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="listkey" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\swsearchable.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swsearchable" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\encfiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="encfiltmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\filemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="filemgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\ftptrans.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftptrans" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\installmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\localemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="localemgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\markupfiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="markupfiltmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\stringmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="stringmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\swcacher.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcacher" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\swconfig.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swconfig" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\swfiltermgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swfiltermgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\swlocale.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swlocale" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\swmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\mgr\curlftpt.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="curlftpt" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\utilxml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utilxml" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\roman.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="roman" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\swbuf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swbuf" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\swobject.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swobject" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\swversion.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swversion" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\url.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="url" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\utilstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utilstr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\Greek2Greek.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="Greek2Greek" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\comments\hrefcom\hrefcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="hrefcom" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\comments\rawcom\rawcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawcom" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\comments\rawfiles\rawfiles.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawfiles" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\comments\zcom\zcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zcom" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\comments\swcom.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcom" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\zverse.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zverse" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\entriesblk.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="entriesblk" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\lzsscomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="lzsscomprs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\rawstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawstr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\rawstr4.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawstr4" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\rawverse.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawverse" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\sapphire.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="sapphire" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\swcipher.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcipher" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\swcomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swcomprs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\zipcomprs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zipcomprs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\common\zstr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zstr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8utf16.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8utf16" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbffootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbffootnotes" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfheadings" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfhtml" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfhtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfhtmlhref" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfmorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfmorph" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfosis" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfplain" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfredletterwords.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfredletterwords" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfrtf" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfstrongs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfthml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfthml" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\gbfwebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfwebif" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\greeklexattribs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="greeklexattribs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\latin1utf16.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="latin1utf16" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\latin1utf8.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="latin1utf8" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisfootnotes" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisheadings" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osishtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osishtmlhref" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osislemma.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osislemma" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osismorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osismorph" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisosis" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisplain" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisredletterwords.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisredletterwords" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisrtf" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisscripref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisscripref" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osisstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osisstrongs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osiswebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiswebif" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osiswordjs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiswordjs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\plainfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="plainfootnotes" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\plainhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="plainhtml" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\rtfhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rtfhtml" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\swbasicfilter.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swbasicfilter" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\swoptfilter.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swoptfilter" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlfootnotes.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlfootnotes" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlgbf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlgbf" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlheadings.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlheadings" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlhtml.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlhtml" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlhtmlhref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlhtmlhref" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmllemma.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmllemma" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlmorph.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlmorph" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlosis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlosis" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlplain" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlrtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlrtf" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlscripref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlscripref" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlstrongs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlstrongs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlvariants.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlvariants" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlwebif.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlwebif" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\thmlwordjs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlwordjs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\unicodertf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="unicodertf" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf16utf8.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf16utf8" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8arshaping.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8arshaping" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8bidireorder.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8bidireorder" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8cantillation.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8cantillation" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8greekaccents.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8greekaccents" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8hebrewpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8hebrewpoints" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8arabicpoints.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8arabicpoints" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8html.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8html" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8latin1.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8latin1" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8nfc.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8nfc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8nfkd.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8nfkd" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\utf8transliterator.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="utf8transliterator" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\cipherfil.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cipherfil" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawgenbook" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\genbook\swgenbook.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swgenbook" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\lexdict\rawld\rawld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawld" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\lexdict\rawld4\rawld4.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawld4" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\lexdict\zld\zld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zld" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\lexdict\swld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swld" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\tests\echomod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="echomod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\texts\rawtext\rawtext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="rawtext" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\texts\ztext\ztext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ztext" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\texts\swtext.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swtext" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\swmodule.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="swmodule" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\zutil.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="zutil" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\compress.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="compress" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\crc32.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="crc32" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\deflate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="deflate" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\gzio.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gzio" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\infblock.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infblock" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\infcodes.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infcodes" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\inffast.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inffast" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\inflate.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inflate" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\inftrees.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="inftrees" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\infutil.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="infutil" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\maketree.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="maketree" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\trees.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="trees" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\uncompr.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="uncompr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\untgz.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="untgz" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\zlib\adler32.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="adler32" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\papyriplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="papyriplain" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\utilfuns\ftpparse.c" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="ftpparse" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\osismorphsegmentation.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osismorphsegmentation" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\keys\versetreekey.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="versetreekey" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\teiplain.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="teiplain" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\src\modules\filters\teirtf.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="teirtf" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">20</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item4">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item5">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item6">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item7">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item8">..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item9">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item10">..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item11">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item12">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item13">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item14">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item15">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item16">..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item17">..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item18">..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item19">..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">7</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item5">..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item6">..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">22</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item2">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item3">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item4">_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item5">_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item6">__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item7">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item8">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item9">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item10">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item11">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item12">_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item13">_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item14">_ICU_;_ICUSWORD_;USBINARY;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item15">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item16">_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item17">_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item18">;USBINARY;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item19">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item20">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item21">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <HistoryLists_hlFinalOutputDir>

+          <HistoryLists_hlFinalOutputDir Name="Count">3</HistoryLists_hlFinalOutputDir>

+          <HistoryLists_hlFinalOutputDir Name="Item0">..\</HistoryLists_hlFinalOutputDir>

+          <HistoryLists_hlFinalOutputDir Name="Item1">../\</HistoryLists_hlFinalOutputDir>

+          <HistoryLists_hlFinalOutputDir Name="Item2">../</HistoryLists_hlFinalOutputDir>

+        </HistoryLists_hlFinalOutputDir>

+        <HistoryLists_hlTlibPageSize>

+          <HistoryLists_hlTlibPageSize Name="Count">5</HistoryLists_hlTlibPageSize>

+          <HistoryLists_hlTlibPageSize Name="Item0">0x0200</HistoryLists_hlTlibPageSize>

+          <HistoryLists_hlTlibPageSize Name="Item1">0x0080</HistoryLists_hlTlibPageSize>

+          <HistoryLists_hlTlibPageSize Name="Item2">0x0040</HistoryLists_hlTlibPageSize>

+          <HistoryLists_hlTlibPageSize Name="Item3">0x0020</HistoryLists_hlTlibPageSize>

+          <HistoryLists_hlTlibPageSize Name="Item4">0x0010</HistoryLists_hlTlibPageSize>

+        </HistoryLists_hlTlibPageSize>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+		<Source>

+			<Source Name="MainSource">libsword.bpf</Source>

+		</Source>  <buildevents/>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/lib/bcppmake/libsword.bpf b/lib/bcppmake/libsword.bpf
new file mode 100644
index 0000000..bbb5e27
--- /dev/null
+++ b/lib/bcppmake/libsword.bpf
@@ -0,0 +1,168 @@
+
+//---------------------------------------------------------------------------
+
+//#include <vcl.h>
+#pragma hdrstop
+
+USEUNIT("..\..\src\frontend\swdisp.cpp");
+USEUNIT("..\..\src\frontend\swlog.cpp");
+USEUNIT("..\..\src\keys\versekey.cpp");
+USEUNIT("..\..\src\keys\strkey.cpp");
+USEUNIT("..\..\src\keys\swkey.cpp");
+USEUNIT("..\..\src\keys\treekey.cpp");
+USEUNIT("..\..\src\keys\treekeyidx.cpp");
+USEUNIT("..\..\src\keys\listkey.cpp");
+USEUNIT("..\..\src\mgr\swsearchable.cpp");
+USEUNIT("..\..\src\mgr\encfiltmgr.cpp");
+USEUNIT("..\..\src\mgr\filemgr.cpp");
+USEUNIT("..\..\src\mgr\installmgr.cpp");
+USEUNIT("..\..\src\mgr\localemgr.cpp");
+USEUNIT("..\..\src\mgr\markupfiltmgr.cpp");
+USEUNIT("..\..\src\mgr\stringmgr.cpp");
+USEUNIT("..\..\src\mgr\swcacher.cpp");
+USEUNIT("..\..\src\mgr\swconfig.cpp");
+USEUNIT("..\..\src\mgr\swfiltermgr.cpp");
+USEUNIT("..\..\src\mgr\swlocale.cpp");
+USEUNIT("..\..\src\mgr\swmgr.cpp");
+USEUNIT("..\..\src\mgr\curlftpt.cpp");
+USEUNIT("..\..\src\utilfuns\utilxml.cpp");
+USEUNIT("..\..\src\utilfuns\roman.cpp");
+USEUNIT("..\..\src\utilfuns\swbuf.cpp");
+USEUNIT("..\..\src\utilfuns\swobject.cpp");
+USEUNIT("..\..\src\utilfuns\swversion.cpp");
+USEUNIT("..\..\src\utilfuns\url.cpp");
+USEUNIT("..\..\src\utilfuns\utilstr.cpp");
+USEUNIT("..\..\src\modules\comments\hrefcom\hrefcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawcom\rawcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawfiles\rawfiles.cpp");
+USEUNIT("..\..\src\modules\comments\zcom\zcom.cpp");
+USEUNIT("..\..\src\modules\comments\swcom.cpp");
+USEUNIT("..\..\src\modules\common\zverse.cpp");
+USEUNIT("..\..\src\modules\common\entriesblk.cpp");
+USEUNIT("..\..\src\modules\common\lzsscomprs.cpp");
+USEUNIT("..\..\src\modules\common\rawstr.cpp");
+USEUNIT("..\..\src\modules\common\rawstr4.cpp");
+USEUNIT("..\..\src\modules\common\rawverse.cpp");
+USEUNIT("..\..\src\modules\common\sapphire.cpp");
+USEUNIT("..\..\src\modules\common\swcipher.cpp");
+USEUNIT("..\..\src\modules\common\swcomprs.cpp");
+USEUNIT("..\..\src\modules\common\zipcomprs.cpp");
+USEUNIT("..\..\src\modules\common\zstr.cpp");
+USEUNIT("..\..\src\modules\filters\utf8utf16.cpp");
+USEUNIT("..\..\src\modules\filters\gbffootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\gbfheadings.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\gbfmorph.cpp");
+USEUNIT("..\..\src\modules\filters\gbfosis.cpp");
+USEUNIT("..\..\src\modules\filters\gbfplain.cpp");
+USEUNIT("..\..\src\modules\filters\gbfredletterwords.cpp");
+USEUNIT("..\..\src\modules\filters\gbfrtf.cpp");
+USEUNIT("..\..\src\modules\filters\gbfstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\gbfthml.cpp");
+USEUNIT("..\..\src\modules\filters\gbfwebif.cpp");
+USEUNIT("..\..\src\modules\filters\greeklexattribs.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf16.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf8.cpp");
+USEUNIT("..\..\src\modules\filters\osisfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\osisheadings.cpp");
+USEUNIT("..\..\src\modules\filters\osishtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\osislemma.cpp");
+USEUNIT("..\..\src\modules\filters\osismorph.cpp");
+USEUNIT("..\..\src\modules\filters\osisosis.cpp");
+USEUNIT("..\..\src\modules\filters\osisplain.cpp");
+USEUNIT("..\..\src\modules\filters\osisredletterwords.cpp");
+USEUNIT("..\..\src\modules\filters\osisrtf.cpp");
+USEUNIT("..\..\src\modules\filters\osisscripref.cpp");
+USEUNIT("..\..\src\modules\filters\osisstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\osiswebif.cpp");
+USEUNIT("..\..\src\modules\filters\osiswordjs.cpp");
+USEUNIT("..\..\src\modules\filters\rtfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\swbasicfilter.cpp");
+USEUNIT("..\..\src\modules\filters\swoptfilter.cpp");
+USEUNIT("..\..\src\modules\filters\thmlfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\thmlgbf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlheadings.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtml.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\thmllemma.cpp");
+USEUNIT("..\..\src\modules\filters\thmlmorph.cpp");
+USEUNIT("..\..\src\modules\filters\thmlosis.cpp");
+USEUNIT("..\..\src\modules\filters\thmlplain.cpp");
+USEUNIT("..\..\src\modules\filters\thmlrtf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlscripref.cpp");
+USEUNIT("..\..\src\modules\filters\thmlstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\thmlvariants.cpp");
+USEUNIT("..\..\src\modules\filters\thmlwebif.cpp");
+USEUNIT("..\..\src\modules\filters\thmlwordjs.cpp");
+USEUNIT("..\..\src\modules\filters\unicodertf.cpp");
+USEUNIT("..\..\src\modules\filters\utf16utf8.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arshaping.cpp");
+USEUNIT("..\..\src\modules\filters\utf8bidireorder.cpp");
+USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
+USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
+USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8html.cpp");
+USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfkd.cpp");
+USEUNIT("..\..\src\modules\filters\utf8transliterator.cpp");
+USEUNIT("..\..\src\modules\filters\cipherfil.cpp");
+USEUNIT("..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp");
+USEUNIT("..\..\src\modules\genbook\swgenbook.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld\rawld.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld4\rawld4.cpp");
+USEUNIT("..\..\src\modules\lexdict\zld\zld.cpp");
+USEUNIT("..\..\src\modules\lexdict\swld.cpp");
+USEUNIT("..\..\src\modules\tests\echomod.cpp");
+USEUNIT("..\..\src\modules\texts\rawtext\rawtext.cpp");
+USEUNIT("..\..\src\modules\texts\ztext\ztext.cpp");
+USEUNIT("..\..\src\modules\texts\swtext.cpp");
+USEUNIT("..\..\src\modules\swmodule.cpp");
+USEUNIT("..\..\src\utilfuns\zlib\zutil.c");
+USEUNIT("..\..\src\utilfuns\zlib\compress.c");
+USEUNIT("..\..\src\utilfuns\zlib\crc32.c");
+USEUNIT("..\..\src\utilfuns\zlib\deflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\inffast.c");
+USEUNIT("..\..\src\utilfuns\zlib\inflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\inftrees.c");
+USEUNIT("..\..\src\utilfuns\zlib\trees.c");
+USEUNIT("..\..\src\utilfuns\zlib\uncompr.c");
+USEUNIT("..\..\src\utilfuns\zlib\untgz.c");
+USEUNIT("..\..\src\utilfuns\zlib\adler32.c");
+USEUNIT("..\..\src\modules\filters\papyriplain.cpp");
+USEUNIT("..\..\src\utilfuns\ftpparse.c");
+USEUNIT("..\..\src\modules\filters\osismorphsegmentation.cpp");
+USEUNIT("..\..\src\keys\versetreekey.cpp");
+USEUNIT("..\..\src\modules\filters\teiplain.cpp");
+USEUNIT("..\..\src\modules\filters\teirtf.cpp");
+USEUNIT("..\..\src\modules\texts\rawtext4\rawtext4.cpp");
+USEUNIT("..\..\src\modules\comments\rawcom4\rawcom4.cpp");
+USEUNIT("..\..\src\modules\common\rawverse4.cpp");
+USEUNIT("..\..\src\modules\filters\teihtmlhref.cpp");
+USEUNIT("..\..\src\mgr\curlhttpt.cpp");
+USEUNIT("..\..\src\modules\filters\gbfxhtml.cpp");
+USEUNIT("..\..\src\modules\filters\osisxhtml.cpp");
+USEUNIT("..\..\src\modules\filters\thmlxhtml.cpp");
+USEUNIT("..\..\src\modules\filters\teixhtml.cpp");
+USEUNIT("..\..\src\mgr\remotetrans.cpp");
+USEUNIT("..\..\src\modules\filters\osisglosses.cpp");
+USEUNIT("..\..\src\modules\filters\osisenum.cpp");
+USEUNIT("..\..\src\utilfuns\zlib\gzclose.c");
+USEUNIT("..\..\src\utilfuns\zlib\gzlib.c");
+USEUNIT("..\..\src\utilfuns\zlib\gzread.c");
+USEUNIT("..\..\src\utilfuns\zlib\gzwrite.c");
+USEUNIT("..\..\src\utilfuns\zlib\infback.c");
+USEUNIT("..\..\src\mgr\versificationmgr.cpp");
+USEUNIT("..\..\src\modules\common\xzcomprs.cpp");
+USEUNIT("..\..\src\modules\common\bz2comprs.cpp");
+USEUNIT("..\..\src\modules\filters\osisvariants.cpp");
+USEUNIT("..\..\src\modules\filters\osisxlit.cpp");
+USEUNIT("..\..\src\modules\filters\osisreferencelinks.cpp");
+USEUNIT("..\..\src\modules\filters\scsuutf8.cpp");
+//---------------------------------------------------------------------------
+#define Library
+
+// To add a file to the library use the Project menu 'Add to Project'.
+
diff --git a/lib/bcppmake/libsword.bpr b/lib/bcppmake/libsword.bpr
new file mode 100644
index 0000000..e2cccb6
--- /dev/null
+++ b/lib/bcppmake/libsword.bpr
@@ -0,0 +1,312 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="..\libsword.lib"/>
+    <OBJFILES value="..\..\src\frontend\swdisp.obj ..\..\src\frontend\swlog.obj 
+      ..\..\src\keys\versekey.obj ..\..\src\keys\strkey.obj 
+      ..\..\src\keys\swkey.obj ..\..\src\keys\treekey.obj 
+      ..\..\src\keys\treekeyidx.obj ..\..\src\keys\listkey.obj 
+      ..\..\src\mgr\swsearchable.obj ..\..\src\mgr\encfiltmgr.obj 
+      ..\..\src\mgr\filemgr.obj ..\..\src\mgr\installmgr.obj 
+      ..\..\src\mgr\localemgr.obj ..\..\src\mgr\markupfiltmgr.obj 
+      ..\..\src\mgr\stringmgr.obj ..\..\src\mgr\swcacher.obj 
+      ..\..\src\mgr\swconfig.obj ..\..\src\mgr\swfiltermgr.obj 
+      ..\..\src\mgr\swlocale.obj ..\..\src\mgr\swmgr.obj 
+      ..\..\src\mgr\curlftpt.obj ..\..\src\utilfuns\utilxml.obj 
+      ..\..\src\utilfuns\roman.obj ..\..\src\utilfuns\swbuf.obj 
+      ..\..\src\utilfuns\swobject.obj 
+      ..\..\src\utilfuns\swversion.obj ..\..\src\utilfuns\url.obj 
+      ..\..\src\utilfuns\utilstr.obj 
+      ..\..\src\modules\comments\hrefcom\hrefcom.obj 
+      ..\..\src\modules\comments\rawcom\rawcom.obj 
+      ..\..\src\modules\comments\rawfiles\rawfiles.obj 
+      ..\..\src\modules\comments\zcom\zcom.obj 
+      ..\..\src\modules\comments\swcom.obj ..\..\src\modules\common\zverse.obj 
+      ..\..\src\modules\common\entriesblk.obj 
+      ..\..\src\modules\common\lzsscomprs.obj 
+      ..\..\src\modules\common\rawstr.obj ..\..\src\modules\common\rawstr4.obj 
+      ..\..\src\modules\common\rawverse.obj 
+      ..\..\src\modules\common\sapphire.obj ..\..\src\modules\common\swcipher.obj 
+      ..\..\src\modules\common\swcomprs.obj 
+      ..\..\src\modules\common\zipcomprs.obj ..\..\src\modules\common\zstr.obj 
+      ..\..\src\modules\filters\utf8utf16.obj 
+      ..\..\src\modules\filters\gbffootnotes.obj 
+      ..\..\src\modules\filters\gbfheadings.obj 
+      ..\..\src\modules\filters\gbfhtml.obj 
+      ..\..\src\modules\filters\gbfhtmlhref.obj 
+      ..\..\src\modules\filters\gbfmorph.obj 
+      ..\..\src\modules\filters\gbfosis.obj 
+      ..\..\src\modules\filters\gbfplain.obj 
+      ..\..\src\modules\filters\gbfredletterwords.obj 
+      ..\..\src\modules\filters\gbfrtf.obj 
+      ..\..\src\modules\filters\gbfstrongs.obj 
+      ..\..\src\modules\filters\gbfthml.obj 
+      ..\..\src\modules\filters\gbfwebif.obj 
+      ..\..\src\modules\filters\greeklexattribs.obj 
+      ..\..\src\modules\filters\latin1utf16.obj 
+      ..\..\src\modules\filters\latin1utf8.obj 
+      ..\..\src\modules\filters\osisfootnotes.obj 
+      ..\..\src\modules\filters\osisheadings.obj 
+      ..\..\src\modules\filters\osishtmlhref.obj 
+      ..\..\src\modules\filters\osislemma.obj 
+      ..\..\src\modules\filters\osismorph.obj 
+      ..\..\src\modules\filters\osisosis.obj 
+      ..\..\src\modules\filters\osisplain.obj 
+      ..\..\src\modules\filters\osisredletterwords.obj 
+      ..\..\src\modules\filters\osisrtf.obj 
+      ..\..\src\modules\filters\osisscripref.obj 
+      ..\..\src\modules\filters\osisstrongs.obj 
+      ..\..\src\modules\filters\osiswebif.obj 
+      ..\..\src\modules\filters\osiswordjs.obj 
+      ..\..\src\modules\filters\rtfhtml.obj 
+      ..\..\src\modules\filters\swbasicfilter.obj 
+      ..\..\src\modules\filters\swoptfilter.obj 
+      ..\..\src\modules\filters\thmlfootnotes.obj 
+      ..\..\src\modules\filters\thmlgbf.obj 
+      ..\..\src\modules\filters\thmlheadings.obj 
+      ..\..\src\modules\filters\thmlhtml.obj 
+      ..\..\src\modules\filters\thmlhtmlhref.obj 
+      ..\..\src\modules\filters\thmllemma.obj 
+      ..\..\src\modules\filters\thmlmorph.obj 
+      ..\..\src\modules\filters\thmlosis.obj 
+      ..\..\src\modules\filters\thmlplain.obj 
+      ..\..\src\modules\filters\thmlrtf.obj 
+      ..\..\src\modules\filters\thmlscripref.obj 
+      ..\..\src\modules\filters\thmlstrongs.obj 
+      ..\..\src\modules\filters\thmlvariants.obj 
+      ..\..\src\modules\filters\thmlwebif.obj 
+      ..\..\src\modules\filters\thmlwordjs.obj 
+      ..\..\src\modules\filters\unicodertf.obj 
+      ..\..\src\modules\filters\utf16utf8.obj 
+      ..\..\src\modules\filters\utf8arshaping.obj 
+      ..\..\src\modules\filters\utf8bidireorder.obj 
+      ..\..\src\modules\filters\utf8cantillation.obj 
+      ..\..\src\modules\filters\utf8greekaccents.obj 
+      ..\..\src\modules\filters\utf8hebrewpoints.obj 
+      ..\..\src\modules\filters\utf8arabicpoints.obj 
+      ..\..\src\modules\filters\utf8html.obj 
+      ..\..\src\modules\filters\utf8latin1.obj 
+      ..\..\src\modules\filters\utf8nfc.obj 
+      ..\..\src\modules\filters\utf8nfkd.obj 
+      ..\..\src\modules\filters\utf8transliterator.obj 
+      ..\..\src\modules\filters\cipherfil.obj 
+      ..\..\src\modules\genbook\rawgenbook\rawgenbook.obj 
+      ..\..\src\modules\genbook\swgenbook.obj 
+      ..\..\src\modules\lexdict\rawld\rawld.obj 
+      ..\..\src\modules\lexdict\rawld4\rawld4.obj 
+      ..\..\src\modules\lexdict\zld\zld.obj ..\..\src\modules\lexdict\swld.obj 
+      ..\..\src\modules\tests\echomod.obj 
+      ..\..\src\modules\texts\rawtext\rawtext.obj 
+      ..\..\src\modules\texts\ztext\ztext.obj ..\..\src\modules\texts\swtext.obj 
+      ..\..\src\modules\swmodule.obj ..\..\src\utilfuns\zlib\zutil.obj 
+      ..\..\src\utilfuns\zlib\compress.obj ..\..\src\utilfuns\zlib\crc32.obj 
+      ..\..\src\utilfuns\zlib\deflate.obj ..\..\src\utilfuns\zlib\inffast.obj 
+      ..\..\src\utilfuns\zlib\inflate.obj ..\..\src\utilfuns\zlib\inftrees.obj 
+      ..\..\src\utilfuns\zlib\trees.obj ..\..\src\utilfuns\zlib\uncompr.obj 
+      ..\..\src\utilfuns\zlib\untgz.obj ..\..\src\utilfuns\zlib\adler32.obj 
+      ..\..\src\modules\filters\papyriplain.obj ..\..\src\utilfuns\ftpparse.obj 
+      ..\..\src\modules\filters\osismorphsegmentation.obj 
+      ..\..\src\keys\versetreekey.obj ..\..\src\modules\filters\teiplain.obj 
+      ..\..\src\modules\filters\teirtf.obj 
+      ..\..\src\modules\texts\rawtext4\rawtext4.obj 
+      ..\..\src\modules\comments\rawcom4\rawcom4.obj 
+      ..\..\src\modules\common\rawverse4.obj 
+      ..\..\src\modules\filters\teihtmlhref.obj ..\..\src\mgr\curlhttpt.obj 
+      ..\..\src\modules\filters\gbfxhtml.obj 
+      ..\..\src\modules\filters\osisxhtml.obj 
+      ..\..\src\modules\filters\thmlxhtml.obj 
+      ..\..\src\modules\filters\teixhtml.obj ..\..\src\mgr\remotetrans.obj 
+      ..\..\src\modules\filters\osisglosses.obj 
+      ..\..\src\modules\filters\osisenum.obj ..\..\src\utilfuns\zlib\gzclose.obj 
+      ..\..\src\utilfuns\zlib\gzlib.obj ..\..\src\utilfuns\zlib\gzread.obj 
+      ..\..\src\utilfuns\zlib\gzwrite.obj ..\..\src\utilfuns\zlib\infback.obj 
+      ..\..\src\mgr\versificationmgr.obj ..\..\src\modules\common\xzcomprs.obj 
+      ..\..\src\modules\common\bz2comprs.obj 
+      ..\..\src\modules\filters\osisvariants.obj 
+      ..\..\src\modules\filters\osisxlit.obj 
+      ..\..\src\modules\filters\scsuutf8.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value=""/>
+    <LIBRARIES value=""/>
+    <PACKAGES value=""/>
+    <PATHCPP value=".;..\..\src\frontend;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\zcom;..\..\src\modules\comments;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict;..\..\src\modules\tests;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\texts;..\..\src\modules;..\..\src\utilfuns\zlib;..\..\src\modules\texts\rawtext4;..\..\src\modules\comments\rawcom4"/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <LINKER value="TLib"/>
+    <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT"/>
+    <SYSDEFINES value="NO_STRICT"/>
+    <MAINSOURCE value="libsword.bpf"/>
+    <INCLUDEPATH value="..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/>
+    <LIBPATH value="..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+    <LISTFILE value=""/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\..\src\modules\comments\rawcom4 -I..\..\src\modules\texts\rawtext4 
+      -I..\..\src\modules\tests -I..\..\src\utilfuns\zlib 
+      -I..\..\src\modules\lexdict\zld -I..\..\src\modules\lexdict\rawld4 
+      -I..\..\src\modules\comments\zcom -I..\..\src\modules\genbook\rawgenbook 
+      -I..\..\src\modules\genbook -I..\..\src\modules\texts\ztext 
+      -I..\..\src\modules\texts\rawtext -I..\..\src\modules\texts 
+      -I..\..\src\modules\lexdict\rawld -I..\..\src\modules\lexdict 
+      -I..\..\src\modules\filters -I..\..\src\modules\common 
+      -I..\..\src\modules\comments\rawfiles -I..\..\src\modules\comments\rawcom 
+      -I..\..\src\modules\comments\hrefcom -I..\..\src\modules\comments 
+      -I..\..\src\modules -I..\..\src\frontend -I..\..\src\utilfuns 
+      -I..\..\src\mgr -I..\..\src\keys -I..\..\..\icu-sword\source\common 
+      -I..\..\apps\windoze\CBuilder5\InstallMgr\curl\include -I..\..\include 
+      -I..\..\include\internal\regex -I$(BCB)\include -I$(BCB)\include\vcl 
+      -I..\..\..\icu-sword\source\i18n -I..\..\..\biblecs\clucene\src 
+      -I..\..\..\biblecs\apps\InstallMgr\curl\include -src_suffix cpp -DUNICODE 
+      -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE 
+      -D_WIN32 -D_CL_DISABLE_MULTITHREADING -DCURLAVAILABLE 
+      -DLUCENE_ENABLE_REFCOUNT -no_tie -boa"/>
+    <CFLAG1 value="-O2 -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="/P1024"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="$(OBJFILES)"/>
+    <ALLLIB value="cg32.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=22
+Item0=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include
+Item1=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include
+Item2=..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include
+Item3=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include
+Item4=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src
+Item5=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src
+Item6=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n
+Item7=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item8=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item9=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item10=..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item11=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item12=..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item13=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item14=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item15=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item16=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common
+Item17=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item18=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item19=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item20=..\include;$(BCB)\include;$(BCB)\include\vcl
+Item21=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=8
+Item0=..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item3=$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item6=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item7=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=25
+Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT
+Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG
+Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE
+Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item5=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item6=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE
+Item7=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item8=_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item9=__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item10=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item11=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item12=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item13=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
+Item14=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item15=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
+Item16=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
+Item17=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item18=_ICU_;_ICUSWORD_;USBINARY
+Item19=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG
+Item20=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE
+Item21=;USBINARY;_DEBUG
+Item22=_ICU_;_ICUSWORD_
+Item23=_ICU_;_ICUSWORD_;_DEBUG
+Item24=_DEBUG
+
+[HistoryLists\hlFinalOutputDir]
+Count=3
+Item0=..\
+Item1=../\
+Item2=../
+
+[HistoryLists\hlTlibPageSize]
+Count=7
+Item0=0x0400
+Item1=1024
+Item2=0x0200
+Item3=0x0080
+Item4=0x0040
+Item5=0x0020
+Item6=0x0010
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
diff --git a/lib/bcppmake/libsword6icu.bpf b/lib/bcppmake/libsword6icu.bpf
new file mode 100644
index 0000000..45ed548
--- /dev/null
+++ b/lib/bcppmake/libsword6icu.bpf
@@ -0,0 +1,124 @@
+//---------------------------------------------------------------------------
+
+//#include <vcl.h>
+#pragma hdrstop
+USEUNIT("..\..\src\keys\versekey.cpp");
+USEUNIT("..\..\src\keys\strkey.cpp");
+USEUNIT("..\..\src\keys\swkey.cpp");
+USEUNIT("..\..\src\keys\listkey.cpp");
+USEUNIT("..\..\src\mgr\swmgr.cpp");
+USEUNIT("..\..\src\mgr\localemgr.cpp");
+USEUNIT("..\..\src\mgr\swconfig.cpp");
+USEUNIT("..\..\src\mgr\swlocale.cpp");
+USEUNIT("..\..\src\mgr\filemgr.cpp");
+USEUNIT("..\..\src\utilfuns\utilstr.cpp");
+USEUNIT("..\..\src\utilfuns\utilconf.cpp");
+USEUNIT("..\..\src\utilfuns\Greek2Greek.cpp");
+USEUNIT("..\..\src\frontend\swlog.cpp");
+USEUNIT("..\..\src\frontend\swdisp.cpp");
+USEUNIT("..\..\src\modules\swmodule.cpp");
+USEUNIT("..\..\src\modules\comments\swcom.cpp");
+USEUNIT("..\..\src\modules\comments\hrefcom\hrefcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawcom\rawcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawfiles\rawfiles.cpp");
+USEUNIT("..\..\src\modules\common\lzsscomprs.cpp");
+USEUNIT("..\..\src\modules\common\rawstr.cpp");
+USEUNIT("..\..\src\modules\common\rawverse.cpp");
+USEUNIT("..\..\src\modules\common\sapphire.cpp");
+USEUNIT("..\..\src\modules\common\swcipher.cpp");
+USEUNIT("..\..\src\modules\common\swcomprs.cpp");
+USEUNIT("..\..\src\modules\filters\thmlrtf.cpp");
+USEUNIT("..\..\src\modules\filters\gbffootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\gbfplain.cpp");
+USEUNIT("..\..\src\modules\filters\gbfrtf.cpp");
+USEUNIT("..\..\src\modules\filters\gbfstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\gbfthml.cpp");
+USEUNIT("..\..\src\modules\filters\plainfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\plainhtml.cpp");
+USEUNIT("..\..\src\modules\filters\rtfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\rwphtml.cpp");
+USEUNIT("..\..\src\modules\filters\rwprtf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlgbf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtml.cpp");
+USEUNIT("..\..\src\modules\filters\thmlplain.cpp");
+USEUNIT("..\..\src\modules\filters\cipherfil.cpp");
+USEUNIT("..\..\src\modules\lexdict\swld.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld\rawld.cpp");
+USEUNIT("..\..\src\modules\texts\swtext.cpp");
+USEUNIT("..\..\src\modules\texts\rawtext\rawtext.cpp");
+USEUNIT("..\..\src\modules\texts\ztext\ztext.cpp");
+USEUNIT("..\..\src\modules\common\zverse.cpp");
+USEUNIT("..\..\src\keys\treekey.cpp");
+USEUNIT("..\..\src\keys\treekeyidx.cpp");
+USEUNIT("..\..\src\modules\common\rawstr4.cpp");
+USEUNIT("..\..\src\modules\common\zstr.cpp");
+USEUNIT("..\..\src\modules\genbook\swgenbook.cpp");
+USEUNIT("..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp");
+USEUNIT("..\..\src\mgr\swfiltermgr.cpp");
+USEUNIT("..\..\src\modules\filters\utf8utf16.cpp");
+USEUNIT("..\..\src\modules\filters\gbfheadings.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\gbfmorph.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf16.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf8.cpp");
+USEUNIT("..\..\src\modules\filters\swbasicfilter.cpp");
+USEUNIT("..\..\src\modules\filters\thmlfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\thmlheadings.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\thmllemma.cpp");
+USEUNIT("..\..\src\modules\filters\thmlmorph.cpp");
+USEUNIT("..\..\src\modules\filters\thmlscripref.cpp");
+USEUNIT("..\..\src\modules\filters\thmlstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\thmlvariants.cpp");
+USEUNIT("..\..\src\modules\filters\unicodertf.cpp");
+USEUNIT("..\..\src\modules\filters\utf16utf8.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arshaping.cpp");
+USEUNIT("..\..\src\modules\filters\utf8bidireorder.cpp");
+USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
+USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
+USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8html.cpp");
+USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfkd.cpp");
+USEUNIT("..\..\src\modules\filters\utf8transliterator.cpp");
+USEUNIT("..\..\src\modules\comments\zcom\zcom.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld4\rawld4.cpp");
+USEUNIT("..\..\src\modules\common\zipcomprs.cpp");
+USEUNIT("..\..\src\modules\lexdict\zld\zld.cpp");
+USEUNIT("..\..\src\modules\common\entriesblk.cpp");
+USEUNIT("..\..\src\utilfuns\zlib\zutil.c");
+USEUNIT("..\..\src\utilfuns\zlib\compress.c");
+USEUNIT("..\..\src\utilfuns\zlib\crc32.c");
+USEUNIT("..\..\src\utilfuns\zlib\deflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\gzio.c");
+USEUNIT("..\..\src\utilfuns\zlib\infblock.c");
+USEUNIT("..\..\src\utilfuns\zlib\infcodes.c");
+USEUNIT("..\..\src\utilfuns\zlib\inffast.c");
+USEUNIT("..\..\src\utilfuns\zlib\inflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\inftrees.c");
+USEUNIT("..\..\src\utilfuns\zlib\infutil.c");
+USEUNIT("..\..\src\utilfuns\zlib\trees.c");
+USEUNIT("..\..\src\utilfuns\zlib\uncompr.c");
+USEUNIT("..\..\src\utilfuns\zlib\untgz.c");
+USEUNIT("..\..\src\utilfuns\zlib\adler32.c");
+USEUNIT("..\..\src\modules\filters\greeklexattribs.cpp");
+USEUNIT("..\..\src\mgr\swcacher.cpp");
+USEUNIT("..\..\src\modules\filters\gbfosis.cpp");
+USEUNIT("..\..\src\modules\filters\thmlosis.cpp");
+USEUNIT("..\..\src\mgr\encfiltmgr.cpp");
+USEUNIT("..\..\src\mgr\markupfiltmgr.cpp");
+USEUNIT("..\..\src\utilfuns\roman.cpp");
+USEUNIT("..\..\src\mgr\swsourcemgr.cpp");
+USEUNIT("..\..\src\mgr\installmgr.cpp");
+USEUNIT("..\..\src\utilfuns\ftpparse.c");
+USEUNIT("..\..\src\modules\filters\osisstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\osismorph.cpp");
+USEUNIT("..\..\src\modules\filters\gbfredletterwords.cpp");
+//---------------------------------------------------------------------------
+#define Library
+
+// To add a file to the library use the Project menu 'Add to Project'.
+
diff --git a/lib/bcppmake/libsword6icu.bpr b/lib/bcppmake/libsword6icu.bpr
new file mode 100644
index 0000000..4c87f2a
--- /dev/null
+++ b/lib/bcppmake/libsword6icu.bpr
@@ -0,0 +1,351 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.06.00"/>
+    <PROJECT value="..\libsword6icu.lib"/>
+    <OBJFILES value="..\..\obj\versekey.obj ..\..\obj\strkey.obj ..\..\obj\swkey.obj 
+      ..\..\obj\listkey.obj ..\..\obj\swmgr.obj ..\..\obj\localemgr.obj 
+      ..\..\obj\swconfig.obj ..\..\obj\swlocale.obj ..\..\obj\filemgr.obj 
+      ..\..\obj\utilstr.obj ..\..\obj\Greek2Greek.obj ..\..\obj\swlog.obj 
+      ..\..\obj\swdisp.obj ..\..\obj\swmodule.obj ..\..\obj\swcom.obj 
+      ..\..\obj\hrefcom.obj ..\..\obj\rawcom.obj ..\..\obj\rawfiles.obj 
+      ..\..\obj\lzsscomprs.obj ..\..\obj\rawstr.obj ..\..\obj\rawverse.obj 
+      ..\..\obj\sapphire.obj ..\..\obj\swcipher.obj ..\..\obj\swcomprs.obj 
+      ..\..\obj\thmlrtf.obj ..\..\obj\gbffootnotes.obj ..\..\obj\gbfhtml.obj 
+      ..\..\obj\gbfplain.obj ..\..\obj\gbfrtf.obj ..\..\obj\gbfstrongs.obj 
+      ..\..\obj\gbfthml.obj ..\..\obj\plainfootnotes.obj ..\..\obj\plainhtml.obj 
+      ..\..\obj\rtfhtml.obj ..\..\obj\thmlgbf.obj ..\..\obj\thmlhtml.obj 
+      ..\..\obj\thmlplain.obj ..\..\obj\cipherfil.obj ..\..\obj\swld.obj 
+      ..\..\obj\rawld.obj ..\..\obj\swtext.obj ..\..\obj\rawtext.obj 
+      ..\..\obj\ztext.obj ..\..\obj\zverse.obj ..\..\obj\treekey.obj 
+      ..\..\obj\treekeyidx.obj ..\..\obj\rawstr4.obj ..\..\obj\zstr.obj 
+      ..\..\obj\swgenbook.obj ..\..\obj\rawgenbook.obj ..\..\obj\swfiltermgr.obj 
+      ..\..\obj\utf8utf16.obj ..\..\obj\gbfheadings.obj 
+      ..\..\obj\gbfhtmlhref.obj ..\..\obj\gbfmorph.obj ..\..\obj\latin1utf16.obj 
+      ..\..\obj\latin1utf8.obj 
+      ..\..\obj\swbasicfilter.obj ..\..\obj\thmlfootnotes.obj 
+      ..\..\obj\thmlheadings.obj ..\..\obj\thmlhtmlhref.obj 
+      ..\..\obj\thmllemma.obj ..\..\obj\thmlmorph.obj ..\..\obj\thmlscripref.obj 
+      ..\..\obj\thmlstrongs.obj ..\..\obj\thmlvariants.obj 
+      ..\..\obj\unicodertf.obj ..\..\obj\utf16utf8.obj 
+      ..\..\obj\utf8arshaping.obj ..\..\obj\utf8bidireorder.obj 
+      ..\..\obj\utf8cantillation.obj ..\..\obj\utf8greekaccents.obj 
+      ..\..\obj\utf8hebrewpoints.obj ..\..\obj\utf8html.obj 
+      ...\..\obj\utf8arabicpoints.obj 
+      ..\..\obj\utf8latin1.obj ..\..\obj\utf8nfc.obj ..\..\obj\utf8nfkd.obj 
+      ..\..\obj\utf8transliterator.obj ..\..\obj\zcom.obj ..\..\obj\rawld4.obj 
+      ..\..\obj\zipcomprs.obj ..\..\obj\zld.obj ..\..\obj\entriesblk.obj 
+      ..\..\obj\zutil.obj ..\..\obj\compress.obj ..\..\obj\crc32.obj 
+      ..\..\obj\deflate.obj ..\..\obj\gzio.obj ..\..\obj\infblock.obj 
+      ..\..\obj\infcodes.obj ..\..\obj\inffast.obj ..\..\obj\inflate.obj 
+      ..\..\obj\inftrees.obj ..\..\obj\infutil.obj ..\..\obj\trees.obj 
+      ..\..\obj\uncompr.obj ..\..\obj\untgz.obj ..\..\obj\adler32.obj 
+      ..\..\obj\greeklexattribs.obj ..\..\obj\swcacher.obj ..\..\obj\gbfosis.obj 
+      ..\..\obj\thmlosis.obj ..\..\obj\encfiltmgr.obj 
+      ..\..\obj\markupfiltmgr.obj ..\..\obj\roman.obj ..\..\obj\ftpparse.obj 
+      ..\..\obj\osisstrongs.obj ..\..\obj\osismorph.obj 
+      ..\..\obj\gbfredletterwords.obj ..\..\obj\osisheadings.obj 
+      ..\..\obj\swbuf.obj ..\..\obj\utilxml.obj ..\..\obj\osisplain.obj 
+      ..\..\obj\osisrtf.obj ..\..\obj\thmlwebif.obj ..\..\obj\gbfwebif.obj 
+      ..\..\obj\osisfootnotes.obj ..\..\obj\osisscripref.obj 
+      ..\..\obj\swoptfilter.obj ..\..\obj\osislemma.obj 
+      ..\..\obj\osisredletterwords.obj ..\..\obj\osishtmlhref.obj 
+      ..\..\obj\swsearchable.obj ..\..\obj\osiswebif.obj ..\..\obj\osisosis.obj 
+      ..\..\obj\stringmgr.obj ..\..\obj\swversion.obj ..\..\obj\url.obj 
+      ..\..\obj\swobject.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value=""/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value=""/>
+    <PATHCPP value=".;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\frontend;..\..\src\modules;..\..\src\modules\comments;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\lexdict;..\..\src\modules\lexdict\rawld;..\..\src\modules\texts;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\genbook;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\comments\zcom;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\utilfuns\zlib"/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <LINKER value="TLib"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
+    <SYSDEFINES value="NO_STRICT"/>
+    <MAINSOURCE value="libsword6icu.bpf"/>
+    <INCLUDEPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>
+    <LIBPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+    <LISTFILE value=""/>
+    <OTHERFILES value=""/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\..\src\utilfuns\zlib -I..\..\src\modules\lexdict\zld 
+      -I..\..\src\modules\lexdict\rawld4 -I..\..\src\modules\comments\zcom 
+      -I..\..\src\modules\genbook\rawgenbook -I..\..\src\modules\genbook 
+      -I..\..\src\modules\texts\ztext -I..\..\src\modules\texts\rawtext 
+      -I..\..\src\modules\texts -I..\..\src\modules\lexdict\rawld 
+      -I..\..\src\modules\lexdict -I..\..\src\modules\filters 
+      -I..\..\src\modules\common -I..\..\src\modules\comments\rawfiles 
+      -I..\..\src\modules\comments\rawcom -I..\..\src\modules\comments\hrefcom 
+      -I..\..\src\modules\comments -I..\..\src\modules -I..\..\src\frontend 
+      -I..\..\src\utilfuns -I..\..\src\mgr -I..\..\src\keys 
+      -I..\..\..\icu-sword\include 
+      -I..\..\apps\windoze\CBuilder5\InstallMgr\curl\include -I..\..\include 
+      -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_ICUSWORD_ 
+      -DUSBINARY -boa"/>
+    <CFLAG1 value="-Od -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-N2..\..\obj -N0..\..\obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="/P512"/>
+    <OTHERFILES value=""/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="$(OBJFILES)"/>
+    <ALLLIB value="cg32.lib"/>
+    <OTHERFILES value=""/>
+  </LINKER>
+  <FILELIST>
+      <FILE FILENAME="libsword6icu.bpf" FORMNAME="" UNITNAME="libsword" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\keys\versekey.cpp" FORMNAME="" UNITNAME="versekey" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\keys\strkey.cpp" FORMNAME="" UNITNAME="strkey" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\keys\swkey.cpp" FORMNAME="" UNITNAME="swkey" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\keys\listkey.cpp" FORMNAME="" UNITNAME="listkey" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\swmgr.cpp" FORMNAME="" UNITNAME="swmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\localemgr.cpp" FORMNAME="" UNITNAME="localemgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\swconfig.cpp" FORMNAME="" UNITNAME="swconfig" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\swlocale.cpp" FORMNAME="" UNITNAME="swlocale" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\filemgr.cpp" FORMNAME="" UNITNAME="filemgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\utilstr.cpp" FORMNAME="" UNITNAME="utilstr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\Greek2Greek.cpp" FORMNAME="" UNITNAME="Greek2Greek" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\frontend\swlog.cpp" FORMNAME="" UNITNAME="swlog" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\frontend\swdisp.cpp" FORMNAME="" UNITNAME="swdisp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\swmodule.cpp" FORMNAME="" UNITNAME="swmodule" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\comments\swcom.cpp" FORMNAME="" UNITNAME="swcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\comments\hrefcom\hrefcom.cpp" FORMNAME="" UNITNAME="hrefcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\comments\rawcom\rawcom.cpp" FORMNAME="" UNITNAME="rawcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\comments\rawfiles\rawfiles.cpp" FORMNAME="" UNITNAME="rawfiles" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\lzsscomprs.cpp" FORMNAME="" UNITNAME="lzsscomprs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\rawstr.cpp" FORMNAME="" UNITNAME="rawstr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\rawverse.cpp" FORMNAME="" UNITNAME="rawverse" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\sapphire.cpp" FORMNAME="" UNITNAME="sapphire" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\swcipher.cpp" FORMNAME="" UNITNAME="swcipher" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\swcomprs.cpp" FORMNAME="" UNITNAME="swcomprs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlrtf.cpp" FORMNAME="" UNITNAME="thmlrtf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbffootnotes.cpp" FORMNAME="" UNITNAME="gbffootnotes" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfhtml.cpp" FORMNAME="" UNITNAME="gbfhtml" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfplain.cpp" FORMNAME="" UNITNAME="gbfplain" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfrtf.cpp" FORMNAME="" UNITNAME="gbfrtf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfstrongs.cpp" FORMNAME="" UNITNAME="gbfstrongs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfthml.cpp" FORMNAME="" UNITNAME="gbfthml" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\plainfootnotes.cpp" FORMNAME="" UNITNAME="plainfootnotes" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\plainhtml.cpp" FORMNAME="" UNITNAME="plainhtml" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\rtfhtml.cpp" FORMNAME="" UNITNAME="rtfhtml" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlgbf.cpp" FORMNAME="" UNITNAME="thmlgbf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlhtml.cpp" FORMNAME="" UNITNAME="thmlhtml" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlplain.cpp" FORMNAME="" UNITNAME="thmlplain" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\cipherfil.cpp" FORMNAME="" UNITNAME="cipherfil" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\lexdict\swld.cpp" FORMNAME="" UNITNAME="swld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\lexdict\rawld\rawld.cpp" FORMNAME="" UNITNAME="rawld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\texts\swtext.cpp" FORMNAME="" UNITNAME="swtext" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\texts\rawtext\rawtext.cpp" FORMNAME="" UNITNAME="rawtext" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\texts\ztext\ztext.cpp" FORMNAME="" UNITNAME="ztext" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\zverse.cpp" FORMNAME="" UNITNAME="zverse" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\keys\treekey.cpp" FORMNAME="" UNITNAME="treekey" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\keys\treekeyidx.cpp" FORMNAME="" UNITNAME="treekeyidx" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\rawstr4.cpp" FORMNAME="" UNITNAME="rawstr4" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\zstr.cpp" FORMNAME="" UNITNAME="zstr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\genbook\swgenbook.cpp" FORMNAME="" UNITNAME="swgenbook" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp" FORMNAME="" UNITNAME="rawgenbook" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\swfiltermgr.cpp" FORMNAME="" UNITNAME="swfiltermgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8utf16.cpp" FORMNAME="" UNITNAME="utf8utf16" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfheadings.cpp" FORMNAME="" UNITNAME="gbfheadings" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfhtmlhref.cpp" FORMNAME="" UNITNAME="gbfhtmlhref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfmorph.cpp" FORMNAME="" UNITNAME="gbfmorph" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\latin1utf16.cpp" FORMNAME="" UNITNAME="latin1utf16" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\latin1utf8.cpp" FORMNAME="" UNITNAME="latin1utf8" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\swbasicfilter.cpp" FORMNAME="" UNITNAME="swbasicfilter" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlfootnotes.cpp" FORMNAME="" UNITNAME="thmlfootnotes" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlheadings.cpp" FORMNAME="" UNITNAME="thmlheadings" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlhtmlhref.cpp" FORMNAME="" UNITNAME="thmlhtmlhref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmllemma.cpp" FORMNAME="" UNITNAME="thmllemma" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlmorph.cpp" FORMNAME="" UNITNAME="thmlmorph" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlscripref.cpp" FORMNAME="" UNITNAME="thmlscripref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlstrongs.cpp" FORMNAME="" UNITNAME="thmlstrongs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlvariants.cpp" FORMNAME="" UNITNAME="thmlvariants" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\unicodertf.cpp" FORMNAME="" UNITNAME="unicodertf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf16utf8.cpp" FORMNAME="" UNITNAME="utf16utf8" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8arshaping.cpp" FORMNAME="" UNITNAME="utf8arshaping" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8bidireorder.cpp" FORMNAME="" UNITNAME="utf8bidireorder" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8cantillation.cpp" FORMNAME="" UNITNAME="utf8cantillation" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8greekaccents.cpp" FORMNAME="" UNITNAME="utf8greekaccents" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8hebrewpoints.cpp" FORMNAME="" UNITNAME="utf8hebrewpoints" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8arabicpoints.cpp" FORMNAME="" UNITNAME="utf8arabicpoints" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8html.cpp" FORMNAME="" UNITNAME="utf8html" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8latin1.cpp" FORMNAME="" UNITNAME="utf8latin1" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8nfc.cpp" FORMNAME="" UNITNAME="utf8nfc" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8nfkd.cpp" FORMNAME="" UNITNAME="utf8nfkd" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\utf8transliterator.cpp" FORMNAME="" UNITNAME="utf8transliterator" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\comments\zcom\zcom.cpp" FORMNAME="" UNITNAME="zcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\lexdict\rawld4\rawld4.cpp" FORMNAME="" UNITNAME="rawld4" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\zipcomprs.cpp" FORMNAME="" UNITNAME="zipcomprs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\lexdict\zld\zld.cpp" FORMNAME="" UNITNAME="zld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\common\entriesblk.cpp" FORMNAME="" UNITNAME="entriesblk" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\zutil.c" FORMNAME="" UNITNAME="zutil" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\compress.c" FORMNAME="" UNITNAME="compress" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\crc32.c" FORMNAME="" UNITNAME="crc32" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\deflate.c" FORMNAME="" UNITNAME="deflate" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\gzio.c" FORMNAME="" UNITNAME="gzio" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\infblock.c" FORMNAME="" UNITNAME="infblock" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\infcodes.c" FORMNAME="" UNITNAME="infcodes" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\inffast.c" FORMNAME="" UNITNAME="inffast" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\inflate.c" FORMNAME="" UNITNAME="inflate" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\inftrees.c" FORMNAME="" UNITNAME="inftrees" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\infutil.c" FORMNAME="" UNITNAME="infutil" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\trees.c" FORMNAME="" UNITNAME="trees" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\uncompr.c" FORMNAME="" UNITNAME="uncompr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\untgz.c" FORMNAME="" UNITNAME="untgz" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\zlib\adler32.c" FORMNAME="" UNITNAME="adler32" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\greeklexattribs.cpp" FORMNAME="" UNITNAME="greeklexattribs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\swcacher.cpp" FORMNAME="" UNITNAME="swcacher" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfosis.cpp" FORMNAME="" UNITNAME="gbfosis" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlosis.cpp" FORMNAME="" UNITNAME="thmlosis" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\encfiltmgr.cpp" FORMNAME="" UNITNAME="encfiltmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\markupfiltmgr.cpp" FORMNAME="" UNITNAME="markupfiltmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\roman.cpp" FORMNAME="" UNITNAME="roman" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\ftpparse.c" FORMNAME="" UNITNAME="ftpparse" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisstrongs.cpp" FORMNAME="" UNITNAME="osisstrongs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osismorph.cpp" FORMNAME="" UNITNAME="osismorph" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfredletterwords.cpp" FORMNAME="" UNITNAME="gbfredletterwords" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisheadings.cpp" FORMNAME="" UNITNAME="osisheadings" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\swbuf.cpp" FORMNAME="" UNITNAME="swbuf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\utilxml.cpp" FORMNAME="" UNITNAME="utilxml" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisplain.cpp" FORMNAME="" UNITNAME="osisplain" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisrtf.cpp" FORMNAME="" UNITNAME="osisrtf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\thmlwebif.cpp" FORMNAME="" UNITNAME="thmlwebif" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\gbfwebif.cpp" FORMNAME="" UNITNAME="gbfwebif" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisfootnotes.cpp" FORMNAME="" UNITNAME="osisfootnotes.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisscripref.cpp" FORMNAME="" UNITNAME="osisscripref.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\swoptfilter.cpp" FORMNAME="" UNITNAME="swoptfilter.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osislemma.cpp" FORMNAME="" UNITNAME="osislemma.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisredletterwords.cpp" FORMNAME="" UNITNAME="osisredletterwords.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osishtmlhref.cpp" FORMNAME="" UNITNAME="osishtmlhref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\swsearchable.cpp" FORMNAME="" UNITNAME="swsearchable" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osiswebif.cpp" FORMNAME="" UNITNAME="osiswebif" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\modules\filters\osisosis.cpp" FORMNAME="" UNITNAME="osisosis" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\mgr\stringmgr.cpp" FORMNAME="" UNITNAME="stringmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\swversion.cpp" FORMNAME="" UNITNAME="swversion" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\url.cpp" FORMNAME="" UNITNAME="url" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\src\utilfuns\swobject.cpp" FORMNAME="" UNITNAME="swobject" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+  </FILELIST>
+  <BUILDTOOLS>
+  </BUILDTOOLS>
+
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=15
+Item0=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item1=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\..\icu-sword\include;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item4=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item5=..\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item6=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item7=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item8=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item9=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common
+Item10=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item11=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item12=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item13=..\include;$(BCB)\include;$(BCB)\include\vcl
+Item14=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=6
+Item0=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item1=$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\apps\windoze;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=9
+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0
+Item2=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL
+Item3=_ICU_;_ICUSWORD_;USBINARY
+Item4=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item5=;USBINARY;_DEBUG
+Item6=_ICU_;_ICUSWORD_
+Item7=_ICU_;_ICUSWORD_;_DEBUG
+Item8=_DEBUG
+
+[HistoryLists\hlIntOutputDir]
+Count=2
+Item0=..\..\obj
+Item1=obj
+
+[HistoryLists\hlFinalOutputDir]
+Count=3
+Item0=..\
+Item1=../\
+Item2=../
+
+[HistoryLists\hlTlibPageSize]
+Count=5
+Item0=0x0200
+Item1=0x0080
+Item2=0x0040
+Item3=0x0020
+Item4=0x0010
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+Launcher=
+UseLauncher=0
+DebugCWD=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteLauncher=
+RemoteCWD=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+  </IDEOPTIONS>
+</PROJECT>
diff --git a/lib/vcppmake/libsword.sln b/lib/vcppmake/libsword.sln
new file mode 100644
index 0000000..3a09b7c
--- /dev/null
+++ b/lib/vcppmake/libsword.sln
@@ -0,0 +1,20 @@
+

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2012

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/lib/vcppmake/libsword.vcxproj b/lib/vcppmake/libsword.vcxproj
new file mode 100644
index 0000000..4f38573
--- /dev/null
+++ b/lib/vcppmake/libsword.vcxproj
@@ -0,0 +1,479 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{97449E5E-F880-4D22-933A-0D2FC32034D4}</ProjectGuid>

+    <RootNamespace>libsword</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <AdditionalOptions>/D _CRT_SECURE_NO_DEPRECATE %(AdditionalOptions)</AdditionalOptions>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>.\Debug/libsword.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <CompileAs>Default</CompileAs>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <WarningLevel>Level1</WarningLevel>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>libcurl_a_debug.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-debug-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+      <EnableCOMDATFolding>false</EnableCOMDATFolding>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>../../include;../../include/internal/regex;../../../icu-sword/include;../../src/utilfuns/win32;../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;_ICU_;_ICUSWORD_;WIN32;_LIB;REGEX_MALLOC;SWMAKINGDLL;CURLAVAILABLE;CURL_STATICLIB;USBINARY;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>

+      </StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderOutputFile>.\Release/libsword.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <CompileAs>Default</CompileAs>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <WarningLevel>Level1</WarningLevel>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>libcurl_a.lib;ws2_32.lib;winmm.lib;wldap32.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalLibraryDirectories>../../../curl/builds/libcurl-vc10-x86-release-static-ipv6-sspi-spnego-winssl/lib;../../../icu-sword/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\..\src\mgr\remotetrans.cpp" />

+    <ClCompile Include="..\..\src\mgr\versificationmgr.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\cipherfil.cpp" />

+    <ClCompile Include="..\..\src\mgr\curlftpt.cpp" />

+    <ClCompile Include="..\..\src\mgr\curlhttpt.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisenum.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisglosses.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisxlit.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisreferencelinks.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\scsuutf8.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\win32\dirent.cpp" />

+    <ClCompile Include="..\..\src\mgr\encfiltmgr.cpp" />

+    <ClCompile Include="..\..\src\modules\common\entriesblk.cpp" />

+    <ClCompile Include="..\..\src\mgr\filemgr.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\ftpparse.c" />

+    <ClCompile Include="..\..\src\modules\filters\gbffootnotes.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfheadings.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfhtml.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfhtmlhref.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfmorph.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfosis.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfplain.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfredletterwords.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfrtf.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfstrongs.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfthml.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfwebif.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfwordjs.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\gbfxhtml.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\greeklexattribs.cpp" />

+    <ClCompile Include="..\..\src\modules\comments\hrefcom\hrefcom.cpp" />

+    <ClCompile Include="..\..\src\mgr\installmgr.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\latin1utf16.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\latin1utf8.cpp" />

+    <ClCompile Include="..\..\src\keys\listkey.cpp" />

+    <ClCompile Include="..\..\src\mgr\localemgr.cpp" />

+    <ClCompile Include="..\..\src\modules\common\lzsscomprs.cpp" />

+    <ClCompile Include="..\..\src\mgr\markupfiltmgr.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisfootnotes.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisheadings.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osishtmlhref.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osislemma.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osismorph.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osismorphsegmentation.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisosis.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisplain.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisredletterwords.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisrtf.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisscripref.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisstrongs.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisvariants.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osiswebif.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osiswordjs.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\osisxhtml.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\papyriplain.cpp" />

+    <ClCompile Include="..\..\src\modules\comments\rawcom\rawcom.cpp" />

+    <ClCompile Include="..\..\src\modules\comments\rawcom4\rawcom4.cpp" />

+    <ClCompile Include="..\..\src\modules\comments\rawfiles\rawfiles.cpp" />

+    <ClCompile Include="..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp" />

+    <ClCompile Include="..\..\src\modules\lexdict\rawld\rawld.cpp" />

+    <ClCompile Include="..\..\src\modules\lexdict\rawld4\rawld4.cpp" />

+    <ClCompile Include="..\..\src\modules\common\rawstr.cpp" />

+    <ClCompile Include="..\..\src\modules\common\rawstr4.cpp" />

+    <ClCompile Include="..\..\src\modules\texts\rawtext\rawtext.cpp" />

+    <ClCompile Include="..\..\src\modules\texts\rawtext4\rawtext4.cpp" />

+    <ClCompile Include="..\..\src\modules\common\rawverse.cpp" />

+    <ClCompile Include="..\..\src\modules\common\rawverse4.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\regex.c" />

+    <ClCompile Include="..\..\src\utilfuns\roman.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\rtfhtml.cpp" />

+    <ClCompile Include="..\..\src\modules\common\sapphire.cpp" />

+    <ClCompile Include="..\..\src\mgr\stringmgr.cpp" />

+    <ClCompile Include="..\..\src\keys\strkey.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\swbasicfilter.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\swbuf.cpp" />

+    <ClCompile Include="..\..\src\mgr\swcacher.cpp" />

+    <ClCompile Include="..\..\src\modules\common\swcipher.cpp" />

+    <ClCompile Include="..\..\src\modules\comments\swcom.cpp" />

+    <ClCompile Include="..\..\src\modules\common\swcomprs.cpp" />

+    <ClCompile Include="..\..\src\mgr\swconfig.cpp" />

+    <ClCompile Include="..\..\src\frontend\swdisp.cpp" />

+    <ClCompile Include="..\..\src\mgr\swfiltermgr.cpp" />

+    <ClCompile Include="..\..\src\modules\genbook\swgenbook.cpp" />

+    <ClCompile Include="..\..\src\keys\swkey.cpp" />

+    <ClCompile Include="..\..\src\modules\lexdict\swld.cpp" />

+    <ClCompile Include="..\..\src\mgr\swlocale.cpp" />

+    <ClCompile Include="..\..\src\frontend\swlog.cpp" />

+    <ClCompile Include="..\..\src\mgr\swmgr.cpp" />

+    <ClCompile Include="..\..\src\modules\swmodule.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\swobject.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\swoptfilter.cpp" />

+    <ClCompile Include="..\..\src\mgr\swsearchable.cpp" />

+    <ClCompile Include="..\..\src\modules\texts\swtext.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\swversion.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\teixhtml.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\teihtmlhref.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\teiplain.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\teirtf.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlfootnotes.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlgbf.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlheadings.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlhtml.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlhtmlhref.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmllemma.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlmorph.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlosis.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlplain.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlrtf.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlscripref.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlstrongs.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlvariants.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlwebif.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlwordjs.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\thmlxhtml.cpp" />

+    <ClCompile Include="..\..\src\keys\treekey.cpp" />

+    <ClCompile Include="..\..\src\keys\treekeyidx.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\unicodertf.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\adler32.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\compress.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\crc32.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\deflate.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\gzclose.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\gzlib.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\gzread.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\gzwrite.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\infback.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\inffast.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\inflate.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\inftrees.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\trees.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\uncompr.c" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\untgz.c" />

+    <ClCompile Include="..\..\src\utilfuns\url.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf16utf8.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8arabicpoints.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8arshaping.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8bidireorder.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8cantillation.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8greekaccents.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8hebrewpoints.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8html.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8latin1.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8nfc.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8nfkd.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8transliterator.cpp" />

+    <ClCompile Include="..\..\src\modules\filters\utf8utf16.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\utilstr.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\utilxml.cpp" />

+    <ClCompile Include="..\..\src\keys\versekey.cpp" />

+    <ClCompile Include="..\..\src\keys\versetreekey.cpp" />

+    <ClCompile Include="..\..\src\modules\comments\zcom\zcom.cpp" />

+    <ClCompile Include="..\..\src\modules\common\zipcomprs.cpp" />

+    <ClCompile Include="..\..\src\modules\common\bz2comprs.cpp" />

+    <ClCompile Include="..\..\src\modules\common\xzcomprs.cpp" />

+    <ClCompile Include="..\..\src\modules\lexdict\zld\zld.cpp" />

+    <ClCompile Include="..\..\src\modules\common\zstr.cpp" />

+    <ClCompile Include="..\..\src\modules\texts\ztext\ztext.cpp" />

+    <ClCompile Include="..\..\src\modules\common\zverse.cpp" />

+    <ClCompile Include="..\..\src\utilfuns\zlib\zutil.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\..\include\canon.h" />

+    <ClInclude Include="..\..\include\canon_abbrevs.h" />

+    <ClInclude Include="..\..\include\canon_catholic.h" />

+    <ClInclude Include="..\..\include\canon_catholic2.h" />

+    <ClInclude Include="..\..\include\canon_german.h" />

+    <ClInclude Include="..\..\include\canon_kjva.h" />

+    <ClInclude Include="..\..\include\canon_leningrad.h" />

+    <ClInclude Include="..\..\include\canon_luther.h" />

+    <ClInclude Include="..\..\include\canon_lxx.h" />

+    <ClInclude Include="..\..\include\canon_mt.h" />

+    <ClInclude Include="..\..\include\canon_nrsv.h" />

+    <ClInclude Include="..\..\include\canon_nrsva.h" />

+    <ClInclude Include="..\..\include\canon_null.h" />

+    <ClInclude Include="..\..\include\canon_orthodox.h" />

+    <ClInclude Include="..\..\include\canon_synodal.h" />

+    <ClInclude Include="..\..\include\canon_synodalprot.h" />

+    <ClInclude Include="..\..\include\canon_vulg.h" />

+    <ClInclude Include="..\..\include\cipherfil.h" />

+    <ClInclude Include="..\..\include\curlftpt.h" />

+    <ClInclude Include="..\..\include\curlhttpt.h" />

+    <ClInclude Include="..\..\include\defs.h" />

+    <ClInclude Include="..\..\include\encfiltmgr.h" />

+    <ClInclude Include="..\..\include\entriesblk.h" />

+    <ClInclude Include="..\..\include\filemgr.h" />

+    <ClInclude Include="..\..\include\flatapi.h" />

+    <ClInclude Include="..\..\include\ftplib.h" />

+    <ClInclude Include="..\..\include\ftplibftpt.h" />

+    <ClInclude Include="..\..\include\ftpparse.h" />

+    <ClInclude Include="..\..\include\gbffootnotes.h" />

+    <ClInclude Include="..\..\include\gbfheadings.h" />

+    <ClInclude Include="..\..\include\gbfhtml.h" />

+    <ClInclude Include="..\..\include\gbfhtmlhref.h" />

+    <ClInclude Include="..\..\include\gbfmorph.h" />

+    <ClInclude Include="..\..\include\gbfosis.h" />

+    <ClInclude Include="..\..\include\gbfplain.h" />

+    <ClInclude Include="..\..\include\gbfredletterwords.h" />

+    <ClInclude Include="..\..\include\gbfrtf.h" />

+    <ClInclude Include="..\..\include\gbfstrongs.h" />

+    <ClInclude Include="..\..\include\gbfthml.h" />

+    <ClInclude Include="..\..\include\gbfwebif.h" />

+    <ClInclude Include="..\..\include\gbfwordjs.h" />

+    <ClInclude Include="..\..\include\gbfxhtml.h" />

+    <ClInclude Include="..\..\include\greeklexattribs.h" />

+    <ClInclude Include="..\..\include\hrefcom.h" />

+    <ClInclude Include="..\..\include\installmgr.h" />

+    <ClInclude Include="..\..\include\latin1utf16.h" />

+    <ClInclude Include="..\..\include\latin1utf8.h" />

+    <ClInclude Include="..\..\include\listkey.h" />

+    <ClInclude Include="..\..\include\localemgr.h" />

+    <ClInclude Include="..\..\include\lzsscomprs.h" />

+    <ClInclude Include="..\..\include\markupfiltmgr.h" />

+    <ClInclude Include="..\..\include\multimapwdef.h" />

+    <ClInclude Include="..\..\include\osisenum.h" />

+    <ClInclude Include="..\..\include\osisfootnotes.h" />

+    <ClInclude Include="..\..\include\osisglosses.h" />

+    <ClInclude Include="..\..\include\osisheadings.h" />

+    <ClInclude Include="..\..\include\osishtmlhref.h" />

+    <ClInclude Include="..\..\include\osislemma.h" />

+    <ClInclude Include="..\..\include\osismorph.h" />

+    <ClInclude Include="..\..\include\osismorphsegmentation.h" />

+    <ClInclude Include="..\..\include\osisosis.h" />

+    <ClInclude Include="..\..\include\osisplain.h" />

+    <ClInclude Include="..\..\include\osisredletterwords.h" />

+    <ClInclude Include="..\..\include\osisrtf.h" />

+    <ClInclude Include="..\..\include\osisscripref.h" />

+    <ClInclude Include="..\..\include\osisstrongs.h" />

+    <ClInclude Include="..\..\include\osisvariants.h" />

+    <ClInclude Include="..\..\include\osiswebif.h" />

+    <ClInclude Include="..\..\include\osiswordjs.h" />

+    <ClInclude Include="..\..\include\osisxhtml.h" />

+    <ClInclude Include="..\..\include\osisxlit.h" />

+    <ClInclude Include="..\..\include\osisreferencelinks.h" />

+    <ClInclude Include="..\..\include\papyriplain.h" />

+    <ClInclude Include="..\..\include\rawcom.h" />

+    <ClInclude Include="..\..\include\rawcom4.h" />

+    <ClInclude Include="..\..\include\rawfiles.h" />

+    <ClInclude Include="..\..\include\rawgenbook.h" />

+    <ClInclude Include="..\..\include\rawld.h" />

+    <ClInclude Include="..\..\include\rawld4.h" />

+    <ClInclude Include="..\..\include\rawstr.h" />

+    <ClInclude Include="..\..\include\rawstr4.h" />

+    <ClInclude Include="..\..\include\rawtext.h" />

+    <ClInclude Include="..\..\include\rawtext4.h" />

+    <ClInclude Include="..\..\include\rawverse.h" />

+    <ClInclude Include="..\..\include\rawverse4.h" />

+    <ClInclude Include="..\..\include\remotetrans.h" />

+    <ClInclude Include="..\..\include\roman.h" />

+    <ClInclude Include="..\..\include\rtfhtml.h" />

+    <ClInclude Include="..\..\include\sapphire.h" />

+    <ClInclude Include="..\..\include\scsuutf8.h" />

+    <ClInclude Include="..\..\include\stringmgr.h" />

+    <ClInclude Include="..\..\include\strkey.h" />

+    <ClInclude Include="..\..\include\swbasicfilter.h" />

+    <ClInclude Include="..\..\include\swbuf.h" />

+    <ClInclude Include="..\..\include\swcacher.h" />

+    <ClInclude Include="..\..\include\swcipher.h" />

+    <ClInclude Include="..\..\include\swcom.h" />

+    <ClInclude Include="..\..\include\swcomprs.h" />

+    <ClInclude Include="..\..\include\swconfig.h" />

+    <ClInclude Include="..\..\include\swdisp.h" />

+    <ClInclude Include="..\..\include\swfilter.h" />

+    <ClInclude Include="..\..\include\swfiltermgr.h" />

+    <ClInclude Include="..\..\include\swgenbook.h" />

+    <ClInclude Include="..\..\include\swkey.h" />

+    <ClInclude Include="..\..\include\swld.h" />

+    <ClInclude Include="..\..\include\swlocale.h" />

+    <ClInclude Include="..\..\include\swlog.h" />

+    <ClInclude Include="..\..\include\swmacs.h" />

+    <ClInclude Include="..\..\include\swmgr.h" />

+    <ClInclude Include="..\..\include\swmodule.h" />

+    <ClInclude Include="..\..\include\swobject.h" />

+    <ClInclude Include="..\..\include\swoptfilter.h" />

+    <ClInclude Include="..\..\include\swsearchable.h" />

+    <ClInclude Include="..\..\include\swtext.h" />

+    <ClInclude Include="..\..\include\swversion.h" />

+    <ClInclude Include="..\..\include\sysdata.h" />

+    <ClInclude Include="..\..\include\teixhtml.h" />

+    <ClInclude Include="..\..\include\teihtmlhref.h" />

+    <ClInclude Include="..\..\include\teiplain.h" />

+    <ClInclude Include="..\..\include\teirtf.h" />

+    <ClInclude Include="..\..\include\thmlfootnotes.h" />

+    <ClInclude Include="..\..\include\thmlgbf.h" />

+    <ClInclude Include="..\..\include\thmlheadings.h" />

+    <ClInclude Include="..\..\include\thmlhtml.h" />

+    <ClInclude Include="..\..\include\thmlhtmlhref.h" />

+    <ClInclude Include="..\..\include\thmllemma.h" />

+    <ClInclude Include="..\..\include\thmlmorph.h" />

+    <ClInclude Include="..\..\include\thmlosis.h" />

+    <ClInclude Include="..\..\include\thmlplain.h" />

+    <ClInclude Include="..\..\include\thmlrtf.h" />

+    <ClInclude Include="..\..\include\thmlscripref.h" />

+    <ClInclude Include="..\..\include\thmlstrongs.h" />

+    <ClInclude Include="..\..\include\thmlvariants.h" />

+    <ClInclude Include="..\..\include\thmlwebif.h" />

+    <ClInclude Include="..\..\include\thmlwordjs.h" />

+    <ClInclude Include="..\..\include\thmlxhtml.h" />

+    <ClInclude Include="..\..\include\treekey.h" />

+    <ClInclude Include="..\..\include\treekeyidx.h" />

+    <ClInclude Include="..\..\include\unicodertf.h" />

+    <ClInclude Include="..\..\include\untgz.h" />

+    <ClInclude Include="..\..\include\url.h" />

+    <ClInclude Include="..\..\include\utf16utf8.h" />

+    <ClInclude Include="..\..\include\utf8arabicpoints.h" />

+    <ClInclude Include="..\..\include\utf8arshaping.h" />

+    <ClInclude Include="..\..\include\utf8bidireorder.h" />

+    <ClInclude Include="..\..\include\utf8cantillation.h" />

+    <ClInclude Include="..\..\include\utf8greekaccents.h" />

+    <ClInclude Include="..\..\include\utf8hebrewpoints.h" />

+    <ClInclude Include="..\..\include\utf8html.h" />

+    <ClInclude Include="..\..\include\utf8latin1.h" />

+    <ClInclude Include="..\..\include\utf8nfc.h" />

+    <ClInclude Include="..\..\include\utf8nfkd.h" />

+    <ClInclude Include="..\..\include\utf8transliterator.h" />

+    <ClInclude Include="..\..\include\utf8utf16.h" />

+    <ClInclude Include="..\..\include\utilstr.h" />

+    <ClInclude Include="..\..\include\utilxml.h" />

+    <ClInclude Include="..\..\include\versekey.h" />

+    <ClInclude Include="..\..\include\versetreekey.h" />

+    <ClInclude Include="..\..\include\versificationmgr.h" />

+    <ClInclude Include="..\..\include\zcom.h" />

+    <ClInclude Include="..\..\include\zconf.h" />

+    <ClInclude Include="..\..\include\zipcomprs.h" />

+    <ClInclude Include="..\..\include\bz2comprs.h" />

+    <ClInclude Include="..\..\include\xzcomprs.h" />

+    <ClInclude Include="..\..\include\zld.h" />

+    <ClInclude Include="..\..\include\zlib.h" />

+    <ClInclude Include="..\..\include\zstr.h" />

+    <ClInclude Include="..\..\include\ztext.h" />

+    <ClInclude Include="..\..\include\zverse.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\crc32.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\deflate.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\gzguts.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\inffast.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\inffixed.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\inflate.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\inftrees.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\trees.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\zconf.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\zlib.h" />

+    <ClInclude Include="..\..\src\utilfuns\zlib\zutil.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>

diff --git a/locales.d/Makefile.am b/locales.d/Makefile.am
new file mode 100644
index 0000000..8544cdc
--- /dev/null
+++ b/locales.d/Makefile.am
@@ -0,0 +1,26 @@
+swlocaledir = $(top_srcdir)/locales.d
+
+localeDATA = $(swlocaledir)/*.conf
+
+EXTRA_DIST += $(localeDATA)
+
+localedatadir = $(pkgdatadir)/locales.d
+
+installlocaleDATA: $(localeDATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(localedatadir)
+	@list='$(localeDATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(localedatadir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(localedatadir)/$$f; \
+	done
+
+uninstalllocaleDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(localeDATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(localedatadir)/$$f"; \
+	  rm -f $(DESTDIR)$(localedatadir)/$$f; \
+	done
+
diff --git a/locales.d/abbr.conf b/locales.d/abbr.conf
new file mode 100644
index 0000000..c8d6522
--- /dev/null
+++ b/locales.d/abbr.conf
@@ -0,0 +1,75 @@
+[Meta]
+Name=abbr
+Description=English abbreviations
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Gen
+Exodus=Ex
+Leviticus=Lev
+Numbers=Num
+Deuteronomy=Deut
+Joshua=Josh
+Judges=Judg
+Ruth=Ruth
+I Samuel=1Sam
+II Samuel=2Sam
+I Kings=1Kgs
+II Kings=2Kgs
+I Chronicles=1Chr
+II Chronicles=2Chr
+Ezra=Ezra
+Nehemiah=Neh
+Esther=Esth
+Job=Job
+Psalms=Pss
+Proverbs=Prov
+Ecclesiastes=Eccl
+Song of Solomon=Song
+Isaiah=Isa
+Jeremiah=Jer
+Lamentations=Lam
+Ezekiel=Eze
+Daniel=Dan
+Hosea=Hos
+Joel=Joel
+Amos=Amos
+Obadiah=Ob
+Jonah=Jonah
+Micah=Mic
+Nahum=Nah
+Habakkuk=Hab
+Zephaniah=Zeph
+Haggai=Hag
+Zechariah=Zech
+Malachi=Mal
+Matthew=Mt
+Mark=Mk
+Luke=Lk
+John=Jn
+Acts=Acts
+Romans=Rom
+I Corinthians=1Cor
+II Corinthians=2Cor
+Galatians=Gal
+Ephesians=Eph
+Philippians=Php
+Colossians=Col
+I Thessalonians=1Thes
+II Thessalonians=2Thes
+I Timothy=1Tim
+II Timothy=2Tim
+Titus=Tit
+Philemon=Phm
+Hebrews=Heb
+James=Jas
+I Peter=1Pet
+II Peter=2Pet
+I John=1Jn
+II John=2Jn
+III John=3Jn
+Jude=Jude
+Revelation of John=Rev
+
+[Book Abbrevs]
+
diff --git a/locales.d/af-utf8.conf b/locales.d/af-utf8.conf
new file mode 100644
index 0000000..6e08aa5
--- /dev/null
+++ b/locales.d/af-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=af
+Description=Afrikaans (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Levitikus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Josua
+Judges=Rigters
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Konings
+II Kings=2 Konings
+I Chronicles=1 Kronieke
+II Chronicles=2 Kronieke
+Ezra=Esra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Job
+Psalms=Psalms
+Proverbs=Spreuke van Salomo
+Ecclesiastes=Prediker
+Song of Solomon=Hooglied van Salomo
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klaagliedere van Jeremia
+Ezekiel=Esegiël
+Daniel=Daniël
+Hosea=Hosea
+Joel=Joël
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Miga
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sagaria
+Malachi=Maleagi
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Handelinge
+Romans=Romeine
+I Corinthians=1 Korintiërs
+II Corinthians=2 Korintiërs
+Galatians=Galasiërs
+Ephesians=Efesiërs
+Philippians=Filipense
+Colossians=Kolossense
+I Thessalonians=1 Tessalonisense
+II Thessalonians=2 Thessalonisense
+I Timothy=1 Timoteus
+II Timothy=2 Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebreërs
+James=Jakobus
+I Peter=1 Petrus
+II Peter=2 Petrus
+I John=1 Johannes
+II John=2 Johannes
+III John=3 Johannes
+Jude=Judas
+Revelation of John=Openbaring
+
+[Book Abbrevs]
+
+GENESIS=Gen
+EXODUS=Exod
+LEVITIKUS=Lev
+NUMERI=Num
+DEUTERONOMIUM=Deut
+JOSUA=Josh
+RIGTERS=Judg
+RUT=Ruth
+1 SAMUEL=1Sam
+2 SAMUEL=2Sam
+1 KONINGS=1Kgs
+2 KONINGS=2Kgs
+1 KRONIEKE=1Chr
+2 KRONIEKE=2Chr
+ESRA=Ezra
+NEHEMIA=Neh
+ESTER=Esth
+JOB=Job
+PSALMS=Ps
+SPREUKE VAN SALOMO=Prov
+PREDIKER=Eccl
+HOOGLIED VAN SALOMO=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAAGLIEDERE VAN JEREMIA=Lam
+ESEGIËL=Ezek
+DANIËL=Dan
+HOSEA=Hos
+JOËL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIGA=Mic
+NAHUM=Nah
+HABAKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAGARIA=Zech
+MALEAGI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+HANDELINGE=Acts
+ROMEINE=Rom
+1 KORINTIËRS=1Cor
+2 KORINTIËRS=2Cor
+GALASIËRS=Gal
+EFESIËRS=Eph
+FILIPENSE=Phil
+KOLOSSENSE=Col
+1 TESSALONISENSE=1Thess
+2 THESSALONISENSE=2Thess
+1 TIMOTEUS=1Tim
+2 TIMOTEUS=2Tim
+TITUS=Titus
+FILEMON=Phlm
+HEBREËRS=Heb
+JAKOBUS=Jas
+1 PETRUS=1Pet
+2 PETRUS=2Pet
+1 JOHANNES=1John
+2 JOHANNES=2John
+3 JOHANNES=3John
+JUDAS=Jude
+OPENBARING=Rev
diff --git a/locales.d/af.conf b/locales.d/af.conf
new file mode 100644
index 0000000..4e2ec31
--- /dev/null
+++ b/locales.d/af.conf
@@ -0,0 +1,415 @@
+[Meta]
+Name=af
+Description=Afrikaans
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Génesis
+Exodus=Exodus
+Leviticus=Levítikus
+Numbers=Númeri
+Deuteronomy=Deuteronómium
+Joshua=Josua
+Judges=Rigters
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Konings
+II Kings=2 Konings
+I Chronicles=1 Kronieke
+II Chronicles=2 Kronieke
+Ezra=Esra
+Nehemiah=Nehemía
+Esther=Ester
+Job=Job
+Psalms=Psalms
+Proverbs=Spreuke van Salomo
+Ecclesiastes=Prediker
+Song of Solomon=Hooglied van Salomo
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klaagliedere van Jeremia
+Ezekiel=Eségiël
+Daniel=Daniël
+Hosea=Hoséa
+Joel=Joël
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Miga
+Nahum=Nahum
+Habakkuk=Hábakuk
+Zephaniah=Sefánja
+Haggai=Haggai
+Zechariah=Sagaria
+Malachi=Maleági
+Matthew=Matthéüs
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Handelinge
+Romans=Romeine
+I Corinthians=1 Korinthiërs
+II Corinthians=2 Korinthiërs
+Galatians=Galásiërs
+Ephesians=Efésiërs
+Philippians=Filippense
+Colossians=Kolossense
+I Thessalonians=1 Thessalonicense
+II Thessalonians=2 Thessalonicense
+I Timothy=1 Timótheüs
+I Timothy=2 Timótheüs
+Titus=Titus
+Philemon=Filémon
+Hebrews=Hebreërs
+James=Jakobus
+I Peter=1 Petrus
+II Peter=2 Petrus
+I John=1 Johannes
+II John=2 Johannes
+III John=3 Johannes
+Jude=Judas
+Revelation of John=Openbaring
+
+[Book Abbrevs]
+
+GÉNESIS=Gen
+GENESIS=Gen
+GEN=Gen
+genesis=Gen
+gen=Gen
+EXODUS=Exod
+EX=Exod
+EXO=Exod
+EXOD=Exod
+ex=Exod
+exo=Exod
+exod=Exod
+LEVÍTIKUS=Lev
+LEVITIKUS=Lev
+LEV=Lev
+levitikus=Lev
+lev=Lev
+NÚMERI=Num
+NUMERI=Num
+NUM=Num
+numeri=Num
+num=Num
+DEUTERONÓMIUM=Deut
+DEUTERONOMIUM=Deut
+DEUT=Deut
+DEU=Deut
+deuteronomium=Deut
+deut=Deut
+deu=Deut
+JOSUA=Josh
+JOS=Josh
+josua=Josh
+jos=Josh
+RIGTERS=Judg
+RIG=Judg
+rigters=Judg
+rig=Judg
+RUT=Ruth
+rut=Ruth
+1 SAMUEL=1Sam
+1SAMUEL=1Sam
+1 SAM=1Sam
+1SAM=1Sam
+1 samuel=1Sam
+1samuel=1Sam
+1 sam=1Sam
+1sam=1Sam
+2 SAMUEL=2Sam
+2SAMUEL=2Sam
+2 SAM=2Sam
+2SAM=2Sam
+2 samuel=2Sam
+2samuel=2Sam
+2 sam=2Sam
+2sam=2Sam
+1 KONINGS=1Kgs
+1KONINGS=1Kgs
+1 KON=1Kgs
+1KON=1Kgs
+1 konings=1Kgs
+1konings=1Kgs
+1 kon=1Kgs
+1kon=1Kgs
+2 KONINGS=2Kgs
+2KONINGS=2Kgs
+2 KON=2Kgs
+2KON=2Kgs
+2 konings=2Kgs
+2konings=2Kgs
+2 kon=2Kgs
+2kon=2Kgs
+1 KRONIEKE=1Chr
+1KRONIEKE=1Chr
+1 KRON=1Chr
+1KRON=1Chr
+1 kronieke=1Chr
+1kronieke=1Chr
+1 kron=1Chr
+1kron=1Chr
+2 KRONIEKE=2Chr
+2KRONIEKE=2Chr
+2 KRON=2Chr
+2KRON=2Chr
+2 kronieke=2Chr
+2kronieke=2Chr
+2 kron=2Chr
+2kron=2Chr
+ESRA=Ezra
+esra=Ezra
+NEHEMÍA=Neh
+NEHEMIA=Neh
+NEH=Neh
+nehemia=Neh
+neh=Neh
+ESTER=Esth
+EST=Esth
+ester=Esth
+est=Esth
+JOB=Job
+job=Job
+PSALMS=Ps
+PS=Ps
+psalms=Ps
+ps=Ps
+SPREUKE VAN SALOMO=Prov
+SPREUKE=Prov
+spreuke=Prov
+PREDIKER=Eccl
+PRED=Eccl
+prediker=Eccl
+pred=Eccl
+HOOGLIED VAN SALOMO=Song
+HOOGLIED=Song
+hooglied=Song
+JESAJA=Isa
+JES=Isa
+jesaja=Isa
+jes=Isa
+JEREMIA=Jer
+JER=Jer
+jeremia=Jer
+jer=Jer
+KLAAGLIEDERE VAN JEREMIA=Lam
+KLAAGLIEDERE=Lam
+KLAAGL=Lam
+klaaglieder=Lam
+klaagl=Lam
+ESÉGIËL=Ezek
+ESEGIEL=Ezek
+ESE=Ezek
+esegiel=Ezek
+ese=Ezek
+DANIËL=Dan
+DANIEL=Dan
+DAN=Dan
+daniel=Dan
+daniël=Dan
+dan=Dan
+HOSÉA=Hos
+HOSEA=Hos
+HOS=Hos
+hosea=Hos
+hos=Hos
+JOËL=Joel
+JOEL=Joel
+joël=Joel
+joel=Joel
+AMOS=Amos
+amos=Amos
+OBADJA=Obad
+OBAD=Obad
+obadja=Obad
+obad=Obad
+JONA=Jonah
+jona=Jonah
+MIGA=Mic
+miga=Mic
+NAHUM=Nah
+NAH=Nah
+nahum=Nah
+nah=Nah
+HÁBAKUK=Hab
+HABAKUK=Hab
+HAB=Hab
+habakuk=Hab
+hab=Hab
+SEFÁNJA=Zeph
+SEFANJA=Zeph
+SEF=Zeph
+sefanja=Zeph
+sef=Zeph
+HAGGAI=Hag
+HAG=Hag
+haggai=Hag
+hag=Hag
+SAGARIA=Zech
+SAG=Zech
+sagaria=Zech
+sag=Zech
+MALEÁGI=Mal
+MALEAGI=Mal
+MAL=Mal
+maleagi=Mal
+mal=Mal
+MATTHÉÜS=Matt
+MATTHEUS=Matt
+MAT=Matt
+mattheus=Matt
+mat=Matt
+MARKUS=Mark
+MARK=Mark
+MAR=Mark
+markus=Mark
+mark=Mark
+mar=Mark
+LUKAS=Luke
+LUK=Luke
+lukas=Luke
+LUK=Luke
+JOHANNES=John
+JOH=John
+johannes=John
+joh=John
+HANDELINGE=Acts
+HAND=Acts
+handelinge=Acts
+hand=Acts
+ROMEINE=Rom
+ROM=Rom
+romeine=Rom
+rom=Rom
+1 KORINTHIËRS=1Cor
+1 KORINTHIERS=1Cor
+1 KOR=1Cor
+1KORINTHIERS=1Cor
+1KOR=1Cor
+1 korinthiërs=1Cor
+1 korinthiers=1Cor
+1korinthiers=1Cor
+2 KORINTHIËRS=2Cor
+2 KORINTHIERS=2Cor
+2 KOR=2Cor
+2KORINTHIERS=2Cor
+2KOR=2Cor
+2 korinthiërs=2Cor
+2 korinthiers=2Cor
+2korinthiers=2Cor
+GALÁSIËRS=Gal
+GALASIERS=Gal
+GAL=Gal
+galasiers=Gal
+gal=Gal
+EFÉSIËRS=Eph
+EFESIERS=Eph
+EF=Eph
+efesiers=Eph
+ef=Eph
+FILIPPENSE=Phil
+FIL=Phil
+filipense=Phil
+fil=Phil
+KOLOSSENSE=Col
+KOL=Col
+kolossense=Col
+kol=Col
+1 THESSALONICENSE=1Thess
+1THESSALONICENSE=1Thess
+1THES=1Thess
+1 thessalonicense=1Thess
+1thessalonicense=1Thess
+1thes=1Thess
+2 THESSALONICENSE=2Thess
+2THESSALONICENSE=2Thess
+2THES=2Thess
+2 thessalonicense=2Thess
+2thessalonicense=2Thess
+2thes=2Thess
+1 TIMÓTHEÜS=1Tim
+1 TIMOTHEUS=1Tim
+1TIMOTHEUS=1Tim
+1TIM=1Tim
+1 timótheüs=1Tim
+1 timotheus=1Tim
+1timotheus=1Tim
+1tim=1Tim
+2 TIMÓTHEÜS=2Tim
+2 TIMOTHEUS=2Tim
+2TIMOTHEUS=2Tim
+2TIM=2Tim
+2 timótheüs=2Tim
+2 timotheus=2Tim
+2timotheus=2Tim
+2tim=2Tim
+TITUS=Titus
+TIT=Titus
+titus=Titus
+tit=Titus
+FILÉMON=Phlm
+FILEMON=Phlm
+FIL=Phlm
+filemon=Phlm
+fil=Phlm
+HEBREËRS=Heb
+HEBREERS=Heb
+HEB=Heb
+hebreërs=Heb
+hebreers=Heb
+heb=Heb
+JAKOBUS=Jas
+JAK=Jas
+jakobus=Jas
+jak=Jas
+1 PETRUS=1Pet
+1PETRUS=1Pet
+1 PET=1Pet
+1PET=1Pet
+1 petrus=1Pet
+1petrus=1Pet
+1 pet=1Pet
+1pet=1Pet
+2 PETRUS=2Pet
+2PETRUS=2Pet
+2 PET=2Pet
+2PET=2Pet
+2 petrus=2Pet
+2petrus=2Pet
+2 pet=2Pet
+2pet=2Pet
+1 JOHANNES=1John
+1JOHANNES=1John
+1 JOH=1John
+1JOH=1John
+1 johannes=1John
+1johannes=1John
+1 joh=1John
+1joh=1John
+2 JOHANNES=2John
+2JOHANNES=2John
+2 JOH=2John
+2JOH=2John
+2 johannes=2John
+2johannes=2John
+2 joh=2John
+2joh=2John
+3 JOHANNES=3John
+3JOHANNES=3John
+3 JOH=3John
+3JOH=3John
+3 johannes=3John
+3johannes=3John
+3 joh=3John
+3joh=3John
+JUDAS=Jude
+JUD=Jude
+OPENBARING=Rev
+OPEN=Rev
+OP=Rev
+openbaring=Rev
+open=Rev
+op=Rev
diff --git a/locales.d/ar-utf8.conf b/locales.d/ar-utf8.conf
new file mode 100644
index 0000000..e8de87c
--- /dev/null
+++ b/locales.d/ar-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=ar
+Description=Arabic (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=تكوين
+Exodus=خروج
+Leviticus=لاويين
+Numbers=عدد
+Deuteronomy=تثنية
+Joshua=يشوع
+Judges=قضاه
+Ruth=راعوث
+I Samuel=صموائيل الاول
+II Samuel=صموائيل الثاني
+I Kings=ملوك الاول
+II Kings=ملوك الثاني
+I Chronicles=أخبار الأيام الأول
+II Chronicles=أخبار الأيام الثاني
+Ezra=عزرا
+Nehemiah=نحميا
+Esther=أستير
+Job=أيوب
+Psalms=مزامير
+Proverbs=أمثال
+Ecclesiastes=الجامعة
+Song of Solomon=نشيد الأنشاد
+Isaiah=أشعياء
+Jeremiah=أرميا
+Lamentations=مراثي أرميا
+Ezekiel=حزقيال
+Daniel=دانيال
+Hosea=هوشع
+Joel=يوئيل
+Amos=عاموس
+Obadiah=عوبديا
+Jonah=يونان
+Micah=ميخا
+Nahum=ناحوم
+Habakkuk=حبقوق
+Zephaniah=ص�نيا
+Haggai=حجي
+Zechariah=زكريا
+Malachi=ملاخي
+Matthew=متي
+Mark=مرقس
+Luke=لوقا
+John=يوحنا
+Acts=أعمال الرسل
+Romans=رومية
+I Corinthians=كورنثوس الأولى
+II Corinthians=كورنثوس الثانية
+Galatians=غلاطية
+Ephesians=ا�سس
+Philippians=�يلبى
+Colossians=كولوسي
+I Thessalonians=تسالونيكى الأولى
+II Thessalonians=تسالونيكى الثانية
+I Timothy=تيموثاوس الأولى
+II Timothy=تيموثاوس الثانية
+Titus=تيطس
+Philemon=�يلمون
+Hebrews=العبرانيين
+James=يعقوب
+I Peter=بطرس الأولى
+II Peter=بطرس الثانية
+I John=يوحنا الأولى
+II John=يوحنا الثانية
+III John=يوحنا الثالثة
+Jude=يهوذا
+Revelation of John=الرؤيا
+
+[Book Abbrevs]
+
+تكوين=Gen
+خروج=Exod
+لاويين=Lev
+عدد=Num
+تثنية=Deut
+يشوع=Josh
+قضاه=Judg
+راعوث=Ruth
+صموائيل الاول=1Sam
+صموائيل الثاني=2Sam
+ملوك الاول=1Kgs
+ملوك الثاني=2Kgs
+أخبار الأيام الأول=1Chr
+أخبار الأيام الثاني=2Chr
+عزرا=Ezra
+نحميا=Neh
+أستير=Esth
+أيوب=Job
+مزامير=Ps
+أمثال=Prov
+الجامعة=Eccl
+نشيد الأنشاد=Song
+أشعياء=Isa
+أرميا=Jer
+مراثي أرميا=Lam
+حزقيال=Ezek
+دانيال=Dan
+هوشع=Hos
+يوئيل=Joel
+عاموس=Amos
+عوبديا=Obad
+يونان=Jonah
+ميخا=Mic
+ناحوم=Nah
+حبقوق=Hab
+ص�نيا=Zeph
+حجي=Hag
+زكريا=Zech
+ملاخي=Mal
+متي=Matt
+مرقس=Mark
+لوقا=Luke
+يوحنا=John
+أعمال الرسل=Acts
+رومية=Rom
+كورنثوس الأولى=1Cor
+كورنثوس الثانية=2Cor
+غلاطية=Gal
+ا�سس=Eph
+�يلبى=Phil
+كولوسي=Col
+تسالونيكى الأولى=1Thess
+تسالونيكى الثانية=2Thess
+تيموثاوس الأولى=1Tim
+تيموثاوس الثانية=2Tim
+تيطس=Titus
+�يلمون=Phlm
+العبرانيين=Heb
+يعقوب=Jas
+بطرس الأولى=1Pet
+بطرس الثانية=2Pet
+يوحنا الأولى=1John
+يوحنا الثانية=2John
+يوحنا الثالثة=3John
+يهوذا=Jude
+الرؤيا=Rev
diff --git a/locales.d/ar_EG-cp1256.conf b/locales.d/ar_EG-cp1256.conf
new file mode 100644
index 0000000..b99051f
--- /dev/null
+++ b/locales.d/ar_EG-cp1256.conf
@@ -0,0 +1,209 @@
+[Meta]
+Name=ar_EG
+Description=Arabic (EG)
+Encoding=CP1256
+
+[Text]
+Genesis=Êßæíä
+Exodus=ÎÑæÌ
+Leviticus=áÇæííä
+Numbers=ÚÏÏ
+Deuteronomy=ÊËäíÉ
+Joshua=íÔæÚ
+Judges=ÞÖÇå
+Ruth=ÑÇÚæË
+I Samuel=ÕãæÇÆíá ÇáÇæá
+II Samuel=ÕãæÇÆíá ÇáËÇäí
+I Kings=ãáæß ÇáÇæá
+II Kings=ãáæß ÇáËÇäí
+I Chronicles=ÃÎÈÇÑ ÇáÃíÇã ÇáÃæá
+II Chronicles=ÃÎÈÇÑ ÇáÃíÇã ÇáËÇäí
+Ezra=ÚÒÑÇ
+Nehemiah=äÍãíÇ
+Esther=ÃÓÊíÑ
+Job=ÃíæÈ
+Psalms=ãÒÇãíÑ
+Proverbs=̋肇
+Ecclesiastes=ÇáÌÇãÚÉ
+Song of Solomon=äÔíÏ ÇáÃäÔÇÏ
+Isaiah=ÃÔÚíÇÁ
+Jeremiah=ÃÑãíÇ
+Lamentations=ãÑÇËí ÃÑãíÇ
+Ezekiel=ÍÒÞíÇá
+Daniel=ÏÇäíÇá
+Hosea=åæÔÚ
+Joel=íæÆíá
+Amos=ÚÇãæÓ
+Obadiah=ÚæÈÏíÇ
+Jonah=íæäÇä
+Micah=ãíÎÇ
+Nahum=äÇÍæã
+Habakkuk=ÍÈÞæÞ
+Zephaniah=ÕÝäíÇ
+Haggai=ÍÌí
+Zechariah=ÒßÑíÇ
+Malachi=ãáÇÎí
+Matthew=ãÊí
+Mark=ãÑÞÓ
+Luke=áæÞÇ
+John=íæÍäÇ
+Acts=ÃÚãÇá ÇáÑÓá
+Romans=ÑæãíÉ
+I Corinthians=ßæÑäËæÓ ÇáÃæáì
+II Corinthians=ßæÑäËæÓ ÇáËÇäíÉ
+Galatians=ÛáÇØíÉ
+Ephesians=ÇÝÓÓ
+Philippians=ÝíáÈì
+Colossians=ßæáæÓí
+I Thessalonians=ÊÓÇáæäíßì ÇáÃæáì
+II Thessalonians=ÊÓÇáæäíßì ÇáËÇäíÉ
+I Timothy=ÊíãæËÇæÓ ÇáÃæáì
+II Timothy=ÊíãæËÇæÓ ÇáËÇäíÉ
+Titus=ÊíØÓ
+Philemon=Ýíáãæä
+Hebrews=ÇáÚÈÑÇäííä
+James=íÚÞæÈ
+I Peter=ÈØÑÓ ÇáÃæáì
+II Peter=ÈØÑÓ ÇáËÇäíÉ
+I John=íæÍäÇ ÇáÃæáì
+II John=íæÍäÇ ÇáËÇäíÉ
+III John=íæÍäÇ ÇáËÇáËÉ
+Jude=íåæÐÇ
+Revelation of John=ÇáÑÄíÇ
+
+[Book Abbrevs]
+
+Êßæíä=1
+ÎÑæÌ=2
+áÇæííä=3
+ÚÏÏ=4
+ÊËäíÉ=5
+íÔæÚ=6
+ÞÖÇå=7
+ÑÇÚæË=8
+ÕãæÇÆíá ÇáÇæá=9
+ÕãæÇÆíá ÇáËÇäí=10
+ãáæß ÇáÇæá=11
+ãáæß ÇáËÇäí=12
+ÃÎÈÇÑ ÇáÃíÇã ÇáÃæá=13
+ÃÎÈÇÑ ÇáÃíÇã ÇáËÇäí=14
+ÚÒÑÇ=15
+äÍãíÇ=16
+ÃÓÊíÑ=17
+ÃíæÈ=18
+ãÒÇãíÑ=19
+̋肇=20
+ÇáÌÇãÚÉ=21
+äÔíÏ ÇáÃäÔÇÏ=22
+ÃÔÚíÇÁ=23
+ÃÑãíÇ=24
+ãÑÇËí ÃÑãíÇ=25
+ÍÒÞíÇá=26
+ÏÇäíÇá=27
+åæÔÚ=28
+íæÆíá=29
+ÚÇãæÓ=30
+ÚæÈÏíÇ=31
+íæäÇä=32
+ãíÎÇ=33
+äÇÍæã=34
+ÍÈÞæÞ=35
+ÕÝäíÇ=36
+ÍÌí=37
+ÒßÑíÇ=38
+ãáÇÎí=39
+ãÊí=40
+ãÑÞÓ=41
+áæÞÇ=42
+íæÍäÇ=43
+ÃÚãÇá ÇáÑÓá=44
+ÑæãíÉ=45
+ßæÑäËæÓ ÇáÃæáì=46
+ßæÑäËæÓ ÇáËÇäíÉ=47
+ÛáÇØíÉ=48
+ÇÝÓÓ=49
+ÝíáÈì=50
+ßæáæÓí=51
+ÊÓÇáæäíßì ÇáÃæáì=52
+ÊÓÇáæäíßì ÇáËÇäíÉ=53
+ÊíãæËÇæÓ ÇáÃæáì=54
+ÊíãæËÇæÓ ÇáËÇäíÉ=55
+ÊíØÓ=56
+Ýíáãæä=57
+ÇáÚÈÑÇäííä=58
+íÚÞæÈ=59
+ÈØÑÓ ÇáÃæáì=60
+ÈØÑÓ ÇáËÇäíÉ=61
+íæÍäÇ ÇáÃæáì=62
+íæÍäÇ ÇáËÇäíÉ=63
+íæÍäÇ ÇáËÇáËÉ=64
+íåæÐÇ=65
+ÇáÑÄíÇ=Rev
+
+
+ÊßÆÍÄ=Gen
+ÎÑÆÌ=Exod
+ÁÇÆÍÍÄ=Lev
+ÚÏÏ=Num
+ÊËÄÍÉ=Deut
+ÍÔÆÚ=Josh
+ÞÖÇÅ=Judg
+ÑÇÚÆË=Ruth
+ÕÃÆÇÆÍÁ ÇÁÇÆÁ=1Sam
+ÕÃÆÇÆÍÁ ÇÁËÇÄÍ=2Sam
+ÃÁÆß ÇÁÇÆÁ=1Kgs
+ÃÁÆß ÇÁËÇÄÍ=2Kgs
+ÃÎÈÇÑ ÇÁÃÍÇÃ ÇÁÃÆÁ=1Chr
+ÃÎÈÇÑ ÇÁÃÍÇÃ ÇÁËÇÄÍ=2Chr
+ÚÒÑÇ=Ezra
+ÄÍÃÍÇ=Neh
+ÃÓÊÍÑ=Esth
+ÃÍÆÈ=Job
+ÃÒÇÃÍÑ=Ps
+ÃÃËÇÁ=Prov
+ÇÁÌÇÃÚÉ=Eccl
+ÄÔÍÏ ÇÁÃÄÔÇÏ=Song
+ÃÔÚÍÇÁ=Isa
+ÃÑÃÍÇ=Jer
+ÃÑÇËÍ ÃÑÃÍÇ=Lam
+ÍÒÞÍÇÁ=Ezek
+ÏÇÄÍÇÁ=Dan
+ÅÆÔÚ=Hos
+ÍÆÆÍÁ=Joel
+ÚÇÃÆÓ=Amos
+ÚÆÈÏÍÇ=Obad
+ÍÆÄÇÄ=Jonah
+ÃÍÎÇ=Mic
+ÄÇÍÆÃ=Nah
+ÍÈÞÆÞ=Hab
+ÕÝÄÍÇ=Zeph
+ÍÌÍ=Hag
+ÒßÑÍÇ=Zech
+ÃÁÇÎÍ=Mal
+ÃÊÍ=Matt
+ÃÑÞÓ=Mark
+ÁÆÞÇ=Luke
+ÍÆÍÄÇ=John
+ÃÚÃÇÁ ÇÁÑÓÁ=Acts
+ÑÆÃÍÉ=Rom
+ßÆÑÄËÆÓ ÇÁÃÆÁÌ=1Cor
+ßÆÑÄËÆÓ ÇÁËÇÄÍÉ=2Cor
+ÛÁÇØÍÉ=Gal
+ÇÝÓÓ=Eph
+ÝÍÁÈÌ=Phil
+ßÆÁÆÓÍ=Col
+ÊÓÇÁÆÄÍßÌ ÇÁÃÆÁÌ=1Thess
+ÊÓÇÁÆÄÍßÌ ÇÁËÇÄÍÉ=2Thess
+ÊÍÃÆËÇÆÓ ÇÁÃÆÁÌ=1Tim
+ÊÍÃÆËÇÆÓ ÇÁËÇÄÍÉ=2Tim
+ÊÍØÓ=Titus
+ÝÍÁÃÆÄ=Phlm
+ÇÁÚÈÑÇÄÍÍÄ=Heb
+ÍÚÞÆÈ=Jas
+ÈØÑÓ ÇÁÃÆÁÌ=1Pet
+ÈØÑÓ ÇÁËÇÄÍÉ=2Pet
+ÍÆÍÄÇ ÇÁÃÆÁÌ=1John
+ÍÆÍÄÇ ÇÁËÇÄÍÉ=2John
+ÍÆÍÄÇ ÇÁËÇÁËÉ=3John
+ÍÅÆÐÇ=Jude
+
diff --git a/locales.d/ar_EG-utf8.conf b/locales.d/ar_EG-utf8.conf
new file mode 100644
index 0000000..74425d1
--- /dev/null
+++ b/locales.d/ar_EG-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=ar_EG
+Description=Arabic (EG, Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=تكوين
+Exodus=خروج
+Leviticus=لاويين
+Numbers=عدد
+Deuteronomy=تثنية
+Joshua=يشوع
+Judges=قضاه
+Ruth=راعوث
+I Samuel=صموائيل الاول
+II Samuel=صموائيل الثاني
+I Kings=ملوك الاول
+II Kings=ملوك الثاني
+I Chronicles=أخبار الأيام الأول
+II Chronicles=أخبار الأيام الثاني
+Ezra=عزرا
+Nehemiah=نحميا
+Esther=أستير
+Job=أيوب
+Psalms=مزامير
+Proverbs=أمثال
+Ecclesiastes=الجامعة
+Song of Solomon=نشيد الأنشاد
+Isaiah=أشعياء
+Jeremiah=أرميا
+Lamentations=مراثي أرميا
+Ezekiel=حزقيال
+Daniel=دانيال
+Hosea=هوشع
+Joel=يوئيل
+Amos=عاموس
+Obadiah=عوبديا
+Jonah=يونان
+Micah=ميخا
+Nahum=ناحوم
+Habakkuk=حبقوق
+Zephaniah=ص�نيا
+Haggai=حجي
+Zechariah=زكريا
+Malachi=ملاخي
+Matthew=متي
+Mark=مرقس
+Luke=لوقا
+John=يوحنا
+Acts=أعمال الرسل
+Romans=رومية
+I Corinthians=كورنثوس الأولى
+II Corinthians=كورنثوس الثانية
+Galatians=غلاطية
+Ephesians=ا�سس
+Philippians=�يلبى
+Colossians=كولوسي
+I Thessalonians=تسالونيكى الأولى
+II Thessalonians=تسالونيكى الثانية
+I Timothy=تيموثاوس الأولى
+II Timothy=تيموثاوس الثانية
+Titus=تيطس
+Philemon=�يلمون
+Hebrews=العبرانيين
+James=يعقوب
+I Peter=بطرس الأولى
+II Peter=بطرس الثانية
+I John=يوحنا الأولى
+II John=يوحنا الثانية
+III John=يوحنا الثالثة
+Jude=يهوذا
+Revelation of John=الرؤيا
+
+[Book Abbrevs]
+
+تكوين=Gen
+خروج=Exod
+لاويين=Lev
+عدد=Num
+تثنية=Deut
+يشوع=Josh
+قضاه=Judg
+راعوث=Ruth
+صموائيل الاول=1Sam
+صموائيل الثاني=2Sam
+ملوك الاول=1Kgs
+ملوك الثاني=2Kgs
+أخبار الأيام الأول=1Chr
+أخبار الأيام الثاني=2Chr
+عزرا=Ezra
+نحميا=Neh
+أستير=Esth
+أيوب=Job
+مزامير=Ps
+أمثال=Prov
+الجامعة=Eccl
+نشيد الأنشاد=Song
+أشعياء=Isa
+أرميا=Jer
+مراثي أرميا=Lam
+حزقيال=Ezek
+دانيال=Dan
+هوشع=Hos
+يوئيل=Joel
+عاموس=Amos
+عوبديا=Obad
+يونان=Jonah
+ميخا=Mic
+ناحوم=Nah
+حبقوق=Hab
+ص�نيا=Zeph
+حجي=Hag
+زكريا=Zech
+ملاخي=Mal
+متي=Matt
+مرقس=Mark
+لوقا=Luke
+يوحنا=John
+أعمال الرسل=Acts
+رومية=Rom
+كورنثوس الأولى=1Cor
+كورنثوس الثانية=2Cor
+غلاطية=Gal
+ا�سس=Eph
+�يلبى=Phil
+كولوسي=Col
+تسالونيكى الأولى=1Thess
+تسالونيكى الثانية=2Thess
+تيموثاوس الأولى=1Tim
+تيموثاوس الثانية=2Tim
+تيطس=Titus
+�يلمون=Phlm
+العبرانيين=Heb
+يعقوب=Jas
+بطرس الأولى=1Pet
+بطرس الثانية=2Pet
+يوحنا الأولى=1John
+يوحنا الثانية=2John
+يوحنا الثالثة=3John
+يهوذا=Jude
+الرؤيا=Rev
diff --git a/locales.d/az-utf8.conf b/locales.d/az-utf8.conf
new file mode 100644
index 0000000..210a2c5
--- /dev/null
+++ b/locales.d/az-utf8.conf
@@ -0,0 +1,194 @@
+[Meta]
+Name=az
+Description=Azeri (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=YARADILIÅž KÄ°TABI
+Exodus=ÇIXIŞ KİTABI
+Leviticus=LEVİLİL�R KİTABI
+Numbers=SAYLAR KÄ°TABI
+Deuteronomy=QANUNUN T�KRARI KİTABI
+
+Joshua=YEŞUA PEYĞ�MB�RİN KİTABI
+Judges=HAKİML�R KİTABI
+Ruth=RUT KÄ°TABI
+I Samuel=BÄ°RÄ°NCÄ° ÅžAMUEL KÄ°TABI
+II Samuel=Ä°KÄ°NCÄ° ÅžAMUEL KÄ°TABI
+I Kings=BÄ°RÄ°NCÄ° PADÅžAHLAR KÄ°TABI
+II Kings=Ä°KÄ°NCÄ° PADÅžAHLAR KÄ°TABI
+I Chronicles=BİRİNCİ SALNAM�L�R KİTABI
+II Chronicles=İKİNCİ SALNAM�L�R KİTABI
+
+Ezra=EZRA KÄ°TABI
+Nehemiah=NEHEMYA KÄ°TABI
+Esther=ESTER KÄ°TABI
+Job=�YYUB KİTABI
+Psalms=Z�BUR
+Proverbs=SÜLEYMANIN M�S�LL�Rİ
+Ecclesiastes=VAÄ°Z KÄ°TABI
+Song of Solomon=N�ĞM�L�R N�ĞM�Sİ KİTABI
+
+Isaiah=YEŞAYA PEYĞ�MB�RİN KİTABI
+Jeremiah=YEREMYA PEYĞ�MB�RİN KİTABI
+Lamentations=M�RSİY�L�R KİTABI
+Ezekiel=YEZEKEL PEYĞ�MB�RİN KİTABI
+Daniel=DANİEL PEYĞ�MB�RİN KİTABI
+Hosea=HUŞ� PEYĞ�MB�RİN KİTABI
+Joel=YOEL PEYĞ�MB�RİN KİTABI
+Amos=AMOS PEYĞ�MB�RİN KİTABI
+Obadiah=AVDİYA PEYĞ�MB�RİN KİTABI
+Jonah=YUNUS PEYĞ�MB�RİN KİTABI
+Micah=MİKEYA PEYĞ�MB�RİN KİTABI
+Nahum=NAHUM PEYĞ�MB�RİN KİTABI
+Habakkuk=HABAQQUQ PEYĞ�MB�RİN KİTABI
+Zephaniah=SEFANYA PEYĞ�MB�RİN KİTABI
+Haggai=HAQQAY PEYĞ�MB�RİN KİTABI
+Zechariah=Z�K�RİYY� PEYĞ�MB�RİN KİTABI
+Malachi=MALAKİ PEYĞ�MB�RİN KİTABI
+
+Matthew=MATTANIN N�QL ETDİYİ MÜJD�
+Mark=MARKIN N�QL ETDİYİ MÜJD�
+Luke=LUKANIN N�QL ETDİYİ MÜJD�
+John=Y�HYANIN N�QL ETDİYİ MÜJD�
+Acts=H�VARİL�RİN İŞL�Rİ
+
+Romans=PAULUN ROMALILARA M�KTUBU
+I Corinthians=PAULUN KORİNFLİL�R� BİRİNCİ M�KTUBU
+II Corinthians=PAULUN KORİNFLİL�R� İKİNCİ M�KTUBU
+Galatians=PAULUN QALATİYALILARA M�KTUBU
+Ephesians=PAULUN EFESLİL�R� M�KTUBU
+Philippians=PAULUN FİLİPİLİL�R� M�KTUBU
+Colossians=PAULUN KOLOSSELİL�R� M�KTUBU
+I Thessalonians=PAULUN SALONİKLİL�R� BİRİNCİ M�KTUBU
+II Thessalonians=PAULUN SALONİKLİL�R� İKİNCİ M�KTUBU
+I Timothy=PAULUN TİMOTEY� BİRİNCİ M�KTUBU
+II Timothy=PAULUN TİMOTEY� İKİNCİ M�KTUBU
+Titus=PAULUN TİT� M�KTUBU
+Philemon=PAULUN FİLİMONA M�KTUBU
+
+Hebrews=İBRANİL�R� M�KTUB
+James=YAQUBUN M�KTUBU
+I Peter=PETERİN BİRİNCİ M�KTUBU
+II Peter=PETERİN İKİNCİ M�KTUBU
+I John=Y�HYANIN BİRİNCİ M�KTUBU
+II John=Y�HYANIN İKİNCİ M�KTUBU
+III John=Y�HYANIN ÜÇÜNCÜ M�KTUBU
+Jude=Y�HUDANIN M�KTUBU
+Revelation of John=Y�HYAYA NAZİL OLAN
+
+[Book Abbrevs]
+
+YARADILIÅž KÄ°TABI=Gen
+ÇIXIŞ KİTABI=Exod
+LEVİLİL�R KİTABI=Lev
+SAYLAR KÄ°TABI=Num
+QANUNUN T�KRARI KİTABI=Deut
+
+YEŞUA PEYĞ�MB�RİN KİTABI=Josh
+HAKİML�R KİTABI=Judg
+RUT KÄ°TABI=Rut
+
+BÄ°RÄ°NCÄ° ÅžAMUEL KÄ°TABI=1Sam
+1ÅžAM=1Sam
+
+Ä°KÄ°NCÄ° ÅžAMUEL KÄ°TABI=2Sam
+2ÅžAM=2Sam
+
+BÄ°RÄ°NCÄ° PADÅžAHLAR KÄ°TABI=1Kgs
+Ä°KÄ°NCÄ° PADÅžAHLAR KÄ°TABI=2Kgs
+1PAD=1Kgs
+2PAD=2Kgs
+
+BİRİNCİ SALNAM�L�R KİTABI=1Chr
+İKİNCİ SALNAM�L�R KİTABI=2Chr
+1SALN=1Chr
+2SALN=2Chr
+
+EZRA KÄ°TABI=Ezra
+NEHEMYA KÄ°TABI=Neh
+ESTER KÄ°TABI=Esth
+�YYUB KİTABI=Job
+Z�BUR=Ps
+SÜLEYMANIN M�S�LL�Rİ=Prov
+VAÄ°Z KÄ°TABI=Eccl
+N�ĞM�L�R N�ĞM�Sİ KİTABI=Song
+YEŞAYA PEYĞ�MB�RİN KİTABI=Isa
+YEREMYA PEYĞ�MB�RİN KİTABI=Jer
+M�RSİY�L�R KİTABI=Lam
+YEZEKEL PEYĞ�MB�RİN KİTABI=Ezek
+DANİEL PEYĞ�MB�RİN KİTABI=Dan
+HUŞ� PEYĞ�MB�RİN KİTABI=Hos
+YOEL PEYĞ�MB�RİN KİTABI=Joel
+AMOS PEYĞ�MB�RİN KİTABI=Amos
+AVDİYA PEYĞ�MB�RİN KİTABI=Obad
+YUNUS PEYĞ�MB�RİN KİTABI=Jonah
+MİKEYA PEYĞ�MB�RİN KİTABI=Mic
+NAHUM PEYĞ�MB�RİN KİTABI=Nah
+HABAQQUQ PEYĞ�MB�RİN KİTABI=Hab
+SEFANYA PEYĞ�MB�RİN KİTABI=Zeph
+HAQQAY PEYĞ�MB�RİN KİTABI=Hag
+Z�K�RİYY� PEYĞ�MB�RİN KİTABI=Zech
+MALAKİ PEYĞ�MB�RİN KİTABI=Mal
+
+MATTANIN N�QL ETDİYİ MÜJD�=Matt
+MARKIN N�QL ETDİYİ MÜJD�=Mark
+LUKANIN N�QL ETDİYİ MÜJD�=Luke
+Y�HYANIN N�QL ETDİYİ MÜJD�=John
+H�VARİL�RİN İŞL�Rİ=Acts
+
+PAULUN ROMALILARA M�KTUBU=Rom
+PAULUN KORİNFLİL�R� BİRİNCİ M�KTUBU=1Cor
+PAULUN KORİNFLİL�R� İKİNCİ M�KTUBU=2Cor
+PAULUN QALATİYALILARA M�KTUBU=Gal
+PAULUN EFESLİL�R� M�KTUBU=Eph
+PAULUN FİLİPİLİL�R� M�KTUBU=Phil
+PAULUN KOLOSSELİL�R� M�KTUBU=Col
+PAULUN SALONİKLİL�R� BİRİNCİ M�KTUBU=1Thess
+PAULUN SALONİKLİL�R� İKİNCİ M�KTUBU=2Thess
+PAULUN TİMOTEY� BİRİNCİ M�KTUBU=1Tim
+PAULUN TİMOTEY� İKİNCİ M�KTUBU=2Tim
+PAULUN TİT� M�KTUBU=Titus
+PAULUN FİLİMONA M�KTUBU=Phlm
+
+ROM=Rom
+1KOR=1Cor
+KORİNFLİL�R� BİRİNCİ M�KTUBU=1Cor
+2KOR=2Cor
+KORİNFLİL�R� İKİNCİ M�KTUBU=2Cor
+
+QALATİYALILARA M�KTUBU=Gal
+EFESLİL�R� M�KTUBU=Eph
+FİLİPİLİL�R� M�KTUBU=Phil
+KOLOSSELİL�R� M�KTUBU=Col
+1SAL=1Thess
+SALONİKLİL�R� BİRİNCİ M�KTUBU=1Thess
+2SAL=2Thess
+SALONİKLİL�R� İKİNCİ M�KTUBU=2Thess
+1TÄ°M=1Tim
+TİMOTEY� BİRİNCİ M�KTUBU=1Tim
+2TÄ°M=2Tim
+TİMOTEY� İKİNCİ M�KTUBU=2Tim
+TİT� M�KTUBU=Titus
+FİLİMONA M�KTUBU=Phlm
+
+
+İBRANİL�R� M�KTUB=Heb
+YAQUBUN M�KTUBU=Jas
+PETERİN BİRİNCİ M�KTUBU=1Pet
+PETERİN İKİNCİ M�KTUBU=2Pet
+Y�HYANIN BİRİNCİ M�KTUBU=1John
+Y�HYANIN İKİNCİ M�KTUBU=2John
+Y�HYANIN ÜÇÜNCÜ M�KTUBU=3John
+
+1PET=1Pet
+2PET=2Pet
+1Y�HYANIN BİRİNCİ M�KTUBU=1John
+2Y�HYANIN İKİNCİ M�KTUBU=2John
+3Y�HYANIN ÜÇÜNCÜ M�KTUBU=3John
+
+Yəhd=Jude
+Y�HYAYA NAZİL OLAN V�HY=Rev
+V�HY=Rev
+
+
diff --git a/locales.d/bg-utf8.conf b/locales.d/bg-utf8.conf
new file mode 100644
index 0000000..514b220
--- /dev/null
+++ b/locales.d/bg-utf8.conf
@@ -0,0 +1,220 @@
+# Bulgarian BIBLE
+# БИБЛИЯ ИЛИ СВЕЩЕ�ОТО ПИС��ИЕ �� СТ�РИЯ И �ОВИЯ З�ВЕТ.
+# Andrew Ivanov andrew@hacker.bg
+
+[Meta]
+Name=bg
+Description=Bulgarian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Битие
+Exodus=Изход
+Leviticus=Левит
+Numbers=Чи�ла
+Deuteronomy=Второзаконие
+Joshua=И�у� �авин
+Judges=Съдии
+Ruth=Рут
+I Samuel=1 Книга на Царете
+II Samuel=2 Kнига на Царете
+I Kings=3 Книга на Царете
+II Kings=4 Книга на Царете
+I Chronicles=1 Книга на Летопи�ите
+II Chronicles=2 Книга на Летопи�ите
+Ezra=Ездра
+Nehemiah=�ееми�
+Esther=Е�тир
+Job=Йов
+Psalms=П�алми
+Proverbs=Притчи
+Ecclesiastes=Екли�иа�т
+Song of Solomon=Пе�ен на Пе�ните
+Isaiah=И�а�
+Jeremiah=Йереми�
+Lamentations=Плачът на Йереми�
+Ezekiel=Йезекил
+Daniel=Даниил
+Hosea=О�и�
+Joel=Йоил
+Amos=�мо�
+Obadiah=�вдий
+Jonah=Йона
+Micah=Михей
+Nahum=�аум
+Habakkuk=�вакум
+Zephaniah=Софони�
+Haggai=�гей
+Zechariah=Захари�
+Malachi=Малахи�
+Matthew=Матей
+Mark=Марко
+Luke=Лука
+John=Йоан
+Acts=Де�ни� на �по�толите
+Romans=Римл�ни
+I Corinthians=1 Коринт�ни
+II Corinthians=2 Коринт�ни
+Galatians=Галат�ни
+Ephesians=Ефе��ни
+Philippians=Филип�ни
+Colossians=Коло��ни
+I Thessalonians=1 Солунци
+II Thessalonians=2 Солунци
+I Timothy=1 Тимотей
+II Timothy=2 Тимотей
+Titus=Тит
+Philemon=Филимон
+Hebrews=Евреи
+James=Яков
+I Peter=1 Петрово
+II Peter=2 Петрово
+I John=1 Йоаново
+II John=2 Йоаново
+III John=3 Йоаново
+Jude=Юда
+Revelation of John=Откровението на Йоан
+
+[Book Abbrevs]
+
+Битие=Gen
+Бит=Gen
+
+Изход=Exod
+Изх=Exod
+
+Левит=Lev
+
+Чи�ла=Num
+
+Второзаконие=Deut
+
+И�у� �авин=Josh
+
+Съдии=Judg
+
+Рут=Ruth
+
+1 Книга на Царете=1Sam
+1 Царе=1Sam
+
+2 Kнига на Царете=2Sam
+2 Царе=2Sam
+
+3 Книга на Царете=1Kgs
+3 Царе=1Kgs
+
+4 Книга на Царете=2Kgs
+4 Царе=2Kgs
+
+1 Книга на Летопи�ите=1Chr
+1 Летопи�и=1Chr
+
+2 Книга на Летопи�ите=2Chr
+2 Летопи�и=2Chr
+
+Ездра=Ezra
+
+�ееми�=Neh
+
+Е�тир=Esth
+
+Йов=Job
+
+П�алми=Ps
+
+Притчи=Prov
+
+Екли�иа�т=Eccl
+
+Пе�ен на Пе�ните=Song
+
+И�а�=Isa
+
+Йереми�=Jer
+
+Плачът на Йереми�=Lam
+
+Йезекил=Ezek
+
+Даниил=Dan
+
+О�и�=Hos
+
+Йоил=Joel
+
+�мо�=Amos
+
+�вдий=Obad
+
+Йона=Jonah
+
+Михей=Mic
+
+�аум=Nah
+
+�вакум=Hab
+
+Софони�=Zeph
+
+�гей=Hag
+
+Захари�=Zech
+
+Малахи�=Mal
+
+Матей=Matt
+
+Марко=Mark
+
+Лука=Luke
+
+Йоан=John
+
+Де�ни� на �по�толите=Acts
+Де�ни�=Acts
+
+Римл�ни=Rom
+
+1 Коринт�ни=1Cor
+
+2 Коринт�ни=2Cor
+
+Галат�ни=Gal
+
+Ефе��ни=Eph
+
+Филип�ни=Phil
+
+Коло��ни=Col
+
+1 Солунци=1Thess
+
+2 Солунци=2Thess
+
+1 Тимотей=1Tim
+
+2 Тимотей=2Tim
+
+Тит=Titus
+
+Филимон=Phlm
+
+Евреи=Heb
+
+Яков=Jas
+
+1 Петрово=1Pet
+
+2 Петрово=2Pet
+
+1 Йоаново=1John
+
+2 Йоаново=2John
+
+3 Йоаново=3John
+
+Юда=Jude
+
+Откровението на Йоан=Rev
+Откровение=Rev
diff --git a/locales.d/bg_BG-cp1251.conf b/locales.d/bg_BG-cp1251.conf
new file mode 100644
index 0000000..f6c01fd
--- /dev/null
+++ b/locales.d/bg_BG-cp1251.conf
@@ -0,0 +1,220 @@
+# Bulgarian BIBLE
+# ÁÈÁËÈß ÈËÈ ÑÂÅÙÅÍÎÒÎ ÏÈÑÀÍÈÅ ÍÀ ÑÒÀÐÈß È ÍÎÂÈß ÇÀÂÅÒ.
+# Andrew Ivanov andrew@hacker.bg
+
+[Meta]
+Name=bg_BG-cp1251
+Description=Bulgarian
+Encoding=CP1251
+
+[Text]
+Genesis=Áèòèå
+Exodus=Èçõîä
+Leviticus=Ëåâèò
+Numbers=×èñëà
+Deuteronomy=Âòîðîçàêîíèå
+Joshua=Èñóñ Íàâèí
+Judges=Ñúäèè
+Ruth=Ðóò
+I Samuel=1 Êíèãà íà Öàðåòå
+II Samuel=2 Kíèãà íà Öàðåòå
+I Kings=3 Êíèãà íà Öàðåòå
+II Kings=4 Êíèãà íà Öàðåòå
+I Chronicles=1 Êíèãà íà Ëåòîïèñèòå
+II Chronicles=2 Êíèãà íà Ëåòîïèñèòå
+Ezra=Åçäðà
+Nehemiah=Íååìèÿ
+Esther=Åñòèð
+Job=Éîâ
+Psalms=Ïñàëìè
+Proverbs=Ïðèò÷è
+Ecclesiastes=Åêëèñèàñò
+Song of Solomon=Ïåñåí íà Ïåñíèòå
+Isaiah=Èñàÿ
+Jeremiah=Éåðåìèÿ
+Lamentations=Ïëà÷úò íà Éåðåìèÿ
+Ezekiel=Éåçåêèë
+Daniel=Äàíèèë
+Hosea=Îñèÿ
+Joel=Éîèë
+Amos=Àìîñ
+Obadiah=Àâäèé
+Jonah=Éîíà
+Micah=Ìèõåé
+Nahum=Íàóì
+Habakkuk=Àâàêóì
+Zephaniah=Ñîôîíèÿ
+Haggai=Àãåé
+Zechariah=Çàõàðèÿ
+Malachi=Ìàëàõèÿ
+Matthew=Ìàòåé
+Mark=Ìàðêî
+Luke=Ëóêà
+John=Éîàí
+Acts=Äåÿíèÿ íà Àïîñòîëèòå
+Romans=Ðèìëÿíè
+I Corinthians=1 Êîðèíòÿíè
+II Corinthians=2 Êîðèíòÿíè
+Galatians=Ãàëàòÿíè
+Ephesians=Åôåñÿíè
+Philippians=Ôèëèïÿíè
+Colossians=Êîëîñÿíè
+I Thessalonians=1 Ñîëóíöè
+II Thessalonians=2 Ñîëóíöè
+I Timothy=1 Òèìîòåé
+II Timothy=2 Òèìîòåé
+Titus=Òèò
+Philemon=Ôèëèìîí
+Hebrews=Åâðåè
+James=ßêîâ
+I Peter=1 Ïåòðîâî
+II Peter=2 Ïåòðîâî
+I John=1 Éîàíîâî
+II John=2 Éîàíîâî
+III John=3 Éîàíîâî
+Jude=Þäà
+Revelation of John=Îòêðîâåíèåòî íà Éîàí
+
+[Book Abbrevs]
+
+Áèòèå=Gen
+Áèò=Gen
+
+Èçõîä=Exod
+Èçõ=Exod
+
+Ëåâèò=Lev
+
+×èñëà=Num
+
+Âòîðîçàêîíèå=Deut
+
+Èñóñ Íàâèí=Josh
+
+Ñúäèè=Judg
+
+Ðóò=Ruth
+
+1 Êíèãà íà Öàðåòå=1Sam
+1 Öàðå=1Sam
+
+2 Kíèãà íà Öàðåòå=2Sam
+2 Öàðå=2Sam
+
+3 Êíèãà íà Öàðåòå=1Kgs
+3 Öàðå=1Kgs
+
+4 Êíèãà íà Öàðåòå=2Kgs
+4 Öàðå=2Kgs
+
+1 Êíèãà íà Ëåòîïèñèòå=1Chr
+1 Ëåòîïèñè=1Chr
+
+2 Êíèãà íà Ëåòîïèñèòå=2Chr
+2 Ëåòîïèñè=2Chr
+
+Åçäðà=Ezra
+
+Íååìèÿ=Neh
+
+Åñòèð=Esth
+
+Éîâ=Job
+
+Ïñàëìè=Ps
+
+Ïðèò÷è=Prov
+
+Åêëèñèàñò=Eccl
+
+Ïåñåí íà Ïåñíèòå=Song
+
+Èñàÿ=Isa
+
+Éåðåìèÿ=Jer
+
+Ïëà÷úò íà Éåðåìèÿ=Lam
+
+Éåçåêèë=Ezek
+
+Äàíèèë=Dan
+
+Îñèÿ=Hos
+
+Éîèë=Joel
+
+Àìîñ=Amos
+
+Àâäèé=Obad
+
+Éîíà=Jonah
+
+Ìèõåé=Mic
+
+Íàóì=Nah
+
+Àâàêóì=Hab
+
+Ñîôîíèÿ=Zeph
+
+Àãåé=Hag
+
+Çàõàðèÿ=Zech
+
+Ìàëàõèÿ=Mal
+
+Ìàòåé=Matt
+
+Ìàðêî=Mark
+
+Ëóêà=Luke
+
+Éîàí=John
+
+Äåÿíèÿ íà Àïîñòîëèòå=Acts
+Äåÿíèÿ=Acts
+
+Ðèìëÿíè=Rom
+
+1 Êîðèíòÿíè=1Cor
+
+2 Êîðèíòÿíè=2Cor
+
+Ãàëàòÿíè=Gal
+
+Åôåñÿíè=Eph
+
+Ôèëèïÿíè=Phil
+
+Êîëîñÿíè=Col
+
+1 Ñîëóíöè=1Thess
+
+2 Ñîëóíöè=2Thess
+
+1 Òèìîòåé=1Tim
+
+2 Òèìîòåé=2Tim
+
+Òèò=Titus
+
+Ôèëèìîí=Phlm
+
+Åâðåè=Heb
+
+ßêîâ=Jas
+
+1 Ïåòðîâî=1Pet
+
+2 Ïåòðîâî=2Pet
+
+1 Éîàíîâî=1John
+
+2 Éîàíîâî=2John
+
+3 Éîàíîâî=3John
+
+Þäà=Jude
+
+Îòêðîâåíèåòî íà Éîàí=Rev
+Îòêðîâåíèå=Rev
diff --git a/locales.d/cs-utf8.conf b/locales.d/cs-utf8.conf
new file mode 100644
index 0000000..b2066a3
--- /dev/null
+++ b/locales.d/cs-utf8.conf
@@ -0,0 +1,278 @@
+#
+#               Czech Bible books for Sword.
+#
+#       2000/04/12. (c) Petr@Kristof.CZ, GNU GPL 2.0.
+#
+# Notice: the locales name of czech language is CS, not CZ.
+#         CZ is shortcut name of state (Czech Republic).
+#
+# Notice: For correct czech environment you must set locales to "cs_CZ"
+#
+# Notice: Names and abbreviations are in compliance with authority
+#         A. Novotný: Biblický slovník (1967).
+#
+
+[Meta]
+Name=cs
+Description=Czech (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Leviticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Jozue
+Judges=Soudců
+Ruth=Rut
+I Samuel=1. Samuelova
+II Samuel=2. Samuelova
+I Kings=1. Královská
+II Kings=2. Královská
+I Chronicles=1. Paralipomenon
+II Chronicles=2. Paralipomenon
+Ezra=Ezdráš
+Nehemiah=Nehemiáš
+Esther=Ester
+Job=Job
+Psalms=Žalmy
+Proverbs=Přísloví
+Ecclesiastes=Kazatel
+Song of Solomon=Píseň Šalomounova
+Isaiah=Izaiáš
+Jeremiah=Jeremiáš
+Lamentations=Plá� Jeremiášův
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Ozeáš
+Joel=Joel
+Amos=Amos
+Obadiah=Abdiáš
+Jonah=Jonáš
+Micah=Micheáš
+Nahum=Nahum
+Habakkuk=Abakuk
+Zephaniah=Sofoniáš
+Haggai=Aggeus
+Zechariah=Zachariáš
+Malachi=Malachiáš
+Matthew=Matouš
+Mark=Marek
+Luke=Lukáš
+John=Jan
+Acts=Skutky
+Romans=Římanům
+I Corinthians=1. Korintským
+II Corinthians=2. Korintským
+Galatians=Galatským
+Ephesians=Efezským
+Philippians=Filipenským
+Colossians=Kolossenským
+I Thessalonians=1. Tessalonicenským
+II Thessalonians=2. Tessalonicenským
+I Timothy=1. Timoteovi
+II Timothy=2. Timoteovi
+Titus=Titovi
+Philemon=Filemonovi
+Hebrews=Židům
+James=Jakub
+I Peter=1. Petrova
+II Peter=2. Petrova
+I John=1. Janova
+II John=2. Janova
+III John=3. Janova
+Jude=Juda
+Revelation of John=Zjevení
+
+[Book Abbrevs]
+
+GENESIS=Gen
+GN=Gen
+EXODUS=Exod
+EX=Exod
+LEVITICUS=Lev
+LV=Lev
+NUMERI=Num
+NU=Num
+DEUTERONOMIUM=Deut
+DT=Deut
+JOZUE=Josh
+JOZ=Josh
+SOUDCÅ®=Judg
+SD=Judg
+RUT=Ruth
+RT=Ruth
+
+1. SAMUELOVA=1Sam
+1 SAMUELOVA=1Sam
+1SAMUELOVA=1Sam
+1S=1Sam
+
+2. SAMUELOVA=2Sam
+2 SAMUELOVA=2Sam
+2SAMUELOVA=2Sam
+2S=2Sam
+
+1. KR�LOVSK�=1Kgs
+1 KR�LOVSK�=1Kgs
+1KR�LOVSK�=1Kgs
+1KR=1Kgs
+
+2. KR�LOVSK�=2Kgs
+2 KR�LOVSK�=2Kgs
+2KR�LOVSK�=2Kgs
+2KR=2Kgs
+
+1. PARALIPOMENON=1Chr
+1 PARALIPOMENON=1Chr
+1PARALIPOMENON=1Chr
+1PA=1Chr
+
+2. PARALIPOMENON=2Chr
+2 PARALIPOMENON=2Chr
+2PARALIPOMENON=2Chr
+2PA=2Chr
+
+EZDR�Š=Ezra
+EZD=Ezra
+NEHEMI�Š=Neh
+NEH=Neh
+ESTER=Esth
+EST=Esth
+JOB=Job
+JB=Job
+ŽALMY=Ps
+Ž=Ps
+P�SLOV�=Prov
+PŘ=Prov
+KAZATEL=Eccl
+KAZ=Eccl
+P�SEŇ ŠALOMOUNOVA=Song
+P�SEŇ ŠALAMOUNOVA=Song
+P�S=Song
+IZAI�Š=Isa
+IZ=Isa
+JEREMI�Š=Jer
+JR=Jer
+PL�Č JEREMI�ŠŮV=Lam
+PL=Lam
+EZECHIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OZE�Š=Hos
+OZ=Hos
+JOEL=Joel
+JL=Joel
+AMOS=Amos
+AM=Amos
+ABDI�Š=Obad
+ABD=Obad
+JON�Š=Jonah
+JON=Jonah
+MICHE�Š=Mic
+MI=Mic
+NAHUM=Nah
+NA=Nah
+ABAKUK=Hab
+AB=Hab
+SOFONI�Š=Zeph
+SF=Zeph
+AGGEUS=Hag
+AG=Hag
+ZACHARI�Š=Zech
+ZA=Zech
+MALACHI�Š=Mal
+MAL=Mal
+MATOUÅ =Matt
+MT=Matt
+MAREK=Mark
+MK=Mark
+LUK�Š=Luke
+LK=Luke
+L=Luke
+JAN=John
+J=John
+SKUTKY=Acts
+SK=Acts
+Ř�MANŮM=Rom
+Ř=Rom
+
+1. KORINTSK�M=1Cor
+1 KORINTSK�M=1Cor
+1KORINTSK�M=1Cor
+1K=1Cor
+
+2. KORINTSK�M=2Cor
+2 KORINTSK�M=2Cor
+2KORINTSK�M=2Cor
+2K=2Cor
+
+GALATSK�M=Gal
+GA=Gal
+EFEZSK�M=Eph
+EF=Eph
+FILIPENSK�M=Phil
+FP=Phil
+KOLOSSENSK�M=Col
+KO=Col
+
+1. TESSALONICENSK�M=1Thess
+1 TESSALONICENSK�M=1Thess
+1TESSALONICENSK�M=1Thess
+1TE=1Thess
+
+2. TESSALONICENSK�M=2Thess
+2 TESSALONICENSK�M=2Thess
+2TESSALONICENSK�M=2Thess
+2TE=2Thess
+
+1. TIMOTEOVI=1Tim
+1 TIMOTEOVI=1Tim
+1TIMOTEOVI=1Tim
+1TM=1Tim
+
+2. TIMOTEOVI=2Tim
+2 TIMOTEOVI=2Tim
+2TIMOTEOVI=2Tim
+2TM=2Tim
+
+TITOVI=Titus
+TT=Titus
+FILEMONOVI=Phlm
+FM=Phlm
+ŽIDŮM=Heb
+ŽD=Heb
+JAKUB=Jas
+JK=Jas
+
+1. PETROVA=1Pet
+1 PETROVA=1Pet
+1PETROVA=1Pet
+1PT=1Pet
+
+2. PETROVA=2Pet
+2 PETROVA=2Pet
+2PETROVA=2Pet
+2PT=2Pet
+
+1. JANOVA=1John
+1 JANOVA=1John
+1JANOVA=1John
+1J=1John
+
+2. JANOVA=2John
+2 JANOVA=2John
+2JANOVA=2John
+2J=2John
+
+3. JANOVA=3John
+3 JANOVA=3John
+3JANOVA=3John
+3J=3John
+
+JUDA=Jude
+JU=Jude
+ZJEVEN�=Rev
+ZJ=Rev
diff --git a/locales.d/cs.conf b/locales.d/cs.conf
new file mode 100644
index 0000000..f677aba
--- /dev/null
+++ b/locales.d/cs.conf
@@ -0,0 +1,278 @@
+#
+#               Czech Bible books for Sword.
+#
+#       2000/04/12. (c) Petr@Kristof.CZ, GNU GPL 2.0.
+#
+# Notice: the locales name of czech language is CS, not CZ.
+#         CZ is shortcut name of state (Czech Republic).
+#
+# Notice: For correct czech environment you must set locales to "cs_CZ"
+#
+# Notice: Names and abbreviations are in compliance with authority
+#         A. Novotný: Biblický slovník (1967).
+#
+
+[Meta]
+Name=cs
+Description=Czech
+Encoding=ISO8859-2
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Leviticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Jozue
+Judges=Soudcù
+Ruth=Rut
+I Samuel=1. Samuelova
+II Samuel=2. Samuelova
+I Kings=1. Královská
+II Kings=2. Královská
+I Chronicles=1. Paralipomenon
+II Chronicles=2. Paralipomenon
+Ezra=Ezdrá¹
+Nehemiah=Nehemiá¹
+Esther=Ester
+Job=Job
+Psalms=®almy
+Proverbs=Pøísloví
+Ecclesiastes=Kazatel
+Song of Solomon=Píseò ©alomounova
+Isaiah=Izaiá¹
+Jeremiah=Jeremiá¹
+Lamentations=Pláè Jeremiá¹ùv
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Ozeá¹
+Joel=Joel
+Amos=Amos
+Obadiah=Abdiá¹
+Jonah=Joná¹
+Micah=Micheá¹
+Nahum=Nahum
+Habakkuk=Abakuk
+Zephaniah=Sofoniá¹
+Haggai=Aggeus
+Zechariah=Zachariá¹
+Malachi=Malachiá¹
+Matthew=Matou¹
+Mark=Marek
+Luke=Luká¹
+John=Jan
+Acts=Skutky
+Romans=Øímanùm
+I Corinthians=1. Korintským
+II Corinthians=2. Korintským
+Galatians=Galatským
+Ephesians=Efezským
+Philippians=Filipenským
+Colossians=Kolossenským
+I Thessalonians=1. Tessalonicenským
+II Thessalonians=2. Tessalonicenským
+I Timothy=1. Timoteovi
+II Timothy=2. Timoteovi
+Titus=Titovi
+Philemon=Filemonovi
+Hebrews=®idùm
+James=Jakub
+I Peter=1. Petrova
+II Peter=2. Petrova
+I John=1. Janova
+II John=2. Janova
+III John=3. Janova
+Jude=Juda
+Revelation of John=Zjevení
+
+[Book Abbrevs]
+
+GENESIS=Gen
+GN=Gen
+EXODUS=Exod
+EX=Exod
+LEVITICUS=Lev
+LV=Lev
+NUMERI=Num
+NU=Num
+DEUTERONOMIUM=Deut
+DT=Deut
+JOZUE=Josh
+JOZ=Josh
+SOUDCÙ=Judg
+SD=Judg
+RUT=Ruth
+RT=Ruth
+
+1. SAMUELOVA=1Sam
+1 SAMUELOVA=1Sam
+1SAMUELOVA=1Sam
+1S=1Sam
+
+2. SAMUELOVA=2Sam
+2 SAMUELOVA=2Sam
+2SAMUELOVA=2Sam
+2S=2Sam
+
+1. KRÁLOVSKÁ=1Kgs
+1 KRÁLOVSKÁ=1Kgs
+1KRÁLOVSKÁ=1Kgs
+1KR=1Kgs
+
+2. KRÁLOVSKÁ=2Kgs
+2 KRÁLOVSKÁ=2Kgs
+2KRÁLOVSKÁ=2Kgs
+2KR=2Kgs
+
+1. PARALIPOMENON=1Chr
+1 PARALIPOMENON=1Chr
+1PARALIPOMENON=1Chr
+1PA=1Chr
+
+2. PARALIPOMENON=2Chr
+2 PARALIPOMENON=2Chr
+2PARALIPOMENON=2Chr
+2PA=2Chr
+
+EZDRÁ¹=Ezra
+EZD=Ezra
+NEHEMIÁ¹=Neh
+NEH=Neh
+ESTER=Esth
+EST=Esth
+JOB=Job
+JB=Job
+®ALMY=Ps
+®=Ps
+PØÍSLOVÍ=Prov
+PØ=Prov
+KAZATEL=Eccl
+KAZ=Eccl
+PÍSEÒ ©ALOMOUNOVA=Song
+PÍSEÒ ©ALAMOUNOVA=Song
+PÍS=Song
+IZAIÁ¹=Isa
+IZ=Isa
+JEREMIÁ¹=Jer
+JR=Jer
+PLÁÈ JEREMIÁ¹ÙV=Lam
+PL=Lam
+EZECHIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OZEÁ¹=Hos
+OZ=Hos
+JOEL=Joel
+JL=Joel
+AMOS=Amos
+AM=Amos
+ABDIÁ¹=Obad
+ABD=Obad
+JONÁ¹=Jonah
+JON=Jonah
+MICHEÁ¹=Mic
+MI=Mic
+NAHUM=Nah
+NA=Nah
+ABAKUK=Hab
+AB=Hab
+SOFONIÁ¹=Zeph
+SF=Zeph
+AGGEUS=Hag
+AG=Hag
+ZACHARIÁ¹=Zech
+ZA=Zech
+MALACHIÁ¹=Mal
+MAL=Mal
+MATOU¹=Matt
+MT=Matt
+MAREK=Mark
+MK=Mark
+LUKÁ¹=Luke
+LK=Luke
+L=Luke
+JAN=John
+J=John
+SKUTKY=Acts
+SK=Acts
+ØÍMANÙM=Rom
+Ø=Rom
+
+1. KORINTSKÝM=1Cor
+1 KORINTSKÝM=1Cor
+1KORINTSKÝM=1Cor
+1K=1Cor
+
+2. KORINTSKÝM=2Cor
+2 KORINTSKÝM=2Cor
+2KORINTSKÝM=2Cor
+2K=2Cor
+
+GALATSKÝM=Gal
+GA=Gal
+EFEZSKÝM=Eph
+EF=Eph
+FILIPENSKÝM=Phil
+FP=Phil
+KOLOSSENSKÝM=Col
+KO=Col
+
+1. TESSALONICENSKÝM=1Thess
+1 TESSALONICENSKÝM=1Thess
+1TESSALONICENSKÝM=1Thess
+1TE=1Thess
+
+2. TESSALONICENSKÝM=2Thess
+2 TESSALONICENSKÝM=2Thess
+2TESSALONICENSKÝM=2Thess
+2TE=2Thess
+
+1. TIMOTEOVI=1Tim
+1 TIMOTEOVI=1Tim
+1TIMOTEOVI=1Tim
+1TM=1Tim
+
+2. TIMOTEOVI=2Tim
+2 TIMOTEOVI=2Tim
+2TIMOTEOVI=2Tim
+2TM=2Tim
+
+TITOVI=Titus
+TT=Titus
+FILEMONOVI=Phlm
+FM=Phlm
+®IDÙM=Heb
+®D=Heb
+JAKUB=Jas
+JK=Jas
+
+1. PETROVA=1Pet
+1 PETROVA=1Pet
+1PETROVA=1Pet
+1PT=1Pet
+
+2. PETROVA=2Pet
+2 PETROVA=2Pet
+2PETROVA=2Pet
+2PT=2Pet
+
+1. JANOVA=1John
+1 JANOVA=1John
+1JANOVA=1John
+1J=1John
+
+2. JANOVA=2John
+2 JANOVA=2John
+2JANOVA=2John
+2J=2John
+
+3. JANOVA=3John
+3 JANOVA=3John
+3JANOVA=3John
+3J=3John
+
+JUDA=Jude
+JU=Jude
+ZJEVENÍ=Rev
+ZJ=Rev
diff --git a/locales.d/cy-utf8.conf b/locales.d/cy-utf8.conf
new file mode 100644
index 0000000..e9332b9
--- /dev/null
+++ b/locales.d/cy-utf8.conf
@@ -0,0 +1,171 @@
+[Meta]
+Name=cy
+Description=Cymraeg (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Lefiticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Josua
+Judges=Barnwyr
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Brenhinoedd
+II Kings=2 Brenhinoedd
+I Chronicles=1 Cronicl
+II Chronicles=2 Cronicl
+Ezra=Esra
+Nehemiah=Nehemeia
+Esther=Esther
+Job=Job
+Psalms=Salmau
+Proverbs=Diarhebion
+Ecclesiastes=Pregethwr
+Song of Solomon=Caniad Solomon
+Isaiah=Eseia
+Jeremiah=Jeremeia
+Lamentations=Galarnad
+Ezekiel=Eseciel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadeia
+Jonah=Jona
+Micah=Micha
+Nahum=Nahum
+Habakkuk=Habacuc
+Zephaniah=Seffaneia
+Haggai=Haggai
+Zechariah=Sechareia
+Malachi=Malachi
+Matthew=Mathew
+Mark=Marc
+Luke=Luc
+John=Ioan
+Acts=Actau
+Romans=Rhufeiniaid
+I Corinthians=1 Corinthiaid
+II Corinthians=2 Corinthiaid
+Galatians=Galatiaid
+Ephesians=Effesiaid
+Philippians=Philipiaid
+Colossians=Colosiaid
+I Thessalonians=1 Thesaloniaid
+II Thessalonians=2 Thesaloniaid
+I Timothy=1 Timotheus
+II Timothy=2 Timotheus
+Titus=Titus
+Philemon=Philemon
+Hebrews=Hebreaid
+James=Iago
+I Peter=1 Pedr
+II Peter=2 Pedr
+I John=1 Ioan
+II John=2 Ioan
+III John=3 Ioan
+Jude=Jwdas
+Revelation of John=Datguddiad
+
+[Book Abbrevs]
+
+GENESIS=Gen
+EXODUS=Exod
+LEFITICUS=Lev
+NUMERI=Num
+DEUTERONOMIUM=Deut
+JOSUA=Josh
+BARNWYR=Judg
+
+1 SAMUEL=1Sam
+1SAMUEL=1Sam
+
+2 SAMUEL=2Sam
+2SAMUEL=2Sam
+
+1 BRENHINOEDD=1Kgs
+1BRENHINOEDD=1Kgs
+
+2 BRENHINOEDD=2Kgs
+2BRENHINOEDD=2Kgs
+
+1 CRONICL=1Chr
+1CRONICL=1Chr
+
+2 CRONICL=2Chr
+2CRONICL=2Chr
+
+ESRA=Ezra
+NEHEMEIA=Neh
+ESTHER=Esth
+SALMAU=Ps
+DIARHEBION=Prov
+PREGETHWR=Eccl
+CANIAD SOLOMON=Song
+ESEIA=Isa
+JEREMEIA=Jer
+GALARNAD=Lam
+ESECIEL=Ezek
+OBADEIA=Obad
+JONA=Jonah
+MICHA=Mic
+HABACUC=Hab
+SEFFANEIA=Zeph
+HAGGAI=Hag
+SECHAREIA=Zech
+
+MATHEW=Matt
+MARC=Mark
+LUC=Luke
+IOAN=John
+ACTAU=Acts
+RHUFEINIAID=Rom
+
+1 CORINTHIAID=1Cor
+1CORINTHIAID=1Cor
+
+2 CORINTHIAID=2Cor
+2CORINTHIAID=2Cor
+
+GALATIAID=Gal
+EFFESIAID=Eph
+PHILIPIAID=Phil
+COLOSIAID=Col
+
+1 THESALONIAID=1Thess
+1THESALONIAID=1Thess
+
+2 THESALONIAID=2Thess
+2THESALONIAID=2Thes
+
+1 TIMOTHEUS=1Tim
+1TIMOTHEUS=1Tim
+
+2 TIMOTHEUS=2Tim
+2TIMOTHEUS=2Tim
+
+HEBREAID=Heb
+IAGO=Jas
+
+1 PEDR=1Pet
+1PEDR=1Pet
+
+2 PEDR=2Pet
+2PEDR=2Pet
+
+1 IOAN=1John
+1IOAN=1John
+
+2 IOAN=2John
+2IOAN=2John
+
+3 IOAN=3John
+3IOAN=3John
+
+JWDAS=Jude
+DATGUDDIAD=Rev
+
diff --git a/locales.d/cy.conf b/locales.d/cy.conf
new file mode 100644
index 0000000..20a4788
--- /dev/null
+++ b/locales.d/cy.conf
@@ -0,0 +1,171 @@
+[Meta]
+Name=cy
+Description=Cymraeg
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Lefiticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Josua
+Judges=Barnwyr
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Brenhinoedd
+II Kings=2 Brenhinoedd
+I Chronicles=1 Cronicl
+II Chronicles=2 Cronicl
+Ezra=Esra
+Nehemiah=Nehemeia
+Esther=Esther
+Job=Job
+Psalms=Salmau
+Proverbs=Diarhebion
+Ecclesiastes=Pregethwr
+Song of Solomon=Caniad Solomon
+Isaiah=Eseia
+Jeremiah=Jeremeia
+Lamentations=Galarnad
+Ezekiel=Eseciel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadeia
+Jonah=Jona
+Micah=Micha
+Nahum=Nahum
+Habakkuk=Habacuc
+Zephaniah=Seffaneia
+Haggai=Haggai
+Zechariah=Sechareia
+Malachi=Malachi
+Matthew=Mathew
+Mark=Marc
+Luke=Luc
+John=Ioan
+Acts=Actau
+Romans=Rhufeiniaid
+I Corinthians=1 Corinthiaid
+II Corinthians=2 Corinthiaid
+Galatians=Galatiaid
+Ephesians=Effesiaid
+Philippians=Philipiaid
+Colossians=Colosiaid
+I Thessalonians=1 Thesaloniaid
+II Thessalonians=2 Thesaloniaid
+I Timothy=1 Timotheus
+II Timothy=2 Timotheus
+Titus=Titus
+Philemon=Philemon
+Hebrews=Hebreaid
+James=Iago
+I Peter=1 Pedr
+II Peter=2 Pedr
+I John=1 Ioan
+II John=2 Ioan
+III John=3 Ioan
+Jude=Jwdas
+Revelation of John=Datguddiad
+
+[Book Abbrevs]
+
+GENESIS=Gen
+EXODUS=Exod
+LEFITICUS=Lev
+NUMERI=Num
+DEUTERONOMIUM=Deut
+JOSUA=Josh
+BARNWYR=Judg
+
+1 SAMUEL=1Sam
+1SAMUEL=1Sam
+
+2 SAMUEL=2Sam
+2SAMUEL=2Sam
+
+1 BRENHINOEDD=1Kgs
+1BRENHINOEDD=1Kgs
+
+2 BRENHINOEDD=2Kgs
+2BRENHINOEDD=2Kgs
+
+1 CRONICL=1Chr
+1CRONICL=1Chr
+
+2 CRONICL=2Chr
+2CRONICL=2Chr
+
+ESRA=Ezra
+NEHEMEIA=Neh
+ESTHER=Esth
+SALMAU=Ps
+DIARHEBION=Prov
+PREGETHWR=Eccl
+CANIAD SOLOMON=Song
+ESEIA=Isa
+JEREMEIA=Jer
+GALARNAD=Lam
+ESECIEL=Ezek
+OBADEIA=Obad
+JONA=Jonah
+MICHA=Mic
+HABACUC=Hab
+SEFFANEIA=Zeph
+HAGGAI=Hag
+SECHAREIA=Zech
+
+MATHEW=Matt
+MARC=Mark
+LUC=Luke
+IOAN=John
+ACTAU=Acts
+RHUFEINIAID=Rom
+
+1 CORINTHIAID=1Cor
+1CORINTHIAID=1Cor
+
+2 CORINTHIAID=2Cor
+2CORINTHIAID=2Cor
+
+GALATIAID=Gal
+EFFESIAID=Eph
+PHILIPIAID=Phil
+COLOSIAID=Col
+
+1 THESALONIAID=1Thess
+1THESALONIAID=1Thess
+
+2 THESALONIAID=2Thess
+2THESALONIAID=2Thes
+
+1 TIMOTHEUS=1Tim
+1TIMOTHEUS=1Tim
+
+2 TIMOTHEUS=2Tim
+2TIMOTHEUS=2Tim
+
+HEBREAID=Heb
+IAGO=Jas
+
+1 PEDR=1Pet
+1PEDR=1Pet
+
+2 PEDR=2Pet
+2PEDR=2Pet
+
+1 IOAN=1John
+1IOAN=1John
+
+2 IOAN=2John
+2IOAN=2John
+
+3 IOAN=3John
+3IOAN=3John
+
+JWDAS=Jude
+DATGUDDIAD=Rev
+
diff --git a/locales.d/da-utf8.conf b/locales.d/da-utf8.conf
new file mode 100644
index 0000000..f9635f7
--- /dev/null
+++ b/locales.d/da-utf8.conf
@@ -0,0 +1,387 @@
+[Meta]
+Name=da
+Description=Dansk (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Første Mosebog
+Exodus=Anden Mosebog
+Leviticus=Tredje Mosebog
+Numbers=Fjerde Mosebog
+Deuteronomy=Femte Mosebog
+Joshua=Josvabogen
+Judges=Dommerbogen
+Ruth=Ruths Bog
+I Samuel=1. Samuelsbog
+II Samuel=2. Samuelsbog
+I Kings=1. Kongebog
+II Kings=2. Kongebog
+I Chronicles=1. Krønikebog
+II Chronicles=2. Krønikebog
+Ezra=Ezras Bog
+Nehemiah=Nehemias' Bog
+Esther=Esters Bog
+Job=Jobs Bog
+Psalms=Salmernes Bog
+Proverbs=Ordsprogenes Bog
+Ecclesiastes=Prædikerens Bog
+Song of Solomon=Højsangen
+Isaiah=Esajas' Bog
+Jeremiah=Jeremias' Bog
+Lamentations=Klagesangene
+Ezekiel=Ezekiels Bog
+Daniel=Daniels Bog
+Hosea=Hoseas' Bog
+Joel=Joels Bog
+Amos=Amos' Bog
+Obadiah=Obadias' Bog
+Jonah=Jonas' Bog
+Micah=Mikas Bog
+Nahum=Nahums Bog
+Habakkuk=Habakkuks Bog
+Zephaniah=Sefanias' Bog
+Haggai=Haggajs Bog
+Zechariah=Zakarias' Bog
+Malachi=Malakias' Bog
+Matthew=Matthæusevangeliet
+Mark=Markusevangeliet
+Luke=Lukasevangeliet
+John=Johannesevangeliet
+Acts=Apostlenes Gerninger
+Romans=Paulus' Brev til Romerne
+I Corinthians=Paulus' Første Brev til  Korintherne
+II Corinthians=Paulus' Andet Brev til  Korintherne
+Galatians=Paulus' Brev til Galaterne
+Ephesians=Paulus' Brev til Efeserne
+Philippians=Paulus' Brev til Filipperne
+Colossians=Paulus' Brev til Kolossenserne
+I Thessalonians=Paulus' Første Brev til Thessalonikerne
+II Thessalonians=Paulus' Andet Brev til Thessalonikerne
+I Timothy=Paulus' Første Brev til Timotheus
+II Timothy=Paulus' Andet Brev til Timotheus
+Titus=Paulus' Brev til Titus
+Philemon=Paulus' Brev til Filemon
+Hebrews=Brevet til Hebræerne
+James=Jakobs Brev
+I Peter=Peters Første Brev
+II Peter=Peters Andet Brev
+I John=Johannes' Første Brev
+II John=Johannes' Andet Brev
+III John=Johannes' Tredje Brev
+Jude=Judas' Brev
+Revelation of John=Johannes' Ã…benbaring
+
+[Book Abbrevs]
+
+1. MOSEBOG=Gen
+1 MOSEBOG=Gen
+1MOSEBOG=Gen
+1 MOS=Gen
+
+2. MOSEBOG=Exod
+2 MOSEBOG=Exod
+2MOSEBOG=Exod
+2 MOS=Exod
+
+3. MOSEBOG=Lev
+3 MOSEBOG=Lev
+3MOSEBOG=Lev
+3 MOS=Lev
+
+4. MOSEBOG=Num
+4 MOSEBOG=Num
+4MOSEBOG=Num
+4 MOS=Num
+NUMERI=Num
+
+5. MOSEBOG=Deut
+5 MOSEBOG=Deut
+5MOSEBOG=Deut
+5 MOS=Deut
+DEUTERONOMIUM=Deut
+
+JOSVA=Josh
+JOSUA=Josh
+JOS=Josh
+DOMMER=Judg
+DOM=Judg
+JUDICIUM=Judg
+RUTH=Ruth
+RUT=Ruth
+
+1. SAMUEL=1Sam
+1 SAMUEL=1Sam
+1SAMUEL=1Sam
+1 SAM=1Sam
+
+2. SAMUEL=2Sam
+2 SAMUEL=2Sam
+2SAMUEL=2Sam
+2 SAM=2Sam
+
+1. KONGE=1Kgs
+1 KONGE=1Kgs
+1KONGE=1Kgs
+1 KONG=1Kgs
+
+2. KONGE=2Kgs
+2 KONGE=2Kgs
+2KONGE=2Kgs
+2 KONG=2Kgs
+
+1. KRØNIKE=1Chr
+1 KRØNIKE=1Chr
+1KRØNIKE=1Chr
+1 KRØN=1Chr
+
+2. KRØNIKE=2Chr
+2 KRØNIKE=2Chr
+2KRØNIKE=2Chr
+2 KRØN=2Chr
+
+EZRA=Ezra
+NEHEMIAS=Neh
+NEH=Neh
+ESTER=Esth
+JOB=Job
+SALMERNE=Ps
+SL=Ps
+PSALM=Ps
+PSL=Ps
+ORDSPROGENE=Prov
+ORDSP=Prov
+PRÆDIKEREN=Eccl
+PRÆD=Eccl
+HØJSANGEN=Song
+HØJS=Song
+SALOMOS HØJSANG=Song
+ESAJAS=Isa
+ES=Isa
+JEREMIAS=Jer
+JER=Jer
+KLAGESANGENE=Lam
+KLAGES=Lam
+EZEKIEL=Ezek
+EZ=Ezek
+EZEK=Ezek
+DANIEL=Dan
+DAN=Dan
+HOSEAS=Hos
+HOS=Hos
+JOEL=Joel
+AMOS=Amos
+AM=Amos
+OBADIAS=Obad
+OBAD=Obad
+JONAS=Jonah
+JON=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+HAB=Hab
+ZEFANIAS=Zeph
+ZEF=Zeph
+HAGGAJ=Hag
+HAGG=Hag
+ZAKARIAS=Zech
+ZAK=Zech
+MALAKIAS=Mal
+MAL=Mal
+MATTHÆUS=Matt
+MATT=Matt
+MATTH=Matt
+MARKUS=Mark
+MARK=Mark
+LUKAS=Luke
+LUK=Luke
+JOHANNES=John
+JOH=John
+APOSTLENE=Acts
+AP.G=Acts
+AP G=Acts
+APG=Acts
+APOST=Acts
+ACTA=Acts
+ROMER=Rom
+ROM=Rom
+
+1. KORINTHER=1Cor
+1 KORINTHER=1Cor
+1KORINTHER=1Cor
+1 KOR=1Cor
+
+2. KORINTHER=2Cor
+2 KORINTHER=2Cor
+2KORINTHER=2Cor
+2 KOR=2Cor
+
+GALATER=Gal
+GALATERNE=Gal
+GAL=Gal
+EFESER=Eph
+EFESERBREVET=Eph
+EFESERNE=Eph
+EF=Eph
+FILIPPER=Phil
+FILIPPERBREVET=Phil
+FILIPPERNE=Phil
+FIL=Phil
+KOLOSSENSER=Col
+KOLOSSENSERNE=Col
+KOLOSSENSERBREVET=Col
+KOLOSSER=Col
+KOLOSSERNE=Col
+KOLOSSERBREVET=Col
+KOL=Col
+
+1. THESSALONIKER=1Thess
+1 THESSALONIKER=1Thess
+1THESSALONIKER=1Thess
+1 TESS=1Thess
+1 THESS=1Thess
+
+2. THESSALONIKER=2Thess
+2 THESSALONIKER=2Thess
+2THESSALONIKER=2Thess
+2 TESS=2Thess
+2 THESS=2Thess
+
+1. TIMOTHEUS=1Tim
+1 TIMOTHEUS=1Tim
+1TIMOTHEUS=1Tim
+1 TIM=1Tim
+
+2. TIMOTHEUS=2Tim
+2 TIMOTHEUS=2Tim
+2TIMOTHEUS=2Tim
+2 TIM=2Tim
+
+TITUS=Titus
+TIT=Titus
+FILEMON=Phlm
+FILEM=Phlm
+HEBRÆERNE=Heb
+HEBR=Heb
+HEBRÆERBREVET=Heb
+JAKOB=Jas
+JAKOBSBREVET=Jas
+JAK=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+1 PET=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+2 PET=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+1 JOH=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+2 JOH=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+3 JOH=3John
+
+JUDAS=Jude
+Ã…BENBARINGEN=Rev
+Ã…B=Rev
+AAB=Rev
+Ã…BENBARINGSBOGEN=Rev
+JOHANNES' APOKALYPSE=Rev
+APOKALYPSEN=Rev
+
+FØRSTE MOSEBOG=Gen
+ANDEN MOSEBOG=Exod
+TREDJE MOSEBOG=Lev
+FJERDE MOSEBOG=Num
+FEMTE MOSEBOG=Deut
+JOSVABOGEN=Josh
+DOMMERBOGEN=Judg
+RUTHS BOG=Ruth
+
+1. SAMUELSBOG=1Sam
+1 SAMUELSBOG=1Sam
+1SAMUELSBOG=1Sam
+
+2. SAMUELSBOG=2Sam
+2 SAMUELSBOG=2Sam
+2SAMUELSBOG=2Sam
+
+1. KONGEBOG=1Kgs
+1 KONGEBOG=1Kgs
+1KONGEBOG=1Kgs
+
+2. KONGEBOG=2Kgs
+2 KONGEBOG=2Kgs
+2KONGEBOG=2Kgs
+
+1. KRØNIKEBOG=1Chr
+1 KRØNIKEBOG=1Chr
+1KRØNIKEBOG=1Chr
+
+2. KRØNIKEBOG=2Chr
+2 KRØNIKEBOG=2Chr
+2KRØNIKEBOG=2Chr
+
+EZRAS BOG=Ezra
+NEHEMIAS' BOG=Neh
+ESTERS BOG=Esth
+JOBS BOG=Job
+SALMERNES BOG=Ps
+ORDSPROGENES BOG=Prov
+PRÆDIKERENS BOG=Eccl
+HØJSANGEN=Song
+ESAJAS' BOG=Isa
+JEREMIAS' BOG=Jer
+KLAGESANGENE=Lam
+EZEKIELS BOG=Ezek
+DANIELS BOG=Dan
+HOSEAS' BOG=Hos
+JOELS BOG=Joel
+AMOS' BOG=Amos
+OBADIAS' BOG=Obad
+JONAS' BOG=Jonah
+MIKAS BOG=Mic
+NAHUMS BOG=Nah
+HABAKKUKS BOG=Hab
+SEFANIAS' BOG=Zeph
+HAGGAJS BOG=Hag
+ZAKARIAS' BOG=Zech
+MALAKIAS' BOG=Mal
+MATTHÆUSEVANGELIET=Matt
+MARKUSEVANGELIET=Mark
+LUKASEVANGELIET=Luke
+JOHANNESEVANGELIET=John
+APOSTLENES GERNINGER=Acts
+PAULUS' BREV TIL ROMERNE=Rom
+PAULUS' FØRSTE BREV TIL  KORINTHERNE=1Cor
+PAULUS' ANDET BREV TIL  KORINTHERNE=2Cor
+PAULUS' BREV TIL GALATERNE=Gal
+PAULUS' BREV TIL EFESERNE=Eph
+PAULUS' BREV TIL FILIPPERNE=Phil
+PAULUS' BREV TIL KOLOSSENSERNE=Col
+PAULUS' FØRSTE BREV TIL THESSALONIKERNE=1Thess
+PAULUS' ANDET BREV TIL THESSALONIKERNE=2Thess
+PAULUS' FØRSTE BREV TIL TIMOTHEUS=1Tim
+PAULUS' ANDET BREV TIL TIMOTHEUS=2Tim
+PAULUS' BREV TIL TITUS=Titus
+PAULUS' BREV TIL FILEMON=Phlm
+BREVET TIL HEBRÆERNE=Heb
+JAKOBS BREV=Jas
+PETERS FØRSTE BREV=1Pet
+PETERS ANDET BREV=2Pet
+JOHANNES' FØRSTE BREV=1John
+JOHANNES' ANDET BREV=2John
+JOHANNES' TREDJE BREV=3John
+JUDAS' BREV=Jude
+JOHANNES' Ã…BENBARING=Rev
diff --git a/locales.d/da.conf b/locales.d/da.conf
new file mode 100644
index 0000000..54c421f
--- /dev/null
+++ b/locales.d/da.conf
@@ -0,0 +1,387 @@
+[Meta]
+Name=da
+Description=Dansk
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Første Mosebog
+Exodus=Anden Mosebog
+Leviticus=Tredje Mosebog
+Numbers=Fjerde Mosebog
+Deuteronomy=Femte Mosebog
+Joshua=Josvabogen
+Judges=Dommerbogen
+Ruth=Ruths Bog
+I Samuel=1. Samuelsbog
+II Samuel=2. Samuelsbog
+I Kings=1. Kongebog
+II Kings=2. Kongebog
+I Chronicles=1. Krønikebog
+II Chronicles=2. Krønikebog
+Ezra=Ezras Bog
+Nehemiah=Nehemias' Bog
+Esther=Esters Bog
+Job=Jobs Bog
+Psalms=Salmernes Bog
+Proverbs=Ordsprogenes Bog
+Ecclesiastes=Prædikerens Bog
+Song of Solomon=Højsangen
+Isaiah=Esajas' Bog
+Jeremiah=Jeremias' Bog
+Lamentations=Klagesangene
+Ezekiel=Ezekiels Bog
+Daniel=Daniels Bog
+Hosea=Hoseas' Bog
+Joel=Joels Bog
+Amos=Amos' Bog
+Obadiah=Obadias' Bog
+Jonah=Jonas' Bog
+Micah=Mikas Bog
+Nahum=Nahums Bog
+Habakkuk=Habakkuks Bog
+Zephaniah=Sefanias' Bog
+Haggai=Haggajs Bog
+Zechariah=Zakarias' Bog
+Malachi=Malakias' Bog
+Matthew=Matthæusevangeliet
+Mark=Markusevangeliet
+Luke=Lukasevangeliet
+John=Johannesevangeliet
+Acts=Apostlenes Gerninger
+Romans=Paulus' Brev til Romerne
+I Corinthians=Paulus' Første Brev til  Korintherne
+II Corinthians=Paulus' Andet Brev til  Korintherne
+Galatians=Paulus' Brev til Galaterne
+Ephesians=Paulus' Brev til Efeserne
+Philippians=Paulus' Brev til Filipperne
+Colossians=Paulus' Brev til Kolossenserne
+I Thessalonians=Paulus' Første Brev til Thessalonikerne
+II Thessalonians=Paulus' Andet Brev til Thessalonikerne
+I Timothy=Paulus' Første Brev til Timotheus
+II Timothy=Paulus' Andet Brev til Timotheus
+Titus=Paulus' Brev til Titus
+Philemon=Paulus' Brev til Filemon
+Hebrews=Brevet til Hebræerne
+James=Jakobs Brev
+I Peter=Peters Første Brev
+II Peter=Peters Andet Brev
+I John=Johannes' Første Brev
+II John=Johannes' Andet Brev
+III John=Johannes' Tredje Brev
+Jude=Judas' Brev
+Revelation of John=Johannes' Åbenbaring
+
+[Book Abbrevs]
+
+1. MOSEBOG=Gen
+1 MOSEBOG=Gen
+1MOSEBOG=Gen
+1 MOS=Gen
+
+2. MOSEBOG=Exod
+2 MOSEBOG=Exod
+2MOSEBOG=Exod
+2 MOS=Exod
+
+3. MOSEBOG=Lev
+3 MOSEBOG=Lev
+3MOSEBOG=Lev
+3 MOS=Lev
+
+4. MOSEBOG=Num
+4 MOSEBOG=Num
+4MOSEBOG=Num
+4 MOS=Num
+NUMERI=Num
+
+5. MOSEBOG=Deut
+5 MOSEBOG=Deut
+5MOSEBOG=Deut
+5 MOS=Deut
+DEUTERONOMIUM=Deut
+
+JOSVA=Josh
+JOSUA=Josh
+JOS=Josh
+DOMMER=Judg
+DOM=Judg
+JUDICIUM=Judg
+RUTH=Ruth
+RUT=Ruth
+
+1. SAMUEL=1Sam
+1 SAMUEL=1Sam
+1SAMUEL=1Sam
+1 SAM=1Sam
+
+2. SAMUEL=2Sam
+2 SAMUEL=2Sam
+2SAMUEL=2Sam
+2 SAM=2Sam
+
+1. KONGE=1Kgs
+1 KONGE=1Kgs
+1KONGE=1Kgs
+1 KONG=1Kgs
+
+2. KONGE=2Kgs
+2 KONGE=2Kgs
+2KONGE=2Kgs
+2 KONG=2Kgs
+
+1. KRØNIKE=1Chr
+1 KRØNIKE=1Chr
+1KRØNIKE=1Chr
+1 KRØN=1Chr
+
+2. KRØNIKE=2Chr
+2 KRØNIKE=2Chr
+2KRØNIKE=2Chr
+2 KRØN=2Chr
+
+EZRA=Ezra
+NEHEMIAS=Neh
+NEH=Neh
+ESTER=Esth
+JOB=Job
+SALMERNE=Ps
+SL=Ps
+PSALM=Ps
+PSL=Ps
+ORDSPROGENE=Prov
+ORDSP=Prov
+PRÆDIKEREN=Eccl
+PRÆD=Eccl
+HØJSANGEN=Song
+HØJS=Song
+SALOMOS HØJSANG=Song
+ESAJAS=Isa
+ES=Isa
+JEREMIAS=Jer
+JER=Jer
+KLAGESANGENE=Lam
+KLAGES=Lam
+EZEKIEL=Ezek
+EZ=Ezek
+EZEK=Ezek
+DANIEL=Dan
+DAN=Dan
+HOSEAS=Hos
+HOS=Hos
+JOEL=Joel
+AMOS=Amos
+AM=Amos
+OBADIAS=Obad
+OBAD=Obad
+JONAS=Jonah
+JON=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+HAB=Hab
+ZEFANIAS=Zeph
+ZEF=Zeph
+HAGGAJ=Hag
+HAGG=Hag
+ZAKARIAS=Zech
+ZAK=Zech
+MALAKIAS=Mal
+MAL=Mal
+MATTHÆUS=Matt
+MATT=Matt
+MATTH=Matt
+MARKUS=Mark
+MARK=Mark
+LUKAS=Luke
+LUK=Luke
+JOHANNES=John
+JOH=John
+APOSTLENE=Acts
+AP.G=Acts
+AP G=Acts
+APG=Acts
+APOST=Acts
+ACTA=Acts
+ROMER=Rom
+ROM=Rom
+
+1. KORINTHER=1Cor
+1 KORINTHER=1Cor
+1KORINTHER=1Cor
+1 KOR=1Cor
+
+2. KORINTHER=2Cor
+2 KORINTHER=2Cor
+2KORINTHER=2Cor
+2 KOR=2Cor
+
+GALATER=Gal
+GALATERNE=Gal
+GAL=Gal
+EFESER=Eph
+EFESERBREVET=Eph
+EFESERNE=Eph
+EF=Eph
+FILIPPER=Phil
+FILIPPERBREVET=Phil
+FILIPPERNE=Phil
+FIL=Phil
+KOLOSSENSER=Col
+KOLOSSENSERNE=Col
+KOLOSSENSERBREVET=Col
+KOLOSSER=Col
+KOLOSSERNE=Col
+KOLOSSERBREVET=Col
+KOL=Col
+
+1. THESSALONIKER=1Thess
+1 THESSALONIKER=1Thess
+1THESSALONIKER=1Thess
+1 TESS=1Thess
+1 THESS=1Thess
+
+2. THESSALONIKER=2Thess
+2 THESSALONIKER=2Thess
+2THESSALONIKER=2Thess
+2 TESS=2Thess
+2 THESS=2Thess
+
+1. TIMOTHEUS=1Tim
+1 TIMOTHEUS=1Tim
+1TIMOTHEUS=1Tim
+1 TIM=1Tim
+
+2. TIMOTHEUS=2Tim
+2 TIMOTHEUS=2Tim
+2TIMOTHEUS=2Tim
+2 TIM=2Tim
+
+TITUS=Titus
+TIT=Titus
+FILEMON=Phlm
+FILEM=Phlm
+HEBRÆERNE=Heb
+HEBR=Heb
+HEBRÆERBREVET=Heb
+JAKOB=Jas
+JAKOBSBREVET=Jas
+JAK=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+1 PET=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+2 PET=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+1 JOH=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+2 JOH=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+3 JOH=3John
+
+JUDAS=Jude
+ÅBENBARINGEN=Rev
+ÅB=Rev
+AAB=Rev
+ÅBENBARINGSBOGEN=Rev
+JOHANNES' APOKALYPSE=Rev
+APOKALYPSEN=Rev
+
+FØRSTE MOSEBOG=Gen
+ANDEN MOSEBOG=Exod
+TREDJE MOSEBOG=Lev
+FJERDE MOSEBOG=Num
+FEMTE MOSEBOG=Deut
+JOSVABOGEN=Josh
+DOMMERBOGEN=Judg
+RUTHS BOG=Ruth
+
+1. SAMUELSBOG=1Sam
+1 SAMUELSBOG=1Sam
+1SAMUELSBOG=1Sam
+
+2. SAMUELSBOG=2Sam
+2 SAMUELSBOG=2Sam
+2SAMUELSBOG=2Sam
+
+1. KONGEBOG=1Kgs
+1 KONGEBOG=1Kgs
+1KONGEBOG=1Kgs
+
+2. KONGEBOG=2Kgs
+2 KONGEBOG=2Kgs
+2KONGEBOG=2Kgs
+
+1. KRØNIKEBOG=1Chr
+1 KRØNIKEBOG=1Chr
+1KRØNIKEBOG=1Chr
+
+2. KRØNIKEBOG=2Chr
+2 KRØNIKEBOG=2Chr
+2KRØNIKEBOG=2Chr
+
+EZRAS BOG=Ezra
+NEHEMIAS' BOG=Neh
+ESTERS BOG=Esth
+JOBS BOG=Job
+SALMERNES BOG=Ps
+ORDSPROGENES BOG=Prov
+PRÆDIKERENS BOG=Eccl
+HØJSANGEN=Song
+ESAJAS' BOG=Isa
+JEREMIAS' BOG=Jer
+KLAGESANGENE=Lam
+EZEKIELS BOG=Ezek
+DANIELS BOG=Dan
+HOSEAS' BOG=Hos
+JOELS BOG=Joel
+AMOS' BOG=Amos
+OBADIAS' BOG=Obad
+JONAS' BOG=Jonah
+MIKAS BOG=Mic
+NAHUMS BOG=Nah
+HABAKKUKS BOG=Hab
+SEFANIAS' BOG=Zeph
+HAGGAJS BOG=Hag
+ZAKARIAS' BOG=Zech
+MALAKIAS' BOG=Mal
+MATTHÆUSEVANGELIET=Matt
+MARKUSEVANGELIET=Mark
+LUKASEVANGELIET=Luke
+JOHANNESEVANGELIET=John
+APOSTLENES GERNINGER=Acts
+PAULUS' BREV TIL ROMERNE=Rom
+PAULUS' FØRSTE BREV TIL  KORINTHERNE=1Cor
+PAULUS' ANDET BREV TIL  KORINTHERNE=2Cor
+PAULUS' BREV TIL GALATERNE=Gal
+PAULUS' BREV TIL EFESERNE=Eph
+PAULUS' BREV TIL FILIPPERNE=Phil
+PAULUS' BREV TIL KOLOSSENSERNE=Col
+PAULUS' FØRSTE BREV TIL THESSALONIKERNE=1Thess
+PAULUS' ANDET BREV TIL THESSALONIKERNE=2Thess
+PAULUS' FØRSTE BREV TIL TIMOTHEUS=1Tim
+PAULUS' ANDET BREV TIL TIMOTHEUS=2Tim
+PAULUS' BREV TIL TITUS=Titus
+PAULUS' BREV TIL FILEMON=Phlm
+BREVET TIL HEBRÆERNE=Heb
+JAKOBS BREV=Jas
+PETERS FØRSTE BREV=1Pet
+PETERS ANDET BREV=2Pet
+JOHANNES' FØRSTE BREV=1John
+JOHANNES' ANDET BREV=2John
+JOHANNES' TREDJE BREV=3John
+JUDAS' BREV=Jude
+JOHANNES' ÅBENBARING=Rev
diff --git a/locales.d/de-utf8.conf b/locales.d/de-utf8.conf
new file mode 100644
index 0000000..5fc6fa5
--- /dev/null
+++ b/locales.d/de-utf8.conf
@@ -0,0 +1,239 @@
+[Meta]
+Name=de
+Description=Deutsch (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mose
+Exodus=2. Mose
+Leviticus=3. Mose
+Numbers=4. Mose
+Deuteronomy=5. Mose
+Joshua=Josua
+Judges=Richter
+Ruth=Rut
+I Samuel=1. Samuel
+II Samuel=2. Samuel
+I Kings=1. Könige
+II Kings=2. Könige
+I Chronicles=1. Chronik
+II Chronicles=2. Chronik
+Ezra=Esra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Hiob
+Psalms=Psalmen
+Proverbs=Sprüche
+Ecclesiastes=Prediger
+Song of Solomon=Hoheslied
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagelieder
+Ezekiel=Hesekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Micha
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Zefanja
+Haggai=Haggai
+Zechariah=Sacharja
+Malachi=Maleachi
+Matthew=Matthäus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostelgeschichte
+Romans=Römer
+I Corinthians=1. Korinther
+II Corinthians=2. Korinther
+Galatians=Galater
+Ephesians=Epheser
+Philippians=Philipper
+Colossians=Kolosser
+I Thessalonians=1. Thessalonicher
+II Thessalonians=2. Thessalonicher
+I Timothy=1. Timotheus
+II Timothy=2. Timotheus
+Titus=Titus
+Philemon=Philemon
+Hebrews=Hebräer
+James=Jakobus
+I Peter=1. Petrus
+II Peter=2. Petrus
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Offenbarung
+
+[Book Abbrevs]
+
+1. MOSE=Gen
+1 MOSE=Gen
+1MOSE=Gen
+1MO=Gen
+
+2. MOSE=Exod
+2 MOSE=Exod
+2MOSE=Exod
+2MO=Exod
+
+3. MOSE=Lev
+3 MOSE=Lev
+3MOSE=Lev
+3MO=Lev
+
+4. MOSE=Num
+4 MOSE=Num
+4MOSE=Num
+4MO=Num
+
+5. MOSE=Deut
+5 MOSE=Deut
+5MOSE=Deut
+5MO=Deut
+
+JOSUA=Josh
+RICHTER=Judg
+RUT=Ruth
+
+1. SAMUEL=1Sam
+1 SAMUEL=1Sam
+1SAMUEL=1Sam
+1SAM=1Sam
+
+2. SAMUEL=2Sam
+2 SAMUEL=2Sam
+2SAM=2Sam
+
+1. KÖNIGE=1Kgs
+1 KÖNIGE=1Kgs
+1KÖNIGE=1Kgs
+1KÖN=1Kgs
+
+2. KÖNIGE=2Kgs
+2 KÖNIGE=2Kgs
+2KÖN=2Kgs
+2KÖN=2Kgs
+
+1. CHRONIK=1Chr
+1 CHRONIK=1Chr
+1CHRONIK=1Chr
+1CHR=1Chr
+
+2. CHRONIK=2Chr
+2 CHRONIK=2Chr
+2CHRONIK=2Chr
+2CHR=2Chr
+
+ESRA=Ezra
+NEHEMIA=Neh
+ESTER=Esth
+HIOB=Job
+PSALMEN=Ps
+SPRÃœCHE=Prov
+PREDIGER=Eccl
+HOHESLIED=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGELIEDER=Lam
+HESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MICHA=Mic
+NAHUM=Nah
+HABAKUK=Hab
+ZEFANJA=Zeph
+ZEPHANJA=Zeph
+HAGGAI=Hag
+SACHARJA=Zech
+MALEACHI=Mal
+MATTHÄUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+
+APOSTELGESCHICHTE=Acts
+APG=Acts
+
+RÖMER=Rom
+
+1. KORINTHER=1Cor
+1 KORINTHER=1Cor
+1KORINTHER=1Cor
+1KOR=1Cor
+
+2. KORINTHER=2Cor
+2 KORINTHER=2Cor
+2KORINTHER=2Cor
+2KOR=2Cor
+
+GALATER=Gal
+EPHESER=Eph
+PHILIPPER=Phil
+KOLOSSER=Col
+
+1. THESSALONICHER=1Thess
+1 THESSALONICHER=1Thess
+1THESSALONICHER=1Thess
+1THESS=1Thess
+
+2. THESSALONICHER=2Thess
+2 THESSALONICHER=2Thess
+2THESSALONICHER=2Thess
+2THESS=2Thess
+
+1. TIMOTHEUS=1Tim
+1 TIMOTHEUS=1Tim
+1TIMOTHEUS=1Tim
+1TIM=1Tim
+
+2. TIMOTHEUS=2Tim
+2 TIMOTHEUS=2Tim
+2TIMOTHEUS=2Tim
+2TIM=2Tim
+
+TITUS=Titus
+PHILEMON=Phlm
+HEBRÄER=Heb
+JAKOBUS=Jas
+
+1. PETRUS=1Pet
+1 PETRUS=1Pet
+1PETRUS=1Pet
+1PET=1Pet
+
+2. PETRUS=2Pet
+2 PETRUS=2Pet
+2PETRUS=2Pet
+2PET=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+1JOH=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+2JOH=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+3JOH=3John
+
+JUDAS=Jude
+
+OFFENBARUNG=Rev
+OFFB=Rev
+APC=Rev
diff --git a/locales.d/de.conf b/locales.d/de.conf
new file mode 100644
index 0000000..a0ea7ca
--- /dev/null
+++ b/locales.d/de.conf
@@ -0,0 +1,236 @@
+[Meta]
+Name=de
+Description=Deutsch
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Mose
+Exodus=2. Mose
+Leviticus=3. Mose
+Numbers=4. Mose
+Deuteronomy=5. Mose
+Joshua=Josua
+Judges=Richter
+Ruth=Rut
+I Samuel=1. Samuel
+II Samuel=2. Samuel
+I Kings=1. Könige
+II Kings=2. Könige
+I Chronicles=1. Chronik
+II Chronicles=2. Chronik
+Ezra=Esra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Hiob
+Psalms=Psalmen
+Proverbs=Sprüche
+Ecclesiastes=Prediger
+Song of Solomon=Hoheslied
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagelieder
+Ezekiel=Hesekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Micha
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Zefanja
+Haggai=Haggai
+Zechariah=Sacharja
+Malachi=Maleachi
+Matthew=Matthäus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostelgeschichte
+Romans=Römer
+I Corinthians=1. Korinther
+II Corinthians=2. Korinther
+Galatians=Galater
+Ephesians=Epheser
+Philippians=Philipper
+Colossians=Kolosser
+I Thessalonians=1. Thessalonicher
+II Thessalonians=2. Thessalonicher
+I Timothy=1. Timotheus
+II Timothy=2. Timotheus
+Titus=Titus
+Philemon=Philemon
+Hebrews=Hebräer
+James=Jakobus
+I Peter=1. Petrus
+II Peter=2. Petrus
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Offenbarung
+
+[Book Abbrevs]
+
+1. MOSE=Gen
+1 MOSE=Gen
+1MOSE=Gen
+1MO=Gen
+
+2. MOSE=Exod
+2 MOSE=Exod
+2MOSE=Exod
+2MO=Exod
+
+3. MOSE=Lev
+3 MOSE=Lev
+3MOSE=Lev
+3MO=Lev
+
+4. MOSE=Num
+4 MOSE=Num
+4MOSE=Num
+4MO=Num
+
+5. MOSE=Deut
+5 MOSE=Deut
+5MOSE=Deut
+5MO=Deut
+
+JOSUA=Josh
+RICHTER=Judg
+RUT=Ruth
+
+1. SAMUEL=1Sam
+1 SAMUEL=1Sam
+1SAMUEL=1Sam
+1SAM=1Sam
+
+2. SAMUEL=2Sam
+2 SAMUEL=2Sam
+2SAM=2Sam
+
+1. KÖNIGE=1Kgs
+1 KÖNIGE=1Kgs
+1KÖNIGE=1Kgs
+1KÖN=1Kgs
+
+2. KÖNIGE=2Kgs
+2 KÖNIGE=2Kgs
+2KÖN=2Kgs
+2KÖN=2Kgs
+
+1. CHRONIK=1Chr
+1 CHRONIK=1Chr
+1CHRONIK=1Chr
+1CHR=1Chr
+
+2. CHRONIK=2Chr
+2 CHRONIK=2Chr
+2CHRONIK=2Chr
+2CHR=2Chr
+
+ESRA=Ezra
+NEHEMIA=Neh
+ESTER=Esth
+HIOB=Job
+PSALMEN=Ps
+SPRÜCHE=Prov
+PREDIGER=Eccl
+HOHESLIED=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGELIEDER=Lam
+HESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MICHA=Mic
+NAHUM=Nah
+HABAKUK=Hab
+ZEFANJA=Zeph
+ZEPHANJA=Zeph
+HAGGAI=Hag
+SACHARJA=Zech
+MALEACHI=Mal
+MATTHÄUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTELGESCHICHTE=Acts
+RÖMER=Rom
+
+1. KORINTHER=1Cor
+1 KORINTHER=1Cor
+1KORINTHER=1Cor
+1KOR=1Cor
+
+2. KORINTHER=2Cor
+2 KORINTHER=2Cor
+2KORINTHER=2Cor
+2KOR=2Cor
+
+GALATER=Gal
+EPHESER=Eph
+PHILIPPER=Phil
+KOLOSSER=Col
+
+1. THESSALONICHER=1Thess
+1 THESSALONICHER=1Thess
+1THESSALONICHER=1Thess
+1THESS=1Thess
+
+2. THESSALONICHER=2Thess
+2 THESSALONICHER=2Thess
+2THESSALONICHER=2Thess
+2THESS=2Thess
+
+1. TIMOTHEUS=1Tim
+1 TIMOTHEUS=1Tim
+1TIMOTHEUS=1Tim
+1TIM=1Tim
+
+2. TIMOTHEUS=2Tim
+2 TIMOTHEUS=2Tim
+2TIMOTHEUS=2Tim
+2TIM=2Tim
+
+TITUS=Titus
+PHILEMON=Phlm
+HEBRÄER=Heb
+JAKOBUS=Jas
+
+1. PETRUS=1Pet
+1 PETRUS=1Pet
+1PETRUS=1Pet
+1PET=1Pet
+
+2. PETRUS=2Pet
+2 PETRUS=2Pet
+2PETRUS=2Pet
+2PET=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+1JOH=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+2JOH=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+3JOH=3John
+
+JUDAS=Jude
+
+OFFENBARUNG=Rev
+OFFB=Rev
+APC=Rev
diff --git a/locales.d/de_abbrev-utf8.conf b/locales.d/de_abbrev-utf8.conf
new file mode 100644
index 0000000..233cf13
--- /dev/null
+++ b/locales.d/de_abbrev-utf8.conf
@@ -0,0 +1,148 @@
+#
+#   German Bible bookname abbreviations -- derived from the "Loccumer Richtlinien"
+#                       Corrections & Contributions welcome
+#
+#                          Martin Gruner mg.pub@gmx.net
+#
+
+[Meta]
+Name=de_abbrev
+Description=German abbreviations (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1Mo
+Exodus=2Mo
+Leviticus=3Mo
+Numbers=4Mo
+Deuteronomy=5Mo
+Joshua=Jos
+Judges=Ri
+Ruth=Rut
+I Samuel=1Sam
+II Samuel=2Sam
+I Kings=1Kön
+II Kings=2Kön
+I Chronicles=1Chr
+II Chronicles=2Chr
+Ezra=Esra
+Nehemiah=Neh
+Esther=Est
+Job=Hiob
+Psalms=Ps
+Proverbs=Spr
+Ecclesiastes=Pred
+Song of Solomon=Hld
+Isaiah=Jes
+Jeremiah=Jer
+Lamentations=Klgl
+Ezekiel=Hes
+Daniel=Dan
+Hosea=Hos
+Joel=Joel
+Amos=Am
+Obadiah=Obd
+Jonah=Jona
+Micah=Mi
+Nahum=Nah
+Habakkuk=Hab
+Zephaniah=Zef
+Haggai=Hag
+Zechariah=Sach
+Malachi=Mal
+Matthew=Mt
+Mark=Mk
+Luke=Lk
+John=Joh
+Acts=Apg
+Romans=Röm
+I Corinthians=1Kor
+II Corinthians=2Kor
+Galatians=Gal
+Ephesians=Eph
+Philippians=Phil
+Colossians=Kol
+I Thessalonians=1Thess
+II Thessalonians=2Thess
+I Timothy=1Tim
+II Timothy=2Tim
+Titus=Tit
+Philemon=Phlm
+Hebrews=Heb
+James=Jak
+I Peter=1Pet
+II Peter=2Pet
+I John=1Joh
+II John=2Joh
+III John=3Joh
+Jude=Jud
+Revelation of John=Offb
+
+[Book Abbrevs]
+
+1MO=Gen
+2MO=Exod
+3MO=Lev
+4MO=Num
+5MO=Deut
+JOS=Josh
+RI=Judg
+RUT=Ruth
+1SAM=1Sam
+2SAMUEL=2Sam
+1KÖN=1Kgs
+2KÖN=2Kgs
+1CHR=1Chr
+2CHR=2Chr
+ESRA=Ezra
+NEH=Neh
+EST=Esth
+HIOB=Job
+PS=Ps
+SPR=Prov
+PRED=Eccl
+HLD=Song
+JES=Isa
+JER=Jer
+KLGL=Lam
+HESL=Ezek
+DAN=Dan
+HOS=Hos
+JOEL=Joel
+AM=Amos
+OBD=Obad
+JONA=Jonah
+MI=Mic
+NAH=Nah
+HAB=Hab
+ZEF=Zeph
+HAG=Hag
+SACH=Zech
+MAL=Mal
+MT=Matt
+MK=Mark
+LK=Luke
+JOH=John
+APG=Acts
+RÖM=Rom
+1KOR=1Cor
+2KOR=2Cor
+GAL=Gal
+EPH=Eph
+PHIL=Phil
+KOL=Col
+1THESS=1Thess
+2THESS=2Thess
+1TIM=1Tim
+2TIM=2Tim
+TIT=Titus
+PHLM=Phlm
+HEB=Heb
+JAK=Jas
+1PET=1Pet
+2PET=2Pet
+1JOH=1John
+2JOH=2John
+3JOH=3John
+JUD=Jude
+OFFB=Rev
diff --git a/locales.d/de_abbrev.conf b/locales.d/de_abbrev.conf
new file mode 100644
index 0000000..ceab927
--- /dev/null
+++ b/locales.d/de_abbrev.conf
@@ -0,0 +1,148 @@
+#
+#   German Bible bookname abbreviations -- derived from the "Loccumer Richtlinien"
+#                       Corrections & Contributions welcome
+#
+#                          Martin Gruner mg.pub@gmx.net
+#
+
+[Meta]
+Name=de_abbrev
+Description=German abbreviations
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1Mo
+Exodus=2Mo
+Leviticus=3Mo
+Numbers=4Mo
+Deuteronomy=5Mo
+Joshua=Jos
+Judges=Ri
+Ruth=Rut
+I Samuel=1Sam
+II Samuel=2Sam
+I Kings=1Kön
+II Kings=2Kön
+I Chronicles=1Chr
+II Chronicles=2Chr
+Ezra=Esra
+Nehemiah=Neh
+Esther=Est
+Job=Hiob
+Psalms=Ps
+Proverbs=Spr
+Ecclesiastes=Pred
+Song of Solomon=Hld
+Isaiah=Jes
+Jeremiah=Jer
+Lamentations=Klgl
+Ezekiel=Hes
+Daniel=Dan
+Hosea=Hos
+Joel=Joel
+Amos=Am
+Obadiah=Obd
+Jonah=Jona
+Micah=Mi
+Nahum=Nah
+Habakkuk=Hab
+Zephaniah=Zef
+Haggai=Hag
+Zechariah=Sach
+Malachi=Mal
+Matthew=Mt
+Mark=Mk
+Luke=Lk
+John=Joh
+Acts=Apg
+Romans=Röm
+I Corinthians=1Kor
+II Corinthians=2Kor
+Galatians=Gal
+Ephesians=Eph
+Philippians=Phil
+Colossians=Kol
+I Thessalonians=1Thess
+II Thessalonians=2Thess
+I Timothy=1Tim
+II Timothy=2Tim
+Titus=Tit
+Philemon=Phlm
+Hebrews=Heb
+James=Jak
+I Peter=1Pet
+II Peter=2Pet
+I John=1Joh
+II John=2Joh
+III John=3Joh
+Jude=Jud
+Revelation of John=Offb
+
+[Book Abbrevs]
+
+1MO=Gen
+2MO=Exod
+3MO=Lev
+4MO=Num
+5MO=Deut
+JOS=Josh
+RI=Judg
+RUT=Ruth
+1SAM=1Sam
+2SAMUEL=2Sam
+1KÖN=1Kgs
+2KÖN=2Kgs
+1CHR=1Chr
+2CHR=2Chr
+ESRA=Ezra
+NEH=Neh
+EST=Esth
+HIOB=Job
+PS=Ps
+SPR=Prov
+PRED=Eccl
+HLD=Song
+JES=Isa
+JER=Jer
+KLGL=Lam
+HESL=Ezek
+DAN=Dan
+HOS=Hos
+JOEL=Joel
+AM=Amos
+OBD=Obad
+JONA=Jonah
+MI=Mic
+NAH=Nah
+HAB=Hab
+ZEF=Zeph
+HAG=Hag
+SACH=Zech
+MAL=Mal
+MT=Matt
+MK=Mark
+LK=Luke
+JOH=John
+APG=Acts
+RÖM=Rom
+1KOR=1Cor
+2KOR=2Cor
+GAL=Gal
+EPH=Eph
+PHIL=Phil
+KOL=Col
+1THESS=1Thess
+2THESS=2Thess
+1TIM=1Tim
+2TIM=2Tim
+TIT=Titus
+PHLM=Phlm
+HEB=Heb
+JAK=Jas
+1PET=1Pet
+2PET=2Pet
+1JOH=1John
+2JOH=2John
+3JOH=3John
+JUD=Jude
+OFFB=Rev
diff --git a/locales.d/es-utf8.conf b/locales.d/es-utf8.conf
new file mode 100644
index 0000000..ae6f7b7
--- /dev/null
+++ b/locales.d/es-utf8.conf
@@ -0,0 +1,206 @@
+[Meta]
+Name=es
+Description=Spanish (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Génesis
+Exodus=Éxodo
+Leviticus=Levítico
+Numbers=Números
+Deuteronomy=Deuteronomio
+Joshua=Josué
+Judges=Jueces
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Reyes
+II Kings=2 Reyes
+I Chronicles=1 Crónicas
+II Chronicles=2 Crónicas
+Ezra=Esdras
+Nehemiah=Nehemías
+Esther=Ester
+Job=Job
+Psalms=Salmos
+Proverbs=Proverbios
+Ecclesiastes=Eclesiastés
+Song of Solomon=Cantares
+Isaiah=Isaías
+Jeremiah=Jeremías
+Lamentations=Lamentaciones
+Ezekiel=Ezequiel
+Daniel=Daniel
+Hosea=Oseas
+Joel=Joel
+Amos=Amós
+Obadiah=Abdías
+Jonah=Jonás
+Micah=Miqueas
+Nahum=Nahum
+Habakkuk=Habacuc
+Zephaniah=Sofonías
+Haggai=Hageo
+Zechariah=Zacarías
+Malachi=Malaquías
+Matthew=Mateo
+Mark=Marcos
+Luke=Lucas
+John=Juan
+Acts=Hechos
+Romans=Romanos
+I Corinthians=1 Corintios
+II Corinthians=2 Corintios
+Galatians=Gálatas
+Ephesians=Efesios
+Philippians=Filipenses
+Colossians=Colosenses
+I Thessalonians=1 Tesalonicenses
+II Thessalonians=2 Tesalonicenses
+I Timothy=1 Timoteo
+II Timothy=2 Timoteo
+Titus=Tito
+Philemon=Filemón
+Hebrews=Hebreos
+James=Santiago
+I Peter=1 Pedro
+II Peter=2 Pedro
+I John=1 Juan
+II John=2 Juan
+III John=3 Juan
+Jude=Judas
+Revelation of John=Apocalipsis
+
+[Book Abbrevs]
+
+GÉNESIS=Gen
+GN=Gen
+ÉXODO=Exod
+EX=Exod
+LEV�TICO=Lev
+LV=Lev
+NÚMEROS=Num
+NM=Num
+DEUTERONOMIO=Deut
+DT=Deut
+JOSUÉ=Josh
+JOS=Josh
+JUECES=Judg
+JUE=Judg
+RUT=Ruth
+RT=Ruth
+1 SAMUEL=1Sam
+1S=1Sam
+2 SAMUEL=2Sam
+2S=2Sam
+1 REYES=1Kgs
+1R=1Kgs
+2 REYES=2Kgs
+2R=2Kgs
+1 CRÓNICAS=1Chr
+1CR=1Chr
+2 CRÓNICAS=2Chr
+2CR=2Chr
+ESDRAS=Ezra
+ESD=Ezra
+NEHEM�AS=Neh
+NEH=Neh
+ESTER=Esth
+EST=Esth
+JOB=Job
+SALMOS=Ps
+SAL=Ps
+PROVERBIOS=Prov
+PR=Prov
+ECLESIASTÉS=Eccl
+EC=Eccl
+CANTARES=Song
+CNT=Song
+ISA�AS=Isa
+IS=Isa
+JEREM�AS=Jer
+JER=Jer
+LAMENTACIONES=Lam
+LM=Lam
+EZEQUIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OSEAS=Hos
+OS=Hos
+JOEL=Joel
+JL=Joel
+AMÓS=Amos
+AM=Amos
+ABD�AS=Obad
+ABD=Obad
+JON�S=Jonah
+JON=Jonah
+MIQUEAS=Mic
+MI=Mic
+NAHUM=Nah
+NAH=Nah
+HABACUC=Hab
+HAB=Hab
+SOFON�AS=Zeph
+SOF=Zeph
+HAGEO=Hag
+HAG=Hag
+ZACAR�AS=Zech
+ZAC=Zech
+MALAQU�AS=Mal
+MAL=Mal
+MATEO=Matt
+MT=Matt
+MARCOS=Mark
+MR=Mark
+LUCAS=Luke
+LC=Luke
+JUAN=John
+JN=John
+HECHOS=Acts
+HCH=Acts
+ROMANOS=Rom
+RO=Rom
+1 CORINTIOS=1Cor
+1CO=1Cor
+2 CORINTIOS=2Cor
+2CO=2Cor
+G�LATAS=Gal
+G�=Gal
+EFESIOS=Eph
+EF=Eph
+FILIPENSES=Phil
+FIL=Phil
+COLOSENSES=Col
+COL=Col
+1 TESALONICENSES=1Thess
+1TS=1Thess
+2 TESALONICENSES=2Thess
+2TS=2Thess
+1 TIMOTEO=1Tim
+1TI=1Tim
+2 TIMOTEO=2Tim
+2TI=2Tim
+TITO=Titus
+TIT=Titus
+FILEMÓN=Phlm
+FLM=Phlm
+HEBREOS=Heb
+HE=Heb
+SANTIAGO=Jas
+STG=Jas
+1 PEDRO=1Pet
+1P=1Pet
+2 PEDRO=2Pet
+2P=2Pet
+1 JUAN=1John
+1JN=1John
+2 JUAN=2John
+2JN=2John
+3 JUAN=3John
+3JN=3John
+JUDAS=Jude
+JUD=Jude
+APOCALIPSIS=Rev
+AP=Rev
diff --git a/locales.d/es.conf b/locales.d/es.conf
new file mode 100644
index 0000000..b628689
--- /dev/null
+++ b/locales.d/es.conf
@@ -0,0 +1,206 @@
+[Meta]
+Name=es
+Description=Spanish
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Génesis
+Exodus=Éxodo
+Leviticus=Levítico
+Numbers=Números
+Deuteronomy=Deuteronomio
+Joshua=Josué
+Judges=Jueces
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Reyes
+II Kings=2 Reyes
+I Chronicles=1 Crónicas
+II Chronicles=2 Crónicas
+Ezra=Esdras
+Nehemiah=Nehemías
+Esther=Ester
+Job=Job
+Psalms=Salmos
+Proverbs=Proverbios
+Ecclesiastes=Eclesiastés
+Song of Solomon=Cantares
+Isaiah=Isaías
+Jeremiah=Jeremías
+Lamentations=Lamentaciones
+Ezekiel=Ezequiel
+Daniel=Daniel
+Hosea=Oseas
+Joel=Joel
+Amos=Amós
+Obadiah=Abdías
+Jonah=Jonás
+Micah=Miqueas
+Nahum=Nahum
+Habakkuk=Habacuc
+Zephaniah=Sofonías
+Haggai=Hageo
+Zechariah=Zacarías
+Malachi=Malaquías
+Matthew=Mateo
+Mark=Marcos
+Luke=Lucas
+John=Juan
+Acts=Hechos
+Romans=Romanos
+I Corinthians=1 Corintios
+II Corinthians=2 Corintios
+Galatians=Gálatas
+Ephesians=Efesios
+Philippians=Filipenses
+Colossians=Colosenses
+I Thessalonians=1 Tesalonicenses
+II Thessalonians=2 Tesalonicenses
+I Timothy=1 Timoteo
+II Timothy=2 Timoteo
+Titus=Tito
+Philemon=Filemón
+Hebrews=Hebreos
+James=Santiago
+I Peter=1 Pedro
+II Peter=2 Pedro
+I John=1 Juan
+II John=2 Juan
+III John=3 Juan
+Jude=Judas
+Revelation of John=Apocalipsis
+
+[Book Abbrevs]
+
+GÉNESIS=Gen
+GN=Gen
+ÉXODO=Exod
+EX=Exod
+LEVÍTICO=Lev
+LV=Lev
+NÚMEROS=Num
+NM=Num
+DEUTERONOMIO=Deut
+DT=Deut
+JOSUÉ=Josh
+JOS=Josh
+JUECES=Judg
+JUE=Judg
+RUT=Ruth
+RT=Ruth
+1 SAMUEL=1Sam
+1S=1Sam
+2 SAMUEL=2Sam
+2S=2Sam
+1 REYES=1Kgs
+1R=1Kgs
+2 REYES=2Kgs
+2R=2Kgs
+1 CRÓNICAS=1Chr
+1CR=1Chr
+2 CRÓNICAS=2Chr
+2CR=2Chr
+ESDRAS=Ezra
+ESD=Ezra
+NEHEMÍAS=Neh
+NEH=Neh
+ESTER=Esth
+EST=Esth
+JOB=Job
+SALMOS=Ps
+SAL=Ps
+PROVERBIOS=Prov
+PR=Prov
+ECLESIASTÉS=Eccl
+EC=Eccl
+CANTARES=Song
+CNT=Song
+ISAÍAS=Isa
+IS=Isa
+JEREMÍAS=Jer
+JER=Jer
+LAMENTACIONES=Lam
+LM=Lam
+EZEQUIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OSEAS=Hos
+OS=Hos
+JOEL=Joel
+JL=Joel
+AMÓS=Amos
+AM=Amos
+ABDÍAS=Obad
+ABD=Obad
+JONÁS=Jonah
+JON=Jonah
+MIQUEAS=Mic
+MI=Mic
+NAHUM=Nah
+NAH=Nah
+HABACUC=Hab
+HAB=Hab
+SOFONÍAS=Zeph
+SOF=Zeph
+HAGEO=Hag
+HAG=Hag
+ZACARÍAS=Zech
+ZAC=Zech
+MALAQUÍAS=Mal
+MAL=Mal
+MATEO=Matt
+MT=Matt
+MARCOS=Mark
+MR=Mark
+LUCAS=Luke
+LC=Luke
+JUAN=John
+JN=John
+HECHOS=Acts
+HCH=Acts
+ROMANOS=Rom
+RO=Rom
+1 CORINTIOS=1Cor
+1CO=1Cor
+2 CORINTIOS=2Cor
+2CO=2Cor
+GÁLATAS=Gal
+GÁ=Gal
+EFESIOS=Eph
+EF=Eph
+FILIPENSES=Phil
+FIL=Phil
+COLOSENSES=Col
+COL=Col
+1 TESALONICENSES=1Thess
+1TS=1Thess
+2 TESALONICENSES=2Thess
+2TS=2Thess
+1 TIMOTEO=1Tim
+1TI=1Tim
+2 TIMOTEO=2Tim
+2TI=2Tim
+TITO=Titus
+TIT=Titus
+FILEMÓN=Phlm
+FLM=Phlm
+HEBREOS=Heb
+HE=Heb
+SANTIAGO=Jas
+STG=Jas
+1 PEDRO=1Pet
+1P=1Pet
+2 PEDRO=2Pet
+2P=2Pet
+1 JUAN=1John
+1JN=1John
+2 JUAN=2John
+2JN=2John
+3 JUAN=3John
+3JN=3John
+JUDAS=Jude
+JUD=Jude
+APOCALIPSIS=Rev
+AP=Rev
diff --git a/locales.d/et-utf8.conf b/locales.d/et-utf8.conf
new file mode 100644
index 0000000..78c0e83
--- /dev/null
+++ b/locales.d/et-utf8.conf
@@ -0,0 +1,310 @@
+[Meta]
+Name=et
+Description=Estonian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Moosese
+Exodus=2. Moosese
+Leviticus=3. Moosese
+Numbers=4. Moosese
+Deuteronomy=5. Moosese
+Joshua=Joosua
+Judges=Kohtumõistjate
+Ruth=Rutt
+I Samuel=1. Saamueli
+II Samuel=2. Saamueli
+I Kings=1. Kuningate
+II Kings=2. Kuningate
+I Chronicles=1. Ajaraamat
+II Chronicles=2. Ajaraamat
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Iiob
+Psalms=Laulud
+Proverbs=Õpetussõnad
+Ecclesiastes=Koguja
+Song of Solomon=Ãœlemlaul
+Isaiah=Jesaja
+Jeremiah=Jeremija
+Lamentations=Nutulaulud
+Ezekiel=Hesekiel
+Daniel=Taaniel
+Hosea=Hoosea
+Joel=Joel
+Amos=Aamos
+Obadiah=Obadja
+Jonah=Joona
+Micah=Miika
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteuse
+Mark=Markuse
+Luke=Luuka
+John=Johannese
+Acts=Apostlite Teod
+Romans=Roomlastele
+I Corinthians=1. Korintlastele
+II Corinthians=2. Korintlastele
+Galatians=Galaatlastele
+Ephesians=Efeslastele
+Philippians=Filiplastele
+Colossians=Koloslastele
+I Thessalonians=1. Tessalooniklastele
+II Thessalonians=2. Tessalooniklastele
+I Timothy=1. Timoteosele
+II Timothy=2. Timoteosele
+Titus=Tiitusele
+Philemon=Fileemonile
+Hebrews=Heebrealastele
+James=Jaakobuse
+I Peter=1. Peetruse
+II Peter=2. Peetruse
+I John=1. Johannese
+II John=2. Johannese
+III John=3. Johannese
+Jude=Juuda
+Revelation of John=Ilmutuse
+
+[Book Abbrevs]
+
+1MO=Gen
+1MS=Gen
+G=Gen
+GE=Gen
+1. MOOSESE=Gen
+1 MOOSESE=Gen
+1MOOSESE=Gen
+
+2MO=Exod
+2MS=Exod
+EX=Exod
+2. MOOSESE=Exod
+2 MOOSESE=Exod
+2MOOSESE=Exod
+
+3MO=Lev
+3MS=Lev
+LEV=Lev
+3. MOOSESE=Lev
+3 MOOSESE=Lev
+3MOOSESE=Lev
+
+4MO=Num
+4MS=Num
+NU=Num
+4. MOOSESE=Num
+4 MOOSESE=Num
+4MOOSESE=Num
+
+5MO=Deut
+5MS=Deut
+DT=Deut
+5. MOOSESE=Deut
+5 MOOSESE=Deut
+5MOOSESE=Deut
+
+JO=Josh
+JOOSUA=Josh
+KM=Judg
+KOHTUMÕISTJATE=Judg
+RU=Ruth
+RUTT=Ruth
+
+1SM=1Sam
+1. SAAMUELI=1Sam
+1 SAAMUELI=1Sam
+1SAAMUELI=1Sam
+
+2SM=2Sam
+2. SAAMUELI=2Sam
+2 SAAMUELI=2Sam
+2SAAMUELI=2Sam
+
+1KN=1Kgs
+1KU=1Kgs
+1. KUNINGATE=1Kgs
+1 KUNINGATE=1Kgs
+1KUNINGATE=1Kgs
+
+2KN=2Kgs
+2KU=2Kgs
+2. KUNINGATE=2Kgs
+2 KUNINGATE=2Kgs
+2KUNINGATE=2Kgs
+
+1AJ=1Chr
+1. AJARAAMAT=1Chr
+1 AJARAAMAT=1Chr
+1AJARAAMAT=1Chr
+
+2AJ=2Chr
+2. AJARAAMAT=2Chr
+2 AJARAAMAT=2Chr
+2AJARAAMAT=2Chr
+
+ES=Ezra
+ESRA=Ezra
+NE=Neh
+NEHEMJA=Neh
+EST=Esth
+ESTER=Esth
+II=Job
+IIOB=Job
+PS=Ps
+LA=Ps
+PSALMID=Ps
+LAULUD=Ps
+ÕP=Prov
+ÕPETUSSÕNAD=Prov
+KG=Eccl
+KOGUJA=Eccl
+ÃœL=Song
+ÃœLEMLAUL=Song
+JS=Isa
+JESAJA=Isa
+JR=Jer
+JEREMIJA=Jer
+NL=Lam
+NUTULAULUD=Lam
+HS=Ezek
+HESEKIEL=Ezek
+TA=Dan
+TAANIEL=Dan
+HO=Hos
+HOOSEA=Hos
+JL=Joel
+JOEL=Joel
+AM=Amos
+AAMOS=Amos
+OB=Obad
+OBADJA=Obad
+JN=Jonah
+JOONA=Jonah
+MI=Mic
+MIIKA=Mic
+NA=Nah
+NAHUM=Nah
+HA=Hab
+HABAKUK=Hab
+SF=Zeph
+SEFANJA=Zeph
+HG=Hag
+HAGGAI=Hag
+SK=Zech
+SAKARJA=Zech
+ML=Mal
+MALAKI=Mal
+MT=Matt
+MAT=Matt
+MATTEUSE=Matt
+MK=Mark
+MAR=Mark
+MARKUSE=Mark
+LU=Luke
+LK=Luke
+LUUKA=Luke
+JH=John
+JOHANNESE=John
+AP=Acts
+APT=Acts
+APOSTLITE TEOD=Acts
+RO=Rom
+RM=Rom
+ROOMLASTELE=Rom
+
+1KO=1Cor
+1KR=1Cor
+1KORINTLASTELE=1Cor
+1. KORINTLASTELE=1Cor
+1 KORINTLASTELE=1Cor
+
+2KO=2Cor
+2KR=2Cor
+2KORINTLASTELE=2Cor
+2. KORINTLASTELE=2Cor
+2 KORINTLASTELE=2Cor
+
+GL=Gal
+GALAATLASTELE=Gal
+EF=Eph
+EFESLASTELE=Eph
+FI=Phil
+FILIPLASTELE=Phil
+KO=Col
+KL=Col
+KOLOSLASTELE=Col
+
+1TS=1Thess
+1TE=1Thess
+1. TESSALOONIKLASTELE=1Thess
+1 TESSALOONIKLASTELE=1Thess
+1TESSALOONIKLASTELE=1Thess
+
+2TS=2Thess
+2TE=2Thess
+2. TESSALOONIKLASTELE=2Thess
+2 TESSALOONIKLASTELE=2Thess
+2TESSALOONIKLASTELE=2Thess
+
+1TM=1Tim
+1TI=1Tim
+1. TIMOTEOSELE=1Tim
+1 TIMOTEOSELE=1Tim
+1TIMOTEOSELE=1Tim
+
+2TM=2Tim
+2TI=2Tim
+2. TIMOTEOSELE=2Tim
+2 TIMOTEOSELE=2Tim
+2TIMOTEOSELE=2Tim
+
+TI=Titus
+TT=Titus
+TIITUSELE=Titus
+FL=Phil
+FM=Phlm
+FILEEMONILE=Phlm
+HE=Heb
+HB=Heb
+HEEBREALASTELE=Heb
+JK=Jas
+JAAKOBUSE=Jas
+
+1PT=1Pet
+1PE=1Pet
+1. PEETRUSE=1Pet
+1 PEETRUSE=1Pet
+1PEETRUSE=1Pet
+
+2PT=2Pet
+2PE=2Pet
+2. PEETRUSE=2Pet
+2 PEETRUSE=2Pet
+2PEETRUSE=2Pet
+
+1JH=1John
+1. JOHANNESE=1John
+1 JOHANNESE=1John
+1JOHANNESE=1John
+
+2JH=2John
+2. JOHANNESE=2John
+2 JOHANNESE=2John
+2JOHANNESE=2John
+
+3JH=3John
+3. JOHANNESE=3John
+3 JOHANNESE=3John
+3JOHANNESE=3John
+
+JU=Jude
+JD=Jude
+JUUDA=Jude
+ILM=Rev
+ILMUTUSE=Rev
diff --git a/locales.d/et.conf b/locales.d/et.conf
new file mode 100644
index 0000000..102e975
--- /dev/null
+++ b/locales.d/et.conf
@@ -0,0 +1,310 @@
+[Meta]
+Name=et
+Description=Estonian
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Moosese
+Exodus=2. Moosese
+Leviticus=3. Moosese
+Numbers=4. Moosese
+Deuteronomy=5. Moosese
+Joshua=Joosua
+Judges=Kohtumõistjate
+Ruth=Rutt
+I Samuel=1. Saamueli
+II Samuel=2. Saamueli
+I Kings=1. Kuningate
+II Kings=2. Kuningate
+I Chronicles=1. Ajaraamat
+II Chronicles=2. Ajaraamat
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Iiob
+Psalms=Laulud
+Proverbs=Õpetussõnad
+Ecclesiastes=Koguja
+Song of Solomon=Ülemlaul
+Isaiah=Jesaja
+Jeremiah=Jeremija
+Lamentations=Nutulaulud
+Ezekiel=Hesekiel
+Daniel=Taaniel
+Hosea=Hoosea
+Joel=Joel
+Amos=Aamos
+Obadiah=Obadja
+Jonah=Joona
+Micah=Miika
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteuse
+Mark=Markuse
+Luke=Luuka
+John=Johannese
+Acts=Apostlite Teod
+Romans=Roomlastele
+I Corinthians=1. Korintlastele
+II Corinthians=2. Korintlastele
+Galatians=Galaatlastele
+Ephesians=Efeslastele
+Philippians=Filiplastele
+Colossians=Koloslastele
+I Thessalonians=1. Tessalooniklastele
+II Thessalonians=2. Tessalooniklastele
+I Timothy=1. Timoteosele
+II Timothy=2. Timoteosele
+Titus=Tiitusele
+Philemon=Fileemonile
+Hebrews=Heebrealastele
+James=Jaakobuse
+I Peter=1. Peetruse
+II Peter=2. Peetruse
+I John=1. Johannese
+II John=2. Johannese
+III John=3. Johannese
+Jude=Juuda
+Revelation of John=Ilmutuse
+
+[Book Abbrevs]
+
+1MO=Gen
+1MS=Gen
+G=Gen
+GE=Gen
+1. MOOSESE=Gen
+1 MOOSESE=Gen
+1MOOSESE=Gen
+
+2MO=Exod
+2MS=Exod
+EX=Exod
+2. MOOSESE=Exod
+2 MOOSESE=Exod
+2MOOSESE=Exod
+
+3MO=Lev
+3MS=Lev
+LEV=Lev
+3. MOOSESE=Lev
+3 MOOSESE=Lev
+3MOOSESE=Lev
+
+4MO=Num
+4MS=Num
+NU=Num
+4. MOOSESE=Num
+4 MOOSESE=Num
+4MOOSESE=Num
+
+5MO=Deut
+5MS=Deut
+DT=Deut
+5. MOOSESE=Deut
+5 MOOSESE=Deut
+5MOOSESE=Deut
+
+JO=Josh
+JOOSUA=Josh
+KM=Judg
+KOHTUMÕISTJATE=Judg
+RU=Ruth
+RUTT=Ruth
+
+1SM=1Sam
+1. SAAMUELI=1Sam
+1 SAAMUELI=1Sam
+1SAAMUELI=1Sam
+
+2SM=2Sam
+2. SAAMUELI=2Sam
+2 SAAMUELI=2Sam
+2SAAMUELI=2Sam
+
+1KN=1Kgs
+1KU=1Kgs
+1. KUNINGATE=1Kgs
+1 KUNINGATE=1Kgs
+1KUNINGATE=1Kgs
+
+2KN=2Kgs
+2KU=2Kgs
+2. KUNINGATE=2Kgs
+2 KUNINGATE=2Kgs
+2KUNINGATE=2Kgs
+
+1AJ=1Chr
+1. AJARAAMAT=1Chr
+1 AJARAAMAT=1Chr
+1AJARAAMAT=1Chr
+
+2AJ=2Chr
+2. AJARAAMAT=2Chr
+2 AJARAAMAT=2Chr
+2AJARAAMAT=2Chr
+
+ES=Ezra
+ESRA=Ezra
+NE=Neh
+NEHEMJA=Neh
+EST=Esth
+ESTER=Esth
+II=Job
+IIOB=Job
+PS=Ps
+LA=Ps
+PSALMID=Ps
+LAULUD=Ps
+ÕP=Prov
+ÕPETUSSÕNAD=Prov
+KG=Eccl
+KOGUJA=Eccl
+ÜL=Song
+ÜLEMLAUL=Song
+JS=Isa
+JESAJA=Isa
+JR=Jer
+JEREMIJA=Jer
+NL=Lam
+NUTULAULUD=Lam
+HS=Ezek
+HESEKIEL=Ezek
+TA=Dan
+TAANIEL=Dan
+HO=Hos
+HOOSEA=Hos
+JL=Joel
+JOEL=Joel
+AM=Amos
+AAMOS=Amos
+OB=Obad
+OBADJA=Obad
+JN=Jonah
+JOONA=Jonah
+MI=Mic
+MIIKA=Mic
+NA=Nah
+NAHUM=Nah
+HA=Hab
+HABAKUK=Hab
+SF=Zeph
+SEFANJA=Zeph
+HG=Hag
+HAGGAI=Hag
+SK=Zech
+SAKARJA=Zech
+ML=Mal
+MALAKI=Mal
+MT=Matt
+MAT=Matt
+MATTEUSE=Matt
+MK=Mark
+MAR=Mark
+MARKUSE=Mark
+LU=Luke
+LK=Luke
+LUUKA=Luke
+JH=John
+JOHANNESE=John
+AP=Acts
+APT=Acts
+APOSTLITE TEOD=Acts
+RO=Rom
+RM=Rom
+ROOMLASTELE=Rom
+
+1KO=1Cor
+1KR=1Cor
+1KORINTLASTELE=1Cor
+1. KORINTLASTELE=1Cor
+1 KORINTLASTELE=1Cor
+
+2KO=2Cor
+2KR=2Cor
+2KORINTLASTELE=2Cor
+2. KORINTLASTELE=2Cor
+2 KORINTLASTELE=2Cor
+
+GL=Gal
+GALAATLASTELE=Gal
+EF=Eph
+EFESLASTELE=Eph
+FI=Phil
+FILIPLASTELE=Phil
+KO=Col
+KL=Col
+KOLOSLASTELE=Col
+
+1TS=1Thess
+1TE=1Thess
+1. TESSALOONIKLASTELE=1Thess
+1 TESSALOONIKLASTELE=1Thess
+1TESSALOONIKLASTELE=1Thess
+
+2TS=2Thess
+2TE=2Thess
+2. TESSALOONIKLASTELE=2Thess
+2 TESSALOONIKLASTELE=2Thess
+2TESSALOONIKLASTELE=2Thess
+
+1TM=1Tim
+1TI=1Tim
+1. TIMOTEOSELE=1Tim
+1 TIMOTEOSELE=1Tim
+1TIMOTEOSELE=1Tim
+
+2TM=2Tim
+2TI=2Tim
+2. TIMOTEOSELE=2Tim
+2 TIMOTEOSELE=2Tim
+2TIMOTEOSELE=2Tim
+
+TI=Titus
+TT=Titus
+TIITUSELE=Titus
+FL=Phil
+FM=Phlm
+FILEEMONILE=Phlm
+HE=Heb
+HB=Heb
+HEEBREALASTELE=Heb
+JK=Jas
+JAAKOBUSE=Jas
+
+1PT=1Pet
+1PE=1Pet
+1. PEETRUSE=1Pet
+1 PEETRUSE=1Pet
+1PEETRUSE=1Pet
+
+2PT=2Pet
+2PE=2Pet
+2. PEETRUSE=2Pet
+2 PEETRUSE=2Pet
+2PEETRUSE=2Pet
+
+1JH=1John
+1. JOHANNESE=1John
+1 JOHANNESE=1John
+1JOHANNESE=1John
+
+2JH=2John
+2. JOHANNESE=2John
+2 JOHANNESE=2John
+2JOHANNESE=2John
+
+3JH=3John
+3. JOHANNESE=3John
+3 JOHANNESE=3John
+3JOHANNESE=3John
+
+JU=Jude
+JD=Jude
+JUUDA=Jude
+ILM=Rev
+ILMUTUSE=Rev
diff --git a/locales.d/et_abbr-utf8.conf b/locales.d/et_abbr-utf8.conf
new file mode 100644
index 0000000..23393da
--- /dev/null
+++ b/locales.d/et_abbr-utf8.conf
@@ -0,0 +1,313 @@
+[Meta]
+Name=et_abbrev
+Description=Estonian abbreviations (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1Ms
+Exodus=2Ms
+Leviticus=3Ms
+Numbers=4Ms
+Deuteronomy=5Ms
+Joshua=Jos
+Judges=Km
+Ruth=Rt
+I Samuel=1Sm
+II Samuel=2Sm
+I Kings=1Kn
+II Kings=2Kn
+I Chronicles=1Aj
+II Chronicles=2Aj
+Ezra=Esr
+Nehemiah=Ne
+Esther=Est
+Job=Ii
+Psalms=Ps
+Proverbs=Õp
+Ecclesiastes=Kg
+Song of Solomon=Ãœl
+Isaiah=Js
+Jeremiah=Jr
+Lamentations=Nl
+Ezekiel=Hs
+Daniel=Tn
+Hosea=Ho
+Joel=Jl
+Amos=Am
+Obadiah=Ob
+Jonah=Jn
+Micah=Mi
+Nahum=Na
+Habakkuk=Ha
+Zephaniah=Sf
+Haggai=Hg
+Zechariah=Sk
+Malachi=Ml
+Matthew=Mt
+Mark=Mk
+Luke=Lk
+John=Jh
+Acts=Ap
+Romans=Rm
+I Corinthians=1Kr
+II Corinthians=2Kr
+Galatians=Gl
+Ephesians=Ef
+Philippians=Fl
+Colossians=Kl
+I Thessalonians=1Ts
+II Thessalonians=2Ts
+I Timothy=1Tm
+II Timothy=2Tm
+Titus=Tt
+Philemon=Fm
+Hebrews=Hb
+James=Jk
+I Peter=1Pt
+II Peter=2Pt
+I John=1Jh
+II John=2Jh
+III John=3Jh
+Jude=Jd
+Revelation of John=Ilm
+
+[Book Abbrevs]
+
+1MO=Gen
+1MS=Gen
+G=Gen
+GE=Gen
+1. MOOSESE=Gen
+1 MOOSESE=Gen
+1MOOSESE=Gen
+
+2MO=Exod
+2MS=Exod
+EX=Exod
+2. MOOSESE=Exod
+2 MOOSESE=Exod
+2MOOSESE=Exod
+
+3MO=Lev
+3MS=Lev
+LEV=Lev
+3. MOOSESE=Lev
+3 MOOSESE=Lev
+3MOOSESE=Lev
+
+4MO=Num
+4MS=Num
+NU=Num
+4. MOOSESE=Num
+4 MOOSESE=Num
+4MOOSESE=Num
+
+5MO=Deut
+5MS=Deut
+DT=Deut
+5. MOOSESE=Deut
+5 MOOSESE=Deut
+5MOOSESE=Deut
+
+JO=Josh
+JOOSUA=Josh
+KM=Judg
+KOHTUMÕISTJATE=Judg
+
+RT=Ruth
+RU=Ruth
+RUTT=Ruth
+
+1SM=1Sam
+1. SAAMUELI=1Sam
+1 SAAMUELI=1Sam
+1SAAMUELI=1Sam
+
+2SM=2Sam
+2. SAAMUELI=2Sam
+2 SAAMUELI=2Sam
+2SAAMUELI=2Sam
+
+1KN=1Kgs
+1KU=1Kgs
+1. KUNINGATE=1Kgs
+1 KUNINGATE=1Kgs
+1KUNINGATE=1Kgs
+
+2KN=2Kgs
+2KU=2Kgs
+2. KUNINGATE=2Kgs
+2 KUNINGATE=2Kgs
+2KUNINGATE=2Kgs
+
+1AJ=1Chr
+1. AJARAAMAT=1Chr
+1 AJARAAMAT=1Chr
+1AJARAAMAT=1Chr
+
+2AJ=2Chr
+2. AJARAAMAT=2Chr
+2 AJARAAMAT=2Chr
+2AJARAAMAT=2Chr
+
+ES=Ezra
+ESRA=Ezra
+NE=Neh
+NEHEMJA=Neh
+EST=Esth
+ESTER=Esth
+II=Job
+IIOB=Job
+PS=Ps
+LA=Ps
+PSALMID=Ps
+LAULUD=Ps
+ÕP=Prov
+ÕPETUSSÕNAD=Prov
+KG=Eccl
+KOGUJA=Eccl
+ÃœL=Song
+ÃœLEMLAUL=Song
+JS=Isa
+JESAJA=Isa
+JR=Jer
+JEREMIJA=Jer
+NL=Lam
+NUTULAULUD=Lam
+HS=Ezek
+HESEKIEL=Ezek
+TA=Dan
+TN=Dan
+TAANIEL=Dan
+HO=Hos
+HOOSEA=Hos
+JL=Joel
+JOEL=Joel
+AM=Amos
+AAMOS=Amos
+OB=Obad
+OBADJA=Obad
+JN=Jonah
+JOONA=Jonah
+MI=Mic
+MIIKA=Mic
+NA=Nah
+NAHUM=Nah
+HA=Hab
+HABAKUK=Hab
+SF=Zeph
+SEFANJA=Zeph
+HG=Hag
+HAGGAI=Hag
+SK=Zech
+SAKARJA=Zech
+ML=Mal
+MALAKI=Mal
+MT=Matt
+MAT=Matt
+MATTEUSE=Matt
+MK=Mark
+MAR=Mark
+MARKUSE=Mark
+LU=Luke
+LK=Luke
+LUUKA=Luke
+JH=John
+JOHANNESE=John
+AP=Acts
+APT=Acts
+APOSTLITE TEOD=Acts
+RO=Rom
+RM=Rom
+ROOMLASTELE=Rom
+
+1KO=1Cor
+1KR=1Cor
+1KORINTLASTELE=1Cor
+1. KORINTLASTELE=1Cor
+1 KORINTLASTELE=1Cor
+
+2KO=2Cor
+2KR=2Cor
+2KORINTLASTELE=2Cor
+2. KORINTLASTELE=2Cor
+2 KORINTLASTELE=2Cor
+
+GL=Gal
+GALAATLASTELE=Gal
+EF=Eph
+EFESLASTELE=Eph
+FI=Phil
+FILIPLASTELE=Phil
+KO=Col
+KL=Col
+KOLOSLASTELE=Col
+
+1TS=1Thess
+1TE=1Thess
+1. TESSALOONIKLASTELE=1Thess
+1 TESSALOONIKLASTELE=1Thess
+1TESSALOONIKLASTELE=1Thess
+
+2TS=2Thess
+2TE=2Thess
+2. TESSALOONIKLASTELE=2Thess
+2 TESSALOONIKLASTELE=2Thess
+2TESSALOONIKLASTELE=2Thess
+
+1TM=1Tim
+1TI=1Tim
+1. TIMOTEOSELE=1Tim
+1 TIMOTEOSELE=1Tim
+1TIMOTEOSELE=1Tim
+
+2TM=2Tim
+2TI=2Tim
+2. TIMOTEOSELE=2Tim
+2 TIMOTEOSELE=2Tim
+2TIMOTEOSELE=2Tim
+
+TI=Titus
+TT=Titus
+TIITUSELE=Titus
+FL=Phil
+FM=Phlm
+FILEEMONILE=Phlm
+HE=Heb
+HB=Heb
+HEEBREALASTELE=Heb
+JK=Jas
+JAAKOBUSE=Jas
+
+1PT=1Pet
+1PE=1Pet
+1. PEETRUSE=1Pet
+1 PEETRUSE=1Pet
+1PEETRUSE=1Pet
+
+2PT=2Pet
+2PE=2Pet
+2. PEETRUSE=2Pet
+2 PEETRUSE=2Pet
+2PEETRUSE=2Pet
+
+1JH=1John
+1. JOHANNESE=1John
+1 JOHANNESE=1John
+1JOHANNESE=1John
+
+2JH=2John
+2. JOHANNESE=2John
+2 JOHANNESE=2John
+2JOHANNESE=2John
+
+3JH=3John
+3. JOHANNESE=3John
+3 JOHANNESE=3John
+3JOHANNESE=3John
+
+JU=Jude
+JD=Jude
+JUUDA=Jude
+ILM=Rev
+ILMUTUSE=Rev
diff --git a/locales.d/et_abbr.conf b/locales.d/et_abbr.conf
new file mode 100644
index 0000000..7fda9c1
--- /dev/null
+++ b/locales.d/et_abbr.conf
@@ -0,0 +1,312 @@
+[Meta]
+Name=et_abbrev
+Description=Estonian abbreviations
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1Ms
+Exodus=2Ms
+Leviticus=3Ms
+Numbers=4Ms
+Deuteronomy=5Ms
+Joshua=Jos
+Judges=Km
+Ruth=Rt
+I Samuel=1Sm
+II Samuel=2Sm
+I Kings=1Kn
+II Kings=2Kn
+I Chronicles=1Aj
+II Chronicles=2Aj
+Ezra=Esr
+Nehemiah=Ne
+Esther=Est
+Job=Ii
+Psalms=Ps
+Proverbs=Õp
+Ecclesiastes=Kg
+Song of Solomon=Ül
+Isaiah=Js
+Jeremiah=Jr
+Lamentations=Nl
+Ezekiel=Hs
+Daniel=Tn
+Hosea=Ho
+Joel=Jl
+Amos=Am
+Obadiah=Ob
+Jonah=Jn
+Micah=Mi
+Nahum=Na
+Habakkuk=Ha
+Zephaniah=Sf
+Haggai=Hg
+Zechariah=Sk
+Malachi=Ml
+Matthew=Mt
+Mark=Mk
+Luke=Lk
+John=Jh
+Acts=Ap
+Romans=Rm
+I Corinthians=1Kr
+II Corinthians=2Kr
+Galatians=Gl
+Ephesians=Ef
+Philippians=Fl
+Colossians=Kl
+I Thessalonians=1Ts
+II Thessalonians=2Ts
+I Timothy=1Tm
+II Timothy=2Tm
+Titus=Tt
+Philemon=Fm
+Hebrews=Hb
+James=Jk
+I Peter=1Pt
+II Peter=2Pt
+I John=1Jh
+II John=2Jh
+III John=3Jh
+Jude=Jd
+Revelation of John=Ilm
+
+[Book Abbrevs]
+
+1MO=Gen
+1MS=Gen
+G=Gen
+GE=Gen
+1. MOOSESE=Gen
+1 MOOSESE=Gen
+1MOOSESE=Gen
+
+2MO=Exod
+2MS=Exod
+EX=Exod
+2. MOOSESE=Exod
+2 MOOSESE=Exod
+2MOOSESE=Exod
+
+3MO=Lev
+3MS=Lev
+LEV=Lev
+3. MOOSESE=Lev
+3 MOOSESE=Lev
+3MOOSESE=Lev
+
+4MO=Num
+4MS=Num
+NU=Num
+4. MOOSESE=Num
+4 MOOSESE=Num
+4MOOSESE=Num
+
+5MO=Deut
+5MS=Deut
+DT=Deut
+5. MOOSESE=Deut
+5 MOOSESE=Deut
+5MOOSESE=Deut
+
+JO=Josh
+JOOSUA=Josh
+KM=Judg
+KOHTUMÕISTJATE=Judg
+RT=Ruth
+RU=Ruth
+RUTT=Ruth
+
+1SM=1Sam
+1. SAAMUELI=1Sam
+1 SAAMUELI=1Sam
+1SAAMUELI=1Sam
+
+2SM=2Sam
+2. SAAMUELI=2Sam
+2 SAAMUELI=2Sam
+2SAAMUELI=2Sam
+
+1KN=1Kgs
+1KU=1Kgs
+1. KUNINGATE=1Kgs
+1 KUNINGATE=1Kgs
+1KUNINGATE=1Kgs
+
+2KN=2Kgs
+2KU=2Kgs
+2. KUNINGATE=2Kgs
+2 KUNINGATE=2Kgs
+2KUNINGATE=2Kgs
+
+1AJ=1Chr
+1. AJARAAMAT=1Chr
+1 AJARAAMAT=1Chr
+1AJARAAMAT=1Chr
+
+2AJ=2Chr
+2. AJARAAMAT=2Chr
+2 AJARAAMAT=2Chr
+2AJARAAMAT=2Chr
+
+ES=Ezra
+ESRA=Ezra
+NE=Neh
+NEHEMJA=Neh
+EST=Esth
+ESTER=Esth
+II=Job
+IIOB=Job
+PS=Ps
+LA=Ps
+PSALMID=Ps
+LAULUD=Ps
+ÕP=Prov
+ÕPETUSSÕNAD=Prov
+KG=Eccl
+KOGUJA=Eccl
+ÜL=Song
+ÜLEMLAUL=Song
+JS=Isa
+JESAJA=Isa
+JR=Jer
+JEREMIJA=Jer
+NL=Lam
+NUTULAULUD=Lam
+HS=Ezek
+HESEKIEL=Ezek
+TA=Dan
+TN=Dan
+TAANIEL=Dan
+HO=Hos
+HOOSEA=Hos
+JL=Joel
+JOEL=Joel
+AM=Amos
+AAMOS=Amos
+OB=Obad
+OBADJA=Obad
+JN=Jonah
+JOONA=Jonah
+MI=Mic
+MIIKA=Mic
+NA=Nah
+NAHUM=Nah
+HA=Hab
+HABAKUK=Hab
+SF=Zeph
+SEFANJA=Zeph
+HG=Hag
+HAGGAI=Hag
+SK=Zech
+SAKARJA=Zech
+ML=Mal
+MALAKI=Mal
+MT=Matt
+MAT=Matt
+MATTEUSE=Matt
+MK=Mark
+MAR=Mark
+MARKUSE=Mark
+LU=Luke
+LK=Luke
+LUUKA=Luke
+JH=John
+JOHANNESE=John
+AP=Acts
+APT=Acts
+APOSTLITE TEOD=Acts
+RO=Rom
+RM=Rom
+ROOMLASTELE=Rom
+
+1KO=1Cor
+1KR=1Cor
+1KORINTLASTELE=1Cor
+1. KORINTLASTELE=1Cor
+1 KORINTLASTELE=1Cor
+
+2KO=2Cor
+2KR=2Cor
+2KORINTLASTELE=2Cor
+2. KORINTLASTELE=2Cor
+2 KORINTLASTELE=2Cor
+
+GL=Gal
+GALAATLASTELE=Gal
+EF=Eph
+EFESLASTELE=Eph
+FI=Phil
+FILIPLASTELE=Phil
+KO=Col
+KL=Col
+KOLOSLASTELE=Col
+
+1TS=1Thess
+1TE=1Thess
+1. TESSALOONIKLASTELE=1Thess
+1 TESSALOONIKLASTELE=1Thess
+1TESSALOONIKLASTELE=1Thess
+
+2TS=2Thess
+2TE=2Thess
+2. TESSALOONIKLASTELE=2Thess
+2 TESSALOONIKLASTELE=2Thess
+2TESSALOONIKLASTELE=2Thess
+
+1TM=1Tim
+1TI=1Tim
+1. TIMOTEOSELE=1Tim
+1 TIMOTEOSELE=1Tim
+1TIMOTEOSELE=1Tim
+
+2TM=2Tim
+2TI=2Tim
+2. TIMOTEOSELE=2Tim
+2 TIMOTEOSELE=2Tim
+2TIMOTEOSELE=2Tim
+
+TI=Titus
+TT=Titus
+TIITUSELE=Titus
+FL=Phil
+FM=Phlm
+FILEEMONILE=Phlm
+HE=Heb
+HB=Heb
+HEEBREALASTELE=Heb
+JK=Jas
+JAAKOBUSE=Jas
+
+1PT=1Pet
+1PE=1Pet
+1. PEETRUSE=1Pet
+1 PEETRUSE=1Pet
+1PEETRUSE=1Pet
+
+2PT=2Pet
+2PE=2Pet
+2. PEETRUSE=2Pet
+2 PEETRUSE=2Pet
+2PEETRUSE=2Pet
+
+1JH=1John
+1. JOHANNESE=1John
+1 JOHANNESE=1John
+1JOHANNESE=1John
+
+2JH=2John
+2. JOHANNESE=2John
+2 JOHANNESE=2John
+2JOHANNESE=2John
+
+3JH=3John
+3. JOHANNESE=3John
+3 JOHANNESE=3John
+3JOHANNESE=3John
+
+JU=Jude
+JD=Jude
+JUUDA=Jude
+ILM=Rev
+ILMUTUSE=Rev
diff --git a/locales.d/fa-utf8.conf b/locales.d/fa-utf8.conf
new file mode 100644
index 0000000..01609a6
--- /dev/null
+++ b/locales.d/fa-utf8.conf
@@ -0,0 +1,286 @@
+# Farsi also known as Persian
+# Provided by Peter Von Kaehne
+# 5 December 2006
+
+[Meta]
+Name=fa
+Description=Farsi
+Encoding=UTF-8
+
+[Text]
+Genesis=پیدایش
+Exodus=خروج
+Leviticus=لاویان
+Numbers=اعداد
+Deuteronomy=تثنیه
+Joshua=یوشع
+Judges=داوران
+Ruth=روت
+I Samuel=اول سموئیل
+II Samuel=دوم سموئیل
+I Kings=اول پادشاهان
+II Kings=دوم پادشاهان
+I Chronicles=اول تواریخ
+II Chronicles=دوم تواریخ
+Ezra=عزرا
+Nehemiah=نحمیا
+Esther=استر
+Job=ایوب
+Psalms=مزامیر
+Proverbs=امثال سلیمان
+Ecclesiastes=جامعه
+Song of Solomon=غزل غزلهای سلیمان
+Isaiah=اشعیا
+Jeremiah=ارمیا
+Lamentations=مراثی ارمیا
+Ezekiel=حزقیال
+Daniel=دانیال
+Hosea=هوشع
+Joel=یوییل
+Amos=عاموس
+Obadiah=عوبدیا
+Jonah=یونس
+Micah=میکاه
+Nahum=ناحوم
+Habakkuk=حبقوق
+Zephaniah=ض�نیا
+Haggai=حجی
+Zechariah=زکریا
+Malachi=ملاکی
+Matthew=متی
+Mark=مرقس
+Luke=لوقا
+John=یوحنا
+Acts=اعمال رسولان
+Romans=رومیان
+I Corinthians=اول قرنتیان
+II Corinthians=دوم قرنتیان
+Galatians=غلاطیان
+Ephesians=ا�سسیان
+Philippians=�یلیپیان
+Colossians=کولسیان
+I Thessalonians=اول تسالونکیان
+II Thessalonians=دوم تسالونکیان
+I Timothy=اول تیموتاؤس
+II Timothy=دوم تیموتاؤس
+Titus=تیطوس
+Philemon=�لیمون
+Hebrews=عبرانیان
+James=یعقوب
+I Peter=اول پطرس
+II Peter=دوم پطرس
+I John=اول یوحنا
+II John=دوم یوحنا
+III John=سوم یوحنا
+Jude=یهودا
+Revelation of John=مکاش�ه یوحنا
+
+[Book Abbrevs]
+
+پیدایش=Gen
+خروج=Exod
+لاویان=Lev
+اعداد=Num
+تثنیه=Deut
+یوشع=Josh
+داوران=Judg
+روت=Ruth
+اول سموئیل=1Sam
+دوم سموئیل=2Sam
+اول پادشاهان=1Kgs
+دوم پادشاهان=2Kgs
+اول تواریخ=1Chr
+دوم تواریخ=2Chr
+عزرا=Ezra
+نحمیا=Neh
+استر=Esth
+ایوب=Job
+مزامیر=Ps
+امثال سلیمان=Prov
+جامعه=Eccl
+غزل غزلهای سلیمان=Song
+اشعیا=Isa
+ارمیا=Jer
+مراثی ارمیا=Lam
+حزقیال=Ezek
+دانیال=Dan
+هوشع=Hos
+یوییل=Joel
+عاموس=Amos
+عوبدیا=Obad
+یونس=Jonah
+میکاه=Mic
+ناحوم=Nah
+حبقوق=Hab
+ض�نیا=Zeph
+حجی=Hag
+زکریا=Zech
+ملاکی=Mal
+متی=Matt
+مرقس=Mark
+لوقا=Luke
+یوحنا=John
+اعمال رسولان=Acts
+رومیان=Rom
+اول قرنتیان=1Cor
+دوم قرنتیان=2Cor
+غلاطیان=Gal
+ا�سسیان=Eph
+�یلیپیان=Phil
+کولسیان=Col
+اول تسالونکیان=1Thess
+دوم تسالونکیان=2Thess
+اول تیموتاؤس=1Tim
+دوم تیموتاؤس=2Tim
+تیطوس=Titus
+�لیمون=Phlm
+عبرانیان=Heb
+یعقوب=Jas
+اول پطرس=1Pet
+دوم پطرس=2Pet
+اول یوحنا=1John
+دوم یوحنا=2John
+سوم یوحنا=3John
+یهودا=Jude
+مکاش�ه یوحنا=Rev
+
+پید=Gen
+خر=Exod
+لاو=Lev
+اعد=Num
+تثن=Deut
+یوش=Josh
+داو=Judg
+روت=Ruth
+۱ سم=1Sam
+۲ سم=2Sam
+۱ پاد=1Kgs
+۲ پاد=2Kgs
+۱ تو=1Chr
+۲ تو=2Chr
+عزرا=Ezra
+نحم=Neh
+است=Esth
+ایوب=Job
+مز=Ps
+امثال=Prov
+جام=Eccl
+غزل=Song
+اش=Isa
+ارم=Jer
+مرا=Lam
+حز=Ezek
+دان=Dan
+هوش=Hos
+یویی=Joel
+عام=Amos
+عوبد=Obad
+یون=Jonah
+میک=Mic
+ناح=Nah
+حبق=Hab
+ض�ن=Zeph
+حجی=Hag
+زکر=Zech
+ملا=Mal
+متی=Matt
+مرق=Mark
+لوقا=Luke
+یوح=John
+اعمال=Acts
+روم=Rom
+۱ قر=1Cor
+۲ قر=2Cor
+غلا=Gal
+ا�س=Eph
+�یل=Phil
+کول=Col
+۱ تس=1Thess
+۲ تس=2Thess
+۱ تیم=1Tim
+۲ تیم=2Tim
+تیط=Titus
+�لی=Phlm
+عبر=Heb
+یعق=Jas
+۱ پط=1Pet
+۲ پط=2Pet
+۱ یو=1John
+۲ یو=2John
+۳ یو=3John
+یهو=Jude
+مکا=Rev
+
+۱سم=1Sam
+۲سم=2Sam
+۱پاد=1Kgs
+۲پاد=2Kgs
+۱تو=1Chr
+۲تو=2Chr
+۱قر=1Cor
+۲قر=2Cor
+۱تس=1Thess
+۲تس=2Thess
+۱تیم=1Tim
+۲تیم=2Tim
+۱پط=1Pet
+۲پط=2Pet
+۱یو=1John
+۲یو=2John
+۳یو=3John
+
+1 سم=1Sam
+2 سم=2Sam
+1 پاد=1Kgs
+2 پاد=2Kgs
+1 تو=1Chr
+2 تو=2Chr
+1 قر=1Cor
+2 قر=2Cor
+1 تس=1Thess
+2 تس=2Thess
+1 تیم=1Tim
+2 تیم=2Tim
+1 پط=1Pet
+2 پط=2Pet
+1 یو=1John
+2 یو=2John
+3 یو=3John
+
+1سم=1Sam
+2سم=2Sam
+1پاد=1Kgs
+2پاد=2Kgs
+1تو=1Chr
+2تو=2Chr
+1قر=1Cor
+2قر=2Cor
+1تس=1Thess
+2تس=2Thess
+1تیم=1Tim
+2تیم=2Tim
+1پط=1Pet
+2پط=2Pet
+1یو=1John
+2یو=2John
+3یو=3John
+
+اول سم=1Sam
+دوم سم=2Sam
+اول پاد=1Kgs
+دوم پاد=2Kgs
+اول تو=1Chr
+دوم تو=2Chr
+اول قر=1Cor
+دوم قر=2Cor
+اول تس=1Thess
+دوم تس=2Thess
+اول تیم=1Tim
+دوم تیم=2Tim
+اول پط=1Pet
+دوم پط=2Pet
+اول یو=1John
+دوم یو=2John
+سوم یو=3John
+
+
diff --git a/locales.d/fi-utf8.conf b/locales.d/fi-utf8.conf
new file mode 100644
index 0000000..e1bd311
--- /dev/null
+++ b/locales.d/fi-utf8.conf
@@ -0,0 +1,329 @@
+[Meta]
+Name=fi
+Description=Finnish (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mooseksen kirja
+Exodus=2. Mooseksen kirja
+Leviticus=3. Mooseksen kirja
+Numbers=4. Mooseksen kirja
+Deuteronomy=5. Mooseksen kirja
+Joshua=Joosua
+Judges=Tuomarien kirja
+Ruth=Ruut
+I Samuel=1. Samuelin kirja
+II Samuel=2. Samuelin kirja
+I Kings=1. Kuninkaiden kirja
+II Kings=2. Kuninkaiden kirja
+I Chronicles=1. Aikakirja
+II Chronicles=2. Aikakirja
+Ezra=Esra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Job
+Psalms=Psalmit
+Proverbs=Sananlaskut
+Ecclesiastes=Saarnaaja
+Song of Solomon=Laulujen laulu
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Valitusvirret
+Ezekiel=Hesekiel
+Daniel=Daniel
+Hosea=Hoosea
+Joel=Joel
+Amos=Aamos
+Obadiah=Obadja
+Jonah=Joona
+Micah=Miika
+Nahum=Naahum
+Habakkuk=Habakuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malakia
+Matthew=Matteus
+Mark=Markus
+Luke=Luukas
+John=Johannes
+Acts=Apostolien teot
+Romans=Roomalaiskirje
+I Corinthians=1. Korinttolaiskirje
+II Corinthians=2. Korinttolaiskirje
+Galatians=Galatalaiskirje
+Ephesians=Efesolaiskirje
+Philippians=Filippiläiskirje
+Colossians=Kolossalaiskirje
+I Thessalonians=1. Tessalonikalaiskirje
+II Thessalonians=2. Tessalonikalaiskirje
+I Timothy=1. kirje Timoteukselle
+II Timothy=2. kirje Timoteukselle
+Titus=Kirje Titukselle
+Philemon=Kirje Filemonille
+Hebrews=Heprealaiskirje
+James=Jaakobin kirje
+I Peter=1. Pietarin kirje
+II Peter=2. Pietarin kirje
+I John=1. Johanneksen kirje
+II John=2. Johanneksen kirje
+III John=3. Johanneksen kirje
+Jude=Juudaksen kirje
+Revelation of John=Johanneksen ilmestys
+
+[Book Abbrevs]
+
+1. MOOSEKSEN KIRJA=Gen
+1 MOOSEKSEN KIRJA=Gen
+
+2. MOOSEKSEN KIRJA=Exod
+2 MOOSEKSEN KIRJA=Exod
+
+3. MOOSEKSEN KIRJA=Lev
+3 MOOSEKSEN KIRJA=Lev
+
+4. MOOSEKSEN KIRJA=Num
+4 MOOSEKSEN KIRJA=Num
+
+5. MOOSEKSEN KIRJA=Deut
+5 MOOSEKSEN KIRJA=Deut
+
+JOOSUA=Josh
+TUOMARIEN KIRJA=Judg
+RUUT=Ruth
+
+1. SAMUELIN KIRJA=1Sam
+1 SAMUELIN KIRJA=1Sam
+
+2. SAMUELIN KIRJA=2Sam
+2 SAMUELIN KIRJA=2Sam
+
+1. KUNINKAIDEN KIRJA=1Kgs
+1 KUNINKAIDEN KIRJA=1Kgs
+
+2. KUNINKAIDEN KIRJA=2Kgs
+2 KUNINKAIDEN KIRJA=2Kgs
+
+1. AIKAKIRJA=1Chr
+1 AIKAKIRJA=1Chr
+
+2. AIKAKIRJA=2Chr
+2 AIKAKIRJA=2Chr
+
+ESRA=Ezra
+NEHEMIA=Neh
+ESTER=Esth
+JOB=Job
+PSALMIT=Ps
+SANANLASKUT=Prov
+SAARNAAJA=Eccl
+LAULUJEN LAULU=Song
+JESAJA=Isa
+JEREMIA=Jer
+VALITUSVIRRET=Lam
+HESEKIEL=Ezek
+DANIEL=Dan
+HOOSEA=Hos
+JOEL=Joel
+AAMOS=Amos
+OBADJA=Obad
+JOONA=Jonah
+MIIKA=Mic
+NAAHUM=Nah
+HABAKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKIA=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUUKAS=Luke
+JOHANNES=John
+APOSTOLIEN TEOT=Acts
+ROOMALAISKIRJE=Rom
+
+1. KORINTTOLAISKIRJE=1Cor
+1 KORINTTOLAISKIRJE=1Cor
+
+2. KORINTTOLAISKIRJE=2Cor
+2 KORINTTOLAISKIRJE=2Cor
+
+GALATALAISKIRJE=Gal
+EFESOLAISKIRJE=Eph
+FILIPPILÄISKIRJE=Phil
+KOLOSSALAISKIRJE=Col
+
+1. TESSALONIKALAISKIRJE=1Thess
+1 TESSALONIKALAISKIRJE=1Thess
+
+2. TESSALONIKALAISKIRJE=2Thess
+2 TESSALONIKALAISKIRJE=2Thess
+
+1. KIRJE TIMOTEUKSELLE=1Tim
+1 KIRJE TIMOTEUKSELLE=1Tim
+
+2. KIRJE TIMOTEUKSELLE=2Tim
+2 KIRJE TIMOTEUKSELLE=2Tim
+
+KIRJE TITUKSELLE=Titus
+KIRJE FILEMONILLE=Phlm
+HEPREALAISKIRJE=Heb
+JAAKOBIN KIRJE=Jas
+
+1. PIETARIN KIRJE=1Pet
+1 PIETARIN KIRJE=1Pet
+
+2. PIETARIN KIRJE=2Pet
+2 PIETARIN KIRJE=2Pet
+
+1. JOHANNEKSEN KIRJE=1John
+1 JOHANNEKSEN KIRJE=1John
+
+2. JOHANNEKSEN KIRJE=2John
+2 JOHANNEKSEN KIRJE=2John
+
+3. JOHANNEKSEN KIRJE=3John
+3 JOHANNEKSEN KIRJE=3John
+
+JUUDAKSEN KIRJE=Jude
+JOHANNEKSEN ILMESTYS=Rev
+1. MOOS=Gen
+1.MOOS=Gen
+1 MOOS=Gen
+1MOOS=Gen
+2. MOOS=Exod
+2.MOOS=Exod
+2 MOOS=Exod
+2MOOS=Exod
+3. MOOS=Lev
+3.MOOS=Lev
+3 MOOS=Lev
+3MOOS=Lev
+4. MOOS=Num
+4.MOOS=Num
+4 MOOS=Num
+4MOOS=Num
+5. MOOS=Deut
+5.MOOS=Deut
+5 MOOS=Deut
+5MOOS=Deut
+JOOS=Josh
+RUUT=Ruth
+TUOM=Judg
+1. SAM=1Sam
+1.SAM=1Sam
+1 SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2.SAM=2Sam
+2 SAM=2Sam
+2SAM=2Sam
+1. KUN=1Kgs
+1.KUN=1Kgs
+1 KUN=1Kgs
+1KUN=1Kgs
+2. KUN=2Kgs
+2.KUN=2Kgs
+2 KUN=2Kgs
+2KUN=2Kgs
+1. AIK=1Chr
+1.AIK=1Chr
+1 AIK=1Chr
+1AIK=1Chr
+2. AIK=2Chr
+2.AIK=2Chr
+2 AIK=2Chr
+2AIK=2Chr
+NEH=Neh
+EST=Esth
+PS=Ps
+SANANL=Prov
+SAARN=Eccl
+LAUL. L=Song
+LAUL.L=Song
+LAUL L=Song
+LAULL=Song
+KORK. V=Song
+KORK.V=Song
+KORK V=Song
+KORKV=Song
+KORKEA VEISU=Song
+JES=Isa
+JER=Jer
+VALIT=Lam
+HES=Ezek
+DAN=Dan
+HOOS=Hos
+JOEL=Joel
+AAM=Amos
+OB=Obad
+JOONA=Jonah
+MIIKA=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAGG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUUK=Luke
+JOH=John
+AP T=Acts
+APT=Acts
+ROOM=Rom
+1. KOR=1Cor
+1.KOR=1Cor
+1 KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2.KOR=2Cor
+2 KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1.TESS=1Thess
+1 TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2.TESS=2Thess
+2 TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1.TIM=1Tim
+1 TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2.TIM=2Tim
+2 TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+HEPR=Heb
+JAAK=Jas
+1. PIET=1Pet
+1.PIET=1Pet
+1 PIET=1Pet
+1PIET=1Pet
+2. PIET=2Pet
+2.PIET=2Pet
+2 PIET=2Pet
+2PIET=2Pet
+1. JOH=1John
+1.JOH=1John
+1 JOH=1John
+1JOH=1John
+2. JOH=2John
+2.JOH=2John
+2 JOH=2John
+2JOH=2John
+3. JOH=3John
+3.JOH=3John
+3 JOH=3John
+3JOH=3John
+JUUD=Jude
+ILM=Rev
diff --git a/locales.d/fi.conf b/locales.d/fi.conf
new file mode 100755
index 0000000..95abaf1
--- /dev/null
+++ b/locales.d/fi.conf
@@ -0,0 +1,329 @@
+[Meta]
+Name=fi
+Description=Finnish
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Mooseksen kirja
+Exodus=2. Mooseksen kirja
+Leviticus=3. Mooseksen kirja
+Numbers=4. Mooseksen kirja
+Deuteronomy=5. Mooseksen kirja
+Joshua=Joosua
+Judges=Tuomarien kirja
+Ruth=Ruut
+I Samuel=1. Samuelin kirja
+II Samuel=2. Samuelin kirja
+I Kings=1. Kuninkaiden kirja
+II Kings=2. Kuninkaiden kirja
+I Chronicles=1. Aikakirja
+II Chronicles=2. Aikakirja
+Ezra=Esra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Job
+Psalms=Psalmit
+Proverbs=Sananlaskut
+Ecclesiastes=Saarnaaja
+Song of Solomon=Laulujen laulu
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Valitusvirret
+Ezekiel=Hesekiel
+Daniel=Daniel
+Hosea=Hoosea
+Joel=Joel
+Amos=Aamos
+Obadiah=Obadja
+Jonah=Joona
+Micah=Miika
+Nahum=Naahum
+Habakkuk=Habakuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malakia
+Matthew=Matteus
+Mark=Markus
+Luke=Luukas
+John=Johannes
+Acts=Apostolien teot
+Romans=Roomalaiskirje
+I Corinthians=1. Korinttolaiskirje
+II Corinthians=2. Korinttolaiskirje
+Galatians=Galatalaiskirje
+Ephesians=Efesolaiskirje
+Philippians=Filippiläiskirje
+Colossians=Kolossalaiskirje
+I Thessalonians=1. Tessalonikalaiskirje
+II Thessalonians=2. Tessalonikalaiskirje
+I Timothy=1. kirje Timoteukselle
+II Timothy=2. kirje Timoteukselle
+Titus=Kirje Titukselle
+Philemon=Kirje Filemonille
+Hebrews=Heprealaiskirje
+James=Jaakobin kirje
+I Peter=1. Pietarin kirje
+II Peter=2. Pietarin kirje
+I John=1. Johanneksen kirje
+II John=2. Johanneksen kirje
+III John=3. Johanneksen kirje
+Jude=Juudaksen kirje
+Revelation of John=Johanneksen ilmestys
+
+[Book Abbrevs]
+
+1. MOOSEKSEN KIRJA=Gen
+1 MOOSEKSEN KIRJA=Gen
+
+2. MOOSEKSEN KIRJA=Exod
+2 MOOSEKSEN KIRJA=Exod
+
+3. MOOSEKSEN KIRJA=Lev
+3 MOOSEKSEN KIRJA=Lev
+
+4. MOOSEKSEN KIRJA=Num
+4 MOOSEKSEN KIRJA=Num
+
+5. MOOSEKSEN KIRJA=Deut
+5 MOOSEKSEN KIRJA=Deut
+
+JOOSUA=Josh
+TUOMARIEN KIRJA=Judg
+RUUT=Ruth
+
+1. SAMUELIN KIRJA=1Sam
+1 SAMUELIN KIRJA=1Sam
+
+2. SAMUELIN KIRJA=2Sam
+2 SAMUELIN KIRJA=2Sam
+
+1. KUNINKAIDEN KIRJA=1Kgs
+1 KUNINKAIDEN KIRJA=1Kgs
+
+2. KUNINKAIDEN KIRJA=2Kgs
+2 KUNINKAIDEN KIRJA=2Kgs
+
+1. AIKAKIRJA=1Chr
+1 AIKAKIRJA=1Chr
+
+2. AIKAKIRJA=2Chr
+2 AIKAKIRJA=2Chr
+
+ESRA=Ezra
+NEHEMIA=Neh
+ESTER=Esth
+JOB=Job
+PSALMIT=Ps
+SANANLASKUT=Prov
+SAARNAAJA=Eccl
+LAULUJEN LAULU=Song
+JESAJA=Isa
+JEREMIA=Jer
+VALITUSVIRRET=Lam
+HESEKIEL=Ezek
+DANIEL=Dan
+HOOSEA=Hos
+JOEL=Joel
+AAMOS=Amos
+OBADJA=Obad
+JOONA=Jonah
+MIIKA=Mic
+NAAHUM=Nah
+HABAKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKIA=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUUKAS=Luke
+JOHANNES=John
+APOSTOLIEN TEOT=Acts
+ROOMALAISKIRJE=Rom
+
+1. KORINTTOLAISKIRJE=1Cor
+1 KORINTTOLAISKIRJE=1Cor
+
+2. KORINTTOLAISKIRJE=2Cor
+2 KORINTTOLAISKIRJE=2Cor
+
+GALATALAISKIRJE=Gal
+EFESOLAISKIRJE=Eph
+FILIPPILÄISKIRJE=Phil
+KOLOSSALAISKIRJE=Col
+
+1. TESSALONIKALAISKIRJE=1Thess
+1 TESSALONIKALAISKIRJE=1Thess
+
+2. TESSALONIKALAISKIRJE=2Thess
+2 TESSALONIKALAISKIRJE=2Thess
+
+1. KIRJE TIMOTEUKSELLE=1Tim
+1 KIRJE TIMOTEUKSELLE=1Tim
+
+2. KIRJE TIMOTEUKSELLE=2Tim
+2 KIRJE TIMOTEUKSELLE=2Tim
+
+KIRJE TITUKSELLE=Titus
+KIRJE FILEMONILLE=Phlm
+HEPREALAISKIRJE=Heb
+JAAKOBIN KIRJE=Jas
+
+1. PIETARIN KIRJE=1Pet
+1 PIETARIN KIRJE=1Pet
+
+2. PIETARIN KIRJE=2Pet
+2 PIETARIN KIRJE=2Pet
+
+1. JOHANNEKSEN KIRJE=1John
+1 JOHANNEKSEN KIRJE=1John
+
+2. JOHANNEKSEN KIRJE=2John
+2 JOHANNEKSEN KIRJE=2John
+
+3. JOHANNEKSEN KIRJE=3John
+3 JOHANNEKSEN KIRJE=3John
+
+JUUDAKSEN KIRJE=Jude
+JOHANNEKSEN ILMESTYS=Rev
+1. MOOS=Gen
+1.MOOS=Gen
+1 MOOS=Gen
+1MOOS=Gen
+2. MOOS=Exod
+2.MOOS=Exod
+2 MOOS=Exod
+2MOOS=Exod
+3. MOOS=Lev
+3.MOOS=Lev
+3 MOOS=Lev
+3MOOS=Lev
+4. MOOS=Num
+4.MOOS=Num
+4 MOOS=Num
+4MOOS=Num
+5. MOOS=Deut
+5.MOOS=Deut
+5 MOOS=Deut
+5MOOS=Deut
+JOOS=Josh
+RUUT=Ruth
+TUOM=Judg
+1. SAM=1Sam
+1.SAM=1Sam
+1 SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2.SAM=2Sam
+2 SAM=2Sam
+2SAM=2Sam
+1. KUN=1Kgs
+1.KUN=1Kgs
+1 KUN=1Kgs
+1KUN=1Kgs
+2. KUN=2Kgs
+2.KUN=2Kgs
+2 KUN=2Kgs
+2KUN=2Kgs
+1. AIK=1Chr
+1.AIK=1Chr
+1 AIK=1Chr
+1AIK=1Chr
+2. AIK=2Chr
+2.AIK=2Chr
+2 AIK=2Chr
+2AIK=2Chr
+NEH=Neh
+EST=Esth
+PS=Ps
+SANANL=Prov
+SAARN=Eccl
+LAUL. L=Song
+LAUL.L=Song
+LAUL L=Song
+LAULL=Song
+KORK. V=Song
+KORK.V=Song
+KORK V=Song
+KORKV=Song
+KORKEA VEISU=Song
+JES=Isa
+JER=Jer
+VALIT=Lam
+HES=Ezek
+DAN=Dan
+HOOS=Hos
+JOEL=Joel
+AAM=Amos
+OB=Obad
+JOONA=Jonah
+MIIKA=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAGG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUUK=Luke
+JOH=John
+AP T=Acts
+APT=Acts
+ROOM=Rom
+1. KOR=1Cor
+1.KOR=1Cor
+1 KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2.KOR=2Cor
+2 KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1.TESS=1Thess
+1 TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2.TESS=2Thess
+2 TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1.TIM=1Tim
+1 TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2.TIM=2Tim
+2 TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+HEPR=Heb
+JAAK=Jas
+1. PIET=1Pet
+1.PIET=1Pet
+1 PIET=1Pet
+1PIET=1Pet
+2. PIET=2Pet
+2.PIET=2Pet
+2 PIET=2Pet
+2PIET=2Pet
+1. JOH=1John
+1.JOH=1John
+1 JOH=1John
+1JOH=1John
+2. JOH=2John
+2.JOH=2John
+2 JOH=2John
+2JOH=2John
+3. JOH=3John
+3.JOH=3John
+3 JOH=3John
+3JOH=3John
+JUUD=Jude
+ILM=Rev
diff --git a/locales.d/fo-utf8.conf b/locales.d/fo-utf8.conf
new file mode 100644
index 0000000..81383e2
--- /dev/null
+++ b/locales.d/fo-utf8.conf
@@ -0,0 +1,199 @@
+[Meta]
+Name=fo
+Description=føroyskt (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mósebók
+Exodus=2. Mósebók
+Leviticus=3. Mósebók
+Numbers=4. Mósebók
+Deuteronomy=5. Mósebók
+Joshua=Josva
+Judges=Dómararnir
+Ruth=Rutt
+I Samuel=1. Sámuelsbók
+II Samuel=2. Sámuelsbók
+I Kings=1. Kongabók
+II Kings=2. Kongabók
+I Chronicles=1. Krønikubók
+II Chronicles=2. Krønikubók
+Ezra=Ezra
+Nehemiah=Nehemias
+Esther=Ester
+Job=Job
+Psalms=Sálmarnir
+Proverbs=Orðtøkini
+Ecclesiastes=Prædikarin
+Song of Solomon=Høysangen
+Isaiah=Esaias
+Jeremiah=Jeremias
+Lamentations=Sorgarsongirnir
+Ezekiel=Ezekiel
+Daniel=Dániel
+Hosea=Hoseas
+Joel=Jóel
+Amos=Amos
+Obadiah=Obadias
+Jonah=Jónas
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Zefanias
+Haggai=Haggai
+Zechariah=Zakarias
+Malachi=Malakias
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Jóhannes
+Acts=�postlasøgan
+Romans=Róm
+I Corinthians=1. Korint
+II Corinthians=2. Korint
+Galatians=Galatia
+Ephesians=Efesus
+Philippians=Filippi
+Colossians=Kolosse
+I Thessalonians=1. Tessalonika
+II Thessalonians=2. Tessalonika
+I Timothy=1. Timoteus
+II Timothy=2. Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebrearar
+James=Jákup
+I Peter=1. Pætur
+II Peter=2. Pætur
+I John=1. Jóhannes
+II John=2. Jóhannes
+III John=3. Jóhannes
+Jude=Judas
+Revelation of John=Opinberingin
+
+[Book Abbrevs]
+ES.=Isa
+1. MÓSEBÓK=Gen
+2. MÓSEBÓK=Exod
+3. MÓSEBÓK=Lev
+4. MÓSEBÓK=Num
+5. MÓSEBÓK=Deut
+1 MÓSEBÓK=Gen
+2 MÓSEBÓK=Exod
+3 MÓSEBÓK=Lev
+4 MÓSEBÓK=Num
+5 MÓSEBÓK=Deut
+1.MÓSEBÓK=Gen
+2.MÓSEBÓK=Exod
+3.MÓSEBÓK=Lev
+4.MÓSEBÓK=Num
+5.MÓSEBÓK=Deut
+1MÓSEBÓK=Gen
+2MÓSEBÓK=Exod
+3MÓSEBÓK=Lev
+4MÓSEBÓK=Num
+5MÓSEBÓK=Deut
+DÓMARARNIR=Judg
+1. S�MUELSBÓK=1Sam
+2. S�MUELSBÓK=2Sam
+1. KONGABÓK=1Kgs
+2. KONGABÓK=2Kgs
+1. KRØNIKUBÓK=1Chr
+2. KRØNIKUBÓK=2Chr
+1 S�MUELSBÓK=1Sam
+2 S�MUELSBÓK=2Sam
+1 KONGABÓK=1Kgs
+2 KONGABÓK=2Kgs
+1 KRØNIKUBÓK=1Chr
+2 KRØNIKUBÓK=2Chr
+1.S�MUELSBÓK=1Sam
+2.S�MUELSBÓK=2Sam
+1.KONGABÓK=1Kgs
+2.KONGABÓK=2Kgs
+1.KRØNIKUBÓK=1Chr
+2.KRØNIKUBÓK=2Chr
+1S�MUELSBÓK=1Sam
+2S�MUELSBÓK=2Sam
+1KONGABÓK=1Kgs
+2KONGABÓK=2Kgs
+1KRØNIKUBÓK=1Chr
+2KRØNIKUBÓK=2Chr
+NEHEMIAS=Neh
+S�LMARNIR=Ps
+OR�TØKINI=Prov
+PRÆDIKARIN=Eccl
+HØYSANGEN=Song
+ESAIAS=Isa
+JEREMIAS=Jer
+SORGARSONGIRNIR=Lam
+D�NIEL=Dan
+HOSEAS=Hos
+OBADIAS=Obad
+ZEFANIAS=Zeph
+ZAKARIAS=Zech
+MALAKIAS=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JÓHANNES=John
+�POSTLASØGAN=Acts
+1. KORINT=1Cor
+2. KORINT=2Cor
+1 KORINT=1Cor
+2 KORINT=2Cor
+1.KORINT=1Cor
+2.KORINT=2Cor
+1KORINT=1Cor
+2KORINT=2Cor
+EFESUS=Eph
+FILIPPI=Phil
+KOLOSSE=Col
+1. TESSALONIKA=1Thess
+2. TESSALONIKA=2Thess
+1. TIMOTEUS=1Tim
+2. TIMOTEUS=2Tim
+FILEMON=Phlm
+HEBREARAR=Heb
+1. PÆTUR=1Pet
+2. PÆTUR=2Pet
+1. JÓHANNES=1John
+2. JÓHANNES=2John
+3. JÓHANNES=3John
+1 TESSALONIKA=1Thess
+2 TESSALONIKA=2Thess
+1 TIMOTEUS=1Tim
+2 TIMOTEUS=2Tim
+1 PÆTUR=1Pet
+2 PÆTUR=2Pet
+1 JÓHANNES=1John
+2 JÓHANNES=2John
+3 JÓHANNES=3John
+1.TESSALONIKA=1Thess
+2.TESSALONIKA=2Thess
+1.TIMOTEUS=1Tim
+2.TIMOTEUS=2Tim
+1.PÆTUR=1Pet
+2.PÆTUR=2Pet
+1.JÓHANNES=1John
+2.JÓHANNES=2John
+3.JÓHANNES=3John
+1TESSALONIKA=1Thess
+2TESSALONIKA=2Thess
+1TIMOTEUS=1Tim
+2TIMOTEUS=2Tim
+1PÆTUR=1Pet
+2PÆTUR=2Pet
+1JÓHANNES=1John
+2JÓHANNES=2John
+3JÓHANNES=3John
+OPINBERINGIN=Rev
+JOSVA=Josh
+RUTT=Ruth
+JÓEL=Joel
+JÓNAS=Jonah
+MIKA=Mic
+RÓM=Rom
+J�KUP=Jas
+JUDAS=Jude
+H�SONG=Song
+
diff --git a/locales.d/fr-utf8.conf b/locales.d/fr-utf8.conf
new file mode 100644
index 0000000..6b7cc91
--- /dev/null
+++ b/locales.d/fr-utf8.conf
@@ -0,0 +1,506 @@
+[Meta]
+Name=fr
+Description=French (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genèse
+Exodus=Exode
+Leviticus=Lévitique
+Numbers=Nombres
+Deuteronomy=Deutéronome
+Joshua=Josué
+Judges=Juges
+Ruth=Ruth
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Rois
+II Kings=2 Rois
+I Chronicles=1 Chroniques
+II Chronicles=2 Chroniques
+Ezra=Esdras
+Nehemiah=Néhémie
+Esther=Esther
+Job=Job
+Psalms=Psaumes
+Proverbs=Proverbes
+Ecclesiastes=Ecclésiaste
+Song of Solomon=Cantique des cantiques
+Isaiah=Ésaïe
+Jeremiah=Jérémie
+Lamentations=Lamentations de Jérémie
+Ezekiel=Ézéchiel
+Daniel=Daniel
+Hosea=Osée
+Joel=Joël
+Amos=Amos
+Obadiah=Abdias
+Jonah=Jonas
+Micah=Michée
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sophonie
+Haggai=Aggée
+Zechariah=Zacharie
+Malachi=Malachie
+Matthew=Matthieu
+Mark=Marc
+Luke=Luc
+John=Jean
+Acts=Actes
+Romans=Romains
+I Corinthians=1 Corinthiens
+II Corinthians=2 Corinthiens
+Galatians=Galates
+Ephesians=Éphésiens
+Philippians=Philippiens
+Colossians=Colossiens
+I Thessalonians=1 Thessaloniciens
+II Thessalonians=2 Thessaloniciens
+I Timothy=1 Timothée
+II Timothy=2 Timothée
+Titus=Tite
+Philemon=Philémon
+Hebrews=Hébreux
+James=Jacques
+I Peter=1 Pierre
+II Peter=2 Pierre
+I John=1 Jean
+II John=2 Jean
+III John=3 Jean
+Jude=Jude
+Revelation of John=Apocalypse
+
+[Book Abbrevs]
+GENÈSE=Gen
+EXODE=Exod
+LÉVITIQUE=Lev
+NOMBRES=Num
+DEUTÉRONOME=Deut
+JOSUÉ=Josh
+JUGES=Judg
+RUTH=Ruth
+1 SAMUEL=1Sam
+2 SAMUEL=2Sam
+1 ROIS=1Kgs
+2 ROIS=2Kgs
+1 CHRONIQUES=1Chr
+2 CHRONIQUES=2Chr
+ESDRAS=Ezra
+NÉHÉMIE=Neh
+ESTHER=Esth
+JOB=Job
+PSAUMES=Ps
+PROVERBES=Prov
+ECCLÉSIASTE=Eccl
+CANTIQUE DES CANTIQUES=Song
+ESA�E=Isa
+JÉRÉMIE=Jer
+LAMENTATIONS DE JÉRÉMIE=Lam
+ÉZÉCHIEL=Ezek
+DANIEL=Dan
+OSÉE=Hos
+JOËL=Joel
+AMOS=Amos
+ABDIAS=Obad
+JONAS=Jonah
+MICHÉE=Mic
+NAHUM=Nah
+HABAKUK=Hab
+SOPHONIE=Zeph
+AGGÉE=Hag
+ZACHARIE=Zech
+ZACCHARIE=Zech
+MALACHIE=Mal
+MATTHIEU=Matt
+MARC=Mark
+LUC=Luke
+JEAN=John
+ACTES=Acts
+ROMAINS=Rom
+1 CORINTHIENS=1Cor
+2 CORINTHIENS=2Cor
+GALATES=Gal
+EPHÉSIENS=Eph
+PHILIPPIENS=Phil
+COLOSSIENS=Col
+1 THESSALONICIENS=1Thess
+2 THESSALONICIENS=2Thess
+1 TIMOTHÉE=1Tim
+2 TIMOTHÉE=2Tim
+TITE=Titus
+PHILÉMON=Phlm
+HÉBREUX=Heb
+JACQUES=Jas
+1 PIERRE=1Pet
+2 PIERRE=2Pet
+1 JEAN=1John
+2 JEAN=2John
+3 JEAN=3John
+JUDE=Jude
+APOCALYPSE=Rev
+
+1 C=1Cor
+1C=1Cor
+1 CH=1Chr
+1CH=1Chr
+1 CHR=1Chr
+1CHR=1Chr
+1 CHRO=1Chr
+1CHRO=1Chr
+1 CO=1Cor
+1CO=1Cor
+1 COR=1Cor
+1COR=1Cor
+1 J=1John
+1J=1John
+1 JE=1John
+1JE=1John
+1 JEA=1John
+1JEA=1John
+1 JN=1John
+1JN=1John
+1 P=1Pet
+1P=1Pet
+1 PI=1Pet
+1PI=1Pet
+1 PIE=1Pet
+1PIE=1Pet
+1 R=1Kgs
+1R=1Kgs
+1 RO=1Kgs
+1RO=1Kgs
+1 ROI=1Kgs
+1ROI=1Kgs
+1 S=1Sam
+1S=1Sam
+1 SA=1Sam
+1SA=1Sam
+1 SAM=1Sam
+1SAM=1Sam
+1 T=1Thess
+1T=1Thess
+1 TH=1Thess
+1TH=1Thess
+1 THE=1Thess
+1THE=1Thess
+1 TI=1Tim
+1TI=1Tim
+1 TIM=1Tim
+1TIM=1Tim
+1 TIMOTHEE=1Tim
+1TIMOTHEE=1Tim
+1 TM=1Tim
+1TM=1Tim
+2 C=2Cor
+2C=2Cor
+2 CH=2Chr
+2CH=2Chr
+2 CHR=2Chr
+2CHR=2Chr
+2 CHRO=2Chr
+2CHRO=2Chr
+2 CO=2Cor
+2CO=2Cor
+2 COR=2Cor
+2COR=2Cor
+2 J=2John
+2J=2John
+2 JE=2John
+2JE=2John
+2 JEA=2John
+2JEA=2John
+2 JN=2John
+2JN=2John
+2 P=2Pet
+2P=2Pet
+2 PI=2Pet
+2PI=2Pet
+2 PIE=2Pet
+2PIE=2Pet
+2 R=2Kgs
+2R=2Kgs
+2 RO=2Kgs
+2RO=2Kgs
+2 ROI=2Kgs
+2ROI=2Kgs
+2 S=2Sam
+2S=2Sam
+2 SA=2Sam
+2SA=2Sam
+2 SAM=2Sam
+2SAM=2Sam
+2 T=2Thess
+2T=2Thess
+2 TH=2Thess
+2TH=2Thess
+2 THE=2Thess
+2THE=2Thess
+2 TI=2Tim
+2TI=2Tim
+2 TIM=2Tim
+2TIM=2Tim
+2 TIMOTHEE=2Tim
+2TIMOTHEE=2Tim
+2 TM=2Tim
+2TM=2Tim
+3 J=3John
+3J=3John
+3 JE=3John
+3JE=3John
+3 JEA=3John
+3JEA=3John
+3 JN=3John
+3JN=3John
+A=Acts
+AB=Obad
+ABD=Obad
+ABDI=Obad
+AC=Acts
+ACT=Acts
+ACTE=Acts
+AG=Hag
+AGG=Hag
+AGGE=Hag
+AGGÉ=Hag
+AGGEE=Hag
+AM=Amos
+AMO=Amos
+AP=Rev
+APO=Rev
+APOC=Rev
+B=Heb
+CA=Song
+CAN=Song
+CANT=Song
+CDC=Song
+CO=Col
+COL=Col
+COLO=Col
+CT=Song
+DA=Dan
+DAN=Dan
+DANI=Dan
+DE=Deut
+DEU=Deut
+DEUT=Deut
+DEUTERONOME=Deut
+DN=Dan
+DT=Deut
+E=Exod
+É=Eph
+EC=Eccl
+ECC=Eccl
+ECCL=Eccl
+ECCLESIASTE=Eccl
+ÉC=Eccl
+ÉCC=Eccl
+ÉCCL=Eccl
+ECL=Eccl
+ÉCL=Eccl
+EP=Eph
+ÉP=Eph
+EPH=Eph
+ÉPH=Eph
+EPHE=Eph
+ÉPHE=Eph
+EPHÉ=Eph
+ÉPHÉ=Eph
+EPHESIENS=Eph
+ÉPHÉSIENS=Eph
+ES=Isa
+ÉS=Isa
+ESA=Isa
+ÉSA=Isa
+ESAI=Isa
+ESA�=Isa
+ÉSA�=Isa
+ESAIE=Isa
+ÉSAIE=Isa
+ÉSA�E=Isa
+ESD=Ezra
+ESDR=Ezra
+ÉSD=Ezra
+EST=Esth
+ESTH=Esth
+ÉST=Esth
+EX=Exod
+EXO=Exod
+EXOD=Exod
+EZ=Ezek
+EZE=Ezek
+ÉZE=Ezek
+EZÉ=Ezek
+ÉZÉ=Ezek
+EZEC=Ezek
+ÉZEC=Ezek
+EZÉC=Ezek
+ÉZÉC=Ezek
+EZECHIEL=Ezek
+F=Eph
+G=Gen
+GA=Gal
+GAL=Gal
+GALA=Gal
+GE=Gen
+GEN=Gen
+GENE=Gen
+GENÈ=Gen
+GENESE=Gen
+GÉ=Gen
+GÉN=Gen
+GN=Gen
+H=Hab
+HA=Hab
+HAB=Hab
+HABA=Hab
+HABACUC=Hab
+HABAQUQ=Hab
+HE=Heb
+HÉ=Heb
+HEB=Heb
+HÉB=Heb
+HEBREUX=Heb
+I=Isa
+IS=Isa
+ISA=Isa
+ISAI=Isa
+ISA�=Isa
+ISAIE=Isa
+J=Josh
+JA=Jas
+JAC=Jas
+JACQ=Jas
+JB=Job
+JC=Jas
+JD=Jude
+JÉ=Jer
+JE=John
+JEA=John
+JER=Jer
+JÉR=Jer
+JERE=Jer
+JÉRE=Jer
+JERÉ=Jer
+JÉRÉ=Jer
+JEREMIE=Jer
+JG=Judg
+JL=Joel
+JN=John
+JOB=Job
+JOE=Joel
+JOË=Joel
+JOEL=Joel
+JON=Jonah
+JONA=Jonah
+JOS=Josh
+JOSUE=Josh
+JR=Jer
+JS=Josh
+JU=Judg
+JUD=Jude
+JUG=Judg
+JUGE=Judg
+K=Hab
+L=Lev
+LA=Lam
+LAM=Lam
+LAME=Lam
+LC=Luke
+LDJ=Lam
+LE=Lev
+LÉ=Lev
+LEV=Lev
+LÉV=Lev
+LEVI=Lev
+LÉVI=Lev
+LEVITIQUE=Lev
+LM=Lam
+LU=Luke
+LUC=Luke
+LV=Lev
+M=Matt
+MA=Mal
+MAL=Mal
+MALA=Mal
+MAR=Mark
+MAT=Matt
+MATT=Matt
+MC=Mark
+MI=Mic
+MIC=Mic
+MICH=Mic
+MICHEE=Mic
+ML=Mal
+MR=Mark
+MT=Matt
+N=Num
+NA=Nah
+NAH=Nah
+NAHU=Hab
+NB=Num
+NE=Neh
+NÉ=Neh
+NEH=Neh
+NÉH=Neh
+NEHE=Neh
+NÉHE=Neh
+NEHÉ=Neh
+NÉHÉ=Neh
+NEHEMIE=Neh
+NO=Num
+NOM=Num
+NOMB=Num
+O=Hos
+OS=Hos
+OSE=Hos
+OSÉ=Hos
+OSEE=Hos
+P=Ps
+PH=Phil
+PHI=Phil
+PHIL=Phil
+PHILEMON=Phlm
+PHLM=Phlm
+PHM=Phlm
+PR=Prov
+PRE=Eccl
+PRÉ=Eccl
+PRED=Eccl
+PRÉD=Eccl
+PREDICATEUR=Eccl
+PRO=Prov
+PROV=Prov
+PS=Ps
+PSA=Ps
+PSAU=Ps
+QO=Eccl
+R=Rom
+RE=Rev
+RÉ=Rev
+REV=Rev
+RÉV=Rev
+REVE=Rev
+RÉVE=Rev
+REVÉ=Rev
+RÉVÉ=Rev
+RM=Rom
+RO=Rom
+ROM=Rom
+RT=Ruth
+RU=Ruth
+RUT=Ruth
+S=Zeph
+SO=Zeph
+SOP=Zeph
+SOPH=Zeph
+T=Titus
+TI=Titus
+TIT=Titus
+TT=Titus
+U=Judg
+V=Lev
+Z=Zech
+ZA=Zech
+ZAC=Zech
+ZACH=Zech
diff --git a/locales.d/fr.conf b/locales.d/fr.conf
new file mode 100644
index 0000000..ba9942d
--- /dev/null
+++ b/locales.d/fr.conf
@@ -0,0 +1,506 @@
+[Meta]
+Name=fr
+Description=French
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Genèse
+Exodus=Exode
+Leviticus=Lévitique
+Numbers=Nombres
+Deuteronomy=Deutéronome
+Joshua=Josué
+Judges=Juges
+Ruth=Ruth
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Rois
+II Kings=2 Rois
+I Chronicles=1 Chroniques
+II Chronicles=2 Chroniques
+Ezra=Esdras
+Nehemiah=Néhémie
+Esther=Esther
+Job=Job
+Psalms=Psaumes
+Proverbs=Proverbes
+Ecclesiastes=Écclésiaste
+Song of Solomon=Cantique des cantiques
+Isaiah=Esaïe
+Jeremiah=Jérémie
+Lamentations=Lamentations de Jérémie
+Ezekiel=Ézéchiel
+Daniel=Daniel
+Hosea=Osée
+Joel=Joël
+Amos=Amos
+Obadiah=Abdias
+Jonah=Jonas
+Micah=Michée
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sophonie
+Haggai=Aggée
+Zechariah=Zacharie
+Malachi=Malachie
+Matthew=Matthieu
+Mark=Marc
+Luke=Luc
+John=Jean
+Acts=Actes
+Romans=Romains
+I Corinthians=1 Corinthiens
+II Corinthians=2 Corinthiens
+Galatians=Galates
+Ephesians=Éphésiens
+Philippians=Philippiens
+Colossians=Colossiens
+I Thessalonians=1 Thessaloniciens
+II Thessalonians=2 Thessaloniciens
+I Timothy=1 Timothée
+II Timothy=2 Timothée
+Titus=Tite
+Philemon=Philémon
+Hebrews=Hébreux
+James=Jacques
+I Peter=1 Pierre
+II Peter=2 Pierre
+I John=1 Jean
+II John=2 Jean
+III John=3 Jean
+Jude=Jude
+Revelation of John=Apocalypse
+
+[Book Abbrevs]
+GENÈSE=Gen
+EXODE=Exod
+LÉVITIQUE=Lev
+NOMBRES=Num
+DEUTÉRONOME=Deut
+JOSUÉ=Josh
+JUGES=Judg
+RUTH=Ruth
+1 SAMUEL=1Sam
+2 SAMUEL=2Sam
+1 ROIS=1Kgs
+2 ROIS=2Kgs
+1 CHRONIQUES=1Chr
+2 CHRONIQUES=2Chr
+ESDRAS=Ezra
+NÉHÉMIE=Neh
+ESTHER=Esth
+JOB=Job
+PSAUMES=Ps
+PROVERBES=Prov
+ECCLÉSIASTE=Eccl
+ÉCCLÉSIASTE=Eccl
+CANTIQUE DES CANTIQUES=Song
+ESAÏE=Isa
+JÉRÉMIE=Jer
+LAMENTATIONS DE JÉRÉMIE=Lam
+ÉZÉCHIEL=Ezek
+DANIEL=Dan
+OSÉE=Hos
+JOËL=Joel
+AMOS=Amos
+ABDIAS=Obad
+JONAS=Jonah
+MICHÉE=Mic
+NAHUM=Nah
+HABAKUK=Hab
+SOPHONIE=Zeph
+AGGÉE=Hag
+ZACHARIE=Zech
+ZACCHARIE=Zech
+MALACHIE=Mal
+MATTHIEU=Matt
+MARC=Mark
+LUC=Luke
+JEAN=John
+ACTES=Acts
+ROMAINS=Rom
+1 CORINTHIENS=1Cor
+2 CORINTHIENS=2Cor
+GALATES=Gal
+EPHÉSIENS=Eph
+ÉPHÉSIENS=Eph
+PHILIPPIENS=Phil
+COLOSSIENS=Col
+1 THESSALONICIENS=1Thess
+2 THESSALONICIENS=2Thess
+1 TIMOTHÉE=1Tim
+2 TIMOTHÉE=2Tim
+TITE=Titus
+PHILÉMON=Phlm
+HÉBREUX=Heb
+JACQUES=Jas
+1 PIERRE=1Pet
+2 PIERRE=2Pet
+1 JEAN=1John
+2 JEAN=2John
+3 JEAN=3John
+JUDE=Jude
+APOCALYPSE=Rev
+
+1 C=1Cor
+1C=1Cor
+1 CH=1Chr
+1CH=1Chr
+1 CHR=1Chr
+1CHR=1Chr
+1 CHRO=1Chr
+1CHRO=1Chr
+1 CO=1Cor
+1CO=1Cor
+1 COR=1Cor
+1COR=1Cor
+1 J=1John
+1J=1John
+1 JE=1John
+1JE=1John
+1 JEA=1John
+1JEA=1John
+1 JN=1John
+1JN=1John
+1 P=1Pet
+1P=1Pet
+1 PI=1Pet
+1PI=1Pet
+1 PIE=1Pet
+1PIE=1Pet
+1 R=1Kgs
+1R=1Kgs
+1 RO=1Kgs
+1RO=1Kgs
+1 ROI=1Kgs
+1ROI=1Kgs
+1 S=1Sam
+1S=1Sam
+1 SA=1Sam
+1SA=1Sam
+1 SAM=1Sam
+1SAM=1Sam
+1 T=1Thess
+1T=1Thess
+1 TH=1Thess
+1TH=1Thess
+1 THE=1Thess
+1THE=1Thess
+1 TI=1Tim
+1TI=1Tim
+1 TIM=1Tim
+1TIM=1Tim
+1 TIMOTHEE=1Tim
+1TIMOTHEE=1Tim
+1 TM=1Tim
+1TM=1Tim
+2 C=2Cor
+2C=2Cor
+2 CH=2Chr
+2CH=2Chr
+2 CHR=2Chr
+2CHR=2Chr
+2 CHRO=2Chr
+2CHRO=2Chr
+2 CO=2Cor
+2CO=2Cor
+2 COR=2Cor
+2COR=2Cor
+2 J=2John
+2J=2John
+2 JE=2John
+2JE=2John
+2 JEA=2John
+2JEA=2John
+2 JN=2John
+2JN=2John
+2 P=2Pet
+2P=2Pet
+2 PI=2Pet
+2PI=2Pet
+2 PIE=2Pet
+2PIE=2Pet
+2 R=2Kgs
+2R=2Kgs
+2 RO=2Kgs
+2RO=2Kgs
+2 ROI=2Kgs
+2ROI=2Kgs
+2 S=2Sam
+2S=2Sam
+2 SA=2Sam
+2SA=2Sam
+2 SAM=2Sam
+2SAM=2Sam
+2 T=2Thess
+2T=2Thess
+2 TH=2Thess
+2TH=2Thess
+2 THE=2Thess
+2THE=2Thess
+2 TI=2Tim
+2TI=2Tim
+2 TIM=2Tim
+2TIM=2Tim
+2 TIMOTHEE=2Tim
+2TIMOTHEE=2Tim
+2 TM=2Tim
+2TM=2Tim
+3 J=3John
+3J=3John
+3 JE=3John
+3JE=3John
+3 JEA=3John
+3JEA=3John
+3 JN=3John
+3JN=3John
+A=Acts
+AB=Obad
+ABD=Obad
+ABDI=Obad
+AC=Acts
+ACT=Acts
+ACTE=Acts
+AG=Hag
+AGG=Hag
+AGGE=Hag
+AGGÉ=Hag
+AGGEE=Hag
+AM=Amos
+AMO=Amos
+AP=Rev
+APO=Rev
+APOC=Rev
+B=Heb
+CA=Song
+CAN=Song
+CANT=Song
+CDC=Song
+CO=Col
+COL=Col
+COLO=Col
+CT=Song
+DA=Dan
+DAN=Dan
+DANI=Dan
+DE=Deut
+DEU=Deut
+DEUT=Deut
+DEUTERONOME=Deut
+DN=Dan
+DT=Deut
+E=Exod
+É=Eph
+EC=Eccl
+ECC=Eccl
+ECCL=Eccl
+ECCLESIASTE=Eccl
+ÉC=Eccl
+ÉCC=Eccl
+ÉCCL=Eccl
+ECL=Eccl
+ÉCL=Eccl
+EP=Eph
+ÉP=Eph
+EPH=Eph
+ÉPH=Eph
+EPHE=Eph
+ÉPHE=Eph
+EPHÉ=Eph
+ÉPHÉ=Eph
+EPHESIENS=Eph
+ES=Isa
+ÉS=Isa
+ESA=Isa
+ÉSA=Isa
+ESAI=Isa
+ESAÏ=Isa
+ÉSAÏ=Isa
+ESAIE=Isa
+ÉSAIE=Isa
+ESD=Ezra
+ESDR=Ezra
+ÉSD=Ezra
+EST=Esth
+ESTH=Esth
+ÉST=Esth
+EX=Exod
+EXO=Exod
+EXOD=Exod
+EZ=Ezek
+EZE=Ezek
+ÉZE=Ezek
+EZÉ=Ezek
+ÉZÉ=Ezek
+EZEC=Ezek
+ÉZEC=Ezek
+EZÉC=Ezek
+ÉZÉC=Ezek
+EZECHIEL=Ezek
+F=Eph
+G=Gen
+GA=Gal
+GAL=Gal
+GALA=Gal
+GE=Gen
+GEN=Gen
+GENE=Gen
+GENÈ=Gen
+GENESE=Gen
+GÉ=Gen
+GÉN=Gen
+GN=Gen
+H=Hab
+HA=Hab
+HAB=Hab
+HABA=Hab
+HABACUC=Hab
+HABAQUQ=Hab
+HE=Heb
+HÉ=Heb
+HEB=Heb
+HÉB=Heb
+HEBREUX=Heb
+I=Isa
+IS=Isa
+ISA=Isa
+ISAI=Isa
+ISAÏ=Isa
+ISAIE=Isa
+J=Josh
+JA=Jas
+JAC=Jas
+JACQ=Jas
+JB=Job
+JC=Jas
+JD=Jude
+JÉ=Jer
+JE=John
+JEA=John
+JER=Jer
+JÉR=Jer
+JERE=Jer
+JÉRE=Jer
+JERÉ=Jer
+JÉRÉ=Jer
+JEREMIE=Jer
+JG=Judg
+JL=Joel
+JN=John
+JOB=Job
+JOE=Joel
+JOË=Joel
+JOEL=Joel
+JON=Jonah
+JONA=Jonah
+JOS=Josh
+JOSUE=Josh
+JR=Jer
+JS=Josh
+JU=Judg
+JUD=Jude
+JUG=Judg
+JUGE=Judg
+K=Hab
+L=Lev
+LA=Lam
+LAM=Lam
+LAME=Lam
+LC=Luke
+LDJ=Lam
+LE=Lev
+LÉ=Lev
+LEV=Lev
+LÉV=Lev
+LEVI=Lev
+LÉVI=Lev
+LEVITIQUE=Lev
+LM=Lam
+LU=Luke
+LUC=Luke
+LV=Lev
+M=Matt
+MA=Mal
+MAL=Mal
+MALA=Mal
+MAR=Mark
+MAT=Matt
+MATT=Matt
+MC=Mark
+MI=Mic
+MIC=Mic
+MICH=Mic
+MICHEE=Mic
+ML=Mal
+MR=Mark
+MT=Matt
+N=Num
+NA=Nah
+NAH=Nah
+NAHU=Hab
+NB=Num
+NE=Neh
+NÉ=Neh
+NEH=Neh
+NÉH=Neh
+NEHE=Neh
+NÉHE=Neh
+NEHÉ=Neh
+NÉHÉ=Neh
+NEHEMIE=Neh
+NO=Num
+NOM=Num
+NOMB=Num
+O=Hos
+OS=Hos
+OSE=Hos
+OSÉ=Hos
+OSEE=Hos
+P=Ps
+PH=Phil
+PHI=Phil
+PHIL=Phil
+PHILEMON=Phlm
+PHLM=Phlm
+PHM=Phlm
+PR=Prov
+PRE=Eccl
+PRÉ=Eccl
+PRED=Eccl
+PRÉD=Eccl
+PREDICATEUR=Eccl
+PRO=Prov
+PROV=Prov
+PS=Ps
+PSA=Ps
+PSAU=Ps
+QO=Eccl
+R=Rom
+RE=Rev
+RÉ=Rev
+REV=Rev
+RÉV=Rev
+REVE=Rev
+RÉVE=Rev
+REVÉ=Rev
+RÉVÉ=Rev
+RM=Rom
+RO=Rom
+ROM=Rom
+RT=Ruth
+RU=Ruth
+RUT=Ruth
+S=Zeph
+SO=Zeph
+SOP=Zeph
+SOPH=Zeph
+T=Titus
+TI=Titus
+TIT=Titus
+TT=Titus
+U=Judg
+V=Lev
+Z=Zech
+ZA=Zech
+ZAC=Zech
+ZACH=Zech
diff --git a/locales.d/fr_abbrev-utf8.conf b/locales.d/fr_abbrev-utf8.conf
new file mode 100644
index 0000000..3189b72
--- /dev/null
+++ b/locales.d/fr_abbrev-utf8.conf
@@ -0,0 +1,148 @@
+#
+#   French Bible bookname abbreviations -- derived from the "Louis Segond 1910"
+#                       Corrections & Contributions welcome
+#
+#                          Dominique Corbex domcox@users.sf.net
+#
+
+[Meta]
+Name=fr_abbrev
+Description=French abbreviations (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Ge
+Exodus=Ex
+Leviticus=Lé
+Numbers=No
+Deuteronomy=De
+Joshua=Jos
+Judges=Jg
+Ruth=Ru
+I Samuel=1 S
+II Samuel=2 S
+I Kings=1 R
+II Kings=2 R
+I Chronicles=1 Ch
+II Chronicles=2 Ch
+Ezra=Esd
+Nehemiah=Né
+Esther=Est
+Job=Job
+Psalms=Ps
+Proverbs=Pr
+Ecclesiastes=Ec
+Song of Solomon=Ca
+Isaiah=Es
+Jeremiah=Jé
+Lamentations=La
+Ezekiel=Ez
+Daniel=Da
+Hosea=Os
+Joel=Joë
+Amos=Am
+Obadiah=Ab
+Jonah=Jon
+Micah=Mi
+Nahum=Na
+Habakkuk=Ha
+Zephaniah=So
+Haggai=Ag
+Zechariah=Za
+Malachi=Mal
+Matthew=Mt
+Mark=Mc
+Luke=Lu
+John=Jn
+Acts=Ac
+Romans=Ro
+I Corinthians=1 Co
+II Corinthians=2 Co
+Galatians=Ga
+Ephesians=Ep
+Philippians=Ph
+Colossians=Col
+I Thessalonians=1 Th
+II Thessalonians=2 Th
+I Timothy=1 Ti
+II Timothy=2 Ti
+Titus=Tit
+Philemon=Phm
+Hebrews=Hé
+James=Ja
+I Peter=1 Pi
+II Peter=2 Pi
+I John=1 Jn
+II John=2 Jn
+III John=3 Jn
+Jude=Jud
+Revelation of John=Ap
+
+[Book Abbrevs]
+
+GN=Gen
+EX=Exod
+LV=Lev
+NB=Num
+DT=Deut
+JOS=Josh
+JG=Judg
+RT=Ruth
+1S=1Sam
+2S=2Sam
+1R=1Kgs
+2R=2Kgs
+1CH=1Chr
+2CH=2Chr
+ESD=Ezra
+NE=Neh
+EST=Esth
+JB=Job
+PS=Ps
+PR=Prov
+ECC=Eccl
+CT=Song
+ÉS=Isa
+JR=Jer
+LM=Lam
+EZ=Ezek
+DN=Dan
+OS=Hos
+JL=Joel
+AM=Amos
+AB=Obad
+JON=Jonah
+MI=Mic
+NA=Nah
+HA=Hab
+SO=Zeph
+AG=Hag
+ZA=Zech
+ML=Mal
+MT=Matt
+MC=Mark
+LC=Luke
+JN=John
+AC=Acts
+RM=Rom
+1CO=1Cor
+2CO=2Cor
+GA=Gal
+ÉPH=Eph
+PH=Phil
+COL=Col
+1TH=1Thess
+2TH=2Thess
+1TM=1Tim
+2TM=2Tim
+TT=Titus
+PHM=Phlm
+HE=Heb
+JC=Jas
+1P=1Pet
+2P=2Pet
+1JN=1John
+2JN=2John
+3JN=3John
+JD=Jude
+AP=Rev
diff --git a/locales.d/fr_abbrev.conf b/locales.d/fr_abbrev.conf
new file mode 100644
index 0000000..5671e44
--- /dev/null
+++ b/locales.d/fr_abbrev.conf
@@ -0,0 +1,162 @@
+#
+#   French Bible bookname abbreviations -- derived from the "Louis Segond 1910"
+#                       Corrections & Contributions welcome
+#
+#                          Dominique Corbex domcox@users.sf.net
+#
+
+[Meta]
+Name=fr_abbrev
+Description=French abbreviations
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Ge
+Exodus=Ex
+Leviticus=Lé
+Numbers=No
+Deuteronomy=De
+Joshua=Jos
+Judges=Jg
+Ruth=Ru
+I Samuel=1 S
+II Samuel=2 S
+I Kings=1 R
+II Kings=2 R
+I Chronicles=1 Ch
+II Chronicles=2 Ch
+Ezra=Esd
+Nehemiah=Né
+Esther=Est
+Job=Job
+Psalms=Ps
+Proverbs=Pr
+Ecclesiastes=Ec
+Song of Solomon=Ca
+Isaiah=Es
+Jeremiah=Jé
+Lamentations=La
+Ezekiel=Ez
+Daniel=Da
+Hosea=Os
+Joel=Joë
+Amos=Am
+Obadiah=Ab
+Jonah=Jon
+Micah=Mi
+Nahum=Na
+Habakkuk=Ha
+Zephaniah=So
+Haggai=Ag
+Zechariah=Za
+Malachi=Mal
+Matthew=Mt
+Mark=Mc
+Luke=Lu
+John=Jn
+Acts=Ac
+Romans=Ro
+I Corinthians=1 Co
+II Corinthians=2 Co
+Galatians=Ga
+Ephesians=Ep
+Philippians=Ph
+Colossians=Col
+I Thessalonians=1 Th
+II Thessalonians=2 Th
+I Timothy=1 Ti
+II Timothy=2 Ti
+Titus=Tit
+Philemon=Phm
+Hebrews=Hé
+James=Ja
+I Peter=1 Pi
+II Peter=2 Pi
+I John=1 Jn
+II John=2 Jn
+III John=3 Jn
+Jude=Jud
+Revelation of John=Ap
+
+[Book Abbrevs]
+
+GN=Gen
+EX=Exod
+LV=Lev
+NB=Num
+DT=Deut
+JOS=Josh
+JG=Judg
+RT=Ruth
+1S=1Sam
+2S=2Sam
+1R=1Kgs
+2R=2Kgs
+1CH=1Chr
+2CH=2Chr
+ESD=Ezra
+NE=Neh
+EST=Esth
+JB=Job
+PS=Ps
+PR=Prov
+ECC=Eccl
+ÉCCLÉSIASTE=Eccl
+CT=Song
+ÉS=Isa
+JR=Jer
+LM=Lam
+EZ=Ezek
+DN=Dan
+OS=Hos
+JL=Joel
+AM=Amos
+AB=Obad
+JON=Jonah
+MI=Mic
+NA=Nah
+HA=Hab
+SO=Zeph
+AG=Hag
+ZA=Zech
+ML=Mal
+MT=Matt
+MC=Mark
+LC=Luke
+JN=John
+AC=Acts
+RM=Rom
+1CO=1Cor
+2CO=2Cor
+GA=Gal
+ÉPH=Eph
+PH=Phil
+COL=Col
+1TH=1Thess
+2TH=2Thess
+1TM=1Tim
+2TM=2Tim
+TT=Titus
+PHM=Phlm
+HE=Heb
+JC=Jas
+1P=1Pet
+2P=2Pet
+1JN=1John
+2JN=2John
+3JN=3John
+JD=Jude
+AP=Rev
+
+LÉ=Lev
+NO=Num
+1 R=1Kgs
+2 R=2Kgs
+NÉ=Neh
+ES=Isa
+JÉ=Jer
+JOË=Joel
+HÉ=Heb
+1 PI=1Pet
+2 PI=2Pet
+
diff --git a/locales.d/ga-utf8.conf b/locales.d/ga-utf8.conf
new file mode 100644
index 0000000..fd2acfb
--- /dev/null
+++ b/locales.d/ga-utf8.conf
@@ -0,0 +1,347 @@
+# Enter a comment here like:
+# Gaeilge also known as Irish
+# Provided by John Duffy
+# 6 May 2009
+
+[Meta]
+Name=ga
+Description=Gaeilge
+Encoding=UTF-8
+
+
+[Text]
+
+Genesis=Geineasas
+Exodus=Eaxodus
+Leviticus=Léivític
+Numbers=Uimhreacha
+Deuteronomy=Deotranaimí
+Joshua=Leabhar Iósua
+Judges=Leabhar Na mBreithiúna
+Ruth=Leabhar Rút
+I Samuel=Céad Leabhar Shamúéil
+II Samuel=Dara Leabhar Shamúéil
+I Kings=Céad Leabhar na Ríthe
+II Kings=Dara Leabhar na Ríthe
+I Chronicles=Céad Leabhar na gCroinicí
+II Chronicles=Dara Leabhar na gCroinicí
+Ezra=Leabhar Eazrá
+Nehemiah=Leabhar Nihimiá
+Esther=Leabhar Eistir
+Job=Leabhar Iób
+Psalms=Leabhar na Salm
+Proverbs=Leabhar na Seanfhocal
+Ecclesiastes=Cóheilit
+Song of Solomon=Laoi na Laoithe
+Isaiah=�seáia
+Jeremiah=Irimia
+Lamentations=Leabhar na nOlagón
+Ezekiel=Eizicéil
+Daniel=Dainéil
+Hosea=Hóisé
+Joel=Ióéil
+Amos=Amós
+Obadiah=Obaidiá
+Jonah=Ióna
+Micah=Míocá
+Nahum=Nahúm
+Habakkuk=Habacúc
+Zephaniah=Zafainiá
+Haggai=Hagaí
+Zechariah=Zacairia
+Malachi=Malaicí
+
+
+Matthew=Matha
+Mark=Marcas
+Luke=Lúcás
+John=Eoin
+Acts=Gníomhartha na nAspal
+Romans=Rómhánaigh
+I Corinthians=1 Corantaigh
+II Corinthians=2 Corantaigh
+Galatians=Galataigh
+Ephesians=Eifisigh
+Philippians=Filipigh
+Colossians=Colosaigh
+I Thessalonians=1 Teasalónaigh
+II Thessalonians=2 Teasalónaigh
+I Timothy=1 Tiomóid
+II Timothy=2 Tiomóid
+Titus=Títeas
+Philemon=Filéamón
+Hebrews=Eabhraigh
+James=Séamas
+I Peter=1 Peadar
+II Peter=2 Peadar
+I John=1 Eoin
+II John=2 Eoin
+III John=3 Eoin
+Jude=Iúd
+Revelation of John=Apacailipsis
+
+
+#Apocr
+# In the Irish Bible, there are only 7 Apoc books, Tobit, Judith, Sirach, Wisdom, Baruch, 1Macc, 2Macc
+
+I Esdras=I Esdras
+II Esdras=II Esdras
+Tobit=Leabhar Thóibít
+Judith=Leabhar Iúidit
+Additions to Esther=Additions to Esther
+Esther (Greek)=Esther (Greek)
+Wisdom=Leabhar na hEagna
+Sirach=Leabhar Shíorach
+Baruch=Barúch
+Prayer of Azariah=Prayer of Azariah
+Susanna=Susanna
+Bel and the Dragon=Bel and the Dragon
+Prayer of Manasses=Prayer of Manasses
+I Maccabees=Céad Leabhar na Macabaech
+II Maccabees=Dara Leabhar na Macabaech
+III Maccabees=III Maccabees
+IV Maccabees=IV Maccabees
+Additional Psalm=Additional Psalm
+
+# These aren't yet included but probably will soon,
+# so if you'd like to get a headstart now, you may but don't
+# complain if the strings change before final release! :)
+
+Jubilees=Jubilees
+Sirach (Prologue)=Sirach (Prologue)
+I Enoch=I Enoch
+I Meqabyan=I Meqabyan
+II Meqabyan=II Meqabyan
+III Meqabyan=III Meqabyan
+II Baruch=II Baruch
+IV Baruch=IV Baruch
+Daniel (Greek)=Daniel (Greek)
+Additions to Daniel=Additions to Daniel
+Epistle of Jeremiah=Epistle of Jeremiah
+Laodiceans=Laodiceans
+Odes=Odes
+Psalms of Solomon=Psalms of Solomon
+
+
+[Book Abbrevs]
+
+1 CO=1Cor
+1 CORANTAIGH=1Cor
+1 CR=1Chr
+1 EO=1John
+1 EOIN=1John
+1 MA=1Macc
+1 PE=1Pet
+1 PEADAR=1Pet
+1 RI=1Kgs
+1 R�=1Kgs
+1 SA=1Sam
+1 TE=1Thess
+1 TEASALÓNAIGH=1Thess
+1 TI=1Tim
+1 TIOMÓID=1Tim
+1CO=1Cor
+1CR=1Chr
+1EO=1John
+1MA=1Macc
+1PE=1Pet
+1RI=1Kgs
+1R�=1Kgs
+1SA=1Sam
+1TE=1Thess
+1TI=1Tim
+2 CO=2Cor
+2 CORANTAIGH=2Cor
+2 CR=2Chr
+2 EO=2John
+2 EOIN=2John
+2 MA=2Macc
+2 PE=2Pet
+2 PEADAR=2Pet
+2 RI=2Kgs
+2 R�=2Kgs
+2 SA=2Sam
+2 TE=2Thess
+2 TEASALÓNAIGH=2Thess
+2 TI=2Tim
+2 TIOMÓID=2Tim
+2CO=2Cor
+2CR=2Chr
+2EO=2John
+2MA=2Macc
+2PE=2Pet
+2RI=2Kgs
+2R�=2Kgs
+2SA=2Sam
+2TE=2Thess
+2TI=2Tim
+3 EO=3John
+3 EOIN=3John
+3EO=3John
+AM=Amos
+AMOS=Amos
+AMÓS=Amos
+APA=Rev
+APACAILIPSIS=Rev
+BAR=Bar
+BARUCH=Bar
+BARÚCH=Bar
+BRE=Judg
+CÉAD LEABHAR NA GCROINIC�=1Chr
+CÉAD LEABHAR NA MACABAECH=1Macc
+CÉAD LEABHAR NA R�THE=1Kgs
+CÉAD LEABHAR SHAMÚÉIL=1Sam
+CO=Eccl
+CÓ=Eccl
+CÓHEILIT=Eccl
+COL=Col
+COLOSAIGH=Col
+DA=Dan
+DAINÉIL=Dan
+DARA LEABHAR NA GCROINIC�=2Chr
+DARA LEABHAR NA MACABAECH=2Macc
+DARA LEABHAR NA R�THE=2Kgs
+DARA LEABHAR SHAMÚÉIL=2Sam
+DE=Deut
+DEOTRANAIM�=Deut
+EAB=Heb
+EABHRAIGH=Heb
+EAG=Wis
+EAX=Exod
+EAXODUS=Exod
+EAZ=Ezra
+EIF=Eph
+EIFISIGH=Eph
+EIS=Esth
+EIZ=Ezek
+EIZICÉIL=Ezek
+EO=John
+EOIN=John
+FI=Phlm
+FIL=Phil
+FILÉAMÓN=Phlm
+FILIPIGH=Phil
+GA=Gal
+GALATAIGH=Gal
+GE=Gen
+GEINEASAS=Gen
+GNI=Acts
+GN�=Acts
+GN�OMHARTHA NA NASPAL=Acts
+HAB=Hab
+HABACÚC=Hab
+HAG=Hag
+HAGA�=Hag
+HO=Hos
+HÓ=Hos
+HÓISÉ=Hos
+IOB=Job
+IÓB=Job
+IOE=Joel
+IÓÉ=Joel
+IÓÉIL=Joel
+ION=Jonah
+IÓN=Jonah
+IÓNA=Jonah
+IOS=Josh
+IÓS=Josh
+IR=Jer
+IRIMIA=Jer
+ISE=Isa
+�SE=Isa
+�SE�IA=Isa
+IU=Jdt
+IÚ=Jdt
+IUD=Jude
+IÚD=Jude
+IÚD=Jude
+LAOI NA LAOITHE=Song
+LE=Lev
+LÉ=Lev
+LEABHAR EAZR�=Ezra
+LEABHAR EISTIR=Esth
+LEABHAR IÓB=Job
+LEABHAR IÓSUA=Josh
+LEABHAR IÚIDIT=Jdt
+LEABHAR NA HEAGNA=Wis
+LEABHAR NA MBREITHIÚNA=Judg
+LEABHAR NA NOLAGÓN=Lam
+LEABHAR NA SALM=Ps
+LEABHAR NA SEANFHOCAL=Prov
+LEABHAR NIHIMI�=Neh
+LEABHAR RÚT=Ruth
+LEABHAR SH�ORACH=Sir
+LEABHAR THÓIB�T=Tob
+LÉIV�TIC=Lev
+LNL=Song
+LU=Luke
+LÚ=Luke
+LÚC�S=Luke
+MAL=Mal
+MALAIC�=Mal
+MAR=Mark
+MARCAS=Mark
+MAT=Matt
+MATHA=Matt
+MI=Mic
+M�=Mic
+M�OC�=Mic
+NA=Nah
+NAHÚM=Nah
+NIH=Neh
+OB=Obad
+OBAIDI�=Obad
+OL=Lam
+RO=Rom
+RÓ=Rom
+RÓMH�NAIGH=Rom
+RUT=Ruth
+RÚT=Ruth
+SAL=Ps
+SE=Prov
+SEA=Jas
+SÉA=Jas
+SÉAMAS=Jas
+SI=Sir
+S�=Sir
+TI=Titus
+T�=Titus
+T�TEAS=Titus
+TOI=Tob
+TÓI=Tob
+UI=Num
+UIMHREACHA=Num
+ZAC=Zech
+ZACAIRIA=Zech
+ZAF=Zeph
+ZAFAINI�=Zeph
+#
+# These are not in the Irish Bible, but are included here if required if the list must be complete
+#
+ADDITIONAL PSALM=AddPs
+ADDITIONS TO DANIEL=AddDan
+ADDITIONS TO ESTHER=AddEsth
+BEL AND THE DRAGON=Bel
+DANIEL (GREEK)=DanGr
+EPISTLE OF JEREMIAH=EpJer
+ESTHER (GREEK)=EsthGr
+I ENOCH=1En
+I ESDRAS=1Esd
+I MEQABYAN=1Meq
+II BARUCH=2Bar
+II ESDRAS=2Esd
+II MEQABYAN=2Meq
+III MACCABEES=3Macc
+III MEQABYAN=3Meq
+IV BARUCH=4Bar
+IV MACCABEES=4Macc
+JUBILEES=Jub
+LAODICEANS=EpLao
+ODES=Odes
+PRAYER OF AZARIAH=PrAzar
+PRAYER OF MANASSES=PrMan
+PSALMS OF SOLOMON=PssSol
+SIRACH (PROLOGUE)=SirP
+SUSANNA=Sus
+
+
diff --git a/locales.d/he-utf8.conf b/locales.d/he-utf8.conf
new file mode 100644
index 0000000..1ff904c
--- /dev/null
+++ b/locales.d/he-utf8.conf
@@ -0,0 +1,238 @@
+
+#
+#  Hebrew booknames for the Tanach (OT) and the Berit Chadashah (NT).
+#    Tanach part was contributed by Alon Bar-Lev <alonbl2@gmail.com>.
+#
+#    Maintainer: Martin Gruner <mgruner@crosswire.org>
+#
+
+[Meta]
+Name=he
+Description=Hebrew (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=בר�שית
+Exodus=שמות
+Leviticus=ויקר�
+Numbers=במדבר
+Deuteronomy=דברי�
+Joshua=יהושוע
+Judges=שופטי�
+Ruth=רות
+I Samuel=שמו�ל �'
+II Samuel=שמו�ל ב'
+I Kings=מל�כי� �'
+II Kings=מל�כי� ב'
+I Chronicles=דברי הימי� �'
+II Chronicles=דברי הימי� ב'
+Ezra=עזר�
+Nehemiah=נחמיה
+Esther=�סתר
+Job=�יוב
+Psalms=תהילי�
+Proverbs=משלי
+Ecclesiastes=קוהלת
+Song of Solomon=שיר השירי�
+Isaiah=ישיעיהו
+Jeremiah=ירמיהו
+Lamentations=�יכה
+Ezekiel=יחזק�ל
+Daniel=דניי�ל
+Hosea=הושע
+Joel=יו�ל
+Amos=עמוס
+Obadiah=עובדיה
+Jonah=יונה
+Micah=מיכה
+Nahum=נחו�
+Habakkuk=חבקוק
+Zephaniah=צפניה
+Haggai=×—×’×™×™
+Zechariah=זכריה
+Malachi=מל�כי
+Matthew=מתי
+Mark=מרקו�
+Luke=לוק�
+John=יוחנן
+Acts=מעשי השליחי�
+Romans=�ל־הרומיי�
+I Corinthians=הר�שונה �ל־הקורינתי�
+II Corinthians=השנייה �ל־הקורינתי�
+Galatians=�ל־הגלטי�
+Ephesians=�ל־ה�פסיי�
+Philippians=�ל־הפיליפיי�
+Colossians=�ל־הקולומי�
+I Thessalonians=הר�שונה �ל־התסלוניקי�
+II Thessalonians=השנייה �ל־התסלוניקי�
+I Timothy=הר�שונה �ל־טימותיו�
+II Timothy=השנייה �ל־טימותיו�
+Titus=�ל־טיטו�
+Philemon=�ל־פילימון
+Hebrews=�ל־העברי�
+James=יעקב
+I Peter=פטרו� הר�שונה
+II Peter=פטרו� השנייה
+I John=יוחנן הר�שונה
+II John=יוחנן השנייה
+III John=יוחנן השלישית
+Jude=יהודה
+Revelation of John=התגלות
+
+[Book Abbrevs]
+
+בר�שית=Gen
+שמות=Exod
+ויקר�=Lev
+במדבר=Num
+דברי�=Deut
+יהושוע=Josh
+שופטי�=Judg
+רות=Ruth
+שמו�ל �'=1Sam
+שמו�ל�=1Sam
+שמו�ל �=1Sam
+שמו�ל ב'=2Sam
+שמו�לב=2Sam
+שמו�ל ב=2Sam
+מל�כי� �'=1Kgs
+מל�כי��=1Kgs
+מל�כי� �=1Kgs
+מל�כי� ב'=2Kgs
+מל�כי� ב=2Kgs
+מל�כי�ב=2Kgs
+דברי הימי� �'=1Chr
+דבריהימי��=1Chr
+דברי הימי� �=1Chr
+דברי הימי� ב'=2Chr
+דבריהימי�ב=2Chr
+דברי הימי� ב=2Chr
+עזר�=Ezra
+נחמיה=Neh
+�סתר=Esth
+�יוב=Job
+תהילי�=Ps
+משלי=Prov
+קוהלת=Eccl
+שיר השירי�=Song
+�יכה=Lam
+דניי�ל=Dan
+ישיעיהו=Isa
+ירמיהו=Jer
+יחזק�ל=Ezek
+הושע=Hos
+יו�ל=Joel
+עמוס=Amos
+עובדיה=Obad
+יונה=Jonah
+מיכה=Mic
+נחו�=Nah
+חבקוק=Hab
+צפניה=Zeph
+×—×’×™×™=Hag
+זכריה=Zech
+מל�כי=Mal
+
+מתי=Matt
+הבשורה על־פי מתי=Matt
+
+מרקו�=Mark
+הבשורה על־פי מרקו�=Mark
+
+לוק�=Luke
+הבשורה על־פי לוק�=Luke
+
+יוחנן=John
+הבשורה על־פי יוחנן=John
+
+מעשי השליחי�=Acts
+
+�ל־הרומיי�=Rom
+�גרת �ל־הרומיי�=Rom
+�גרת פולו� �ל־הרומיי�=Rom
+�גרת פולו� השליח �ל־הרומיי�=Rom
+
+הר�שונה �ל־הקורינתי�=1Cor
+�גרת הר�שונה �ל־הקורינתי�=1Cor
+�גרת פולו� הר�שונה �ל־הקורינתי�=1Cor
+
+השנייה �ל־הקורינתי�=2Cor
+�גרת השנייה �ל־הקורינתי�=2Cor
+�גרת פולו� השנייה �ל־הקורינתי�=2Cor
+
+�ל־הגלטי�=Gal
+�גרת �ל־הגלטי�=Gal
+�גרת פולו� �ל־הגלטי�=Gal
+�גרת פולו� השליח �ל־הגלטי�=Gal
+
+�ל־ה�פסיי�=Eph
+�גרת �ל־ה�פסיי�=Eph
+�גרת פולו� �ל־ה�פסיי�=Eph
+�גרת פולו� השליח �ל־ה�פסיי�=Eph
+
+�ל־הפיליפיי�=Phil
+�גרת �ל־הפיליפיי�=Phil
+�גרת פולו� �ל־הפיליפיי�=Phil
+�גרת פולו� השליח �ל־הפיליפיי�=Phil
+
+�ל־הקולומי�=Col
+�גרת �ל־הקולומי�=Col
+�גרת פולו� �ל־הקולומי�=Col
+�גר פולומ השליח �ל־הקולומי�=Col
+
+הר�שונה �ל־התסלוניקי�=1Thess
+�גרת הר�שונה �ל־התסלוניקי�=1Thess
+�גרת פולו� הר�שונה �ל־התסלוניקי�=1Thess
+
+השנייה �ל־התסלוניקי�=2Thess
+�גרת השנייה �ל־התסלוניקי�=2Thess
+�גרת פולו� השנייה �ל־התסלוניקי�=2Thess
+
+הר�שונה �ל־טימותיו�=1Tim
+�גרת הר�שונה �ל־טימותיו�=1Tim
+�גרת פולו� הר�שונה �ל־טימותיו�=1Tim
+
+השנייה �ל־טימותיו�=2Tim
+�גרת השנייה �ל־טימותיו�=2Tim
+�גרת פולו� השנייה �ל־טימותיו�=2Tim
+
+�ל־טיטו�=Titus
+�גרת �ל־טיטו�=Titus
+�גרת פולו� �ל־טיטו�=Titus
+
+�ל־פילימון=Phlm
+�גרת �ל־פילימון=Phlm
+�גרת פולו� �ל־פילימון=Phlm
+
+�ל־העברי�=Heb
+�גרת �ל־העברי�=Heb
+ה�גרת �ל־העברי�=Heb
+
+יעקב=Jas
+�גרת יעקב=Jas
+
+פטרו� הר�שונה=1Pet
+�גרת פטרו� הר�שונה=1Pet
+�גרת הרשונה של פטרו� השליח=1Pet
+
+פטרו� השנייה=2Pet
+�גרת פטרו� השנייה=2Pet
+�גרת השנייה של פטרו� השליח=2Pet
+
+יוחנן הר�שונה=1John
+�גרת יוחנן הר�שונה=1John
+�גרת הרשונה של יוחנן השליח=1John
+
+יוחנן השנייה=2John
+�גרת יוחנן השנייה=2John
+�גרת השנייה של יוחנן השליח=2John
+
+יוחנן השלישית=3John
+�גרת יוחנן השלישית=3John
+�גרת השלישית יוחנן השליח=3John
+
+יהודה=Jude
+�גרת יהודה=Jude
+
+התגלות=Rev
+התגלות יוחנן=Rev
diff --git a/locales.d/hr-utf8.conf b/locales.d/hr-utf8.conf
new file mode 100644
index 0000000..337e365
--- /dev/null
+++ b/locales.d/hr-utf8.conf
@@ -0,0 +1,352 @@
+[Meta]
+Name=hr
+Description=Hrvatski (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Knjiga Postanka
+Exodus=Knjiga Izlaska
+Leviticus=Levitski zakonik
+Numbers=Knjiga Brojeva
+Deuteronomy=Ponovljeni zakon
+Joshua=Jošua
+Judges=Suci
+Ruth=Knjiga o Ruti
+I Samuel=Prva knjiga o Samuelu
+II Samuel=Druga knjiga o Samuelu
+I Kings=Prva knjiga o Kraljevima
+II Kings=Druga knjiga o Kraljevima
+I Chronicles=Prva knjiga Ljetopisa
+II Chronicles=Druga knjiga Ljetopisa
+Ezra=Knjiga Ezrina
+Nehemiah=Knjiga Nehemijina
+Esther=Knjiga o Esteri
+Job=Knjiga o Jobu
+Psalms=Psalmi
+Proverbs=Mudre izreke
+Ecclesiastes=Knjiga propovjednika
+Song of Solomon=Pjesma nad pjesmama
+Isaiah=Knjiga proroka Izaije
+Jeremiah=Knjiga proroka Jeremije
+Lamentations=Tužaljke (pla� Jeremijin)
+Ezekiel=Knjiga proroka Ezekiela
+Daniel=Knjiga proroka Daniela
+Hosea=Knjiga proroka Hošea
+Joel=Knjiga proroka Joela
+Amos=Knjiga proroka Amosa
+Obadiah=Knjiga proroka Obadije
+Jonah=Knjiga proroka Jone
+Micah=Knjiga proroka Miheja
+Nahum=Knjiga proroka Nahuma
+Habakkuk=Knjiga proroka Habakuka
+Zephaniah=Knjiga proroka Sefanije
+Haggai=Knjiga proroka Hagaja
+Zechariah=Knjiga proroka Zaharije
+Malachi=Knjiga proroka Malahije
+
+Matthew=Evanđelje po Mateju
+Mark=Evanđelje po Marku
+Luke=Evanđelje po Luki
+John=Evanđelje po Ivanu
+Acts=Djela apostolska
+Romans=Poslanica Rimljanima
+I Corinthians=Prva poslanica Korinćanima
+II Corinthians=Druga poslanica Korinćanima
+Galatians=Poslanica Galaćanima
+Ephesians=Poslanica Efežanima
+Philippians=Poslanica Filipljnima
+Colossians=Poslanica Kološanima
+I Thessalonians=Prva poslanica Solunjanima
+II Thessalonians=Druga poslanica Solunjanima
+I Timothy=Prva poslanica Timoteju
+II Timothy=Druga poslanica Timoteju
+Titus=Poslanica Titu
+Philemon=Poslanica Filemonu
+Hebrews=Poslanica Hebrejima
+James=Jakovljeva poslanica
+I Peter=Prva Petrova poslanica
+II Peter=Druga Petrova poslanica
+I John=Prva Ivanova poslanica
+II John=Druga Ivanova poslanica
+III John=Treća Ivanova poslanica
+Jude=Judina poslanica
+Revelation of John=Otkrivenje
+
+[Book Abbrevs]
+
+POSTANAK=Gen
+KNJIGA POSTANKA=Gen
+
+IZLAZAK=Exod
+KNJIGA IZLASKA=Exod
+
+LEVITSKI ZAKONIK=Lev
+LEVITSKIZAKONIK=Lev
+LEVITSKI=Lev
+ZAKONIK=Lev
+
+BROJEVI=Num
+KNJIGA BROJEVA=Num
+
+PONOVLJENI ZAKON=Deut
+PONOVLJENIZAKON=Deut
+PONOVLJENI=Deut
+ZAKON=Deut
+
+JOÅ UA=Josh
+
+SUCI=Judg
+
+RUTA=Ruth
+KNJIGA O RUTI=Ruth
+
+SAMUEL 1=1Sam
+SAMUEL1=1Sam
+1SAMUELOVA=1Sam
+1 SAMUELOVA=1Sam
+1. SAMUELOVA=1Sam
+PRVA KNJIGA O SAMUELU=1Sam
+
+SAMUEL 2=2Sam
+SAMUEL2=2Sam
+2SAMUELOVA=2Sam
+2 SAMUELOVA=2Sam
+2. SAMUELOVA=2Sam
+DRUGA KNJIGA O SAMUELU=2Sam
+
+KRALJEVI1=1Kgs
+KRALJEVI 1=1Kgs
+1KRALJEVIMA=1Kgs
+1 KRALJEVIMA=1Kgs
+1. KRALJEVIMA=1Kgs
+PRVA KNJIGA O KRALJEVIMA=1Kgs
+
+KRALJEVI2=2Kgs
+KRALJEVI 2=2Kgs
+2KRALJEVIMA=2Kgs
+2 KRALJEVIMA=2Kgs
+2. KRALJEVIMA=2Kgs
+DRUGA KNJIGA O KRALJEVIMA=2Kgs
+
+LJETOPISI1=1Chr
+LJETOPISI 1=1Chr
+1LJETOPISA=1Chr
+1 LJETOPISA=1Chr
+1. LJETOPISA=1Chr
+PRVA KNJIGA LJETOPISA=1Chr
+
+LJETOPISI2=2Chr
+LJETOPISI 2=2Chr
+2LJETOPISA=2Chr
+2 LJETOPISA=2Chr
+2. LJETOPISA=2Chr
+DRUGA KNJIGA LJETOPISA=2Chr
+
+ESRA=Ezra
+KNJIGA EZRINA=Ezra
+
+NEHEMIJA=Neh
+KNJIGA NEHEMIJINA=Neh
+
+ESTERA=Esth
+KNJIGA O ESTERI=Esth
+
+JOB=Job
+KNJIGA O JOBU=Job
+
+PSALMI=Ps
+
+IZREKE=Prov
+MUDRE IZREKE=Prov
+
+PROPOVJEDNIK=Eccl
+KNJIGA PROPOVJEDNIKA=Eccl
+
+PJESMA NAD PJESMAMA=Song
+
+IZAIJA=Isa
+KNJIGA PROROKA IZAIJE=Isa
+
+JEREMIJA=Jer
+KNJIGA PROROKA JEREMIJE=Jer
+
+TUŽALJKE=Lam
+TUŽALJKE (PLAČ JEREMIJIN)=Lam
+
+EZEKIEL=Ezek
+KNJIGA PROROKA EZEKIELA=Ezek
+
+DANIEL=Dan
+KNJIGA PROROKA DANIELA=Dan
+
+HOÅ EA=Hos
+KNJIGA PROROKA HOÅ EA=Hos
+
+JOEL=Joel
+KNJIGA PROROKA JOELA=Joel
+
+AMOS=Amos
+KNJIGA PROROKA AMOSA=Amos
+
+OBADIJA=Obad
+KNJIGA PROROKA OBADIJE=Obad
+
+JONA=Jonah
+KNJIGA PROROKA JONE=Jonah
+
+MIHEJ=Mic
+KNJIGA PROROKA MIHEJA=Mic
+
+NAHUM=Nah
+KNJIGA PROROKA NAHUMA=Nah
+
+HABAKUK=Hab
+KNJIGA PROROKA HABAKUKA=Hab
+
+SEFANIJA=Zeph
+KNJIGA PROROKA SEFANIJE=Zeph
+
+HAGAJ=Hag
+KNJIGA PROROKA HAGAJA=Hag
+
+ZAHARIJA=Zech
+KNJIGA PROROKA ZAHARIJE=Zech
+
+MALAHIJA=Mal
+KNJIGA PROROKA MALAHIJE=Mal
+
+MATEJ=Matt
+EVAN�ELJE PO MATEJU=Matt
+
+MARKO=Mark
+EVAN�ELJE PO MARKU=Mark
+
+LUKA=Luke
+EVAN�ELJE PO LUKI=Luke
+
+IVAN=John
+EVAN�ELJE PO IVANU=John
+
+DJELA APOSTOLSKA=Acts
+DJELA=Acts
+
+RIMLJANIMA=Rom
+POSLANICA RIMLJANIMA=Rom
+
+1. KORINÄŒANIMA=1Cor
+1 KORINÄŒANIMA=1Cor
+1KORINÄŒANIMA=1Cor
+1KOR=1Cor
+KORINÄŒANIMA1=1Cor
+KORINÄŒANIMA 1=1Cor
+PRVA POSLANICA KORINĆANIMA=1Cor
+
+2. KORINÄŒANIMA=2Cor
+2 KORINÄŒANIMA=2Cor
+2KORINÄŒANIMA=2Cor
+2KOR=2Cor
+KORINÄŒANIMA2=2Cor
+KORINÄŒANIMA 2=2Cor
+DRUGA POSLANICA KORINĆANIMA=2Cor
+
+GALAÄŒANIMA=Gal
+POSLANICA GALAĆANIMA=Gal
+
+EFEŽANIMA=Eph
+POSLANICA EFEŽANIMA=Eph
+
+FILIPLJANIMA=Phil
+POSLANICA FILIPLJNIMA=Phil
+
+KOLOÅ ANIMA=Col
+POSLANICA KOLOÅ ANIMA=Col
+
+1. SOLUNJANIMA=1Thess
+1 SOLUNJANIMA=1Thess
+1SOLUNJANIMA=1Thess
+1SOL=1Thess
+SOLUNJANIMA1=1Thess
+SOLUNJANIMA 1=1Thess
+PRVA POSLANICA SOLUNJANIMA=1Thess
+
+2. SOLUNJANIMA=2Thess
+2 SOLUNJANIMA=2Thess
+2SOLUNJANIMA=2Thess
+2SOL=2Thess
+SOLUNJANIMA2=2Thess
+SOLUNJANIMA 2=2Thess
+DRUGA POSLANICA SOLUNJANIMA=2Thess
+
+1. TIMOTEJU=1Tim
+1 TIMOTEJU=1Tim
+1TIMOTEJU=1Tim
+1TIM=1Tim
+TIMOTEJU1=1Tim
+TIMOTEJU 1=1Tim
+PRVA POSLANICA TIMOTEJU=1Tim
+
+2. TIMOTEJU=2Tim
+2 TIMOTEJU=2Tim
+2TIMOTEJU=2Tim
+2TIM=2Tim
+TIMOTEJU2=2Tim
+TIMOTEJU 2=2Tim
+DRUGA POSLANICA TIMOTEJU=2Tim
+
+TITU=Titus
+POSLANICA TITU=Titus
+
+FILEMONU=Phlm
+POSLANICA FILEMONU=Phlm
+
+HEBREJIMA=Heb
+POSLANICA HEBREJIMA=Heb
+
+JAKOVLJEVA=Jas
+JAKOVLJEVA POSLANICA=Jas
+
+1. PETROVA=1Pet
+1 PETROVA=1Pet
+1PETROVA=1Pet
+1PET=1Pet
+PETROVA1=1Pet
+PETROVA 1=1Pet
+PRVA PETROVA POSLANICA=1Pet
+
+2. PETROVA=2Pet
+2 PETROVA=2Pet
+2PETROVA=2Pet
+2PET=2Pet
+PETROVA2=2Pet
+PETROVA 2=2Pet
+DRUGA PETROVA POSLANICA=2Pet
+
+1. IVANOVA=1John
+1 IVANOVA=1John
+1IVANOVA=1John
+1IVAN=1John
+IVANOVA1=1John
+IVANOVA 1=1John
+PRVA IVANOVA POSLANICA=1John
+
+2. IVANOVA=2John
+2 IVANOVA=2John
+2IVANOVA=2John
+2IVAN=2John
+IVANOVA2=2John
+IVANOVA 2=2John
+DRUGA IVANOVA POSLANICA=2John
+
+3. IVANOVA=3John
+3 IVANOVA=3John
+3IVANOVA=3John
+3IVAN=3John
+IVANOVA3=3John
+IVANOVA 3=3John
+TREĆA IVANOVA POSLANICA=3John
+
+JUDINA=Jude
+JUDINA POSLANICA=Jude
+
+OTKRIVENJE=Rev
+OTKR=Rev
diff --git a/locales.d/hu-utf8.conf b/locales.d/hu-utf8.conf
new file mode 100644
index 0000000..de757d8
--- /dev/null
+++ b/locales.d/hu-utf8.conf
@@ -0,0 +1,211 @@
+[Meta]
+Name=hu
+Description=Magyar (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mózes
+Exodus=2. Mózes
+Leviticus=3. Mózes
+Numbers=4. Mózes
+Deuteronomy=5. Mózes
+Joshua=Józsué
+Judges=Bírák
+Ruth=Ruth
+I Samuel=1. Sámuel
+II Samuel=2. Sámuel
+I Kings=1. Királyok
+II Kings=2. Királyok
+I Chronicles=1. Krónika
+II Chronicles=2. Krónika
+Ezra=Ezsdrás
+Nehemiah=Nehémiás
+Esther=Eszter
+Job=Jób
+Psalms=Zsoltárok
+Proverbs=Példabeszédek
+Ecclesiastes=Prédikátor
+Song of Solomon=Énekek éneke
+Isaiah=Ézsaiás
+Jeremiah=Jeremiás
+Lamentations=Jeremiás Siralmai
+Ezekiel=Ezékiel
+Daniel=Dániel
+Hosea=Hóseás
+Joel=Jóel
+Amos=�mós
+Obadiah=Abdiás
+Jonah=Jónás
+Micah=Mikeás
+Nahum=Náhum
+Habakkuk=Habakuk
+Zephaniah=Sofóniás
+Haggai=Aggeus
+Zechariah=Zakariás
+Malachi=Malakiás
+Matthew=Máté
+Mark=Márk
+Luke=Lukács
+John=János
+Acts=Apostolok Cselekedetei
+Romans=Róma
+I Corinthians=1. Korintus
+II Corinthians=2. Korintus
+Galatians=Galata
+Ephesians=Efézus
+Philippians=Filippi
+Colossians=Kolossé
+I Thessalonians=1. Thessalonika
+II Thessalonians=2. Thessalonika
+I Timothy=1. Timóteus
+II Timothy=2. Timóteus
+Titus=Titusz
+Philemon=Filemon
+Hebrews=Zsidókhoz írt levél
+James=Jakab
+I Peter=1. Péter
+II Peter=2. Péter
+I John=1. János
+II John=2. János
+III John=3. János
+Jude=Júdás
+Revelation of John=Jelenések
+
+[Book Abbrevs]
+
+1. MÓZES=Gen
+1 MÓZES=Gen
+1MÓZES=Gen
+
+2. MÓZES=Exod
+2 MÓZES=Exod
+2MÓZES=Exod
+
+3. MÓZES=Lev
+3 MÓZES=Lev
+3MÓZES=Lev
+
+4. MÓZES=Num
+4 MÓZES=Num
+4MÓZES=Num
+
+5. MÓZES=Deut
+5 MÓZES=Deut
+5MÓZES=Deut
+
+JÓZSUÉ=Josh
+B�R�K=Judg
+RUTH=Ruth
+
+1. S�MUEL=1Sam
+1 S�MUEL=1Sam
+1S�MUEL=1Sam
+
+2. S�MUEL=2Sam
+2 S�MUEL=2Sam
+2S�MUEL=2Sam
+
+1. KIR�LYOK=1Kgs
+1 KIR�LYOK=1Kgs
+1KIR�LYOK=1Kgs
+
+2. KIR�LYOK=2Kgs
+2 KIR�LYOK=2Kgs
+2KIR�LYOK=2Kgs
+
+1. KRÓNIKA=1Chr
+1 KRÓNIKA=1Chr
+1KRÓNIKA=1Chr
+
+2. KRÓNIKA=2Chr
+2 KRÓNIKA=2Chr
+2KRÓNIKA=2Chr
+
+EZSDR�S=Ezra
+NEHÉMI�S=Neh
+ESZTER=Esth
+JÓB=Job
+ZSOLT�ROK=Ps
+PÉLDABESZÉDEK=Prov
+PRÉDIK�TOR=Eccl
+ÉNEKEK ÉNEKE=Song
+ÉZSAI�S=Isa
+JEREMI�S=Jer
+JEREMI�S SIRALMAI=Lam
+EZÉKIEL=Ezek
+D�NIEL=Dan
+HÓSE�S=Hos
+JÓEL=Joel
+�MÓS=Amos
+ABDI�S=Obad
+JÓN�S=Jonah
+MIKE�S=Mic
+N�HUM=Nah
+HABAKUK=Hab
+SOFÓNI�S=Zeph
+AGGEUS=Hag
+ZAKARI�S=Zech
+MALAKI�S=Mal
+M�TÉ=Matt
+M�RK=Mark
+LUK�CS=Luke
+J�NOS=John
+APOSTOLOK CSELEKEDETEI=Acts
+RÓMA=Rom
+
+1. KORINTUS=1Cor
+1 KORINTUS=1Cor
+1KORINTUS=1Cor
+
+2. KORINTUS=2Cor
+2 KORINTUS=2Cor
+2KORINTUS=2Cor
+
+GALATA=Gal
+EFÉZUS=Eph
+FILIPPI=Phil
+KOLOSSÉ=Col
+
+1. THESSALONIKA=1Thess
+1 THESSALONIKA=1Thess
+1THESSALONIKA=1Thess
+
+2. THESSALONIKA=2Thess
+2 THESSALONIKA=2Thess
+2THESSALONIKA=2Thess
+
+1. TIMÓTEUS=1Tim
+1 TIMÓTEUS=1Tim
+1TIMÓTEUS=1Tim
+
+2. TIMÓTEUS=2Tim
+2 TIMÓTEUS=2Tim
+2TIMÓTEUS=2Tim
+
+TITUSZ=Titus
+FILEMON=Phlm
+ZSIDÓKHOZ �RT LEVÉL=Heb
+JAKAB=Jas
+
+1. PÉTER=1Pet
+1 PÉTER=1Pet
+1PÉTER=1Pet
+
+2. PÉTER=2Pet
+2 PÉTER=2Pet
+2PÉTER=2Pet
+
+1. J�NOS=1John
+1 J�NOS=1John
+1J�NOS=1John
+
+2. J�NOS=2John
+2 J�NOS=2John
+2J�NOS=2John
+
+3. J�NOS=3John
+3 J�NOS=3John
+3J�NOS=3John
+
+JÚD�S=Jude
+JELENÉSEK=Rev
diff --git a/locales.d/hu.conf b/locales.d/hu.conf
new file mode 100644
index 0000000..e0dc834
--- /dev/null
+++ b/locales.d/hu.conf
@@ -0,0 +1,211 @@
+[Meta]
+Name=hu
+Description=Magyar
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Mózes
+Exodus=2. Mózes
+Leviticus=3. Mózes
+Numbers=4. Mózes
+Deuteronomy=5. Mózes
+Joshua=Józsué
+Judges=Bírák
+Ruth=Ruth
+I Samuel=1. Sámuel
+II Samuel=2. Sámuel
+I Kings=1. Királyok
+II Kings=2. Királyok
+I Chronicles=1. Krónika
+II Chronicles=2. Krónika
+Ezra=Ezsdrás
+Nehemiah=Nehémiás
+Esther=Eszter
+Job=Jób
+Psalms=Zsoltárok
+Proverbs=Példabeszédek
+Ecclesiastes=Prédikátor
+Song of Solomon=Énekek éneke
+Isaiah=Ézsaiás
+Jeremiah=Jeremiás
+Lamentations=Jeremiás Siralmai
+Ezekiel=Ezékiel
+Daniel=Dániel
+Hosea=Hóseás
+Joel=Jóel
+Amos=Ámós
+Obadiah=Abdiás
+Jonah=Jónás
+Micah=Mikeás
+Nahum=Náhum
+Habakkuk=Habakuk
+Zephaniah=Sofóniás
+Haggai=Aggeus
+Zechariah=Zakariás
+Malachi=Malakiás
+Matthew=Máté
+Mark=Márk
+Luke=Lukács
+John=János
+Acts=Apostolok Cselekedetei
+Romans=Róma
+I Corinthians=1. Korintus
+II Corinthians=2. Korintus
+Galatians=Galata
+Ephesians=Efézus
+Philippians=Filippi
+Colossians=Kolossé
+I Thessalonians=1. Thessalonika
+II Thessalonians=2. Thessalonika
+I Timothy=1. Timóteus
+II Timothy=2. Timóteus
+Titus=Titusz
+Philemon=Filemon
+Hebrews=Zsidókhoz írt levél
+James=Jakab
+I Peter=1. Péter
+II Peter=2. Péter
+I John=1. János
+II John=2. János
+III John=3. János
+Jude=Júdás
+Revelation of John=Jelenések
+
+[Book Abbrevs]
+
+1. MÓZES=Gen
+1 MÓZES=Gen
+1MÓZES=Gen
+
+2. MÓZES=Exod
+2 MÓZES=Exod
+2MÓZES=Exod
+
+3. MÓZES=Lev
+3 MÓZES=Lev
+3MÓZES=Lev
+
+4. MÓZES=Num
+4 MÓZES=Num
+4MÓZES=Num
+
+5. MÓZES=Deut
+5 MÓZES=Deut
+5MÓZES=Deut
+
+JÓZSUÉ=Josh
+BÍRÁK=Judg
+RUTH=Ruth
+
+1. SÁMUEL=1Sam
+1 SÁMUEL=1Sam
+1SÁMUEL=1Sam
+
+2. SÁMUEL=2Sam
+2 SÁMUEL=2Sam
+2SÁMUEL=2Sam
+
+1. KIRÁLYOK=1Kgs
+1 KIRÁLYOK=1Kgs
+1KIRÁLYOK=1Kgs
+
+2. KIRÁLYOK=2Kgs
+2 KIRÁLYOK=2Kgs
+2KIRÁLYOK=2Kgs
+
+1. KRÓNIKA=1Chr
+1 KRÓNIKA=1Chr
+1KRÓNIKA=1Chr
+
+2. KRÓNIKA=2Chr
+2 KRÓNIKA=2Chr
+2KRÓNIKA=2Chr
+
+EZSDRÁS=Ezra
+NEHÉMIÁS=Neh
+ESZTER=Esth
+JÓB=Job
+ZSOLTÁROK=Ps
+PÉLDABESZÉDEK=Prov
+PRÉDIKÁTOR=Eccl
+ÉNEKEK ÉNEKE=Song
+ÉZSAIÁS=Isa
+JEREMIÁS=Jer
+JEREMIÁS SIRALMAI=Lam
+EZÉKIEL=Ezek
+DÁNIEL=Dan
+HÓSEÁS=Hos
+JÓEL=Joel
+ÁMÓS=Amos
+ABDIÁS=Obad
+JÓNÁS=Jonah
+MIKEÁS=Mic
+NÁHUM=Nah
+HABAKUK=Hab
+SOFÓNIÁS=Zeph
+AGGEUS=Hag
+ZAKARIÁS=Zech
+MALAKIÁS=Mal
+MÁTÉ=Matt
+MÁRK=Mark
+LUKÁCS=Luke
+JÁNOS=John
+APOSTOLOK CSELEKEDETEI=Acts
+RÓMA=Rom
+
+1. KORINTUS=1Cor
+1 KORINTUS=1Cor
+1KORINTUS=1Cor
+
+2. KORINTUS=2Cor
+2 KORINTUS=2Cor
+2KORINTUS=2Cor
+
+GALATA=Gal
+EFÉZUS=Eph
+FILIPPI=Phil
+KOLOSSÉ=Col
+
+1. THESSALONIKA=1Thess
+1 THESSALONIKA=1Thess
+1THESSALONIKA=1Thess
+
+2. THESSALONIKA=2Thess
+2 THESSALONIKA=2Thess
+2THESSALONIKA=2Thess
+
+1. TIMÓTEUS=1Tim
+1 TIMÓTEUS=1Tim
+1TIMÓTEUS=1Tim
+
+2. TIMÓTEUS=2Tim
+2 TIMÓTEUS=2Tim
+2TIMÓTEUS=2Tim
+
+TITUSZ=Titus
+FILEMON=Phlm
+ZSIDÓKHOZ ÍRT LEVÉL=Heb
+JAKAB=Jas
+
+1. PÉTER=1Pet
+1 PÉTER=1Pet
+1PÉTER=1Pet
+
+2. PÉTER=2Pet
+2 PÉTER=2Pet
+2PÉTER=2Pet
+
+1. JÁNOS=1John
+1 JÁNOS=1John
+1JÁNOS=1John
+
+2. JÁNOS=2John
+2 JÁNOS=2John
+2JÁNOS=2John
+
+3. JÁNOS=3John
+3 JÁNOS=3John
+3JÁNOS=3John
+
+JÚDÁS=Jude
+JELENÉSEK=Rev
diff --git a/locales.d/id-utf8.conf b/locales.d/id-utf8.conf
new file mode 100644
index 0000000..785035c
--- /dev/null
+++ b/locales.d/id-utf8.conf
@@ -0,0 +1,465 @@
+[Meta]
+Name=id
+Description=Bahasa Indonesia (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Kejadian
+Exodus=Keluaran
+Leviticus=Imamat
+Numbers=Bilangan
+Deuteronomy=Ulangan
+Joshua=Yosua
+Judges=Hakim-hakim
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Raja
+II Kings=2 Raja
+I Chronicles=1 Tawarikh
+II Chronicles=2 Tawarikh
+Ezra=Ezra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Ayub
+Psalms=Mazmur
+Proverbs=Amsal
+Ecclesiastes=Pengkhotbah
+Song of Solomon=Kidung Agung
+Isaiah=Yesaya
+Jeremiah=Yeremia
+Lamentations=Ratapan
+Ezekiel=Yehezkiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Yoel
+Amos=Amos
+Obadiah=Obaja
+Jonah=Yunus
+Micah=Mikha
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Zefanya
+Haggai=Hagai
+Zechariah=Zakharia
+Malachi=Maleakhi
+Matthew=Matius
+Mark=Markus
+Luke=Lukas
+John=Yohanes
+Acts=Kisah Para Rasul
+Romans=Roma
+I Corinthians=1 Korintus
+II Corinthians=2 Korintus
+Galatians=Galatia
+Ephesians=Efesus
+Philippians=Filipi
+Colossians=Kolose
+I Thessalonians=1 Tesalonika
+II Thessalonians=2 Tesalonika
+I Timothy=1 Timotius
+II Timothy=2 Timotius
+Titus=Titus
+Philemon=Filemon
+Hebrews=Ibrani
+James=Yakobus
+I Peter=1 Petrus
+II Peter=2 Petrus
+I John=1 Yohanes
+II John=2 Yohanes
+III John=3 Yohanes
+Jude=Yudas
+Revelation of John=Wahyu
+
+[Book Abbrevs]
+1 C=1Cor
+1 CHRONICLES=1Chr
+1 CORINTHIANS=1Cor
+1 JN=1John
+1 JOHN=1John
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 KOR=1Cor
+1 KORINTUS=1Cor
+1 PE=1Pet
+1 PETER=1Pet
+1 PETRUS=1Pet
+1 PTR=1Pet
+1 RA=1Kgs
+1 RAJA=1Kgs
+1 RAJA-RAJA=1Kgs
+1 SA=1Sam
+1 SAMUEL=1Sam
+1 TA=1Chr
+1 TAWARIKH=1Chr
+1 TE=1Thess
+1 TESALONIKA=1Thess
+1 THESSALONIANS=1Thess
+1 TI=1Tim
+1 TIMOTHY=1Tim
+1 TIMOTIUS=1Tim
+1 YO=1John
+1 YOHANES=1John
+1C=1Cor
+1CHRONICLES=1Chr
+1CORINTHIANS=1Cor
+1JN=1John
+1JOHN=1John
+1KGS=1Kgs
+1KINGS=1Kgs
+1KO=1Cor
+1PE=1Pet
+1PETER=1Pet
+1PTR=1Pet
+1RA=1Kgs
+1RAJA-RAJA=1Kgs
+1SA=1Sam
+1SAMUEL=1Sam
+1TA=1Chr
+1TE=1Thess
+1THESSALONIANS=1Thess
+1TI=1Tim
+1TIMOTHY=1Tim
+1YO=1John
+1YOH=1John
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
+2 JN=2John
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 KO=2Cor
+2 KORINTUS=2Cor
+2 PE=2Pet
+2 PETER=2Pet
+2 PETRUS=2Pet
+2 PTR=2Pet
+2 RA=2Kgs
+2 RAJA=2Kgs
+2 RAJA-RAJA=2Kgs
+2 SA=2Sam
+2 SAMUEL=2Sam
+2 TA=2Chr
+2 TAWARIKH=2Chr
+2 TE=2Thess
+2 TESALONIKA=2Thess
+2 THESSALONIANS=2Thess
+2 TI=2Tim
+2 TIMOTHY=2Tim
+2 TIMOTIUS=2Tim
+2 YO=2John
+2 YOHANES=2John
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2KO=2Cor
+2PE=2Pet
+2PETER=2Pet
+2PTR=2Pet
+2RA=2Kgs
+2RAJA-RAJA=2Kgs
+2SA=2Sam
+2SAMUEL=2Sam
+2TA=2Chr
+2TE=2Thess
+2THESSALONIANS=2Thess
+2TI=2Tim
+2TIMOTHY=2Tim
+2YO=2John
+2YOH=2John
+3 JN=3John
+3 JOHN=3John
+3 YO=3John
+3 YOHANES=3John
+3JN=3John
+3JOHN=3John
+3YO=3John
+3YOH=3John
+A=Prov
+ACTS=Acts
+AM=Amos
+AMO=Amos
+AMOS=Amos
+AMS=Prov
+AMSAL=Prov
+AYB=Job
+AYU=Job
+AYUB=Job
+BIL=Num
+BILANGAN=Num
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Dan
+DAN=Dan
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EF=Eph
+EFESUS=Eph
+EPHESIANS=Eph
+EST=Esth
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZR=Ezra
+EZRA=Ezra
+F=Phil
+FILE=Phlm
+FILEMON=Phlm
+FILI=Phil
+FILIPI=Phil
+FLM=Phlm
+FLP=Phil
+G=Gal
+GAL=Gal
+GALATIA=Gal
+GALATIANS=Gal
+GENESIS=Gen
+H=Judg
+HA=Judg
+HAB=Hab
+HABAKKUK=Hab
+HABAKUK=Hab
+HAG=Hag
+HAGAI=Hag
+HAGGAI=Hag
+HAK=Judg
+HAKIM-HAKIM=Judg
+HE=Heb
+HEBREWS=Heb
+HOS=Hos
+HOSEA=Hos
+I C=1Cor
+I CHRONICLES=1Chr
+I CORINTHIANS=1Cor
+I JN=1John
+I JOHN=1John
+I KGS=1Kgs
+I KINGS=1Kgs
+I KO=1Cor
+I PE=1Pet
+I PETER=1Pet
+I PETRUS=1Pet
+I PTR=1Pet
+I RA=1Kgs
+I RAJA-RAJA=1Kgs
+I SA=1Sam
+I SAMUEL=1Sam
+I TA=1Chr
+I TE=1Thess
+I THESSALONIANS=1Thess
+I TI=1Tim
+I TIMOTHY=1Tim
+I YO=1John
+I=Lev
+IBR=Heb
+IBRANI=Heb
+IC=1Cor
+ICHRONICLES=1Chr
+ICORINTHIANS=1Cor
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
+II KGS=2Kgs
+II KINGS=2Kgs
+II KO=2Cor
+II PE=2Pet
+II PETER=2Pet
+II PETRUS=2Pet
+II PTR=2Pet
+II RA=2Kgs
+II RAJA-RAJA=2Kgs
+II SA=2Sam
+II SAMUEL=2Sam
+II TA=2Chr
+II TE=2Thess
+II THESSALONIANS=2Thess
+II TI=2Tim
+II TIMOTHY=2Tim
+II YO=2John
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+III YO=3John
+IIIJN=3John
+IIIJOHN=3John
+IIIYO=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIKO=2Cor
+IIPE=2Pet
+IIPETER=2Pet
+IIPETRUS=2Pet
+IIPTR=2Pet
+IIRA=2Kgs
+IIRAJA-RAJA=2Kgs
+IISA=2Sam
+IISAMUEL=2Sam
+IITA=2Chr
+IITE=2Thess
+IITHESSALONIANS=2Thess
+IITI=1Tim
+IITI=2Tim
+IITIMOTHY=2Tim
+IIYO=2John
+IJN=1John
+IJOHN=1John
+IKGS=1Kgs
+IKINGS=1Kgs
+IKO=1Cor
+IM=Lev
+IMAMAT=Lev
+IPE=1Pet
+IPETER=1Pet
+IPETRUS=1Pet
+IPTR=1Pet
+IRA=1Kgs
+IRAJA-RAJA=1Kgs
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITA=1Chr
+ITE=1Thess
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+IYES=Isa
+IYO=1John
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
+JUDGES=Judg
+KEJ=Gen
+KEJADIAN=Gen
+KEL=Exod
+KELUARAN=Exod
+KID=Song
+KIDUNG AGUNG=Song
+KIS=Acts
+KISAH PARA RASUL=Acts
+KOL=Col
+KOLOSE=Col
+L=Luke
+LAMENTATIONS=Lam
+LEVITICUS=Lev
+LK=Luke
+LUK=Luke
+LUKAS=Luke
+LUKE=Luke
+MA=Matt
+MAL=Mal
+MALACHI=Mal
+MALEAKHI=Mal
+MARK=Mark
+MARKUS=Mark
+MAT=Matt
+MATIUS=Matt
+MATTHEW=Matt
+MAZ=Ps
+MAZMUR=Ps
+MICAH=Mic
+MIK=Mic
+MIKHA=Mic
+MK=Mark
+MR=Mark
+MRK=Mark
+MT=Matt
+MZM=Ps
+N=Neh
+NAH=Nah
+NAHUM=Nah
+NEH=Neh
+NEHEMIA=Neh
+NEHEMIAH=Neh
+NUMBERS=Num
+OB=Obad
+OBADIAH=Obad
+OBAJA=Obad
+P=Eccl
+PENGK=Eccl
+PENGKHOTBAH=Eccl
+PH=Phil
+PHILEMON=Phlm
+PHILIPPIANS=Phil
+PHLM=Phlm
+PHM=Phlm
+PHP=Phil
+PKH=Eccl
+PROVERBS=Prov
+PSALMS=Ps
+PSM=Ps
+PSS=Ps
+R=Rom
+RAT=Lam
+RATAPAN=Lam
+REVELATION OF JOHN=Rev
+REVELATION OF ST. JOHN=Rev
+REVELATION=Rev
+RM=Rom
+ROM=Rom
+ROMA=Rom
+ROMANS=Rom
+RUT=Ruth
+RUTH=Ruth
+SONG OF SOLOMON=Song
+SONG OF SONGS=Song
+SOS=Song
+TIT=Titus
+TITUS=Titus
+UL=Deut
+ULANGAN=Deut
+WAH=Rev
+WAHYU=Rev
+WHY=Rev
+Y=John
+YAK=Jas
+YAKOBUS=Jas
+YE=Isa
+YEH=Ezek
+YEHEZKIEL=Ezek
+YER=Jer
+YEREMIA=Jer
+YES=Isa
+YESAYA=Isa
+YL=Joel
+YO=John
+YOE=Joel
+YOEL=Joel
+YOH=John
+YOHANES=John
+YOS=Josh
+YOSUA=Josh
+YUD=Jude
+YUDAS=Jude
+YUN=Jonah
+YUNUS=Jonah
+ZAK=Zech
+ZAKHARIA=Zech
+ZECHARIAH=Zech
+ZEF=Zeph
+ZEFANYA=Zeph
+ZEPHANIAH=Zeph
diff --git a/locales.d/id.conf b/locales.d/id.conf
new file mode 100644
index 0000000..16a1fbb
--- /dev/null
+++ b/locales.d/id.conf
@@ -0,0 +1,465 @@
+[Meta]
+Name=id
+Description=Bahasa Indonesia
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Kejadian
+Exodus=Keluaran
+Leviticus=Imamat
+Numbers=Bilangan
+Deuteronomy=Ulangan
+Joshua=Yosua
+Judges=Hakim-hakim
+Ruth=Rut
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Raja
+II Kings=2 Raja
+I Chronicles=1 Tawarikh
+II Chronicles=2 Tawarikh
+Ezra=Ezra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Ayub
+Psalms=Mazmur
+Proverbs=Amsal
+Ecclesiastes=Pengkhotbah
+Song of Solomon=Kidung Agung
+Isaiah=Yesaya
+Jeremiah=Yeremia
+Lamentations=Ratapan
+Ezekiel=Yehezkiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Yoel
+Amos=Amos
+Obadiah=Obaja
+Jonah=Yunus
+Micah=Mikha
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Zefanya
+Haggai=Hagai
+Zechariah=Zakharia
+Malachi=Maleakhi
+Matthew=Matius
+Mark=Markus
+Luke=Lukas
+John=Yohanes
+Acts=Kisah Para Rasul
+Romans=Roma
+I Corinthians=1 Korintus
+II Corinthians=2 Korintus
+Galatians=Galatia
+Ephesians=Efesus
+Philippians=Filipi
+Colossians=Kolose
+I Thessalonians=1 Tesalonika
+II Thessalonians=2 Tesalonika
+I Timothy=1 Timotius
+II Timothy=2 Timotius
+Titus=Titus
+Philemon=Filemon
+Hebrews=Ibrani
+James=Yakobus
+I Peter=1 Petrus
+II Peter=2 Petrus
+I John=1 Yohanes
+II John=2 Yohanes
+III John=3 Yohanes
+Jude=Yudas
+Revelation of John=Wahyu
+
+[Book Abbrevs]
+1 C=1Cor
+1 CHRONICLES=1Chr
+1 CORINTHIANS=1Cor
+1 JN=1John
+1 JOHN=1John
+1 KGS=1Kgs
+1 KINGS=1Kgs
+1 KOR=1Cor
+1 KORINTUS=1Cor
+1 PE=1Pet
+1 PETER=1Pet
+1 PETRUS=1Pet
+1 PTR=1Pet
+1 RA=1Kgs
+1 RAJA=1Kgs
+1 RAJA-RAJA=1Kgs
+1 SA=1Sam
+1 SAMUEL=1Sam
+1 TA=1Chr
+1 TAWARIKH=1Chr
+1 TE=1Thess
+1 TESALONIKA=1Thess
+1 THESSALONIANS=1Thess
+1 TI=1Tim
+1 TIMOTHY=1Tim
+1 TIMOTIUS=1Tim
+1 YO=1John
+1 YOHANES=1John
+1C=1Cor
+1CHRONICLES=1Chr
+1CORINTHIANS=1Cor
+1JN=1John
+1JOHN=1John
+1KGS=1Kgs
+1KINGS=1Kgs
+1KO=1Cor
+1PE=1Pet
+1PETER=1Pet
+1PTR=1Pet
+1RA=1Kgs
+1RAJA-RAJA=1Kgs
+1SA=1Sam
+1SAMUEL=1Sam
+1TA=1Chr
+1TE=1Thess
+1THESSALONIANS=1Thess
+1TI=1Tim
+1TIMOTHY=1Tim
+1YO=1John
+1YOH=1John
+2 C=2Cor
+2 CHRONICLES=2Chr
+2 CORINTHIANS=2Cor
+2 JN=2John
+2 JOHN=2John
+2 KGS=2Kgs
+2 KINGS=2Kgs
+2 KO=2Cor
+2 KORINTUS=2Cor
+2 PE=2Pet
+2 PETER=2Pet
+2 PETRUS=2Pet
+2 PTR=2Pet
+2 RA=2Kgs
+2 RAJA=2Kgs
+2 RAJA-RAJA=2Kgs
+2 SA=2Sam
+2 SAMUEL=2Sam
+2 TA=2Chr
+2 TAWARIKH=2Chr
+2 TE=2Thess
+2 TESALONIKA=2Thess
+2 THESSALONIANS=2Thess
+2 TI=2Tim
+2 TIMOTHY=2Tim
+2 TIMOTIUS=2Tim
+2 YO=2John
+2 YOHANES=2John
+2C=2Cor
+2CHRONICLES=2Chr
+2CORINTHIANS=2Cor
+2JN=2John
+2JOHN=2John
+2KGS=2Kgs
+2KINGS=2Kgs
+2KO=2Cor
+2PE=2Pet
+2PETER=2Pet
+2PTR=2Pet
+2RA=2Kgs
+2RAJA-RAJA=2Kgs
+2SA=2Sam
+2SAMUEL=2Sam
+2TA=2Chr
+2TE=2Thess
+2THESSALONIANS=2Thess
+2TI=2Tim
+2TIMOTHY=2Tim
+2YO=2John
+2YOH=2John
+3 JN=3John
+3 JOHN=3John
+3 YO=3John
+3 YOHANES=3John
+3JN=3John
+3JOHN=3John
+3YO=3John
+3YOH=3John
+A=Prov
+ACTS=Acts
+AM=Amos
+AMO=Amos
+AMOS=Amos
+AMS=Prov
+AMSAL=Prov
+AYB=Job
+AYU=Job
+AYUB=Job
+BIL=Num
+BILANGAN=Num
+C=Col
+CANTICLE OF CANTICLES=Song
+COC=Song
+COLOSSIANS=Col
+D=Dan
+DAN=Dan
+DANIEL=Dan
+DEUTERONOMY=Deut
+E=Eph
+ECCLESIASTES=Eccl
+EF=Eph
+EFESUS=Eph
+EPHESIANS=Eph
+EST=Esth
+ESTER=Esth
+ESTHER=Esth
+EXODUS=Exod
+EZEKIEL=Ezek
+EZR=Ezra
+EZRA=Ezra
+F=Phil
+FILE=Phlm
+FILEMON=Phlm
+FILI=Phil
+FILIPI=Phil
+FLM=Phlm
+FLP=Phil
+G=Gal
+GAL=Gal
+GALATIA=Gal
+GALATIANS=Gal
+GENESIS=Gen
+H=Judg
+HA=Judg
+HAB=Hab
+HABAKKUK=Hab
+HABAKUK=Hab
+HAG=Hag
+HAGAI=Hag
+HAGGAI=Hag
+HAK=Judg
+HAKIM-HAKIM=Judg
+HE=Heb
+HEBREWS=Heb
+HOS=Hos
+HOSEA=Hos
+I C=1Cor
+I CHRONICLES=1Chr
+I CORINTHIANS=1Cor
+I JN=1John
+I JOHN=1John
+I KGS=1Kgs
+I KINGS=1Kgs
+I KO=1Cor
+I PE=1Pet
+I PETER=1Pet
+I PETRUS=1Pet
+I PTR=1Pet
+I RA=1Kgs
+I RAJA-RAJA=1Kgs
+I SA=1Sam
+I SAMUEL=1Sam
+I TA=1Chr
+I TE=1Thess
+I THESSALONIANS=1Thess
+I TI=1Tim
+I TIMOTHY=1Tim
+I YO=1John
+I=Lev
+IBR=Heb
+IBRANI=Heb
+IC=1Cor
+ICHRONICLES=1Chr
+ICORINTHIANS=1Cor
+II C=2Cor
+II CHRONICLES=2Chr
+II CORINTHIANS=2Cor
+II JN=2John
+II JOHN=2John
+II KGS=2Kgs
+II KINGS=2Kgs
+II KO=2Cor
+II PE=2Pet
+II PETER=2Pet
+II PETRUS=2Pet
+II PTR=2Pet
+II RA=2Kgs
+II RAJA-RAJA=2Kgs
+II SA=2Sam
+II SAMUEL=2Sam
+II TA=2Chr
+II TE=2Thess
+II THESSALONIANS=2Thess
+II TI=2Tim
+II TIMOTHY=2Tim
+II YO=2John
+IIC=2Cor
+IICHRONICLES=2Chr
+IICORINTHIANS=2Cor
+III JN=3John
+III JOHN=3John
+III YO=3John
+IIIJN=3John
+IIIJOHN=3John
+IIIYO=3John
+IIJN=2John
+IIJOHN=2John
+IIKGS=2Kgs
+IIKINGS=2Kgs
+IIKO=2Cor
+IIPE=2Pet
+IIPETER=2Pet
+IIPETRUS=2Pet
+IIPTR=2Pet
+IIRA=2Kgs
+IIRAJA-RAJA=2Kgs
+IISA=2Sam
+IISAMUEL=2Sam
+IITA=2Chr
+IITE=2Thess
+IITHESSALONIANS=2Thess
+IITI=1Tim
+IITI=2Tim
+IITIMOTHY=2Tim
+IIYO=2John
+IJN=1John
+IJOHN=1John
+IKGS=1Kgs
+IKINGS=1Kgs
+IKO=1Cor
+IM=Lev
+IMAMAT=Lev
+IPE=1Pet
+IPETER=1Pet
+IPETRUS=1Pet
+IPTR=1Pet
+IRA=1Kgs
+IRAJA-RAJA=1Kgs
+ISA=Isa
+ISAIAH=Isa
+ISAMUEL=1Sam
+ITA=1Chr
+ITE=1Thess
+ITHESSALONIANS=1Thess
+ITIMOTHY=1Tim
+IYES=Isa
+IYO=1John
+J=John
+JAMES=Jas
+JAS=Jas
+JEREMIAH=Jer
+JN=John
+JO=John
+JOB=Job
+JOEL=Joel
+JOHN=John
+JONAH=Jonah
+JOSHUA=Josh
+JUD=Judg
+JUDE=Jude
+JUDGES=Judg
+KEJ=Gen
+KEJADIAN=Gen
+KEL=Exod
+KELUARAN=Exod
+KID=Song
+KIDUNG AGUNG=Song
+KIS=Acts
+KISAH PARA RASUL=Acts
+KOL=Col
+KOLOSE=Col
+L=Luke
+LAMENTATIONS=Lam
+LEVITICUS=Lev
+LK=Luke
+LUK=Luke
+LUKAS=Luke
+LUKE=Luke
+MA=Matt
+MAL=Mal
+MALACHI=Mal
+MALEAKHI=Mal
+MARK=Mark
+MARKUS=Mark
+MAT=Matt
+MATIUS=Matt
+MATTHEW=Matt
+MAZ=Ps
+MAZMUR=Ps
+MICAH=Mic
+MIK=Mic
+MIKHA=Mic
+MK=Mark
+MR=Mark
+MRK=Mark
+MT=Matt
+MZM=Ps
+N=Neh
+NAH=Nah
+NAHUM=Nah
+NEH=Neh
+NEHEMIA=Neh
+NEHEMIAH=Neh
+NUMBERS=Num
+OB=Obad
+OBADIAH=Obad
+OBAJA=Obad
+P=Eccl
+PENGK=Eccl
+PENGKHOTBAH=Eccl
+PH=Phil
+PHILEMON=Phlm
+PHILIPPIANS=Phil
+PHLM=Phlm
+PHM=Phlm
+PHP=Phil
+PKH=Eccl
+PROVERBS=Prov
+PSALMS=Ps
+PSM=Ps
+PSS=Ps
+R=Rom
+RAT=Lam
+RATAPAN=Lam
+REVELATION OF JOHN=Rev
+REVELATION OF ST. JOHN=Rev
+REVELATION=Rev
+RM=Rom
+ROM=Rom
+ROMA=Rom
+ROMANS=Rom
+RUT=Ruth
+RUTH=Ruth
+SONG OF SOLOMON=Song
+SONG OF SONGS=Song
+SOS=Song
+TIT=Titus
+TITUS=Titus
+UL=Deut
+ULANGAN=Deut
+WAH=Rev
+WAHYU=Rev
+WHY=Rev
+Y=John
+YAK=Jas
+YAKOBUS=Jas
+YE=Isa
+YEH=Ezek
+YEHEZKIEL=Ezek
+YER=Jer
+YEREMIA=Jer
+YES=Isa
+YESAYA=Isa
+YL=Joel
+YO=John
+YOE=Joel
+YOEL=Joel
+YOH=John
+YOHANES=John
+YOS=Josh
+YOSUA=Josh
+YUD=Jude
+YUDAS=Jude
+YUN=Jonah
+YUNUS=Jonah
+ZAK=Zech
+ZAKHARIA=Zech
+ZECHARIAH=Zech
+ZEF=Zeph
+ZEFANYA=Zeph
+ZEPHANIAH=Zeph
diff --git a/locales.d/it-utf8.conf b/locales.d/it-utf8.conf
new file mode 100644
index 0000000..eb08f92
--- /dev/null
+++ b/locales.d/it-utf8.conf
@@ -0,0 +1,487 @@
+[Meta]
+Name=it
+Description=Italiano (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesi
+Exodus=Esodo
+Leviticus=Levitico
+Numbers=Numeri
+Deuteronomy=Deuteronomio
+Joshua=Giosuè
+Judges=Giudici
+Ruth=Ruth
+I Samuel=1. Samuele
+II Samuel=2. Samuele
+I Kings=1. Re
+II Kings=2. Re
+I Chronicles=1. Cronache
+II Chronicles=2. Cronache
+Ezra=Esdra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Giobbe
+Psalms=Salmi
+Proverbs=Proverbi
+Ecclesiastes=Ecclesiaste
+Song of Solomon=Cantico dei Cantici
+Isaiah=Isaia
+Jeremiah=Geremia
+Lamentations=Lamentazioni
+Ezekiel=Ezechiele
+Daniel=Daniele
+Hosea=Osea
+Joel=Gioele
+Amos=Amos
+Obadiah=Abdia
+Jonah=Giona
+Micah=Michea
+Nahum=Nahum
+Habakkuk=Habacuc
+Zephaniah=Sofonia
+Haggai=Aggeo
+Zechariah=Zaccaria
+Malachi=Malachia
+Matthew=Matteo
+Mark=Marco
+Luke=Luca
+John=Giovanni
+Acts=Atti degli Apostoli
+Romans=Romani
+I Corinthians=1. Corinzi
+II Corinthians=2. Corinzi
+Galatians=Galati
+Ephesians=Efesini
+Philippians=Filippesi
+Colossians=Colossesi
+I Thessalonians=1. Tessalonicesi
+II Thessalonians=2. Tessalonicesi
+I Timothy=1. Timoteo
+II Timothy=2. Timoteo
+Titus=Tito
+Philemon=Filemone
+Hebrews=Ebrei
+James=Giacomo
+I Peter=1. Pietro
+II Peter=2. Pietro
+I John=1. Giovanni
+II John=2. Giovanni
+III John=3. Giovanni
+Jude=Giuda
+Revelation of John=Apocalisse di Giovanni
+
+[Book Abbrevs]
+
+GENESI=Gen
+ESODO=Exod
+LEVITICO=Lev
+NUMERI=Num
+DEUTERONOMIO=Deut
+GIOSUÈ=Josh
+GIUDICI=Judg
+RUTH=Ruth
+
+1. SAMUELE=1Sam
+1 SAMUELE=1Sam
+1SAMUELE=1Sam
+
+2. SAMUELE=2Sam
+2 SAMUELE=2Sam
+2SAMUELE=2Sam
+
+1. RE=1Kgs
+1 RE=1Kgs
+1RE=1Kgs
+
+2. RE=2Kgs
+2 RE=2Kgs
+2RE=2Kgs
+
+1. CRONACHE=1Chr
+1 CRONACHE=1Chr
+1CRONACHE=1Chr
+
+2. CRONACHE=2Chr
+2 CRONACHE=2Chr
+2CRONACHE=2Chr
+
+ESODO=Ezra
+NEHEMIA=Neh
+ESTER=Esth
+GIOBBE=Job
+SALMI=Ps
+PROVERBI=Prov
+ECCLESIASTE=Eccl
+CANTICO DEI CANTICI=Song
+ISAIA=Isa
+GEREMIA=Jer
+LAMENTAZIONI=Lam
+EZECHIELE=Ezek
+DANIELE=Dan
+OSEA=Hos
+GIOELE=Joel
+AMOS=Amos
+ABDIA=Obad
+GIONA=Jonah
+MICHEA=Mic
+NAHUM=Nah
+HABACUC=Hab
+SOFONIA=Zeph
+AGGEO=Hag
+ZACCARIA=Zech
+MALACHIA=Mal
+MATTEO=Matt
+MARCO=Mark
+LUCA=Luke
+GIOVANNI=John
+ATTI=Acts
+ROMANI=Rom
+1. CORINZI=1Cor
+2. CORINZI=2Cor
+GALATI=Gal
+EFESINI=Eph
+FILIPPESI=Phil
+COLOSSESI=Col
+
+1. TESSALONICESI=1Thess
+1 TESSALONICESI=1Thess
+1TESSALONICESI=1Thess
+
+2. TESSALONICESI=2Thess
+2 TESSALONICESI=2Thess
+2TESSALONICESI=2Thess
+
+1. TIMOTEO=1Tim
+1 TIMOTEO=1Tim
+1TIMOTEO=1Tim
+
+2. TIMOTEO=2Tim
+2 TIMOTEO=2Tim
+2TIMOTEO=2Tim
+
+TITO=Titus
+FILEMONE=Phlm
+EBREI=Heb
+GIACOMO=Jas
+
+1. PIETRO=1Pet
+1 PIETRO=1Pet
+1PIETRO=1Pet
+
+2. PIETRO=2Pet
+2 PIETRO=2Pet
+2PIETRO=2Pet
+
+1. GIOVANNI=1John
+1 GIOVANNI=1John
+1GIOVANNI=1John
+
+2. GIOVANNI=2John
+2 GIOVANNI=2John
+2GIOVANNI=2John
+
+3. GIOVANNI=3John
+3 GIOVANNI=3John
+3GIOVANNI=3John
+
+GIUDA=Jude
+APOCALISSE=Rev
+
+1 C=1Cor
+1 COR=1Cor
+1 CORINZI=1Cor
+1 CR=1Cor
+1 CRO=1Chr
+1 CRON=1Chr
+1 CRONACHE=1Chr
+1 GIOVANNI=1John
+1 GV=1John
+1 PIETRO=1Pet
+1 PT=1Pet
+1 RE=1Kgs
+1 SAM=1Sam
+1 SAMUELE=1Sam
+1 TESS=1Thess
+1 TESSALONICESI=1Thess
+1 TIM=1Tim
+1 TIMOTEO=1Tim
+1 TM=1Tim
+1 TS=1Thess
+1C=1Cor
+1COR=1Cor
+1CORINZI=1Cor
+1CR=1Cor
+1CRO=1Chr
+1CRON=1Chr
+1CRONACHE=1Chr
+1GIOVANNI=1John
+1GV=1John
+1PIETRO=1Pet
+1PT=1Pet
+1RE=1Kgs
+1SAM=1Sam
+1SAMUELE=1Sam
+1TESS=1Thess
+1TESSALONICESI=1Thess
+1TIM=1Tim
+1TIMOTEO=1Tim
+1TM=1Tim
+1TS=1Thess
+2 C=2Cor
+2 COR=2Cor
+2 CORINZI=2Cor
+2 CR=2Cor
+2 CRO=2Chr
+2 CRON=2Chr
+2 CRONACHE=2Chr
+2 GIOVANNI=2John
+2 GV=2John
+2 PIETRO=2Pet
+2 PT=2Pet
+2 RE=2Kgs
+2 SAM=2Sam
+2 SAMUELE=2Sam
+2 TESS=2Thess
+2 TESSALONICESI=2Thess
+2 TIM=2Tim
+2 TIMOTEO=2Tim
+2 TM=2Tim
+2 TS=2Thess
+2C=2Cor
+2COR=2Cor
+2CORINZI=2Cor
+2CR=2Cor
+2CRO=2Chr
+2CRON=2Chr
+2CRONACHE=2Chr
+2GIOVANNI=2John
+2GV=2John
+2PIETRO=2Pet
+2PT=2Pet
+2RE=2Kgs
+2SAM=2Sam
+2SAMUELE=2Sam
+2TESS=2Thess
+2TESSALONICESI=2Thess
+2TIM=2Tim
+2TIMOTEO=2Tim
+2TM=2Tim
+2TS=2Thess
+3 GIOVANNI=3John
+3 GV=3John
+3GIOVANNI=3John
+3GV=3John
+AB=Hab
+ABACUC=Hab
+ABD=Obad
+ABDIA=Obad
+AGG=Hag
+AGGEO=Hag
+AM=Amos
+AMO=Amos
+AMOS=Amos
+AP=Rev
+APOC=Rev
+APOCALISSE DI GIOVANNI=Rev
+AT=Acts
+ATTI DEGLI APOSTOLI=Acts
+C=Col
+CAN=Song
+CL=Col
+COL=Col
+COLOSSESI=Col
+D=Deut
+DAN=Dan
+DANIELE=Dan
+DEU=Deut
+DEUT=Deut
+DEUTERONOMIO=Deut
+E=Eph
+EB=Heb
+EBR=Heb
+EBREI=Heb
+ECC=Eccl
+ECCLE=Eccl
+ECCLESIASTE=Eccl
+EF=Eph
+EFESINI=Eph
+ES=Exod
+ESD=Ezra
+ESDRA=Ezra
+ESO=Exod
+ESODO=Exod
+EST=Esth
+ESTER=Esth
+EZ=Ezek
+EZE=Ezek
+EZECHIELE=Ezek
+FIL=Phil
+FILEM=Phlm
+FILEMONE=Phlm
+FILIPPESI=Phil
+FL=Phil
+FM=Phlm
+G=Gen
+GAL=Gal
+GALATI=Gal
+GBB=Job
+GC=Jas
+GD=Jude
+GDC=Judg
+GEN=Gen
+GENESI=Gen
+GER=Jer
+GEREMIA=Jer
+GIAC=Jas
+GIACOMO=Jas
+GIO=Josh
+GIOB=Job
+GIOBBE=Job
+GIOELE=Joel
+GIONA=Jonah
+GIOS=Josh
+GIOSUÈ=Josh
+GIOVANNI=John
+GIUD=Judg
+GIUDA=Jude
+GIUDICI=Judg
+GL=Gal
+GLE=Joel
+GNA=Jonah
+GV=John
+HAB=Hab
+HABACUC=Hab
+I C=1Cor
+I COR=1Cor
+I CORINZI=1Cor
+I CR=1Cor
+I CRO=1Chr
+I CRON=1Chr
+I CRONACHE=1Chr
+I GIOVANNI=1John
+I GV=1John
+I PIETRO=1Pet
+I PT=1Pet
+I RE=1Kgs
+I SAM=1Sam
+I SAMUEL=1Sam
+I TESS=1Thess
+I TESSALONICESI=1Thess
+I TIM=1Tim
+I TIMOTEO=1Tim
+I TM=1Tim
+I TS=1Thess
+IC=1Cor
+ICOR=1Cor
+ICORINZI=1Cor
+ICR=1Cor
+ICRO=1Chr
+ICRON=1Chr
+ICRONACHE=1Chr
+IGIOVANNI=1John
+IGV=1John
+II C=2Cor
+II COR=2Cor
+II CORINZI=2Cor
+II CR=2Cor
+II CRO=2Chr
+II CRON=2Chr
+II CRONACHE=2Chr
+II GIOVANNI=2John
+II GV=2John
+II PIETRO=2Pet
+II PT=2Pet
+II RE=2Kgs
+II SAM=2Sam
+II SAMUELE=2Sam
+II TESS=2Thess
+II TESSALONICESI=2Thess
+II TIM=2Tim
+II TIMOTEO=2Tim
+II TM=2Tim
+II TS=2Thess
+IIC=2Cor
+IICOR=2Cor
+IICORINZI=2Cor
+IICR=2Cor
+IICRO=2Chr
+IICRON=2Chr
+IICRONACHE=2Chr
+IIGIOVANNI=2John
+IIGV=2John
+III GIOVANNI=3John
+III GV=3John
+IIIGIOVANNI=3John
+IIIGV=3John
+IIPIETRO=2Pet
+IIPT=2Pet
+IIRE=2Kgs
+IISAM=2Sam
+IISAMUELE=2Sam
+IITESS=2Thess
+IITESSALONICESI=2Thess
+IITIM=2Tim
+IITIMOTEO=2Tim
+IITM=2Tim
+IITS=2Thess
+IPIETRO=1Pet
+IPT=1Pet
+IRE=1Kgs
+IS=Isa
+ISA=Isa
+ISAIA=Isa
+ISAM=1Sam
+ISAMUELE=1Sam
+ITESS=1Thess
+ITESSALONICESI=1Thess
+ITIM=1Tim
+ITIMOTEO=1Tim
+ITM=1Tim
+ITS=1Thess
+L=Luke
+LC=Luke
+LAM=Lam
+LAMENTATIONS=Lam
+LEV=Lev
+LEVITICO=Lev
+LUCA=Luke
+MA=Matt
+MAL=Mal
+MALACHIA=Mal
+MARCO=Mark
+MATTEO=Matt
+MC=Mark
+MI=Mic
+MIC=Mic
+MICHEA=Mic
+MT=Matt
+N=Num
+NAH=Nah
+NAHUM=Nah
+NEEM=Neh
+NEH=Neh
+NEHEMIA=Neh
+NUM=Num
+NUMERI=Num
+OS=Hos
+OSE=Hos
+OSEA=Hos
+PRO=Prov
+PROV=Prov
+PROVERBI=Prov
+RM=Rom
+ROM=Rom
+ROMANI=Rom
+RUT=Ruth
+RUTH=Ruth
+SAL=Ps
+SALMI=Ps
+SLM=Ps
+SOF=Zeph
+SOFONIA=Zeph
+TIT=Titus
+TITO=Titus
+TT=Titus
+ZAC=Zech
+ZACCARIA=Zech
diff --git a/locales.d/it.conf b/locales.d/it.conf
new file mode 100644
index 0000000..426e7b2
--- /dev/null
+++ b/locales.d/it.conf
@@ -0,0 +1,487 @@
+[Meta]
+Name=it
+Description=Italiano
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Genesi
+Exodus=Esodo
+Leviticus=Levitico
+Numbers=Numeri
+Deuteronomy=Deuteronomio
+Joshua=Giosuè
+Judges=Giudici
+Ruth=Ruth
+I Samuel=1. Samuele
+II Samuel=2. Samuele
+I Kings=1. Re
+II Kings=2. Re
+I Chronicles=1. Cronache
+II Chronicles=2. Cronache
+Ezra=Esdra
+Nehemiah=Nehemia
+Esther=Ester
+Job=Giobbe
+Psalms=Salmi
+Proverbs=Proverbi
+Ecclesiastes=Ecclesiaste
+Song of Solomon=Cantico dei Cantici
+Isaiah=Isaia
+Jeremiah=Geremia
+Lamentations=Lamentazioni
+Ezekiel=Ezechiele
+Daniel=Daniele
+Hosea=Osea
+Joel=Gioele
+Amos=Amos
+Obadiah=Abdia
+Jonah=Giona
+Micah=Michea
+Nahum=Nahum
+Habakkuk=Habacuc
+Zephaniah=Sofonia
+Haggai=Aggeo
+Zechariah=Zaccaria
+Malachi=Malachia
+Matthew=Matteo
+Mark=Marco
+Luke=Luca
+John=Giovanni
+Acts=Atti degli Apostoli
+Romans=Romani
+I Corinthians=1. Corinzi
+II Corinthians=2. Corinzi
+Galatians=Galati
+Ephesians=Efesini
+Philippians=Filippesi
+Colossians=Colossesi
+I Thessalonians=1. Tessalonicesi
+II Thessalonians=2. Tessalonicesi
+I Timothy=1. Timoteo
+II Timothy=2. Timoteo
+Titus=Tito
+Philemon=Filemone
+Hebrews=Ebrei
+James=Giacomo
+I Peter=1. Pietro
+II Peter=2. Pietro
+I John=1. Giovanni
+II John=2. Giovanni
+III John=3. Giovanni
+Jude=Giuda
+Revelation of John=Apocalisse di Giovanni
+
+[Book Abbrevs]
+
+GENESI=Gen
+ESODO=Exod
+LEVITICO=Lev
+NUMERI=Num
+DEUTERONOMIO=Deut
+GIOSUÈ=Josh
+GIUDICI=Judg
+RUTH=Ruth
+
+1. SAMUELE=1Sam
+1 SAMUELE=1Sam
+1SAMUELE=1Sam
+
+2. SAMUELE=2Sam
+2 SAMUELE=2Sam
+2SAMUELE=2Sam
+
+1. RE=1Kgs
+1 RE=1Kgs
+1RE=1Kgs
+
+2. RE=2Kgs
+2 RE=2Kgs
+2RE=2Kgs
+
+1. CRONACHE=1Chr
+1 CRONACHE=1Chr
+1CRONACHE=1Chr
+
+2. CRONACHE=2Chr
+2 CRONACHE=2Chr
+2CRONACHE=2Chr
+
+ESODO=Ezra
+NEHEMIA=Neh
+ESTER=Esth
+GIOBBE=Job
+SALMI=Ps
+PROVERBI=Prov
+ECCLESIASTE=Eccl
+CANTICO DEI CANTICI=Song
+ISAIA=Isa
+GEREMIA=Jer
+LAMENTAZIONI=Lam
+EZECHIELE=Ezek
+DANIELE=Dan
+OSEA=Hos
+GIOELE=Joel
+AMOS=Amos
+ABDIA=Obad
+GIONA=Jonah
+MICHEA=Mic
+NAHUM=Nah
+HABACUC=Hab
+SOFONIA=Zeph
+AGGEO=Hag
+ZACCARIA=Zech
+MALACHIA=Mal
+MATTEO=Matt
+MARCO=Mark
+LUCA=Luke
+GIOVANNI=John
+ATTI=Acts
+ROMANI=Rom
+1. CORINZI=1Cor
+2. CORINZI=2Cor
+GALATI=Gal
+EFESINI=Eph
+FILIPPESI=Phil
+COLOSSESI=Col
+
+1. TESSALONICESI=1Thess
+1 TESSALONICESI=1Thess
+1TESSALONICESI=1Thess
+
+2. TESSALONICESI=2Thess
+2 TESSALONICESI=2Thess
+2TESSALONICESI=2Thess
+
+1. TIMOTEO=1Tim
+1 TIMOTEO=1Tim
+1TIMOTEO=1Tim
+
+2. TIMOTEO=2Tim
+2 TIMOTEO=2Tim
+2TIMOTEO=2Tim
+
+TITO=Titus
+FILEMONE=Phlm
+EBREI=Heb
+GIACOMO=Jas
+
+1. PIETRO=1Pet
+1 PIETRO=1Pet
+1PIETRO=1Pet
+
+2. PIETRO=2Pet
+2 PIETRO=2Pet
+2PIETRO=2Pet
+
+1. GIOVANNI=1John
+1 GIOVANNI=1John
+1GIOVANNI=1John
+
+2. GIOVANNI=2John
+2 GIOVANNI=2John
+2GIOVANNI=2John
+
+3. GIOVANNI=3John
+3 GIOVANNI=3John
+3GIOVANNI=3John
+
+GIUDA=Jude
+APOCALISSE=Rev
+
+1 C=1Cor
+1 COR=1Cor
+1 CORINZI=1Cor
+1 CR=1Cor
+1 CRO=1Chr
+1 CRON=1Chr
+1 CRONACHE=1Chr
+1 GIOVANNI=1John
+1 GV=1John
+1 PIETRO=1Pet
+1 PT=1Pet
+1 RE=1Kgs
+1 SAM=1Sam
+1 SAMUELE=1Sam
+1 TESS=1Thess
+1 TESSALONICESI=1Thess
+1 TIM=1Tim
+1 TIMOTEO=1Tim
+1 TM=1Tim
+1 TS=1Thess
+1C=1Cor
+1COR=1Cor
+1CORINZI=1Cor
+1CR=1Cor
+1CRO=1Chr
+1CRON=1Chr
+1CRONACHE=1Chr
+1GIOVANNI=1John
+1GV=1John
+1PIETRO=1Pet
+1PT=1Pet
+1RE=1Kgs
+1SAM=1Sam
+1SAMUELE=1Sam
+1TESS=1Thess
+1TESSALONICESI=1Thess
+1TIM=1Tim
+1TIMOTEO=1Tim
+1TM=1Tim
+1TS=1Thess
+2 C=2Cor
+2 COR=2Cor
+2 CORINZI=2Cor
+2 CR=2Cor
+2 CRO=2Chr
+2 CRON=2Chr
+2 CRONACHE=2Chr
+2 GIOVANNI=2John
+2 GV=2John
+2 PIETRO=2Pet
+2 PT=2Pet
+2 RE=2Kgs
+2 SAM=2Sam
+2 SAMUELE=2Sam
+2 TESS=2Thess
+2 TESSALONICESI=2Thess
+2 TIM=2Tim
+2 TIMOTEO=2Tim
+2 TM=2Tim
+2 TS=2Thess
+2C=2Cor
+2COR=2Cor
+2CORINZI=2Cor
+2CR=2Cor
+2CRO=2Chr
+2CRON=2Chr
+2CRONACHE=2Chr
+2GIOVANNI=2John
+2GV=2John
+2PIETRO=2Pet
+2PT=2Pet
+2RE=2Kgs
+2SAM=2Sam
+2SAMUELE=2Sam
+2TESS=2Thess
+2TESSALONICESI=2Thess
+2TIM=2Tim
+2TIMOTEO=2Tim
+2TM=2Tim
+2TS=2Thess
+3 GIOVANNI=3John
+3 GV=3John
+3GIOVANNI=3John
+3GV=3John
+AB=Hab
+ABACUC=Hab
+ABD=Obad
+ABDIA=Obad
+AGG=Hag
+AGGEO=Hag
+AM=Amos
+AMO=Amos
+AMOS=Amos
+AP=Rev
+APOC=Rev
+APOCALISSE DI GIOVANNI=Rev
+AT=Acts
+ATTI DEGLI APOSTOLI=Acts
+C=Col
+CAN=Song
+CL=Col
+COL=Col
+COLOSSESI=Col
+D=Deut
+DAN=Dan
+DANIELE=Dan
+DEU=Deut
+DEUT=Deut
+DEUTERONOMIO=Deut
+E=Eph
+EB=Heb
+EBR=Heb
+EBREI=Heb
+ECC=Eccl
+ECCLE=Eccl
+ECCLESIASTE=Eccl
+EF=Eph
+EFESINI=Eph
+ES=Exod
+ESD=Ezra
+ESDRA=Ezra
+ESO=Exod
+ESODO=Exod
+EST=Esth
+ESTER=Esth
+EZ=Ezek
+EZE=Ezek
+EZECHIELE=Ezek
+FIL=Phil
+FILEM=Phlm
+FILEMONE=Phlm
+FILIPPESI=Phil
+FL=Phil
+FM=Phlm
+G=Gen
+GAL=Gal
+GALATI=Gal
+GBB=Job
+GC=Jas
+GD=Jude
+GDC=Judg
+GEN=Gen
+GENESI=Gen
+GER=Jer
+GEREMIA=Jer
+GIAC=Jas
+GIACOMO=Jas
+GIO=Josh
+GIOB=Job
+GIOBBE=Job
+GIOELE=Joel
+GIONA=Jonah
+GIOS=Josh
+GIOSUÈ=Josh
+GIOVANNI=John
+GIUD=Judg
+GIUDA=Jude
+GIUDICI=Judg
+GL=Gal
+GLE=Joel
+GNA=Jonah
+GV=John
+HAB=Hab
+HABACUC=Hab
+I C=1Cor
+I COR=1Cor
+I CORINZI=1Cor
+I CR=1Cor
+I CRO=1Chr
+I CRON=1Chr
+I CRONACHE=1Chr
+I GIOVANNI=1John
+I GV=1John
+I PIETRO=1Pet
+I PT=1Pet
+I RE=1Kgs
+I SAM=1Sam
+I SAMUEL=1Sam
+I TESS=1Thess
+I TESSALONICESI=1Thess
+I TIM=1Tim
+I TIMOTEO=1Tim
+I TM=1Tim
+I TS=1Thess
+IC=1Cor
+ICOR=1Cor
+ICORINZI=1Cor
+ICR=1Cor
+ICRO=1Chr
+ICRON=1Chr
+ICRONACHE=1Chr
+IGIOVANNI=1John
+IGV=1John
+II C=2Cor
+II COR=2Cor
+II CORINZI=2Cor
+II CR=2Cor
+II CRO=2Chr
+II CRON=2Chr
+II CRONACHE=2Chr
+II GIOVANNI=2John
+II GV=2John
+II PIETRO=2Pet
+II PT=2Pet
+II RE=2Kgs
+II SAM=2Sam
+II SAMUELE=2Sam
+II TESS=2Thess
+II TESSALONICESI=2Thess
+II TIM=2Tim
+II TIMOTEO=2Tim
+II TM=2Tim
+II TS=2Thess
+IIC=2Cor
+IICOR=2Cor
+IICORINZI=2Cor
+IICR=2Cor
+IICRO=2Chr
+IICRON=2Chr
+IICRONACHE=2Chr
+IIGIOVANNI=2John
+IIGV=2John
+III GIOVANNI=3John
+III GV=3John
+IIIGIOVANNI=3John
+IIIGV=3John
+IIPIETRO=2Pet
+IIPT=2Pet
+IIRE=2Kgs
+IISAM=2Sam
+IISAMUELE=2Sam
+IITESS=2Thess
+IITESSALONICESI=2Thess
+IITIM=2Tim
+IITIMOTEO=2Tim
+IITM=2Tim
+IITS=2Thess
+IPIETRO=1Pet
+IPT=1Pet
+IRE=1Kgs
+IS=Isa
+ISA=Isa
+ISAIA=Isa
+ISAM=1Sam
+ISAMUELE=1Sam
+ITESS=1Thess
+ITESSALONICESI=1Thess
+ITIM=1Tim
+ITIMOTEO=1Tim
+ITM=1Tim
+ITS=1Thess
+L=Luke
+LC=Luke
+LAM=Lam
+LAMENTATIONS=Lam
+LEV=Lev
+LEVITICO=Lev
+LUCA=Luke
+MA=Matt
+MAL=Mal
+MALACHIA=Mal
+MARCO=Mark
+MATTEO=Matt
+MC=Mark
+MI=Mic
+MIC=Mic
+MICHEA=Mic
+MT=Matt
+N=Num
+NAH=Nah
+NAHUM=Nah
+NEEM=Neh
+NEH=Neh
+NEHEMIA=Neh
+NUM=Num
+NUMERI=Num
+OS=Hos
+OSE=Hos
+OSEA=Hos
+PRO=Prov
+PROV=Prov
+PROVERBI=Prov
+RM=Rom
+ROM=Rom
+ROMANI=Rom
+RUT=Ruth
+RUTH=Ruth
+SAL=Ps
+SALMI=Ps
+SLM=Ps
+SOF=Zeph
+SOFONIA=Zeph
+TIT=Titus
+TITO=Titus
+TT=Titus
+ZAC=Zech
+ZACCARIA=Zech
diff --git a/locales.d/iu-utf8.conf b/locales.d/iu-utf8.conf
new file mode 100644
index 0000000..72db3d8
--- /dev/null
+++ b/locales.d/iu-utf8.conf
@@ -0,0 +1,292 @@
+[Meta]
+Name=iu
+Description=Inuktitut (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=ᒨᓯᓯᑦ ᓯᕗᓪᓖᑦ
+Exodus=ᒨᓯᓯᑦ �ᑉ��ᑦ
+Leviticus=ᒨᓯᓯᑦ �ᖓᔪ�ᑦ
+Numbers=ᒨᓯᓯᑦ ᓯᑕᒪ�ᑦ
+Deuteronomy=ᒨᓯᓯᑦ ᑕᓪᓕᒪ�ᑦ
+Joshua=ᔮᓱ�ᑉ �ᒡᓚ�ᑦ
+Judges=�ᓱ�ᖅᓮᔩᑦ �ᒡᓚ�ᑦ
+Ruth=ᕉᑎ�ᑉ �ᓂᒃᑲ�ᓯᓂᖓ
+I Samuel=ᓴᒧ�ᓕᑦ ᓯᕗᓪᓖᑦ
+II Samuel=ᓴᒧ�ᓕᑦ �ᑉ��ᑦ
+I Kings=�ᑕᓃᑦ ᓯᕗᓪᓖᑦ
+II Kings=�ᑕᓃᑦ �ᑉ��ᑦ
+I Chronicles=ᑯᕉᓂᑲᑦ ᓯᕗᓪᓖᑦ
+II Chronicles=ᑯᕉᓂᑲᑦ �ᑉ��ᑦ
+Ezra=�ᓱᕋ�ᑉ �ᒡᓚ�ᑦ
+Nehemiah=ᓂᕼ�ᒤ��ᑉ �ᒡᓚ�ᑦ
+Esther=�ᓯᑕ�ᑉ �ᒡᓚ�ᑦ
+Job=ᔫ��ᑉ �ᒡᓚ�ᑦ
+Psalms=���ᕈᑎᑦ
+Proverbs=ᓲᓗᒨᓂ�ᑉ �ᖃᓪᓚᖕᓂ�ᑦ
+Ecclesiastes=�ᓕᓯᒪᓃᑦ �ᒃᓖᓯ�ᓯ�ᔅ
+Song of Solomon=ᓲᓗᒨᓂ�ᑉ ���ᕈᓯ�ᑦ
+Isaiah=�ᓮ�ᓯ�ᑉ �ᒡᓚ�ᑦ
+Jeremiah=ᔨᕆᒤ��ᑉ �ᒡᓚ�ᑦ
+Lamentations=ᔨᕆᒤ��ᑉ �ᒡ���ᖕᓂ�ᑦ
+Ezekiel=�ᔨᑭ�ᓕ�ᑉ �ᒡᓚ�ᑦ
+Daniel=ᑖᓂ�ᓕ�ᑉ �ᒡᓚ�ᑦ
+Hosea=ᕼ�ᓯ�ᑉ �ᒡᓚ�ᑦ
+Joel=ᔪ�ᓕ�ᑉ �ᒡᓚ�ᑦ
+Amos=�ᒨᓯ�ᑉ �ᒡᓚ�ᑦ
+Obadiah=����ᑉ �ᒡᓚ�ᑦ
+Jonah=ᔫᓇ�ᑉ �ᒡᓚ�ᑦ
+Micah=ᒤᑲ�ᑉ �ᒡᓚ�ᑦ
+Nahum=ᓇᕼ�ᒥ�ᑉ �ᒡᓚ�ᑦ
+Habakkuk=ᕼ��ᑲ�ᑉ �ᒡᓚ�ᑦ
+Zephaniah=ᔭ����ᑉ �ᒡᓚ�ᑦ
+Haggai=ᕼ�ᒊᑉ �ᒡᓚ�ᑦ
+Zechariah=ᔭᑲᕅ��ᑉ �ᒡᓚ�ᑦ
+Malachi=ᒪᓚᑬᑉ �ᒡᓚ�ᑦ
+Matthew=ᒫᑎ�ᓯ�ᑉ �ᒡᓚ�ᑦ
+Mark=ᒫᑯᓯ�ᑉ �ᒡᓚ�ᑦ
+Luke=ᓘᑲᓯ�ᑉ �ᒡᓚ�ᑦ
+John=ᔪ�ᓇᓯ�ᑉ �ᒡᓚ�ᑦ
+Acts=��ᓯᑕᓖᑦ �ᓂ��ᖕᓂ�ᑦ
+Romans=ᕉᒪᒥ�ᓄᑦ
+I Corinthians=ᑯᕆ�ᑎ�ᒥ�ᓄᑦ ᓯᕗᓪᓖᑦ
+II Corinthians=ᑯᕆ�ᑎ�ᒥ�ᓄᑦ �ᑉ��ᑦ
+Galatians=�ᓔᑎ�ᒥ�ᓄᑦ
+Ephesians=��ᓯᒥ�ᓄᑦ
+Philippians=�ᓕ�ᒥ�ᓄᑦ
+Colossians=ᑯᓘᓯ�ᒥ�ᓄᑦ
+I Thessalonians=ᑎᓴᓗ�ᑲᒥ�ᓄᑦ ᓯᕗᓪᓖᑦ
+II Thessalonians=ᑎᓴᓗ�ᑲᒥ�ᓄᑦ �ᑉ��ᑦ
+I Timothy=ᑎᒧᑎᒧᑦ ᓯᕗᓪᓖᑦ
+II Timothy=ᑎᒧᑎᒧᑦ �ᑉ��ᑦ
+Titus=�ᑑᓯᒧᑦ
+Philemon=�ᓕᒨᓂᒧᑦ
+Hebrews=�ᑉᕈ�ᓄᑦ
+James=ᔧᒥᓯ�ᑉ �ᒡᓚ�ᑦ
+I Peter=�ᑦ�ᕉᓯᑦ ᓯᕗᓪᓖᑦ
+II Peter=�ᑦ�ᕉᓯᑦ �ᑉ��ᑦ
+I John=ᔪ�ᓇᓯᑦ ᓯᕗᓪᓖᑦ
+II John=ᔪ�ᓇᓯᑦ �ᑉ��ᑦ
+III John=ᔪ�ᓇᓯ�ᑉ �ᖓᔪ�ᑦ
+Jude=ᔫᑎ�ᑉ �ᒡᓚ�ᑦ
+Revelation of John=ᔪ�ᓇᓯ�ᑉ ᑕᑯᑎᑕ�ᓂ�ᑦ
+
+[Book Abbrevs]
+ᒨᓯᓯᑦ ᓯᕗᓪᓖᑦ=Gen
+1 ᒨᓯᓯᑦ=Gen
+1ᒨᓯᓯᑦ=Gen
+
+ᒨᓯᓯᑦ �ᑉ��ᑦ=Ex
+2 ᒨᓯᓯᑦ=Ex
+2ᒨᓯᓯᑦ=Ex
+
+ᒨᓯᓯᑦ �ᖓᔪ�ᑦ=Lev
+3 ᒨᓯᓯᑦ=Lev
+3ᒨᓯᓯᑦ=Lev
+
+ᒨᓯᓯᑦ ᓯᑕᒪ�ᑦ=Num
+4 ᒨᓯᓯᑦ=Num
+4ᒨᓯᓯᑦ=Num
+
+ᒨᓯᓯᑦ ᑕᓪᓕᒪ�ᑦ=Deut
+5 ᒨᓯᓯᑦ=Deut
+5ᒨᓯᓯᑦ=Deut
+
+ᔮᓱ�ᑉ �ᒡᓚ�ᑦ=Josh
+ᔮᓱ�=Josh
+
+�ᓱ�ᖅᓮᔩᑦ �ᒡᓚ�ᑦ=Judg
+�ᓱ�ᖅᓮᔩᑦ=Judg
+
+ᕉᑎ�ᑉ �ᓂᒃᑲ�ᓯᓂᖓ=Ruth
+ᕉᑎᑦ=Ruth
+
+ᓴᒧ�ᓕᑦ ᓯᕗᓪᓖᑦ=1Sam
+1 ᓴᒧ�ᓕᑦ=1Sam
+1ᓴᒧ�ᓕᑦ=1Sam
+
+ᓴᒧ�ᓕᑦ �ᑉ��ᑦ=2Sam
+2 ᓴᒧ�ᓕᑦ=2Sam
+2ᓴᒧ�ᓕᑦ=2Sam
+
+�ᑕᓃᑦ ᓯᕗᓪᓖᑦ=1Kgs
+1 �ᑕᓃᑦ=1Kgs
+1�ᑕᓃᑦ=1Kgs
+
+�ᑕᓃᑦ �ᑉ��ᑦ=2Kgs
+2 �ᑕᓃᑦ=2Kgs
+2�ᑕᓃᑦ=2Kgs
+
+ᑯᕉᓂᑲᑦ ᓯᕗᓪᓖᑦ=1Chr
+1 ᑯᕉᓂᑲᑦ=1Chr
+1ᑯᕉᓂᑲᑦ=1Chr
+
+ᑯᕉᓂᑲᑦ �ᑉ��ᑦ=2Chr
+2 ᑯᕉᓂᑲᑦ=2Chr
+2ᑯᕉᓂᑲᑦ=2Chr
+
+�ᓱᕋ�ᑉ �ᒡᓚ�ᑦ=Ezra
+�ᓱᕋ=Ezra
+
+ᓂᕼ�ᒤ��ᑉ �ᒡᓚ�ᑦ=Neh
+ᓂᕼ�ᒤ�=Neh
+
+�ᓯᑕ�ᑉ �ᒡᓚ�ᑦ=Esth
+�ᓯᑕ=Esth
+
+ᔫ��ᑉ �ᒡᓚ�ᑦ=Job
+ᔫ�=Job
+
+���ᕈᑎᑦ=Pss
+���ᕈᑦ=Pss
+
+ᓲᓗᒨᓂ�ᑉ �ᖃᓪᓚᖕᓂ�ᑦ=Prov
+ᓲᓗᒨᓂ=Prov
+
+�ᓕᓯᒪᓃᑦ �ᒃᓖᓯ�ᓯ�ᔅ=Eccl
+�ᓕᓯᒪᓃᑦ=Eccl
+
+ᓲᓗᒨᓂ�ᑉ ���ᕈᓯ�ᑦ=Song
+���ᕈᓰᑦ=Song
+
+�ᓮ�ᓯ�ᑉ �ᒡᓚ�ᑦ=Isa
+�ᓮ�ᓯᑦ=Isa
+
+ᔨᕆᒤ��ᑉ �ᒡᓚ�ᑦ=Jer
+ᔨᕆᒤ�=Jer
+
+ᔨᕆᒤ��ᑉ �ᒡ���ᖕᓂ�ᑦ=Lam
+�ᒡ���ᖕᓃᑦ=Lam
+
+�ᔨᑭ�ᓕ�ᑉ �ᒡᓚ�ᑦ=Eze
+�ᔨᑭ�ᓕᑦ=Eze
+
+ᑖᓂ�ᓕ�ᑉ �ᒡᓚ�ᑦ=Dan
+ᑖᓂ�ᓕ=Dan
+
+ᕼ�ᓯ�ᑉ �ᒡᓚ�ᑦ=Hos
+ᕼ�ᓯ�=Hos
+
+ᔪ�ᓕ�ᑉ �ᒡᓚ�ᑦ=Joel
+ᔪ�ᓕ=Joel
+
+�ᒨᓯ�ᑉ �ᒡᓚ�ᑦ=Amos
+�ᒨᓯ=Amos
+
+����ᑉ �ᒡᓚ�ᑦ=Ob
+����=Ob
+
+ᔫᓇ�ᑉ �ᒡᓚ�ᑦ=Jonah
+ᔫᓇ=Jonah
+
+ᒤᑲ�ᑉ �ᒡᓚ�ᑦ=Mic
+ᒤᑲ=Mic
+
+ᓇᕼ�ᒥ�ᑉ �ᒡᓚ�ᑦ=Nah
+ᓇᕼ�ᒥ=Nah
+
+ᕼ��ᑲ�ᑉ �ᒡᓚ�ᑦ=Hab
+ᕼ��ᑲ=Hab
+
+ᔭ����ᑉ �ᒡᓚ�ᑦ=Zeph
+ᔭ���=Zeph
+
+ᕼ�ᒊᑉ �ᒡᓚ�ᑦ=Hag
+ᕼ�ᒊ=Hag
+
+ᔭᑲᕅ��ᑉ �ᒡᓚ�ᑦ=Zech
+ᔭᑲᕅ�=Zech
+
+ᒪᓚᑬᑉ �ᒡᓚ�ᑦ=Mal
+ᒪᓚᑬ=Mal
+
+ᒫᑎ�ᓯ�ᑉ �ᒡᓚ�ᑦ=Mt
+ᒫᑎ�ᓯ=Mt
+
+ᒫᑯᓯ�ᑉ �ᒡᓚ�ᑦ=Mk
+ᒫᑯᓯ=Mk
+
+ᓘᑲᓯ�ᑉ �ᒡᓚ�ᑦ=Lk
+ᓘᑲᓯ=Lk
+
+ᔪ�ᓇᓯ�ᑉ �ᒡᓚ�ᑦ=Jn
+ᔪ�ᓇᓯ=Jn
+
+��ᓯᑕᓖᑦ �ᓂ��ᖕᓂ�ᑦ=Acts
+��ᓯᑕᓖᑦ=Acts
+
+ᕉᒪᒥ�ᓄᑦ=Rom
+
+ᑯᕆ�ᑎ�ᒥ�ᓄᑦ ᓯᕗᓪᓖᑦ=1Cor
+1 ᑯᕆ�ᑎᑦ=1Cor
+1ᑯᕆ�ᑎᑦ=1Cor
+
+ᑯᕆ�ᑎ�ᒥ�ᓄᑦ �ᑉ��ᑦ=2Cor
+2 ᑯᕆ�ᑎᑦ=2Cor
+2ᑯᕆ�ᑎᑦ=2Cor
+
+�ᓔᑎ�ᒥ�ᓄᑦ=Gal
+�ᓔᑎ=Gal
+
+��ᓯᒥ�ᓄᑦ=Eph
+��ᓯ=Eph
+
+�ᓕ�ᒥ�ᓄᑦ=Php
+�ᓕ�=Php
+
+ᑯᓘᓯ�ᒥ�ᓄᑦ=Col
+ᑯᓘᓯ=Col
+
+ᑎᓴᓗ�ᑲᒥ�ᓄᑦ ᓯᕗᓪᓖᑦ=1Thes
+1 ᑎᓴᓗ�=1Thes
+1ᑎᓴᓗ�=1Thes
+
+ᑎᓴᓗ�ᑲᒥ�ᓄᑦ �ᑉ��ᑦ=2Thes
+2 ᑎᓴᓗ�=2Thes
+2ᑎᓴᓗ�=2Thes
+
+ᑎᒧᑎᒧᑦ ᓯᕗᓪᓖᑦ=1Tim
+1 ᑎᒧᑎ=1Tim
+1ᑎᒧᑎ=1Tim
+
+ᑎᒧᑎᒧᑦ �ᑉ��ᑦ=2Tim
+2 ᑎᒧᑎ=2Tim
+2ᑎᒧᑎ=2Tim
+
+�ᑑᓯᒧᑦ=Tit
+�ᑑᓯᑦ=Tit
+
+�ᓕᒨᓂᒧᑦ=Phm
+�ᓕᒨ=Phm
+
+�ᑉᕈ�ᓄᑦ=Heb
+�ᑉᕈ�ᑦ=Heb
+
+ᔧᒥᓯ�ᑉ �ᒡᓚ�ᑦ=Jas
+ᔧᒥᓯᑦ=Jas
+
+�ᑦ�ᕉᓯᑦ ᓯᕗᓪᓖᑦ=1Pet
+1 �ᑦ�ᕉᓯᑦ=1Pet
+1�ᑦ�ᕉᓯᑦ=1Pet
+
+�ᑦ�ᕉᓯᑦ �ᑉ��ᑦ=2Pet
+2 �ᑦ�ᕉᓯᑦ=2Pet
+2�ᑦ�ᕉᓯᑦ=2Pet
+
+ᔪ�ᓇᓯᑦ ᓯᕗᓪᓖᑦ=1Jn
+1 ᔪ�ᓇᓯ=1Jn
+1ᔪ�ᓇᓯ=1Jn
+
+ᔪ�ᓇᓯᑦ �ᑉ��ᑦ=2Jn
+2 ᔪ�ᓇᓯ=2Jn
+2ᔪ�ᓇᓯ=2Jn
+
+ᔪ�ᓇᓯ�ᑉ �ᖓᔪ�ᑦ=3Jn
+3 ᔪ�ᓇᓯ=3Jn
+3ᔪ�ᓇᓯ=3Jn
+
+ᔫᑎ�ᑉ �ᒡᓚ�ᑦ=Jude
+ᔫᑎᑦ=Jude
+
+ᔪ�ᓇᓯ�ᑉ ᑕᑯᑎᑕ�ᓂ�ᑦ=Rev
+ᑕᑯᑎ=Rev
diff --git a/locales.d/ja-utf8.conf b/locales.d/ja-utf8.conf
new file mode 100644
index 0000000..d6d2c9a
--- /dev/null
+++ b/locales.d/ja-utf8.conf
@@ -0,0 +1,201 @@
+[Meta]
+Name=ja
+Description=Japanese (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=創世記
+Exodus=出エジプト記
+Leviticus=レビ記
+Numbers=民数記
+Deuteronomy=申命記
+Joshua=ヨシュア記
+Judges=士師記
+Ruth=ルツ記
+I Samuel=サムエル記上
+II Samuel=サムエル記下
+I Kings=列王紀上
+II Kings=列王紀下
+I Chronicles=歴代志上
+II Chronicles=歴代志下
+Ezra=エズラ記
+Nehemiah=�ヘミヤ記
+Esther=エステル記
+Job=ヨブ記
+Psalms=詩篇
+Proverbs=箴言
+Ecclesiastes=���書
+Song of Solomon=雅歌
+Isaiah=イザヤ書
+Jeremiah=エレミヤ書
+Lamentations=哀歌
+Ezekiel=エゼキエル書
+Daniel=ダニエル書
+Hosea=ホセア書
+Joel=ヨエル書
+Amos=アモス書
+Obadiah=オ�デヤ書
+Jonah=ヨナ書
+Micah=ミカ書
+Nahum=ナホム書
+Habakkuk=��クク書
+Zephaniah=ゼ�ニヤ書
+Haggai=�ガイ書
+Zechariah=ゼカリヤ書
+Malachi=マラキ書
+Matthew=マタイ�よる�音書
+Mark=マルコ�よる�音書
+Luke=ルカ�よる�音書
+John=ヨ���よる�音書
+Acts=使徒行�
+Romans=ローマ人��手紙
+I Corinthians=コリント人��第一�手紙
+II Corinthians=コリント人��第二�手紙
+Galatians=ガラテヤ人��手紙
+Ephesians=エペソ人��手紙
+Philippians=ピリピ人��手紙
+Colossians=コロサイ人��手紙
+I Thessalonians=テサロニケ人��第一�手紙
+II Thessalonians=テサロニケ人��第二�手紙
+I Timothy=テモテヘ�第一�手紙
+II Timothy=テモテヘ�第二�手紙
+Titus=テトスヘ�手紙
+Philemon=ピレモンヘ�手紙
+Hebrews=ヘブル人��手紙
+James=ヤコブ�手紙
+I Peter=ペテロ�第一�手紙
+II Peter=ペテロ�第二�手紙
+I John=ヨ���第一�手紙
+II John=ヨ���第二�手紙
+III John=ヨ���第三�手紙
+Jude=ユダ�手紙
+Revelation of John=ヨ���黙示録
+
+
+#Apocr
+
+
+# 1Esd
+I Esdras=エズラ記(ギリシャ語)
+# 2Esd
+II Esdras=エズラ記(ラテン語)
+# Tob
+Tobit=トビト記
+# Jdt
+Judith=ユディト記
+# AddEsth
+Additions to Esther=エステル記補�
+# EsthGr
+Esther (Greek)=エステル記(ギリシャ語)
+# Wis
+Wisdom=知��書
+# Sir
+Sirach=シラ書(集会�書)
+# Bar
+Baruch=�ルク書
+# PrAzar
+Prayer of Azariah=アザルヤ�祈り�三人�若者�賛歌
+# Sus
+Susanna=スザンナ
+# Bel
+Bel and the Dragon=ベル�竜
+# PrMan
+Prayer of Manasses=マナセ�祈り
+# 1Macc
+I Maccabees=マカ�イ記一
+# 2Macc
+II Maccabees=マカ�イ記二
+# 3Macc
+III Maccabees=マカ�イ記三
+# 4Macc
+IV Maccabees=マカ�イ記四
+# AddPs
+Additional Psalm=詩篇第151編
+
+
+[Book Abbrevs]
+
+創世記=Gen
+出エジプト記=Exod
+レビ記=Lev
+民数記=Num
+申命記=Deut
+ヨシュア記=Josh
+士師記=Judg
+ルツ記=Ruth
+サムエル記上=1Sam
+サムエル記下=2Sam
+列王紀上=1Kgs
+列王紀下=2Kgs
+歴代志上=1Chr
+歴代志下=2Chr
+エズラ記=Ezra
+�ヘミヤ記=Neh
+エステル記=Esth
+ヨブ記=Job
+詩篇=Ps
+箴言=Prov
+���書=Eccl
+雅歌=Song
+イザヤ書=Isa
+エレミヤ書=Jer
+哀歌=Lam
+エゼキエル書=Ezek
+ダニエル書=Dan
+ホセア書=Hos
+ヨエル書=Joel
+アモス書=Amos
+オ�デヤ書=Obad
+ヨナ書=Jonah
+ミカ書=Mic
+ナホム書=Nah
+��クク書=Hab
+ゼ�ニヤ書=Zeph
+�ガイ書=Hag
+ゼカリヤ書=Zech
+マラキ書=Mal
+マタイ�よる�音書=Matt
+マルコ�よる�音書=Mark
+ルカ�よる�音書=Luke
+ヨ���よる�音書=John
+使徒行�=Acts
+ローマ人��手紙=Rom
+コリント人��第一�手紙=1Cor
+コリント人��第二�手紙=2Cor
+ガラテヤ人��手紙=Gal
+エペソ人��手紙=Eph
+ピリピ人��手紙=Phil
+コロサイ人��手紙=Col
+テサロニケ人��第一�手紙=1Thess
+テサロニケ人��第二�手紙=2Thess
+テモテヘ�第一�手紙=1Tim
+テモテヘ�第二�手紙=2Tim
+テトスヘ�手紙=Titus
+ピレモンヘ�手紙=Phlm
+ヘブル人��手紙=Heb
+ヤコブ�手紙=Jas
+ペテロ�第一�手紙=1Pet
+ペテロ�第二�手紙=2Pet
+ヨ���第一�手紙=1John
+ヨ���第二�手紙=2John
+ヨ���第三�手紙=3John
+ユダ�手紙=Jude
+ヨ���黙示録=Rev
+エズラ記(ギリシャ語)=1Esd
+エズラ記(ラテン語)=2Esd
+トビト記=Tob
+ユディト記=Jdt
+エステル記補�=AddEsth
+エステル記(ギリシャ語)=EsthGr
+知��書=Wis
+シラ書(集会�書)=Sir
+�ルク書=Bar
+アザルヤ�祈り�三人�若者�賛歌=PrAzar
+スザンナ=Sus
+ベル�竜=Bel
+マナセ�祈り=PrMan
+マカ�イ記一=1Macc
+マカ�イ記二=2Macc
+マカ�イ記三=3Macc
+マカ�イ記四=4Macc
+詩篇第151編=AddPs
diff --git a/locales.d/ko-utf8.conf b/locales.d/ko-utf8.conf
new file mode 100644
index 0000000..0c621f2
--- /dev/null
+++ b/locales.d/ko-utf8.conf
@@ -0,0 +1,272 @@
+[Meta]
+Name=ko
+Description=Korean (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=창세기
+Exodus=출애굽기
+Leviticus=레위기
+Numbers=민수기
+Deuteronomy=신명기
+Joshua=여호수아
+Judges=사사기
+Ruth=룻기
+I Samuel=사무엘�
+II Samuel=사무엘하
+I Kings=열왕기�
+II Kings=열왕기하
+I Chronicles=역대�
+II Chronicles=역대하
+Ezra=�스�
+Nehemiah=�헤미야
+Esther=�스�
+Job=욥기
+Psalms=시편
+Proverbs=ìž ì–¸
+Ecclesiastes=전�서
+Song of Solomon=ì•„ê°€
+Isaiah=�사야
+Jeremiah=예레미야
+Lamentations=예레미야애가
+Ezekiel=�스겔
+Daniel=다니엘
+Hosea=호세아
+Joel=요엘
+Amos=아모스
+Obadiah=오바댜
+Jonah=요나
+Micah=미가
+Nahum=나훔
+Habakkuk=하박국
+Zephaniah=스바�
+Haggai=학개
+Zechariah=스가랴
+Malachi=��기
+Matthew=마태복�
+Mark=마가복�
+Luke=누가복�
+John=요한복�
+Acts=사�행전
+Romans=로마서
+I Corinthians=고린�전서
+II Corinthians=고린�후서
+Galatians=갈�디아서
+Ephesians=�베소서
+Philippians=빌립보서
+Colossians=골로새서
+I Thessalonians=�살로니가전서
+II Thessalonians=�살로니가후서
+I Timothy=디모�전서
+II Timothy=디모�후서
+Titus=디�서
+Philemon=빌레몬서
+Hebrews=히브리서
+James=야고보서
+I Peter=베드로전서
+II Peter=베드로후서
+I John=요한�서
+II John=요한�서
+III John=요한삼서
+Jude=유다서
+Revelation of John=요한계시�
+
+[Book Abbrevs]
+
+창세기=Gen
+ì°½=Gen
+
+출애굽기=Exod
+츌=Exod
+
+레위기=Lev
+ë ˆ=Lev
+
+민수기=Num
+민=Num
+
+신명기=Deut
+ì‹ =Deut
+
+여호수아=Josh
+수=Josh
+
+사사기=Judg
+ì‚¿=Judg
+
+룻기=Ruth
+룻=Ruth
+
+사무엘�=1Sam
+삼�=1Sam
+
+사무엘하=2Sam
+삼하=2Sam
+
+열왕기�=1Kgs
+왕�=1Kgs
+
+열왕기하=2Kgs
+왕하=2Kgs
+
+역대�=1Chr
+대�=1Chr
+
+역대하=2Chr
+대하=2Chr
+
+�스�=Ezra
+스=Ezra
+
+�헤미야=Neh
+�=Neh
+
+�스�=Esth
+ì—�=Esth
+
+욥기=Job
+욥=Job
+
+시편=Ps
+시=Ps
+
+ìž ì–¸=Prov
+ìž =Prov
+
+전�서=Eccl
+ì „=Eccl
+
+ì•„ê°€=Song
+ì•„=Song
+
+�사야=Isa
+사=Isa
+
+예레미야=Jer
+ë ˜=Jer
+
+예레미야애가=Lam
+ì• =Lam
+
+�스겔=Ezek
+ê²”=Ezek
+
+다니엘=Dan
+단=Dan
+
+호세아=Hos
+호=Hos
+
+요엘=Joel
+욜=Joel
+
+아모스=Amos
+ì•”=Amos
+
+오바댜=Obad
+옵=Obad
+
+요나=Jonah
+욘=Jonah
+
+미가=Mic
+미=Mic
+
+나훔=Nah
+나=Nah
+
+하박국=Hab
+í•©=Hab
+
+스바�=Zeph
+습=Zeph
+
+학개=Hag
+í•™=Hag
+
+스가랴=Zech
+슥=Zech
+
+��기=Mal
+�=Mal
+
+마태복�=Matt
+마=Matt
+
+마가복�=Mark
+막=Mark
+
+누가복�=Luke
+눅=Luke
+
+요한복�=John
+ìš”=John
+
+사�행전=Acts
+í–‰=Acts
+
+로마서=Rom
+롬=Rom
+
+고린�전서=1Cor
+ê³ ì „=1Cor
+
+고린�후서=2Cor
+고후=2Cor
+
+갈�디아서=Gal
+ê°ˆ=Gal
+
+�베소서=Eph
+ì—¡=Eph
+
+빌립보서=Phil
+빌=Phil
+
+골로새서=Col
+골=Col
+
+�살로니가전서=1Thess
+ì‚´ì „=1Thess
+
+�살로니가후서=2Thess
+살후=2Thess
+
+디모�전서=1Tim
+딤전=1Tim
+
+디모�후서=2Tim
+딤후=2Tim
+
+디�서=Titus
+ë”›=Titus
+
+빌레몬서=Phlm
+몬=Phlm
+
+히브리서=Heb
+히=Heb
+
+야고보서=Jas
+약=Jas
+
+베드로전서=1Pet
+벧전=1Pet
+
+베드로후서=2Pet
+벧후=2Pet
+
+요한�서=1John
+요�=1John
+
+요한�서=2John
+요�=2John
+
+요한삼서=3John
+요삼=3John
+
+유다서=Jude
+유=Jude
+
+요한계시�=Rev
+계=Rev
diff --git a/locales.d/ko.conf b/locales.d/ko.conf
new file mode 100644
index 0000000..0d662f4
--- /dev/null
+++ b/locales.d/ko.conf
@@ -0,0 +1,272 @@
+[Meta]
+Name=ko
+Description=Korean
+Encoding=EUC-KR
+
+[Text]
+Genesis=â¼¼±â
+Exodus=Ãâ¾Ö±Á±â
+Leviticus=·¹À§±â
+Numbers=¹Î¼ö±â
+Deuteronomy=½Å¸í±â
+Joshua=¿©È£¼ö¾Æ
+Judges=»ç»ç±â
+Ruth=·í±â
+I Samuel=»ç¹«¿¤»ó
+II Samuel=»ç¹«¿¤ÇÏ
+I Kings=¿­¿Õ±â»ó
+II Kings=¿­¿Õ±âÇÏ
+I Chronicles=¿ª´ë»ó
+II Chronicles=¿ª´ëÇÏ
+Ezra=¿¡½º¶ó
+Nehemiah=´ÀÇì¹Ì¾ß
+Esther=¿¡½º´õ
+Job=¿é±â
+Psalms=½ÃÆí
+Proverbs=Àá¾ð
+Ecclesiastes=Àüµµ¼­
+Song of Solomon=¾Æ°¡
+Isaiah=ÀÌ»ç¾ß
+Jeremiah=¿¹·¹¹Ì¾ß
+Lamentations=¿¹·¹¹Ì¾ß¾Ö°¡
+Ezekiel=¿¡½º°Ö
+Daniel=´Ù´Ï¿¤
+Hosea=È£¼¼¾Æ
+Joel=¿ä¿¤
+Amos=¾Æ¸ð½º
+Obadiah=¿À¹Ù´ô
+Jonah=¿ä³ª
+Micah=¹Ì°¡
+Nahum=³ªÈÉ
+Habakkuk=ÇϹڱ¹
+Zephaniah=½º¹Ù³Ä
+Haggai=Çа³
+Zechariah=½º°¡·ª
+Malachi=¸»¶ó±â
+Matthew=¸¶Åº¹À½
+Mark=¸¶°¡º¹À½
+Luke=´©°¡º¹À½
+John=¿äÇѺ¹À½
+Acts=»çµµÇàÀü
+Romans=·Î¸¶¼­
+I Corinthians=°í¸°µµÀü¼­
+II Corinthians=°í¸°µµÈļ­
+Galatians=°¥¶óµð¾Æ¼­
+Ephesians=¿¡º£¼Ò¼­
+Philippians=ºô¸³º¸¼­
+Colossians=°ñ·Î»õ¼­
+I Thessalonians=µ¥»ì·Î´Ï°¡Àü¼­
+II Thessalonians=µ¥»ì·Î´Ï°¡Èļ­
+I Timothy=µð¸ðµ¥Àü¼­
+II Timothy=µð¸ðµ¥Èļ­
+Titus=µðµµ¼­
+Philemon=ºô·¹¸ó¼­
+Hebrews=È÷ºê¸®¼­
+James=¾ß°íº¸¼­
+I Peter=º£µå·ÎÀü¼­
+II Peter=º£µå·ÎÈļ­
+I John=¿äÇÑÀϼ­
+II John=¿äÇÑÀ̼­
+III John=¿äÇѻＭ
+Jude=À¯´Ù¼­
+Revelation of John=¿äÇÑ°è½Ã·Ï
+
+[Book Abbrevs]
+
+â¼¼±â=Gen
+â=Gen
+
+Ãâ¾Ö±Á±â=Exod
+Ãô=Exod
+
+·¹À§±â=Lev
+·¹=Lev
+
+¹Î¼ö±â=Num
+¹Î=Num
+
+½Å¸í±â=Deut
+½Å=Deut
+
+¿©È£¼ö¾Æ=Josh
+¼ö=Josh
+
+»ç»ç±â=Judg
+Ȗ=Judg
+
+·í±â=Ruth
+·í=Ruth
+
+»ç¹«¿¤»ó=1Sam
+ȕȗ=1Sam
+
+»ç¹«¿¤ÇÏ=2Sam
+»ïÇÏ=2Sam
+
+¿­¿Õ±â»ó=1Kgs
+¿Õ»ó=1Kgs
+
+¿­¿Õ±âÇÏ=2Kgs
+¿ÕÇÏ=2Kgs
+
+¿ª´ë»ó=1Chr
+´ë»ó=1Chr
+
+¿ª´ëÇÏ=2Chr
+´ëÇÏ=2Chr
+
+¿¡½º¶ó=Ezra
+½º=Ezra
+
+´ÀÇì¹Ì¾ß=Neh
+´À=Neh
+
+¿¡½º´õ=Esth
+¿¡=Esth
+
+¿é±â=Job
+¿é=Job
+
+½ÃÆí=Ps
+½Ã=Ps
+
+Àá¾ð=Prov
+Àá=Prov
+
+Àüµµ¼­=Eccl
+Àü=Eccl
+
+¾Æ°¡=Song
+¾Æ=Song
+
+ÀÌ»ç¾ß=Isa
+ȍ=Isa
+
+¿¹·¹¹Ì¾ß=Jer
+·½=Jer
+
+¿¹·¹¹Ì¾ß¾Ö°¡=Lam
+¾Ö=Lam
+
+¿¡½º°Ö=Ezek
+°Ö=Ezek
+
+´Ù´Ï¿¤=Dan
+´Ü=Dan
+
+È£¼¼¾Æ=Hos
+È£=Hos
+
+¿ä¿¤=Joel
+¿ç=Joel
+
+¾Æ¸ð½º=Amos
+¾Ï=Amos
+
+¿À¹Ù´ô=Obad
+¿É=Obad
+
+¿ä³ª=Jonah
+¿æ=Jonah
+
+¹Ì°¡=Mic
+¹Ì=Mic
+
+³ªÈÉ=Nah
+³ª=Nah
+
+ÇϹڱ¹=Hab
+ÇÕ=Hab
+
+½º¹Ù³Ä=Zeph
+½À=Zeph
+
+Çа³=Hag
+ÇÐ=Hag
+
+½º°¡·ª=Zech
+½»=Zech
+
+¸»¶ó±â=Mal
+¸»=Mal
+
+¸¶Åº¹À½=Matt
+¸¶=Matt
+
+¸¶°¡º¹À½=Mark
+¸·=Mark
+
+´©°¡º¹À½=Luke
+´ª=Luke
+
+¿äÇѺ¹À½=John
+¿ä=John
+
+»çµµÇàÀü=Acts
+Çà=Acts
+
+·Î¸¶¼­=Rom
+·Ò=Rom
+
+°í¸°µµÀü¼­=1Cor
+°íÀü=1Cor
+
+°í¸°µµÈļ­=2Cor
+°íÈÄ=2Cor
+
+°¥¶óµð¾Æ¼­=Gal
+°¥=Gal
+
+¿¡º£¼Ò¼­=Eph
+¿¦=Eph
+
+ºô¸³º¸¼­=Phil
+ºô=Phil
+
+°ñ·Î»õ¼­=Col
+°ñ=Col
+
+µ¥»ì·Î´Ï°¡Àü¼­=1Thess
+ȓ˟=1Thess
+
+µ¥»ì·Î´Ï°¡Èļ­=2Thess
+»ìÈÄ=2Thess
+
+µð¸ðµ¥Àü¼­=1Tim
+µõÀü=1Tim
+
+µð¸ðµ¥Èļ­=2Tim
+µõÈÄ=2Tim
+
+µðµµ¼­=Titus
+µó=Titus
+
+ºô·¹¸ó¼­=Phlm
+¸ó=Phlm
+
+È÷ºê¸®¼­=Heb
+È÷=Heb
+
+¾ß°íº¸¼­=Jas
+¾à=Jas
+
+º£µå·ÎÀü¼­=1Pet
+º¦Àü=1Pet
+
+º£µå·ÎÈļ­=2Pet
+º¦ÈÄ=2Pet
+
+¿äÇÑÀϼ­=1John
+¿äÀÏ=1John
+
+¿äÇÑÀ̼­=2John
+¿äÀÌ=2John
+
+¿äÇѻＭ=3John
+¿ä»ï=3John
+
+À¯´Ù¼­=Jude
+À¯=Jude
+
+¿äÇÑ°è½Ã·Ï=Rev
+°è=Rev
diff --git a/locales.d/ko_abbrev-utf8.conf b/locales.d/ko_abbrev-utf8.conf
new file mode 100644
index 0000000..13f04b3
--- /dev/null
+++ b/locales.d/ko_abbrev-utf8.conf
@@ -0,0 +1,271 @@
+[Meta]
+Name=ko_abbrev
+Description=Korean abbreviations (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=ì°½
+Exodus=출
+Leviticus=ë ˆ
+Numbers=민
+Deuteronomy=ì‹ 
+Joshua=ì—¬
+Judges=ì‚¿
+Ruth=룻
+I Samuel=삼�
+II Samuel=삼하
+I Kings=왕�
+II Kings=왕하
+I Chronicles=대�
+II Chronicles=대하
+Ezra=스
+Nehemiah=�
+Esther=ì—�
+Job=욥
+Psalms=시
+Proverbs=ìž 
+Ecclesiastes=ì „
+Song of Solomon=ì•„
+Isaiah=사
+Jeremiah=ë ˜
+Lamentations=ì• 
+Ezekiel=ê²”
+Daniel=단
+Hosea=호
+Joel=욜
+Amos=ì•”
+Obadiah=옵
+Jonah=욘
+Micah=미
+Nahum=나
+Habakkuk=í•©
+Zephaniah=습
+Haggai=í•™
+Zechariah=슥
+Malachi=�
+Matthew=마
+Mark=막
+Luke=눅
+John=ìš”
+Acts=í–‰
+Romans=롬
+I Corinthians=ê³ ì „
+II Corinthians=고후
+Galatians=ê°ˆ
+Ephesians=ì—¡
+Philippians=빌
+Colossians=골
+I Thessalonians=ì‚´ì „
+II Thessalonians=살후
+I Timothy=딤전
+II Timothy=딤후
+Titus=ë”›
+Philemon=몬
+Hebrews=히
+James=약
+I Peter=벧전
+II Peter=벧후
+I John=요�
+II John=요�
+III John=요삼
+Jude=유
+Revelation of John=계
+
+[Book Abbrevs]
+창세기=Gen
+ì°½=Gen
+
+출애굽기=Exod
+츌=Exod
+
+레위기=Lev
+ë ˆ=Lev
+
+민수기=Num
+민=Num
+
+신명기=Deut
+ì‹ =Deut
+
+여호수아=Josh
+수=Josh
+
+사사기=Judg
+ì‚¿=Judg
+
+룻기=Ruth
+룻=Ruth
+
+사무엘�=1Sam
+삼�=1Sam
+
+사무엘하=2Sam
+삼하=2Sam
+
+열왕기�=1Kgs
+왕�=1Kgs
+
+열왕기하=2Kgs
+왕하=2Kgs
+
+역대�=1Chr
+대�=1Chr
+
+역대하=2Chr
+대하=2Chr
+
+�스�=Ezra
+스=Ezra
+
+�헤미야=Neh
+�=Neh
+
+�스�=Esth
+ì—�=Esth
+
+욥기=Job
+욥=Job
+
+시편=Ps
+시=Ps
+
+ìž ì–¸=Prov
+ìž =Prov
+
+전�서=Eccl
+ì „=Eccl
+
+ì•„ê°€=Song
+ì•„=Song
+
+�사야=Isa
+사=Isa
+
+예레미야=Jer
+ë ˜=Jer
+
+예레미야애가=Lam
+ì• =Lam
+
+�스겔=Ezek
+ê²”=Ezek
+
+다니엘=Dan
+단=Dan
+
+호세아=Hos
+호=Hos
+
+요엘=Joel
+욜=Joel
+
+아모스=Amos
+ì•”=Amos
+
+오바댜=Obad
+옵=Obad
+
+요나=Jonah
+욘=Jonah
+
+미가=Mic
+미=Mic
+
+나훔=Nah
+나=Nah
+
+하박국=Hab
+í•©=Hab
+
+스바�=Zeph
+습=Zeph
+
+학개=Hag
+í•™=Hag
+
+스가랴=Zech
+슥=Zech
+
+��기=Mal
+�=Mal
+
+마태복�=Matt
+마=Matt
+
+마가복�=Mark
+막=Mark
+
+누가복�=Luke
+눅=Luke
+
+요한복�=John
+ìš”=John
+
+사�행전=Acts
+í–‰=Acts
+
+로마서=Rom
+롬=Rom
+
+고린�전서=1Cor
+ê³ ì „=1Cor
+
+고린�후서=2Cor
+고후=2Cor
+
+갈�디아서=Gal
+ê°ˆ=Gal
+
+�베소서=Eph
+ì—¡=Eph
+
+빌립보서=Phil
+빌=Phil
+
+골로새서=Col
+골=Col
+
+�살로니가전서=1Thess
+ì‚´ì „=1Thess
+
+�살로니가후서=2Thess
+살후=2Thess
+
+디모�전서=1Tim
+딤전=1Tim
+
+디모�후서=2Tim
+딤후=2Tim
+
+디�서=Titus
+ë”›=Titus
+
+빌레몬서=Phlm
+몬=Phlm
+
+히브리서=Heb
+히=Heb
+
+야고보서=Jas
+약=Jas
+
+베드로전서=1Pet
+벧전=1Pet
+
+베드로후서=2Pet
+벧후=2Pet
+
+요한�서=1John
+요�=1John
+
+요한�서=2John
+요�=2John
+
+요한삼서=3John
+요삼=3John
+
+유다서=Jude
+유=Jude
+
+요한계시�=Rev
+계=Rev
diff --git a/locales.d/ko_abbrev.conf b/locales.d/ko_abbrev.conf
new file mode 100644
index 0000000..1911304
--- /dev/null
+++ b/locales.d/ko_abbrev.conf
@@ -0,0 +1,272 @@
+[Meta]
+Name=ko_abbrev
+Description=Korean abbreviations
+Encoding=EUC-KR
+
+[Text]
+Genesis=â
+Exodus=Ãâ
+Leviticus=·¹
+Numbers=¹Î
+Deuteronomy=½Å
+Joshua=¿©
+Judges=Ȗ
+Ruth=·í
+I Samuel=ȕȗ
+II Samuel=»ïÇÏ
+I Kings=¿Õ»ó
+II Kings=¿ÕÇÏ
+I Chronicles=´ë»ó
+II Chronicles=´ëÇÏ
+Ezra=½º
+Nehemiah=´À
+Esther=¿¡
+Job=¿é
+Psalms=½Ã
+Proverbs=Àá
+Ecclesiastes=Àü
+Song of Solomon=¾Æ
+Isaiah=ȍ
+Jeremiah=·½
+Lamentations=¾Ö
+Ezekiel=°Ö
+Daniel=´Ü
+Hosea=È£
+Joel=¿ç
+Amos=¾Ï
+Obadiah=¿À¹Ù´ô
+Jonah=¿æ
+Micah=¹Ì
+Nahum=³ª
+Habakkuk=ÇÕ
+Zephaniah=½À
+Haggai=ÇÐ
+Zechariah=½»
+Malachi=¸»
+Matthew=¸¶
+Mark=¸·
+Luke=´ª
+John=¿ä
+Acts=Çà
+Romans=·Ò
+I Corinthians=°íÀü
+II Corinthians=°íÈÄ
+Galatians=°¥
+Ephesians=¿¦
+Philippians=ºô
+Colossians=°ñ
+I Thessalonians=ȓ˟
+II Thessalonians=»ìÈÄ
+I Timothy=µõÀü
+II Timothy=µõÈÄ
+Titus=µó
+Philemon=¸ó
+Hebrews=È÷
+James=¾à
+I Peter=º¦Àü
+II Peter=º¦ÈÄ
+I John=¿äÀÏ
+II John=¿äÀÌ
+III John=¿ä»ï
+Jude=À¯
+Revelation of John=°è
+
+[Book Abbrevs]
+â¼¼±â=Gen
+â=Gen
+
+Ãâ¾Ö±Á±â=Exod
+Ãô=Exod
+
+·¹À§±â=Lev
+·¹=Lev
+
+¹Î¼ö±â=Num
+¹Î=Num
+
+½Å¸í±â=Deut
+½Å=Deut
+
+¿©È£¼ö¾Æ=Josh
+¼ö=Josh
+
+»ç»ç±â=Judg
+Ȗ=Judg
+
+·í±â=Ruth
+·í=Ruth
+
+»ç¹«¿¤»ó=1Sam
+ȕȗ=1Sam
+
+»ç¹«¿¤ÇÏ=2Sam
+»ïÇÏ=2Sam
+
+¿­¿Õ±â»ó=1Kgs
+¿Õ»ó=1Kgs
+
+¿­¿Õ±âÇÏ=2Kgs
+¿ÕÇÏ=2Kgs
+
+¿ª´ë»ó=1Chr
+´ë»ó=1Chr
+
+¿ª´ëÇÏ=2Chr
+´ëÇÏ=2Chr
+
+¿¡½º¶ó=Ezra
+½º=Ezra
+
+´ÀÇì¹Ì¾ß=Neh
+´À=Neh
+
+¿¡½º´õ=Esth
+¿¡=Esth
+
+¿é±â=Job
+¿é=Job
+¿É=Job
+
+
+½ÃÆí=Ps
+½Ã=Ps
+
+Àá¾ð=Prov
+Àá=Prov
+
+Àüµµ¼­=Eccl
+Àü=Eccl
+
+¾Æ°¡=Song
+¾Æ=Song
+
+ÀÌ»ç¾ß=Isa
+ȍ=Isa
+
+¿¹·¹¹Ì¾ß=Jer
+·½=Jer
+
+¿¹·¹¹Ì¾ß¾Ö°¡=Lam
+¾Ö=Lam
+
+¿¡½º°Ö=Ezek
+°Ö=Ezek
+
+´Ù´Ï¿¤=Dan
+´Ü=Dan
+
+È£¼¼¾Æ=Hos
+È£=Hos
+
+¿ä¿¤=Joel
+¿ç=Joel
+
+¾Æ¸ð½º=Amos
+¾Ï=Amos
+
+¿À¹Ù´ô=Obad
+
+¿ä³ª=Jonah
+¿æ=Jonah
+
+¹Ì°¡=Mic
+¹Ì=Mic
+
+³ªÈÉ=Nah
+³ª=Nah
+
+ÇϹڱ¹=Hab
+ÇÕ=Hab
+
+½º¹Ù³Ä=Zeph
+½À=Zeph
+
+Çа³=Hag
+ÇÐ=Hag
+
+½º°¡·ª=Zech
+½»=Zech
+
+¸»¶ó±â=Mal
+¸»=Mal
+
+¸¶Åº¹À½=Matt
+¸¶=Matt
+
+¸¶°¡º¹À½=Mark
+¸·=Mark
+
+´©°¡º¹À½=Luke
+´ª=Luke
+
+¿äÇѺ¹À½=John
+¿ä=John
+
+»çµµÇàÀü=Acts
+Çà=Acts
+
+·Î¸¶¼­=Rom
+·Ò=Rom
+
+°í¸°µµÀü¼­=1Cor
+°íÀü=1Cor
+
+°í¸°µµÈļ­=2Cor
+°íÈÄ=2Cor
+
+°¥¶óµð¾Æ¼­=Gal
+°¥=Gal
+
+¿¡º£¼Ò¼­=Eph
+¿¦=Eph
+
+ºô¸³º¸¼­=Phil
+ºô=Phil
+
+°ñ·Î»õ¼­=Col
+°ñ=Col
+
+µ¥»ì·Î´Ï°¡Àü¼­=1Thess
+ȓ˟=1Thess
+
+µ¥»ì·Î´Ï°¡Èļ­=2Thess
+»ìÈÄ=2Thess
+
+µð¸ðµ¥Àü¼­=1Tim
+µõÀü=1Tim
+
+µð¸ðµ¥Èļ­=2Tim
+µõÈÄ=2Tim
+
+µðµµ¼­=Titus
+µó=Titus
+
+ºô·¹¸ó¼­=Phlm
+¸ó=Phlm
+
+È÷ºê¸®¼­=Heb
+È÷=Heb
+
+¾ß°íº¸¼­=Jas
+¾à=Jas
+
+º£µå·ÎÀü¼­=1Pet
+º¦Àü=1Pet
+
+º£µå·ÎÈļ­=2Pet
+º¦ÈÄ=2Pet
+
+¿äÇÑÀϼ­=1John
+¿äÀÏ=1John
+
+¿äÇÑÀ̼­=2John
+¿äÀÌ=2John
+
+¿äÇѻＭ=3John
+¿ä»ï=3John
+
+À¯´Ù¼­=Jude
+À¯=Jude
+
+¿äÇÑ°è½Ã·Ï=Rev
+°è=Rev
diff --git a/locales.d/la-utf8.conf b/locales.d/la-utf8.conf
new file mode 100644
index 0000000..153cd9b
--- /dev/null
+++ b/locales.d/la-utf8.conf
@@ -0,0 +1,147 @@
+#
+#     Latin Bible booknames as in the Vulgata
+#    Still in alpha stage. Contributions are welcome.
+#
+#           Martin Gruner mgruner@crosswire.org
+
+[Meta]
+Name=la
+Description=Lingua Latina (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Leviticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Iosue
+Judges=Judicum
+Ruth=Ruth
+I Samuel=I Samuhel
+II Samuel=II Samuhel
+I Kings=I Regum
+II Kings=II Regum
+I Chronicles=I Paralipomenon
+II Chronicles=II Paralipomenon
+Ezra=Ezras
+Nehemiah=Neemia
+Esther=Hester
+Job=Iob
+Psalms=Psalmi
+Proverbs=Proverbia
+Ecclesiastes=Ecclesiastes
+Song of Solomon=Canticum
+Isaiah=Isaias
+Jeremiah=Hieremias
+Lamentations=Lamentationes
+Ezekiel=Hiezecihel
+Daniel=Danihel
+Hosea=Osee
+Joel=Johel
+Amos=Amos
+Obadiah=Abdias
+Jonah=Ionas
+Micah=Micha
+Nahum=Naum
+Habakkuk=Abacuc
+Zephaniah=Sofonias
+Haggai=Aggeus
+Zechariah=Zaccharias
+Malachi=Malachi
+Matthew=Secundum Mattheum
+Mark=Secundum Marcum
+Luke=Secundum Lucam
+John=Secundum Iohannem
+Acts=Actus Apostolorum
+Romans=Ad Romanos
+I Corinthians=Ad Corinthios I
+II Corinthians=Ad Corinthios II
+Galatians=Ad Galatas
+Ephesians=Ad Ephesios
+Philippians=Ad Philippenses
+Colossians=Ad Colossenses
+I Thessalonians=Ad Thessalonicenses I
+II Thessalonians=Ad Thessalonicenses II
+I Timothy=Ad Timotheum I
+II Timothy=Ad Timotheum II
+Titus=Ad Titum
+Philemon=Ad Philemonem
+Hebrews=Ad Hebraeos
+James=Jacobi
+I Peter=Petri I
+II Peter=Petri II
+I John=Iohannis I
+II John=Iohannis II
+III John=Iohannis III
+Jude=Judae
+Revelation of John=Apocalypsis
+
+[Book Abbrevs]
+
+GENESIS=Gen
+EXODUS=Exod
+LEVITICUS=Lev
+NUMERI=Num
+DEUTERONOMIUM=Deut
+IOSUE=Josh
+JUDICUM=Judg
+RUTH=Ruth
+I SAMUHEL=1Sam
+II SAMUHEL=2Sam
+I REGUM=1Kgs
+II REGUM=2Kgs
+I PARALIPOMENON=1Chr
+II PARALIPOMENON=2Chr
+EZRAS=Ezra
+NEEMIA=Neh
+HESTER=Esth
+IOB=Job
+PSALMI=Ps
+PROVERBIA=Prov
+ECCLESIASTES=Eccl
+CANTICUM=Song
+ISAIAS=Isa
+HIEREMIAS=Jer
+LAMENTATIONES=Lam
+HIEZECIHEL=Ezek
+DANIHEL=Dan
+OSEE=Hos
+JOHEL=Joel
+AMOS=Amos
+ABDIAS=Obad
+IONAS=Jonah
+MICHA=Mic
+NAUM=Nah
+ABACUC=Hab
+SOFONIAS=Zeph
+AGGEUS=Hag
+ZACCHARIAS=Zech
+MALACHI=Mal
+SECUNDUM MATTHEUM=Matt
+SECUNDUM MARCUM=Mark
+SECUNDUM LUCAM=Luke
+SECUNDUM IOHANNEM=John
+ACTUS APOSTOLORUM=Acts
+AD ROMANOS=Rom
+AD CORINTHIOS I=1Cor
+AD CORINTHIOS II=2Cor
+AD GALATAS=Gal
+AD EPHESIOS=Eph
+AD PHILIPPENSES=Phil
+AD COLOSSENSES=Col
+AD THESSALONICENSES I=1Thess
+AD THESSALONICENSES II=2Thess
+AD TIMOTHEUM I=1Tim
+AD TIMOTHEUM II=2Tim
+AD TITUM=Titus
+AD PHILEMONEM=Phlm
+AD HEBRAEOS=Heb
+JACOBI=Jas
+PETRI I=1Pet
+PETRI II=2Pet
+IOHANNIS I=1John
+IOHANNIS II=2John
+IOHANNIS III=3John
+JUDAE=Jude
+APOCALYPSIS=Rev
diff --git a/locales.d/la.conf b/locales.d/la.conf
new file mode 100644
index 0000000..30251af
--- /dev/null
+++ b/locales.d/la.conf
@@ -0,0 +1,147 @@
+#
+#     Latin Bible booknames as in the Vulgata
+#    Still in alpha stage. Contributions are welcome.
+#
+#           Martin Gruner mgruner@crosswire.org
+
+[Meta]
+Name=la
+Description=Lingua Latina
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Leviticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Iosue
+Judges=Judicum
+Ruth=Ruth
+I Samuel=I Samuhel
+II Samuel=II Samuhel
+I Kings=I Regum
+II Kings=II Regum
+I Chronicles=I Paralipomenon
+II Chronicles=II Paralipomenon
+Ezra=Ezras
+Nehemiah=Neemia
+Esther=Hester
+Job=Iob
+Psalms=Psalmi
+Proverbs=Proverbia
+Ecclesiastes=Ecclesiastes
+Song of Solomon=Canticum
+Isaiah=Isaias
+Jeremiah=Hieremias
+Lamentations=Lamentationes
+Ezekiel=Hiezecihel
+Daniel=Danihel
+Hosea=Osee
+Joel=Johel
+Amos=Amos
+Obadiah=Abdias
+Jonah=Ionas
+Micah=Micha
+Nahum=Naum
+Habakkuk=Abacuc
+Zephaniah=Sofonias
+Haggai=Aggeus
+Zechariah=Zaccharias
+Malachi=Malachi
+Matthew=Secundum Mattheum
+Mark=Secundum Marcum
+Luke=Secundum Lucam
+John=Secundum Iohannem
+Acts=Actus Apostolorum
+Romans=Ad Romanos
+I Corinthians=Ad Corinthios I
+II Corinthians=Ad Corinthios II
+Galatians=Ad Galatas
+Ephesians=Ad Ephesios
+Philippians=Ad Philippenses
+Colossians=Ad Colossenses
+I Thessalonians=Ad Thessalonicenses I
+II Thessalonians=Ad Thessalonicenses II
+I Timothy=Ad Timotheum I
+II Timothy=Ad Timotheum II
+Titus=Ad Titum
+Philemon=Ad Philemonem
+Hebrews=Ad Hebraeos
+James=Jacobi
+I Peter=Petri I
+II Peter=Petri II
+I John=Iohannis I
+II John=Iohannis II
+III John=Iohannis III
+Jude=Judae
+Revelation of John=Apocalypsis
+
+[Book Abbrevs]
+
+GENESIS=Gen
+EXODUS=Exod
+LEVITICUS=Lev
+NUMERI=Num
+DEUTERONOMIUM=Deut
+IOSUE=Josh
+JUDICUM=Judg
+RUTH=Ruth
+I SAMUHEL=1Sam
+II SAMUHEL=2Sam
+I REGUM=1Kgs
+II REGUM=2Kgs
+I PARALIPOMENON=1Chr
+II PARALIPOMENON=2Chr
+EZRAS=Ezra
+NEEMIA=Neh
+HESTER=Esth
+IOB=Job
+PSALMI=Ps
+PROVERBIA=Prov
+ECCLESIASTES=Eccl
+CANTICUM=Song
+ISAIAS=Isa
+HIEREMIAS=Jer
+LAMENTATIONES=Lam
+HIEZECIHEL=Ezek
+DANIHEL=Dan
+OSEE=Hos
+JOHEL=Joel
+AMOS=Amos
+ABDIAS=Obad
+IONAS=Jonah
+MICHA=Mic
+NAUM=Nah
+ABACUC=Hab
+SOFONIAS=Zeph
+AGGEUS=Hag
+ZACCHARIAS=Zech
+MALACHI=Mal
+SECUNDUM MATTHEUM=Matt
+SECUNDUM MARCUM=Mark
+SECUNDUM LUCAM=Luke
+SECUNDUM IOHANNEM=John
+ACTUS APOSTOLORUM=Acts
+AD ROMANOS=Rom
+AD CORINTHIOS I=1Cor
+AD CORINTHIOS II=2Cor
+AD GALATAS=Gal
+AD EPHESIOS=Eph
+AD PHILIPPENSES=Phil
+AD COLOSSENSES=Col
+AD THESSALONICENSES I=1Thess
+AD THESSALONICENSES II=2Thess
+AD TIMOTHEUM I=1Tim
+AD TIMOTHEUM II=2Tim
+AD TITUM=Titus
+AD PHILEMONEM=Phlm
+AD HEBRAEOS=Heb
+JACOBI=Jas
+PETRI I=1Pet
+PETRI II=2Pet
+IOHANNIS I=1John
+IOHANNIS II=2John
+IOHANNIS III=3John
+JUDAE=Jude
+APOCALYPSIS=Rev
diff --git a/locales.d/locales.conf b/locales.d/locales.conf
new file mode 100644
index 0000000..9781e0d
--- /dev/null
+++ b/locales.d/locales.conf
@@ -0,0 +1,8184 @@
+# List of locales with their localized name and their English name
+# lo=Name
+# lo.en=English Name
+
+[Meta]
+Name=locales
+Description=Locale Names
+Encoding=UTF-8
+
+[Text]
+
+aa.en=Afar
+aa=Qafár af
+ab.en=Abkhazian
+ab=�ҧ�уа
+ae.en=Avestan
+af.en=Afrikaans
+ak.en=Akan
+am=አማርኛ
+am.en=Amharic
+an.en=Aragonese
+ar.en=Arabic
+ar=العربية
+as.en=Assamese
+as=অসমীয়া
+av.en=Avaric
+ay=Aymar aru
+ay.en=Aymara
+az-Cyrl=�зәрбајҹан
+az=Azərbaycan / �зәрбајҹан / آذربایجان
+az-Arab=آذربایجان
+az.en=Azerbaijani
+az-Latn=Azərbaycan
+ba.en=Bashkir
+ba=Башҡорт
+be.en=Belarusian
+be=Белару�ка�
+bg.en=Bulgarian
+bg=Българ�ки
+bh.en=Bihari languages
+bh=भोजप�री
+bi.en=Bislama
+bm.en=Bambara
+bn.en=Bengali
+bn=বাংলা
+bo=བོད་ས�ད་
+bo.en=Tibetan
+br=Brezhoneg
+br.en=Breton
+bs=Bosanski
+bs.en=Bosnian
+ca=Català
+ca.en=Catalan
+ce.en=Chechen
+ce=�охчийн
+ch=Chamoru
+ch.en=Chamorro
+co=Corsu
+co.en=Corsican
+cr.en=Cree
+cs=Čeština
+cs.en=Czech
+cu.en=Church Slavic
+cu=Словѣ�нь�къ ѩ�ꙑ�къ
+cv.en=Chuvash
+cv=Чăвашла
+cy=Cymraeg
+cy.en=Welsh
+da=Dansk
+da.en=Danish
+de=Deutsch
+de.en=German
+dv.en=Dhivehi
+dz=རྫོང་�
+dz.en=Dzongkha
+ee.en=Ewe
+el.en=Modern Greek (1453-)
+el=Ελληνικά
+en=English
+en.en=English
+en-GB=English (UK)
+en-US=English (US)
+eo.en=Esperanto
+es.en=Spanish
+es=Español
+et=Eesti Keel
+et.en=Estonian
+eu.en=Basque
+eu=Euskara
+fa.en=Persian
+fa=�ارسی
+ff.en=Fulah
+fi.en=Finnish
+fi=Suomi
+fj.en=Fijian
+fj=Na vosa vaka-Viti
+fo.en=Faroese
+fo=Føroyskt
+fr.en=French
+fr=Français
+fy.en=Western Frisian
+fy=Frysk
+ga.en=Irish
+ga=Gaeilge
+gd=A' Ghàidhlig
+gd.en=Scottish Gaelic
+gl.en=Galician
+gl=Galego
+gn.en=Guarani
+gn=ગ�જરાતી
+gu.en=Gujarati
+gv.en=Manx
+gv=Gaelg
+ha.en=Hausa
+he.en=Hebrew
+he=עברית
+hi.en=Hindi
+hi=हिन�दी
+ho.en=Hiri Motu
+hr.en=Croatian
+hr=Hrvatski
+ht.en=Haitian
+ht=Kreyòl ayisyen
+hu.en=Hungarian
+hu=Magyar
+hy.en=Armenian
+hy=Õ€Õ¡ÕµÕ¥Ö€Õ¥Õ¶
+hz.en=Herero
+hz=Otjiherero
+ia.en=Interlingua (International Auxiliary Language)
+id=Bahasa Indonesia
+id.en=Indonesian
+ie.en=Interlingue
+ig.en=Igbo
+ii.en=Sichuan Yi
+ik.en=Inupiaq
+ik=Iñupiak
+in.en=Indonesian
+io.en=Ido
+is.en=Icelandic
+is=�slenska
+it.en=Italian
+it=Italiano
+iu=�ᓄᒃᑎ�ᑦ
+iu.en=Inuktitut
+iw.en=Hebrew
+ja.en=Japanese
+ja=日本語
+ji.en=Yiddish
+jv.en=Javanese
+jw.en=Javanese
+ka.en=Georgian
+ka=ქ�რთული
+kg.en=Kongo
+ki.en=Kikuyu
+ki=Gĩkũyũ
+kj.en=Kuanyama
+kj=Oshikwanyama
+kk.en=Kazakh
+kk=Қазақша
+kl.en=Kalaallisut
+km=ភាសា�្មែរ
+km.en=Central Khmer
+kn.en=Kannada
+kn=ಕನ�ನಡ
+ko=한국�
+ko.en=Korean
+ko-KP=조선�
+kr.en=Kanuri
+ks-Arab=کٲش�ر
+ks-Deva=कॉश�र
+ks.en=Kashmiri
+ks=कॉश�र / کٲش�ر
+ku-Arab=كوردی
+ku-Cyrl=К'ӧрди
+ku.en=Kurdish
+ku=Kurdî / كوردی / К'ӧрди
+ku-Latn=Kurdî
+kv.en=Komi
+kv=Коми
+kw.en=Cornish
+kw=Kernewek
+ky.en=Kirghiz
+ky=Кыргызча
+la.en=Latin
+la=lingua latina
+lb.en=Luxembourgish
+lb=Lëtzebuergesch
+lg.en=Ganda
+li.en=Limburgan
+ln.en=Lingala
+ln=Lingála
+lo=ພາສາລາວ
+lo.en=Lao
+lt.en=Lithuanian
+lt=Lietuvių
+lu.en=Luba-Katanga
+lv.en=Latvian
+lv=Latviešu
+mg.en=Malagasy
+mh.en=Marshallese
+mh=Kajin M̧ajeļ
+mi.en=Maori
+mi=M�ori
+mk.en=Macedonian
+mk=Македон�ки
+ml.en=Malayalam
+ml=മലയാളം
+mn.en=Mongolian
+mn=Монгол
+mo.en=Moldavian
+mr.en=Marathi
+mr=मराठी
+ms=Bahasa Melayu
+ms.en=Malay (macrolanguage)
+mt.en=Maltese
+mt=Malti
+my.en=Burmese
+my=မြန်မာစ
+na=Dorerin Naoero
+na.en=Nauru
+nb=Bokmål
+nb.en=Norwegian Bokmål
+nd.en=North Ndebele
+nd=Sindebele
+ne.en=Nepali
+ne=नेपाली
+ng.en=Ndonga
+ng=Owambo
+nl.en=Dutch
+nl=Nederlands
+nn.en=Norwegian Nynorsk
+nn=Nynorsk
+no.en=Norwegian
+no=Norsk
+nr.en=South Ndebele
+nr=Nrebele
+nv=Diné bizaad
+nv.en=Navajo
+ny=Chicheŵa
+ny.en=Nyanja
+oc.en=Occitan (post 1500)
+oj.en=Ojibwa
+om.en=Oromo
+or=ଓଡ଼ିଆ
+or.en=Oriya
+os.en=Ossetian
+os=Иронау
+pa-Arab=پنجابی
+pa-Deva=पंजाबी
+pa.en=Panjabi
+pa-Guru=ਪੰਜਾਬੀ
+pa=ਪੰਜਾਬੀ / پنجابی / पंजाबी
+pi.en=Pali
+pi=पािऴ
+pl.en=Polish
+pl=Polszczyzna
+ps.en=Pushto
+ps=پښتو
+pt-BR=Português Brasileiro
+pt.en=Portuguese
+pt=Português
+qu.en=Quechua
+rm.en=Romansh
+rm=Rumantsch
+rn.en=Rundi
+rn=Kirundi
+ro.en=Romanian
+ro=Română
+ru.en=Russian
+ru=Ру��кий
+rw.en=Kinyarwanda
+sa.en=Sanskrit
+sa=संस�कृतम�
+sc.en=Sardinian
+sc=Sardu
+sd.en=Sindhi
+sd=سنڌي
+se.en=Northern Sami
+se=Sámegiella
+sg.en=Sango
+sg=Sängö
+sh.en=Serbo-Croatian
+si.en=Sinhala
+si=සිංහල
+sk.en=Slovak
+sk=Sloven�ina
+sl.en=Slovenian
+sl=Slovenš�ina
+sm.en=Samoan
+sm=Gagana Samoa
+sn=chiShona
+sn.en=Shona
+so.en=Somali
+so=Soomaaliga
+sq.en=Albanian
+sq=Shqip
+sr-Cyrl=Срп�ки
+sr.en=Serbian
+sr-Latn=Srpski
+sr=Срп�ки / Srpski
+ss.en=Swati
+ss=SiSwati
+st.en=Southern Sotho
+st=Sesotho
+su=Basa Sunda
+su.en=Sundanese
+sv.en=Swedish
+sv=Svenska
+sw.en=Swahili (macrolanguage)
+sw=Kiswahili
+ta.en=Tamil
+ta=தமிழ�
+te.en=Telugu
+te=తెల�గ�
+tg-Arab=تاجیکی‎
+tg-Cyrl=Тоҷикӣ
+tg.en=Tajik
+tg-Latn=tojikī
+tg=Тоҷикӣ / Tojikī / تاجیکی‎
+th=ภาษาไทย
+th.en=Thai
+ti.en=Tigrinya
+tk-Arab=تورکمنچه
+tk-Cyrl=Түркменче
+tk.en=Turkmen
+tk-Latn=Türkmençe
+tk=Türkmençe / Түркменче / تورکمنچه
+tl.en=Tagalog
+tl-Tglg=ᜆᜄᜎᜓᜄ
+tl=Wikang Tagalog
+tn.en=Tswana
+tn=Setswana
+to.en=Tonga (Tonga Islands)
+tr.en=Turkish
+tr=Türkçe
+ts.en=Tsonga
+ts=Xitsonga
+tt-Cyrl=Татарча
+tt.en=Tatar
+tt-Latn=Tatarça
+tt=Tatarça / Татарча
+tw.en=Twi
+ty.en=Tahitian
+ty=Reo M�'ohi
+ug-Arab=ئۇيغۇرچە
+ug-Cyrl=Уйғурчә
+ug.en=Uighur
+ug-Latn=Uyghurche‎
+ug=Uyghurche‎ / ئۇيغۇرچە / Уйғурчә
+uk.en=Ukrainian
+uk=Україн�ька
+ur-Arab=اردو
+ur-Deva=उर�दू
+ur.en=Urdu
+ur=اردو / उर�दू
+uz-Cyrl=Ўзбек
+uz.en=Uzbek
+uz-Latn=O'zbek
+uz=O'zbek / Ўзбек
+ve.en=Venda
+vi.en=Vietnamese
+vi=Tiếng Việt
+vo.en=Volapük
+wa.en=Walloon
+wo.en=Wolof
+xh.en=Xhosa
+xh=isiXhosa
+yi.en=Yiddish
+yi=ייִדיש
+yo=èdèe Yorùbá
+yo.en=Yoruba
+za.en=Zhuang
+za=Vahcuengh
+zh.en=Chinese
+zh-Hans=简体中文
+zh-Hant=�体中文
+zh=中文
+zu.en=Zulu
+zu=isiZulu
+aaa.en=Ghotuo
+aab.en=Alumu-Tesu
+aac.en=Ari
+aad.en=Amal
+aae.en=Arbëreshë Albanian
+aaf.en=Aranadan
+aag.en=Ambrak
+aah.en=Abu' Arapesh
+aai.en=Arifama-Miniafia
+aak.en=Ankave
+aal.en=Afade
+aam.en=Aramanik
+aan.en=Anambé
+aao.en=Algerian Saharan Arabic
+aap.en=Pará Arára
+aaq.en=Eastern Abnaki
+aas.en=Aasáx
+aat.en=Arvanitika Albanian
+aau.en=Abau
+aav.en=Austro-Asiatic languages
+aaw.en=Solong
+aax.en=Mandobo Atas
+aaz.en=Amarasi
+aba.en=Abé
+abb.en=Bankon
+abc.en=Ambala Ayta
+abd.en=Camarines Norte Agta
+abe.en=Western Abnaki
+abf.en=Abai Sungai
+abg.en=Abaga
+abh.en=Tajiki Arabic
+abi.en=Abidji
+abj.en=Aka-Bea
+abl.en=Lampung Nyo
+abm.en=Abanyom
+abn.en=Abua
+abo.en=Abon
+abp.en=Abenlen Ayta
+abq.en=Abaza
+abr.en=Abron
+abs.en=Ambonese Malay
+abt.en=Ambulas
+abu.en=Abure
+abv.en=Baharna Arabic
+abw.en=Pal
+abx.en=Inabaknon
+aby.en=Aneme Wake
+abz.en=Abui
+aca.en=Achagua
+acb.en=�ncá
+acd.en=Gikyode
+ace.en=Achinese
+acf.en=Saint Lucian Creole French
+ach.en=Acoli
+aci.en=Aka-Cari
+ack.en=Aka-Kora
+acl.en=Akar-Bale
+acm.en=Mesopotamian Arabic
+acn.en=Achang
+acp.en=Eastern Acipa
+acq.en=Ta'izzi-Adeni Arabic
+acr=Achí
+acr.en=Achi
+acs.en=Acroá
+act.en=Achterhoeks
+acu.en=Achuar-Shiwiar
+acv.en=Achumawi
+acw.en=Hijazi Arabic
+acx.en=Omani Arabic
+acy.en=Cypriot Arabic
+acz.en=Acheron
+ada.en=Adangme
+adb.en=Adabe
+add.en=Dzodinka
+ade.en=Adele
+adf.en=Dhofari Arabic
+adg.en=Andegerebinha
+adh.en=Adhola
+adi.en=Adi
+adj.en=Adioukrou
+adl.en=Galo
+adn.en=Adang
+ado.en=Abu
+adp.en=Adap
+adq.en=Adangbe
+adr.en=Adonara
+ads.en=Adamorobe Sign Language
+adt.en=Adnyamathanha
+adu.en=Aduge
+adw.en=Amundava
+adx.en=Amdo Tibetan
+ady.en=Adyghe
+ady=адыгaбз�
+adz.en=Adzera
+aea.en=Areba
+aeb.en=Tunisian Arabic
+aec.en=Saidi Arabic
+aed.en=Argentine Sign Language
+aee.en=Northeast Pashayi
+aek.en=Haeke
+ael.en=Ambele
+aem.en=Arem
+aen.en=Armenian Sign Language
+aeq.en=Aer
+aer.en=Eastern Arrernte
+aes.en=Alsea
+aeu.en=Akeu
+aew.en=Ambakich
+aey.en=Amele
+aez.en=Aeka
+afa.en=Afro-Asiatic languages
+afb.en=Gulf Arabic
+afd.en=Andai
+afe.en=Putukwam
+afg.en=Afghan Sign Language
+afh.en=Afrihili
+afi.en=Akrukay
+afk.en=Nanubae
+afn.en=Defaka
+afo.en=Eloyi
+afp.en=Tapei
+afs.en=Afro-Seminole Creole
+aft.en=Afitti
+afu.en=Awutu
+afz.en=Obokuitai
+aga.en=Aguano
+agb.en=Legbo
+agc.en=Agatu
+agd.en=Agarabi
+age.en=Angal
+agf.en=Arguni
+agg.en=Angor
+agh.en=Ngelima
+agi.en=Agariya
+agj.en=Argobba
+agk.en=Isarog Agta
+agl.en=Fembe
+agm.en=Angaataha
+agn.en=Agutaynen
+ago.en=Tainae
+agp.en=Paranan
+agq.en=Aghem
+agr.en=Aguaruna
+ags.en=Esimbi
+agt.en=Central Cagayan Agta
+agu.en=Aguacateco
+agv.en=Remontado Agta
+agw.en=Kahua
+agx.en=Aghul
+agy.en=Southern Alta
+agz.en=Mt. Iriga Agta
+aha.en=Ahanta
+ahb.en=Axamb
+ahg.en=Qimant
+ahh.en=Aghu
+ahi.en=Tiagbamrin Aizi
+ahk.en=Akha
+ahl.en=Igo
+ahm.en=Mobumrin Aizi
+ahn.en=Àhàn
+aho.en=Ahom
+ahp.en=Aproumu Aizi
+ahr.en=Ahirani
+ahs.en=Ashe
+aht.en=Ahtena
+aia.en=Arosi
+aib.en=Ainu (China)
+aic.en=Ainbai
+aid.en=Alngith
+aie.en=Amara
+aif.en=Agi
+aig.en=Antigua and Barbuda Creole English
+aih.en=Ai-Cham
+aii.en=Assyrian Neo-Aramaic
+aij.en=Lishanid Noshan
+aik.en=Ake
+ail.en=Aimele
+aim.en=Aimol
+ain.en=Ainu (Japan)
+aio.en=Aiton
+aip.en=Burumakok
+aiq.en=Aimaq
+air.en=Airoran
+ais.en=Nataoran Amis
+ait.en=Arikem
+aiw.en=Aari
+aix.en=Aighon
+aiy.en=Ali
+aja.en=Aja (Sudan)
+ajg.en=Aja (Benin)
+aji.en=Ajië
+ajp.en=South Levantine Arabic
+ajt.en=Judeo-Tunisian Arabic
+aju.en=Judeo-Moroccan Arabic
+ajw.en=Ajawa
+ajz.en=Amri Karbi
+akb.en=Batak Angkola
+akc.en=Mpur
+akd.en=Ukpet-Ehom
+ake.en=Akawaio
+akf.en=Akpa
+akg.en=Anakalangu
+akh.en=Angal Heneng
+aki.en=Aiome
+akj.en=Aka-Jeru
+akk.en=Akkadian
+akl.en=Aklanon
+akm.en=Aka-Bo
+ako.en=Akurio
+akp.en=Siwu
+akq.en=Ak
+akr.en=Araki
+aks.en=Akaselem
+akt.en=Akolet
+aku.en=Akum
+akv.en=Akhvakh
+akw.en=Akwa
+akx.en=Aka-Kede
+aky.en=Aka-Kol
+akz.en=Alabama
+ala.en=Alago
+alc.en=Qawasqar
+ald.en=Alladian
+ale.en=Aleut
+alf.en=Alege
+alg.en=Algonquian languages
+alh.en=Alawa
+ali.en=Amaimon
+alj.en=Alangan
+alk.en=Alak
+all.en=Allar
+alm.en=Amblong
+aln.en=Gheg Albanian
+alo.en=Larike-Wakasihu
+alp.en=Alune
+alq.en=Algonquin
+alr.en=Alutor
+als.en=Tosk Albanian
+alt.en=Southern Altai
+alu.en='Are'are
+alv.en=Atlantic-Congo languages
+alw.en=Alaba-K’abeena
+alx.en=Amol
+aly.en=Alyawarr
+alz.en=Alur
+ama.en=Amanayé
+amb.en=Ambo
+amc.en=Amahuaca
+ame.en=Yanesha'
+amf.en=Hamer-Banna
+amg.en=Amarag
+ami.en=Amis
+amj.en=Amdang
+amk.en=Ambai
+aml.en=War-Jaintia
+amm.en=Ama (Papua New Guinea)
+amn.en=Amanab
+amo.en=Amo
+amp.en=Alamblak
+amq.en=Amahai
+amr.en=Amarakaeri
+ams.en=Southern Amami-Oshima
+amt.en=Amto
+amu.en=Guerrero Amuzgo
+amv.en=Ambelau
+amw.en=Western Neo-Aramaic
+amx.en=Anmatyerre
+amy.en=Ami
+amz.en=Atampaya
+ana.en=Andaqui
+anb.en=Andoa
+anc.en=Ngas
+and.en=Ansus
+ane.en=Xârâcùù
+anf.en=Animere
+ang=Englisc
+ang.en=Old English (ca. 450-1100)
+anh.en=Nend
+ani.en=Andi
+anj.en=Anor
+ank.en=Goemai
+anl.en=Anu
+anm.en=Anal
+ann.en=Obolo
+ano.en=Andoque
+anp.en=Angika
+anq.en=Jarawa (India)
+anr.en=Andh
+ans.en=Anserma
+ant.en=Antakarinya
+anu.en=Anuak
+anv.en=Denya
+anw.en=Anaang
+anx.en=Andra-Hus
+any.en=Anyin
+anz.en=Anem
+aoa.en=Angolar
+aob.en=Abom
+aoc.en=Pemon
+aod.en=Andarum
+aoe.en=Angal Enen
+aof.en=Bragat
+aog.en=Angoram
+aoh.en=Arma
+aoi.en=Anindilyakwa
+aoj.en=Mufian
+aok.en=Arhö
+aol.en=Alor
+aom.en=Ömie
+aon.en=Bumbita Arapesh
+aor.en=Aore
+aos.en=Taikat
+aot.en=A'tong
+aox.en=Atorada
+aoz.en=Uab Meto
+apa.en=Apache languages
+apb.en=Sa'a
+apc.en=North Levantine Arabic
+apd.en=Sudanese Arabic
+ape.en=Bukiyip
+apg.en=Ampanang
+aph.en=Athpariya
+api.en=Apiaká
+apj.en=Jicarilla Apache
+apk.en=Kiowa Apache
+apl.en=Lipan Apache
+apm.en=Mescalero-Chiricahua Apache
+apn.en=Apinayé
+apo.en=Apalik
+app.en=Apma
+apq.en=A-Pucikwar
+apr.en=Arop-Lokep
+aps.en=Arop-Sissano
+apt.en=Apatani
+apu.en=Apurinã
+apv.en=Alapmunte
+apw.en=Western Apache
+apx.en=Aputai
+apy.en=Apalaí
+apz.en=Safeyoka
+aqa.en=Alacalufan languages
+aqc.en=Archi
+aqg.en=Arigidi
+aql.en=Algic languages
+aqm.en=Atohwaim
+aqn.en=Northern Alta
+aqp.en=Atakapa
+aqr.en=Arhâ
+arb.en=Standard Arabic
+arc.en=Official Aramaic (700-300 BCE)
+ard.en=Arabana
+are.en=Western Arrarnta
+arh.en=Arhuaco
+ari.en=Arikara
+arj.en=Arapaso
+ark.en=Arikapú
+arl.en=Arabela
+arn.en=Mapudungun
+aro.en=Araona
+arp.en=Arapaho
+arq.en=Algerian Arabic
+arr.en=Karo (Brazil)
+ars.en=Najdi Arabic
+art.en=Artificial languages
+aru.en=Aruá (Amazonas State)
+arv.en=Arbore
+arw.en=Arawak
+arx.en=Aruá (Rodonia State)
+ary.en=Moroccan Arabic
+arz.en=Egyptian Arabic
+asa.en=Asu (Tanzania)
+asb.en=Assiniboine
+asc.en=Casuarina Coast Asmat
+asd.en=Asas
+ase.en=American Sign Language
+asf.en=Australian Sign Language
+asg.en=Cishingini
+ash.en=Abishira
+asi.en=Buruwai
+asj.en=Nsari
+ask.en=Ashkun
+asl.en=Asilulu
+asn.en=Xingú Asuriní
+aso.en=Dano
+asp.en=Algerian Sign Language
+asq.en=Austrian Sign Language
+asr.en=Asuri
+ass.en=Ipulo
+ast.en=Asturian
+ast=Llingua Llïonesa
+asu.en=Tocantins Asurini
+asv.en=Asoa
+asw.en=Australian Aborigines Sign Language
+asx.en=Muratayak
+asy.en=Yaosakor Asmat
+asz.en=As
+ata.en=Pele-Ata
+atb.en=Zaiwa
+atc.en=Atsahuaca
+atd.en=Ata Manobo
+ate.en=Atemble
+atg.en=Ivbie North-Okpela-Arhe
+ath.en=Athapascan languages
+ati.en=Attié
+atj.en=Atikamekw
+atk.en=Ati
+atl.en=Mt. Iraya Agta
+atm.en=Ata
+atn.en=Ashtiani
+ato.en=Atong
+atp.en=Pudtol Atta
+atq.en=Aralle-Tabulahan
+atr.en=Waimiri-Atroari
+ats.en=Gros Ventre
+att.en=Pamplona Atta
+atu.en=Reel
+atv.en=Northern Altai
+atw.en=Atsugewi
+atx.en=Arutani
+aty.en=Aneityum
+atz.en=Arta
+aua.en=Asumboa
+aub.en=Alugu
+auc.en=Waorani
+aud.en=Anuta
+aue.en=.en=/Kx'au//'ein
+auf.en=Arauan languages
+aug.en=Aguna
+auh.en=Aushi
+aui.en=Anuki
+auj.en=Awjilah
+auk.en=Heyo
+aul.en=Aulua
+aum.en=Asu (Nigeria)
+aun.en=Molmo One
+auo.en=Auyokawa
+aup.en=Makayam
+auq.en=Anus
+aur.en=Aruek
+aus.en=Australian languages
+aut.en=Austral
+auu.en=Auye
+auw.en=Awyi
+aux.en=Aurá
+auy.en=Awiyaana
+auz.en=Uzbeki Arabic
+avb.en=Avau
+avd.en=Alviri-Vidari
+avi.en=Avikam
+avk.en=Kotava
+avl.en=Eastern Egyptian Bedawi Arabic
+avn.en=Avatime
+avo.en=Agavotaguerra
+avs.en=Aushiri
+avt.en=Au
+avu.en=Avokaya
+avv.en=Avá-Canoeiro
+awa.en=Awadhi
+awb.en=Awa (Papua New Guinea)
+awc=Cicipu
+awc.en=Cicipu
+awd.en=Arawakan languages
+awe.en=Awetí
+awh.en=Awbono
+awi.en=Aekyom
+awk.en=Awabakal
+awm.en=Arawum
+awn.en=Awngi
+awo.en=Awak
+awr.en=Awera
+aws.en=South Awyu
+awt.en=Araweté
+awu.en=Central Awyu
+awv.en=Jair Awyu
+aww.en=Awun
+awx.en=Awara
+awy.en=Edera Awyu
+axb.en=Abipon
+axg.en=Mato Grosso Arára
+axk.en=Yaka (Central African Republic)
+axm.en=Middle Armenian
+axx.en=Xaragure
+aya.en=Awar
+ayb.en=Ayizo Gbe
+ayc.en=Southern Aymara
+ayd.en=Ayabadhu
+aye.en=Ayere
+ayg.en=Ginyanga
+ayh.en=Hadrami Arabic
+ayi.en=Leyigha
+ayk.en=Akuku
+ayl.en=Libyan Arabic
+ayn.en=Sanaani Arabic
+ayo.en=Ayoreo
+ayp.en=North Mesopotamian Arabic
+ayq.en=Ayi (Papua New Guinea)
+ayr.en=Central Aymara
+ays.en=Sorsogon Ayta
+ayt.en=Bataan Ayta
+ayu.en=Ayu
+ayx.en=Ayi (China)
+ayy.en=Tayabas Ayta
+ayz.en=Mai Brat
+aza.en=Azha
+azb-Arab=�зәрбајҹан
+azb=Azərbaycan / �зәрбајҹан / آذربایجان
+azb-Cyrl=آذربایجان
+azb.en=South Azerbaijani
+azb-Latn=Azərbaycan
+azc.en=Uto-Aztecan languages
+azg.en=San Pedro Amuzgos Amuzgo
+azj-Arab=�зәрбајҹан
+azj=Azərbaycan / �зәрбајҹан / آذربایجان
+azj-Cyrl=آذربایجان
+azj.en=North Azerbaijani
+azj-Latn=Azərbaycan
+azm.en=Ipalapa Amuzgo
+azo.en=Awing
+azt.en=Faire Atta
+azz.en=Highland Puebla Nahuatl
+baa.en=Babatana
+bab.en=Bainouk-Gunyuño
+bac.en=Badui
+bad.en=Banda languages
+bae.en=Baré
+baf.en=Nubaca
+bag.en=Tuki
+bah.en=Bahamas Creole English
+bai.en=Bamileke languages
+baj.en=Barakai
+bal.en=Baluchi
+ban.en=Balinese
+bao.en=Waimaha
+bap.en=Bantawa
+bar=Bairisch
+bar.en=Bavarian
+bas.en=Basa (Cameroon)
+bat.en=Baltic languages
+bau.en=Bada (Nigeria)
+bav.en=Vengo
+baw.en=Bambili-Bambui
+bax.en=Bamun
+bay.en=Batuley
+baz.en=Tunen
+bba.en=Baatonum
+bbb.en=Barai
+bbc.en=Batak Toba
+bbd.en=Bau
+bbe.en=Bangba
+bbf.en=Baibai
+bbg.en=Barama
+bbh.en=Bugan
+bbi.en=Barombi
+bbj.en=Ghomálá'
+bbk.en=Babanki
+bbl.en=Bats
+bbm.en=Babango
+bbn.en=Uneapa
+bbo.en=Northern Bobo Madaré
+bbp.en=West Central Banda
+bbq.en=Bamali
+bbr.en=Girawa
+bbs.en=Bakpinka
+bbt.en=Mburku
+bbu.en=Kulung (Nigeria)
+bbv.en=Karnai
+bbw.en=Baba
+bbx.en=Bubia
+bby.en=Befang
+bbz.en=Babalia Creole Arabic
+bca.en=Central Bai
+bcb.en=Bainouk-Samik
+bcc.en=Southern Balochi
+bcd.en=North Babar
+bce.en=Bamenyam
+bcf.en=Bamu
+bcg.en=Baga Binari
+bch.en=Bariai
+bci.en=Baoulé
+bcj.en=Bardi
+bck.en=Bunaba
+bcl.en=Central Bicolano
+bcm.en=Bannoni
+bcn.en=Bali (Nigeria)
+bco.en=Kaluli
+bcp.en=Bali (Democratic Republic of Congo)
+bcq.en=Bench
+bcr.en=Babine
+bcs.en=Kohumono
+bct.en=Bendi
+bcu.en=Awad Bing
+bcv.en=Shoo-Minda-Nye
+bcw.en=Bana
+bcy.en=Bacama
+bcz.en=Bainouk-Gunyaamolo
+bda.en=Bayot
+bdb.en=Basap
+bdc.en=Emberá-Baudó
+bdd.en=Bunama
+bde.en=Bade
+bdg.en=Bonggi
+bdh.en=Baka (Sudan)
+bdi.en=Burun
+bdj.en=Bai
+bdk.en=Budukh
+bdl.en=Indonesian Bajau
+bdm.en=Buduma
+bdn.en=Baldemu
+bdo.en=Morom
+bdp.en=Bende
+bdq.en=Bahnar
+bdr.en=West Coast Bajau
+bds.en=Burunge
+bdt.en=Bokoto
+bdu.en=Oroko
+bdv.en=Bodo Parja
+bdw.en=Baham
+bdx.en=Budong-Budong
+bdy.en=Bandjalang
+bdz.en=Badeshi
+bea.en=Beaver
+beb.en=Bebele
+bec.en=Iceve-Maci
+bed.en=Bedoanas
+bee.en=Byangsi
+bef.en=Benabena
+beg.en=Belait
+beh.en=Biali
+bei.en=Bekati'
+bej.en=Beja
+bek.en=Bebeli
+bem.en=Bemba (Zambia)
+beo.en=Beami
+bep.en=Besoa
+beq.en=Beembe
+ber.en=Berber languages
+bes.en=Besme
+bet.en=Guiberoua Béte
+beu.en=Blagar
+bev.en=Daloa Bété
+bew.en=Betawi
+bex.en=Jur Modo
+bey.en=Beli (Papua New Guinea)
+bez.en=Bena (Tanzania)
+bfa.en=Bari
+bfb.en=Pauri Bareli
+bfc.en=Northern Bai
+bfd.en=Bafut
+bfe.en=Betaf
+bff.en=Bofi
+bfg.en=Busang Kayan
+bfh.en=Blafe
+bfi.en=British Sign Language
+bfj.en=Bafanji
+bfk.en=Ban Khor Sign Language
+bfl.en=Banda-Ndélé
+bfm.en=Mmen
+bfn.en=Bunak
+bfo.en=Malba Birifor
+bfp.en=Beba
+bfq.en=Badaga
+bfr.en=Bazigar
+bfs.en=Southern Bai
+bft.en=Balti
+bfu.en=Gahri
+bfw.en=Bondo
+bfy.en=Bagheli
+bfz.en=Mahasu Pahari
+bga.en=Gwamhi-Wuri
+bgb.en=Bobongko
+bgc.en=Haryanvi
+bgd.en=Rathwi Bareli
+bge.en=Bauria
+bgf.en=Bangandu
+bgg.en=Bugun
+bgi.en=Giangan
+bgj.en=Bangolan
+bgk.en=Bit
+bgl.en=Bo (Laos)
+bgm.en=Baga Mboteni
+bgn.en=Western Balochi
+bgo.en=Baga Koga
+bgp.en=Eastern Balochi
+bgq.en=Bagri
+bgr.en=Bawm Chin
+bgs.en=Tagabawa
+bgt.en=Bughotu
+bgu.en=Mbongno
+bgv.en=Warkay-Bipim
+bgw.en=Bhatri
+bgx.en=Balkan Gagauz Turkish
+bgy.en=Benggoi
+bgz.en=Banggai
+bha.en=Bharia
+bhb.en=Bhili
+bhc.en=Biga
+bhd.en=Bhadrawahi
+bhe.en=Bhaya
+bhf.en=Odiai
+bhg.en=Binandere
+bhh.en=Bukharic
+bhi.en=Bhilali
+bhj.en=Bahing
+bhk.en=Albay Bicolano
+bhl.en=Bimin
+bhm.en=Bathari
+bhn.en=Bohtan Neo-Aramaic
+bho.en=Bhojpuri
+bhp.en=Bima
+bhq.en=Tukang Besi South
+bhr.en=Bara Malagasy
+bhs.en=Buwal
+bht.en=Bhattiyali
+bhu.en=Bhunjia
+bhv.en=Bahau
+bhw.en=Biak
+bhx.en=Bhalay
+bhy.en=Bhele
+bhz.en=Bada (Indonesia)
+bia.en=Badimaya
+bib.en=Bissa
+bic.en=Bikaru
+bid.en=Bidiyo
+bie.en=Bepour
+bif.en=Biafada
+big.en=Biangai
+bij.en=Vaghat-Ya-Bijim-Legeri
+bik.en=Bikol
+bil.en=Bile
+bim.en=Bimoba
+bin.en=Bini
+bio.en=Nai
+bip.en=Bila
+biq.en=Bipi
+bir.en=Bisorio
+bit.en=Berinomo
+biu.en=Biete
+biv.en=Southern Birifor
+biw.en=Kol (Cameroon)
+bix.en=Bijori
+biy.en=Birhor
+biz.en=Baloi
+bja.en=Budza
+bjb.en=Banggarla
+bjc.en=Bariji
+bjd.en=Bandjigali
+bje.en=Biao-Jiao Mien
+bjf.en=Barzani Jewish Neo-Aramaic
+bjg.en=Bidyogo
+bjh.en=Bahinemo
+bji.en=Burji
+bjj.en=Kanauji
+bjk.en=Barok
+bjl.en=Bulu (Papua New Guinea)
+bjm.en=Bajelani
+bjn.en=Banjar
+bjo.en=Mid-Southern Banda
+bjq.en=Southern Betsimisaraka Malagasy
+bjr.en=Binumarien
+bjs.en=Bajan
+bjt.en=Balanta-Ganja
+bju.en=Busuu
+bjv.en=Bedjond
+bjw.en=Bakwé
+bjx.en=Banao Itneg
+bjy.en=Bayali
+bjz.en=Baruga
+bka.en=Kyak
+bkb.en=Finallig
+bkc.en=Baka (Cameroon)
+bkd.en=Binukid
+bkf.en=Beeke
+bkg.en=Buraka
+bkh.en=Bakoko
+bki.en=Baki
+bkj.en=Pande
+bkk.en=Brokskat
+bkl.en=Berik
+bkm.en=Kom (Cameroon)
+bkn.en=Bukitan
+bko.en=Kwa'
+bkp.en=Boko (Democratic Republic of Congo)
+bkq.en=Bakairí
+bkr.en=Bakumpai
+bks.en=Masbate Sorsogon
+bkt.en=Boloki
+bku.en=Buhid
+bkv.en=Bekwarra
+bkw.en=Bekwil
+bkx.en=Baikeno
+bky.en=Bokyi
+bkz.en=Bungku
+bla.en=Siksika
+blb.en=Bilua
+blc.en=Bella Coola
+bld.en=Bolango
+ble.en=Balanta-Kentohe
+blf.en=Buol
+blg.en=Balau
+blh.en=Kuwaa
+bli.en=Bolia
+blj.en=Bolongan
+blk.en=Pa'o Karen
+bll.en=Biloxi
+blm.en=Beli (Sudan)
+bln.en=Southern Catanduanes Bicolano
+blo.en=Anii
+blp.en=Blablanga
+blq.en=Baluan-Pam
+blr.en=Blang
+bls.en=Balaesang
+blt.en=Tai Dam
+blv.en=Bolo
+blw.en=Balangao
+blx.en=Mag-Indi Ayta
+bly.en=Notre
+blz.en=Balantak
+bma.en=Lame
+bmb.en=Bembe
+bmc.en=Biem
+bmd.en=Baga Manduri
+bme.en=Limassa
+bmf.en=Bom
+bmg.en=Bamwe
+bmh.en=Kein
+bmi.en=Bagirmi
+bmj.en=Bote-Majhi
+bmk.en=Ghayavi
+bml.en=Bomboli
+bmm.en=Northern Betsimisaraka Malagasy
+bmn.en=Bina (Papua New Guinea)
+bmo.en=Bambalang
+bmp.en=Bulgebi
+bmq.en=Bomu
+bmr.en=Muinane
+bms.en=Bilma Kanuri
+bmt.en=Biao Mon
+bmu.en=Burum-Mindik
+bmv.en=Bum
+bmw.en=Bomwali
+bmx.en=Baimak
+bmy.en=Bemba (Democratic Republic of Congo)
+bmz.en=Baramu
+bna.en=Bonerate
+bnb.en=Bookan
+bnc.en=Central Bontoc
+bnd.en=Banda (Indonesia)
+bne.en=Bintauna
+bnf.en=Masiwang
+bng.en=Benga
+bni.en=Bangi
+bnj.en=Eastern Tawbuid
+bnk.en=Bierebo
+bnl.en=Boon
+bnm.en=Batanga
+bnn.en=Bunun
+bno.en=Bantoanon
+bnp.en=Bola
+bnq.en=Bantik
+bnr.en=Butmas-Tur
+bns.en=Bundeli
+bnt.en=Bantu languages
+bnu.en=Bentong
+bnv.en=Bonerif
+bnw.en=Bisis
+bnx.en=Bangubangu
+bny.en=Bintulu
+bnz.en=Beezen
+boa.en=Bora
+bob.en=Aweer
+boe.en=Mundabli
+bof.en=Bolon
+bog.en=Bamako Sign Language
+boh.en=Boma
+boi.en=Barbareño
+boj.en=Anjam
+bok.en=Bonjo
+bol.en=Bole
+bom.en=Berom
+bon.en=Bine
+boo.en=Tiemacèwè Bozo
+bop.en=Bonkiman
+boq.en=Bogaya
+bor.en=Borôro
+bot.en=Bongo
+bou.en=Bondei
+bov.en=Tuwuli
+bow.en=Rema
+box.en=Buamu
+boy.en=Bodo (Central African Republic)
+boz.en=Tiéyaxo Bozo
+bpa.en=Dakaka
+bpb.en=Barbacoas
+bpd.en=Banda-Banda
+bpg.en=Bonggo
+bph.en=Botlikh
+bpi.en=Bagupi
+bpj.en=Binji
+bpk.en=Orowe
+bpl.en=Broome Pearling Lugger Pidgin
+bpm.en=Biyom
+bpn.en=Dzao Min
+bpo.en=Anasi
+bpp.en=Kaure
+bpq.en=Banda Malay
+bpr.en=Koronadal Blaan
+bps.en=Sarangani Blaan
+bpt.en=Barrow Point
+bpu.en=Bongu
+bpv.en=Bian Marind
+bpw.en=Bo (Papua New Guinea)
+bpx.en=Palya Bareli
+bpy.en=Bishnupriya
+bpz.en=Bilba
+bqa.en=Tchumbuli
+bqb.en=Bagusa
+bqc.en=Boko (Benin)
+bqd.en=Bung
+bqf.en=Baga Kaloum
+bqg.en=Bago-Kusuntu
+bqh.en=Baima
+bqi.en=Bakhtiari
+bqj.en=Bandial
+bqk.en=Banda-Mbrès
+bql.en=Bilakura
+bqm.en=Wumboko
+bqn.en=Bulgarian Sign Language
+bqo.en=Balo
+bqp.en=Busa
+bqq.en=Biritai
+bqr.en=Burusu
+bqs.en=Bosngun
+bqt.en=Bamukumbit
+bqu.en=Boguru
+bqv.en=Begbere-Ejar
+bqw.en=Buru (Nigeria)
+bqx.en=Baangi
+bqy.en=Bengkala Sign Language
+bqz.en=Bakaka
+bra.en=Braj
+brb.en=Lave
+brc.en=Berbice Creole Dutch
+brd.en=Baraamu
+brf.en=Bera
+brg.en=Baure
+brh.en=Brahui
+bri.en=Mokpwe
+brj.en=Bieria
+brk.en=Birked
+brl.en=Birwa
+brm.en=Barambu
+brn.en=Boruca
+bro.en=Brokkat
+brp.en=Barapasi
+brq.en=Breri
+brr.en=Birao
+brs.en=Baras
+brt.en=Bitare
+bru.en=Eastern Bru
+brv.en=Western Bru
+brw.en=Bellari
+brx.en=Bodo (India)
+bry.en=Burui
+brz.en=Bilbil
+bsa.en=Abinomn
+bsb.en=Brunei Bisaya
+bsc.en=Bassari
+bse.en=Wushi
+bsf.en=Bauchi
+bsg.en=Bashkardi
+bsh.en=Kati
+bsi.en=Bassossi
+bsj.en=Bangwinji
+bsk.en=Burushaski
+bsl.en=Basa-Gumna
+bsm.en=Busami
+bsn.en=Barasana-Eduria
+bso.en=Buso
+bsp.en=Baga Sitemu
+bsq.en=Bassa
+bsr.en=Bassa-Kontagora
+bss.en=Akoose
+bst.en=Basketo
+bsu.en=Bahonsuai
+bsv.en=Baga Sobané
+bsw.en=Baiso
+bsx.en=Yangkam
+bsy.en=Sabah Bisaya
+bta.en=Bata
+btb.en=Beti (Cameroon)
+btc.en=Bati (Cameroon)
+btd.en=Batak Dairi
+bte.en=Gamo-Ningi
+btf.en=Birgit
+btg.en=Gagnoa Bété
+bth.en=Biatah Bidayuh
+bti.en=Burate
+btj.en=Bacanese Malay
+btk.en=Batak languages
+btl.en=Bhatola
+btm.en=Batak Mandailing
+btn.en=Ratagnon
+bto.en=Iriga Bicolano
+btp.en=Budibud
+btq.en=Batek
+btr.en=Baetora
+bts.en=Batak Simalungun
+btt.en=Bete-Bendi
+btu.en=Batu
+btv.en=Bateri
+btw.en=Butuanon
+btx.en=Batak Karo
+bty.en=Bobot
+btz.en=Batak Alas-Kluet
+bua.en=Buriat
+bub.en=Bua
+buc.en=Bushi
+bud.en=Ntcham
+bue.en=Beothuk
+buf.en=Bushoong
+bug.en=Buginese
+buh.en=Younuo Bunu
+bui.en=Bongili
+buj.en=Basa-Gurmana
+buk.en=Bugawac
+bum.en=Bulu (Cameroon)
+bun.en=Sherbro
+buo.en=Terei
+bup.en=Busoa
+buq.en=Brem
+bus.en=Bokobaru
+but.en=Bungain
+buu.en=Budu
+buv.en=Bun
+buw.en=Bubi
+bux.en=Boghom
+buy.en=Bullom So
+buz.en=Bukwen
+bva.en=Barein
+bvb.en=Bube
+bvc.en=Baelelea
+bvd.en=Baeggu
+bve.en=Berau Malay
+bvf.en=Boor
+bvg.en=Bonkeng
+bvh.en=Bure
+bvi.en=Belanda Viri
+bvj.en=Baan
+bvk.en=Bukat
+bvl.en=Bolivian Sign Language
+bvm.en=Bamunka
+bvn.en=Buna
+bvo.en=Bolgo
+bvq.en=Birri
+bvr.en=Burarra
+bvt.en=Bati (Indonesia)
+bvu.en=Bukit Malay
+bvv.en=Baniva
+bvw.en=Boga
+bvx.en=Dibole
+bvz.en=Bauzi
+bwa.en=Bwatoo
+bwb.en=Namosi-Naitasiri-Serua
+bwc.en=Bwile
+bwd.en=Bwaidoka
+bwe.en=Bwe Karen
+bwf.en=Boselewa
+bwg.en=Barwe
+bwh.en=Bishuo
+bwi.en=Baniwa
+bwj.en=Láá Láá Bwamu
+bwk.en=Bauwaki
+bwl.en=Bwela
+bwm.en=Biwat
+bwn.en=Wunai Bunu
+bwo.en=Boro (Ethiopia)
+bwp.en=Mandobo Bawah
+bwq.en=Southern Bobo Madaré
+bwr.en=Bura-Pabir
+bws.en=Bomboma
+bwt.en=Bafaw-Balong
+bwu.en=Buli (Ghana)
+bww.en=Bwa
+bwx.en=Bu-Nao Bunu
+bwy.en=Cwi Bwamu
+bwz.en=Bwisi
+bxa.en=Bauro
+bxb.en=Belanda Bor
+bxc.en=Molengue
+bxd.en=Pela
+bxe.en=Birale
+bxf.en=Bilur
+bxg.en=Bangala
+bxh.en=Buhutu
+bxi.en=Pirlatapa
+bxj.en=Bayungu
+bxk.en=Bukusu
+bxl.en=Jalkunan
+bxm.en=Mongolia Buriat
+bxn.en=Burduna
+bxo.en=Barikanchi
+bxp.en=Bebil
+bxq.en=Beele
+bxr.en=Russia Buriat
+bxs.en=Busam
+bxu.en=China Buriat
+bxv.en=Berakou
+bxw.en=Bankagooma
+bxx.en=Borna (Democratic Republic of Congo)
+bxz.en=Binahari
+bya.en=Batak
+byb.en=Bikya
+byc.en=Ubaghara
+byd.en=Benyadu'
+bye.en=Pouye
+byf.en=Bete
+byg.en=Baygo
+byh.en=Bujhyal
+byi.en=Buyu
+byj.en=Bina (Nigeria)
+byk.en=Biao
+byl.en=Bayono
+bym.en=Bidyara
+byn.en=Bilin
+byo.en=Biyo
+byp.en=Bumaji
+byq.en=Basay
+byr.en=Baruya
+bys.en=Burak
+byt.en=Berti
+byv.en=Medumba
+byw.en=Belhariya
+byx.en=Qaqet
+byy.en=Buya
+byz.en=Banaro
+bza.en=Bandi
+bzb.en=Andio
+bzd.en=Bribri
+bze.en=Jenaama Bozo
+bzf.en=Boikin
+bzg.en=Babuza
+bzh.en=Mapos Buang
+bzi.en=Bisu
+bzj.en=Belize Kriol English
+bzk.en=Nicaragua Creole English
+bzl.en=Boano (Sulawesi)
+bzm.en=Bolondo
+bzn.en=Boano (Maluku)
+bzo.en=Bozaba
+bzp.en=Kemberano
+bzq.en=Buli (Indonesia)
+bzr.en=Biri
+bzs.en=Brazilian Sign Language
+bzt.en=Brithenig
+bzu.en=Burmeso
+bzv.en=Bebe
+bzw.en=Basa (Nigeria)
+bzx.en=Hainyaxo Bozo
+bzy.en=Obanliku
+bzz.en=Evant
+caa.en=Chortí
+cab.en=Garifuna
+cac.en=Chuj
+cad.en=Caddo
+cae.en=Lehar
+caf.en=Southern Carrier
+cag.en=Nivaclé
+cah.en=Cahuarano
+cai.en=Central American Indian languages
+caj.en=Chané
+cak.en=Kaqchikel
+cal.en=Carolinian
+cam.en=Cemuhî
+can.en=Chambri
+cao.en=Chácobo
+cap.en=Chipaya
+caq.en=Car Nicobarese
+car.en=Galibi Carib
+cas.en=Tsimané
+cau.en=Caucasian languages
+cav.en=Cavineña
+caw.en=Callawalla
+cax.en=Chiquitano
+cay.en=Cayuga
+caz.en=Canichana
+cba.en=Chibchan languages
+cbb.en=Cabiyarí
+cbc.en=Carapana
+cbd.en=Carijona
+cbe.en=Chipiajes
+cbg.en=Chimila
+cbh.en=Cagua
+cbi.en=Chachi
+cbj.en=Ede Cabe
+cbk.en=Chavacano
+cbl.en=Bualkhaw Chin
+cbn.en=Nyahkur
+cbo.en=Izora
+cbr.en=Cashibo-Cacataibo
+cbs.en=Cashinahua
+cbt.en=Chayahuita
+cbu.en=Candoshi-Shapra
+cbv.en=Cacua
+cby.en=Carabayo
+cca.en=Cauca
+ccc.en=Chamicuro
+ccd.en=Cafundo Creole
+cce.en=Chopi
+ccg.en=Samba Daka
+cch.en=Atsam
+ccj.en=Kasanga
+ccl.en=Cutchi-Swahili
+ccm.en=Malaccan Creole Malay
+ccn.en=North Caucasian languages
+cco.en=Comaltepec Chinantec
+ccp.en=Chakma
+ccq.en=Chaungtha
+ccr.en=Cacaopera
+ccs.en=South Caucasian languages
+cda.en=Choni
+cdc.en=Chadic languages
+cdd.en=Caddoan languages
+cde.en=Chenchu
+cdf.en=Chiru
+cdg.en=Chamari
+cdh.en=Chambeali
+cdi.en=Chodri
+cdj.en=Churahi
+cdm.en=Chepang
+cdn.en=Chaudangsi
+cdo.en=Min Dong Chinese
+cdr.en=Cinda-Regi-Tiyal
+cds.en=Chadian Sign Language
+cdy.en=Chadong
+cdz.en=Koda
+cea.en=Lower Chehalis
+ceb.en=Cebuano
+ceb=Sinugboanon
+ceg.en=Chamacoco
+cel.en=Celtic languages
+cen.en=Cen
+cet.en=Centúúm
+cfa.en=Dijim-Bwilim
+cfd.en=Cara
+cfg.en=Como Karim
+cfm.en=Falam Chin
+cga.en=Changriwa
+cgc.en=Kagayanen
+cgg.en=Chiga
+cgk.en=Chocangacakha
+chb.en=Chibcha
+chc.en=Catawba
+chd.en=Highland Oaxaca Chontal
+chf.en=Tabasco Chontal
+chg.en=Chagatai
+chh.en=Chinook
+chj.en=Ojitlán Chinantec
+chk.en=Chuukese
+chl.en=Cahuilla
+chm.en=Mari (Russia)
+chn.en=Chinook jargon
+cho.en=Choctaw
+chp.en=Chipewyan
+chq.en=Quiotepec Chinantec
+chr=�ᎳᎩ
+chr.en=Cherokee
+cht.en=Cholón
+chw.en=Chuwabu
+chx.en=Chantyal
+chy.en=Cheyenne
+chz.en=Ozumacín Chinantec
+cia.en=Cia-Cia
+cib.en=Ci Gbe
+cic.en=Chickasaw
+cid.en=Chimariko
+cie.en=Cineni
+cih.en=Chinali
+cik.en=Chitkuli Kinnauri
+cim.en=Cimbrian
+cin.en=Cinta Larga
+cip.en=Chiapanec
+cir.en=Tiri
+ciw.en=Chippewa
+ciy.en=Chaima
+cja.en=Western Cham
+cje.en=Chru
+cjh.en=Upper Chehalis
+cji.en=Chamalal
+cjk.en=Chokwe
+cjm.en=Eastern Cham
+cjn.en=Chenapian
+cjo.en=Ashéninka Pajonal
+cjp.en=Cabécar
+cjr.en=Chorotega
+cjs.en=Shor
+cjv.en=Chuave
+cjy.en=Jinyu Chinese
+cka.en=Khumi Awa Chin
+ckb.en=Central Kurdish
+ckh.en=Chak
+ckl.en=Cibak
+cko.en=Anufo
+ckq.en=Kajakse
+ckr.en=Kairak
+cks.en=Tayo
+ckt.en=Chukot
+cku.en=Koasati
+ckv.en=Kavalan
+ckx.en=Caka
+cky.en=Cakfem-Mushere
+ckz.en=Cakchiquel-Quiché Mixed Language
+cla.en=Ron
+clc.en=Chilcotin
+cld.en=Chaldean Neo-Aramaic
+cle.en=Lealao Chinantec
+clh.en=Chilisso
+cli.en=Chakali
+clk.en=Idu-Mishmi
+cll.en=Chala
+clm.en=Clallam
+clo.en=Lowland Oaxaca Chontal
+clu.en=Caluyanun
+clw.en=Chulym
+cly.en=Eastern Highland Chatino
+cma.en=Maa
+cmc.en=Chamic languages
+cme.en=Cerma
+cmg.en=Classical Mongolian
+cmi.en=Emberá-Chamí
+cmk.en=Chimakum
+cml.en=Campalagian
+cmm.en=Michigamea
+cmn.en=Mandarin Chinese
+cmo.en=Central Mnong
+cmr.en=Mro Chin
+cms.en=Messapic
+cmt.en=Camtho
+cna.en=Changthang
+cnb.en=Chinbon Chin
+cnc.en=Côông
+cng.en=Northern Qiang
+cnh.en=Haka Chin
+cni.en=Asháninka
+cnk.en=Khumi Chin
+cnl.en=Lalana Chinantec
+cno.en=Con
+cns.en=Central Asmat
+cnt.en=Tepetotutla Chinantec
+cnu.en=Chenoua
+cnw.en=Ngawn Chin
+cnx.en=Middle Cornish
+coa.en=Cocos Islands Malay
+cob.en=Chicomuceltec
+coc.en=Cocopa
+cod.en=Cocama-Cocamilla
+coe.en=Koreguaje
+cof.en=Colorado
+cog.en=Chong
+coh.en=Chonyi-Dzihana-Kauma
+coj.en=Cochimi
+cok.en=Santa Teresa Cora
+col.en=Columbia-Wenatchi
+com.en=Comanche
+con.en=Cofán
+coo.en=Comox
+cop=Ⲙⲉⲧⲣⲉⲙ̀ⲛⲭ�ⲙⲓ
+cop.en=Coptic
+coq.en=Coquille
+cot.en=Caquinte
+cou.en=Wamey
+cov.en=Cao Miao
+cow.en=Cowlitz
+cox.en=Nanti
+coy.en=Coyaima
+coz.en=Chochotec
+cpa.en=Palantla Chinantec
+cpb.en=Ucayali-Yurúa Ashéninka
+cpc.en=Ajyíninka Apurucayali
+cpe.en=English-based creoles and pidgins
+cpf.en=French-based creoles and pidgins
+cpg.en=Cappadocian Greek
+cpi.en=Chinese Pidgin English
+cpn.en=Cherepon
+cpp.en=Portuguese-based creoles and pidgins
+cps.en=Capiznon
+cpu.en=Pichis Ashéninka
+cpx.en=Pu-Xian Chinese
+cpy.en=South Ucayali Ashéninka
+cqd.en=Chuanqiandian Cluster Miao
+cqu.en=Chilean Quechua
+cra.en=Chara
+crb.en=Island Carib
+crc.en=Lonwolwol
+crd.en=Coeur d'Alene
+crf.en=Caramanta
+crg.en=Michif
+crh.en=Crimean Tatar
+cri.en=Sãotomense
+crj.en=Southern East Cree
+crk.en=Plains Cree
+crl.en=Northern East Cree
+crm.en=Moose Cree
+crn.en=El Nayar Cora
+cro.en=Crow
+crp.en=Creoles and pidgins
+crq.en=Iyo'wujwa Chorote
+crr.en=Carolina Algonquian
+crs.en=Seselwa Creole French
+crt.en=Iyojwa'ja Chorote
+crv.en=Chaura
+crw.en=Chrau
+crx.en=Carrier
+cry.en=Cori
+crz.en=Cruzeño
+csa.en=Chiltepec Chinantec
+csb.en=Kashubian
+csc.en=Catalan Sign Language
+csd.en=Chiangmai Sign Language
+cse.en=Czech Sign Language
+csf.en=Cuba Sign Language
+csg.en=Chilean Sign Language
+csh.en=Asho Chin
+csi.en=Coast Miwok
+csk.en=Jola-Kasa
+csl.en=Chinese Sign Language
+csm.en=Central Sierra Miwok
+csn.en=Colombian Sign Language
+cso.en=Sochiapam Chinantec
+csq.en=Croatia Sign Language
+csr.en=Costa Rican Sign Language
+css.en=Southern Ohlone
+cst.en=Northern Ohlone
+csu.en=Central Sudanic languages
+csw.en=Swampy Cree
+csy.en=Siyin Chin
+csz.en=Coos
+cta.en=Tataltepec Chatino
+ctc.en=Chetco
+ctd.en=Tedim Chin
+cte.en=Tepinapa Chinantec
+ctg.en=Chittagonian
+ctl.en=Tlacoatzintepec Chinantec
+ctm.en=Chitimacha
+ctn.en=Chhintange
+cto.en=Emberá-Catío
+ctp.en=Western Highland Chatino
+cts.en=Northern Catanduanes Bicolano
+ctt.en=Wayanad Chetti
+ctu=Ch'ol
+ctu.en=Chol
+ctz.en=Zacatepec Chatino
+cua.en=Cua
+cub.en=Cubeo
+cuc.en=Usila Chinantec
+cug.en=Cung
+cuh.en=Chuka
+cui.en=Cuiba
+cuj.en=Mashco Piro
+cuk.en=San Blas Kuna
+cul.en=Culina
+cum.en=Cumeral
+cuo.en=Cumanagoto
+cup.en=Cupeño
+cuq.en=Cun
+cur.en=Chhulung
+cus.en=Cushitic languages
+cut.en=Teutila Cuicatec
+cuu.en=Tai Ya
+cuv.en=Cuvok
+cuw.en=Chukwa
+cux.en=Tepeuxila Cuicatec
+cvg.en=Chug
+cvn.en=Valle Nacional Chinantec
+cwa.en=Kabwa
+cwb.en=Maindo
+cwd.en=Woods Cree
+cwe.en=Kwere
+cwg.en=Chewong
+cwt.en=Kuwaataay
+cya.en=Nopala Chatino
+cyb.en=Cayubaba
+cyo.en=Cuyonon
+czh.en=Huizhou Chinese
+czk.en=Knaanic
+czn.en=Zenzontepec Chatino
+czo.en=Min Zhong Chinese
+czt.en=Zotung Chin
+daa.en=Dangaléat
+dac.en=Dambi
+dad.en=Marik
+dae.en=Duupa
+daf.en=Dan
+dag.en=Dagbani
+dah.en=Gwahatike
+dai.en=Day
+daj.en=Dar Fur Daju
+dak.en=Dakota
+dal.en=Dahalo
+dam.en=Damakawa
+dao.en=Daai Chin
+dap.en=Nisi (India)
+daq.en=Dandami Maria
+dar.en=Dargwa
+das.en=Daho-Doo
+dau.en=Dar Sila Daju
+dav.en=Taita
+daw.en=Davawenyo
+dax.en=Dayi
+day.en=Land Dayak languages
+daz.en=Dao
+dba.en=Bangi Me
+dbb.en=Deno
+dbd.en=Dadiya
+dbe.en=Dabe
+dbf.en=Edopi
+dbg.en=Dogul Dom Dogon
+dbi.en=Doka
+dbj.en=Ida'an
+dbl.en=Dyirbal
+dbm.en=Duguri
+dbn.en=Duriankere
+dbo.en=Dulbu
+dbp.en=Duwai
+dbq.en=Daba
+dbr.en=Dabarre
+dbu.en=Bondum Dom Dogon
+dbv.en=Dungu
+dby.en=Dibiyaso
+dcc.en=Deccan
+dcr.en=Negerhollands
+ddd.en=Dongotono
+dde.en=Doondo
+ddg.en=Fataluku
+ddi.en=Diodio
+ddj.en=Jaru
+ddn.en=Dendi (Benin)
+ddo.en=Dido
+dds.en=Donno So Dogon
+ddw.en=Dawera-Daweloor
+dec.en=Dagik
+ded.en=Dedua
+dee.en=Dewoin
+def.en=Dezfuli
+deg.en=Degema
+deh.en=Dehwari
+dei.en=Demisa
+dek.en=Dek
+del.en=Delaware
+dem.en=Dem
+den.en=Slave (Athapascan)
+dep.en=Pidgin Delaware
+deq.en=Dendi (Central African Republic)
+der.en=Deori
+des.en=Desano
+dev.en=Domung
+dez.en=Dengese
+dga.en=Southern Dagaare
+dgb.en=Bunoge Dogon
+dgc.en=Casiguran Dumagat Agta
+dgd.en=Dagaari Dioula
+dge.en=Degenan
+dgg.en=Doga
+dgh.en=Dghwede
+dgi.en=Northern Dagara
+dgk.en=Dagba
+dgn.en=Dagoman
+dgo.en=Dogri (individual language)
+dgr.en=Dogrib
+dgs.en=Dogoso
+dgu.en=Degaru
+dgx.en=Doghoro
+dgz.en=Daga
+dha.en=Dhanwar (India)
+dhd.en=Dhundari
+dhg.en=Dhangu
+dhi.en=Dhimal
+dhl.en=Dhalandji
+dhm.en=Zemba
+dhn.en=Dhanki
+dho.en=Dhodia
+dhr.en=Dhargari
+dhs.en=Dhaiso
+dhu.en=Dhurga
+dhv.en=Dehu
+dhw.en=Dhanwar (Nepal)
+dia.en=Dia
+dib.en=South Central Dinka
+dic.en=Lakota Dida
+did.en=Didinga
+dif.en=Dieri
+dig.en=Digo
+dih.en=Kumiai
+dii.en=Dimbong
+dij.en=Dai
+dik.en=Southwestern Dinka
+dil.en=Dilling
+dim.en=Dime
+din.en=Dinka
+dio.en=Dibo
+dip.en=Northeastern Dinka
+diq.en=Dimli (individual language)
+dir.en=Dirim
+dis.en=Dimasa
+dit.en=Dirari
+diu.en=Diriku
+diw.en=Northwestern Dinka
+dix.en=Dixon Reef
+diy.en=Diuwe
+diz.en=Ding
+djb.en=Djinba
+djc.en=Dar Daju Daju
+djd.en=Djamindjung
+dje.en=Zarma
+djf.en=Djangun
+dji.en=Djinang
+djj.en=Djeebbana
+djk.en=Aukan
+djl.en=Djiwarli
+djm.en=Jamsay Dogon
+djn.en=Djauan
+djo.en=Jangkang
+djr.en=Djambarrpuyngu
+dju.en=Kapriman
+djw.en=Djawi
+dka.en=Dakpakha
+dkk.en=Dakka
+dkl.en=Kolum So Dogon
+dkr.en=Kuijau
+dks.en=Southeastern Dinka
+dkx.en=Mazagway
+dlg.en=Dolgan
+dlm.en=Dalmatian
+dln.en=Darlong
+dma.en=Duma
+dmc.en=Dimir
+dme.en=Dugwor
+dmg.en=Upper Kinabatangan
+dmk.en=Domaaki
+dml.en=Dameli
+dmm.en=Dama
+dmn.en=Mande languages
+dmo.en=Kemezung
+dmr.en=East Damar
+dms.en=Dampelas
+dmu.en=Dubu
+dmv.en=Dumpas
+dmx.en=Dema
+dmy.en=Demta
+dna.en=Upper Grand Valley Dani
+dnd.en=Daonda
+dne.en=Ndendeule
+dng.en=Dungan
+dni.en=Lower Grand Valley Dani
+dnk.en=Dengka
+dnn.en=Dzùùngoo
+dnr.en=Danaru
+dnt.en=Mid Grand Valley Dani
+dnu.en=Danau
+dnw.en=Western Dani
+dny.en=Dení
+doa.en=Dom
+dob.en=Dobu
+doc.en=Northern Dong
+doe.en=Doe
+dof.en=Domu
+doh.en=Dong
+doi.en=Dogri (macrolanguage)
+dok.en=Dondo
+dol.en=Doso
+don.en=Toura (Papua New Guinea)
+doo.en=Dongo
+dop.en=Lukpa
+doq.en=Dominican Sign Language
+dor.en=Dori'o
+dos.en=Dogosé
+dot.en=Dass
+dov.en=Dombe
+dow.en=Doyayo
+dox.en=Bussa
+doy.en=Dompo
+doz.en=Dorze
+dpp.en=Papar
+dra.en=Dravidian languages
+drb.en=Dair
+drd.en=Darmiya
+dre.en=Dolpo
+drg.en=Rungus
+drh.en=Darkhat
+dri.en=C'lela
+drl.en=Darling
+drn.en=West Damar
+dro.en=Daro-Matu Melanau
+drq.en=Dura
+drr.en=Dororo
+drs.en=Gedeo
+drt.en=Drents
+dru.en=Rukai
+drw.en=Darwazi
+dry.en=Darai
+dsb.en=Lower Sorbian
+dse.en=Dutch Sign Language
+dsh.en=Daasanach
+dsi.en=Disa
+dsl.en=Danish Sign Language
+dsn.en=Dusner
+dso.en=Desiya
+dsq.en=Tadaksahak
+dta.en=Daur
+dtb.en=Labuk-Kinabatangan Kadazan
+dti.en=Ana Tinga Dogon
+dtk.en=Tene Kan Dogon
+dtm.en=Tomo Kan Dogon
+dtp.en=Central Dusun
+dtr.en=Lotud
+dts.en=Toro So Dogon
+dtt.en=Toro Tegu Dogon
+dtu.en=Tebul Ure Dogon
+dua.en=Duala
+dub.en=Dubli
+duc.en=Duna
+dud.en=Hun-Saare
+due.en=Umiray Dumaget Agta
+duf.en=Dumbea
+dug.en=Duruma
+duh.en=Dungra Bhil
+dui.en=Dumun
+duj.en=Dhuwal
+duk.en=Duduela
+dul.en=Alabat Island Agta
+dum.en=Middle Dutch (ca. 1050-1350)
+dun.en=Dusun Deyah
+duo.en=Dupaninan Agta
+dup.en=Duano
+duq.en=Dusun Malang
+dur.en=Dii
+dus.en=Dumi
+duu.en=Drung
+duv.en=Duvle
+duw.en=Dusun Witu
+dux.en=Duungooma
+duy.en=Dicamay Agta
+duz.en=Duli
+dva.en=Duau
+dwa.en=Diri
+dwl.en=Walo Kumbe Dogon
+dwr.en=Dawro
+dws.en=Dutton World Speedwords
+dww.en=Dawawa
+dya.en=Dyan
+dyb.en=Dyaberdyaber
+dyd.en=Dyugun
+dyg.en=Villa Viciosa Agta
+dyi.en=Djimini Senoufo
+dym.en=Yanda Dom Dogon
+dyn.en=Dyangadi
+dyo.en=Jola-Fonyi
+dyu.en=Dyula
+dyy.en=Dyaabugay
+dza.en=Tunzu
+dzd.en=Daza
+dzg.en=Dazaga
+dzl.en=Dzalakha
+dzn.en=Dzando
+ebg.en=Ebughu
+ebo.en=Teke-Ebo
+ebr.en=Ebrié
+ebu.en=Embu
+ecr.en=Eteocretan
+ecs.en=Ecuadorian Sign Language
+ecy.en=Eteocypriot
+eee.en=E
+efa.en=Efai
+efe.en=Efe
+efi.en=Efik
+ega.en=Ega
+egl.en=Emilian
+ego.en=Eggon
+egx.en=Egyptian languages
+egy.en=Egyptian (Ancient)
+ehu.en=Ehueun
+eip.en=Eipomek
+eit.en=Eitiep
+eiv.en=Askopan
+eja.en=Ejamat
+eka.en=Ekajuk
+eke.en=Ekit
+ekg.en=Ekari
+eki.en=Eki
+ekk.en=Standard Estonian
+ekl.en=Kol
+ekm.en=Elip
+eko.en=Koti
+ekp.en=Ekpeye
+ekr.en=Yace
+eky.en=Eastern Kayah
+ele.en=Elepi
+elh.en=El Hugeirat
+eli.en=Nding
+elk.en=Elkei
+elm.en=Eleme
+elo.en=El Molo
+elp.en=Elpaputih
+elu.en=Elu
+elx.en=Elamite
+ema.en=Emai-Iuleha-Ora
+emb.en=Embaloh
+eme.en=Emerillon
+emg.en=Eastern Meohang
+emi.en=Mussau-Emira
+emk.en=Eastern Maninkakan
+emm.en=Mamulique
+emn.en=Eman
+emo.en=Emok
+emp.en=Northern Emberá
+ems.en=Pacific Gulf Yupik
+emu.en=Eastern Muria
+emw.en=Emplawas
+emy.en=Epigraphic Mayan
+ena.en=Apali
+enb.en=Markweeta
+enc.en=En
+end.en=Ende
+enf.en=Forest Enets
+enh.en=Tundra Enets
+enm.en=Middle English (1100-1500)
+enn.en=Engenni
+eno.en=Enggano
+enq.en=Enga
+enr.en=Emumu
+enu.en=Enu
+env.en=Enwan (Edu State)
+enw.en=Enwan (Akwa Ibom State)
+eot.en=Beti (Côte d'Ivoire)
+epi.en=Epie
+era.en=Eravallan
+erg.en=Sie
+erh.en=Eruwa
+eri.en=Ogea
+erk.en=South Efate
+ero.en=Horpa
+err.en=Erre
+ers.en=Ersu
+ert.en=Eritai
+erw.en=Erokwanas
+ese.en=Ese Ejja
+esh.en=Eshtehardi
+esi.en=North Alaskan Inupiatun
+esk.en=Northwest Alaska Inupiatun
+esl.en=Egypt Sign Language
+esm.en=Esuma
+esn.en=Salvadoran Sign Language
+eso.en=Estonian Sign Language
+esq.en=Esselen
+ess.en=Central Siberian Yupik
+esu.en=Central Yupik
+esx.en=Eskimo-Aleut languages
+etb.en=Etebi
+etc.en=Etchemin
+eth.en=Ethiopian Sign Language
+etn.en=Eton (Vanuatu)
+eto.en=Eton (Cameroon)
+etr.en=Edolo
+ets.en=Yekhee
+ett.en=Etruscan
+etu.en=Ejagham
+etx.en=Eten
+etz.en=Semimi
+euq.en=Basque (family)
+eve.en=Even
+evh.en=Uvbie
+evn.en=Evenki
+ewo.en=Ewondo
+ext.en=Extremaduran
+eya.en=Eyak
+eyo.en=Keiyo
+eze.en=Uzekwe
+faa.en=Fasu
+fab.en=Fa D'ambu
+fad.en=Wagi
+faf.en=Fagani
+fag.en=Finongan
+fah.en=Baissa Fali
+fai.en=Faiwol
+faj.en=Faita
+fak.en=Fang (Cameroon)
+fal.en=South Fali
+fam.en=Fam
+fan.en=Fang (Equatorial Guinea)
+fap.en=Palor
+far.en=Fataleka
+fat.en=Fanti
+fau.en=Fayu
+fax.en=Fala
+fay.en=Southwestern Fars
+faz.en=Northwestern Fars
+fcs.en=Quebec Sign Language
+fer.en=Feroge
+ffi.en=Foia Foia
+ffm.en=Maasina Fulfulde
+fgr.en=Fongoro
+fia.en=Nobiin
+fie.en=Fyer
+fil.en=Filipino
+fip.en=Fipa
+fir.en=Firan
+fit.en=Tornedalen Finnish
+fiu.en=Finno-Ugrian languages
+fiw.en=Fiwaga
+fkv.en=Kven Finnish
+fla.en=Kalispel-Pend d'Oreille
+flh.en=Foau
+fli.en=Fali
+fll.en=North Fali
+fln.en=Flinders Island
+flr.en=Fuliiru
+fly.en=Tsotsitaal
+fmp.en=Fe'fe'
+fmu.en=Far Western Muria
+fng.en=Fanagalo
+fni.en=Fania
+fod.en=Foodo
+foi.en=Foi
+fom.en=Foma
+fon.en=Fon
+for.en=Fore
+fos.en=Siraya
+fox.en=Formosan languages
+fpe.en=Fernando Po Creole English
+fqs.en=Fas
+frc.en=Cajun French
+frd.en=Fordata
+frk.en=Frankish
+frm.en=Middle French (ca. 1400-1600)
+fro.en=Old French (842-ca. 1400)
+frp.en=Franco-Provençal
+frq.en=Forak
+frr.en=Northern Frisian
+frs.en=Eastern Frisian
+frt.en=Fortsenal
+fse.en=Finnish Sign Language
+fsl.en=French Sign Language
+fss.en=Finland-Swedish Sign Language
+fub.en=Adamawa Fulfulde
+fuc.en=Pulaar
+fud.en=East Futuna
+fue.en=Borgu Fulfulde
+fuf.en=Pular
+fuh.en=Western Niger Fulfulde
+fui.en=Bagirmi Fulfulde
+fuj.en=Ko
+fum.en=Fum
+fun.en=Fulniô
+fuq.en=Central-Eastern Niger Fulfulde
+fur.en=Friulian
+fut.en=Futuna-Aniwa
+fuu.en=Furu
+fuv.en=Nigerian Fulfulde
+fuy.en=Fuyug
+fvr.en=Fur
+fwa.en=Fwâi
+fwe.en=Fwe
+gaa.en=Ga
+gab.en=Gabri
+gad.en=Gaddang
+gae.en=Guarequena
+gaf.en=Gende
+gag.en=Gagauz
+gah.en=Alekano
+gai.en=Borei
+gaj.en=Gadsup
+gak.en=Gamkonora
+gal.en=Galoli
+gam.en=Kandawo
+gan.en=Gan Chinese
+gao.en=Gants
+gap.en=Gal
+gaq.en=Gata'
+gar.en=Galeya
+gas.en=Adiwasi Garasia
+gat.en=Kenati
+gau.en=Mudhili Gadaba
+gav.en=Gabutamon
+gaw.en=Nobonob
+gax.en=Borana-Arsi-Guji Oromo
+gay.en=Gayo
+gaz.en=West Central Oromo
+gba.en=Gbaya (Central African Republic)
+gbb.en=Kaytetye
+gbc.en=Garawa
+gbd.en=Karadjeri
+gbe.en=Niksek
+gbf.en=Gaikundi
+gbg.en=Gbanziri
+gbh.en=Defi Gbe
+gbi.en=Galela
+gbj.en=Bodo Gadaba
+gbk.en=Gaddi
+gbl.en=Gamit
+gbm.en=Garhwali
+gbn.en=Mo'da
+gbo.en=Northern Grebo
+gbp.en=Gbaya-Bossangoa
+gbq.en=Gbaya-Bozoum
+gbr.en=Gbagyi
+gbs.en=Gbesi Gbe
+gbu.en=Gagadu
+gbv.en=Gbanu
+gbx.en=Eastern Xwla Gbe
+gby.en=Gbari
+gbz.en=Zoroastrian Dari
+gcc.en=Mali
+gcd.en=Ganggalida
+gce.en=Galice
+gcf.en=Guadeloupean Creole French
+gcl.en=Grenadian Creole English
+gcn.en=Gaina
+gcr.en=Guianese Creole French
+gct.en=Colonia Tovar German
+gda.en=Gade Lohar
+gdb.en=Pottangi Ollar Gadaba
+gdc.en=Gugu Badhun
+gdd.en=Gedaged
+gde.en=Gude
+gdf.en=Guduf-Gava
+gdg.en=Ga'dang
+gdh.en=Gadjerawang
+gdi.en=Gundi
+gdj.en=Gurdjar
+gdk.en=Gadang
+gdl.en=Dirasha
+gdm.en=Laal
+gdn.en=Umanakaina
+gdo.en=Ghodoberi
+gdq.en=Mehri
+gdr.en=Wipi
+gdu.en=Gudu
+gdx.en=Godwari
+gea.en=Geruma
+geb.en=Kire
+gec.en=Gboloo Grebo
+ged.en=Gade
+geg.en=Gengle
+geh.en=Hutterite German
+gei.en=Gebe
+gej.en=Gen
+gek.en=Yiwom
+gel.en=Kag-Fer-Jiir-Koor-Ror-Us-Zuksun
+gem.en=Germanic languages
+geq.en=Geme
+ges.en=Geser-Gorom
+gew.en=Gera
+gex.en=Garre
+gey.en=Enya
+gez=�ዕ�
+gez.en=Geez
+gfk.en=Patpatar
+gft.en=Gafat
+gga.en=Gao
+ggb.en=Gbii
+ggd.en=Gugadj
+gge.en=Guragone
+ggg.en=Gurgula
+ggk.en=Kungarakany
+ggl.en=Ganglau
+ggn.en=Eastern Gurung
+ggo.en=Southern Gondi
+ggr.en=Aghu Tharnggalu
+ggt.en=Gitua
+ggu.en=Gagu
+ggw.en=Gogodala
+gha.en=Ghadamès
+ghc.en=Hiberno-Scottish Gaelic
+ghe.en=Southern Ghale
+ghh.en=Northern Ghale
+ghk.en=Geko Karen
+ghl.en=Ghulfan
+ghn.en=Ghanongga
+gho.en=Ghomara
+ghr.en=Ghera
+ghs.en=Guhu-Samane
+ght.en=Kutang Ghale
+gia.en=Kitja
+gib.en=Gibanawa
+gic.en=Gail
+gid.en=Gidar
+gig.en=Goaria
+gil.en=Gilbertese
+gim.en=Gimi (Eastern Highlands)
+gin.en=Hinukh
+gio.en=Gelao
+gip.en=Gimi (West New Britain)
+giq.en=Green Gelao
+gir.en=Red Gelao
+gis.en=North Giziga
+git.en=Gitxsan
+giw.en=White Gelao
+gix.en=Gilima
+giy.en=Giyug
+giz.en=South Giziga
+gji.en=Geji
+gjk.en=Kachi Koli
+gjn.en=Gonja
+gju.en=Gujari
+gka.en=Guya
+gke.en=Ndai
+gkn.en=Gokana
+gkp.en=Guinea Kpelle
+glc.en=Bon Gula
+gld.en=Nanai
+glh.en=Northwest Pashayi
+gli.en=Guliguli
+glj.en=Gula Iro
+glk.en=Gilaki
+glo.en=Galambu
+glr.en=Glaro-Twabo
+glu.en=Gula (Chad)
+glw.en=Glavda
+gly.en=Gule
+gma.en=Gambera
+gmb.en=Gula'alaa
+gmd.en=Mághdì
+gme.en=East Germanic languages
+gmh.en=Middle High German (ca. 1050-1500)
+gml.en=Middle Low German
+gmm.en=Gbaya-Mbodomo
+gmn.en=Gimnime
+gmq.en=North Germanic languages
+gmu.en=Gumalu
+gmv.en=Gamo
+gmw.en=West Germanic languages
+gmx.en=Magoma
+gmy.en=Mycenaean Greek
+gna.en=Kaansa
+gnb.en=Gangte
+gnc.en=Guanche
+gnd.en=Zulgo-Gemzek
+gne.en=Ganang
+gng.en=Ngangam
+gnh.en=Lere
+gni.en=Gooniyandi
+gnk.en=//Gana
+gnl.en=Gangulu
+gnm.en=Ginuman
+gnn.en=Gumatj
+gno.en=Northern Gondi
+gnq.en=Gana
+gnr.en=Gureng Gureng
+gnt.en=Guntai
+gnu.en=Gnau
+gnw.en=Western Bolivian Guaraní
+gnz.en=Ganzi
+goa.en=Guro
+gob.en=Playero
+goc.en=Gorakor
+god.en=Godié
+goe.en=Gongduk
+gof.en=Gofa
+gog.en=Gogo
+goh.en=Old High German (ca. 750-1050)
+goi.en=Gobasi
+goj.en=Gowlan
+gok.en=Gowli
+gol.en=Gola
+gom.en=Goan Konkani
+gon.en=Gondi
+goo.en=Gone Dau
+gop.en=Yeretuar
+goq.en=Gorap
+gor.en=Gorontalo
+gos.en=Gronings
+got=�������
+got.en=Gothic
+gou.en=Gavar
+gow.en=Gorowa
+gox.en=Gobu
+goy.en=Goundo
+goz.en=Gozarkhani
+gpa.en=Gupa-Abawa
+gpn.en=Taiap
+gqa.en=Ga'anda
+gqi.en=Guiqiong
+gqn.en=Guana (Brazil)
+gqr.en=Gor
+gra.en=Rajput Garasia
+grb.en=Grebo
+grc.en=Ancient Greek (to 1453)
+grc=Ἑλληνική
+grd.en=Guruntum-Mbaaru
+grg.en=Madi
+grh.en=Gbiri-Niragu
+gri.en=Ghari
+grj.en=Southern Grebo
+grk.en=Greek languages
+grm.en=Kota Marudu Talantang
+gro.en=Groma
+grq.en=Gorovu
+grr.en=Taznatit
+grs.en=Gresi
+grt.en=Garo
+gru.en=Kistane
+grv.en=Central Grebo
+grw.en=Gweda
+grx.en=Guriaso
+gry.en=Barclayville Grebo
+grz.en=Guramalum
+gse.en=Ghanaian Sign Language
+gsg.en=German Sign Language
+gsl.en=Gusilay
+gsm.en=Guatemalan Sign Language
+gsn.en=Gusan
+gso.en=Southwest Gbaya
+gsp.en=Wasembo
+gss.en=Greek Sign Language
+gsw.en=Swiss German
+gta.en=Guató
+gti.en=Gbati-ri
+gua.en=Shiki
+gub.en=Guajajára
+guc.en=Wayuu
+gud.en=Yocoboué Dida
+gue.en=Gurinji
+guf.en=Gupapuyngu
+gug.en=Paraguayan Guaraní
+guh.en=Guahibo
+gui.en=Eastern Bolivian Guaraní
+guk.en=Gumuz
+gul.en=Sea Island Creole English
+gum.en=Guambiano
+gun.en=Mbyá Guaraní
+guo.en=Guayabero
+gup.en=Gunwinggu
+guq.en=Aché
+gur.en=Farefare
+gus.en=Guinean Sign Language
+gut.en=Maléku Jaíka
+guu.en=Yanomamö
+guv.en=Gey
+guw.en=Gun
+gux.en=Gourmanchéma
+guz.en=Gusii
+gva.en=Guana (Paraguay)
+gvc.en=Guanano
+gve.en=Duwet
+gvf.en=Golin
+gvj.en=Guajá
+gvl.en=Gulay
+gvm.en=Gurmana
+gvn.en=Kuku-Yalanji
+gvo.en=Gavião Do Jiparaná
+gvp.en=Pará Gavião
+gvr.en=Western Gurung
+gvs.en=Gumawana
+gvy.en=Guyani
+gwa.en=Mbato
+gwb.en=Gwa
+gwc.en=Kalami
+gwd.en=Gawwada
+gwe.en=Gweno
+gwf.en=Gowro
+gwg.en=Moo
+gwi.en=Gwichʼin
+gwj.en=/Gwi
+gwn.en=Gwandara
+gwr.en=Gwere
+gwt.en=Gawar-Bati
+gwu.en=Guwamu
+gww.en=Kwini
+gwx.en=Gua
+gxx.en=Wè Southern
+gya.en=Northwest Gbaya
+gyb.en=Garus
+gyd.en=Kayardild
+gye.en=Gyem
+gyf.en=Gungabula
+gyg.en=Gbayi
+gyi.en=Gyele
+gyl.en=Gayil
+gym.en=Ngäbere
+gyn.en=Guyanese Creole English
+gyr.en=Guarayu
+gyy.en=Gunya
+gza.en=Ganza
+gzi.en=Gazi
+gzn.en=Gane
+haa.en=Han
+hab.en=Hanoi Sign Language
+hac.en=Gurani
+had.en=Hatam
+hae.en=Eastern Oromo
+haf.en=Haiphong Sign Language
+hag.en=Hanga
+hah.en=Hahon
+hai.en=Haida
+haj.en=Hajong
+hak.en=Hakka Chinese
+hal.en=Halang
+ham.en=Hewa
+han.en=Hangaza
+hao.en=Hakö
+hap.en=Hupla
+haq.en=Ha
+har.en=Harari
+has.en=Haisla
+hav.en=Havu
+haw.en=Hawaiian
+haw=ʻŌlelo Hawaiʻi
+hax.en=Southern Haida
+hay.en=Haya
+haz.en=Hazaragi
+hba.en=Hamba
+hbb.en=Huba
+hbn.en=Heiban
+hbo.en=Ancient Hebrew
+hbo=עברית מקר�ית
+hbu.en=Habu
+hca.en=Andaman Creole Hindi
+hch.en=Huichol
+hdn.en=Northern Haida
+hds.en=Honduras Sign Language
+hdy.en=Hadiyya
+hea.en=Northern Qiandong Miao
+hed.en=Herdé
+heg.en=Helong
+heh.en=Hehe
+hei.en=Heiltsuk
+hem.en=Hemba
+hgm.en=Hai//om
+hgw.en=Haigwai
+hhi.en=Hoia Hoia
+hhr.en=Kerak
+hhy.en=Hoyahoya
+hia.en=Lamang
+hib.en=Hibito
+hid.en=Hidatsa
+hif.en=Fiji Hindi
+hif=फ़िजि हिन�दी
+hig.en=Kamwe
+hih.en=Pamosu
+hii.en=Hinduri
+hij.en=Hijuk
+hik.en=Seit-Kaitetu
+hil.en=Hiligaynon
+him.en=Himachali languages
+hio.en=Tsoa
+hir.en=Himarimã
+hit.en=Hittite
+hiw.en=Hiw
+hix.en=Hixkaryána
+hji.en=Haji
+hka.en=Kahe
+hke.en=Hunde
+hkk.en=Hunjara-Kaina Ke
+hks.en=Hong Kong Sign Language
+hla.en=Halia
+hlb.en=Halbi
+hld.en=Halang Doan
+hle.en=Hlersu
+hlt.en=Nga La
+hlu.en=Hieroglyphic Luwian
+hma.en=Southern Mashan Hmong
+hmb.en=Humburi Senni Songhay
+hmc.en=Central Huishui Hmong
+hmd.en=Large Flowery Miao
+hme.en=Eastern Huishui Hmong
+hmf.en=Hmong Don
+hmg.en=Southwestern Guiyang Hmong
+hmh.en=Southwestern Huishui Hmong
+hmi.en=Northern Huishui Hmong
+hmj.en=Ge
+hmk.en=Maek
+hml.en=Luopohe Hmong
+hmm.en=Central Mashan Hmong
+hmn.en=Hmong
+hmp.en=Northern Mashan Hmong
+hmq.en=Eastern Qiandong Miao
+hmr.en=Hmar
+hms.en=Southern Qiandong Miao
+hmt.en=Hamtai
+hmu.en=Hamap
+hmv.en=Hmong Dô
+hmw.en=Western Mashan Hmong
+hmx.en=Hmong-Mien languages
+hmy.en=Southern Guiyang Hmong
+hmz.en=Hmong Shua
+hna.en=Mina (Cameroon)
+hnd.en=Southern Hindko
+hne.en=Chhattisgarhi
+hnh.en=//Ani
+hni.en=Hani
+hnj.en=Hmong Njua
+hnn.en=Hanunoo
+hno.en=Northern Hindko
+hns.en=Caribbean Hindustani
+hnu.en=Hung
+hoa.en=Hoava
+hob.en=Mari (Madang Province)
+hoc.en=Ho
+hod.en=Holma
+hoe.en=Horom
+hoh.en=Hobyót
+hoi.en=Holikachuk
+hoj.en=Hadothi
+hok.en=Hokan languages
+hol.en=Holu
+hom.en=Homa
+hoo.en=Holoholo
+hop.en=Hopi
+hor.en=Horo
+hos.en=Ho Chi Minh City Sign Language
+hot.en=Hote
+hov.en=Hovongan
+how.en=Honi
+hoy.en=Holiya
+hoz.en=Hozo
+hpo.en=Hpon
+hps.en=Hawai'i Pidgin Sign Language
+hra.en=Hrangkhol
+hre.en=Hre
+hrk.en=Haruku
+hrm.en=Horned Miao
+hro.en=Haroi
+hrr.en=Horuru
+hrt.en=Hértevin
+hru.en=Hruso
+hrx.en=Hunsrik
+hrz.en=Harzani
+hsb.en=Upper Sorbian
+hsh.en=Hungarian Sign Language
+hsl.en=Hausa Sign Language
+hsn.en=Xiang Chinese
+hss.en=Harsusi
+hti.en=Hoti
+hto.en=Minica Huitoto
+hts.en=Hadza
+htu.en=Hitu
+htx.en=Middle Hittite
+hub.en=Huambisa
+huc.en=.en=/Hua
+hud.en=Huaulu
+hue.en=San Francisco Del Mar Huave
+huf.en=Humene
+hug.en=Huachipaeri
+huh.en=Huilliche
+hui.en=Huli
+huj.en=Northern Guiyang Hmong
+huk.en=Hulung
+hul.en=Hula
+hum.en=Hungana
+huo.en=Hu
+hup.en=Hupa
+huq.en=Tsat
+hur.en=Halkomelem
+hus.en=Huastec
+hus=Tenek
+hut.en=Humla
+huu.en=Murui Huitoto
+huv.en=San Mateo Del Mar Huave
+huw.en=Hukumina
+hux.en=Nüpode Huitoto
+huy.en=Hulaulá
+huz.en=Hunzib
+hvc.en=Haitian Vodoun Culture Language
+hve.en=San Dionisio Del Mar Huave
+hvk.en=Haveke
+hvn.en=Sabu
+hvv.en=Santa María Del Mar Huave
+hwa.en=Wané
+hwc.en=Hawai'i Creole English
+hwo.en=Hwana
+hya.en=Hya
+hyx.en=Armenian (family)
+iai.en=Iaai
+ian.en=Iatmul
+iap.en=Iapama
+iar.en=Purari
+iba.en=Iban
+ibb.en=Ibibio
+ibd.en=Iwaidja
+ibe.en=Akpes
+ibg.en=Ibanag
+ibi.en=Ibilo
+ibl.en=Ibaloi
+ibm.en=Agoi
+ibn.en=Ibino
+ibr.en=Ibuoro
+ibu.en=Ibu
+iby.en=Ibani
+ica.en=Ede Ica
+ich.en=Etkywan
+icl.en=Icelandic Sign Language
+icr.en=Islander Creole English
+ida.en=Idakho-Isukha-Tiriki
+idb.en=Indo-Portuguese
+idc.en=Idon
+idd.en=Ede Idaca
+ide.en=Idere
+idi.en=Idi
+idr.en=Indri
+ids.en=Idesa
+idt.en=Idaté
+idu.en=Idoma
+ifa.en=Amganad Ifugao
+ifb.en=Batad Ifugao
+ife.en=Ifè
+iff.en=Ifo
+ifk.en=Tuwali Ifugao
+ifm.en=Teke-Fuumu
+ifu.en=Mayoyao Ifugao
+ify.en=Keley-I Kallahan
+igb.en=Ebira
+ige.en=Igede
+igg.en=Igana
+igl.en=Igala
+igm.en=Kanggape
+ign.en=Ignaciano
+igo.en=Isebe
+igs.en=Interglossa
+igw.en=Igwe
+ihb.en=Iha Based Pidgin
+ihi.en=Ihievbe
+ihp.en=Iha
+iir.en=Indo-Iranian languages
+ijc.en=Izon
+ije.en=Biseni
+ijj.en=Ede Ije
+ijn.en=Kalabari
+ijo.en=Ijo languages
+ijs.en=Southeast Ijo
+ike.en=Eastern Canadian Inuktitut
+iki.en=Iko
+ikk.en=Ika
+ikl.en=Ikulu
+iko.en=Olulumo-Ikom
+ikp.en=Ikpeshi
+ikt.en=Western Canadian Inuktitut
+ikv.en=Iku-Gora-Ankwa
+ikw.en=Ikwere
+ikx.en=Ik
+ikz.en=Ikizu
+ila.en=Ile Ape
+ilb.en=Ila
+ilg.en=Garig-Ilgar
+ili.en=Ili Turki
+ilk.en=Ilongot
+ill.en=Iranun
+ilo.en=Iloko
+ils.en=International Sign
+ilu.en=Ili'uun
+ilv.en=Ilue
+ilw.en=Talur
+ima.en=Mala Malasar
+ime.en=Imeraguen
+imi.en=Anamgura
+iml.en=Miluk
+imn.en=Imonda
+imo.en=Imbongu
+imr.en=Imroing
+ims.en=Marsian
+imy.en=Milyan
+inb.en=Inga
+inc.en=Indic languages
+ine.en=Indo-European languages
+ing.en=Degexit'an
+inh.en=Ingush
+inj.en=Jungle Inga
+inl.en=Indonesian Sign Language
+inm.en=Minaean
+inn.en=Isinai
+ino.en=Inoke-Yate
+inp.en=Iñapari
+ins.en=Indian Sign Language
+int.en=Intha
+inz.en=Ineseño
+ior.en=Inor
+iou.en=Tuma-Irumu
+iow.en=Iowa-Oto
+ipi.en=Ipili
+ipo.en=Ipiko
+iqu.en=Iquito
+ira.en=Iranian languages
+ire.en=Iresim
+irh.en=Irarutu
+iri.en=Irigwe
+irk.en=Iraqw
+irn.en=Irántxe
+iro.en=Iroquoian languages
+irr.en=Ir
+iru.en=Irula
+irx.en=Kamberau
+iry.en=Iraya
+isa.en=Isabi
+isc.en=Isconahua
+isd.en=Isnag
+ise.en=Italian Sign Language
+isg.en=Irish Sign Language
+ish.en=Esan
+isi.en=Nkem-Nkum
+ism.en=Masimasi
+isn.en=Isanzu
+iso.en=Isoko
+isr.en=Israeli Sign Language
+ist.en=Istriot
+isu.en=Isu (Menchum Division)
+itb.en=Binongan Itneg
+itc.en=Italic languages
+ite.en=Itene
+iti.en=Inlaod Itneg
+itk.en=Judeo-Italian
+itl.en=Itelmen
+itm.en=Itu Mbon Uzo
+ito.en=Itonama
+itr.en=Iteri
+its.en=Isekiri
+itt.en=Maeng Itneg
+itv.en=Itawit
+itw.en=Ito
+itx.en=Itik
+ity.en=Moyadan Itneg
+itz.en=Itzá
+ium.en=Iu Mien
+ivb.en=Ibatan
+ivv.en=Ivatan
+iwk.en=I-Wak
+iwm.en=Iwam
+iwo.en=Iwur
+iws.en=Sepik Iwam
+ixc.en=Ixcatec
+ixl.en=Ixil
+iya.en=Iyayu
+iyo.en=Mesaka
+iyx.en=Yaka (Congo)
+izh.en=Ingrian
+izi.en=Izi-Ezaa-Ikwo-Mgbo
+izr.en=Izere
+jaa.en=Jamamadí
+jab.en=Hyam
+jac.en=Popti'
+jad.en=Jahanka
+jae.en=Yabem
+jaf.en=Jara
+jah.en=Jah Hut
+jaj.en=Zazao
+jak.en=Jakun
+jal.en=Yalahatan
+jam.en=Jamaican Creole English
+jao.en=Yanyuwa
+jaq.en=Yaqay
+jar.en=Jarawa (Nigeria)
+jas.en=New Caledonian Javanese
+jat.en=Jakati
+jau.en=Yaur
+jax.en=Jambi Malay
+jay.en=Yan-nhangu
+jaz.en=Jawe
+jbe.en=Judeo-Berber
+jbj.en=Arandai
+jbn.en=Nafusi
+jbo.en=Lojban
+jbr.en=Jofotek-Bromnya
+jbt.en=Jabutí
+jbu.en=Jukun Takum
+jcs.en=Jamaican Country Sign Language
+jct.en=Krymchak
+jda.en=Jad
+jdg.en=Jadgali
+jdt.en=Judeo-Tat
+jeb.en=Jebero
+jee.en=Jerung
+jeg.en=Jeng
+jeh.en=Jeh
+jei.en=Yei
+jek.en=Jeri Kuo
+jel.en=Yelmek
+jen.en=Dza
+jer.en=Jere
+jet.en=Manem
+jeu.en=Jonkor Bourmataguil
+jgb.en=Ngbee
+jge.en=Judeo-Georgian
+jgo.en=Ngomba
+jhi.en=Jehai
+jhs.en=Jhankot Sign Language
+jia.en=Jina
+jib.en=Jibu
+jic.en=Tol
+jid.en=Bu
+jie.en=Jilbe
+jig.en=Djingili
+jih.en=Shangzhai
+jii.en=Jiiddu
+jil.en=Jilim
+jim.en=Jimi (Cameroon)
+jio.en=Jiamao
+jiq.en=Guanyinqiao
+jit.en=Jita
+jiu.en=Youle Jinuo
+jiv.en=Shuar
+jiy.en=Buyuan Jinuo
+jko.en=Kubo
+jku.en=Labir
+jle.en=Ngile
+jma.en=Dima
+jmb.en=Zumbun
+jmc.en=Machame
+jmd.en=Yamdena
+jmi.en=Jimi (Nigeria)
+jml.en=Jumli
+jmn.en=Makuri Naga
+jmr.en=Kamara
+jms.en=Mashi (Nigeria)
+jmx.en=Western Juxtlahuaca Mixtec
+jna.en=Jangshung
+jnd.en=Jandavra
+jng.en=Yangman
+jni.en=Janji
+jnj.en=Yemsa
+jnl.en=Rawat
+jns.en=Jaunsari
+job.en=Joba
+jod.en=Wojenaka
+jor.en=Jorá
+jos.en=Jordanian Sign Language
+jow.en=Jowulu
+jpa.en=Jewish Palestinian Aramaic
+jpr.en=Judeo-Persian
+jpx.en=Japanese (family)
+jqr.en=Jaqaru
+jra.en=Jarai
+jrb.en=Judeo-Arabic
+jrr.en=Jiru
+jrt.en=Jorto
+jru.en=Japrería
+jsl.en=Japanese Sign Language
+jua.en=Júma
+jub.en=Wannu
+juc.en=Jurchen
+jud.en=Worodougou
+juh.en=Hõne
+juk.en=Wapan
+jul.en=Jirel
+jum.en=Jumjum
+jun.en=Juang
+juo.en=Jiba
+jup.en=Hupdë
+jur.en=Jurúna
+jus.en=Jumla Sign Language
+jut.en=Jutish
+juu.en=Ju
+juw.en=Wãpha
+juy.en=Juray
+jvd.en=Javindo
+jvn.en=Caribbean Javanese
+jwi.en=Jwira-Pepesa
+jya.en=Jiarong
+jye.en=Judeo-Yemeni Arabic
+jyy.en=Jaya
+kaa.en=Kara-Kalpak
+kab.en=Kabyle
+kac.en=Kachin
+kad.en=Kadara
+kae.en=Ketangalan
+kaf.en=Katso
+kag.en=Kajaman
+kah.en=Kara (Central African Republic)
+kai.en=Karekare
+kaj.en=Jju
+kak.en=Kayapa Kallahan
+kam.en=Kamba (Kenya)
+kao.en=Xaasongaxango
+kap.en=Bezhta
+kaq.en=Capanahua
+kar.en=Karen languages
+kav.en=Katukína
+kaw.en=Kawi
+kax.en=Kao
+kay.en=Kamayurá
+kba.en=Kalarko
+kbb.en=Kaxuiâna
+kbc.en=Kadiwéu
+kbd.en=Kabardian
+kbe.en=Kanju
+kbf.en=Kakauhua
+kbg.en=Khamba
+kbh.en=Camsá
+kbi.en=Kaptiau
+kbj.en=Kari
+kbk.en=Grass Koiari
+kbl.en=Kanembu
+kbm.en=Iwal
+kbn.en=Kare (Central African Republic)
+kbo.en=Keliko
+kbp.en=Kabiyé
+kbq.en=Kamano
+kbr.en=Kafa
+kbs.en=Kande
+kbt.en=Abadi
+kbu.en=Kabutra
+kbv.en=Dera (Indonesia)
+kbw.en=Kaiep
+kbx.en=Ap Ma
+kby.en=Manga Kanuri
+kbz.en=Duhwa
+kca.en=Khanty
+kcb.en=Kawacha
+kcc.en=Lubila
+kcd.en=Ngkâlmpw Kanum
+kce.en=Kaivi
+kcf.en=Ukaan
+kcg.en=Tyap
+kch.en=Vono
+kci.en=Kamantan
+kcj.en=Kobiana
+kck.en=Kalanga
+kcl.en=Kela (Papua New Guinea)
+kcm.en=Gula (Central African Republic)
+kcn.en=Nubi
+kco.en=Kinalakna
+kcp.en=Kanga
+kcq.en=Kamo
+kcr.en=Katla
+kcs.en=Koenoem
+kct.en=Kaian
+kcu.en=Kami (Tanzania)
+kcv.en=Kete
+kcw.en=Kabwari
+kcx.en=Kachama-Ganjule
+kcy.en=Korandje
+kcz.en=Konongo
+kda.en=Worimi
+kdc.en=Kutu
+kdd.en=Yankunytjatjara
+kde.en=Makonde
+kdf.en=Mamusi
+kdg.en=Seba
+kdh.en=Tem
+kdi.en=Kumam
+kdj.en=Karamojong
+kdk.en=Numee
+kdl.en=Tsikimba
+kdm.en=Kagoma
+kdn.en=Kunda
+kdo.en=Kordofanian languages
+kdp.en=Kaningdon-Nindem
+kdq.en=Koch
+kdr.en=Karaim
+kdt.en=Kuy
+kdu.en=Kadaru
+kdv.en=Kado
+kdw.en=Koneraw
+kdx.en=Kam
+kdy.en=Keder
+kdz.en=Kwaja
+kea.en=Kabuverdianu
+keb.en=Kélé
+kec.en=Keiga
+ked.en=Kerewe
+kee.en=Eastern Keres
+kef.en=Kpessi
+keg.en=Tese
+keh.en=Keak
+kei.en=Kei
+kej.en=Kadar
+kek.en=Kekchí
+kek=Q'eqchi'
+kel.en=Kela (Democratic Republic of Congo)
+kem.en=Kemak
+ken.en=Kenyang
+keo.en=Kakwa
+kep.en=Kaikadi
+keq.en=Kamar
+ker.en=Kera
+kes.en=Kugbo
+ket.en=Ket
+keu.en=Akebu
+kev.en=Kanikkaran
+kew.en=West Kewa
+kex.en=Kukna
+key.en=Kupia
+kez.en=Kukele
+kfa.en=Kodava
+kfb.en=Northwestern Kolami
+kfc.en=Konda-Dora
+kfd.en=Korra Koraga
+kfe.en=Kota (India)
+kff.en=Koya
+kfg.en=Kudiya
+kfh.en=Kurichiya
+kfi.en=Kannada Kurumba
+kfj.en=Kemiehua
+kfk.en=Kinnauri
+kfl.en=Kung
+kfm.en=Khunsari
+kfn.en=Kuk
+kfo.en=Koro (Côte d'Ivoire)
+kfp.en=Korwa
+kfq.en=Korku
+kfr.en=Kachchi
+kfs.en=Bilaspuri
+kft.en=Kanjari
+kfu.en=Katkari
+kfv.en=Kurmukar
+kfw.en=Kharam Naga
+kfx.en=Kullu Pahari
+kfy.en=Kumaoni
+kfz.en=Koromfé
+kga.en=Koyaga
+kgb.en=Kawe
+kgc.en=Kasseng
+kgd.en=Kataang
+kge.en=Komering
+kgf.en=Kube
+kgg.en=Kusunda
+kgh.en=Upper Tanudan Kalinga
+kgi.en=Selangor Sign Language
+kgj.en=Gamale Kham
+kgk.en=Kaiwá
+kgl.en=Kunggari
+kgm.en=Karipúna
+kgn.en=Karingani
+kgo.en=Krongo
+kgp.en=Kaingang
+kgq.en=Kamoro
+kgr.en=Abun
+kgs.en=Kumbainggar
+kgt.en=Somyev
+kgu.en=Kobol
+kgv.en=Karas
+kgw.en=Karon Dori
+kgx.en=Kamaru
+kgy.en=Kyerung
+kha.en=Khasi
+khb.en=Lü
+khc.en=Tukang Besi North
+khd.en=Bädi Kanum
+khe.en=Korowai
+khf.en=Khuen
+khg.en=Khams Tibetan
+khh.en=Kehu
+khi.en=Khoisan languages
+khj.en=Kuturmi
+khk.en=Halh Mongolian
+khl.en=Lusi
+khn.en=Khandesi
+kho.en=Khotanese
+khp.en=Kapori
+khq.en=Koyra Chiini Songhay
+khr.en=Kharia
+khs.en=Kasua
+kht.en=Khamti
+khu.en=Nkhumbi
+khv.en=Khvarshi
+khw.en=Khowar
+khx.en=Kanu
+khy.en=Kele (Democratic Republic of Congo)
+khz.en=Keapara
+kia.en=Kim
+kib.en=Koalib
+kic.en=Kickapoo
+kid.en=Koshin
+kie.en=Kibet
+kif.en=Eastern Parbate Kham
+kig.en=Kimaama
+kih.en=Kilmeri
+kii.en=Kitsai
+kij.en=Kilivila
+kil.en=Kariya
+kim.en=Karagas
+kio.en=Kiowa
+kip.en=Sheshi Kham
+kiq.en=Kosadle
+kis.en=Kis
+kit.en=Agob
+kiu.en=Kirmanjki (individual language)
+kiv.en=Kimbu
+kiw.en=Northeast Kiwai
+kix.en=Khiamniungan Naga
+kiy.en=Kirikiri
+kiz.en=Kisi
+kja.en=Mlap
+kjb.en=Q'anjob'al
+kjc.en=Coastal Konjo
+kjd.en=Southern Kiwai
+kje.en=Kisar
+kjf.en=Khalaj
+kjg.en=Khmu
+kjh.en=Khakas
+kji.en=Zabana
+kjj.en=Khinalugh
+kjk.en=Highland Konjo
+kjl.en=Western Parbate Kham
+kjm.en=Kháng
+kjn.en=Kunjen
+kjo.en=Harijan Kinnauri
+kjp.en=Pwo Eastern Karen
+kjq.en=Western Keres
+kjr.en=Kurudu
+kjs.en=East Kewa
+kjt.en=Phrae Pwo Karen
+kju.en=Kashaya
+kjx.en=Ramopa
+kjy.en=Erave
+kjz.en=Bumthangkha
+kka.en=Kakanda
+kkb.en=Kwerisa
+kkc.en=Odoodee
+kkd.en=Kinuku
+kke.en=Kakabe
+kkf.en=Kalaktang Monpa
+kkg.en=Mabaka Valley Kalinga
+kkh.en=Khün
+kki.en=Kagulu
+kkj.en=Kako
+kkk.en=Kokota
+kkl.en=Kosarek Yale
+kkm.en=Kiong
+kkn.en=Kon Keu
+kko.en=Karko
+kkp.en=Gugubera
+kkq.en=Kaiku
+kkr.en=Kir-Balar
+kks.en=Giiwo
+kkt.en=Koi
+kku.en=Tumi
+kkv.en=Kangean
+kkw.en=Teke-Kukuya
+kkx.en=Kohin
+kky.en=Guguyimidjir
+kkz.en=Kaska
+kla.en=Klamath-Modoc
+klb.en=Kiliwa
+klc.en=Kolbila
+kld.en=Gamilaraay
+kle.en=Kulung (Nepal)
+klf.en=Kendeje
+klg.en=Tagakaulu Kalagan
+klh.en=Weliki
+kli.en=Kalumpang
+klj.en=Turkic Khalaj
+klk.en=Kono (Nigeria)
+kll.en=Kagan Kalagan
+klm.en=Kolom
+kln.en=Kalenjin
+klo.en=Kapya
+klp.en=Kamasa
+klq.en=Rumu
+klr.en=Khaling
+kls.en=Kalasha
+klt.en=Nukna
+klu.en=Klao
+klv.en=Maskelynes
+klw.en=Lindu
+klx.en=Koluwawa
+kly.en=Kalao
+klz.en=Kabola
+kma.en=Konni
+kmb.en=Kimbundu
+kmc.en=Southern Dong
+kmd.en=Madukayang Kalinga
+kme.en=Bakole
+kmf.en=Kare (Papua New Guinea)
+kmg.en=Kâte
+kmh.en=Kalam
+kmi.en=Kami (Nigeria)
+kmj.en=Kumarbhag Paharia
+kmk.en=Limos Kalinga
+kml.en=Lower Tanudan Kalinga
+kmm.en=Kom (India)
+kmn.en=Awtuw
+kmo.en=Kwoma
+kmp.en=Gimme
+kmq.en=Kwama
+kmr.en=Northern Kurdish
+kms.en=Kamasau
+kmt.en=Kemtuik
+kmu.en=Kanite
+kmv.en=Karipúna Creole French
+kmw.en=Komo (Democratic Republic of Congo)
+kmx.en=Waboda
+kmy.en=Koma
+kmz.en=Khorasani Turkish
+kna.en=Dera (Nigeria)
+knb.en=Lubuagan Kalinga
+knc.en=Central Kanuri
+knd.en=Konda
+kne.en=Kankanaey
+knf.en=Mankanya
+kng.en=Koongo
+kni.en=Kanufi
+knj.en=Western Kanjobal
+knk.en=Kuranko
+knl.en=Keninjal
+knm.en=Kanamarí
+knn.en=Konkani (individual language)
+kno.en=Kono (Sierra Leone)
+knp.en=Kwanja
+knq.en=Kintaq
+knr.en=Kaningra
+kns.en=Kensiu
+knt.en=Panoan Katukína
+knu.en=Kono (Guinea)
+knv.en=Tabo
+knw.en=Kung-Ekoka
+knx.en=Kendayan
+kny.en=Kanyok
+knz.en=Kalamsé
+koa.en=Konomala
+koc.en=Kpati
+kod.en=Kodi
+koe.en=Kacipo-Balesi
+kof.en=Kubi
+kog.en=Cogui
+koh.en=Koyo
+koi.en=Komi-Permyak
+koj.en=Sara Dunjo
+kok.en=Konkani (macrolanguage)
+kol.en=Kol (Papua New Guinea)
+koo.en=Konzo
+kop.en=Kwato
+koq.en=Kota (Gabon)
+kos.en=Kosraean
+kot.en=Lagwan
+kou.en=Koke
+kov.en=Kudu-Camo
+kow.en=Kugama
+kox.en=Coxima
+koy.en=Koyukon
+koz.en=Korak
+kpa.en=Kutto
+kpb.en=Mullu Kurumba
+kpc.en=Curripaco
+kpd.en=Koba
+kpe.en=Kpelle
+kpf.en=Komba
+kpg.en=Kapingamarangi
+kph.en=Kplang
+kpi.en=Kofei
+kpj.en=Karajá
+kpk.en=Kpan
+kpl.en=Kpala
+kpm.en=Koho
+kpn.en=Kepkiriwát
+kpo.en=Ikposo
+kpp.en=Paku Karen
+kpq.en=Korupun-Sela
+kpr.en=Korafe-Yegha
+kps.en=Tehit
+kpt.en=Karata
+kpu.en=Kafoa
+kpv.en=Komi-Zyrian
+kpw.en=Kobon
+kpx.en=Mountain Koiali
+kpy.en=Koryak
+kpz.en=Kupsabiny
+kqa.en=Mum
+kqb.en=Kovai
+kqc.en=Doromu-Koki
+kqd.en=Koy Sanjaq Surat
+kqe.en=Kalagan
+kqf.en=Kakabai
+kqg.en=Khe
+kqh.en=Kisankasa
+kqi.en=Koitabu
+kqj.en=Koromira
+kqk.en=Kotafon Gbe
+kql.en=Kyenele
+kqm.en=Khisa
+kqn.en=Kaonde
+kqo.en=Eastern Krahn
+kqp.en=Kimré
+kqq.en=Krenak
+kqr.en=Kimaragang
+kqs.en=Northern Kissi
+kqt.en=Klias River Kadazan
+kqu.en=Seroa
+kqv.en=Okolod
+kqw.en=Kandas
+kqx.en=Mser
+kqy.en=Koorete
+kqz.en=Korana
+kra.en=Kumhali
+krb.en=Karkin
+krc.en=Karachay-Balkar
+krd.en=Kairui-Midiki
+kre.en=Panará
+krf.en=Koro (Vanuatu)
+krh.en=Kurama
+kri.en=Krio
+krj.en=Kinaray-A
+krk.en=Kerek
+krl.en=Karelian
+krm.en=Krim
+krn.en=Sapo
+kro.en=Kru languages
+krp.en=Korop
+krr.en=Kru'ng 2
+krs.en=Gbaya (Sudan)
+krt.en=Tumari Kanuri
+kru.en=Kurukh
+krv.en=Kavet
+krw.en=Western Krahn
+krx.en=Karon
+kry.en=Kryts
+krz.en=Sota Kanum
+ksa.en=Shuwa-Zamani
+ksb.en=Shambala
+ksc.en=Southern Kalinga
+ksd.en=Kuanua
+kse.en=Kuni
+ksf.en=Bafia
+ksg.en=Kusaghe
+ksh.en=Kölsch
+ksi.en=Krisa
+ksj.en=Uare
+ksk.en=Kansa
+ksl.en=Kumalu
+ksm.en=Kumba
+ksn.en=Kasiguranin
+kso.en=Kofa
+ksp.en=Kaba
+ksq.en=Kwaami
+ksr.en=Borong
+kss.en=Southern Kisi
+kst.en=Winyé
+ksu.en=Khamyang
+ksv.en=Kusu
+ksw.en=S'gaw Karen
+ksx.en=Kedang
+ksy.en=Kharia Thar
+ksz.en=Kodaku
+kta.en=Katua
+ktb.en=Kambaata
+ktc.en=Kholok
+ktd.en=Kokata
+kte.en=Nubri
+ktf.en=Kwami
+ktg.en=Kalkutung
+kth.en=Karanga
+kti.en=North Muyu
+ktj.en=Plapo Krumen
+ktk.en=Kaniet
+ktl.en=Koroshi
+ktm.en=Kurti
+ktn.en=Karitiâna
+kto.en=Kuot
+ktp.en=Kaduo
+ktq.en=Katabaga
+ktr.en=Kota Marudu Tinagas
+kts.en=South Muyu
+ktt.en=Ketum
+ktu.en=Kituba (Democratic Republic of Congo)
+ktv.en=Eastern Katu
+ktw.en=Kato
+ktx.en=Kaxararí
+kty.en=Kango (Bas-Uélé District)
+ktz.en=Ju/'hoan
+kub.en=Kutep
+kuc.en=Kwinsu
+kud.en='Auhelawa
+kue.en=Kuman
+kuf.en=Western Katu
+kug.en=Kupa
+kuh.en=Kushi
+kui.en=Kuikúro-Kalapálo
+kuj.en=Kuria
+kuk.en=Kepo'
+kul.en=Kulere
+kum.en=Kumyk
+kun.en=Kunama
+kuo.en=Kumukio
+kup.en=Kunimaipa
+kuq.en=Karipuna
+kus.en=Kusaal
+kut.en=Kutenai
+kuu.en=Upper Kuskokwim
+kuv.en=Kur
+kuw.en=Kpagua
+kux.en=Kukatja
+kuy.en=Kuuku-Ya'u
+kuz.en=Kunza
+kva.en=Bagvalal
+kvb.en=Kubu
+kvc.en=Kove
+kvd.en=Kui (Indonesia)
+kve.en=Kalabakan
+kvf.en=Kabalai
+kvg.en=Kuni-Boazi
+kvh.en=Komodo
+kvi.en=Kwang
+kvj.en=Psikye
+kvk.en=Korean Sign Language
+kvl.en=Brek Karen
+kvm.en=Kendem
+kvn.en=Border Kuna
+kvo.en=Dobel
+kvp.en=Kompane
+kvq.en=Geba Karen
+kvr.en=Kerinci
+kvs.en=Kunggara
+kvt.en=Lahta Karen
+kvu.en=Yinbaw Karen
+kvv.en=Kola
+kvw.en=Wersing
+kvx.en=Parkari Koli
+kvy.en=Yintale Karen
+kvz.en=Tsakwambo
+kwa.en=Dâw
+kwb.en=Kwa
+kwc.en=Likwala
+kwd.en=Kwaio
+kwe.en=Kwerba
+kwf.en=Kwara'ae
+kwg.en=Sara Kaba Deme
+kwh.en=Kowiai
+kwi.en=Awa-Cuaiquer
+kwj.en=Kwanga
+kwk.en=Kwakiutl
+kwl.en=Kofyar
+kwm.en=Kwambi
+kwn.en=Kwangali
+kwo.en=Kwomtari
+kwp.en=Kodia
+kwq.en=Kwak
+kwr.en=Kwer
+kws.en=Kwese
+kwt.en=Kwesten
+kwu.en=Kwakum
+kwv.en=Sara Kaba Náà
+kww.en=Kwinti
+kwx.en=Khirwar
+kwy.en=San Salvador Kongo
+kwz.en=Kwadi
+kxa.en=Kairiru
+kxb.en=Krobu
+kxc.en=Konso
+kxd.en=Brunei
+kxe.en=Kakihum
+kxf.en=Manumanaw Karen
+kxh.en=Karo (Ethiopia)
+kxi.en=Keningau Murut
+kxj.en=Kulfa
+kxk.en=Zayein Karen
+kxl.en=Nepali Kurux
+kxm.en=Northern Khmer
+kxn.en=Kanowit-Tanjong Melanau
+kxo.en=Kanoé
+kxp.en=Wadiyara Koli
+kxq.en=Smärky Kanum
+kxr.en=Koro (Papua New Guinea)
+kxs.en=Kangjia
+kxt.en=Koiwat
+kxu.en=Kui (India)
+kxv.en=Kuvi
+kxw.en=Konai
+kxx.en=Likuba
+kxy.en=Kayong
+kxz.en=Kerewo
+kya.en=Kwaya
+kyb.en=Butbut Kalinga
+kyc.en=Kyaka
+kyd.en=Karey
+kye.en=Krache
+kyf.en=Kouya
+kyg.en=Keyagana
+kyh.en=Karok
+kyi.en=Kiput
+kyj.en=Karao
+kyk.en=Kamayo
+kyl.en=Kalapuya
+kym.en=Kpatili
+kyn.en=Karolanos
+kyo.en=Kelon
+kyp.en=Kang
+kyq.en=Kenga
+kyr.en=Kuruáya
+kys.en=Baram Kayan
+kyt.en=Kayagar
+kyu.en=Western Kayah
+kyv.en=Kayort
+kyw.en=Kudmali
+kyx.en=Rapoisi
+kyy.en=Kambaira
+kyz.en=Kayabí
+kza.en=Western Karaboro
+kzb.en=Kaibobo
+kzc.en=Bondoukou Kulango
+kzd.en=Kadai
+kze.en=Kosena
+kzf.en=Da'a Kaili
+kzg.en=Kikai
+kzh.en=Kenuzi-Dongola
+kzi.en=Kelabit
+kzj.en=Coastal Kadazan
+kzk.en=Kazukuru
+kzl.en=Kayeli
+kzm.en=Kais
+kzn.en=Kokola
+kzo.en=Kaningi
+kzp.en=Kaidipang
+kzq.en=Kaike
+kzr.en=Karang
+kzs.en=Sugut Dusun
+kzt.en=Tambunan Dusun
+kzu.en=Kayupulau
+kzv.en=Komyandaret
+kzw.en=Karirí-Xocó
+kzx.en=Kamarian
+kzy.en=Kango (Tshopo District)
+kzz.en=Kalabra
+laa.en=Lapuyan Subanun
+lab.en=Linear A
+lac.en=Lacandon
+lac=Hach T'ən
+lad.en=Ladino
+lae.en=Pattani
+laf.en=Lafofa
+lag.en=Langi
+lah.en=Lahnda
+lai.en=Lambya
+laj.en=Lango (Uganda)
+lak.en=Laka (Nigeria)
+lal.en=Lalia
+lam.en=Lamba
+lan.en=Laru
+lap.en=Laka (Chad)
+laq.en=Qabiao
+lar.en=Larteh
+las.en=Lama (Togo)
+lau.en=Laba
+law.en=Lauje
+lax.en=Tiwa
+lay.en=Lama (Myanmar)
+laz.en=Aribwatsa
+lba.en=Lui
+lbb.en=Label
+lbc.en=Lakkia
+lbe.en=Lak
+lbf.en=Tinani
+lbg.en=Laopang
+lbi.en=La'bi
+lbj.en=Ladakhi
+lbm.en=Lodhi
+lbn.en=Lamet
+lbo.en=Laven
+lbq.en=Wampar
+lbr.en=Northern Lorung
+lbs.en=Libyan Sign Language
+lbt.en=Lachi
+lbu.en=Labu
+lbv.en=Lavatbura-Lamusong
+lbw.en=Tolaki
+lbx.en=Lawangan
+lby.en=Lamu-Lamu
+lbz.en=Lardil
+lcc.en=Legenyem
+lcd.en=Lola
+lce.en=Loncong
+lcf.en=Lubu
+lch.en=Luchazi
+lcl.en=Lisela
+lcm.en=Tungag
+lcp.en=Western Lawa
+lcq.en=Luhu
+lcs.en=Lisabata-Nuniali
+ldb.en=Idun
+ldd.en=Luri
+ldg.en=Lenyima
+ldh.en=Lamja-Dengsa-Tola
+ldi.en=Laari
+ldj.en=Lemoro
+ldk.en=Leelau
+ldl.en=Kaan
+ldm.en=Landoma
+ldn.en=Láadan
+ldo.en=Loo
+ldp.en=Tso
+ldq.en=Lufu
+lea.en=Lega-Shabunda
+leb.en=Lala-Bisa
+lec.en=Leco
+led.en=Lendu
+lee.en=Lyélé
+lef.en=Lelemi
+leg.en=Lengua
+leh.en=Lenje
+lei.en=Lemio
+lej.en=Lengola
+lek.en=Leipon
+lel.en=Lele (Democratic Republic of Congo)
+lem.en=Nomaande
+len.en=Lenca
+leo.en=Leti (Cameroon)
+lep.en=Lepcha
+leq.en=Lembena
+ler.en=Lenkau
+les.en=Lese
+let.en=Lesing-Gelimi
+leu.en=Kara (Papua New Guinea)
+lev.en=Lamma
+lew.en=Ledo Kaili
+lex.en=Luang
+ley.en=Lemolang
+lez.en=Lezghian
+lfa.en=Lefa
+lfn.en=Lingua Franca Nova
+lga.en=Lungga
+lgb.en=Laghu
+lgg.en=Lugbara
+lgh.en=Laghuu
+lgi.en=Lengilu
+lgk.en=Lingarak
+lgl.en=Wala
+lgm.en=Lega-Mwenga
+lgn.en=Opuuo
+lgq.en=Logba
+lgr.en=Lengo
+lgt.en=Pahi
+lgu.en=Longgu
+lgz.en=Ligenza
+lha.en=Laha (Viet Nam)
+lhh.en=Laha (Indonesia)
+lhi.en=Lahu Shi
+lhl.en=Lahul Lohar
+lhm.en=Lhomi
+lhn.en=Lahanan
+lhp.en=Lhokpu
+lhs.en=Mlahsö
+lht.en=Lo-Toga
+lhu.en=Lahu
+lia.en=West-Central Limba
+lib.en=Likum
+lic.en=Hlai
+lid.en=Nyindrou
+lie.en=Likila
+lif.en=Limbu
+lig.en=Ligbi
+lih.en=Lihir
+lii.en=Lingkhim
+lij.en=Ligurian
+lik.en=Lika
+lil.en=Lillooet
+lio.en=Liki
+lip.en=Sekpele
+liq.en=Libido
+lir.en=Liberian English
+lis.en=Lisu
+liu.en=Logorik
+liv.en=Liv
+liw.en=Col
+lix.en=Liabuku
+liy.en=Banda-Bambari
+liz.en=Libinza
+lje.en=Rampi
+lji.en=Laiyolo
+ljl.en=Li'o
+ljp.en=Lampung Api
+lka.en=Lakalei
+lkb.en=Kabras
+lkc.en=Kucong
+lkd.en=Lakondê
+lke.en=Kenyi
+lkh.en=Lakha
+lki.en=Laki
+lkj.en=Remun
+lkl.en=Laeko-Libuat
+lkn.en=Lakon
+lko.en=Khayo
+lkr.en=Päri
+lks.en=Kisa
+lkt.en=Lakota
+lky.en=Lokoya
+lla.en=Lala-Roba
+llb.en=Lolo
+llc.en=Lele (Guinea)
+lld.en=Ladin
+lle.en=Lele (Papua New Guinea)
+llf.en=Hermit
+llg.en=Lole
+llh.en=Lamu
+lli.en=Teke-Laali
+llk.en=Lelak
+lll.en=Lilau
+llm.en=Lasalimu
+lln.en=Lele (Chad)
+llo.en=Khlor
+llp.en=North Efate
+llq.en=Lolak
+lls.en=Lithuanian Sign Language
+llu.en=Lau
+llx.en=Lauan
+lma.en=East Limba
+lmb.en=Merei
+lmc.en=Limilngan
+lmd.en=Lumun
+lme.en=Pévé
+lmf.en=South Lembata
+lmg.en=Lamogai
+lmh.en=Lambichhong
+lmi.en=Lombi
+lmj.en=West Lembata
+lmk.en=Lamkang
+lml.en=Hano
+lmm.en=Lamam
+lmn.en=Lambadi
+lmo.en=Lombard
+lmp.en=Limbum
+lmq.en=Lamatuka
+lmr.en=Lamalera
+lmu.en=Lamenu
+lmv.en=Lomaiviti
+lmw.en=Lake Miwok
+lmx.en=Laimbue
+lmy.en=Lamboya
+lmz.en=Lumbee
+lna.en=Langbashe
+lnb.en=Mbalanhu
+lnd.en=Lundayeh
+lng.en=Langobardic
+lnh.en=Lanoh
+lni.en=Daantanai'
+lnj.en=Leningitij
+lnl.en=South Central Banda
+lnm.en=Langam
+lnn.en=Lorediakarkar
+lno.en=Lango (Sudan)
+lns.en=Lamnso'
+lnu.en=Longuda
+lnz.en=Lonzo
+loa.en=Loloda
+lob.en=Lobi
+loc.en=Inonhan
+loe.en=Saluan
+lof.en=Logol
+log.en=Logo
+loh.en=Narim
+loi.en=Loma (Côte d'Ivoire)
+loj.en=Lou
+lok.en=Loko
+lol.en=Mongo
+lom.en=Loma (Liberia)
+lon.en=Malawi Lomwe
+loo.en=Lombo
+lop.en=Lopa
+loq.en=Lobala
+lor.en=Téén
+los.en=Loniu
+lot.en=Otuho
+lou.en=Louisiana Creole French
+lov.en=Lopi
+low.en=Tampias Lobu
+lox.en=Loun
+loy.en=Lowa
+loz.en=Lozi
+lpa.en=Lelepa
+lpe.en=Lepki
+lpn.en=Long Phuri Naga
+lpo.en=Lipo
+lpx.en=Lopit
+lra.en=Rara Bakati'
+lrc.en=Northern Luri
+lre.en=Laurentian
+lrg.en=Laragia
+lri.en=Marachi
+lrk.en=Loarki
+lrl.en=Lari
+lrm.en=Marama
+lrn.en=Lorang
+lro.en=Laro
+lrr.en=Southern Lorung
+lrt.en=Larantuka Malay
+lrv.en=Larevat
+lrz.en=Lemerig
+lsa.en=Lasgerdi
+lsd.en=Lishana Deni
+lse.en=Lusengo
+lsg.en=Lyons Sign Language
+lsh.en=Lish
+lsi.en=Lashi
+lsl.en=Latvian Sign Language
+lsm.en=Saamia
+lso.en=Laos Sign Language
+lsp.en=Panamanian Sign Language
+lsr.en=Aruop
+lss.en=Lasi
+lst.en=Trinidad and Tobago Sign Language
+ltc.en=Late Middle Chinese
+lti.en=Leti (Indonesia)
+ltn.en=Latundê
+lto.en=Tsotso
+lts.en=Tachoni
+ltu.en=Latu
+lua.en=Luba-Lulua
+luc.en=Aringa
+lud.en=Ludian
+lue.en=Luvale
+luf.en=Laua
+lui.en=Luiseno
+luj.en=Luna
+luk.en=Lunanakha
+lul.en=Olu'bo
+lum.en=Luimbi
+lun.en=Lunda
+luo.en=Luo (Kenya and Tanzania)
+lup.en=Lumbu
+luq.en=Lucumi
+lur.en=Laura
+lus.en=Lushai
+lut.en=Lushootseed
+luu.en=Lumba-Yakkha
+luv.en=Luwati
+luw.en=Luo (Cameroon)
+luy.en=Luyia
+luz.en=Southern Luri
+lva.en=Maku'a
+lvk.en=Lavukaleve
+lvu.en=Levuka
+lwa.en=Lwalu
+lwe.en=Lewo Eleng
+lwg.en=Wanga
+lwh.en=White Lachi
+lwl.en=Eastern Lawa
+lwm.en=Laomian
+lwo.en=Luwo
+lwt.en=Lewotobi
+lww.en=Lewo
+lya.en=Layakha
+lyg.en=Lyngngam
+lyn.en=Luyana
+lzh.en=Literary Chinese
+lzl.en=Litzlitz
+lzn.en=Leinong Naga
+lzz.en=Laz
+maa.en=San Jerónimo Tecóatl Mazatec
+mab.en=Yutanduchi Mixtec
+mad.en=Madurese
+mae.en=Bo-Rukul
+maf.en=Mafa
+mag.en=Magahi
+mai.en=Maithili
+maj.en=Jalapa De Díaz Mazatec
+mak.en=Makasar
+mam.en=Mam
+man.en=Mandingo
+map.en=Austronesian languages
+maq.en=Chiquihuitlán Mazatec
+mas.en=Masai
+mat.en=San Francisco Matlatzinca
+mau.en=Huautla Mazatec
+mav.en=Sateré-Mawé
+maw.en=Mampruli
+max.en=North Moluccan Malay
+maz.en=Central Mazahua
+mba.en=Higaonon
+mbb.en=Western Bukidnon Manobo
+mbc.en=Macushi
+mbd.en=Dibabawon Manobo
+mbe.en=Molale
+mbf.en=Baba Malay
+mbh.en=Mangseng
+mbi.en=Ilianen Manobo
+mbj.en=Nadëb
+mbk.en=Malol
+mbl.en=Maxakalí
+mbm.en=Ombamba
+mbn.en=Macaguán
+mbo.en=Mbo (Cameroon)
+mbp.en=Malayo
+mbq.en=Maisin
+mbr.en=Nukak Makú
+mbs.en=Sarangani Manobo
+mbt.en=Matigsalug Manobo
+mbu.en=Mbula-Bwazza
+mbv.en=Mbulungish
+mbw.en=Maring
+mbx.en=Mari (East Sepik Province)
+mby.en=Memoni
+mbz.en=Amoltepec Mixtec
+mca.en=Maca
+mcb.en=Machiguenga
+mcc.en=Bitur
+mcd.en=Sharanahua
+mce.en=Itundujia Mixtec
+mcf.en=Matsés
+mcg.en=Mapoyo
+mch.en=Maquiritari
+mci.en=Mese
+mcj.en=Mvanip
+mck.en=Mbunda
+mcl.en=Macaguaje
+mcm.en=Malaccan Creole Portuguese
+mcn.en=Masana
+mco.en=Coatlán Mixe
+mcp.en=Makaa
+mcq.en=Ese
+mcr.en=Menya
+mcs.en=Mambai
+mct.en=Mengisa
+mcu.en=Cameroon Mambila
+mcv.en=Minanibai
+mcw.en=Mawa (Chad)
+mcx.en=Mpiemo
+mcy.en=South Watut
+mcz.en=Mawan
+mda.en=Mada (Nigeria)
+mdb.en=Morigi
+mdc.en=Male (Papua New Guinea)
+mdd.en=Mbum
+mde.en=Maba (Chad)
+mdf.en=Moksha
+mdg.en=Massalat
+mdh.en=Maguindanao
+mdi.en=Mamvu
+mdj.en=Mangbetu
+mdk.en=Mangbutu
+mdl.en=Maltese Sign Language
+mdm.en=Mayogo
+mdn.en=Mbati
+mdp.en=Mbala
+mdq.en=Mbole
+mdr.en=Mandar
+mds.en=Maria (Papua New Guinea)
+mdt.en=Mbere
+mdu.en=Mboko
+mdv.en=Santa Lucía Monteverde Mixtec
+mdw.en=Mbosi
+mdx.en=Dizin
+mdy.en=Male (Ethiopia)
+mdz.en=Suruí Do Pará
+mea.en=Menka
+meb.en=Ikobi-Mena
+mec.en=Mara
+med.en=Melpa
+mee.en=Mengen
+mef.en=Megam
+meg.en=Mea
+meh.en=Southwestern Tlaxiaco Mixtec
+mei.en=Midob
+mej.en=Meyah
+mek.en=Mekeo
+mel.en=Central Melanau
+mem.en=Mangala
+men.en=Mende (Sierra Leone)
+meo.en=Kedah Malay
+mep.en=Miriwung
+meq.en=Merey
+mer.en=Meru
+mes.en=Masmaje
+met.en=Mato
+meu.en=Motu
+mev.en=Mann
+mew.en=Maaka
+mey.en=Hassaniyya
+mez.en=Menominee
+mfa.en=Pattani Malay
+mfb.en=Bangka
+mfc.en=Mba
+mfd.en=Mendankwe-Nkwen
+mfe.en=Morisyen
+mff.en=Naki
+mfg.en=Mixifore
+mfh.en=Matal
+mfi.en=Wandala
+mfj.en=Mefele
+mfk.en=North Mofu
+mfl.en=Putai
+mfm.en=Marghi South
+mfn.en=Cross River Mbembe
+mfo.en=Mbe
+mfp.en=Makassar Malay
+mfq.en=Moba
+mfr.en=Marithiel
+mfs.en=Mexican Sign Language
+mft.en=Mokerang
+mfu.en=Mbwela
+mfv.en=Mandjak
+mfw.en=Mulaha
+mfx.en=Melo
+mfy.en=Mayo
+mfz.en=Mabaan
+mga.en=Middle Irish (900-1200)
+mgb.en=Mararit
+mgc.en=Morokodo
+mgd.en=Moru
+mge.en=Mango
+mgf.en=Maklew
+mgg.en=Mpongmpong
+mgh.en=Makhuwa-Meetto
+mgi.en=Lijili
+mgj.en=Abureni
+mgk.en=Mawes
+mgl.en=Maleu-Kilenge
+mgm.en=Mambae
+mgn.en=Mbangi
+mgo.en=Meta'
+mgp.en=Eastern Magar
+mgq.en=Malila
+mgr.en=Mambwe-Lungu
+mgs.en=Manda (Tanzania)
+mgt.en=Mongol
+mgu.en=Mailu
+mgv.en=Matengo
+mgw.en=Matumbi
+mgx.en=Omati
+mgy.en=Mbunga
+mgz.en=Mbugwe
+mha.en=Manda (India)
+mhb.en=Mahongwe
+mhc.en=Mocho
+mhd.en=Mbugu
+mhe.en=Besisi
+mhf.en=Mamaa
+mhg.en=Margu
+mhh.en=Maskoy Pidgin
+mhi.en=Ma'di
+mhj.en=Mogholi
+mhk.en=Mungaka
+mhl.en=Mauwake
+mhm.en=Makhuwa-Moniga
+mhn.en=Mócheno
+mho.en=Mashi (Zambia)
+mhp.en=Balinese Malay
+mhq.en=Mandan
+mhr.en=Eastern Mari
+mhs.en=Buru (Indonesia)
+mht.en=Mandahuaca
+mhu.en=Digaro-Mishmi
+mhw.en=Mbukushu
+mhx.en=Maru
+mhy.en=Ma'anyan
+mhz.en=Mor (Mor Islands)
+mia.en=Miami
+mib.en=Atatláhuca Mixtec
+mic.en=Mi'kmaq
+mid.en=Mandaic
+mie.en=Ocotepec Mixtec
+mif.en=Mofu-Gudur
+mig.en=San Miguel El Grande Mixtec
+mih.en=Chayuco Mixtec
+mii.en=Chigmecatitlán Mixtec
+mij.en=Abar
+mik.en=Mikasuki
+mil.en=Peñoles Mixtec
+mim.en=Alacatlatzala Mixtec
+min.en=Minangkabau
+mio.en=Pinotepa Nacional Mixtec
+mip.en=Apasco-Apoala Mixtec
+miq.en=Mískito
+mir.en=Isthmus Mixe
+mis.en=Uncoded languages
+mit.en=Southern Puebla Mixtec
+miu.en=Cacaloxtepec Mixtec
+miw.en=Akoye
+mix.en=Mixtepec Mixtec
+miy.en=Ayutla Mixtec
+miz.en=Coatzospan Mixtec
+mja.en=Mahei
+mjc.en=San Juan Colorado Mixtec
+mjd.en=Northwest Maidu
+mje.en=Muskum
+mjg.en=Tu
+mjh.en=Mwera (Nyasa)
+mji.en=Kim Mun
+mjj.en=Mawak
+mjk.en=Matukar
+mjl.en=Mandeali
+mjm.en=Medebur
+mjn.en=Ma (Papua New Guinea)
+mjo.en=Malankuravan
+mjp.en=Malapandaram
+mjq.en=Malaryan
+mjr.en=Malavedan
+mjs.en=Miship
+mjt.en=Sauria Paharia
+mju.en=Manna-Dora
+mjv.en=Mannan
+mjw.en=Karbi
+mjx.en=Mahali
+mjy.en=Mahican
+mjz.en=Majhi
+mka.en=Mbre
+mkb.en=Mal Paharia
+mkc.en=Siliput
+mke.en=Mawchi
+mkf.en=Miya
+mkg.en=Mak (China)
+mkh.en=Mon-Khmer languages
+mki.en=Dhatki
+mkj.en=Mokilese
+mkk.en=Byep
+mkl.en=Mokole
+mkm.en=Moklen
+mkn.en=Kupang Malay
+mko.en=Mingang Doso
+mkp.en=Moikodi
+mkq.en=Bay Miwok
+mkr.en=Malas
+mks.en=Silacayoapan Mixtec
+mkt.en=Vamale
+mku.en=Konyanka Maninka
+mkv.en=Mafea
+mkw.en=Kituba (Congo)
+mkx.en=Cinamiguin Manobo
+mky.en=East Makian
+mkz.en=Makasae
+mla.en=Malo
+mlb.en=Mbule
+mlc.en=Cao Lan
+mld.en=Malakhel
+mle.en=Manambu
+mlf.en=Mal
+mlh.en=Mape
+mli.en=Malimpung
+mlj.en=Miltu
+mlk.en=Ilwana
+mll.en=Malua Bay
+mlm.en=Mulam
+mln.en=Malango
+mlo.en=Mlomp
+mlp.en=Bargam
+mlq.en=Western Maninkakan
+mlr.en=Vame
+mls.en=Masalit
+mlu.en=To'abaita
+mlv.en=Motlav
+mlw.en=Moloko
+mlx.en=Malfaxal
+mlz.en=Malaynon
+mma.en=Mama
+mmb.en=Momina
+mmc.en=Michoacán Mazahua
+mmd.en=Maonan
+mme.en=Mae
+mmf.en=Mundat
+mmg.en=North Ambrym
+mmh.en=Mehináku
+mmi.en=Musar
+mmj.en=Majhwar
+mmk.en=Mukha-Dora
+mml.en=Man Met
+mmm.en=Maii
+mmn.en=Mamanwa
+mmo.en=Mangga Buang
+mmp.en=Siawi
+mmq.en=Musak
+mmr.en=Western Xiangxi Miao
+mmt.en=Malalamai
+mmu.en=Mmaala
+mmv.en=Miriti
+mmw.en=Emae
+mmx.en=Madak
+mmy.en=Migaama
+mmz.en=Mabaale
+mna.en=Mbula
+mnb.en=Muna
+mnc.en=Manchu
+mnd.en=Mondé
+mne.en=Naba
+mnf.en=Mundani
+mng.en=Eastern Mnong
+mnh.en=Mono (Democratic Republic of Congo)
+mni.en=Manipuri
+mnj.en=Munji
+mnk.en=Mandinka
+mnl.en=Tiale
+mnm.en=Mapena
+mnn.en=Southern Mnong
+mno.en=Manobo languages
+mnp.en=Min Bei Chinese
+mnq.en=Minriq
+mnr.en=Mono (USA)
+mns.en=Mansi
+mnt.en=Maykulan
+mnu.en=Mer
+mnv.en=Rennell-Bellona
+mnw.en=Mon
+mnx.en=Manikion
+mny.en=Manyawa
+mnz.en=Moni
+moa.en=Mwan
+moc.en=Mocoví
+mod.en=Mobilian
+moe.en=Montagnais
+mof.en=Mohegan-Montauk-Narragansett
+mog.en=Mongondow
+moh.en=Mohawk
+moi.en=Mboi
+moj.en=Monzombo
+mok.en=Morori
+mom.en=Monimbo
+moo.en=Monom
+mop.en=Mopán Maya
+moq.en=Mor (Bomberai Peninsula)
+mor.en=Moro
+mos.en=Mossi
+mot.en=Barí
+mou.en=Mogum
+mov.en=Mohave
+mow.en=Moi (Congo)
+mox.en=Molima
+moy.en=Shekkacho
+moz.en=Mukulu
+mpa.en=Mpoto
+mpb.en=Mullukmulluk
+mpc.en=Mangarayi
+mpd.en=Machinere
+mpe.en=Majang
+mpg.en=Marba
+mph.en=Maung
+mpi.en=Mpade
+mpj.en=Martu Wangka
+mpk.en=Mbara (Chad)
+mpl.en=Middle Watut
+mpm.en=Yosondúa Mixtec
+mpn.en=Mindiri
+mpo.en=Miu
+mpp.en=Migabac
+mpq.en=Matís
+mpr.en=Vangunu
+mps.en=Dadibi
+mpt.en=Mian
+mpu.en=Makuráp
+mpv.en=Mungkip
+mpw.en=Mapidian
+mpx.en=Misima-Paneati
+mpy.en=Mapia
+mpz.en=Mpi
+mqa.en=Maba (Indonesia)
+mqb.en=Mbuko
+mqc.en=Mangole
+mqe.en=Matepi
+mqf.en=Momuna
+mqg.en=Kota Bangun Kutai Malay
+mqh.en=Tlazoyaltepec Mixtec
+mqi.en=Mariri
+mqj.en=Mamasa
+mqk.en=Rajah Kabunsuwan Manobo
+mql.en=Mbelime
+mqm.en=South Marquesan
+mqn.en=Moronene
+mqo.en=Modole
+mqp.en=Manipa
+mqq.en=Minokok
+mqr.en=Mander
+mqs.en=West Makian
+mqt.en=Mok
+mqu.en=Mandari
+mqv.en=Mosimo
+mqw.en=Murupi
+mqx.en=Mamuju
+mqy.en=Manggarai
+mqz.en=Malasanga
+mra.en=Mlabri
+mrb.en=Marino
+mrc.en=Maricopa
+mrd.en=Western Magar
+mre.en=Martha's Vineyard Sign Language
+mrf.en=Elseng
+mrg.en=Miri
+mrh.en=Mara Chin
+mrj.en=Western Mari
+mrk.en=Hmwaveke
+mrl.en=Mortlockese
+mrm.en=Merlav
+mrn.en=Cheke Holo
+mro.en=Mru
+mrp.en=Morouas
+mrq.en=North Marquesan
+mrr.en=Maria (India)
+mrs.en=Maragus
+mrt.en=Marghi Central
+mru.en=Mono (Cameroon)
+mrv.en=Mangareva
+mrw.en=Maranao
+mrx.en=Maremgi
+mry.en=Karaga Mandaya
+mrz.en=Marind
+msb.en=Masbatenyo
+msc.en=Sankaran Maninka
+msd.en=Yucatec Maya Sign Language
+mse.en=Musey
+msf.en=Mekwei
+msg.en=Moraid
+msh.en=Masikoro Malagasy
+msi.en=Sabah Malay
+msj.en=Ma (Democratic Republic of Congo)
+msk.en=Mansaka
+msl.en=Molof
+msm.en=Agusan Manobo
+msn.en=Vurës
+mso.en=Mombum
+msp.en=Maritsauá
+msq.en=Caac
+msr.en=Mongolian Sign Language
+mss.en=West Masela
+mst.en=Cataelano Mandaya
+msu.en=Musom
+msv.en=Maslam
+msw.en=Mansoanka
+msx.en=Moresada
+msy.en=Aruamu
+msz.en=Momare
+mta.en=Cotabato Manobo
+mtb.en=Anyin Morofo
+mtc.en=Munit
+mtd.en=Mualang
+mte.en=Mono (Solomon Islands)
+mtf.en=Murik (Papua New Guinea)
+mtg.en=Una
+mth.en=Munggui
+mti.en=Maiwa (Papua New Guinea)
+mtj.en=Moskona
+mtk.en=Mbe'
+mtl.en=Montol
+mtm.en=Mator
+mtn.en=Matagalpa
+mto.en=Totontepec Mixe
+mtp.en=Wichí Lhamtés Nocten
+mtq.en=Muong
+mtr.en=Mewari
+mts.en=Yora
+mtt.en=Mota
+mtu.en=Tututepec Mixtec
+mtv.en=Asaro'o
+mtw.en=Magahat
+mtx.en=Tidaá Mixtec
+mty.en=Nabi
+mua.en=Mundang
+mub.en=Mubi
+muc.en=Mbu'
+mud.en=Mednyj Aleut
+mue.en=Media Lengua
+mug.en=Musgu
+muh.en=Mündü
+mui.en=Musi
+muj.en=Mabire
+muk.en=Mugom
+mul.en=Multiple languages
+mum.en=Maiwala
+mun.en=Munda languages
+muo.en=Nyong
+mup.en=Malvi
+muq.en=Eastern Xiangxi Miao
+mur.en=Murle
+mus.en=Creek
+mut.en=Western Muria
+muu.en=Yaaku
+muv.en=Muthuvan
+mux.en=Bo-Ung
+muy.en=Muyang
+muz.en=Mursi
+mva.en=Manam
+mvb.en=Mattole
+mvd.en=Mamboru
+mve.en=Marwari (Pakistan)
+mvf.en=Peripheral Mongolian
+mvg.en=Yucuañe Mixtec
+mvh.en=Mire
+mvi.en=Miyako
+mvk.en=Mekmek
+mvl.en=Mbara (Australia)
+mvm.en=Muya
+mvn.en=Minaveha
+mvo.en=Marovo
+mvp.en=Duri
+mvq.en=Moere
+mvr.en=Marau
+mvs.en=Massep
+mvt.en=Mpotovoro
+mvu.en=Marfa
+mvv.en=Tagal Murut
+mvw.en=Machinga
+mvx.en=Meoswar
+mvy.en=Indus Kohistani
+mvz.en=Mesqan
+mwa.en=Mwatebu
+mwb.en=Juwal
+mwc.en=Are
+mwd.en=Mudbura
+mwe.en=Mwera (Chimwera)
+mwf.en=Murrinh-Patha
+mwg.en=Aiklep
+mwh.en=Mouk-Aria
+mwi.en=Labo
+mwj.en=Maligo
+mwk.en=Kita Maninkakan
+mwl.en=Mirandese
+mwm.en=Sar
+mwn.en=Nyamwanga
+mwo.en=Central Maewo
+mwp.en=Kala Lagaw Ya
+mwq.en=Mün Chin
+mwr.en=Marwari
+mws.en=Mwimbi-Muthambi
+mwt.en=Moken
+mwu.en=Mittu
+mwv.en=Mentawai
+mww.en=Hmong Daw
+mwx.en=Mediak
+mwy.en=Mosiro
+mwz.en=Moingi
+mxa.en=Northwest Oaxaca Mixtec
+mxb.en=Tezoatlán Mixtec
+mxc.en=Manyika
+mxd.en=Modang
+mxe.en=Mele-Fila
+mxf.en=Malgbe
+mxg.en=Mbangala
+mxh.en=Mvuba
+mxi.en=Mozarabic
+mxj.en=Miju-Mishmi
+mxk.en=Monumbo
+mxl.en=Maxi Gbe
+mxm.en=Meramera
+mxn.en=Moi (Indonesia)
+mxo.en=Mbowe
+mxp.en=Tlahuitoltepec Mixe
+mxq.en=Juquila Mixe
+mxr.en=Murik (Malaysia)
+mxs.en=Huitepec Mixtec
+mxt.en=Jamiltepec Mixtec
+mxu.en=Mada (Cameroon)
+mxv.en=Metlatónoc Mixtec
+mxw.en=Namo
+mxx.en=Mahou
+mxy.en=Southeastern Nochixtlán Mixtec
+mxz.en=Central Masela
+myb.en=Mbay
+myc.en=Mayeka
+myd.en=Maramba
+mye.en=Myene
+myf.en=Bambassi
+myg.en=Manta
+myh.en=Makah
+myi.en=Mina (India)
+myj.en=Mangayat
+myk.en=Mamara Senoufo
+myl.en=Moma
+mym.en=Me'en
+myn.en=Mayan languages
+myo.en=Anfillo
+myp.en=Pirahã
+myq.en=Forest Maninka
+myr.en=Muniche
+mys.en=Mesmes
+myt.en=Sangab Mandaya
+myu.en=Mundurukú
+myv.en=Erzya
+myw.en=Muyuw
+myx.en=Masaaba
+myy.en=Macuna
+myz.en=Classical Mandaic
+mza.en=Santa María Zacatepec Mixtec
+mzb.en=Tumzabt
+mzc.en=Madagascar Sign Language
+mzd.en=Malimba
+mze.en=Morawa
+mzg.en=Monastic Sign Language
+mzh.en=Wichí Lhamtés Güisnay
+mzi.en=Ixcatlán Mazatec
+mzj.en=Manya
+mzk.en=Nigeria Mambila
+mzl.en=Mazatlán Mixe
+mzm.en=Mumuye
+mzn.en=Mazanderani
+mzo.en=Matipuhy
+mzp.en=Movima
+mzq.en=Mori Atas
+mzr.en=Marúbo
+mzs.en=Macanese
+mzt.en=Mintil
+mzu.en=Inapang
+mzv.en=Manza
+mzw.en=Deg
+mzx.en=Mawayana
+mzy.en=Mozambican Sign Language
+mzz.en=Maiadomu
+naa.en=Namla
+nab.en=Southern Nambikuára
+nac.en=Narak
+nad.en=Nijadali
+nae.en=Naka'ela
+naf.en=Nabak
+nag.en=Naga Pidgin
+nah.en=Nahuatl languages
+nai.en=North American Indian languages
+naj.en=Nalu
+nak.en=Nakanai
+nal.en=Nalik
+nam.en=Nangikurrunggurr
+nan.en=Min Nan Chinese
+nao.en=Naaba
+nap.en=Neapolitan
+naq.en=Nama (Namibia)
+nar.en=Iguta
+nas.en=Naasioi
+nat.en=Hungworo
+naw.en=Nawuri
+nax.en=Nakwi
+nay.en=Narrinyeri
+naz.en=Coatepec Nahuatl
+nba.en=Nyemba
+nbb.en=Ndoe
+nbc.en=Chang Naga
+nbd.en=Ngbinda
+nbe.en=Konyak Naga
+nbf.en=Naxi
+nbg.en=Nagarchal
+nbh.en=Ngamo
+nbi.en=Mao Naga
+nbj.en=Ngarinman
+nbk.en=Nake
+nbm.en=Ngbaka Ma'bo
+nbn.en=Kuri
+nbo.en=Nkukoli
+nbp.en=Nnam
+nbq.en=Nggem
+nbr.en=Numana-Nunku-Gbantu-Numbu
+nbs.en=Namibian Sign Language
+nbt.en=Na
+nbu.en=Rongmei Naga
+nbv.en=Ngamambo
+nbw.en=Southern Ngbandi
+nbx.en=Ngura
+nby.en=Ningera
+nca.en=Iyo
+ncb.en=Central Nicobarese
+ncc.en=Ponam
+ncd.en=Nachering
+nce.en=Yale
+ncf.en=Notsi
+ncg.en=Nisga'a
+nch.en=Central Huasteca Nahuatl
+nci.en=Classical Nahuatl
+ncj.en=Northern Puebla Nahuatl
+nck.en=Nakara
+ncl.en=Michoacán Nahuatl
+ncm.en=Nambo
+ncn.en=Nauna
+nco.en=Sibe
+ncp.en=Ndaktup
+ncr.en=Ncane
+ncs.en=Nicaraguan Sign Language
+nct.en=Chothe Naga
+ncu.en=Chumburung
+ncx.en=Central Puebla Nahuatl
+ncz.en=Natchez
+nda.en=Ndasa
+ndb.en=Kenswei Nsei
+ndc.en=Ndau
+ndd.en=Nde-Nsele-Nta
+ndf.en=Nadruvian
+ndg.en=Ndengereko
+ndh.en=Ndali
+ndi.en=Samba Leko
+ndj.en=Ndamba
+ndk.en=Ndaka
+ndl.en=Ndolo
+ndm.en=Ndam
+ndn.en=Ngundi
+ndp.en=Ndo
+ndq.en=Ndombe
+ndr.en=Ndoola
+nds.en=Low German
+nds=Plattdüütsch
+ndt.en=Ndunga
+ndu.en=Dugun
+ndv.en=Ndut
+ndw.en=Ndobo
+ndx.en=Nduga
+ndy.en=Lutos
+ndz.en=Ndogo
+nea.en=Eastern Ngad'a
+neb.en=Toura (Côte d'Ivoire)
+nec.en=Nedebang
+ned.en=Nde-Gbite
+nee.en=Kumak
+nef.en=Nefamese
+neg.en=Negidal
+neh.en=Nyenkha
+nei.en=Neo-Hittite
+nej.en=Neko
+nek.en=Neku
+nem.en=Nemi
+nen.en=Nengone
+neo.en=Ná-Meo
+neq.en=North Central Mixe
+ner.en=Yahadian
+nes.en=Bhoti Kinnauri
+net.en=Nete
+nev.en=Nyaheun
+new.en=Newari
+nex.en=Neme
+ney.en=Neyo
+nez.en=Nez Perce
+nfa.en=Dhao
+nfd.en=Ahwai
+nfl.en=Ayiwo
+nfr.en=Nafaanra
+nfu.en=Mfumte
+nga.en=Ngbaka
+ngb.en=Northern Ngbandi
+ngc.en=Ngombe (Democratic Republic of Congo)
+ngd.en=Ngando (Central African Republic)
+nge.en=Ngemba
+ngf.en=Trans-New Guinea languages
+ngg.en=Ngbaka Manza
+ngh.en=N/u
+ngi.en=Ngizim
+ngj.en=Ngie
+ngk.en=Ngalkbun
+ngl.en=Lomwe
+ngm.en=Ngatik Men's Creole
+ngn.en=Ngwo
+ngo.en=Ngoni
+ngp.en=Ngulu
+ngq.en=Ngurimi
+ngr.en=Nanggu
+ngs.en=Gvoko
+ngt.en=Ngeq
+ngu.en=Guerrero Nahuatl
+ngv.en=Nagumi
+ngw.en=Ngwaba
+ngx.en=Nggwahyi
+ngy.en=Tibea
+ngz.en=Ngungwel
+nha.en=Nhanda
+nhb.en=Beng
+nhc.en=Tabasco Nahuatl
+nhd.en=Chiripá
+nhe.en=Eastern Huasteca Nahuatl
+nhf.en=Nhuwala
+nhg.en=Tetelcingo Nahuatl
+nhh.en=Nahari
+nhi.en=Zacatlán-Ahuacatlán-Tepetzintla Nahuatl
+nhk.en=Isthmus-Cosoleacaque Nahuatl
+nhm.en=Morelos Nahuatl
+nhn.en=Central Nahuatl
+nho.en=Takuu
+nhp.en=Isthmus-Pajapan Nahuatl
+nhq.en=Huaxcaleca Nahuatl
+nhr.en=Naro
+nht.en=Ometepec Nahuatl
+nhu.en=Noone
+nhv.en=Temascaltepec Nahuatl
+nhw.en=Western Huasteca Nahuatl
+nhx.en=Isthmus-Mecayapan Nahuatl
+nhy.en=Northern Oaxaca Nahuatl
+nhz.en=Santa María La Alta Nahuatl
+nia.en=Nias
+nib.en=Nakama
+nic.en=Niger-Kordofanian languages
+nid.en=Ngandi
+nie.en=Niellim
+nif.en=Nek
+nig.en=Ngalakan
+nih.en=Nyiha (Tanzania)
+nii.en=Nii
+nij.en=Ngaju
+nik.en=Southern Nicobarese
+nil.en=Nila
+nim.en=Nilamba
+nin.en=Ninzo
+nio.en=Nganasan
+niq.en=Nandi
+nir.en=Nimboran
+nis.en=Nimi
+nit.en=Southeastern Kolami
+niu.en=Niuean
+niv.en=Gilyak
+niw.en=Nimo
+nix.en=Hema
+niy.en=Ngiti
+niz.en=Ningil
+nja.en=Nzanyi
+njb.en=Nocte Naga
+njd.en=Ndonde Hamba
+njh.en=Lotha Naga
+nji.en=Gudanji
+njj.en=Njen
+njl.en=Njalgulgule
+njm.en=Angami Naga
+njn.en=Liangmai Naga
+njo.en=Ao Naga
+njr.en=Njerep
+njs.en=Nisa
+njt.en=Ndyuka-Trio Pidgin
+nju.en=Ngadjunmaya
+njx.en=Kunyi
+njy.en=Njyem
+nka.en=Nkoya
+nkb.en=Khoibu Naga
+nkc.en=Nkongho
+nkd.en=Koireng
+nke.en=Duke
+nkf.en=Inpui Naga
+nkg.en=Nekgini
+nkh.en=Khezha Naga
+nki.en=Thangal Naga
+nkj.en=Nakai
+nkk.en=Nokuku
+nkm.en=Namat
+nkn.en=Nkangala
+nko.en=Nkonya
+nkp.en=Niuatoputapu
+nkr.en=Nukuoro
+nks.en=North Asmat
+nkt.en=Nyika (Tanzania)
+nku.en=Bouna Kulango
+nkv.en=Nyika (Malawi and Zambia)
+nkw.en=Nkutu
+nkx.en=Nkoroo
+nkz.en=Nkari
+nla.en=Ngombale
+nlc.en=Nalca
+nle.en=East Nyala
+nlg.en=Gela
+nli.en=Grangali
+nlj.en=Nyali
+nlk.en=Ninia Yali
+nll.en=Nihali
+nln.en=Durango Nahuatl
+nlo.en=Ngul
+nlr.en=Ngarla
+nlu.en=Nchumbulu
+nlv.en=Orizaba Nahuatl
+nlx.en=Nahali
+nly.en=Nyamal
+nlz.en=Nalögo
+nma.en=Maram Naga
+nmb.en=Big Nambas
+nmc.en=Ngam
+nmd.en=Ndumu
+nme.en=Mzieme Naga
+nmf.en=Tangkhul Naga
+nmg.en=Kwasio
+nmh.en=Monsang Naga
+nmi.en=Nyam
+nmj.en=Ngombe (Central African Republic)
+nmk.en=Namakura
+nml.en=Ndemli
+nmm.en=Manangba
+nmn.en=!Xóõ
+nmo.en=Moyon Naga
+nmp.en=Nimanbur
+nmq.en=Nambya
+nmr.en=Nimbari
+nms.en=Letemboi
+nmt.en=Namonuito
+nmu.en=Northeast Maidu
+nmv.en=Ngamini
+nmw.en=Nimoa
+nmx.en=Nama (Papua New Guinea)
+nmy.en=Namuyi
+nmz.en=Nawdm
+nna.en=Nyangumarta
+nnb.en=Nande
+nnc.en=Nancere
+nnd.en=West Ambae
+nne.en=Ngandyera
+nnf.en=Ngaing
+nng.en=Maring Naga
+nnh.en=Ngiemboon
+nni.en=North Nuaulu
+nnj.en=Nyangatom
+nnk.en=Nankina
+nnl.en=Northern Rengma Naga
+nnm.en=Namia
+nnn.en=Ngete
+nnp.en=Wancho Naga
+nnq.en=Ngindo
+nnr.en=Narungga
+nns.en=Ningye
+nnt.en=Nanticoke
+nnu.en=Dwang
+nnv.en=Nugunu (Australia)
+nnw.en=Southern Nuni
+nnx.en=Ngong
+nny.en=Nyangga
+nnz.en=Nda'nda'
+noa.en=Woun Meu
+noc.en=Nuk
+nod.en=Northern Thai
+noe.en=Nimadi
+nof.en=Nomane
+nog.en=Nogai
+noh.en=Nomu
+noi.en=Noiri
+nok.en=Nooksack
+nom.en=Nocamán
+non.en=Old Norse
+noo.en=Nootka
+nop.en=Numanggang
+noq.en=Ngongo
+nos.en=Eastern Nisu
+not.en=Nomatsiguenga
+nou.en=Ewage-Notu
+nov.en=Novial
+now.en=Nyambo
+noy.en=Noy
+noz.en=Nayi
+npa.en=Nar Phu
+npb.en=Nupbikha
+nph.en=Phom Naga
+npl.en=Southeastern Puebla Nahuatl
+npn.en=Mondropolon
+npo.en=Pochuri Naga
+nps.en=Nipsan
+npu.en=Puimei Naga
+npy.en=Napu
+nqg.en=Ede Nago
+nqk.en=Kura Ede Nago
+nqm.en=Ndom
+nqn.en=Nen
+nqo.en=N'Ko
+nra.en=Ngom
+nrb.en=Nara
+nrc.en=Noric
+nre.en=Southern Rengma Naga
+nrg.en=Narango
+nri.en=Chokri Naga
+nrl.en=Ngarluma
+nrm.en=Narom
+nrn.en=Norn
+nrp.en=North Picene
+nrr.en=Norra
+nrt.en=Northern Kalapuya
+nrx.en=Ngurmbur
+nrz.en=Lala
+nsa.en=Sangtam Naga
+nsc.en=Nshi
+nsd.en=Southern Nisu
+nse.en=Nsenga
+nsg.en=Ngasa
+nsh.en=Ngoshie
+nsi.en=Nigerian Sign Language
+nsk.en=Naskapi
+nsl.en=Norwegian Sign Language
+nsm.en=Sumi Naga
+nsn.en=Nehan
+nso.en=Pedi
+nsp.en=Nepalese Sign Language
+nsq.en=Northern Sierra Miwok
+nsr.en=Maritime Sign Language
+nss.en=Nali
+nst.en=Tase Naga
+nsu.en=Sierra Negra Nahuatl
+nsv.en=Southwestern Nisu
+nsw.en=Navut
+nsx.en=Nsongo
+nsy.en=Nasal
+nsz.en=Nisenan
+nte.en=Nathembo
+nti.en=Natioro
+ntj.en=Ngaanyatjarra
+ntk.en=Ikoma-Nata-Isenye
+ntm.en=Nateni
+nto.en=Ntomba
+ntp.en=Northern Tepehuan
+ntr.en=Delo
+nts.en=Natagaimas
+ntu.en=Natügu
+ntw.en=Nottoway
+nty.en=Mantsi
+ntz.en=Natanzi
+nua.en=Yuaga
+nub.en=Nubian languages
+nuc.en=Nukuini
+nud.en=Ngala
+nue.en=Ngundu
+nuf.en=Nusu
+nug.en=Nungali
+nuh.en=Ndunda
+nui.en=Ngumbi
+nuj.en=Nyole
+nul.en=Nusa Laut
+num.en=Niuafo'ou
+nun.en=Nung (Myanmar)
+nuo.en=Nguôn
+nup.en=Nupe-Nupe-Tako
+nuq.en=Nukumanu
+nur.en=Nukuria
+nus.en=Nuer
+nut.en=Nung (Viet Nam)
+nuu.en=Ngbundu
+nuv.en=Northern Nuni
+nuw.en=Nguluwan
+nux.en=Mehek
+nuy.en=Nunggubuyu
+nuz.en=Tlamacazapa Nahuatl
+nvh.en=Nasarian
+nvm.en=Namiae
+nwa.en=Nawathinehena
+nwb.en=Nyabwa
+nwc.en=Classical Newari
+nwe.en=Ngwe
+nwi.en=Southwest Tanna
+nwm.en=Nyamusa-Molo
+nwr.en=Nawaru
+nwx.en=Middle Newar
+nwy.en=Nottoway-Meherrin
+nxa.en=Nauete
+nxd.en=Ngando (Democratic Republic of Congo)
+nxe.en=Nage
+nxg.en=Ngad'a
+nxi.en=Nindi
+nxl.en=South Nuaulu
+nxm.en=Numidian
+nxn.en=Ngawun
+nxr.en=Ninggerum
+nxu.en=Narau
+nxx.en=Nafri
+nyb.en=Nyangbo
+nyc.en=Nyanga-li
+nyd.en=Nyore
+nye.en=Nyengo
+nyf.en=Giryama
+nyg.en=Nyindu
+nyh.en=Nyigina
+nyi.en=Ama (Sudan)
+nyj.en=Nyanga
+nyk.en=Nyaneka
+nyl.en=Nyeu
+nym.en=Nyamwezi
+nyn.en=Nyankole
+nyo.en=Nyoro
+nyp.en=Nyang'i
+nyq.en=Nayini
+nyr.en=Nyiha (Malawi)
+nys.en=Nyunga
+nyt.en=Nyawaygi
+nyu.en=Nyungwe
+nyv.en=Nyulnyul
+nyw.en=Nyaw
+nyx.en=Nganyaywana
+nyy.en=Nyakyusa-Ngonde
+nza.en=Tigon Mbembe
+nzb.en=Njebi
+nzi.en=Nzima
+nzk.en=Nzakara
+nzm.en=Zeme Naga
+nzs.en=New Zealand Sign Language
+nzu.en=Teke-Nzikou
+nzy.en=Nzakambay
+oaa.en=Orok
+oac.en=Oroch
+oar.en=Old Aramaic (up to 700 BCE)
+oav.en=Old Avar
+obi.en=Obispeño
+obl.en=Oblo
+obm.en=Moabite
+obo.en=Obo Manobo
+obr.en=Old Burmese
+obt.en=Old Breton
+obu.en=Obulom
+oca.en=Ocaina
+och.en=Old Chinese
+oco.en=Old Cornish
+ocu.en=Atzingo Matlatzinca
+oda.en=Odut
+odk.en=Od
+odt.en=Old Dutch
+odu.en=Odual
+ofo.en=Ofo
+ofs.en=Old Frisian
+ofu.en=Efutop
+ogb.en=Ogbia
+ogc.en=Ogbah
+oge.en=Old Georgian
+ogg.en=Ogbogolo
+ogo.en=Khana
+ogu.en=Ogbronuagum
+oht.en=Old Hittite
+ohu.en=Old Hungarian
+oia.en=Oirata
+oin.en=Inebu One
+ojb.en=Northwestern Ojibwa
+ojc.en=Central Ojibwa
+ojg.en=Eastern Ojibwa
+ojp.en=Old Japanese
+ojs.en=Severn Ojibwa
+ojv.en=Ontong Java
+ojw.en=Western Ojibwa
+oka.en=Okanagan
+okb.en=Okobo
+okd.en=Okodia
+oke.en=Okpe (Southwestern Edo)
+okh.en=Koresh-e Rostam
+oki.en=Okiek
+okj.en=Oko-Juwoi
+okk.en=Kwamtim One
+okl.en=Old Kentish Sign Language
+okm.en=Middle Korean (10th-16th cent.)
+okn.en=Oki-No-Erabu
+oko.en=Old Korean (3rd-9th cent.)
+okr.en=Kirike
+oks.en=Oko-Eni-Osayen
+oku.en=Oku
+okv.en=Orokaiva
+okx.en=Okpe (Northwestern Edo)
+ola.en=Walungge
+old.en=Mochi
+ole.en=Olekha
+olm.en=Oloma
+olo.en=Livvi
+olr.en=Olrat
+oma.en=Omaha-Ponca
+omb.en=East Ambae
+omc.en=Mochica
+ome.en=Omejes
+omg.en=Omagua
+omi.en=Omi
+omk.en=Omok
+oml.en=Ombo
+omn.en=Minoan
+omo.en=Utarmbung
+omp.en=Old Manipuri
+omq.en=Oto-Manguean languages
+omr.en=Old Marathi
+omt.en=Omotik
+omu.en=Omurano
+omv.en=Omotic languages
+omw.en=South Tairora
+omx.en=Old Mon
+ona.en=Ona
+onb.en=Lingao
+one.en=Oneida
+ong.en=Olo
+oni.en=Onin
+onj.en=Onjob
+onk.en=Kabore One
+onn.en=Onobasulu
+ono.en=Onondaga
+onp.en=Sartang
+onr.en=Northern One
+ons.en=Ono
+ont.en=Ontenu
+onu.en=Unua
+onw.en=Old Nubian
+onx.en=Onin Based Pidgin
+ood.en=Tohono O'odham
+oog.en=Ong
+oon.en=Önge
+oor.en=Oorlams
+oos.en=Old Ossetic
+opa.en=Okpamheri
+opk.en=Kopkaka
+opm.en=Oksapmin
+opo.en=Opao
+opt.en=Opata
+opy.en=Ofayé
+ora.en=Oroha
+orc.en=Orma
+ore.en=Orejón
+org.en=Oring
+orh.en=Oroqen
+orn.en=Orang Kanaq
+oro.en=Orokolo
+orr.en=Oruma
+ors.en=Orang Seletar
+ort.en=Adivasi Oriya
+oru.en=Ormuri
+orv.en=Old Russian
+orw.en=Oro Win
+orx.en=Oro
+orz.en=Ormu
+osa.en=Osage
+osc.en=Oscan
+osi.en=Osing
+oso.en=Ososo
+osp.en=Old Spanish
+ost.en=Osatu
+osu.en=Southern One
+osx.en=Old Saxon
+ota.en=Ottoman Turkish (1500-1928)
+otb.en=Old Tibetan
+otd.en=Ot Danum
+ote.en=Mezquital Otomi
+oti.en=Oti
+otk.en=Old Turkish
+otl.en=Tilapa Otomi
+otm.en=Eastern Highland Otomi
+otn.en=Tenango Otomi
+oto.en=Otomian languages
+otq.en=Querétaro Otomi
+otr.en=Otoro
+ots.en=Estado de México Otomi
+ott.en=Temoaya Otomi
+otu.en=Otuke
+otw.en=Ottawa
+otx.en=Texcatepec Otomi
+oty.en=Old Tamil
+otz.en=Ixtenco Otomi
+oua.en=Tagargrent
+oub.en=Glio-Oubi
+oue.en=Ounge
+oui.en=Old Uighur
+oum.en=Ouma
+oun.en=!O!ung
+owi.en=Owiniga
+owl.en=Old Welsh
+oyb.en=Oy
+oyd.en=Oyda
+oym.en=Wayampi
+oyy.en=Oya'oya
+ozm.en=Koonzime
+paa.en=Papuan languages
+pab.en=Parecís
+pac.en=Pacoh
+pad.en=Paumarí
+pae.en=Pagibete
+paf.en=Paranawát
+pag.en=Pangasinan
+pah.en=Tenharim
+pai.en=Pe
+pak.en=Parakanã
+pal.en=Pahlavi
+pam.en=Pampanga
+pao.en=Northern Paiute
+pap.en=Papiamento
+paq.en=Parya
+par.en=Panamint
+pas.en=Papasena
+pat.en=Papitalai
+pau.en=Palauan
+pav.en=Pakaásnovos
+paw.en=Pawnee
+pax.en=Pankararé
+pay.en=Pech
+paz.en=Pankararú
+pbb.en=Páez
+pbc.en=Patamona
+pbe.en=Mezontla Popoloca
+pbf.en=Coyotepec Popoloca
+pbg.en=Paraujano
+pbh.en=E'ñapa Woromaipu
+pbi.en=Parkwa
+pbl.en=Mak (Nigeria)
+pbn.en=Kpasam
+pbo.en=Papel
+pbp.en=Badyara
+pbr.en=Pangwa
+pbs.en=Central Pame
+pbt.en=Southern Pashto
+pbu.en=Northern Pashto
+pbv.en=Pnar
+pby.en=Pyu
+pbz.en=Palu
+pca.en=Santa Inés Ahuatempan Popoloca
+pcb.en=Pear
+pcc.en=Bouyei
+pcd.en=Picard
+pce.en=Ruching Palaung
+pcf.en=Paliyan
+pcg.en=Paniya
+pch.en=Pardhan
+pci.en=Duruwa
+pcj.en=Parenga
+pck.en=Paite Chin
+pcl.en=Pardhi
+pcm.en=Nigerian Pidgin
+pcn.en=Piti
+pcp.en=Pacahuara
+pcr.en=Panang
+pcw.en=Pyapun
+pda.en=Anam
+pdc.en=Pennsylvania German
+pdi.en=Pa Di
+pdn.en=Podena
+pdo.en=Padoe
+pdt.en=Plautdietsch
+pdu.en=Kayan
+pea.en=Peranakan Indonesian
+peb.en=Eastern Pomo
+ped.en=Mala (Papua New Guinea)
+pee.en=Taje
+pef.en=Northeastern Pomo
+peg.en=Pengo
+peh.en=Bonan
+pei.en=Chichimeca-Jonaz
+pej.en=Northern Pomo
+pek.en=Penchal
+pel.en=Pekal
+pem.en=Phende
+peo.en=Old Persian (ca. 600-400 B.C.)
+pep.en=Kunja
+peq.en=Southern Pomo
+pes.en=Western Farsi
+pev.en=Pémono
+pex.en=Petats
+pey.en=Petjo
+pez.en=Eastern Penan
+pfa.en=Pááfang
+pfe.en=Peere
+pfl.en=Pfaelzisch
+pga.en=Sudanese Creole Arabic
+pgg.en=Pangwali
+pgi.en=Pagi
+pgk.en=Rerep
+pgn.en=Paelignian
+pgs.en=Pangseng
+pgu.en=Pagu
+pgy.en=Pongyong
+pha.en=Pa-Hng
+phd.en=Phudagi
+phg.en=Phuong
+phh.en=Phukha
+phi.en=Philippine languages
+phk.en=Phake
+phl.en=Phalura
+phm.en=Phimbi
+phn.en=Phoenician
+pho.en=Phunoi
+phq.en=Phana'
+phr.en=Pahari-Potwari
+pht.en=Phu Thai
+phu.en=Phuan
+phv.en=Pahlavani
+phw.en=Phangduwali
+pia.en=Pima Bajo
+pib.en=Yine
+pic.en=Pinji
+pid.en=Piaroa
+pie.en=Piro
+pif.en=Pingelapese
+pig.en=Pisabo
+pih.en=Pitcairn-Norfolk
+pii.en=Pini
+pij.en=Pijao
+pil.en=Yom
+pim.en=Powhatan
+pin.en=Piame
+pio.en=Piapoco
+pip.en=Pero
+pir.en=Piratapuyo
+pis.en=Pijin
+pit.en=Pitta Pitta
+piu.en=Pintupi-Luritja
+piv.en=Pileni
+piw.en=Pimbwe
+pix.en=Piu
+piy.en=Piya-Kwonci
+piz.en=Pije
+pjt.en=Pitjantjatjara
+pka.en=Ardham�gadhī Pr�krit
+pkb.en=Pokomo
+pkc.en=Paekche
+pkg.en=Pak-Tong
+pkh.en=Pankhu
+pkn.en=Pakanha
+pko.en=Pökoot
+pkp.en=Pukapuka
+pkr.en=Attapady Kurumba
+pks.en=Pakistan Sign Language
+pkt.en=Maleng
+pku.en=Paku
+pla.en=Miani
+plb.en=Polonombauk
+plc.en=Central Palawano
+pld.en=Polari
+ple.en=Palu'e
+plf.en=Central Malayo-Polynesian languages
+plg.en=Pilagá
+plh.en=Paulohi
+plj.en=Polci
+plk.en=Kohistani Shina
+pll.en=Shwe Palaung
+pln.en=Palenquero
+plo.en=Oluta Popoluca
+plp.en=Palpa
+plq.en=Palaic
+plr.en=Palaka Senoufo
+pls.en=San Marcos Tlalcoyalco Popoloca
+plt.en=Plateau Malagasy
+plu.en=Palikúr
+plv.en=Southwest Palawano
+plw.en=Brooke's Point Palawano
+ply.en=Bolyu
+plz.en=Paluan
+pma.en=Paama
+pmb.en=Pambia
+pmc.en=Palumata
+pme.en=Pwaamei
+pmf.en=Pamona
+pmh.en=M�h�r�ṣṭri Pr�krit
+pmi.en=Northern Pumi
+pmj.en=Southern Pumi
+pmk.en=Pamlico
+pml.en=Lingua Franca
+pmm.en=Pomo
+pmn.en=Pam
+pmo.en=Pom
+pmq.en=Northern Pame
+pmr.en=Paynamar
+pms.en=Piemontese
+pmt.en=Tuamotuan
+pmu.en=Mirpur Panjabi
+pmw.en=Plains Miwok
+pmx.en=Poumei Naga
+pmy.en=Papuan Malay
+pmz.en=Southern Pame
+pna.en=Punan Bah-Biau
+pnb.en=Western Panjabi
+pnc.en=Pannei
+pne.en=Western Penan
+png.en=Pongu
+pnh.en=Penrhyn
+pni.en=Aoheng
+pnm.en=Punan Batu 1
+pnn.en=Pinai-Hagahai
+pno.en=Panobo
+pnp.en=Pancana
+pnq.en=Pana (Burkina Faso)
+pnr.en=Panim
+pns.en=Ponosakan
+pnt.en=Pontic
+pnu.en=Jiongnai Bunu
+pnv.en=Pinigura
+pnw.en=Panytyima
+pnx.en=Phong-Kniang
+pny.en=Pinyin
+pnz.en=Pana (Central African Republic)
+poc.en=Poqomam
+pod.en=Ponares
+poe.en=San Juan Atzingo Popoloca
+pof.en=Poke
+pog.en=Potiguára
+poh.en=Poqomchi'
+poi.en=Highland Popoluca
+pok.en=Pokangá
+pom.en=Southeastern Pomo
+pon.en=Pohnpeian
+poo.en=Central Pomo
+pop.en=Pwapwa
+poq.en=Texistepec Popoluca
+pos.en=Sayula Popoluca
+pot.en=Potawatomi
+pot=Neshnabémwen
+pov.en=Upper Guinea Crioulo
+pow.en=San Felipe Otlaltepec Popoloca
+pox.en=Polabian
+poy.en=Pogolo
+poz.en=Malayo-Polynesian languages
+ppa.en=Pao
+ppe.en=Papi
+ppi.en=Paipai
+ppk.en=Uma
+ppl.en=Pipil
+ppm.en=Papuma
+ppn.en=Papapana
+ppo.en=Folopa
+ppp.en=Pelende
+ppq.en=Pei
+ppr.en=Piru
+pps.en=San Luís Temalacayuca Popoloca
+ppt.en=Pare
+ppu.en=Papora
+pqa.en=Pa'a
+pqe.en=Eastern Malayo-Polynesian languages
+pqm.en=Malecite-Passamaquoddy
+pqw.en=Western Malayo-Polynesian languages
+pra.en=Prakrit languages
+prb.en=Lua'
+prc.en=Parachi
+prd.en=Parsi-Dari
+pre.en=Principense
+prg.en=Prussian
+prh.en=Porohanon
+pri.en=Paicî
+prk.en=Parauk
+prl.en=Peruvian Sign Language
+prm.en=Kibiri
+prn.en=Prasuni
+pro.en=Old Provençal (to 1500)
+prp.en=Parsi
+prq.en=Ashéninka Perené
+prr.en=Puri
+prs.en=Dari
+prs=دری
+prt.en=Phai
+pru.en=Puragi
+prw.en=Parawen
+prx.en=Purik
+pry.en=Pray 3
+prz.en=Providencia Sign Language
+psa.en=Asue Awyu
+psc.en=Persian Sign Language
+psd.en=Plains Indian Sign Language
+pse.en=Central Malay
+psg.en=Penang Sign Language
+psh.en=Southwest Pashayi
+psi.en=Southeast Pashayi
+psl.en=Puerto Rican Sign Language
+psm.en=Pauserna
+psn.en=Panasuan
+pso.en=Polish Sign Language
+psp.en=Philippine Sign Language
+psq.en=Pasi
+psr.en=Portuguese Sign Language
+pss.en=Kaulong
+pst.en=Central Pashto
+psu.en=Sauraseni Pr�krit
+psw.en=Port Sandwich
+psy.en=Piscataway
+pta.en=Pai Tavytera
+pth.en=Pataxó Hã-Ha-Hãe
+pti.en=Pintiini
+ptn.en=Patani
+pto.en=Zo'é
+ptp.en=Patep
+ptr.en=Piamatsina
+ptt.en=Enrekang
+ptu.en=Bambam
+ptv.en=Port Vato
+ptw.en=Pentlatch
+pty.en=Pathiya
+pua.en=Western Highland Purepecha
+pub.en=Purum
+puc.en=Punan Merap
+pud.en=Punan Aput
+pue.en=Puelche
+puf.en=Punan Merah
+pug.en=Phuie
+pui.en=Puinave
+puj.en=Punan Tubu
+puk.en=Pu Ko
+pum.en=Puma
+puo.en=Puoc
+pup.en=Pulabu
+puq.en=Puquina
+pur.en=Puruborá
+put.en=Putoh
+puu.en=Punu
+puw.en=Puluwatese
+pux.en=Puare
+puy.en=Purisimeño
+puz.en=Purum Naga
+pwa.en=Pawaia
+pwb.en=Panawa
+pwg.en=Gapapaiwa
+pwm.en=Molbog
+pwn.en=Paiwan
+pwo.en=Pwo Western Karen
+pwr.en=Powari
+pww.en=Pwo Northern Karen
+pxm.en=Quetzaltepec Mixe
+pye.en=Pye Krumen
+pym.en=Fyam
+pyn.en=Poyanáwa
+pyu.en=Puyuma
+pyx.en=Pyu (Myanmar)
+pyy.en=Pyen
+pzn.en=Para Naga
+qua.en=Quapaw
+qub.en=Huallaga Huánuco Quechua
+quc.en=K'iche'
+quc=Qatzijob'al
+qud.en=Calderón Highland Quichua
+quf.en=Lambayeque Quechua
+qug.en=Chimborazo Highland Quichua
+quh.en=South Bolivian Quechua
+qui.en=Quileute
+quk.en=Chachapoyas Quechua
+qul.en=North Bolivian Quechua
+qum.en=Sipacapense
+qun.en=Quinault
+qup.en=Southern Pastaza Quechua
+quq.en=Quinqui
+qur.en=Yanahuanca Pasco Quechua
+qus.en=Santiago del Estero Quichua
+quv.en=Sacapulteco
+quw.en=Tena Lowland Quichua
+qux.en=Yauyos Quechua
+quy.en=Ayacucho Quechua
+quz.en=Cusco Quechua
+qva.en=Ambo-Pasco Quechua
+qvc.en=Cajamarca Quechua
+qve.en=Eastern Apurímac Quechua
+qvh.en=Huamalíes-Dos de Mayo Huánuco Quechua
+qvi.en=Imbabura Highland Quichua
+qvj.en=Loja Highland Quichua
+qvl.en=Cajatambo North Lima Quechua
+qvm.en=Margos-Yarowilca-Lauricocha Quechua
+qvn.en=North Junín Quechua
+qvo.en=Napo Lowland Quechua
+qvp.en=Pacaraos Quechua
+qvs.en=San Martín Quechua
+qvw.en=Huaylla Wanca Quechua
+qvy.en=Queyu
+qvz.en=Northern Pastaza Quichua
+qwa.en=Corongo Ancash Quechua
+qwc.en=Classical Quechua
+qwe.en=Quechuan (family)
+qwh.en=Huaylas Ancash Quechua
+qwm.en=Kuman (Russia)
+qws.en=Sihuas Ancash Quechua
+qwt.en=Kwalhioqua-Tlatskanai
+qxa.en=Chiquián Ancash Quechua
+qxc.en=Chincha Quechua
+qxh.en=Panao Huánuco Quechua
+qxl.en=Salasaca Highland Quichua
+qxn.en=Northern Conchucos Ancash Quechua
+qxo.en=Southern Conchucos Ancash Quechua
+qxp.en=Puno Quechua
+qxq.en=Qashqa'i
+qxr.en=Cañar Highland Quichua
+qxs.en=Southern Qiang
+qxt.en=Santa Ana de Tusi Pasco Quechua
+qxu.en=Arequipa-La Unión Quechua
+qxw.en=Jauja Wanca Quechua
+qya.en=Quenya
+qyp.en=Quiripi
+raa.en=Dungmali
+rab.en=Camling
+rac.en=Rasawa
+rad.en=Rade
+raf.en=Western Meohang
+rag.en=Logooli
+rah.en=Rabha
+rai.en=Ramoaaina
+raj.en=Rajasthani
+rak.en=Tulu-Bohuai
+ral.en=Ralte
+ram.en=Canela
+ran.en=Riantana
+rao.en=Rao
+rap.en=Rapanui
+raq.en=Saam
+rar.en=Rarotongan
+ras.en=Tegali
+rat.en=Razajerdi
+rau.en=Raute
+rav.en=Sampang
+raw.en=Rawang
+rax.en=Rang
+ray.en=Rapa
+raz.en=Rahambuu
+rbb.en=Rumai Palaung
+rcf.en=Réunion Creole French
+rdb.en=Rudbari
+rea.en=Rerau
+reb.en=Rembong
+ree.en=Rejang Kayan
+reg.en=Kara (Tanzania)
+rei.en=Reli
+rej.en=Rejang
+rel.en=Rendille
+rem.en=Remo
+ren.en=Rengao
+rer.en=Rer Bare
+res.en=Reshe
+ret.en=Retta
+rey.en=Reyesano
+rga.en=Roria
+rge.en=Romano-Greek
+rgk.en=Rangkas
+rgn.en=Romagnol
+rgr.en=Resígaro
+rgs.en=Southern Roglai
+rgu.en=Ringgou
+rhg.en=Rohingya
+rhp.en=Yahang
+ria.en=Riang (India)
+rie.en=Rien
+rif.en=Tarifit
+ril.en=Riang (Myanmar)
+rim.en=Nyaturu
+rin.en=Nungu
+rir.en=Ribun
+rit.en=Ritarungo
+riu.en=Riung
+rjg.en=Rajong
+rji.en=Raji
+rjs.en=Rajbanshi
+rka.en=Kraol
+rkb.en=Rikbaktsa
+rkh.en=Rakahanga-Manihiki
+rki.en=Rakhine
+rkm.en=Marka
+rkt.en=Rangpuri
+rma.en=Rama
+rmb.en=Rembarunga
+rmc.en=Carpathian Romani
+rmd.en=Traveller Danish
+rme.en=Angloromani
+rmf.en=Kalo Finnish Romani
+rmg.en=Traveller Norwegian
+rmh.en=Murkim
+rmi.en=Lomavren
+rmk.en=Romkun
+rml.en=Baltic Romani
+rmm.en=Roma
+rmn.en=Balkan Romani
+rmo.en=Sinte Romani
+rmp.en=Rempi
+rmr.en=Caló
+rms.en=Romanian Sign Language
+rmt.en=Domari
+rmu.en=Tavringer Romani
+rmv.en=Romanova
+rmw.en=Welsh Romani
+rmx.en=Romam
+rmy.en=Vlax Romani
+rmz.en=Marma
+rna.en=Runa
+rnd.en=Ruund
+rng.en=Ronga
+rnl.en=Ranglong
+rnn.en=Roon
+rnp.en=Rongpo
+rnw.en=Rungwa
+roa.en=Romance languages
+rob.en=Tae'
+roc.en=Cacgia Roglai
+rod.en=Rogo
+roe.en=Ronji
+rof.en=Rombo
+rog.en=Northern Roglai
+rol.en=Romblomanon
+rom.en=Romany
+roo.en=Rotokas
+rop.en=Kriol
+ror.en=Rongga
+rou.en=Runga
+row.en=Dela-Oenale
+rpn.en=Repanbitip
+rpt.en=Rapting
+rri.en=Ririo
+rro.en=Waima
+rsb.en=Romano-Serbian
+rsi.en=Rennellese Sign Language
+rsl.en=Russian Sign Language
+rth.en=Ratahan
+rtm.en=Rotuman
+rtw.en=Rathawi
+rub.en=Gungu
+ruc.en=Ruuli
+rue.en=Rusyn
+ruf.en=Luguru
+rug.en=Roviana
+ruh.en=Ruga
+rui.en=Rufiji
+ruk.en=Che
+ruo.en=Istro Romanian
+rup.en=Macedo-Romanian
+ruq.en=Megleno Romanian
+rut.en=Rutul
+ruu.en=Lanas Lobu
+ruy.en=Mala (Nigeria)
+ruz.en=Ruma
+rwa.en=Rawo
+rwk.en=Rwa
+rwm.en=Amba (Uganda)
+rwo.en=Rawa
+rwr.en=Marwari (India)
+ryn.en=Northern Amami-Oshima
+rys.en=Yaeyama
+ryu.en=Central Okinawan
+saa.en=Saba
+sab.en=Buglere
+sac.en=Meskwaki
+sad.en=Sandawe
+sae.en=Sabanê
+sae=Sabanês
+saf.en=Safaliba
+sah.en=Yakut
+sai.en=South American Indian languages
+saj.en=Sahu
+sak.en=Sake
+sal.en=Salishan languages
+sam.en=Samaritan Aramaic
+sao.en=Sause
+sap.en=Sanapaná
+saq.en=Samburu
+sar.en=Saraveca
+sas.en=Sasak
+sat.en=Santali
+sau.en=Saleman
+sav.en=Saafi-Saafi
+saw.en=Sawi
+sax.en=Sa
+say.en=Saya
+saz.en=Saurashtra
+sba.en=Ngambay
+sbb.en=Simbo
+sbc.en=Kele (Papua New Guinea)
+sbd.en=Southern Samo
+sbe.en=Saliba
+sbf.en=Shabo
+sbg.en=Seget
+sbh.en=Sori-Harengan
+sbi.en=Seti
+sbj.en=Surbakhal
+sbk.en=Safwa
+sbl.en=Botolan Sambal
+sbm.en=Sagala
+sbn.en=Sindhi Bhil
+sbo.en=Sabüm
+sbp.en=Sangu (Tanzania)
+sbq.en=Sileibi
+sbr.en=Sembakung Murut
+sbs.en=Subiya
+sbt.en=Kimki
+sbu.en=Stod Bhoti
+sbv.en=Sabine
+sbw.en=Simba
+sbx.en=Seberuang
+sby.en=Soli
+sbz.en=Sara Kaba
+sca.en=Sansu
+scb.en=Chut
+sce.en=Dongxiang
+scf.en=San Miguel Creole French
+scg.en=Sanggau
+sch.en=Sakachep
+sci.en=Sri Lankan Creole Malay
+sck.en=Sadri
+scl.en=Shina
+scn.en=Sicilian
+sco.en=Scots
+scp.en=Helambu Sherpa
+scq.en=Sa'och
+scs.en=North Slavey
+scu.en=Shumcho
+scv.en=Sheni
+scw.en=Sha
+scx.en=Sicel
+sda.en=Toraja-Sa'dan
+sdb.en=Shabak
+sdc.en=Sassarese Sardinian
+sde.en=Surubu
+sdf.en=Sarli
+sdg.en=Savi
+sdh.en=Southern Kurdish
+sdj.en=Suundi
+sdk.en=Sos Kundi
+sdl.en=Saudi Arabian Sign Language
+sdm.en=Semandang
+sdn.en=Gallurese Sardinian
+sdo.en=Bukar-Sadung Bidayuh
+sdp.en=Sherdukpen
+sdr.en=Oraon Sadri
+sds.en=Sened
+sdt.en=Shuadit
+sdu.en=Sarudu
+sdv.en=Eastern Sudanic languages
+sdx.en=Sibu Melanau
+sdz.en=Sallands
+sea.en=Semai
+seb.en=Shempire Senoufo
+sec.en=Sechelt
+sed.en=Sedang
+see.en=Seneca
+sef.en=Cebaara Senoufo
+seg.en=Segeju
+seh.en=Sena
+sei.en=Seri
+sej.en=Sene
+sek.en=Sekani
+sel.en=Selkup
+sem.en=Semitic languages
+sen.en=Nanerigé Sénoufo
+seo.en=Suarmin
+sep.en=Sìcìté Sénoufo
+seq.en=Senara Sénoufo
+ser.en=Serrano
+ses.en=Koyraboro Senni Songhai
+set.en=Sentani
+seu.en=Serui-Laut
+sev.en=Nyarafolo Senoufo
+sew.en=Sewa Bay
+sey.en=Secoya
+sez.en=Senthang Chin
+sfb.en=Langue des signes de Belgique Francophone
+sfm.en=Small Flowery Miao
+sfs.en=South African Sign Language
+sfw.en=Sehwi
+sga.en=Old Irish (to 900)
+sgb.en=Mag-Anchi Ayta
+sgc.en=Kipsigis
+sge.en=Segai
+sgg.en=Swiss-German Sign Language
+sgh.en=Shughni
+sgi.en=Suga
+sgk.en=Sangkong
+sgl.en=Sanglechi-Ishkashimi
+sgm.en=Singa
+sgn.en=Sign languages
+sgo.en=Songa
+sgp.en=Singpho
+sgr.en=Sangisari
+sgt.en=Brokpake
+sgu.en=Salas
+sgw.en=Sebat Bet Gurage
+sgx.en=Sierra Leone Sign Language
+sgz.en=Sursurunga
+sha.en=Shall-Zwall
+shb.en=Ninam
+shc.en=Sonde
+she.en=Sheko
+shg.en=Shua
+shh.en=Shoshoni
+shi.en=Tachelhit
+shj.en=Shatt
+shk.en=Shilluk
+shl.en=Shendu
+shm.en=Shahrudi
+shn.en=Shan
+sho.en=Shanga
+shp.en=Shipibo-Conibo
+shq.en=Sala
+shr.en=Shi
+shs.en=Shuswap
+sht.en=Shasta
+shu.en=Chadian Arabic
+shv.en=Shehri
+shw.en=Shwai
+shx.en=She
+shy.en=Tachawit
+shz.en=Syenara Senoufo
+sia.en=Akkala Sami
+sib.en=Sebop
+sid.en=Sidamo
+sie.en=Simaa
+sif.en=Siamou
+sig.en=Paasaal
+sih.en=Zire
+sii.en=Shom Peng
+sij.en=Numbami
+sik.en=Sikiana
+sil.en=Tumulung Sisaala
+sim.en=Mende (Papua New Guinea)
+sio.en=Siouan languages
+sip.en=Sikkimese
+siq.en=Sonia
+sir.en=Siri
+sis.en=Siuslaw
+sit.en=Sino-Tibetan languages
+siu.en=Sinagen
+siv.en=Sumariup
+siw.en=Siwai
+six.en=Sumau
+siy.en=Sivandi
+siz.en=Siwi
+sja.en=Epena
+sjb.en=Sajau Basap
+sjd.en=Kildin Sami
+sje.en=Pite Sami
+sjg.en=Assangori
+sjk.en=Kemi Sami
+sjl.en=Sajalong
+sjm.en=Mapun
+sjn.en=Sindarin
+sjo.en=Xibe
+sjp.en=Surjapuri
+sjr.en=Siar-Lak
+sjs.en=Senhaja De Srair
+sjt.en=Ter Sami
+sju.en=Ume Sami
+sjw.en=Shawnee
+ska.en=Skagit
+skb.en=Saek
+skc.en=Sauk
+skd.en=Southern Sierra Miwok
+ske.en=Seke (Vanuatu)
+skf.en=Sakirabiá
+skg.en=Sakalava Malagasy
+skh.en=Sikule
+ski.en=Sika
+skj.en=Seke (Nepal)
+skk.en=Sok
+skm.en=Sakam
+skn.en=Kolibugan Subanon
+sko.en=Seko Tengah
+skp.en=Sekapan
+skq.en=Sininkere
+skr.en=Seraiki
+sks.en=Maia
+skt.en=Sakata
+sku.en=Sakao
+skv.en=Skou
+skw.en=Skepi Creole Dutch
+skx.en=Seko Padang
+sky.en=Sikaiana
+skz.en=Sekar
+sla.en=Slavic languages
+slc.en=Sáliba
+sld.en=Sissala
+sle.en=Sholaga
+slf.en=Swiss-Italian Sign Language
+slg.en=Selungai Murut
+slh.en=Southern Puget Sound Salish
+sli.en=Lower Silesian
+slj.en=Salumá
+sll.en=Salt-Yui
+slm.en=Pangutaran Sama
+sln.en=Salinan
+slp.en=Lamaholot
+slq.en=Salchuq
+slr.en=Salar
+sls.en=Singapore Sign Language
+slt.en=Sila
+slu.en=Selaru
+slw.en=Sialum
+slx.en=Salampasu
+sly.en=Selayar
+slz.en=Ma'ya
+sma.en=Southern Sami
+smb.en=Simbari
+smc.en=Som
+smd.en=Sama
+smf.en=Auwe
+smg.en=Simbali
+smh.en=Samei
+smi.en=Sami languages
+smj.en=Lule Sami
+smk.en=Bolinao
+sml.en=Central Sama
+smm.en=Musasa
+smn.en=Inari Sami
+smp.en=Samaritan
+smq.en=Samo
+smr.en=Simeulue
+sms.en=Skolt Sami
+smt.en=Simte
+smu.en=Somray
+smv.en=Samvedi
+smw.en=Sumbawa
+smx.en=Samba
+smy.en=Semnani
+smz.en=Simeku
+snb.en=Sebuyau
+snc.en=Sinaugoro
+sne.en=Bau Bidayuh
+snf.en=Noon
+sng.en=Sanga (Democratic Republic of Congo)
+snh.en=Shinabo
+sni.en=Sensi
+snj.en=Riverain Sango
+snk.en=Soninke
+snl.en=Sangil
+snm.en=Southern Ma'di
+snn.en=Siona
+sno.en=Snohomish
+snp.en=Siane
+snq.en=Sangu (Gabon)
+snr.en=Sihan
+sns.en=South West Bay
+snu.en=Senggi
+snv.en=Sa'ban
+snw.en=Selee
+snx.en=Sam
+sny.en=Saniyo-Hiyewe
+snz.en=Sinsauru
+soa.en=Thai Song
+sob.en=Sobei
+soc.en=So (Democratic Republic of Congo)
+sod.en=Songoora
+soe.en=Songomeno
+sog.en=Sogdian
+soh.en=Aka
+soi.en=Sonha
+soj.en=Soi
+sok.en=Sokoro
+sol.en=Solos
+son.en=Songhai languages
+soo.en=Songo
+sop.en=Songe
+soq.en=Kanasi
+sor.en=Somrai
+sos.en=Seeku
+sou.en=Southern Thai
+sov.en=Sonsorol
+sow.en=Sowanda
+sox.en=So (Cameroon)
+soy.en=Miyobe
+soz.en=Temi
+spb.en=Sepa (Indonesia)
+spc.en=Sapé
+spd.en=Saep
+spe.en=Sepa (Papua New Guinea)
+spg.en=Sian
+spi.en=Saponi
+spk.en=Sengo
+spl.en=Selepet
+spm.en=Sepen
+spo.en=Spokane
+spp.en=Supyire Senoufo
+spq.en=Loreto-Ucayali Spanish
+spr.en=Saparua
+sps.en=Saposa
+spt.en=Spiti Bhoti
+spu.en=Sapuan
+spx.en=South Picene
+spy.en=Sabaot
+sqa.en=Shama-Sambuga
+sqh.en=Shau
+sqj.en=Albanian languages
+sqm.en=Suma
+sqn.en=Susquehannock
+sqo.en=Sorkhei
+sqq.en=Sou
+sqr.en=Siculo Arabic
+sqs.en=Sri Lankan Sign Language
+sqt.en=Soqotri
+squ.en=Squamish
+sra.en=Saruga
+srb.en=Sora
+src.en=Logudorese Sardinian
+sre.en=Sara
+srf.en=Nafi
+srg.en=Sulod
+srh.en=Sarikoli
+sri.en=Siriano
+srk.en=Serudung Murut
+srl.en=Isirawa
+srm.en=Saramaccan
+srn.en=Sranan Tongo
+srn=Sranan Tongo
+sro.en=Campidanese Sardinian
+srq.en=Sirionó
+srr.en=Serer
+srs.en=Sarsi
+srt.en=Sauri
+sru.en=Suruí
+srv.en=Waray Sorsogon
+srw.en=Serua
+srx.en=Sirmauri
+sry.en=Sera
+srz.en=Shahmirzadi
+ssa.en=Nilo-Saharan languages
+ssb.en=Southern Sama
+ssc.en=Suba-Simbiti
+ssd.en=Siroi
+sse.en=Balangingi
+ssf.en=Thao
+ssg.en=Seimat
+ssh.en=Shihhi Arabic
+ssi.en=Sansi
+ssj.en=Sausi
+ssk.en=Sunam
+ssl.en=Western Sisaala
+ssm.en=Semnam
+ssn.en=Waata
+sso.en=Sissano
+ssp.en=Spanish Sign Language
+ssq.en=So'a
+ssr.en=Swiss-French Sign Language
+sss.en=Sô
+sst.en=Sinasina
+ssu.en=Susuami
+ssv.en=Shark Bay
+ssx.en=Samberigi
+ssy.en=Saho
+ssz.en=Sengseng
+sta.en=Settla
+stb.en=Northern Subanen
+std.en=Sentinel
+ste.en=Liana-Seti
+stf.en=Seta
+stg.en=Trieng
+sth.en=Shelta
+sti.en=Bulo Stieng
+stj.en=Matya Samo
+stk.en=Arammba
+stl.en=Stellingwerfs
+stm.en=Setaman
+stn.en=Owa
+sto.en=Stoney
+stp.en=Southeastern Tepehuan
+stq.en=Saterfriesisch
+str.en=Straits Salish
+sts.en=Shumashti
+stt.en=Budeh Stieng
+stu.en=Samtao
+stv.en=Silt'e
+stw.en=Satawalese
+sua.en=Sulka
+sub.en=Suku
+suc.en=Western Subanon
+sue.en=Suena
+sug.en=Suganga
+sui.en=Suki
+suj.en=Shubi
+suk.en=Sukuma
+sul.en=Surigaonon
+sum.en=Sumo-Mayangna
+suq.en=Suri
+sur.en=Mwaghavul
+sus.en=Susu
+sut.en=Subtiaba
+suv.en=Sulung
+suw.en=Sumbwa
+sux.en=Sumerian
+suy.en=Suyá
+suz.en=Sunwar
+sva.en=Svan
+svb.en=Ulau-Suain
+svc.en=Vincentian Creole English
+sve.en=Serili
+svk.en=Slovakian Sign Language
+svr.en=Savara
+svs.en=Savosavo
+svx.en=Skalvian
+swb=Comorian
+swb.en=Maore Comorian
+swc.en=Congo Swahili
+swf.en=Sere
+swg.en=Swabian
+swh.en=Swahili (individual language)
+swi.en=Sui
+swj.en=Sira
+swk.en=Malawi Sena
+swl.en=Swedish Sign Language
+swm.en=Samosa
+swn.en=Sawknah
+swo.en=Shanenawa
+swp.en=Suau
+swq.en=Sharwa
+swr.en=Saweru
+sws.en=Seluwasan
+swt.en=Sawila
+swu.en=Suwawa
+swv.en=Shekhawati
+sww.en=Sowa
+swx.en=Suruahá
+swy.en=Sarua
+sxb.en=Suba
+sxc.en=Sicanian
+sxe.en=Sighu
+sxg.en=Shixing
+sxk.en=Southern Kalapuya
+sxl.en=Selian
+sxm.en=Samre
+sxn.en=Sangir
+sxo.en=Sorothaptic
+sxr.en=Saaroa
+sxs.en=Sasaru
+sxu.en=Upper Saxon
+sxw.en=Saxwe Gbe
+sya.en=Siang
+syb.en=Central Subanen
+syc.en=Classical Syriac
+syd.en=Samoyedic languages
+syi.en=Seki
+syk.en=Sukur
+syl.en=Sylheti
+sym.en=Maya Samo
+syn.en=Senaya
+syo.en=Suoy
+syr=ܠܫܢ� ܣܘܪ���
+syr.en=Syriac
+sys.en=Sinyar
+syw.en=Kagate
+syy.en=Al-Sayyid Bedouin Sign Language
+sza.en=Semelai
+szb.en=Ngalum
+szc.en=Semaq Beri
+szd.en=Seru
+sze.en=Seze
+szg.en=Sengele
+szl.en=Silesian
+szn.en=Sula
+szp.en=Suabo
+szv.en=Isu (Fako Division)
+szw.en=Sawai
+taa.en=Lower Tanana
+tab.en=Tabassaran
+tac.en=Lowland Tarahumara
+tad.en=Tause
+tae.en=Tariana
+taf.en=Tapirapé
+tag.en=Tagoi
+tai.en=Tai languages
+taj.en=Eastern Tamang
+tak.en=Tala
+tal.en=Tal
+tan.en=Tangale
+tao.en=Yami
+tap.en=Taabwa
+taq.en=Tamasheq
+tar.en=Central Tarahumara
+tas.en=Tay Boi
+tau.en=Upper Tanana
+tav.en=Tatuyo
+taw.en=Tai
+tax.en=Tamki
+tay.en=Atayal
+taz.en=Tocho
+tba.en=Aikanã
+tbb.en=Tapeba
+tbc.en=Takia
+tbd.en=Kaki Ae
+tbe.en=Tanimbili
+tbf.en=Mandara
+tbg.en=North Tairora
+tbh.en=Thurawal
+tbi.en=Gaam
+tbj.en=Tiang
+tbk.en=Calamian Tagbanwa
+tbl.en=Tboli
+tbm.en=Tagbu
+tbn.en=Barro Negro Tunebo
+tbo.en=Tawala
+tbp.en=Taworta
+tbq.en=Tibeto-Burman languages
+tbr.en=Tumtum
+tbs.en=Tanguat
+tbt.en=Tembo (Kitembo)
+tbu.en=Tubar
+tbv.en=Tobo
+tbw.en=Tagbanwa
+tbx.en=Kapin
+tby.en=Tabaru
+tbz.en=Ditammari
+tca.en=Ticuna
+tcb.en=Tanacross
+tcc.en=Datooga
+tcd.en=Tafi
+tce.en=Southern Tutchone
+tcf.en=Malinaltepec Me'phaa
+tcg.en=Tamagario
+tch.en=Turks And Caicos Creole English
+tci.en=Wára
+tck.en=Tchitchege
+tcl.en=Taman (Myanmar)
+tcm.en=Tanahmerah
+tcn.en=Tichurong
+tco.en=Taungyo
+tcp.en=Tawr Chin
+tcq.en=Kaiy
+tcs.en=Torres Strait Creole
+tct.en=T'en
+tcu.en=Southeastern Tarahumara
+tcw.en=Tecpatlán Totonac
+tcx.en=Toda
+tcy.en=Tulu
+tcz.en=Thado Chin
+tda.en=Tagdal
+tdb.en=Panchpargania
+tdc.en=Emberá-Tadó
+tdd.en=Tai Nüa
+tdf.en=Talieng
+tdg.en=Western Tamang
+tdh.en=Thulung
+tdi.en=Tomadino
+tdj.en=Tajio
+tdk.en=Tambas
+tdl.en=Sur
+tdn.en=Tondano
+tdo.en=Teme
+tdq.en=Tita
+tdr.en=Todrah
+tds.en=Doutai
+tdt.en=Tetun Dili
+tdu.en=Tempasuk Dusun
+tdv.en=Toro
+tdx.en=Tandroy-Mahafaly Malagasy
+tdy.en=Tadyawan
+tea.en=Temiar
+teb.en=Tetete
+tec.en=Terik
+ted.en=Tepo Krumen
+tee.en=Huehuetla Tepehua
+tef.en=Teressa
+teg.en=Teke-Tege
+teh.en=Tehuelche
+tei.en=Torricelli
+tek.en=Ibali Teke
+tem.en=Timne
+ten.en=Tama (Colombia)
+teo.en=Teso
+tep.en=Tepecano
+teq.en=Temein
+ter.en=Tereno
+tes.en=Tengger
+tet.en=Tetum
+teu.en=Soo
+tev.en=Teor
+tew.en=Tewa (USA)
+tex.en=Tennet
+tey.en=Tulishi
+tfi.en=Tofin Gbe
+tfn.en=Tanaina
+tfo.en=Tefaro
+tfr.en=Teribe
+tft.en=Ternate
+tga.en=Sagalla
+tgb.en=Tobilung
+tgc.en=Tigak
+tgd.en=Ciwogai
+tge.en=Eastern Gorkha Tamang
+tgf.en=Chalikha
+tgg.en=Tangga
+tgh.en=Tobagonian Creole English
+tgi.en=Lawunuia
+tgo.en=Sudest
+tgp.en=Tangoa
+tgq.en=Tring
+tgr.en=Tareng
+tgs.en=Nume
+tgt.en=Central Tagbanwa
+tgu.en=Tanggu
+tgv.en=Tingui-Boto
+tgw.en=Tagwana Senoufo
+tgx.en=Tagish
+tgy.en=Togoyo
+thc.en=Tai Hang Tong
+thd.en=Thayore
+the.en=Chitwania Tharu
+thf.en=Thangmi
+thh.en=Northern Tarahumara
+thi.en=Tai Long
+thk.en=Tharaka
+thl.en=Dangaura Tharu
+thm.en=Aheu
+thn.en=Thachanadan
+thp.en=Thompson
+thq.en=Kochila Tharu
+thr.en=Rana Tharu
+ths.en=Thakali
+tht.en=Tahltan
+thu.en=Thuri
+thv.en=Tahaggart Tamahaq
+thw.en=Thudam
+thx.en=The
+thy.en=Tha
+thz.en=Tayart Tamajeq
+tia.en=Tidikelt Tamazight
+tic.en=Tira
+tid.en=Tidong
+tie.en=Tingal
+tif.en=Tifal
+tig.en=Tigre
+tih.en=Timugon Murut
+tii.en=Tiene
+tij.en=Tilung
+tik.en=Tikar
+til.en=Tillamook
+tim.en=Timbe
+tin.en=Tindi
+tio.en=Teop
+tip.en=Trimuris
+tiq.en=Tiéfo
+tis.en=Masadiit Itneg
+tit.en=Tinigua
+tiu.en=Adasen
+tiv.en=Tiv
+tiw.en=Tiwi
+tix.en=Southern Tiwa
+tiy.en=Tiruray
+tiz.en=Tai Hongjin
+tja.en=Tajuasohn
+tjg.en=Tunjung
+tji.en=Northern Tujia
+tjm.en=Timucua
+tjn.en=Tonjon
+tjo.en=Temacine Tamazight
+tjs.en=Southern Tujia
+tju.en=Tjurruru
+tka.en=Truká
+tkb.en=Buksa
+tkd.en=Tukudede
+tke.en=Takwane
+tkf.en=Tukumanféd
+tkk.en=Takpa
+tkl.en=Tokelau
+tkm.en=Takelma
+tkn.en=Toku-No-Shima
+tkp.en=Tikopia
+tkq.en=Tee
+tkr.en=Tsakhur
+tks.en=Takestani
+tkt.en=Kathoriya Tharu
+tku.en=Upper Necaxa Totonac
+tkw.en=Teanu
+tkx.en=Tangko
+tkz.en=Takua
+tla.en=Southwestern Tepehuan
+tlb.en=Tobelo
+tlc.en=Yecuatla Totonac
+tld.en=Talaud
+tlf.en=Telefol
+tlg.en=Tofanma
+tlh.en=Klingon
+tlh=tlhIngan Hol
+tli.en=Tlingit
+tlj.en=Talinga-Bwisi
+tlk.en=Taloki
+tll.en=Tetela
+tlm.en=Tolomako
+tln.en=Talondo'
+tlo.en=Talodi
+tlp.en=Filomena Mata-Coahuitlán Totonac
+tlq.en=Tai Loi
+tlr.en=Talise
+tls.en=Tambotalo
+tlt.en=Teluti
+tlu.en=Tulehu
+tlv.en=Taliabu
+tlw.en=South Wemale
+tlx.en=Khehek
+tly.en=Talysh
+tma.en=Tama (Chad)
+tmb.en=Katbol
+tmc.en=Tumak
+tmd.en=Haruai
+tme.en=Tremembé
+tmf.en=Toba-Maskoy
+tmg.en=Ternateño
+tmh.en=Tamashek
+tmi.en=Tutuba
+tmj.en=Samarokena
+tmk.en=Northwestern Tamang
+tml.en=Tamnim Citak
+tmm.en=Tai Thanh
+tmn.en=Taman (Indonesia)
+tmo.en=Temoq
+tmp.en=Tai Mène
+tmq.en=Tumleo
+tmr.en=Jewish Babylonian Aramaic (ca. 200-1200 CE)
+tms.en=Tima
+tmt.en=Tasmate
+tmu.en=Iau
+tmv.en=Tembo (Motembo)
+tmw.en=Temuan
+tmy.en=Tami
+tmz.en=Tamanaku
+tna.en=Tacana
+tnb.en=Western Tunebo
+tnc.en=Tanimuca-Retuarã
+tnd.en=Angosturas Tunebo
+tne.en=Tinoc Kallahan
+tnf.en=Tangshewi
+tng.en=Tobanga
+tnh.en=Maiani
+tni.en=Tandia
+tnk.en=Kwamera
+tnl.en=Lenakel
+tnm.en=Tabla
+tnn.en=North Tanna
+tno.en=Toromono
+tnp.en=Whitesands
+tnq.en=Taino
+tnr.en=Bedik
+tns.en=Tenis
+tnt.en=Tontemboan
+tnu.en=Tay Khang
+tnv.en=Tangchangya
+tnw.en=Tonsawang
+tnx.en=Tanema
+tny.en=Tongwe
+tnz.en=Tonga (Thailand)
+tob.en=Toba
+toc.en=Coyutla Totonac
+tod.en=Toma
+toe.en=Tomedes
+tof.en=Gizrra
+tog.en=Tonga (Nyasa)
+toh.en=Gitonga
+toi.en=Tonga (Zambia)
+toj.en=Tojolabal
+tol.en=Tolowa
+tom.en=Tombulu
+too.en=Xicotepec De Juárez Totonac
+top.en=Papantla Totonac
+toq.en=Toposa
+tor.en=Togbo-Vara Banda
+tos.en=Highland Totonac
+tou.en=Tho
+tov.en=Upper Taromi
+tow.en=Jemez
+tox.en=Tobian
+toy.en=Topoiyo
+toz.en=To
+tpa.en=Taupota
+tpc.en=Azoyú Me'phaa
+tpe.en=Tippera
+tpf.en=Tarpia
+tpg.en=Kula
+tpi.en=Tok Pisin
+tpj.en=Tapieté
+tpk.en=Tupinikin
+tpl.en=Tlacoapa Me'phaa
+tpm.en=Tampulma
+tpn.en=Tupinambá
+tpo.en=Tai Pao
+tpp.en=Pisaflores Tepehua
+tpq.en=Tukpa
+tpr.en=Tuparí
+tpt.en=Tlachichilco Tepehua
+tpu.en=Tampuan
+tpv.en=Tanapag
+tpw.en=Tupí
+tpx.en=Acatepec Me'phaa
+tpy.en=Trumai
+tpz.en=Tinputz
+tqb.en=Tembé
+tql.en=Lehali
+tqm.en=Turumsa
+tqn.en=Tenino
+tqo.en=Toaripi
+tqp.en=Tomoip
+tqq.en=Tunni
+tqr.en=Torona
+tqt.en=Western Totonac
+tqu.en=Touo
+tqw.en=Tonkawa
+tra.en=Tirahi
+trb.en=Terebu
+trc.en=Copala Triqui
+trd.en=Turi
+tre.en=East Tarangan
+trf.en=Trinidadian Creole English
+trg.en=Lishán Didán
+trh.en=Turaka
+tri.en=Trió
+trj.en=Toram
+trk.en=Turkic languages
+trl.en=Traveller Scottish
+trm.en=Tregami
+trn.en=Trinitario
+tro.en=Tarao Naga
+trp.en=Kok Borok
+trq.en=San Martín Itunyoso Triqui
+trr.en=Taushiro
+trs.en=Chicahuaxtla Triqui
+trt.en=Tunggare
+tru.en=Turoyo
+trv.en=Taroko
+trw.en=Torwali
+trx.en=Tringgus-Sembaan Bidayuh
+try.en=Turung
+trz.en=Torá
+tsa.en=Tsaangi
+tsb.en=Tsamai
+tsc.en=Tswa
+tsd.en=Tsakonian
+tse.en=Tunisian Sign Language
+tsf.en=Southwestern Tamang
+tsg.en=Tausug
+tsh.en=Tsuvan
+tsi.en=Tsimshian
+tsj.en=Tshangla
+tsk.en=Tseku
+tsl.en=Ts'ün-Lao
+tsm.en=Turkish Sign Language
+tsp.en=Northern Toussian
+tsq.en=Thai Sign Language
+tsr.en=Akei
+tss.en=Taiwan Sign Language
+tsu.en=Tsou
+tsv.en=Tsogo
+tsw.en=Tsishingini
+tsx.en=Mubami
+tsy.en=Tebul Sign Language
+tsz.en=Purepecha
+tta.en=Tutelo
+ttb.en=Gaa
+ttc.en=Tektiteko
+ttd.en=Tauade
+tte.en=Bwanabwana
+ttf.en=Tuotomb
+ttg.en=Tutong
+tth.en=Upper Ta'oih
+tti.en=Tobati
+ttj.en=Tooro
+ttk.en=Totoro
+ttl.en=Totela
+ttm.en=Northern Tutchone
+ttn.en=Towei
+tto.en=Lower Ta'oih
+ttp.en=Tombelala
+ttq.en=Tawallammat Tamajaq
+ttr.en=Tera
+tts.en=Northeastern Thai
+ttt.en=Muslim Tat
+ttu.en=Torau
+ttv.en=Titan
+ttw.en=Long Wat
+tty.en=Sikaritai
+ttz.en=Tsum
+tua.en=Wiarumus
+tub.en=Tübatulabal
+tuc.en=Mutu
+tud.en=Tuxá
+tue.en=Tuyuca
+tuf.en=Central Tunebo
+tug.en=Tunia
+tuh.en=Taulil
+tui.en=Tupuri
+tuj.en=Tugutil
+tul.en=Tula
+tum.en=Tumbuka
+tun.en=Tunica
+tuo.en=Tucano
+tup.en=Tupi languages
+tuq.en=Tedaga
+tus.en=Tuscarora
+tut.en=Altaic languages
+tuu.en=Tututni
+tuv.en=Turkana
+tuw.en=Tungus languages
+tux.en=Tuxináwa
+tuy.en=Tugen
+tuz.en=Turka
+tva.en=Vaghua
+tvd.en=Tsuvadi
+tve.en=Te'un
+tvk.en=Southeast Ambrym
+tvl.en=Tuvalu
+tvm.en=Tela-Masbuar
+tvn.en=Tavoyan
+tvo.en=Tidore
+tvs.en=Taveta
+tvt.en=Tutsa Naga
+tvw.en=Sedoa
+tvy.en=Timor Pidgin
+twa.en=Twana
+twb.en=Western Tawbuid
+twc.en=Teshenawa
+twd.en=Twents
+twe.en=Tewa (Indonesia)
+twf.en=Northern Tiwa
+twg.en=Tereweng
+twh.en=Tai Dón
+twl.en=Tawara
+twm.en=Tawang Monpa
+twn.en=Twendi
+two.en=Tswapong
+twp.en=Ere
+twq.en=Tasawaq
+twr.en=Southwestern Tarahumara
+twt.en=Turiwára
+twu.en=Termanu
+tww.en=Tuwari
+twx.en=Tewe
+twy.en=Tawoyan
+txa.en=Tombonuo
+txb.en=Tokharian B
+txc.en=Tsetsaut
+txe.en=Totoli
+txg.en=Tangut
+txh.en=Thracian
+txi.en=Ikpeng
+txm.en=Tomini
+txn.en=West Tarangan
+txo.en=Toto
+txq.en=Tii
+txr.en=Tartessian
+txs.en=Tonsea
+txt.en=Citak
+txu.en=Kayapó
+txx.en=Tatana
+txy.en=Tanosy Malagasy
+tya.en=Tauya
+tye.en=Kyenga
+tyh.en=O'du
+tyi.en=Teke-Tsaayi
+tyj.en=Tai Do
+tyl.en=Thu Lao
+tyn.en=Kombai
+typ.en=Thaypan
+tyr.en=Tai Daeng
+tys.en=Tày Sa Pa
+tyt.en=Tày Tac
+tyu.en=Kua
+tyv.en=Tuvinian
+tyx.en=Teke-Tyee
+tyz.en=Tày
+tza.en=Tanzanian Sign Language
+tzh.en=Tzeltal
+tzj.en=Tz'utujil
+tzm.en=Central Atlas Tamazight
+tzn.en=Tugun
+tzo=Bats'i k'op
+tzo.en=Tzotzil
+tzx.en=Tabriak
+uam.en=Uamué
+uan.en=Kuan
+uar.en=Tairuma
+uba.en=Ubang
+ubi.en=Ubi
+ubr.en=Ubir
+ubu.en=Umbu-Ungu
+uby.en=Ubykh
+uda.en=Uda
+ude.en=Udihe
+udg.en=Muduga
+udi.en=Udi
+udj.en=Ujir
+udl.en=Wuzlam
+udm.en=Udmurt
+udu.en=Uduk
+ues.en=Kioko
+ufi.en=Ufim
+uga.en=Ugaritic
+ugb.en=Kuku-Ugbanh
+uge.en=Ughele
+ugn.en=Ugandan Sign Language
+ugo.en=Ugong
+ugy.en=Uruguayan Sign Language
+uha.en=Uhami
+uhn.en=Damal
+uis.en=Uisai
+uiv.en=Iyive
+uji.en=Tanjijili
+uka.en=Kaburi
+ukg.en=Ukuriguma
+ukh.en=Ukhwejo
+ukl.en=Ukrainian Sign Language
+ukp.en=Ukpe-Bayobiri
+ukq.en=Ukwa
+uks.en=Urubú-Kaapor Sign Language
+uku.en=Ukue
+ukw.en=Ukwuani-Aboh-Ndoni
+ula.en=Fungwa
+ulb.en=Ulukwumi
+ulc.en=Ulch
+ulf.en=Usku
+uli.en=Ulithian
+ulk.en=Meriam
+ull.en=Ullatan
+ulm.en=Ulumanda'
+uln.en=Unserdeutsch
+ulu.en=Uma' Lung
+uma.en=Umatilla
+umb.en=Umbundu
+umc.en=Marrucinian
+umd.en=Umbindhamu
+umg.en=Umbuygamu
+umi.en=Ukit
+umm.en=Umon
+umn.en=Makyan Naga
+umo.en=Umotína
+ump.en=Umpila
+umr.en=Umbugarla
+ums.en=Pendau
+umu.en=Munsee
+una.en=North Watut
+und.en=Undetermined
+une.en=Uneme
+ung.en=Ngarinyin
+unk.en=Enawené-Nawé
+unm.en=Unami
+unp.en=Worora
+unr.en=Mundari
+unx.en=Munda
+unz.en=Unde Kaili
+uok.en=Uokha
+upi.en=Umeda
+upv.en=Uripiv-Wala-Rano-Atchin
+ura.en=Urarina
+urb.en=Urubú-Kaapor
+urc.en=Urningangg
+ure.en=Uru
+urf.en=Uradhi
+urg.en=Urigina
+urh.en=Urhobo
+uri.en=Urim
+urj.en=Uralic languages
+urk.en=Urak Lawoi'
+url.en=Urali
+urm.en=Urapmin
+urn.en=Uruangnirin
+uro.en=Ura (Papua New Guinea)
+urp.en=Uru-Pa-In
+urr.en=Lehalurup
+urt.en=Urat
+uru.en=Urumi
+urv.en=Uruava
+urw.en=Sop
+urx.en=Urimo
+ury.en=Orya
+urz.en=Uru-Eu-Wau-Wau
+usa.en=Usarufa
+ush.en=Ushojo
+usi.en=Usui
+usk.en=Usaghade
+usp.en=Uspanteco
+usu.en=Uya
+uta.en=Otank
+ute.en=Ute-Southern Paiute
+utp.en=Amba (Solomon Islands)
+utr.en=Etulo
+utu.en=Utu
+uum.en=Urum
+uun.en=Kulon-Pazeh
+uur.en=Ura (Vanuatu)
+uuu.en=U
+uve.en=West Uvean
+uvh.en=Uri
+uvl.en=Lote
+uwa.en=Kuku-Uwanh
+uya.en=Doko-Uyanga
+uzn.en=Northern Uzbek
+uzs.en=Southern Uzbek
+vaa.en=Vaagri Booli
+vae.en=Vale
+vaf.en=Vafsi
+vag.en=Vagla
+vah.en=Varhadi-Nagpuri
+vai.en=Vai
+vaj.en=Vasekela Bushman
+val.en=Vehes
+vam.en=Vanimo
+van.en=Valman
+vao.en=Vao
+vap.en=Vaiphei
+var.en=Huarijio
+vas.en=Vasavi
+vau.en=Vanuma
+vav.en=Varli
+vay.en=Wayu
+vbb.en=Southeast Babar
+vec.en=Venetian
+ved.en=Veddah
+vel.en=Veluws
+vem.en=Vemgo-Mabas
+veo.en=Ventureño
+vep.en=Veps
+ver.en=Mom Jango
+vgr.en=Vaghri
+vgt.en=Vlaamse Gebarentaal
+vic.en=Virgin Islands Creole English
+vid.en=Vidunda
+vif.en=Vili
+vig.en=Viemo
+vil.en=Vilela
+vin.en=Vinza
+vis.en=Vishavan
+vit.en=Viti
+viv.en=Iduna
+vka.en=Kariyarra
+vki.en=Ija-Zuba
+vkj.en=Kujarge
+vkk.en=Kaur
+vkl.en=Kulisusu
+vkm.en=Kamakan
+vko.en=Kodeoha
+vkp.en=Korlai Creole Portuguese
+vkt.en=Tenggarong Kutai Malay
+vku.en=Kurrama
+vlp.en=Valpei
+vls.en=Vlaams
+vma.en=Martuyhunira
+vmb.en=Mbabaram
+vmc.en=Juxtlahuaca Mixtec
+vmd.en=Mudu Koraga
+vme.en=East Masela
+vmf.en=Mainfränkisch
+vmg.en=Minigir
+vmh.en=Maraghei
+vmi.en=Miwa
+vmj.en=Ixtayutla Mixtec
+vmk.en=Makhuwa-Shirima
+vml.en=Malgana
+vmm.en=Mitlatongo Mixtec
+vmp.en=Soyaltepec Mazatec
+vmq.en=Soyaltepec Mixtec
+vmr.en=Marenje
+vms.en=Moksela
+vmu.en=Muluridyi
+vmv.en=Valley Maidu
+vmw.en=Makhuwa
+vmx.en=Tamazola Mixtec
+vmy.en=Ayautla Mazatec
+vmz.en=Mazatlán Mazatec
+vnk.en=Vano
+vnm.en=Vinmavis
+vnp.en=Vunapu
+vor.en=Voro
+vot.en=Votic
+vra.en=Vera'a
+vro.en=Võro
+vrs.en=Varisi
+vrt.en=Burmbar
+vsi.en=Moldova Sign Language
+vsl.en=Venezuelan Sign Language
+vsv.en=Valencian Sign Language
+vto.en=Vitou
+vum.en=Vumbu
+vun.en=Vunjo
+vut.en=Vute
+vwa.en=Awa (China)
+waa.en=Walla Walla
+wab.en=Wab
+wac.en=Wasco-Wishram
+wad.en=Wandamen
+wae.en=Walser
+waf.en=Wakoná
+wag.en=Wa'ema
+wah.en=Watubela
+wai.en=Wares
+waj.en=Waffa
+wak.en=Wakashan languages
+wal=ወላይትኛ
+wal.en=Wolaytta
+wam.en=Wampanoag
+wan.en=Wan
+wao.en=Wappo
+wap.en=Wapishana
+waq.en=Wageman
+war.en=Waray (Philippines)
+was.en=Washo
+wat.en=Kaninuwa
+wau.en=Waurá
+wav.en=Waka
+waw.en=Waiwai
+wax.en=Watam
+way.en=Wayana
+waz.en=Wampur
+wba.en=Warao
+wbb.en=Wabo
+wbe.en=Waritai
+wbf.en=Wara
+wbh.en=Wanda
+wbi.en=Vwanji
+wbj.en=Alagwa
+wbk.en=Waigali
+wbl.en=Wakhi
+wbm.en=Wa
+wbp.en=Warlpiri
+wbq.en=Waddar
+wbr.en=Wagdi
+wbt.en=Wanman
+wbv.en=Wajarri
+wbw.en=Woi
+wca.en=Yanomámi
+wci.en=Waci Gbe
+wdd.en=Wandji
+wdg.en=Wadaginam
+wdj.en=Wadjiginy
+wdu.en=Wadjigu
+wea.en=Wewaw
+wec.en=Wè Western
+wed.en=Wedau
+weh.en=Weh
+wei.en=Were
+wem.en=Weme Gbe
+wen.en=Sorbian languages
+weo.en=North Wemale
+wep.en=Westphalien
+wer.en=Weri
+wes.en=Cameroon Pidgin
+wet.en=Perai
+weu.en=Welaung
+wew.en=Wejewa
+wfg.en=Yafi
+wga.en=Wagaya
+wgg.en=Wangganguru
+wgi.en=Wahgi
+wgo.en=Waigeo
+wgw.en=Wagawaga
+wgy.en=Warrgamay
+wha.en=Manusela
+whg.en=North Wahgi
+whk.en=Wahau Kenyah
+whu.en=Wahau Kayan
+wib.en=Southern Toussian
+wic.en=Wichita
+wie.en=Wik-Epa
+wif.en=Wik-Keyangan
+wig.en=Wik-Ngathana
+wih.en=Wik-Me'anha
+wii.en=Minidien
+wij.en=Wik-Iiyanh
+wik.en=Wikalkan
+wil.en=Wilawila
+wim.en=Wik-Mungkan
+win.en=Ho-Chunk
+wir.en=Wiraféd
+wit.en=Wintu
+wiu.en=Wiru
+wiv.en=Muduapa
+wiw.en=Wirangu
+wiy.en=Wiyot
+wja.en=Waja
+wji.en=Warji
+wka.en=Kw'adza
+wkb.en=Kumbaran
+wkd.en=Wakde
+wkl.en=Kalanadi
+wku.en=Kunduvadi
+wkw.en=Wakawaka
+wla.en=Walio
+wlc.en=Mwali Comorian
+wle.en=Wolane
+wlg.en=Kunbarlang
+wli.en=Waioli
+wlk.en=Wailaki
+wll.en=Wali (Sudan)
+wlm.en=Middle Welsh
+wlo.en=Wolio
+wlr.en=Wailapa
+wls.en=Wallisian
+wlu.en=Wuliwuli
+wlv.en=Wichí Lhamtés Vejoz
+wlw.en=Walak
+wlx.en=Wali (Ghana)
+wly.en=Waling
+wma.en=Mawa (Nigeria)
+wmb.en=Wambaya
+wmc.en=Wamas
+wmd.en=Mamaindé
+wme.en=Wambule
+wmh.en=Waima'a
+wmi.en=Wamin
+wmm.en=Maiwa (Indonesia)
+wmn.en=Waamwang
+wmo.en=Wom (Papua New Guinea)
+wms.en=Wambon
+wmt.en=Walmajarri
+wmw.en=Mwani
+wmx.en=Womo
+wnb.en=Wanambre
+wnc.en=Wantoat
+wnd.en=Wandarang
+wne.en=Waneci
+wng.en=Wanggom
+wni.en=Ndzwani Comorian
+wnk.en=Wanukaka
+wnm.en=Wanggamala
+wno.en=Wano
+wnp.en=Wanap
+wnu.en=Usan
+woa.en=Tyaraity
+wob.en=Wè Northern
+woc.en=Wogeo
+wod.en=Wolani
+woe.en=Woleaian
+wof.en=Gambian Wolof
+wog.en=Wogamusin
+woi.en=Kamang
+wok.en=Longto
+wom.en=Wom (Nigeria)
+won.en=Wongo
+woo.en=Manombai
+wor.en=Woria
+wos.en=Hanga Hundi
+wow.en=Wawonii
+woy.en=Weyto
+wpc.en=Maco
+wra.en=Warapu
+wrb.en=Warluwara
+wrd.en=Warduji
+wrg.en=Warungu
+wrh.en=Wiradhuri
+wri.en=Wariyangga
+wrl.en=Warlmanpa
+wrm.en=Warumungu
+wrn.en=Warnang
+wrp.en=Waropen
+wrr.en=Wardaman
+wrs.en=Waris
+wru.en=Waru
+wrv.en=Waruna
+wrw.en=Gugu Warra
+wrx.en=Wae Rana
+wry.en=Merwari
+wrz.en=Waray (Australia)
+wsa.en=Warembori
+wsi.en=Wusi
+wsk.en=Waskia
+wsr.en=Owenia
+wss.en=Wasa
+wsu.en=Wasu
+wsv.en=Wotapuri-Katarqalai
+wtf.en=Dumpu
+wti.en=Berta
+wtk.en=Watakataui
+wtm.en=Mewati
+wtw.en=Wotu
+wua.en=Wikngenchera
+wub.en=Wunambal
+wud.en=Wudu
+wuh.en=Wutunhua
+wul.en=Silimo
+wum.en=Wumbvu
+wun.en=Bungu
+wur.en=Wurrugu
+wut.en=Wutung
+wuu.en=Wu Chinese
+wuv.en=Wuvulu-Aua
+wux.en=Wulna
+wuy.en=Wauyai
+wwa.en=Waama
+wwo.en=Wetamut
+wwr.en=Warrwa
+www.en=Wawa
+wxa.en=Waxianghua
+wya.en=Wyandot
+wyb.en=Wangaaybuwan-Ngiyambaa
+wym.en=Wymysorys
+wyr.en=Wayoró
+wyy.en=Western Fijian
+xaa.en=Andalusian Arabic
+xab.en=Sambe
+xac.en=Kachari
+xad.en=Adai
+xae.en=Aequian
+xag.en=Aghwan
+xai.en=Kaimbé
+xal.en=Kalmyk
+xam.en=/Xam
+xan.en=Xamtanga
+xao.en=Khao
+xap.en=Apalachee
+xaq.en=Aquitanian
+xar.en=Karami
+xas.en=Kamas
+xat.en=Katawixi
+xau.en=Kauwera
+xav.en=Xavánte
+xaw.en=Kawaiisu
+xay.en=Kayan Mahakam
+xba.en=Kamba (Brazil)
+xbc.en=Bactrian
+xbi.en=Kombio
+xbm.en=Middle Breton
+xbo.en=Bolgarian
+xbr.en=Kambera
+xbw.en=Kambiwá
+xbx.en=Kabixí
+xcb.en=Cumbric
+xcc.en=Camunic
+xce.en=Celtiberian
+xcg.en=Cisalpine Gaulish
+xch.en=Chemakum
+xcl.en=Classical Armenian
+xcm.en=Comecrudo
+xcn.en=Cotoname
+xco.en=Chorasmian
+xcr.en=Carian
+xct.en=Classical Tibetan
+xcu.en=Curonian
+xcv.en=Chuvantsy
+xcw.en=Coahuilteco
+xcy.en=Cayuse
+xdc.en=Dacian
+xdm.en=Edomite
+xdy.en=Malayic Dayak
+xeb.en=Eblan
+xed.en=Hdi
+xeg.en=//Xegwi
+xel.en=Kelo
+xem.en=Kembayan
+xep.en=Epi-Olmec
+xer.en=Xerénte
+xes.en=Kesawai
+xet.en=Xetá
+xeu.en=Keoru-Ahia
+xfa.en=Faliscan
+xga.en=Galatian
+xgf.en=Gabrielino-Fernandeño
+xgl.en=Galindan
+xgn.en=Mongolian languages
+xgr.en=Garza
+xha.en=Harami
+xhc.en=Hunnic
+xhd.en=Hadrami
+xhe.en=Khetrani
+xhr.en=Hernican
+xht.en=Hattic
+xhu.en=Hurrian
+xhv.en=Khua
+xia.en=Xiandao
+xib.en=Iberian
+xii.en=Xiri
+xil.en=Illyrian
+xin.en=Xinca
+xip.en=Xipináwa
+xir.en=Xiriâna
+xiv.en=Indus Valley Language
+xiy.en=Xipaya
+xka.en=Kalkoti
+xkb.en=Manigri-Kambolé Ede Nago
+xkc.en=Kho'ini
+xkd.en=Mendalam Kayan
+xke.en=Kereho
+xkf.en=Khengkha
+xkg.en=Kagoro
+xkh.en=Karahawyana
+xki.en=Kenyan Sign Language
+xkj.en=Kajali
+xkk.en=Kaco'
+xkl.en=Mainstream Kenyah
+xkn.en=Kayan River Kayan
+xko.en=Kiorr
+xkp.en=Kabatei
+xkq.en=Koroni
+xkr.en=Xakriabá
+xks.en=Kumbewaha
+xkt.en=Kantosi
+xku.en=Kaamba
+xkv.en=Kgalagadi
+xkw.en=Kembra
+xkx.en=Karore
+xky.en=Uma' Lasan
+xkz.en=Kurtokha
+xla.en=Kamula
+xlb.en=Loup B
+xlc.en=Lycian
+xld.en=Lydian
+xle.en=Lemnian
+xlg.en=Ligurian (Ancient)
+xli.en=Liburnian
+xln.en=Alanic
+xlo.en=Loup A
+xlp.en=Lepontic
+xls.en=Lusitanian
+xlu.en=Cuneiform Luwian
+xly.en=Elymian
+xma.en=Mushungulu
+xmb.en=Mbonga
+xmc.en=Makhuwa-Marrevone
+xmd.en=Mbedam
+xme.en=Median
+xmf.en=Mingrelian
+xmg.en=Mengaka
+xmh.en=Kuku-Muminh
+xmj.en=Majera
+xmk.en=Ancient Macedonian
+xml.en=Malaysian Sign Language
+xmm.en=Manado Malay
+xmn.en=Manichaean Middle Persian
+xmo.en=Morerebi
+xmp.en=Kuku-Mu'inh
+xmq.en=Kuku-Mangk
+xmr.en=Meroitic
+xms.en=Moroccan Sign Language
+xmt.en=Matbat
+xmu.en=Kamu
+xmv.en=Antankarana Malagasy
+xmw.en=Tsimihety Malagasy
+xmx.en=Maden
+xmy.en=Mayaguduna
+xmz.en=Mori Bawah
+xna.en=Ancient North Arabian
+xnb.en=Kanakanabu
+xnd.en=Na-Dene languages
+xng.en=Middle Mongolian
+xnh.en=Kuanhua
+xnn.en=Northern Kankanay
+xno.en=Anglo-Norman
+xnr.en=Kangri
+xns.en=Kanashi
+xoc.en=O'chi'chi'
+xod.en=Kokoda
+xog.en=Soga
+xoi.en=Kominimung
+xok.en=Xokleng
+xom.en=Komo (Sudan)
+xon.en=Konkomba
+xoo.en=Xukurú
+xop.en=Kopar
+xor.en=Korubo
+xow.en=Kowaki
+xpc.en=Pecheneg
+xpe.en=Liberia Kpelle
+xpg.en=Phrygian
+xpi.en=Pictish
+xpk.en=Kulina Pano
+xpm.en=Pumpokol
+xpn.en=Kapinawá
+xpo.en=Pochutec
+xpp.en=Puyo-Paekche
+xpr.en=Parthian
+xps.en=Pisidian
+xpu.en=Punic
+xpy.en=Puyo
+xqa.en=Karakhanid
+xqt.en=Qatabanian
+xra.en=Krahô
+xrb.en=Eastern Karaboro
+xre.en=Kreye
+xri.en=Krikati-Timbira
+xrm.en=Armazic
+xrn.en=Arin
+xrr.en=Raetic
+xrt.en=Aranama-Tamique
+xru.en=Marriammu
+xrw.en=Karawa
+xsa.en=Sabaean
+xsb.en=Tinà Sambal
+xsc.en=Scythian
+xsd.en=Sidetic
+xse.en=Sempan
+xsh.en=Shamang
+xsi.en=Sio
+xsj.en=Subi
+xsl.en=South Slavey
+xsm.en=Kasem
+xsn.en=Sanga (Nigeria)
+xso.en=Solano
+xsp.en=Silopi
+xsq.en=Makhuwa-Saka
+xsr.en=Sherpa
+xss.en=Assan
+xsu.en=Sanumá
+xsv.en=Sudovian
+xsy.en=Saisiyat
+xta.en=Alcozauca Mixtec
+xtb.en=Chazumba Mixtec
+xtc.en=Katcha-Kadugli-Miri
+xtd.en=Diuxi-Tilantongo Mixtec
+xte.en=Ketengban
+xtg.en=Transalpine Gaulish
+xti.en=Sinicahua Mixtec
+xtj.en=San Juan Teita Mixtec
+xtl.en=Tijaltepec Mixtec
+xtm.en=Magdalena Peñasco Mixtec
+xtn.en=Northern Tlaxiaco Mixtec
+xto.en=Tokharian A
+xtp.en=San Miguel Piedras Mixtec
+xtq.en=Tumshuqese
+xtr.en=Early Tripuri
+xts.en=Sindihui Mixtec
+xtt.en=Tacahua Mixtec
+xtu.en=Cuyamecalco Mixtec
+xtw.en=Tawandê
+xty.en=Yoloxochitl Mixtec
+xtz.en=Tasmanian
+xua.en=Alu Kurumba
+xub.en=Betta Kurumba
+xug.en=Kunigami
+xuj.en=Jennu Kurumba
+xum.en=Umbrian
+xuo.en=Kuo
+xup.en=Upper Umpqua
+xur.en=Urartian
+xut.en=Kuthant
+xuu.en=Kxoe
+xve.en=Venetic
+xvi.en=Kamviri
+xvn.en=Vandalic
+xvo.en=Volscian
+xvs.en=Vestinian
+xwa.en=Kwaza
+xwc.en=Woccon
+xwe.en=Xwela Gbe
+xwg.en=Kwegu
+xwl.en=Western Xwla Gbe
+xwo.en=Written Oirat
+xwr.en=Kwerba Mamberamo
+xxb.en=Boro (Ghana)
+xxk.en=Ke'o
+xxr.en=Koropó
+xxt.en=Tambora
+xyl.en=Yalakalore
+xzh.en=Zhang-Zhung
+xzm.en=Zemgalian
+xzp.en=Ancient Zapotec
+yaa.en=Yaminahua
+yab.en=Yuhup
+yac.en=Pass Valley Yali
+yad.en=Yagua
+yae.en=Pumé
+yaf.en=Yaka (Democratic Republic of Congo)
+yag.en=Yámana
+yah.en=Yazgulyam
+yai.en=Yagnobi
+yaj.en=Banda-Yangere
+yak.en=Yakima
+yal.en=Yalunka
+yam.en=Yamba
+yao.en=Yao
+yap.en=Yapese
+yaq.en=Yaqui
+yar.en=Yabarana
+yas.en=Nugunu (Cameroon)
+yat.en=Yambeta
+yau.en=Yuwana
+yav.en=Yangben
+yaw.en=Yawalapití
+yax.en=Yauma
+yay.en=Agwagwune
+yaz.en=Lokaa
+yba.en=Yala
+ybb.en=Yemba
+ybd.en=Yangbye
+ybe.en=West Yugur
+ybh.en=Yakha
+ybi.en=Yamphu
+ybj.en=Hasha
+ybk.en=Bokha
+ybl.en=Yukuben
+ybm.en=Yaben
+ybn.en=Yabaâna
+ybo.en=Yabong
+ybx.en=Yawiyo
+yby.en=Yaweyuha
+ych.en=Chesu
+ycl.en=Lolopo
+ycn.en=Yucuna
+ycp.en=Chepya
+ydd.en=Eastern Yiddish
+yde.en=Yangum Dey
+ydg.en=Yidgha
+ydk.en=Yoidik
+yds.en=Yiddish Sign Language
+yea.en=Ravula
+yec.en=Yeniche
+yee.en=Yimas
+yei.en=Yeni
+yej.en=Yevanic
+yel.en=Yela
+yen.en=Yendang
+yer.en=Tarok
+yes.en=Yeskwa
+yet.en=Yetfa
+yeu.en=Yerukula
+yev.en=Yapunda
+yey.en=Yeyi
+ygl.en=Yangum Gel
+ygm.en=Yagomi
+ygp.en=Gepo
+ygr.en=Yagaria
+ygw.en=Yagwoia
+yha.en=Baha Buyang
+yhd.en=Judeo-Iraqi Arabic
+yhl.en=Hlepho Phowa
+yia.en=Yinggarda
+yif.en=Ache
+yig.en=Wusa Nasu
+yih.en=Western Yiddish
+yii.en=Yidiny
+yij.en=Yindjibarndi
+yik.en=Dongshanba Lalo
+yil.en=Yindjilandji
+yim.en=Yimchungru Naga
+yin.en=Yinchia
+yip.en=Pholo
+yiq.en=Miqie
+yir.en=North Awyu
+yis.en=Yis
+yit.en=Eastern Lalu
+yiu.en=Awu
+yiv.en=Northern Nisu
+yix.en=Axi Yi
+yiy.en=Yir Yoront
+yiz.en=Azhe
+yka.en=Yakan
+ykg.en=Northern Yukaghir
+yki.en=Yoke
+ykk.en=Yakaikeke
+ykl.en=Khlula
+ykm.en=Kap
+yko.en=Yasa
+ykr.en=Yekora
+ykt.en=Kathu
+yky.en=Yakoma
+yla.en=Yaul
+yle.en=Yele
+ylg.en=Yelogu
+yli.en=Angguruk Yali
+yll.en=Yil
+ylm.en=Limi
+yln.en=Langnian Buyang
+ylo.en=Naluo Yi
+ylr.en=Yalarnnga
+ylu.en=Aribwaung
+yly.en=Nyâlayu
+yma.en=Yamphe
+ymb.en=Yambes
+ymc.en=Southern Muji
+ymd.en=Muda
+yme.en=Yameo
+ymg.en=Yamongeri
+ymh.en=Mili
+ymi.en=Moji
+ymk.en=Makwe
+yml.en=Iamalele
+ymm.en=Maay
+ymn.en=Yamna
+ymo.en=Yangum Mon
+ymp.en=Yamap
+ymq.en=Qila Muji
+ymr.en=Malasar
+yms.en=Mysian
+ymt.en=Mator-Taygi-Karagas
+ymx.en=Northern Muji
+ymz.en=Muzi
+yna.en=Aluo
+ynd.en=Yandruwandha
+yne.en=Lang'e
+yng.en=Yango
+ynh.en=Yangho
+ynk.en=Naukan Yupik
+ynl.en=Yangulam
+ynn.en=Yana
+yno.en=Yong
+yns.en=Yansi
+ynu.en=Yahuna
+yob.en=Yoba
+yog.en=Yogad
+yoi.en=Yonaguni
+yok.en=Yokuts
+yol.en=Yola
+yom.en=Yombe
+yon.en=Yonggom
+yos.en=Yos
+yox.en=Yoron
+yoy.en=Yoy
+ypa.en=Phala
+ypb.en=Labo Phowa
+ypg.en=Phola
+yph.en=Phupha
+ypk.en=Yupik languages
+ypm.en=Phuma
+ypn.en=Ani Phowa
+ypo.en=Alo Phola
+ypp.en=Phupa
+ypz.en=Phuza
+yra.en=Yerakai
+yrb.en=Yareba
+yre.en=Yaouré
+yri.en=Yarí
+yrk.en=Nenets
+yrl.en=Nhengatu
+yrn.en=Yerong
+yrs.en=Yarsun
+yrw.en=Yarawata
+ysc.en=Yassic
+ysd.en=Samatao
+ysl.en=Yugoslavian Sign Language
+ysn.en=Sani
+yso.en=Nisi (China)
+ysp.en=Southern Lolopo
+ysr.en=Sirenik Yupik
+yss.en=Yessan-Mayo
+ysy.en=Sanie
+yta.en=Talu
+ytl.en=Tanglang
+ytp.en=Thopho
+yua.en=Yucateco
+yub.en=Yugambal
+yuc.en=Yuchi
+yud.en=Judeo-Tripolitanian Arabic
+yue.en=Yue Chinese
+yuf.en=Havasupai-Walapai-Yavapai
+yug.en=Yug
+yui.en=Yurutí
+yuj.en=Karkar-Yuri
+yuk.en=Yuki
+yul.en=Yulu
+yum.en=Quechan
+yun.en=Bena (Nigeria)
+yup.en=Yukpa
+yuq.en=Yuqui
+yur.en=Yurok
+yut.en=Yopno
+yuu.en=Yugh
+yuw.en=Yau (Morobe Province)
+yux.en=Southern Yukaghir
+yuy.en=East Yugur
+yuz.en=Yuracare
+yva.en=Yawa
+yvt.en=Yavitero
+ywa.en=Kalou
+ywl.en=Western Lalu
+ywn.en=Yawanawa
+ywq.en=Wuding-Luquan Yi
+ywr.en=Yawuru
+ywt.en=Xishanba Lalo
+ywu.en=Wumeng Nasu
+yww.en=Yawarawarga
+yyu.en=Yau (Sandaun Province)
+yyz.en=Ayizi
+yzg.en=E'ma Buyang
+yzk.en=Zokhuo
+zaa.en=Sierra de Juárez Zapotec
+zab.en=San Juan Guelavía Zapotec
+zac.en=Ocotlán Zapotec
+zad.en=Cajonos Zapotec
+zae.en=Yareni Zapotec
+zaf.en=Ayoquesco Zapotec
+zag.en=Zaghawa
+zah.en=Zangwal
+zai.en=Isthmus Zapotec
+zaj.en=Zaramo
+zak.en=Zanaki
+zal.en=Zauzou
+zam.en=Miahuatlán Zapotec
+zao.en=Ozolotepec Zapotec
+zap.en=Zapotec
+zaq.en=Aloápam Zapotec
+zar.en=Rincón Zapotec
+zas.en=Santo Domingo Albarradas Zapotec
+zat.en=Tabaa Zapotec
+zau.en=Zangskari
+zav.en=Yatzachi Zapotec
+zaw.en=Mitla Zapotec
+zax.en=Xadani Zapotec
+zay.en=Zayse-Zergulla
+zaz.en=Zari
+zbc.en=Central Berawan
+zbe.en=East Berawan
+zbl.en=Blissymbols
+zbt.en=Batui
+zbw.en=West Berawan
+zca.en=Coatecas Altas Zapotec
+zch.en=Central Hongshuihe Zhuang
+zdj.en=Ngazidja Comorian
+zea.en=Zeeuws
+zeg.en=Zenag
+zeh.en=Eastern Hongshuihe Zhuang
+zen.en=Zenaga
+zga.en=Kinga
+zgb.en=Guibei Zhuang
+zgm.en=Minz Zhuang
+zgn.en=Guibian Zhuang
+zgr.en=Magori
+zhb.en=Zhaba
+zhd.en=Dai Zhuang
+zhi.en=Zhire
+zhn.en=Nong Zhuang
+zhw.en=Zhoa
+zhx.en=Chinese (family)
+zia.en=Zia
+zib.en=Zimbabwe Sign Language
+zik.en=Zimakani
+zim.en=Mesme
+zin.en=Zinza
+zir.en=Ziriya
+ziw.en=Zigula
+ziz.en=Zizilivakan
+zka.en=Kaimbulawa
+zkb.en=Koibal
+zkg.en=Koguryo
+zkh.en=Khorezmian
+zkk.en=Karankawa
+zko.en=Kott
+zkp.en=São Paulo Kaingáng
+zkr.en=Zakhring
+zkt.en=Kitan
+zku.en=Kaurna
+zkv.en=Krevinian
+zkz.en=Khazar
+zle.en=East Slavic languages
+zlj.en=Liujiang Zhuang
+zlm.en=Malay (individual language)
+zln.en=Lianshan Zhuang
+zlq.en=Liuqian Zhuang
+zls.en=South Slavic languages
+zlw.en=West Slavic languages
+zma.en=Manda (Australia)
+zmb.en=Zimba
+zmc.en=Margany
+zmd.en=Maridan
+zme.en=Mangerr
+zmf.en=Mfinu
+zmg.en=Marti Ke
+zmh.en=Makolkol
+zmi.en=Negeri Sembilan Malay
+zmj.en=Maridjabin
+zmk.en=Mandandanyi
+zml.en=Madngele
+zmm.en=Marimanindji
+zmn.en=Mbangwe
+zmo.en=Molo
+zmp.en=Mpuono
+zmq.en=Mituku
+zmr.en=Maranunggu
+zms.en=Mbesa
+zmt.en=Maringarr
+zmu.en=Muruwari
+zmv.en=Mbariman-Gudhinma
+zmw.en=Mbo (Democratic Republic of Congo)
+zmx.en=Bomitaba
+zmy.en=Mariyedi
+zmz.en=Mbandja
+zna.en=Zan Gula
+znd.en=Zande languages
+zne.en=Zande (individual language)
+zng.en=Mang
+znk.en=Manangkari
+zns.en=Mangas
+zoc.en=Copainalá Zoque
+zoh.en=Chimalapa Zoque
+zom.en=Zou
+zoo.en=Asunción Mixtepec Zapotec
+zoq.en=Tabasco Zoque
+zor.en=Rayón Zoque
+zos.en=Francisco León Zoque
+zpa.en=Lachiguiri Zapotec
+zpb.en=Yautepec Zapotec
+zpc.en=Choapan Zapotec
+zpd.en=Southeastern Ixtlán Zapotec
+zpe.en=Petapa Zapotec
+zpf.en=San Pedro Quiatoni Zapotec
+zpg.en=Guevea De Humboldt Zapotec
+zph.en=Totomachapan Zapotec
+zpi.en=Santa María Quiegolani Zapotec
+zpj.en=Quiavicuzas Zapotec
+zpk.en=Tlacolulita Zapotec
+zpl.en=Lachixío Zapotec
+zpm.en=Mixtepec Zapotec
+zpn.en=Santa Inés Yatzechi Zapotec
+zpo.en=Amatlán Zapotec
+zpp.en=El Alto Zapotec
+zpq.en=Zoogocho Zapotec
+zpr.en=Santiago Xanica Zapotec
+zps.en=Coatlán Zapotec
+zpt.en=San Vicente Coatlán Zapotec
+zpu.en=Yalálag Zapotec
+zpv.en=Chichicapan Zapotec
+zpw.en=Zaniza Zapotec
+zpx.en=San Baltazar Loxicha Zapotec
+zpy.en=Mazaltepec Zapotec
+zpz.en=Texmelucan Zapotec
+zqe.en=Qiubei Zhuang
+zra.en=Kara (Korea)
+zrg.en=Mirgan
+zrn.en=Zirenkel
+zro.en=Záparo
+zrp.en=Zarphatic
+zrs.en=Mairasi
+zsa.en=Sarasira
+zsk.en=Kaskean
+zsl.en=Zambian Sign Language
+zsm.en=Standard Malay
+zsr.en=Southern Rincon Zapotec
+zsu.en=Sukurum
+zte.en=Elotepec Zapotec
+ztg.en=Xanaguía Zapotec
+ztl.en=Lapaguía-Guivini Zapotec
+ztm.en=San Agustín Mixtepec Zapotec
+ztn.en=Santa Catarina Albarradas Zapotec
+ztp.en=Loxicha Zapotec
+ztq.en=Quioquitani-Quierí Zapotec
+zts.en=Tilquiapan Zapotec
+ztt.en=Tejalapan Zapotec
+ztu.en=Güilá Zapotec
+ztx.en=Zaachila Zapotec
+zty.en=Yatee Zapotec
+zua.en=Zeem
+zuh.en=Tokano
+zum.en=Kumzari
+zun.en=Zuni
+zuy.en=Zumaya
+zwa.en=Zay
+zyb.en=Yongbei Zhuang
+zyg.en=Yang Zhuang
+zyj.en=Youjiang Zhuang
+zyn.en=Yongnan Zhuang
+zyp.en=Zyphe
+zza.en=Zaza
+zzj.en=Zuojiang Zhuang
+Arab.en=Arabic
+Armi.en=Imperial Aramaic
+Armn.en=Armenian
+Avst.en=Avestan
+Bali.en=Balinese
+Bamu.en=Bamum
+Batk.en=Batak
+Beng.en=Bengali
+Blis.en=Blissymbols
+Bopo.en=Bopomofo
+Brah.en=Brahmi
+Brai.en=Braille
+Bugi.en=Buginese
+Buhd.en=Buhid
+Cakm.en=Chakma
+Cans.en=Unified Canadian Aboriginal Syllabics
+Cari.en=Carian
+Cham.en=Cham
+Cher.en=Cherokee
+Cirt.en=Cirth
+Copt.en=Coptic
+Cprt.en=Cypriot
+Cyrl.en=Cyrillic
+Cyrs.en=Cyrillic (Old Church Slavonic variant)
+Deva.en=Devanagari
+Dsrt.en=Deseret
+Egyd.en=Egyptian demotic
+Egyh.en=Egyptian hieratic
+Egyp.en=Egyptian hieroglyphs
+Ethi.en=Ethiopic
+Geok.en=Khutsuri (Asomtavruli and Nuskhuri)
+Geor.en=Georgian (Mkhedruli)
+Glag.en=Glagolitic
+Goth.en=Gothic
+Grek.en=Greek
+Gujr.en=Gujarati
+Guru.en=Gurmukhi
+Hang.en=Hangul
+Hani.en=Han
+Hano.en=Hanunoo
+Hans.en=Han (Simplified variant)
+Hant.en=Han (Traditional variant)
+Hebr.en=Hebrew
+Hira.en=Hiragana
+Hmng.en=Pahawh Hmong
+Hrkt.en=(alias for Hiragana + Katakana)
+Hung.en=Old Hungarian
+Inds.en=Indus
+Ital.en=Old Italic (Etruscan, Oscan, etc.)
+Java.en=Javanese
+Jpan.en=Japanese (alias for Han + Hiragana + Katakana)
+Kali.en=Kayah Li
+Kana.en=Katakana
+Khar.en=Kharoshthi
+Khmr.en=Khmer
+Knda.en=Kannada
+Kore.en=Korean (alias for Hangul + Han)
+Kthi.en=Kaithi
+Lana.en=Tai Tham
+Laoo.en=Lao
+Latf.en=Latin (Fraktur variant)
+Latg.en=Latin (Gaelic variant)
+Latn.en=Latin
+Lepc.en=Lepcha
+Limb.en=Limbu
+Lina.en=Linear A
+Linb.en=Linear B
+Lisu.en=Lisu
+Lyci.en=Lycian
+Lydi.en=Lydian
+Mand.en=Mandaic
+Mani.en=Manichaean
+Maya.en=Mayan hieroglyphs
+Mero.en=Meroitic
+Mlym.en=Malayalam
+Mong.en=Mongolian
+Moon.en=Moon
+Mtei.en=Meitei Mayek
+Mymr.en=Myanmar
+Nkgb.en=Nakhi Geba
+Nkoo.en=N’Ko
+Ogam.en=Ogham
+Olck.en=Ol Chiki
+Orkh.en=Old Turkic
+Orya.en=Oriya
+Osma.en=Osmanya
+Perm.en=Old Permic
+Phag.en=Phags-pa
+Phli.en=Inscriptional Pahlavi
+Phlp.en=Psalter Pahlavi
+Phlv.en=Book Pahlavi
+Phnx.en=Phoenician
+Plrd.en=Miao
+Prti.en=Inscriptional Parthian
+Rjng.en=Rejang
+Roro.en=Rongorongo
+Runr.en=Runic
+Samr.en=Samaritan
+Sara.en=Sarati
+Sarb.en=Old South Arabian
+Saur.en=Saurashtra
+Sgnw.en=SignWriting
+Shaw.en=Shavian
+Sinh.en=Sinhala
+Sund.en=Sundanese
+Sylo.en=Syloti Nagri
+Syrc.en=Syriac
+Syre.en=Syriac (Estrangelo variant)
+Syrj.en=Syriac (Western variant)
+Syrn.en=Syriac (Eastern variant)
+Tagb.en=Tagbanwa
+Tale.en=Tai Le
+Talu.en=New Tai Lue
+Taml.en=Tamil
+Tavt.en=Tai Viet
+Telu.en=Telugu
+Teng.en=Tengwar
+Tfng.en=Tifinagh
+Tglg.en=Tagalog
+Thaa.en=Thaana
+Thai.en=Thai
+Tibt.en=Tibetan
+Ugar.en=Ugaritic
+Vaii.en=Vai
+Visp.en=Visible Speech
+Xpeo.en=Old Persian
+Xsux.en=Sumero-Akkadian cuneiform
+Yiii.en=Yi
+aluku.en=Aluku dialect
+biske.en=The San Giorgio dialect of Resian
+boont.en=Boontling
+kkcor.en=Common Cornish orthography of Revived Cornish
+lipaw.en=The Lipovaz dialect of Resian
+nedis.en=Natisone dialect
+njiva.en=The Gniva dialect of Resian
+osojs.en=The Oseacco dialect of Resian
+rozaj.en=Resian
+solba.en=The Stolvizza dialect of Resian
+uccor.en=Unified Cornish orthography of Revived Cornish
+fonipa.en=International Phonetic Alphabet
+fonupa.en=Uralic Phonetic Alphabet
+heploc.en=Hepburn romanization, Library of Congress method
+ndyuka.en=Ndyuka dialect
+pamaka.en=Pamaka dialect
+pinyin.en=Pinyin romanization
+scouse.en=Scouse
+tarask.en=Belarusian in Taraskievica orthography
+ucrcor.en=Unified Cornish Revised orthography of Revived Cornish
+arevela.en=Eastern Armenian
+arevmda.en=Western Armenian
+hepburn.en=Hepburn romanization
+monoton.en=Monotonic Greek
+polyton.en=Polytonic Greek
+baku1926.en=Unified Turkic Latin Alphabet (Historical)
+scotland.en=Scottish Standard English
+valencia.en=Valencian
+wadegile.en=Wade-Giles romanization
diff --git a/locales.d/lt-utf8.conf b/locales.d/lt-utf8.conf
new file mode 100644
index 0000000..8d36e0e
--- /dev/null
+++ b/locales.d/lt-utf8.conf
@@ -0,0 +1,397 @@
+# Lithunian book locale file in UTF-8 encoding made by Linas Spraunius <mail@operis.org>
+# 2004-09-14
+
+[Meta]
+Name=lt
+Description=Lithuanian
+Encoding=UTF-8
+
+[Text]
+Genesis=Pradžios
+Exodus=IÅ¡Ä—jimo
+Leviticus=Kunigų
+Numbers=Skai�ių
+Deuteronomy=Pakartoto įstatymo
+Joshua=JozuÄ—s
+Judges=Teisėjų
+Ruth=Rutos
+I Samuel=I Samuelio
+II Samuel=II Samuelio
+I Kings=I Karalių
+II Kings=II Karalių
+I Chronicles=I Kronikų
+II Chronicles=II Kronikų
+Ezra=Ezdro
+Nehemiah=Nehemijo
+Esther=Esteros
+Job=Jobo
+Psalms=PsalmÄ—s
+Proverbs=PatarlÄ—s
+Ecclesiastes=Ekleziasto
+Song of Solomon=Giesmių Giesmė
+Isaiah=Izaijo
+Jeremiah=Jeremijo
+Lamentations=Raudų
+Ezekiel=Ezekielio
+Daniel=Danieliaus
+Hosea=OzÄ—jo
+Joel=Joelio
+Amos=Amoso
+Obadiah=Abdijo
+Jonah=Jonos
+Micah=MichÄ—jo
+Nahum=Nahumo
+Habakkuk=Habakuko
+Zephaniah=Sofonijo
+Haggai=AgÄ—jo
+Zechariah=Zacharijo
+Malachi=Malachijo
+Matthew=Mato
+Mark=Morkaus
+Luke=Luko
+John=Jono
+Acts=Apaštalų darbai
+Romans=Romie�iams
+I Corinthians=I Korintie�iams
+II Corinthians=II Korintie�iams
+Galatians=Galatams
+Ephesians=Efezie�iams
+Philippians=Filipie�iams
+Colossians=Kolosie�iams
+I Thessalonians=I Tesalonikie�iams
+II Thessalonians=II Tesalonikie�iams
+I Timothy=I Timotiejui
+II Timothy=II Timotiejui
+Titus=Titui
+Philemon=Filemonui
+Hebrews=Žydams
+James=Jokūbo
+I Peter=I Petro
+II Peter=II Petro
+I John=I Jono
+II John=II Jono
+III John=III Jono
+Jude=Judo
+Revelation of John=Apreiškimas Jonui
+
+[Book Abbrevs]
+
+PR=Gen
+PRAD=Gen
+PRADŽIOS=Gen
+IÅ =Exod
+IÅ Ä–J=Exod
+IÅ Ä–JIMO=Exod
+KN=Lev
+KUN=Lev
+KUNIGŲ=Lev
+SK=Num
+SKAIČ=Num
+SKAIČIŲ=Num
+PAK=Deut
+PAKARTOTO=Deut
+PAKARTOTO ĮSTATYMO=Deut
+JOZ=Josh
+JOZUÄ–S=Josh
+TS=Judg
+TEIS=Judg
+TEISĖJŲ=Judg
+RT=Ruth
+RUT=Ruth
+RUTOS=Ruth
+1SAM=1Sam
+1SAMUELIO=1Sam
+1 SAM=1Sam
+1 SAUELIO=1Sam
+I SAM=1Sam
+I SAMUELIO=1Sam
+2 SAM=2Sam
+2 SAUELIO=2Sam
+II SAM=2Sam
+II SAMUELIO=2Sam
+1KAR=1Kgs
+1 KAR=1Kgs
+1KARAL=1Kgs
+1 KARAL=1Kgs
+1KARALIŲ=1Kgs
+1 KARALIŲ=1Kgs
+I KAR=1Kgs
+I KARAL=1Kgs
+I KARALIŲ=1Kgs
+2KAR=2Kgs
+2 KAR=2Kgs
+2KARAL=2Kgs
+2 KARAL=2Kgs
+2KARALIŲ=2Kgs
+2 KARALIŲ=2Kgs
+II KAR=2Kgs
+II KARAL=2Kgs
+II KARALIŲ=2Kgs
+1KRON=1Chr
+1KRONIKŲ=1Chr
+1 KRON=1Chr
+1KRONIKŲ=1Chr
+I KRON=1Chr
+I KRONIKŲ=1Chr
+2KRON=2Chr
+2KRONIKŲ=2Chr
+2 KRON=2Chr
+2KRONIKŲ=2Chr
+II KRON=2Chr
+II KRONIKŲ=2Chr
+EZ=Ezra
+EZD=Ezra
+EZDRO=Ezra
+NEH=Neh
+NEHEM=Neh
+NEHEMIJO=Neh
+ES=Esth
+EST=Esth
+ESTER=Esth
+ESTEROS=Esth
+JOB=Job
+JOBO=Job
+PS=Ps
+PSALM=Ps
+PSALMIŲ=Ps
+PSALMÄ–S=Ps
+PT=Prov
+PAT=Prov
+PATARL=Prov
+PATARLIŲ=Prov
+PATARLÄ–S=Prov
+EK=Eccl
+EKL=Eccl
+EKLEZ=Eccl
+EKLEZIASTO=Eccl
+GG=Song
+GIESM=Song
+GIESMÄ–=Song
+GIESMIŲ GIESMĖ=Song
+IZ=Isa
+IZAIJO=Isa
+JER=Jer
+JEREM=Jer
+JEREMIJO=Jer
+RAUD=Lam
+RAUDŲ=Lam
+EZE=Ezek
+EZECH=Ezek
+EZECHIELIO=Ezek
+EZEKIELIO=Ezek
+DAN=Dan
+DANIEL=Dan
+DANIELIAUS=Dan
+OZ=Hos
+OZÄ–JO=Hos
+JOEL=Joel
+JOELIO=Joel
+AM=Amos
+AMOSO=Amos
+ABD=Obad
+ABDIJO=Obad
+JONOS=Jonah
+MICH=Mic
+MICHÄ–JO=Mic
+NAH=Nah
+NAHUM=Nah
+NAHUMO=Nah
+HAB=Hab
+HABAK=Hab
+HABAKUK=Hab
+HABAKUKO=Hab
+SOF=Zeph
+SOFON=Zeph
+SOFONIJO=Zeph
+AG=Hag
+AGÄ–JO=Hag
+ZACH=Zech
+ZACHAR=Zech
+ZACHARIJO=Zech
+MAL=Mal
+MALACH=Mal
+MALACHIJO=Mal
+MT=Matt
+MAT=Matt
+MATO=Matt
+MK=Mark
+MOR=Mark
+MORK=Mark
+MORKAUS=Mark
+LK=Luke
+LUK=Luke
+LUKO=Luke
+JN=John
+JON=John
+JONO=John
+APD=Acts
+APAÅ T=Acts
+APAŠTALŲ=Acts
+APAŠTALŲ DARBAI=Acts
+RM=Rom
+ROM=Rom
+ROMIEČ=Rom
+ROMIEÄŒIAMS=Rom
+1KOR=1Cor
+1KORINT=1Cor
+1KORINTIEÄŒIAMS=1Cor
+1 KOR=1Cor
+1 KORINT=1Cor
+1 KORINTIEÄŒIAMS=1Cor
+I KOR=1Cor
+I KORINT=1Cor
+I KORINTIEÄŒIAMS=1Cor
+2KOR=2Cor
+2KORINT=2Cor
+2KORINTIEÄŒIAMS=2Cor
+2 KOR=2Cor
+2 KORINT=2Cor
+2 KORINTIEÄŒIAMS=2Cor
+II KOR=2Cor
+II KORINT=2Cor
+II KORINTIEÄŒIAMS=2Cor
+GL=Gal
+GAL=Gal
+GALAT=Gal
+GALATAMS=Gal
+EF=Eph
+EFEZ=Eph
+EFEZIEČ=Eph
+EFEZIEÄŒIAMS=Eph
+FILIP=Phil
+FILIPIEČ=Phil
+FILIPIEÄŒIAMS=Phil
+KOL=Col
+KOLOS=Col
+KOLOSIEČ=Col
+KOLOSIEÄŒIAMS=Col
+1TES=1Thess
+1TESAL=1Thess
+1TESALON=1Thess
+1TESALONIK=1Thess
+1TESALONIKIEČ=1Thess
+1TESALONIKIEÄŒIAMS=1Thess
+1 TES=1Thess
+1 TESAL=1Thess
+1 TESALON=1Thess
+1 TESALONIK=1Thess
+1 TESALONIKIEČ=1Thess
+1 TESALONIKIEÄŒIAMS=1Thess
+I TES=1Thess
+I TESAL=1Thess
+I TESALON=1Thess
+I TESALONIK=1Thess
+I TESALONIKIEČ=1Thess
+I TESALONIKIEÄŒIAMS=1Thess
+2TES=2Thess
+2TESAL=2Thess
+2TESALON=2Thess
+2TESALONIK=2Thess
+2TESALONIKIEČ=2Thess
+2TESALONIKIEÄŒIAMS=2Thess
+2 TES=2Thess
+2 TESAL=2Thess
+2 TESALON=2Thess
+2 TESALONIK=2Thess
+2 TESALONIKIEČ=2Thess
+2 TESALONIKIEÄŒIAMS=2Thess
+II TES=2Thess
+II TESAL=2Thess
+II TESALON=2Thess
+II TESALONIK=2Thess
+II TESALONIKIEČ=2Thess
+II TESALONIKIEÄŒIAMS=2Thess
+1TIM=1Tim
+1TIMOT=1Tim
+1TIMOTIEJ=1Tim
+1TIMOTIEJUI=1Tim
+1 TIM=1Tim
+1 TIMOT=1Tim
+1 TIMOTIEJ=1Tim
+1 TIMOTIEJUI=1Tim
+I TIM=1Tim
+I TIMOT=1Tim
+I TIMOTIEJ=1Tim
+I TIMOTIEJUI=1Tim
+2TIM=2Tim
+2TIMOT=2Tim
+2TIMOTIEJ=2Tim
+2TIMOTIEJUI=2Tim
+2 TIM=2Tim
+2 TIMOT=2Tim
+2 TIMOTIEJ=2Tim
+2 TIMOTIEJUI=2Tim
+II TIM=2Tim
+II TIMOT=2Tim
+II TIMOTIEJ=2Tim
+II TIMOTIEJUI=2Tim
+TIT=Titus
+TITUI=Titus
+FILEM=Phlm
+FILEMON=Phlm
+FILEMONUI=Phlm
+ŽD=Heb
+ŽYD=Heb
+ŽYDAMS=Heb
+JOK=Jas
+JOKŪB=Jas
+JOKŪBO=Jas
+1PT=1Pet
+1PET=1Pet
+1PETR=1Pet
+1PETRO=1Pet
+1 PT=1Pet
+1 PET=1Pet
+1 PETR=1Pet
+1 PETRO=1Pet
+I PT=1Pet
+I PET=1Pet
+I PETR=1Pet
+I PETRO=1Pet
+2PT=2Pet
+2PET=2Pet
+2PETR=2Pet
+2PETRO=2Pet
+2 PT=2Pet
+2 PET=2Pet
+2 PETR=2Pet
+2 PETRO=2Pet
+II PT=2Pet
+II PET=2Pet
+II PETR=2Pet
+II PETRO=2Pet
+1JN=1John
+1JON=1John
+1JONO=1John
+1 JN=1John
+1 JON=1John
+1 JONO=1John
+I JN=1John
+I JON=1John
+I JONO=1John
+2JN=2John
+2JON=2John
+2JONO=2John
+2 JN=2John
+2 JON=2John
+2 JONO=2John
+II JN=2John
+II JON=2John
+II JONO=2John
+3JN=3John
+3JON=3John
+3JONO=3John
+3 JN=3John
+3 JON=3John
+3 JONO=3John
+III JN=3John
+III JON=3John
+III JONO=3John
+JD=Jude
+JUD=Jude
+JUDO=Jude
+APR=Rev
+APREIÅ K=Rev
+APREIÅ KIM=Rev
+APREIÅ KIMAS=Rev
+APREIÅ KIMAS JONUI=Rev
diff --git a/locales.d/mt-utf8.conf b/locales.d/mt-utf8.conf
new file mode 100644
index 0000000..b5f8bfe
--- /dev/null
+++ b/locales.d/mt-utf8.conf
@@ -0,0 +1,211 @@
+[Meta]
+Name=mt
+Description=Maltese / Malti
+Encoding=UTF-8
+
+[Text]
+Genesis=Ä enesi
+Exodus=Eżodu
+Leviticus=Levitku
+Numbers=Numri
+Deuteronomy=Dewteronomju
+Joshua=Ġożwe
+Judges=Imħallfin
+Ruth=Rut
+I Samuel=1 Samwel
+II Samuel=2 Samwel
+I Kings=1 Slaten
+II Kings=2 Slaten
+I Chronicles=1 Kronaki
+II Chronicles=2 Kronaki
+Ezra=Esdra
+Nehemiah=Neħemija
+#Tobit=Tobija 
+#Judith=Ä uditta 
+Esther=Ester
+#I Maccabees=L-Ewwel Ktieb tal-Makkabin
+#II Maccabees=Tt-Tieni Ktieb tal-Makkabin
+Job=Ä ob
+Psalms=Salmi
+Proverbs=Qwiel
+Ecclesiastes=Ktieb Qohelet
+Song of Solomon=L-Għanja tal-Għanjiet
+#Wisdom=Ktieb il-Għerf 
+#Sirach=Il-Ktieb ta' Bin Sirak 
+Isaiah=Isaija
+Jeremiah=Ä eremija
+Lamentations=Lamentazzjonijiet
+#Baruch=Ktieb Baruk 
+Ezekiel=Eżekjel
+Daniel=Danjel
+Hosea=Hosegħa
+Joel=Joel
+Amos=Għamos
+Obadiah=Għabdija
+Jonah=Jona
+Micah=Mikea
+Nahum=Naħum
+Habakkuk=Ħabaqquq
+Zephaniah=Ktieb Sofonija
+Haggai=Ħaggaj
+Zechariah=Żakkarija
+Malachi=Malakija
+Matthew=Mattew
+Mark=Mark
+Luke=Luqa
+John=Ä wann
+Acts=Atti tal-Appostli
+Romans=L-ittra lir-Rumani
+I Corinthians=l-1 ittra Korintin
+II Corinthians=it-2 Ittra lill-Korintin
+Galatians=L-Ittra lill-Galatin
+I Thessalonians= 1 Tessalonkin
+II Thessalonians=2 Tessalonkin
+Ephesians=Itra lill-Efesin
+Philippians=Ittra lill-Filippin
+Colossians= l-Ittra lill-Kolossin
+Philemon= L-Ittra lil Filemon
+I Timothy=L-Ewwel ittra lil Timoteus
+II Timothy=It-tieni ittra lil Timoteus
+Titus=L-Ittra lil Titus
+Hebrews=L-ittra lil Lhud
+James=L-ittra ta'San Ä akbu
+I Peter= L-Ewwel Ittra ta' San Pietru
+II Peter=It-Tieni Ittra ta' San Pietru
+I John=L-ewwel ittra ta' San Ä wann
+II John= It-tieni ittra ta' San Ä wann
+III John= It-Tielet ittra ta' San Ä wann
+Jude= L-Ittra ta' San Ä uda
+Revelation of John=Apokalissi
+
+[Book Abbrevs]
+
+Ä ENESI=Gen
+EŻODU=Exod
+LEVITKU=Lev
+NUMRI=Num
+DEWTERONOMJU=Deut
+
+ĠOŻWE=Josh
+IMĦALLFIN=Judg
+RUT=Ruth
+
+1 SAMWEL=1Sam
+2 SAMWEL=2Sam
+1 SLATEN=1Kgs
+2 SLATEN=2Kgs
+
+1 KRONAKI=1Chr
+2 KRONAKI=2Chr
+ESDRA=Ezra
+NEĦEMIJA=Neh
+# TOBIJA=Esth
+# Ä UDITTA=Job
+ESTER=Esth
+# 1 MAKKABIN=Prov
+# 2 MAKKABIN=Eccl
+Ä OB=Job
+SALMI=Ps
+QWIEL=Prov
+
+QOHELET=Eccl
+KTIEB QOHELET=Eccl
+
+L-GĦANJA TAL-GĦANJIET=Song
+# GĦERF=Dan
+# BIN SIRAK=Hos
+
+ISAIJA=Isa
+Ä EREMIJA=Jer
+LAMENTAZZJONIJIET=Lam
+
+# BARUK=Jonah
+
+EŻEKJEL=Ezek
+DANJEL=Dan
+HOSEGĦA=Hos
+JOEL=Joel
+GĦAMOS=Amos
+GĦABDIJA=Obad
+JONA=Jonah
+MIKEA=Mic
+NAĦUM=Nah
+ĦABAQQUQ=Hab
+
+KTIEB SOFONIJA=Zeph
+SOFONIJA=Zeph
+
+ĦAGGAJ=Hag
+ŻAKKARIJA=Zech
+MALAKIJA=Mal
+MATTEW=Matt
+MARK=Mark
+LUQA=Luke
+Ä WANN=John
+ATTI=Acts
+ATTI TAL-APPOSTLI=Acts
+RUMANI=Rom
+L-ITTRA LIR-RUMANI=Rom
+
+1 KORINTIN=1Cor
+L-1 ITTRA KORINTIN=1Cor
+
+
+2 KORINTIN=2Cor
+IT-2 ITTRA LILL-KORINTIN=2Cor
+
+GALATIN=Gal
+L-ITTRA LILL-GALATIN=Gal
+
+EFESIN=EPh
+ITRA LILL-EFESIN=Eph
+
+FILIPPIN=Phil
+ITTRA LILL-FILIPPIN=Phil
+
+KOLOSSIN=Col
+L-ITTRA LILL-KOLOSSIN=Col
+
+1 TESSALONKIN=1Thess
+
+2 TESSALONKIN=2Thess
+
+1 TIMOTEUS=1Tim
+L-EWWEL ITTRA LIL TIMOTEUS=1Tim
+
+2 TIMOTEUS=2Tim
+IT-TIENI ITTRA LIL TIMOTEUS=2Tim
+
+TITUS=Titus
+L-ITTRA LIL TITUS=Titus
+
+FILEMON=Phlm
+L-ITTRA LIL FILEMON=Phlm
+
+LHUD=Heb
+L-ITTRA LIL LHUD=Heb
+
+SAN Ä AKBU=Jas
+L-ITTRA TA'SAN Ä AKBU=Jas
+
+1 SAN PIETRU=1Pet
+L-EWWEL ITTRA TA' SAN PIETRU=1Pet
+
+2 SAN PIETRU=2Pet
+IT-TIENI ITTRA TA' SAN PIETRU=2Pet
+
+1 Ä WANN=1John
+L-EWWEL ITTRA TA' SAN Ä WANN=1John
+
+2 Ä WANN=2John
+IT-TIENI ITTRA TA' SAN Ä WANN=2John
+
+3 Ä WANN=3John
+IT-TIELET ITTRA TA' SAN Ä WANN=3John
+
+Ä UDA=Jude
+L-ITTRA TA' SAN Ä UDA=Jude
+
+APOKALISSI=Rev
+
+
diff --git a/locales.d/nb-utf8.conf b/locales.d/nb-utf8.conf
new file mode 100644
index 0000000..be8b7f6
--- /dev/null
+++ b/locales.d/nb-utf8.conf
@@ -0,0 +1,295 @@
+[Meta]
+Name=nb
+Description=Bokmål (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josva
+Judges=Dommerne
+Ruth=Rut
+I Samuel=1. Samuelsbok
+II Samuel=2. Samuelsbok
+I Kings=1. Kongebok
+II Kings=2. Kongebok
+I Chronicles=1. Krønikebok
+II Chronicles=2. Krønikebok
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Salmene
+Proverbs=Ordspråkene
+Ecclesiastes=Forkynneren
+Song of Solomon=Høysangen
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagesangene
+Ezekiel=Esekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlenes gjerninger
+Romans=Romerne
+I Corinthians=1. Korinter
+II Corinthians=2. Korinter
+Galatians=Galaterne
+Ephesians=Efeserne
+Philippians=Filipperne
+Colossians=Kolosserne
+I Thessalonians=1. Tessaloniker
+II Thessalonians=2. Tessaloniker
+I Timothy=1. Timoteus
+II Timothy=2. Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebreerne
+James=Jakob
+I Peter=1. Peter
+II Peter=2. Peter
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Johannes' åpenbaring
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+1MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+2MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+3MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+4MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+5MOSEBOK=Deut
+
+JOSVA=Josh
+DOMMERNE=Judg
+RUT=Ruth
+
+1. SAMUELSBOK=1Sam
+1 SAMUELSBOK=1Sam
+1SAMUELSBOK=1Sam
+
+2. SAMUELSBOK=2Sam
+2 SAMUELSBOK=2Sam
+2SAMUELSBOK=2Sam
+
+1. KONGEBOK=1Kgs
+1 KONGEBOK=1Kgs
+1KONGEBOK=1Kgs
+
+2. KONGEBOK=2Kgs
+2 KONGEBOK=2Kgs
+2KONGEBOK=2Kgs
+
+1. KRØNIKEBOK=1Chr
+1 KRØNIKEBOK=1Chr
+1KRØNIKEBOK=1Chr
+
+2. KRØNIKEBOK=2Chr
+2 KRØNIKEBOK=2Chr
+2KRØNIKEBOK=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+SALMENE=Ps
+ORDSPRÃ…KENE=Prov
+FORKYNNEREN=Eccl
+HØYSANGEN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGESANGENE=Lam
+ESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLENES GJERNINGER=Acts
+ROMERNE=Rom
+
+1. KORINTER=1Cor
+1 KORINTER=1Cor
+1KORINTER=1Cor
+
+2. KORINTER=2Cor
+2 KORINTER=2Cor
+2KORINTER=2Cor
+
+GALATERNE=Gal
+EFESERNE=Eph
+FILIPPERNE=Phil
+KOLOSSERNE=Col
+
+1. TESSALONIKER=1Thess
+1 TESSALONIKER=1Thess
+1TESSALONIKER=1Thess
+
+2. TESSALONIKER=2Thess
+2 TESSALONIKER=2Thess
+2TESSALONIKER=2Thess
+
+1. TIMOTEUS=1Tim
+1 TIMOTEUS=1Tim
+1TIMOTEUS=1Tim
+
+2. TIMOTEUS=2Tim
+2 TIMOTEUS=2Tim
+2TIMOTEUS=2Tim
+
+TITUS=Titus
+FILEMON=Phlm
+HEBREERNE=Heb
+JAKOB=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+
+JUDAS=Jude
+JOHANNES' Ã…PENBARING=Rev
+
+1. MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4MOS=Num
+5. MOS=Deut
+5MOS=Deut
+JOS=Josh
+DOM=Judg
+1. SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2SAM=2Sam
+1. KONG=1Kgs
+1KONG=1Kgs
+2. KONG=2Kgs
+2KONG=2Kgs
+1. KRØN=1Chr
+1KRØN=1Chr
+2. KRØN=2Chr
+2KRØN=2Chr
+NEH=Neh
+EST=Esth
+SAL=Ps
+ORDSP=Prov
+FORK=Eccl
+HØYS=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+ESEK=Ezek
+DAN=Dan
+HOS=Hos
+AM=Amos
+OB=Obad
+MI=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+ROM=Rom
+1. KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1JOH=1John
+2. JOH=2John
+2JOH=2John
+3. JOH=3John
+3JOH=3John
+JUD=Jude
+Ã…P=Rev
diff --git a/locales.d/nb.conf b/locales.d/nb.conf
new file mode 100644
index 0000000..bf7702c
--- /dev/null
+++ b/locales.d/nb.conf
@@ -0,0 +1,295 @@
+[Meta]
+Name=nb
+Description=Bokmål
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josva
+Judges=Dommerne
+Ruth=Rut
+I Samuel=1. Samuelsbok
+II Samuel=2. Samuelsbok
+I Kings=1. Kongebok
+II Kings=2. Kongebok
+I Chronicles=1. Krønikebok
+II Chronicles=2. Krønikebok
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Salmene
+Proverbs=Ordspråkene
+Ecclesiastes=Forkynneren
+Song of Solomon=Høysangen
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagesangene
+Ezekiel=Esekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlenes gjerninger
+Romans=Romerne
+I Corinthians=1. Korinter
+II Corinthians=2. Korinter
+Galatians=Galaterne
+Ephesians=Efeserne
+Philippians=Filipperne
+Colossians=Kolosserne
+I Thessalonians=1. Tessaloniker
+II Thessalonians=2. Tessaloniker
+I Timothy=1. Timoteus
+II Timothy=2. Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebreerne
+James=Jakob
+I Peter=1. Peter
+II Peter=2. Peter
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Johannes' åpenbaring
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+1MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+2MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+3MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+4MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+5MOSEBOK=Deut
+
+JOSVA=Josh
+DOMMERNE=Judg
+RUT=Ruth
+
+1. SAMUELSBOK=1Sam
+1 SAMUELSBOK=1Sam
+1SAMUELSBOK=1Sam
+
+2. SAMUELSBOK=2Sam
+2 SAMUELSBOK=2Sam
+2SAMUELSBOK=2Sam
+
+1. KONGEBOK=1Kgs
+1 KONGEBOK=1Kgs
+1KONGEBOK=1Kgs
+
+2. KONGEBOK=2Kgs
+2 KONGEBOK=2Kgs
+2KONGEBOK=2Kgs
+
+1. KRØNIKEBOK=1Chr
+1 KRØNIKEBOK=1Chr
+1KRØNIKEBOK=1Chr
+
+2. KRØNIKEBOK=2Chr
+2 KRØNIKEBOK=2Chr
+2KRØNIKEBOK=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+SALMENE=Ps
+ORDSPRÅKENE=Prov
+FORKYNNEREN=Eccl
+HØYSANGEN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGESANGENE=Lam
+ESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLENES GJERNINGER=Acts
+ROMERNE=Rom
+
+1. KORINTER=1Cor
+1 KORINTER=1Cor
+1KORINTER=1Cor
+
+2. KORINTER=2Cor
+2 KORINTER=2Cor
+2KORINTER=2Cor
+
+GALATERNE=Gal
+EFESERNE=Eph
+FILIPPERNE=Phil
+KOLOSSERNE=Col
+
+1. TESSALONIKER=1Thess
+1 TESSALONIKER=1Thess
+1TESSALONIKER=1Thess
+
+2. TESSALONIKER=2Thess
+2 TESSALONIKER=2Thess
+2TESSALONIKER=2Thess
+
+1. TIMOTEUS=1Tim
+1 TIMOTEUS=1Tim
+1TIMOTEUS=1Tim
+
+2. TIMOTEUS=2Tim
+2 TIMOTEUS=2Tim
+2TIMOTEUS=2Tim
+
+TITUS=Titus
+FILEMON=Phlm
+HEBREERNE=Heb
+JAKOB=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+
+JUDAS=Jude
+JOHANNES' ÅPENBARING=Rev
+
+1. MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4MOS=Num
+5. MOS=Deut
+5MOS=Deut
+JOS=Josh
+DOM=Judg
+1. SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2SAM=2Sam
+1. KONG=1Kgs
+1KONG=1Kgs
+2. KONG=2Kgs
+2KONG=2Kgs
+1. KRØN=1Chr
+1KRØN=1Chr
+2. KRØN=2Chr
+2KRØN=2Chr
+NEH=Neh
+EST=Esth
+SAL=Ps
+ORDSP=Prov
+FORK=Eccl
+HØYS=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+ESEK=Ezek
+DAN=Dan
+HOS=Hos
+AM=Amos
+OB=Obad
+MI=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+ROM=Rom
+1. KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1JOH=1John
+2. JOH=2John
+2JOH=2John
+3. JOH=3John
+3JOH=3John
+JUD=Jude
+ÅP=Rev
diff --git a/locales.d/nl-utf8.conf b/locales.d/nl-utf8.conf
new file mode 100644
index 0000000..d5e12e0
--- /dev/null
+++ b/locales.d/nl-utf8.conf
@@ -0,0 +1,263 @@
+[Meta]
+Name=nl
+Description=Nederlands (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Leviticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Jozua
+Judges=Richteren
+Ruth=Ruth
+I Samuel=1Samuel
+II Samuel=2Samuel
+I Kings=1Koningen
+II Kings=2Koningen
+I Chronicles=1Kronieken
+II Chronicles=2Kronieken
+Ezra=Ezra
+Nehemiah=Nehemia
+Esther=Esther
+Job=Job
+Psalms=Psalm
+Proverbs=Spreuken
+Ecclesiastes=Prediker
+Song of Solomon=Hooglied
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klaagliederen
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Micha
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Zephanja
+Haggai=Haggai
+Zechariah=Zacharia
+Malachi=Maleachi
+Matthew=Mattheus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Handelingen
+Romans=Romeinen
+I Corinthians=1Corinthe
+II Corinthians=2Corinthe
+Galatians=Galaten
+Ephesians=Efeze
+Philippians=Philippensen
+Colossians=Kolossensen
+I Thessalonians=1Thessalonisensen
+II Thessalonians=2Thessalonisensen
+I Timothy=1Thimotheus
+II Timothy=2Thimotheus
+Titus=Titus
+Philemon=Philemon
+Hebrews=Hebreeen
+James=Jacobus
+I Peter=1Petrus
+II Peter=2Petrus
+I John=1Johannes
+II John=2Johannes
+III John=3Johannes
+Jude=Judas
+Revelation of John=Openbaring
+
+[Book Abbrevs]
+
+GENESIS=Gen
+GE=Gen
+EXODUS=Exod
+EX=Exod
+LEVITICUS=Lev
+LE=Lev
+LEV=Lev
+NUMERI=Num
+NUM=Num
+NU=Num
+DEUTERONOMIUM=Deut
+DE=Deut
+DEUT=Deut
+JOZUA=Josh
+JOZ=Josh
+RICHTEREN=Judg
+RI=Judg
+RICH=Judg
+RUTH=Ruth
+1SAMUEL=1Sam
+1SA=1Sam
+1SAM=1Sam
+1 SA=1Sam
+1 SAM=1Sam
+2SAMUEL=2Sam
+2SA=2Sam
+2SAM=2Sam
+2 SA=2Sam
+2 SAM=2Sam
+1KONINGEN=1Kgs
+1KO=1Kgs
+1 KO=1Kgs
+1KON=1Kgs
+1 KON=1Kgs
+2KONINGEN=2Kgs
+2KO=2Kgs
+2 KO=2Kgs
+2KON=2Kgs
+2 KON=2Kgs
+1KRONIEKEN=1Chr
+1KR=1Chr
+1 KR=1Chr
+2KRONIEKEN=2Chr
+2KR=2Chr
+2 KR=2Chr
+EZRA=Ezra
+EZR=Ezra
+NEHEMIA=Neh
+NEH=Neh
+ESTHER=Esth
+ESTER=Esth
+ES=Esth
+JOB=Job
+PSALM=Ps
+PS=Ps
+SPREUKEN=Prov
+SPR=Prov
+SP=Prov
+PREDIKER=Eccl
+PR=Eccl
+HOOGLIED=Song
+HOOGL=Song
+JESAJA=Isa
+JES=Isa
+JEREMIA=Jer
+JER=Jer
+KLAAGLIEDEREN=Lam
+KLAAGL=Lam
+KL=Lam
+EZECHIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DAN=Dan
+HOSEA=Hos
+HOS=Hos
+JOEL=Joel
+AMOS=Amos
+AM=Amos
+OBADJA=Obad
+OB=Obad
+JONA=Jonah
+JON=Jonah
+MICHA=Mic
+NAHUM=Nah
+NAH=Nah
+HABAKKUK=Hab
+HAB=Hab
+ZEPHANJA=Zeph
+ZEPH=Zeph
+HAGGAI=Hag
+HAG=Hag
+ZACHARIA=Zech
+ZACH=Zech
+MALEACHI=Mal
+MAL=Mal
+MATTHEUS=Matt
+MT=Matt
+MATH=Matt
+MARKUS=Mark
+MR=Mark
+MARK=Mark
+LUKAS=Luke
+LUK=Luke
+JOHANNES=John
+JOH=John
+HANDELINGEN=Acts
+HAND=Acts
+AC=Acts
+ROMEINEN=Rom
+ROM=Rom
+RO=Rom
+1KORINTHE=1Cor
+1CORINTHE=1Cor
+1KOR=1Cor
+2KORINTHE=2Cor
+2CORINTHE=2Cor
+2KORINTIERS=2Cor
+2KOR=2Cor
+GALATEN=Gal
+GAL=Gal
+GA=Gal
+EFEZE=Eph
+EF=Eph
+EPH=Eph
+PHILIPPENSEN=Phil
+PHLM=Phlm
+PHP=Phil
+PHIL=Phil
+PH=Phil
+KOLOSSENSEN=Col
+KOL=Col
+1THESSALONISENSEN=1Thess
+1TH=1Thess
+1THES=1Thess
+1 TH=1Thess
+1 THES=1Thess
+2THESSALONISENSEN=2Thess
+2TH=2Thess
+2THES=2Thess
+2 TH=2Thess
+2 THES=2Thess
+1THIMOTHEUS=1Tim
+1TIM=1Tim
+1TI=1Tim
+2THIMOTHEUS=2Tim
+2TIM=2Tim
+2TI=2Tim
+TITUS=Titus
+TIT=Titus
+TI=Titus
+PHILEMON=Phlm
+PHIL=Phlm
+PH=Phlm
+HEBREEEN=Heb
+HEB=Heb
+HEBR=Heb
+JACOBUS=Jas
+JAC=Jas
+1PETRUS=1Pet
+1PE=1Pet
+1PETR=1Pet
+1 PE=1Pet
+1 PETR=1Pet
+2PETRUS=2Pet
+2PE=2Pet
+2PETR=2Pet
+2 PE=2Pet
+2 PETR=2Pet
+1JOHANNES=1John
+1JO=1John
+1 JO=1John
+1JOH=1John
+1 JOH=1John
+2JOHANNES=2John
+2JO=2John
+2 JO=2John
+2JOH=2John
+2 JOH=2John
+3JOHANNES=3John
+3JO=3John
+3 JO=3John
+3JOH=3John
+3 JOH=3John
+JUDAS=Jude
+OPENBARING=Rev
+OP=Rev
+OPB=Rev
+OPENB=Rev
diff --git a/locales.d/nl.conf b/locales.d/nl.conf
new file mode 100644
index 0000000..ff9e0ba
--- /dev/null
+++ b/locales.d/nl.conf
@@ -0,0 +1,263 @@
+[Meta]
+Name=nl
+Description=Nederlands
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Leviticus
+Numbers=Numeri
+Deuteronomy=Deuteronomium
+Joshua=Jozua
+Judges=Richteren
+Ruth=Ruth
+I Samuel=1Samuel
+II Samuel=2Samuel
+I Kings=1Koningen
+II Kings=2Koningen
+I Chronicles=1Kronieken
+II Chronicles=2Kronieken
+Ezra=Ezra
+Nehemiah=Nehemia
+Esther=Esther
+Job=Job
+Psalms=Psalm
+Proverbs=Spreuken
+Ecclesiastes=Prediker
+Song of Solomon=Hooglied
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klaagliederen
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Micha
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Zephanja
+Haggai=Haggai
+Zechariah=Zacharia
+Malachi=Maleachi
+Matthew=Mattheus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Handelingen
+Romans=Romeinen
+I Corinthians=1Corinthe
+II Corinthians=2Corinthe
+Galatians=Galaten
+Ephesians=Efeze
+Philippians=Philippensen
+Colossians=Kolossensen
+I Thessalonians=1Thessalonisensen
+II Thessalonians=2Thessalonisensen
+I Timothy=1Thimotheus
+II Timothy=2Thimotheus
+Titus=Titus
+Philemon=Philemon
+Hebrews=Hebreeen
+James=Jacobus
+I Peter=1Petrus
+II Peter=2Petrus
+I John=1Johannes
+II John=2Johannes
+III John=3Johannes
+Jude=Judas
+Revelation of John=Openbaring
+
+[Book Abbrevs]
+
+GENESIS=Gen
+GE=Gen
+EXODUS=Exod
+EX=Exod
+LEVITICUS=Lev
+LE=Lev
+LEV=Lev
+NUMERI=Num
+NUM=Num
+NU=Num
+DEUTERONOMIUM=Deut
+DE=Deut
+DEUT=Deut
+JOZUA=Josh
+JOZ=Josh
+RICHTEREN=Judg
+RI=Judg
+RICH=Judg
+RUTH=Ruth
+1SAMUEL=1Sam
+1SA=1Sam
+1SAM=1Sam
+1 SA=1Sam
+1 SAM=1Sam
+2SAMUEL=2Sam
+2SA=2Sam
+2SAM=2Sam
+2 SA=2Sam
+2 SAM=2Sam
+1KONINGEN=1Kgs
+1KO=1Kgs
+1 KO=1Kgs
+1KON=1Kgs
+1 KON=1Kgs
+2KONINGEN=2Kgs
+2KO=2Kgs
+2 KO=2Kgs
+2KON=2Kgs
+2 KON=2Kgs
+1KRONIEKEN=1Chr
+1KR=1Chr
+1 KR=1Chr
+2KRONIEKEN=2Chr
+2KR=2Chr
+2 KR=2Chr
+EZRA=Ezra
+EZR=Ezra
+NEHEMIA=Neh
+NEH=Neh
+ESTHER=Esth
+ESTER=Esth
+ES=Esth
+JOB=Job
+PSALM=Ps
+PS=Ps
+SPREUKEN=Prov
+SPR=Prov
+SP=Prov
+PREDIKER=Eccl
+PR=Eccl
+HOOGLIED=Song
+HOOGL=Song
+JESAJA=Isa
+JES=Isa
+JEREMIA=Jer
+JER=Jer
+KLAAGLIEDEREN=Lam
+KLAAGL=Lam
+KL=Lam
+EZECHIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DAN=Dan
+HOSEA=Hos
+HOS=Hos
+JOEL=Joel
+AMOS=Amos
+AM=Amos
+OBADJA=Obad
+OB=Obad
+JONA=Jonah
+JON=Jonah
+MICHA=Mic
+NAHUM=Nah
+NAH=Nah
+HABAKKUK=Hab
+HAB=Hab
+ZEPHANJA=Zeph
+ZEPH=Zeph
+HAGGAI=Hag
+HAG=Hag
+ZACHARIA=Zech
+ZACH=Zech
+MALEACHI=Mal
+MAL=Mal
+MATTHEUS=Matt
+MT=Matt
+MATH=Matt
+MARKUS=Mark
+MR=Mark
+MARK=Mark
+LUKAS=Luke
+LUK=Luke
+JOHANNES=John
+JOH=John
+HANDELINGEN=Acts
+HAND=Acts
+AC=Acts
+ROMEINEN=Rom
+ROM=Rom
+RO=Rom
+1KORINTHE=1Cor
+1CORINTHE=1Cor
+1KOR=1Cor
+2KORINTHE=2Cor
+2CORINTHE=2Cor
+2KORINTIERS=2Cor
+2KOR=2Cor
+GALATEN=Gal
+GAL=Gal
+GA=Gal
+EFEZE=Eph
+EF=Eph
+EPH=Eph
+PHILIPPENSEN=Phil
+PHLM=Phlm
+PHP=Phil
+PHIL=Phil
+PH=Phil
+KOLOSSENSEN=Col
+KOL=Col
+1THESSALONISENSEN=1Thess
+1TH=1Thess
+1THES=1Thess
+1 TH=1Thess
+1 THES=1Thess
+2THESSALONISENSEN=2Thess
+2TH=2Thess
+2THES=2Thess
+2 TH=2Thess
+2 THES=2Thess
+1THIMOTHEUS=1Tim
+1TIM=1Tim
+1TI=1Tim
+2THIMOTHEUS=2Tim
+2TIM=2Tim
+2TI=2Tim
+TITUS=Titus
+TIT=Titus
+TI=Titus
+PHILEMON=Phlm
+PHIL=Phlm
+PH=Phlm
+HEBREEEN=Heb
+HEB=Heb
+HEBR=Heb
+JACOBUS=Jas
+JAC=Jas
+1PETRUS=1Pet
+1PE=1Pet
+1PETR=1Pet
+1 PE=1Pet
+1 PETR=1Pet
+2PETRUS=2Pet
+2PE=2Pet
+2PETR=2Pet
+2 PE=2Pet
+2 PETR=2Pet
+1JOHANNES=1John
+1JO=1John
+1 JO=1John
+1JOH=1John
+1 JOH=1John
+2JOHANNES=2John
+2JO=2John
+2 JO=2John
+2JOH=2John
+2 JOH=2John
+3JOHANNES=3John
+3JO=3John
+3 JO=3John
+3JOH=3John
+3 JOH=3John
+JUDAS=Jude
+OPENBARING=Rev
+OP=Rev
+OPB=Rev
+OPENB=Rev
diff --git a/locales.d/no-utf8.conf b/locales.d/no-utf8.conf
new file mode 100644
index 0000000..bc8d9ce
--- /dev/null
+++ b/locales.d/no-utf8.conf
@@ -0,0 +1,295 @@
+[Meta]
+Name=no
+Description=Norsk (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josva
+Judges=Dommerne
+Ruth=Rut
+I Samuel=1. Samuelsbok
+II Samuel=2. Samuelsbok
+I Kings=1. Kongebok
+II Kings=2. Kongebok
+I Chronicles=1. Krønikebok
+II Chronicles=2. Krønikebok
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Salmene
+Proverbs=Ordspråkene
+Ecclesiastes=Forkynneren
+Song of Solomon=Høysangen
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagesangene
+Ezekiel=Esekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlenes gjerninger
+Romans=Romerne
+I Corinthians=1. Korinter
+II Corinthians=2. Korinter
+Galatians=Galaterne
+Ephesians=Efeserne
+Philippians=Filipperne
+Colossians=Kolosserne
+I Thessalonians=1. Tessaloniker
+II Thessalonians=2. Tessaloniker
+I Timothy=1. Timoteus
+II Timothy=2. Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebreerne
+James=Jakob
+I Peter=1. Peter
+II Peter=2. Peter
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Johannes' åpenbaring
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+1MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+2MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+3MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+4MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+5MOSEBOK=Deut
+
+JOSVA=Josh
+DOMMERNE=Judg
+RUT=Ruth
+
+1. SAMUELSBOK=1Sam
+1 SAMUELSBOK=1Sam
+1SAMUELSBOK=1Sam
+
+2. SAMUELSBOK=2Sam
+2 SAMUELSBOK=2Sam
+2SAMUELSBOK=2Sam
+
+1. KONGEBOK=1Kgs
+1 KONGEBOK=1Kgs
+1KONGEBOK=1Kgs
+
+2. KONGEBOK=2Kgs
+2 KONGEBOK=2Kgs
+2KONGEBOK=2Kgs
+
+1. KRØNIKEBOK=1Chr
+1 KRØNIKEBOK=1Chr
+1KRØNIKEBOK=1Chr
+
+2. KRØNIKEBOK=2Chr
+2 KRØNIKEBOK=2Chr
+2KRØNIKEBOK=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+SALMENE=Ps
+ORDSPRÃ…KENE=Prov
+FORKYNNEREN=Eccl
+HØYSANGEN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGESANGENE=Lam
+ESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLENES GJERNINGER=Acts
+ROMERNE=Rom
+
+1. KORINTER=1Cor
+1 KORINTER=1Cor
+1KORINTER=1Cor
+
+2. KORINTER=2Cor
+2 KORINTER=2Cor
+2KORINTER=2Cor
+
+GALATERNE=Gal
+EFESERNE=Eph
+FILIPPERNE=Phil
+KOLOSSERNE=Col
+
+1. TESSALONIKER=1Thess
+1 TESSALONIKER=1Thess
+1TESSALONIKER=1Thess
+
+2. TESSALONIKER=2Thess
+2 TESSALONIKER=2Thess
+2TESSALONIKER=2Thess
+
+1. TIMOTEUS=1Tim
+1 TIMOTEUS=1Tim
+1TIMOTEUS=1Tim
+
+2. TIMOTEUS=2Tim
+2 TIMOTEUS=2Tim
+2TIMOTEUS=2Tim
+
+TITUS=Titus
+FILEMON=Phlm
+HEBREERNE=Heb
+JAKOB=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+
+JUDAS=Jude
+JOHANNES' Ã…PENBARING=Rev
+
+1. MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4MOS=Num
+5. MOS=Deut
+5MOS=Deut
+JOS=Josh
+DOM=Judg
+1. SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2SAM=2Sam
+1. KONG=1Kgs
+1KONG=1Kgs
+2. KONG=2Kgs
+2KONG=2Kgs
+1. KRØN=1Chr
+1KRØN=1Chr
+2. KRØN=2Chr
+2KRØN=2Chr
+NEH=Neh
+EST=Esth
+SAL=Ps
+ORDSP=Prov
+FORK=Eccl
+HØYS=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+ESEK=Ezek
+DAN=Dan
+HOS=Hos
+AM=Amos
+OB=Obad
+MI=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+ROM=Rom
+1. KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1JOH=1John
+2. JOH=2John
+2JOH=2John
+3. JOH=3John
+3JOH=3John
+JUD=Jude
+Ã…P=Rev
diff --git a/locales.d/no.conf b/locales.d/no.conf
new file mode 100644
index 0000000..0021bd0
--- /dev/null
+++ b/locales.d/no.conf
@@ -0,0 +1,295 @@
+[Meta]
+Name=no
+Description=Norsk
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josva
+Judges=Dommerne
+Ruth=Rut
+I Samuel=1. Samuelsbok
+II Samuel=2. Samuelsbok
+I Kings=1. Kongebok
+II Kings=2. Kongebok
+I Chronicles=1. Krønikebok
+II Chronicles=2. Krønikebok
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Salmene
+Proverbs=Ordspråkene
+Ecclesiastes=Forkynneren
+Song of Solomon=Høysangen
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagesangene
+Ezekiel=Esekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habakkuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlenes gjerninger
+Romans=Romerne
+I Corinthians=1. Korinter
+II Corinthians=2. Korinter
+Galatians=Galaterne
+Ephesians=Efeserne
+Philippians=Filipperne
+Colossians=Kolosserne
+I Thessalonians=1. Tessaloniker
+II Thessalonians=2. Tessaloniker
+I Timothy=1. Timoteus
+II Timothy=2. Timoteus
+Titus=Titus
+Philemon=Filemon
+Hebrews=Hebreerne
+James=Jakob
+I Peter=1. Peter
+II Peter=2. Peter
+I John=1. Johannes
+II John=2. Johannes
+III John=3. Johannes
+Jude=Judas
+Revelation of John=Johannes' åpenbaring
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+1MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+2MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+3MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+4MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+5MOSEBOK=Deut
+
+JOSVA=Josh
+DOMMERNE=Judg
+RUT=Ruth
+
+1. SAMUELSBOK=1Sam
+1 SAMUELSBOK=1Sam
+1SAMUELSBOK=1Sam
+
+2. SAMUELSBOK=2Sam
+2 SAMUELSBOK=2Sam
+2SAMUELSBOK=2Sam
+
+1. KONGEBOK=1Kgs
+1 KONGEBOK=1Kgs
+1KONGEBOK=1Kgs
+
+2. KONGEBOK=2Kgs
+2 KONGEBOK=2Kgs
+2KONGEBOK=2Kgs
+
+1. KRØNIKEBOK=1Chr
+1 KRØNIKEBOK=1Chr
+1KRØNIKEBOK=1Chr
+
+2. KRØNIKEBOK=2Chr
+2 KRØNIKEBOK=2Chr
+2KRØNIKEBOK=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+SALMENE=Ps
+ORDSPRÅKENE=Prov
+FORKYNNEREN=Eccl
+HØYSANGEN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGESANGENE=Lam
+ESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAHUM=Nah
+HABAKKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLENES GJERNINGER=Acts
+ROMERNE=Rom
+
+1. KORINTER=1Cor
+1 KORINTER=1Cor
+1KORINTER=1Cor
+
+2. KORINTER=2Cor
+2 KORINTER=2Cor
+2KORINTER=2Cor
+
+GALATERNE=Gal
+EFESERNE=Eph
+FILIPPERNE=Phil
+KOLOSSERNE=Col
+
+1. TESSALONIKER=1Thess
+1 TESSALONIKER=1Thess
+1TESSALONIKER=1Thess
+
+2. TESSALONIKER=2Thess
+2 TESSALONIKER=2Thess
+2TESSALONIKER=2Thess
+
+1. TIMOTEUS=1Tim
+1 TIMOTEUS=1Tim
+1TIMOTEUS=1Tim
+
+2. TIMOTEUS=2Tim
+2 TIMOTEUS=2Tim
+2TIMOTEUS=2Tim
+
+TITUS=Titus
+FILEMON=Phlm
+HEBREERNE=Heb
+JAKOB=Jas
+
+1. PETER=1Pet
+1 PETER=1Pet
+1PETER=1Pet
+
+2. PETER=2Pet
+2 PETER=2Pet
+2PETER=2Pet
+
+1. JOHANNES=1John
+1 JOHANNES=1John
+1JOHANNES=1John
+
+2. JOHANNES=2John
+2 JOHANNES=2John
+2JOHANNES=2John
+
+3. JOHANNES=3John
+3 JOHANNES=3John
+3JOHANNES=3John
+
+JUDAS=Jude
+JOHANNES' ÅPENBARING=Rev
+
+1. MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4MOS=Num
+5. MOS=Deut
+5MOS=Deut
+JOS=Josh
+DOM=Judg
+1. SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2SAM=2Sam
+1. KONG=1Kgs
+1KONG=1Kgs
+2. KONG=2Kgs
+2KONG=2Kgs
+1. KRØN=1Chr
+1KRØN=1Chr
+2. KRØN=2Chr
+2KRØN=2Chr
+NEH=Neh
+EST=Esth
+SAL=Ps
+ORDSP=Prov
+FORK=Eccl
+HØYS=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+ESEK=Ezek
+DAN=Dan
+HOS=Hos
+AM=Amos
+OB=Obad
+MI=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+ROM=Rom
+1. KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2TESS=2Thess
+1. TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1JOH=1John
+2. JOH=2John
+2JOH=2John
+3. JOH=3John
+3JOH=3John
+JUD=Jude
+ÅP=Rev
diff --git a/locales.d/pl-utf8.conf b/locales.d/pl-utf8.conf
new file mode 100644
index 0000000..49ae5e0
--- /dev/null
+++ b/locales.d/pl-utf8.conf
@@ -0,0 +1,153 @@
+[Meta]
+Name=pl
+Description=Polska (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Rodzaju
+Exodus=Wyjścia
+Leviticus=Kapłańska
+Numbers=Liczb
+Deuteronomy=Powtórzonego Prawa
+Joshua=Jozuego
+Judges=Sędziów
+Ruth=Rut
+I Samuel=1 Samuela
+II Samuel=2 Samuela
+I Kings=1 Królewska
+II Kings=2 Królewska
+I Chronicles=1 Kronik
+II Chronicles=2 Kronik
+Ezra=Ezdrasza
+Nehemiah=Nehemiasza
+Esther=Estery
+Job=Hioba
+Psalms=Psalmów
+Proverbs=Przysłów
+Ecclesiastes=Koheleta
+Song of Solomon=Pieśni nad pieśniami
+Isaiah=Izajasza
+Jeremiah=Jeremiasza
+Lamentations=Lamentacje
+Ezekiel=Ezechiela
+Daniel=Daniela
+Hosea=Ozeasza
+Joel=Joela
+Amos=Amosa
+Obadiah=Abdiasza
+Jonah=Jonasza
+Micah=Micheasza
+Nahum=Nahuma
+Habakkuk=Habakuka
+Zephaniah=Sofoniasza
+Haggai=Aggeusza
+Zechariah=Zachariasza
+Malachi=Malachiasza
+Matthew=Mateusza
+Mark=Marka
+Luke=�ukasza
+John=Jana
+Acts=Dzieje
+Romans=Rzymian
+I Corinthians=1 Koryntian
+II Corinthians=2 Koryntian
+Galatians=Galatów
+Ephesians=Efezjan
+Philippians=Filipian
+Colossians=Kolosan
+I Thessalonians=1 Tesaloniczan
+II Thessalonians=2 Tesaloniczan
+I Timothy=1 Tymoteusza
+II Timothy=2 Tymoteusza
+Titus=Tytusa
+Philemon=Filemona
+Hebrews=Hebrajczyków
+James=Jakuba
+I Peter=1 Piotra
+II Peter=2 Piotra
+I John=1 Jana
+II John=2 Jana
+III John=3 Jana
+Jude=Judy
+Revelation of John=Apokalipsa
+
+[Book Abbrevs]
+
+RODZAJU=Gen
+WYJÅšCIAJ=Exod
+KAP�AŃSKA=Lev
+LICZB=Num
+POWTÓRZONEGO PRAWA=Deut
+JOZUEGO=Josh
+SĘDZIÓW=Judg
+RUT=Ruth
+1 SAMUELA=1Sam
+2 SAMUELA=2Sam
+1 KRÓLEWSKA=1Kgs
+2 KRÓLEWSKA=2Kgs
+1 KRONIK=1Chr
+2 KRONIK=2Chr
+EZDRASZA=Ezra
+NEHEMIASZA=Neh
+ESTERY=Esth
+HIOBA=Job
+PSALMÓW=Ps
+PRZYS�ÓW=Prov
+KOHELETA=Eccl
+EKLEZJASTESA=Eccl
+PIEÅšNI NAD PIEÅšNIAMI=Song
+IZAJASZA=Isa
+JEREMIASZA=Jer
+LAMENTACJE=Lam
+EZECHIELA=Ezek
+DANIELA=Dan
+OZEASZA=Hos
+JOELA=Joel
+AMOSA=Amos
+ABDIASZA=Obad
+JONASZA=Jonah
+MICHEASZA=Mic
+NAHUMA=Nah
+HABAKUKA=Hab
+SOFONIASZA=Zeph
+AGGEUSZA=Hag
+ZACHARIASZA=Zech
+MALACHIASZA=Mal
+MATEUSZA=Matt
+MARKA=Mark
+�UKASZA=Luke
+JANA=John
+DZIEJE=Acts
+RZYMIAN=Rom
+1 KORYNTIAN=1Cor
+1KORYNTIAN=1Cor
+2 KORYNTIAN=2Cor
+2KORYNTIAN=2Cor
+GALATÓW=Gal
+EFEZJAN=Eph
+FILIPIAN=Phil
+KOLOSAN=Col
+1 TESALONICZAN=1Thess
+1TESALONICZAN=1Thess
+2 TESALONICZAN=2Thess
+2TESALONICZAN=2Thess
+1 TYMOTEUSZA=1Tim
+1TYMOTEUSZA=1Tim
+2 TYMOTEUSZA=2Tim
+2TYMOTEUSZA=2Tim
+TYTUSA=Titus
+FILEMONA=Phlm
+HEBRAJCZYKÓW=Heb
+JAKUBA=Jas
+1 PIOTRA=1Pet
+1PIOTRA=1Pet
+2 PIOTRA=2Pet
+2PIOTRA=2Pet
+1 JANA=1John
+1JANA=1John
+2 JANA=2John
+2JANA=2John
+3 JANA=3John
+3JANA=3John
+JUDY=Jude
+APOKALIPSA=Rev
diff --git a/locales.d/pl.conf b/locales.d/pl.conf
new file mode 100644
index 0000000..8fd115a
--- /dev/null
+++ b/locales.d/pl.conf
@@ -0,0 +1,160 @@
+[Meta]
+Name=pl
+Description=Polska
+Encoding=ISO8859-2
+
+[Text]
+Genesis=Rodzaju
+Exodus=Wyj¶cia
+Leviticus=Kap³añska
+Numbers=Liczb
+Deuteronomy=Powtórzonego Prawa
+Joshua=Jozuego
+Judges=Sêdziów
+Ruth=Rut
+I Samuel=1 Samuela
+II Samuel=2 Samuela
+I Kings=1 Królewska
+II Kings=2 Królewska
+I Chronicles=1 Kronik
+II Chronicles=2 Kronik
+Ezra=Ezdrasza
+Nehemiah=Nehemiasza
+Esther=Estery
+Job=Hioba
+Psalms=Psalmów
+Proverbs=Przys³ów
+Ecclesiastes=Koheleta
+Song of Solomon=Pie¶ni nad pie¶niami
+Isaiah=Izajasza
+Jeremiah=Jeremiasza
+Lamentations=Lamentacje
+Ezekiel=Ezechiela
+Daniel=Daniela
+Hosea=Ozeasza
+Joel=Joela
+Amos=Amosa
+Obadiah=Abdiasza
+Jonah=Jonasza
+Micah=Micheasza
+Nahum=Nahuma
+Habakkuk=Habakuka
+Zephaniah=Sofoniasza
+Haggai=Aggeusza
+Zechariah=Zachariasza
+Malachi=Malachiasza
+Matthew=Mateusza
+Mark=Marka
+Luke=£ukasza
+John=Jana
+Acts=Dzieje
+Romans=Rzymian
+I Corinthians=1 Koryntian
+II Corinthians=2 Koryntian
+Galatians=Galatów
+Ephesians=Efezjan
+Philippians=Filipian
+Colossians=Kolosan
+I Thessalonians=1 Tesaloniczan
+II Thessalonians=2 Tesaloniczan
+I Timothy=1 Tymoteusza
+II Timothy=2 Tymoteusza
+Titus=Tytusa
+Philemon=Filemona
+Hebrews=Hebrajczyków
+James=Jakuba
+I Peter=1 Piotra
+II Peter=2 Piotra
+I John=1 Jana
+II John=2 Jana
+III John=3 Jana
+Jude=Judy
+Revelation of John=Apokalipsa
+
+[Book Abbrevs]
+
+RODZAJU=Gen
+WYJ¶CIAJ=Exod
+KAP³AÑSKA=Lev
+LICZB=Num
+POWTÓRZONEGO PRAWA=Deut
+JOZUEGO=Josh
+SDZÊDZIÓW=Judg
+SÊDZIÓW=Judg
+RUT=Ruth
+1 SAMUELA=1Sam
+2 SAMUELA=2Sam
+1 KRÓLEWSKA=1Kgs
+2 KRÓLEWSKA=2Kgs
+1 KRONIK=1Chr
+2 KRONIK=2Chr
+EZDRASZA=Ezra
+NEHEMIASZA=Neh
+ESTERY=Esth
+HIOBA=Job
+PSALMÓW=Ps
+PRZYS³ÓW=Prov
+KOHELETA=Eccl
+EKLEZJASTESA=Eccl
+PIE¶NI NAD PIE¶NIAMI=Song
+IZAJASZA=Isa
+JEREMIASZA=Jer
+LAMENTACJE=Lam
+EZECHIEL=Ezek
+EZECHIELA=Ezek
+DANIEL=Dan
+DANIELA=Dan
+
+OZEASZ=Hos
+OZEASZA=Hos
+JOEL=Joel
+JOELA=Joel
+AMOS=Amos
+AMOSA=Amos
+ABDIASZA=Obad
+JONASZA=Jonah
+MICHEASZA=Mic
+NAHUMA=Nah
+HABAKUKA=Hab
+SOFONIASZA=Zeph
+AGGEUSZA=Hag
+ZACHARIASZA=Zech
+MALACHIASZA=Mal
+MATEUSZA=Matt
+MARKA=Mark
+£UKASZA=Luke
+JANA=John
+DZIEJE=Acts
+RZYMIAN=Rom
+1 KORYNTIAN=1Cor
+1KORYNTIAN=1Cor
+2 KORYNTIAN=2Cor
+2KORYNTIAN=2Cor
+GALATÓW=Gal
+EFEZJAN=Eph
+FILIPIAN=Phil
+KOLOSAN=Col
+1 TESALONICZAN=1Thess
+1TESALONICZAN=1Thess
+2 TESALONICZAN=2Thess
+2TESALONICZAN=2Thess
+1 TYMOTEUSZA=1Tim
+1TYMOTEUSZA=1Tim
+2 TYMOTEUSZA=2Tim
+2TYMOTEUSZA=2Tim
+TYTUSA=Titus
+FILEMONA=Phlm
+HEBRAJCZYKÓW=Heb
+JAKUBA=Jas
+1 PIOTRA=1Pet
+1PIOTRA=1Pet
+2 PIOTRA=2Pet
+2PIOTRA=2Pet
+1 JANA=1John
+1JANA=1John
+2 JANA=2John
+2JANA=2John
+3 JANA=3John
+3JANA=3John
+JUDY=Jude
+APOKALIPSA=Rev
diff --git a/locales.d/pon_utf8.conf b/locales.d/pon_utf8.conf
new file mode 100644
index 0000000..3e55d8e
--- /dev/null
+++ b/locales.d/pon_utf8.conf
@@ -0,0 +1,151 @@
+[Meta]
+Name=pon
+Description=Pohnpeian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=SENESIS
+Exodus=EKSODUS
+Leviticus=LIPAI
+Numbers=NEMPE KAN
+Deuteronomy=DEUDERONOMI
+Joshua=SOSUA
+Judges=SOUNKOPWUNG KAN
+Ruth=RUD
+I Samuel=KEIEUN SAMUEL
+II Samuel=KERIAUN SAMUEL
+I Kings=KEIEUN NANMWARKI KAN
+II Kings=KERIAUN NANMWARKI KAN
+I Chronicles=KEIEUN KRONIKEL
+II Chronicles=KERIAUN KRONIKEL
+Ezra=ESRA
+Nehemiah=NEHMAIA
+Esther=ESTER
+Job=SOHP
+Psalms=MELKAHKA KAN
+Proverbs=LEPIN PADAHK AUDAPAN KAN
+Ecclesiastes=EKLESIADES
+Song of Solomon=MELKAHKAHN MELKAHKA KAN
+Isaiah=AISEIA
+Jeremiah=SEREMAIA
+Lamentations=KOUL KEDEPWIDEPW KAN
+Ezekiel=ESEKIEL
+Daniel=DANIEL
+Hosea=OSEIA
+Joel=SOEL
+Amos=EIMWOS
+Obadiah=OPADAIA
+Jonah=SONA
+Micah=MAIKA
+Nahum=NAHUM
+Habakkuk=APAKUK
+Zephaniah=SEPANAIA
+Haggai=AKKAI
+Zechariah=SEKARAIA
+Malachi=MALAKAI
+Matthew=MADIU
+Mark=MARK
+Luke=LUK
+John=SOHN
+Acts=WIEWIA KAN
+Romans=ROM
+I Corinthians=1 KORINT 
+II Corinthians=2 KORINT
+Galatians=KALESIA
+Ephesians=EPISOS
+Philippians=PILIPAI
+Colossians=KOLOSE
+I Thessalonians=1 DESELONIKA
+II Thessalonians=2 DESELONIKA 
+I Timothy=1 TIMOTY
+II Timothy=2 TIMOTY
+Titus=TAITUS
+Philemon=PAILIMWON
+Hebrews=IPRU
+James=SEIMS
+I Peter=1 PITER
+II Peter=2 PITER
+I John=1 SOHN
+II John=2 SOHN
+III John=3 SOHN
+Jude=SUD
+Revelation of John=KAUDIAHL
+
+[Book Abbrevs]
+
+SEN=Gen
+EKS=Exod
+LIP=Lev
+NEMP=Num
+DEUD=Deut
+SOS=Josh
+S K=Judg
+1 SAM=1Sam
+2 SAM=2Sam
+1 NAN=1Kgs
+2 NAN=2Kgs
+1 KRON=1Chr
+2 KRON=2Chr
+ESRA=Ezra
+NEH=Neh
+EST=Esth
+SOHP=Job
+MEL=Ps
+LEP PAD=Prov
+EKL=Eccl
+MEL MEL=Song
+AIS=Isa
+SER=Jer
+KOUL KED=Lam
+ESEK=Ezek
+DAN=Dan
+OS=Hos
+SOEL=Joel
+EIMW=Amos
+OP=Obad
+SONA=Jonah
+MAIKA=Mic
+NAH=Nah
+APAK=Hab
+SEP=Zeph
+AK=Hag
+SEK=Zech
+MAL=Mal
+
+MAD=Matt
+MK=Mark
+LUK=Luke
+SOHN=John
+WIE=Acts
+ROM=Rom
+1 KOR=1Cor
+2 KOR=2Cor
+KAL=Gal
+EP=Eph
+PIL=Phil
+KOL=Col
+1 DES=1Thess
+2 DES= 2Thess
+1 TIM=1Tim
+2 TIM=2Tim
+1Tim=1Tim
+2TIM=2Tim
+IPRU=Heb
+SEIMS=Jas
+1 PIT=1Pet
+2 PIT=2Pet
+1 SOHN=1John
+2 SOHN=2John
+3 SOHN=3John
+SUD=Jude
+KAUD=Rev
+
+1 Mak=1Macc
+2 Mak=2Macc
+Dob=Tob
+Kupw=Wis
+Par=Bar
+Pel=Bel
+Sir=Sir
+Su=Sus
+
diff --git a/locales.d/pt-utf8.conf b/locales.d/pt-utf8.conf
new file mode 100644
index 0000000..81661f9
--- /dev/null
+++ b/locales.d/pt-utf8.conf
@@ -0,0 +1,206 @@
+[Meta]
+Name=pt
+Description=Portuguese (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Génesis
+Exodus=Êxodo
+Leviticus=Levítico
+Numbers=Números
+Deuteronomy=Deuteronómio
+Joshua=Josué
+Judges=Juízes
+Ruth=Rute
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Reis
+II Kings=2 Reis
+I Chronicles=1 Crónicas
+II Chronicles=2 Crónicas
+Ezra=Esdras
+Nehemiah=Neemias
+Esther=Ester
+Job=Jó
+Psalms=Salmos
+Proverbs=Provérbios
+Ecclesiastes=Eclesiastes
+Song of Solomon=Cantares de Salomão
+Isaiah=Isaías
+Jeremiah=Jeremias
+Lamentations=Lamentações
+Ezekiel=Ezequiel
+Daniel=Daniel
+Hosea=Oséias
+Joel=Joel
+Amos=Amós
+Obadiah=Obadias
+Jonah=Jonas
+Micah=Miquéias
+Nahum=Naum
+Habakkuk=Habacuque
+Zephaniah=Sofonias
+Haggai=Ageu
+Zechariah=Zacarias
+Malachi=Malaquias
+Matthew=Mateus
+Mark=Marcos
+Luke=Lucas
+John=João
+Acts=Actos
+Romans=Romanos
+I Corinthians=1 Coríntios
+II Corinthians=2 Coríntios
+Galatians=Gálatas
+Ephesians=Efésios
+Philippians=Filipenses
+Colossians=Colossenses
+I Thessalonians=1 Tessalonicenses
+II Thessalonians=2 Tessalonicenses
+I Timothy=1 Timóteo
+II Timothy=2 Timóteo
+Titus=Tito
+Philemon=Filemon
+Hebrews=Hebreus
+James=Tiago
+I Peter=1 Pedro
+II Peter=2 Pedro
+I John=1 João
+II John=2 João
+III John=3 João
+Jude=Judas
+Revelation of John=Apocalipse
+
+[Book Abbrevs]
+
+GÉNESIS=Gen
+GEN=Gen
+ÊXODO=Exod
+EX=Exod
+LEV�TICO=Lev
+LV=Lev
+NÚMEROS=Num
+NM=Num
+DEUTERONÓMIO=Deut
+DT=Deut
+JOSUÉ=Josh
+JS=Josh
+JU�ZES=Judg
+JZ=Judg
+RUTE=Ruth
+RT=Ruth
+1 SAMUEL=1Sam
+1SM=1Sam
+2 SAMUEL=2Sam
+2SM=2Sam
+1 REIS=1Kgs
+1RE=1Kgs
+2 REIS=2Kgs
+2RE=2Kgs
+1 CRÓNICAS=1Chr
+1CR=1Chr
+2 CRÓNICAS=2Chr
+2CR=2Chr
+ESDRAS=Ezra
+ED=Ezra
+NEEMIAS=Neh
+NE=Neh
+ESTER=Esth
+ET=Esth
+JÓ=Job
+SALMOS=Ps
+SL=Ps
+PROVÉRBIOS=Prov
+PV=Prov
+ECLESIASTES=Eccl
+EC=Eccl
+CANTARES DE SALOMÃO=Song
+CT=Song
+ISA�AS=Isa
+IS=Isa
+JEREMIAS=Jer
+JR=Jer
+LAMENTAÇÕES=Lam
+LM=Lam
+EZEQUIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OSÉIAS=Hos
+OS=Hos
+JOEL=Joel
+JL=Joel
+AMÓS=Amos
+AM=Amos
+OBADIAS=Obad
+OB=Obad
+JONAS=Jonah
+JN=Jonah
+MIQUÉIAS=Mic
+MQ=Mic
+NAUM=Nah
+NA=Nah
+HABACUQUE=Hab
+HC=Hab
+SOFONIAS=Zeph
+SF=Zeph
+AGEU=Hag
+AG=Hag
+ZACARIAS=Zech
+ZC=Zech
+MALAQUIAS=Mal
+ML=Mal
+MATEUS=Matt
+MT=Matt
+MARCOS=Mark
+MC=Mark
+LUCAS=Luke
+LC=Luke
+JOÃO=John
+JO=John
+ACTOS=Acts
+AT=Acts
+ROMANOS=Rom
+RM=Rom
+1 COR�NTIOS=1Cor
+1CO=1Cor
+2 COR�NTIOS=2Cor
+2CO=2Cor
+G�LATAS=Gal
+GL=Gal
+EFÉSIOS=Eph
+EF=Eph
+FILIPENSES=Phil
+FL=Phil
+COLOSSENSES=Col
+CL=Col
+1 TESSALONICENSES=1Thess
+1TE=1Thess
+2 TESSALONICENSES=2Thess
+2TE=2Thess
+1 TIMÓTEO=1Tim
+1TM=1Tim
+2 TIMÓTEO=2Tim
+2TM=2Tim
+TITO=Titus
+TT=Titus
+FILEMON=Phlm
+FM=Phlm
+HEBREUS=Heb
+HB=Heb
+TIAGO=Jas
+TG=Jas
+1 PEDRO=1Pet
+1PE=1Pet
+2 PEDRO=2Pet
+2PE=2Pet
+1 JOÃO=1John
+1JO=1John
+2 JOÃO=2John
+2JO=2John
+3 JOÃO=3John
+3JO=3John
+JUDAS=Jude
+JD=Jude
+APOCALIPSE=Rev
+AP=Rev
diff --git a/locales.d/pt.conf b/locales.d/pt.conf
new file mode 100644
index 0000000..8df006c
--- /dev/null
+++ b/locales.d/pt.conf
@@ -0,0 +1,206 @@
+[Meta]
+Name=pt
+Description=Portuguese
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Génesis
+Exodus=Êxodo
+Leviticus=Levítico
+Numbers=Números
+Deuteronomy=Deuteronómio
+Joshua=Josué
+Judges=Juízes
+Ruth=Rute
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Reis
+II Kings=2 Reis
+I Chronicles=1 Crónicas
+II Chronicles=2 Crónicas
+Ezra=Esdras
+Nehemiah=Neemias
+Esther=Ester
+Job=Jó
+Psalms=Salmos
+Proverbs=Provérbios
+Ecclesiastes=Eclesiastes
+Song of Solomon=Cantares de Salomão
+Isaiah=Isaías
+Jeremiah=Jeremias
+Lamentations=Lamentações
+Ezekiel=Ezequiel
+Daniel=Daniel
+Hosea=Oséias
+Joel=Joel
+Amos=Amós
+Obadiah=Obadias
+Jonah=Jonas
+Micah=Miquéias
+Nahum=Naum
+Habakkuk=Habacuque
+Zephaniah=Sofonias
+Haggai=Ageu
+Zechariah=Zacarias
+Malachi=Malaquias
+Matthew=Mateus
+Mark=Marcos
+Luke=Lucas
+John=João
+Acts=Actos
+Romans=Romanos
+I Corinthians=1 Coríntios
+II Corinthians=2 Coríntios
+Galatians=Gálatas
+Ephesians=Efésios
+Philippians=Filipenses
+Colossians=Colossenses
+I Thessalonians=1 Tessalonicenses
+II Thessalonians=2 Tessalonicenses
+I Timothy=1 Timóteo
+II Timothy=2 Timóteo
+Titus=Tito
+Philemon=Filemon
+Hebrews=Hebreus
+James=Tiago
+I Peter=1 Pedro
+II Peter=2 Pedro
+I John=1 João
+II John=2 João
+III John=3 João
+Jude=Judas
+Revelation of John=Apocalipse
+
+[Book Abbrevs]
+
+GÉNESIS=Gen
+GEN=Gen
+ÊXODO=Exod
+EX=Exod
+LEVÍTICO=Lev
+LV=Lev
+NÚMEROS=Num
+NM=Num
+DEUTERONÓMIO=Deut
+DT=Deut
+JOSUÉ=Josh
+JS=Josh
+JUÍZES=Judg
+JZ=Judg
+RUTE=Ruth
+RT=Ruth
+1 SAMUEL=1Sam
+1SM=1Sam
+2 SAMUEL=2Sam
+2SM=2Sam
+1 REIS=1Kgs
+1RE=1Kgs
+2 REIS=2Kgs
+2RE=2Kgs
+1 CRÓNICAS=1Chr
+1CR=1Chr
+2 CRÓNICAS=2Chr
+2CR=2Chr
+ESDRAS=Ezra
+ED=Ezra
+NEEMIAS=Neh
+NE=Neh
+ESTER=Esth
+ET=Esth
+JÓ=Job
+SALMOS=Ps
+SL=Ps
+PROVÉRBIOS=Prov
+PV=Prov
+ECLESIASTES=Eccl
+EC=Eccl
+CANTARES DE SALOMÃO=Song
+CT=Song
+ISAÍAS=Isa
+IS=Isa
+JEREMIAS=Jer
+JR=Jer
+LAMENTAÇÕES=Lam
+LM=Lam
+EZEQUIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OSÉIAS=Hos
+OS=Hos
+JOEL=Joel
+JL=Joel
+AMÓS=Amos
+AM=Amos
+OBADIAS=Obad
+OB=Obad
+JONAS=Jonah
+JN=Jonah
+MIQUÉIAS=Mic
+MQ=Mic
+NAUM=Nah
+NA=Nah
+HABACUQUE=Hab
+HC=Hab
+SOFONIAS=Zeph
+SF=Zeph
+AGEU=Hag
+AG=Hag
+ZACARIAS=Zech
+ZC=Zech
+MALAQUIAS=Mal
+ML=Mal
+MATEUS=Matt
+MT=Matt
+MARCOS=Mark
+MC=Mark
+LUCAS=Luke
+LC=Luke
+JOÃO=John
+JO=John
+ACTOS=Acts
+AT=Acts
+ROMANOS=Rom
+RM=Rom
+1 CORÍNTIOS=1Cor
+1CO=1Cor
+2 CORÍNTIOS=2Cor
+2CO=2Cor
+GÁLATAS=Gal
+GL=Gal
+EFÉSIOS=Eph
+EF=Eph
+FILIPENSES=Phil
+FL=Phil
+COLOSSENSES=Col
+CL=Col
+1 TESSALONICENSES=1Thess
+1TE=1Thess
+2 TESSALONICENSES=2Thess
+2TE=2Thess
+1 TIMÓTEO=1Tim
+1TM=1Tim
+2 TIMÓTEO=2Tim
+2TM=2Tim
+TITO=Titus
+TT=Titus
+FILEMON=Phlm
+FM=Phlm
+HEBREUS=Heb
+HB=Heb
+TIAGO=Jas
+TG=Jas
+1 PEDRO=1Pet
+1PE=1Pet
+2 PEDRO=2Pet
+2PE=2Pet
+1 JOÃO=1John
+1JO=1John
+2 JOÃO=2John
+2JO=2John
+3 JOÃO=3John
+3JO=3John
+JUDAS=Jude
+JD=Jude
+APOCALIPSE=Rev
+AP=Rev
diff --git a/locales.d/pt_BR-utf8.conf b/locales.d/pt_BR-utf8.conf
new file mode 100644
index 0000000..9cb8105
--- /dev/null
+++ b/locales.d/pt_BR-utf8.conf
@@ -0,0 +1,206 @@
+[Meta]
+Name=pt_BR
+Description=Brazillian Portuguese
+Encoding=UTF-8
+
+[Text]
+Genesis=Gênesis
+Exodus=Êxodo
+Leviticus=Levítico
+Numbers=Números
+Deuteronomy=Deuteronômio
+Joshua=Josué
+Judges=Juízes
+Ruth=Rute
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Reis
+II Kings=2 Reis
+I Chronicles=1 Crônicas
+II Chronicles=2 Crônicas
+Ezra=Esdras
+Nehemiah=Neemias
+Esther=Ester
+Job=Jó
+Psalms=Salmos
+Proverbs=Provérbios
+Ecclesiastes=Eclesiastes
+Song of Solomon=Cântico dos Cânticos
+Isaiah=Isaías
+Jeremiah=Jeremias
+Lamentations=Lamentações
+Ezekiel=Ezequiel
+Daniel=Daniel
+Hosea=Oséias
+Joel=Joel
+Amos=Amós
+Obadiah=Obadias
+Jonah=Jonas
+Micah=Miquéias
+Nahum=Naum
+Habakkuk=Habacuque
+Zephaniah=Sofonias
+Haggai=Ageu
+Zechariah=Zacarias
+Malachi=Malaquias
+Matthew=Mateus
+Mark=Marcos
+Luke=Lucas
+John=João
+Acts=Atos
+Romans=Romanos
+I Corinthians=1 Coríntios
+II Corinthians=2 Coríntios
+Galatians=Gálatas
+Ephesians=Efésios
+Philippians=Filipenses
+Colossians=Colossenses
+I Thessalonians=1 Tessalonicenses
+II Thessalonians=2 Tessalonicenses
+I Timothy=1 Timóteo
+II Timothy=2 Timóteo
+Titus=Tito
+Philemon=Filemon
+Hebrews=Hebreus
+James=Tiago
+I Peter=1 Pedro
+II Peter=2 Pedro
+I John=1 João
+II John=2 João
+III John=3 João
+Jude=Judas
+Revelation of John=Apocalipse
+
+[Book Abbrevs]
+
+GÊNESIS=Gen
+GEN=Gen
+ÊXODO=Exod
+EX=Exod
+LEV�TICO=Lev
+LV=Lev
+NÚMEROS=Num
+NM=Num
+DEUTERONÔMIO=Deut
+DT=Deut
+JOSUÉ=Josh
+JS=Josh
+JU�ZES=Judg
+JZ=Judg
+RUTE=Ruth
+RT=Ruth
+1 SAMUEL=1Sam
+1SM=1Sam
+2 SAMUEL=2Sam
+2SM=2Sam
+1 REIS=1Kgs
+1RE=1Kgs
+2 REIS=2Kgs
+2RE=2Kgs
+1 CRÔNICAS=1Chr
+1CR=1Chr
+2 CRÔNICAS=2Chr
+2CR=2Chr
+ESDRAS=Ezra
+ED=Ezra
+NEEMIAS=Neh
+NE=Neh
+ESTER=Esth
+ET=Esth
+JÓ=Job
+SALMOS=Ps
+SL=Ps
+PROVÉRBIOS=Prov
+PV=Prov
+ECLESIASTES=Eccl
+EC=Eccl
+Cântico dos Cânticos=Song
+CT=Song
+ISA�AS=Isa
+IS=Isa
+JEREMIAS=Jer
+JR=Jer
+LAMENTAÇÕES=Lam
+LM=Lam
+EZEQUIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OSÉIAS=Hos
+OS=Hos
+JOEL=Joel
+JL=Joel
+AMÓS=Amos
+AM=Amos
+OBADIAS=Obad
+OB=Obad
+JONAS=Jonah
+JN=Jonah
+MIQUÉIAS=Mic
+MQ=Mic
+NAUM=Nah
+NA=Nah
+HABACUQUE=Hab
+HC=Hab
+SOFONIAS=Zeph
+SF=Zeph
+AGEU=Hag
+AG=Hag
+ZACARIAS=Zech
+ZC=Zech
+MALAQUIAS=Mal
+ML=Mal
+MATEUS=Matt
+MT=Matt
+MARCOS=Mark
+MC=Mark
+LUCAS=Luke
+LC=Luke
+JOÃO=John
+JO=John
+ATOS=Acts
+AT=Acts
+ROMANOS=Rom
+RM=Rom
+1 COR�NTIOS=1Cor
+1CO=1Cor
+2 COR�NTIOS=2Cor
+2CO=2Cor
+G�LATAS=Gal
+GL=Gal
+EFÉSIOS=Eph
+EF=Eph
+FILIPENSES=Phil
+FL=Phil
+COLOSSENSES=Col
+CL=Col
+1 TESSALONICENSES=1Thess
+1TE=1Thess
+2 TESSALONICENSES=2Thess
+2TE=2Thess
+1 TIMÓTEO=1Tim
+1TM=1Tim
+2 TIMÓTEO=2Tim
+2TM=2Tim
+TITO=Titus
+TT=Titus
+FILEMON=Phlm
+FM=Phlm
+HEBREUS=Heb
+HB=Heb
+TIAGO=Jas
+TG=Jas
+1 PEDRO=1Pet
+1PE=1Pet
+2 PEDRO=2Pet
+2PE=2Pet
+1 JOÃO=1John
+1JO=1John
+2 JOÃO=2John
+2JO=2John
+3 JOÃO=3John
+3JO=3John
+JUDAS=Jude
+JD=Jude
+APOCALIPSE=Rev
+AP=Rev
diff --git a/locales.d/pt_BR.conf b/locales.d/pt_BR.conf
new file mode 100644
index 0000000..8aa702a
--- /dev/null
+++ b/locales.d/pt_BR.conf
@@ -0,0 +1,206 @@
+[Meta]
+Name=pt_BR
+Description=Brazillian Portuguese
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Gênesis
+Exodus=Êxodo
+Leviticus=Levítico
+Numbers=Números
+Deuteronomy=Deuteronômio
+Joshua=Josué
+Judges=Juízes
+Ruth=Rute
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Reis
+II Kings=2 Reis
+I Chronicles=1 Crônicas
+II Chronicles=2 Crônicas
+Ezra=Esdras
+Nehemiah=Neemias
+Esther=Ester
+Job=Jó
+Psalms=Salmos
+Proverbs=Provérbios
+Ecclesiastes=Eclesiastes
+Song of Solomon=Cântico dos Cânticos
+Isaiah=Isaías
+Jeremiah=Jeremias
+Lamentations=Lamentações
+Ezekiel=Ezequiel
+Daniel=Daniel
+Hosea=Oséias
+Joel=Joel
+Amos=Amós
+Obadiah=Obadias
+Jonah=Jonas
+Micah=Miquéias
+Nahum=Naum
+Habakkuk=Habacuque
+Zephaniah=Sofonias
+Haggai=Ageu
+Zechariah=Zacarias
+Malachi=Malaquias
+Matthew=Mateus
+Mark=Marcos
+Luke=Lucas
+John=João
+Acts=Atos
+Romans=Romanos
+I Corinthians=1 Coríntios
+II Corinthians=2 Coríntios
+Galatians=Gálatas
+Ephesians=Efésios
+Philippians=Filipenses
+Colossians=Colossenses
+I Thessalonians=1 Tessalonicenses
+II Thessalonians=2 Tessalonicenses
+I Timothy=1 Timóteo
+II Timothy=2 Timóteo
+Titus=Tito
+Philemon=Filemon
+Hebrews=Hebreus
+James=Tiago
+I Peter=1 Pedro
+II Peter=2 Pedro
+I John=1 João
+II John=2 João
+III John=3 João
+Jude=Judas
+Revelation of John=Apocalipse
+
+[Book Abbrevs]
+
+GÊNESIS=Gen
+GEN=Gen
+ÊXODO=Exod
+EX=Exod
+LEVÍTICO=Lev
+LV=Lev
+NÚMEROS=Num
+NM=Num
+DEUTERONÔMIO=Deut
+DT=Deut
+JOSUÉ=Josh
+JS=Josh
+JUÍZES=Judg
+JZ=Judg
+RUTE=Ruth
+RT=Ruth
+1 SAMUEL=1Sam
+1SM=1Sam
+2 SAMUEL=2Sam
+2SM=2Sam
+1 REIS=1Kgs
+1RE=1Kgs
+2 REIS=2Kgs
+2RE=2Kgs
+1 CRÔNICAS=1Chr
+1CR=1Chr
+2 CRÔNICAS=2Chr
+2CR=2Chr
+ESDRAS=Ezra
+ED=Ezra
+NEEMIAS=Neh
+NE=Neh
+ESTER=Esth
+ET=Esth
+JÓ=Job
+SALMOS=Ps
+SL=Ps
+PROVÉRBIOS=Prov
+PV=Prov
+ECLESIASTES=Eccl
+EC=Eccl
+Cântico dos Cânticos=Song
+CT=Song
+ISAÍAS=Isa
+IS=Isa
+JEREMIAS=Jer
+JR=Jer
+LAMENTAÇÕES=Lam
+LM=Lam
+EZEQUIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DN=Dan
+OSÉIAS=Hos
+OS=Hos
+JOEL=Joel
+JL=Joel
+AMÓS=Amos
+AM=Amos
+OBADIAS=Obad
+OB=Obad
+JONAS=Jonah
+JN=Jonah
+MIQUÉIAS=Mic
+MQ=Mic
+NAUM=Nah
+NA=Nah
+HABACUQUE=Hab
+HC=Hab
+SOFONIAS=Zeph
+SF=Zeph
+AGEU=Hag
+AG=Hag
+ZACARIAS=Zech
+ZC=Zech
+MALAQUIAS=Mal
+ML=Mal
+MATEUS=Matt
+MT=Matt
+MARCOS=Mark
+MC=Mark
+LUCAS=Luke
+LC=Luke
+JOÃO=John
+JO=John
+ATOS=Acts
+AT=Acts
+ROMANOS=Rom
+RM=Rom
+1 CORÍNTIOS=1Cor
+1CO=1Cor
+2 CORÍNTIOS=2Cor
+2CO=2Cor
+GÁLATAS=Gal
+GL=Gal
+EFÉSIOS=Eph
+EF=Eph
+FILIPENSES=Phil
+FL=Phil
+COLOSSENSES=Col
+CL=Col
+1 TESSALONICENSES=1Thess
+1TE=1Thess
+2 TESSALONICENSES=2Thess
+2TE=2Thess
+1 TIMÓTEO=1Tim
+1TM=1Tim
+2 TIMÓTEO=2Tim
+2TM=2Tim
+TITO=Titus
+TT=Titus
+FILEMON=Phlm
+FM=Phlm
+HEBREUS=Heb
+HB=Heb
+TIAGO=Jas
+TG=Jas
+1 PEDRO=1Pet
+1PE=1Pet
+2 PEDRO=2Pet
+2PE=2Pet
+1 JOÃO=1John
+1JO=1John
+2 JOÃO=2John
+2JO=2John
+3 JOÃO=3John
+3JO=3John
+JUDAS=Jude
+JD=Jude
+APOCALIPSE=Rev
+AP=Rev
diff --git a/locales.d/ro-utf8.conf b/locales.d/ro-utf8.conf
new file mode 100644
index 0000000..87cd586
--- /dev/null
+++ b/locales.d/ro-utf8.conf
@@ -0,0 +1,147 @@
+#
+#     Numele cartilor Bibliei in versiunea Cornilescu
+#
+#        Artemis State arty@home.ro
+#   multumiri lui  Martin Gruner mg.pub@gmx.net
+
+[Meta]
+Name=ro
+Description=Romanian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesa
+Exodus=Exod
+Leviticus=Levitic
+Numbers=Numeri
+Deuteronomy=Deuteronom
+Joshua=Iosua
+Judges=Judecatori
+Ruth=Rut
+I Samuel=I Samuel
+II Samuel=II Samuel
+I Kings=I Regi
+II Kings=II Regi
+I Chronicles=I Cronici
+II Chronicles=II Cronici
+Ezra=Ezra
+Nehemiah=Neemia
+Esther=Estera
+Job=Iov
+Psalms=Psalmi
+Proverbs=Proverbe
+Ecclesiastes=Eclesiastul
+Song of Solomon=Cantarea Cantarilor
+Isaiah=Isaia
+Jeremiah=Ieremia
+Lamentations=Plangerile
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Osea
+Joel=Ioel
+Amos=Amos
+Obadiah=Obadia
+Jonah=Iona
+Micah=Mica
+Nahum=Naum
+Habakkuk=Habacuc
+Zephaniah=Tefania
+Haggai=Hagai
+Zechariah=Zaharia
+Malachi=Maleachi
+Matthew=Matei
+Mark=Marcu
+Luke=Luca
+John=Ioan
+Acts=Faptele Apostolilor
+Romans=Romani
+I Corinthians=I Corinteni
+II Corinthians=II Corinteni
+Galatians=Galateni
+Ephesians=Efeseni
+Philippians=Filipeni
+Colossians=Coloseni
+I Thessalonians=I Tesaloniceni
+II Thessalonians=II Tesaloniceni
+I Timothy=I Timotei
+II Timothy=II Timotei
+Titus=Tit
+Philemon=Filimon
+Hebrews=Evrei
+James=Iacov
+I Peter=I Petru
+II Peter=II Petru
+I John=I Ioan
+II John=II Ioan
+III John=III Ioan
+Jude=Iuda
+Revelation of John=Apocalipsa
+
+[Book Abbrevs]
+
+GENESA=Gen
+EXOD=Exod
+LEVITIC=Lev
+NUMERI=Num
+DEUTERONOM=Deut
+IOSUA=Josh
+JUDECATORI=Judg
+RUT=Ruth
+I SAMUEL=1Sam
+II SAMUEL=2Sam
+I REGI=1Kgs
+II REGI=2Kgs
+I CRONICI=1Chr
+II CRONICI=2Chr
+EZRA=Ezra
+NEEMIA=Neh
+ESTERA=Esth
+IOV=Job
+PSALMI=Ps
+PROVERBE=Prov
+ECLESIASTUL=Eccl
+CANTAREA CANTARILOR=Song
+ISAIA=Isa
+IEREMIA=Jer
+PLANGERILE=Lam
+EZECHIEL=Ezek
+DANIEL=Dan
+OSEA=Hos
+IOEL=Joel
+AMOS=Amos
+OBADIA=Obad
+IONA=Jonah
+MICA=Mic
+NAUM=Nah
+HABACUC=Hab
+TEFANIA=Zeph
+HAGAI=Hag
+ZAHARIA=Zech
+MALEACHI=Mal
+MATEI=Matt
+MARCU=Mark
+LUCA=Luke
+IOAN=John
+FAPTELE APOSTOLILOR=Acts
+ROMANI=Rom
+I CORINTENI=1Cor
+II CORINTENI=2Cor
+GALATENI=Gal
+EFESENI=Eph
+FILIPENI=Phil
+COLOSENI=Col
+I TESALONICENI=1Thess
+II TESALONICENI=2Thess
+I TIMOTEI=1Tim
+II TIMOTEI=2Tim
+TIT=Titus
+FILIMON=Phlm
+EVREI=Heb
+IACOV=Jas
+I PETRU=1Pet
+II PETRU=2Pet
+I IOAN=1John
+II IOAN=2John
+III IOAN=3John
+IUDA=Jude
+APOCALIPSA=Rev
diff --git a/locales.d/ro.conf b/locales.d/ro.conf
new file mode 100644
index 0000000..b10fc5f
--- /dev/null
+++ b/locales.d/ro.conf
@@ -0,0 +1,147 @@
+#
+#     Numele cartilor Bibliei in versiunea Cornilescu
+#
+#        Artemis State arty@home.ro
+#   multumiri lui  Martin Gruner mg.pub@gmx.net
+
+[Meta]
+Name=ro
+Description=Romanian
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Genesa
+Exodus=Exod
+Leviticus=Levitic
+Numbers=Numeri
+Deuteronomy=Deuteronom
+Joshua=Iosua
+Judges=Judecatori
+Ruth=Rut
+I Samuel=I Samuel
+II Samuel=II Samuel
+I Kings=I Regi
+II Kings=II Regi
+I Chronicles=I Cronici
+II Chronicles=II Cronici
+Ezra=Ezra
+Nehemiah=Neemia
+Esther=Estera
+Job=Iov
+Psalms=Psalmi
+Proverbs=Proverbe
+Ecclesiastes=Eclesiastul
+Song of Solomon=Cantarea Cantarilor
+Isaiah=Isaia
+Jeremiah=Ieremia
+Lamentations=Plangerile
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Osea
+Joel=Ioel
+Amos=Amos
+Obadiah=Obadia
+Jonah=Iona
+Micah=Mica
+Nahum=Naum
+Habakkuk=Habacuc
+Zephaniah=Tefania
+Haggai=Hagai
+Zechariah=Zaharia
+Malachi=Maleachi
+Matthew=Matei
+Mark=Marcu
+Luke=Luca
+John=Ioan
+Acts=Faptele Apostolilor
+Romans=Romani
+I Corinthians=I Corinteni
+II Corinthians=II Corinteni
+Galatians=Galateni
+Ephesians=Efeseni
+Philippians=Filipeni
+Colossians=Coloseni
+I Thessalonians=I Tesaloniceni
+II Thessalonians=II Tesaloniceni
+I Timothy=I Timotei
+II Timothy=II Timotei
+Titus=Tit
+Philemon=Filimon
+Hebrews=Evrei
+James=Iacov
+I Peter=I Petru
+II Peter=II Petru
+I John=I Ioan
+II John=II Ioan
+III John=III Ioan
+Jude=Iuda
+Revelation of John=Apocalipsa
+
+[Book Abbrevs]
+
+GENESA=Gen
+EXOD=Exod
+LEVITIC=Lev
+NUMERI=Num
+DEUTERONOM=Deut
+IOSUA=Josh
+JUDECATORI=Judg
+RUT=Ruth
+I SAMUEL=1Sam
+II SAMUEL=2Sam
+I REGI=1Kgs
+II REGI=2Kgs
+I CRONICI=1Chr
+II CRONICI=2Chr
+EZRA=Ezra
+NEEMIA=Neh
+ESTERA=Esth
+IOV=Job
+PSALMI=Ps
+PROVERBE=Prov
+ECLESIASTUL=Eccl
+CANTAREA CANTARILOR=Song
+ISAIA=Isa
+IEREMIA=Jer
+PLANGERILE=Lam
+EZECHIEL=Ezek
+DANIEL=Dan
+OSEA=Hos
+IOEL=Joel
+AMOS=Amos
+OBADIA=Obad
+IONA=Jonah
+MICA=Mic
+NAUM=Nah
+HABACUC=Hab
+TEFANIA=Zeph
+HAGAI=Hag
+ZAHARIA=Zech
+MALEACHI=Mal
+MATEI=Matt
+MARCU=Mark
+LUCA=Luke
+IOAN=John
+FAPTELE APOSTOLILOR=Acts
+ROMANI=Rom
+I CORINTENI=1Cor
+II CORINTENI=2Cor
+GALATENI=Gal
+EFESENI=Eph
+FILIPENI=Phil
+COLOSENI=Col
+I TESALONICENI=1Thess
+II TESALONICENI=2Thess
+I TIMOTEI=1Tim
+II TIMOTEI=2Tim
+TIT=Titus
+FILIMON=Phlm
+EVREI=Heb
+IACOV=Jas
+I PETRU=1Pet
+II PETRU=2Pet
+I IOAN=1John
+II IOAN=2John
+III IOAN=3John
+IUDA=Jude
+APOCALIPSA=Rev
diff --git a/locales.d/ru-utf8.conf b/locales.d/ru-utf8.conf
new file mode 100644
index 0000000..6f20ca2
--- /dev/null
+++ b/locales.d/ru-utf8.conf
@@ -0,0 +1,681 @@
+# Russian BIBLE
+# БИБЛИЯ, К�ИГИ СВЯЩЕ��ОГО ПИС��ИЯ ВЕТХОГО И �ОВОГО З�ВЕТ�.
+# Працює під Linux і Windows вер�ії проекту SWORD
+# Pavlo Bohmat bohm@ukr.net
+
+# Converted with iconv by Martin Gruner
+
+[Meta]
+Name=ru
+Description=Russian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Бытие
+Exodus=И�ход
+Leviticus=Левит
+Numbers=Чи�ла
+Deuteronomy=Второзаконие
+Joshua=Ии�у� �авин
+Judges=Судьи
+Ruth=Руфь
+I Samuel=1. Цар�тв
+II Samuel=2. Цар�тв
+I Kings=3. Цар�тв
+II Kings=4. Цар�тв
+I Chronicles=1. Паралипоменон
+II Chronicles=2. Паралипоменон
+Prayer of Manasses=Молитва Мана��ии
+Ezra=Ездра
+Nehemiah=�ееми�
+I Esdras=2. Ездры
+Tobit=Товита
+Judith=Иудифь
+Esther=Е�фирь
+Job=Иов
+Psalms=П�алтирь
+Proverbs=Притчи
+Ecclesiastes=Еккле�иа�т
+Song of Solomon=Пе�н� Пе�ней
+Wisdom=Премудро�ть Соломона
+Sirach=Сирах
+Isaiah=И�аи�
+Jeremiah=Иереми�
+Lamentations=Плач Иеремии
+Epistle of Jeremiah=По�лание Иеремии
+Baruch=Варуха
+Ezekiel=Иезекииль
+Daniel=Даниил
+Hosea=О�и�
+Joel=Иоиль
+Amos=�мо�
+Obadiah=�вдий
+Jonah=Иона
+Micah=Михей
+Nahum=�аум
+Habakkuk=�ввакум
+Zephaniah=Софони�
+Haggai=�ггей
+Zechariah=Захари�
+Malachi=Малахи�
+I Maccabees=1. Маккавей�ка�
+II Maccabees=2. Маккавей�ка�
+III Maccabees=3. Маккавей�ка�
+II Esdras=3. Ездры
+Matthew=От Матфе�
+Mark=От Марка
+Luke=От Луки
+John=От Иоанна
+Acts=Де�ни�
+Romans=К Римл�нам
+I Corinthians=1. Коринф�нам
+II Corinthians=2. Коринф�нам
+Galatians=К Галатам
+Ephesians=К Ефе��нам
+Philippians=К Филиппийцам
+Colossians=К Коло���нам
+I Thessalonians=1. Фе��алоникийцам
+II Thessalonians=2. Фе��алоникийцам
+I Timothy=1. Тимофею
+II Timothy=2. Тимофею
+Titus=К Титу
+Philemon=К Филимону
+Hebrews=К Евре�м
+James=Иакова
+I Peter=1. Петра
+II Peter=2. Петра
+I John=1. Иоанна
+II John=2. Иоанна
+III John=3. Иоанна
+Jude=Иуды
+Revelation of John=Откровение
+
+[Book Abbrevs]
+
+1М=Gen
+1М.=Gen
+быт=Gen
+быт.=Gen
+Быт=Gen
+Быт.=Gen
+бытие=Gen
+Бытие=Gen
+2М=Exod
+2М.=Exod
+и�х=Exod
+и�х.=Exod
+И�х=Exod
+И�х.=Exod
+и�ход=Exod
+И�ход=Exod
+3М=Lev
+3М.=Lev
+лев=Lev
+лев.=Lev
+Лев=Lev
+Лев.=Lev
+левит=Lev
+Левит=Lev
+4М=Num
+4М.=Num
+чи�=Num
+чи�.=Num
+Чи�=Num
+Чи�.=Num
+чи�ла=Num
+Чи�ла=Num
+5М=Deut
+5М.=Deut
+втор=Deut
+втор.=Deut
+Втор=Deut
+Втор.=Deut
+Второзаконие=Deut
+ии�.нав.=Josh
+егошуи=Josh
+Егошуи=Josh
+ег=Josh
+ег.=Josh
+ии�у� навин=Josh
+Ии�у� �авин=Josh
+�уд=Judg
+�уд.=Judg
+�удьи=Judg
+Судьи=Judg
+руф=Ruth
+руф.=Ruth
+руфь=Ruth
+Руфь=Ruth
+
+1. Цар�тв=1Sam
+1 Цар�тв=1Sam
+1Цар�тв=1Sam
+1цар=1Sam
+1цар.=1Sam
+1 цар=1Sam
+1 цар.=1Sam
+1Цар=1Sam
+1Цар.=1Sam
+1 Цар=1Sam
+1 Цар.=1Sam
+
+2. Цар�тв=2Sam
+2 Цар�тв=2Sam
+2Цар�тв=2Sam
+2цар=2Sam
+2цар.=2Sam
+2 цар=2Sam
+2 цар.=2Sam
+2Цар=2Sam
+2Цар.=2Sam
+2 Цар=2Sam
+2 Цар.=2Sam
+
+3. Цар�тв=1Kgs
+3 Цар�тв=1Kgs
+3Цар�тв=1Kgs
+3цар=1Kgs
+3цар.=1Kgs
+3 цар=1Kgs
+3 цар.=1Kgs
+3Цар=1Kgs
+3Цар.=1Kgs
+3 Цар=1Kgs
+3 Цар.=1Kgs
+
+4. Цар�тв=2Kgs
+4 Цар�тв=2Kgs
+4Цар�тв=2Kgs
+4цар=2Kgs
+4цар.=2Kgs
+4 цар=2Kgs
+4 цар.=2Kgs
+4Цар=2Kgs
+4Цар.=2Kgs
+4 Цар=2Kgs
+4 Цар.=2Kgs
+
+1. Паралипоменон=1Chr
+1 Паралипоменон=1Chr
+1Паралипоменон=1Chr
+1пар=1Chr
+1пар.=1Chr
+1 пар=1Chr
+1 пар.=1Chr
+1 Пар=1Chr
+1 Пар.=1Chr
+
+2. Паралипоменон=2Chr
+2 Паралипоменон=2Chr
+2Паралипоменон=2Chr
+2пар=2Chr
+2пар.=2Chr
+2 пар=2Chr
+2 пар.=2Chr
+2Пар=2Chr
+2Пар.=2Chr
+2 Пар=2Chr
+2 Пар.=2Chr
+
+Молитва Мана��ии=PrMan
+Мана��ии=PrMan
+Ман.=PrMan
+ман.=PrMan
+Ман=PrMan
+ман=PrMan
+
+ездр=Ezra
+ездр.=Ezra
+Ездр=Ezra
+Ездр.=Ezra
+езд=Ezra
+езд.=Ezra
+Езд=Ezra
+Езд.=Ezra
+Ездра=Ezra
+неем=Neh
+неем.=Neh
+�еем=Neh
+�еем.=Neh
+�ееми�=Neh
+
+2. Ездры=1Esd
+2 Ездры=1Esd
+2Ездры=1Esd
+2Езд.=1Esd
+2Езд=1Esd
+2-� Ездры=1Esd
+2-� Езд.=1Esd
+2-� Езд=1Esd
+2 Ездры=1Esd
+2 Езд.=1Esd
+2 Езд=1Esd
+2 езд=1Esd
+2 ездр=1Esd
+2езд=1Esd
+2ездр=1Esd
+2. езд=1Esd
+2. ездр=1Esd
+
+Товита=Tob
+Товит=Tob
+Тов.=Tob
+Тов=Tob
+
+Юдифь=Jdt
+Иудифь=Jdt
+юдифь=Jdt
+иудифь=Jdt
+
+е�ф=Esth
+е�ф.=Esth
+Е�ф=Esth
+Е�ф.=Esth
+Е�фирь=Esth
+иов=Job
+иов.=Job
+Иов=Job
+п�=Ps
+п�.=Ps
+П�=Ps
+П�.=Ps
+П�алтирь=Ps
+прит=Prov
+прит.=Prov
+Прит=Prov
+Прит.=Prov
+Притчи=Prov
+еккл=Eccl
+еккл.=Eccl
+Еккл=Eccl
+Еккл.=Eccl
+Еккле�иа�т=Eccl
+пе�н=Song
+пе�н.=Song
+Пе�н=Song
+Пе�н.=Song
+Пе�н� Пе�ней=Song
+
+Премудро�ть Соломона=Wis
+Премудро�ти=Wis
+Премудро�ть=Wis
+Прем.=Wis
+Прем. Сол.=Wis
+Прем Сол=Wis
+прем.=Wis
+прем=Wis
+
+Сирахова=Sir
+Сираха=Sir
+Сирах=Sir
+Сир.=Sir
+Сир=Sir
+�ир=Sir
+�ирах=Sir
+Премудро�ть Ии�у�а, �ына Сирахова=Sir
+
+и�=Isa
+и�.=Isa
+И�=Isa
+И�.=Isa
+И�аи�=Isa
+иер=Jer
+иер.=Jer
+Иер=Jer
+Иер.=Jer
+Иереми�=Jer
+плач=Lam
+плач.=Lam
+Плач=Lam
+Плач.=Lam
+Плач Иеремии=Lam
+
+По�лание Иеремии=EpJer
+По�л. Иер.=EpJer
+По�л Иер=EpJer
+
+Варуха=Bar
+Варух=Bar
+Вар.=Bar
+Вар=Bar
+
+иез=Ezek
+иез.=Ezek
+Иез=Ezek
+Иез.=Ezek
+Иезекииль=Ezek
+дан=Dan
+дан.=Dan
+Дан=Dan
+Дан.=Dan
+Даниил=Dan
+о�=Hos
+о�.=Hos
+О�=Hos
+О�.=Hos
+О�и�=Hos
+иоил=Joel
+иоил.=Joel
+Иоил=Joel
+Иоил.=Joel
+Иоиль=Joel
+ам=Amos
+ам.=Amos
+�м=Amos
+�м.=Amos
+амо�=Amos
+�мо�=Amos
+авд.=Obad
+�вдий=Obad
+авд=Obad
+ион=Jonah
+ион.=Jonah
+Ион=Jonah
+Ион.=Jonah
+Иона=Jonah
+мих=Mic
+мих.=Mic
+Мих=Mic
+Мих.=Mic
+Михей=Mic
+наум=Nah
+наум.=Nah
+�аум=Nah
+авв=Hab
+авв.=Hab
+�вв=Hab
+�вв.=Hab
+�ввакум=Hab
+�оф=Zeph
+�оф.=Zeph
+Соф=Zeph
+Соф.=Zeph
+Софони�=Zeph
+агг=Hag
+агг.=Hag
+�гг=Hag
+�гг.=Hag
+�ггей=Hag
+зах=Zech
+зах.=Zech
+Зах=Zech
+Зах.=Zech
+Захари�=Zech
+мал=Mal
+мал.=Mal
+Мал=Mal
+Мал.=Mal
+Малахи�=Mal
+
+1. Маккавей�ка�=1Macc
+1 Маккавей�ка�=1Macc
+1Маккавей�ка�=1Macc
+1. Мак=1Macc
+1 Мак=1Macc
+1Мак=1Macc
+1 мак.=1Macc
+1 мак=1Macc
+1мак=1Macc
+
+2. Маккавей�ка�=2Macc
+2 Маккавей�ка�=2Macc
+2Маккавей�ка�=2Macc
+2. Мак=2Macc
+2 Мак=2Macc
+2Мак=2Macc
+2 мак.=1Macc
+2 мак=1Macc
+2мак=1Macc
+
+3. Маккавей�ка�=3Macc
+3 Маккавей�ка�=3Macc
+3Маккавей�ка�=3Macc
+3. Мак=3Macc
+3 Мак=3Macc
+3Мак=3Macc
+3 мак.=1Macc
+3 мак=1Macc
+3мак=1Macc
+
+3. Ездры=2Esd
+3 Ездры=2Esd
+3Ездры=2Esd
+3. Езд=2Esd
+3 Езд=2Esd
+3Езд=2Esd
+3езд=2Esd
+3ездр=2Esd
+3 езд=2Esd
+3 ездр=2Esd
+3. езд=2Esd
+3. ездр=2Esd
+
+
+матф=Matt
+матф.=Matt
+мф=Matt
+мф.=Matt
+Мф=Matt
+Мф.=Matt
+От Матфе�=Matt
+мар=Mark
+мар.=Mark
+мк=Mark
+мк.=Mark
+Мк=Mark
+Мк.=Mark
+От Марка=Mark
+лук=Luke
+лук.=Luke
+лк=Luke
+лк.=Luke
+Лк=Luke
+Лк.=Luke
+От Луки=Luke
+иоан=John
+иоан.=John
+ин=John
+ин.=John
+Ин=John
+Ин.=John
+От Иоанна=John
+де�н=Acts
+де�н.=Acts
+Де�н=Acts
+Де�н.=Acts
+Де�ни�=Acts
+рим=Rom
+рим.=Rom
+Рим=Rom
+Рим.=Rom
+К Римл�нам=Rom
+
+1. Коринф�нам=1Cor
+1 Коринф�нам=1Cor
+1Коринф�нам=1Cor
+1кор=1Cor
+1кор.=1Cor
+1 кор=1Cor
+1 кор.=1Cor
+1Кор=1Cor
+1Кор.=1Cor
+1 Кор=1Cor
+1 Кор.=1Cor
+
+2. Коринф�нам=2Cor
+2 Коринф�нам=2Cor
+2Коринф�нам=2Cor
+2кор=2Cor
+2кор.=2Cor
+2 кор=2Cor
+2 кор.=2Cor
+2Кор=2Cor
+2Кор.=2Cor
+2 Кор=2Cor
+2 Кор.=2Cor
+
+гал=Gal
+гал.=Gal
+Гал=Gal
+Гал.=Gal
+К Галатам=Gal
+еф=Eph
+еф.=Eph
+Еф=Eph
+Еф.=Eph
+К Ефе��нам=Eph
+фил=Phil
+фил.=Phil
+Фил=Phil
+Фил.=Phil
+флп=Phil
+флп.=Phil
+Флп=Phil
+Флп.=Phil
+К Филиппийцам=Phil
+К Коло���нам=Col
+кол=Col
+кол.=Col
+Кол=Col
+Кол.=Col
+
+1. Фе��алоникийцам=1Thess
+1 Фе��алоникийцам=1Thess
+1Фе��алоникийцам=1Thess
+1фе�=1Thess
+1фе�.=1Thess
+1 фе�=1Thess
+1 фе�.=1Thess
+1 Фе�=1Thess
+1 Фе�.=1Thess
+
+2. Фе��алоникийцам=2Thess
+2 Фе��алоникийцам=2Thess
+2Фе��алоникийцам=2Thess
+2фе�=2Thess
+2фе�.=2Thess
+2 фе�=2Thess
+2 фе�.=2Thess
+2Фе�=2Thess
+2Фе�.=2Thess
+2 Фе�=2Thess
+2 Фе�.=2Thess
+
+1. Тимофею=1Tim
+1 Тимофею=1Tim
+1Тимофею=1Tim
+1тим=1Tim
+1тим.=1Tim
+1 тим=1Tim
+1 тим.=1Tim
+1Тим=1Tim
+1Тим.=1Tim
+1 Тим=1Tim
+1 Тим.=1Tim
+
+2. Тимофею=2Tim
+2 Тимофею=2Tim
+2Тимофею=2Tim
+2тим=2Tim
+2тим.=2Tim
+2 тим=2Tim
+2 тим.=2Tim
+2Тим=2Tim
+2Тим.=2Tim
+2 Тим=2Tim
+2 Тим.=2Tim
+
+К Титу=Titus
+тит=Titus
+тит.=Titus
+Тит=Titus
+Тит.=Titus
+флм=Phlm
+флм.=Phlm
+Флм=Phlm
+Флм.=Phlm
+К Филимону=Phlm
+евр.=Heb
+евр=Heb
+Евр=Heb
+Евр.=Heb
+К Евре�м=Heb
+иак=Jas
+иак.=Jas
+Иак=Jas
+Иак.=Jas
+иакова=Jas
+Иакова=Jas
+
+1. Петра=1Pet
+1 Петра=1Pet
+1Петра=1Pet
+1пет=1Pet
+1пет.=1Pet
+1 пет=1Pet
+1 пет.=1Pet
+1Пет=1Pet
+1Пет.=1Pet
+1 Пет=1Pet
+1 Пет.=1Pet
+
+2. Петра=2Pet
+2 Петра=2Pet
+2Петра=2Pet
+2пет=2Pet
+2пет.=2Pet
+2 пет=2Pet
+2 пет.=2Pet
+2Пет=2Pet
+2Пет.=2Pet
+2 Пет=2Pet
+2 Пет.=2Pet
+
+1. Иоанна=1John
+1 Иоанна=1John
+1Иоанна=1John
+1иоан=1John
+1иоан.=1John
+1ин=1John
+1ин.=1John
+1 ин=1John
+1 ин.=1John
+1Ин=1John
+1Ин.=1John
+1 Ин=1John
+1 Ин.=1John
+
+2. Иоанна=2John
+2 Иоанна=2John
+2Иоанна=2John
+2иоан=2John
+2иоан.=2John
+2ин=2John
+2ин.=2John
+2 ин=2John
+2 ин.=2John
+2Ин=2John
+2Ин.=2John
+2 Ин=2John
+2 Ин.=2John
+
+3. Иоанна=3John
+3 Иоанна=3John
+3Иоанна=3John
+3иоан=3John
+3иоан.=3John
+3ин=3John
+3ин.=3John
+3 ин=3John
+3 ин.=3John
+3Ин=3John
+3Ин.=3John
+
+иуд=Jude
+иуд.=Jude
+Иуды=Jude
+откр=Rev
+откр.=Rev
+Откр=Rev
+Откр.=Rev
+Откровение=Rev
diff --git a/locales.d/ru_RU-cp1251.conf b/locales.d/ru_RU-cp1251.conf
new file mode 100755
index 0000000..d70ea52
--- /dev/null
+++ b/locales.d/ru_RU-cp1251.conf
@@ -0,0 +1,557 @@
+# Russian BIBLE
+# ÁÈÁËÈß, ÊÍÈÃÈ ÑÂßÙÅÍÍÎÃÎ ÏÈÑÀÍÈß ÂÅÒÕÎÃÎ È ÍÎÂÎÃÎ ÇÀÂÅÒÀ.
+# Ïðàöþº ï³ä Linux ³ Windows âåðñ³¿ ïðîåêòó SWORD
+# Pavlo Bohmat bohm@ukr.net
+
+[Meta]
+Name=ru_RU-cp1251
+Description=Russian (CP1251)
+Encoding=CP1251
+
+[Text]
+Genesis=Áûòèå
+Exodus=Èñõîä
+Leviticus=Ëåâèò
+Numbers=×èñëà
+Deuteronomy=Âòîðîçàêîíèå
+Joshua=Èèñóñ Íàâèí
+Judges=Ñóäüè
+Ruth=Ðóôü
+I Samuel=1. Öàðñòâ
+II Samuel=2. Öàðñòâ
+I Kings=3. Öàðñòâ
+II Kings=4. Öàðñòâ
+I Chronicles=1. Ïàðàëèïîìåíîí
+II Chronicles=2. Ïàðàëèïîìåíîí
+Ezra=Åçäðà
+Nehemiah=Íååìèÿ
+Esther=Åñôèðü
+Job=Èîâ
+Psalms=Ïñàëòèðü
+Proverbs=Ïðèò÷è
+Ecclesiastes=Åêêëåñèàñò
+Song of Solomon=Ïåñíÿ Ïåñíåé
+Isaiah=Èñàèÿ
+Jeremiah=Èåðåìèÿ
+Lamentations=Ïëà÷ Èåðåìèè
+Ezekiel=Èåçåêèèëü
+Daniel=Äàíèèë
+Hosea=Îñèÿ
+Joel=Èîèëü
+Amos=Àìîñ
+Obadiah=Àâäèé
+Jonah=Èîíà
+Micah=Ìèõåé
+Nahum=Íàóì
+Habakkuk=Àââàêóì
+Zephaniah=Ñîôîíèÿ
+Haggai=Àããåé
+Zechariah=Çàõàðèÿ
+Malachi=Ìàëàõèÿ
+Matthew=Îò Ìàòôåÿ
+Mark=Îò Ìàðêà
+Luke=Îò Ëóêè
+John=Îò Èîàííà
+Acts=Äåÿíèÿ
+Romans=Ê Ðèìëÿíàì
+I Corinthians=1. Êîðèíôÿíàì
+II Corinthians=2. Êîðèíôÿíàì
+Galatians=Ê Ãàëàòàì
+Ephesians=Ê Åôåñÿíàì
+Philippians=Ê Ôèëèïïèéöàì
+Colossians=Ê Êîëîññÿíàì
+I Thessalonians=1. Ôåññàëîíèêèéöàì
+II Thessalonians=2. Ôåññàëîíèêèéöàì
+I Timothy=1. Òèìîôåþ
+II Timothy=2. Òèìîôåþ
+Titus=Ê Òèòó
+Philemon=Ê Ôèëèìîíó
+Hebrews=Ê Åâðåÿì
+James=Èàêîâà
+I Peter=1. Ïåòðà
+II Peter=2. Ïåòðà
+I John=1. Èîàííà
+II John=2. Èîàííà
+III John=3. Èîàííà
+Jude=Èóäû
+Revelation of John=Îòêðîâåíèå
+
+[Book Abbrevs]
+
+1Ì=Gen
+1Ì.=Gen
+áûò=Gen
+áûò.=Gen
+Áûò=Gen
+Áûò.=Gen
+áûòèå=Gen
+Áûòèå=Gen
+2Ì=Exod
+2Ì.=Exod
+èñõ=Exod
+èñõ.=Exod
+Èñõ=Exod
+Èñõ.=Exod
+èñõîä=Exod
+Èñõîä=Exod
+3Ì=Lev
+3Ì.=Lev
+ëåâ=Lev
+ëåâ.=Lev
+Ëåâ=Lev
+Ëåâ.=Lev
+ëåâèò=Lev
+Ëåâèò=Lev
+4Ì=Num
+4Ì.=Num
+÷èñ=Num
+÷èñ.=Num
+×èñ=Num
+×èñ.=Num
+÷èñëà=Num
+×èñëà=Num
+5Ì=Deut
+5Ì.=Deut
+âòîð=Deut
+âòîð.=Deut
+Âòîð=Deut
+Âòîð.=Deut
+Âòîðîçàêîíèå=Deut
+èèñ.íàâ.=Josh
+åãîøóè=Josh
+Åãîøóè=Josh
+åã=Josh
+åã.=Josh
+èèñóñ íàâèí=Josh
+Èèñóñ Íàâèí=Josh
+ñóä=Judg
+ñóä.=Judg
+ñóäüè=Judg
+Ñóäüè=Judg
+ðóô=Ruth
+ðóô.=Ruth
+ðóôü=Ruth
+Ðóôü=Ruth
+
+1. Öàðñòâ=1Sam
+1 Öàðñòâ=1Sam
+1Öàðñòâ=1Sam
+1öàð=1Sam
+1öàð.=1Sam
+1 öàð=1Sam
+1 öàð.=1Sam
+1Öàð=1Sam
+1Öàð.=1Sam
+1 Öàð=1Sam
+1 Öàð.=1Sam
+
+2. Öàðñòâ=2Sam
+2 Öàðñòâ=2Sam
+2Öàðñòâ=2Sam
+2öàð=2Sam
+2öàð.=2Sam
+2 öàð=2Sam
+2 öàð.=2Sam
+2Öàð=2Sam
+2Öàð.=2Sam
+2 Öàð=2Sam
+2 Öàð.=2Sam
+
+3. Öàðñòâ=1Kgs
+3 Öàðñòâ=1Kgs
+3Öàðñòâ=1Kgs
+3öàð=1Kgs
+3öàð.=1Kgs
+3 öàð=1Kgs
+3 öàð.=1Kgs
+3Öàð=1Kgs
+3Öàð.=1Kgs
+3 Öàð=1Kgs
+3 Öàð.=1Kgs
+
+4. Öàðñòâ=2Kgs
+4 Öàðñòâ=2Kgs
+4Öàðñòâ=2Kgs
+4öàð=2Kgs
+4öàð.=2Kgs
+4 öàð=2Kgs
+4 öàð.=2Kgs
+4Öàð=2Kgs
+4Öàð.=2Kgs
+4 Öàð=2Kgs
+4 Öàð.=2Kgs
+
+1. Ïàðàëèïîìåíîí=1Chr
+1 Ïàðàëèïîìåíîí=1Chr
+1Ïàðàëèïîìåíîí=1Chr
+1ïàð=1Chr
+1ïàð.=1Chr
+1 ïàð=1Chr
+1 ïàð.=1Chr
+1 Ïàð=1Chr
+1 Ïàð.=1Chr
+
+2. Ïàðàëèïîìåíîí=2Chr
+2 Ïàðàëèïîìåíîí=2Chr
+2Ïàðàëèïîìåíîí=2Chr
+2ïàð=2Chr
+2ïàð.=2Chr
+2 ïàð=2Chr
+2 ïàð.=2Chr
+2Ïàð=2Chr
+2Ïàð.=2Chr
+2 Ïàð=2Chr
+2 Ïàð.=2Chr
+
+åçäð=Ezra
+åçäð.=Ezra
+Åçäð=Ezra
+Åçäð.=Ezra
+åçä=Ezra
+åçä.=Ezra
+Åçä=Ezra
+Åçä.=Ezra
+Åçäðà=Ezra
+íååì=Neh
+íååì.=Neh
+Íååì=Neh
+Íååì.=Neh
+Íååìèÿ=Neh
+åñô=Esth
+åñô.=Esth
+Åñô=Esth
+Åñô.=Esth
+Åñôèðü=Esth
+èîâ=Job
+èîâ.=Job
+Èîâ=Job
+ïñ=Ps
+ïñ.=Ps
+Ïñ=Ps
+Ïñ.=Ps
+Ïñàëòèðü=Ps
+ïðèò=Prov
+ïðèò.=Prov
+Ïðèò=Prov
+Ïðèò.=Prov
+Ïðèò÷è=Prov
+åêêë=Eccl
+åêêë.=Eccl
+Åêêë=Eccl
+Åêêë.=Eccl
+Åêêëåñèàñò=Eccl
+ïåñí=Song
+ïåñí.=Song
+Ïåñí=Song
+Ïåñí.=Song
+Ïåñíÿ Ïåñíåé=Song
+èñ=Isa
+èñ.=Isa
+Èñ=Isa
+Èñ.=Isa
+Èñàèÿ=Isa
+èåð=Jer
+èåð.=Jer
+Èåð=Jer
+Èåð.=Jer
+Èåðåìèÿ=Jer
+ïëà÷=Lam
+ïëà÷.=Lam
+Ïëà÷=Lam
+Ïëà÷.=Lam
+Ïëà÷ Èåðåìèè=Lam
+èåç=Ezek
+èåç.=Ezek
+Èåç=Ezek
+Èåç.=Ezek
+Èåçåêèèëü=Ezek
+äàí=Dan
+äàí.=Dan
+Äàí=Dan
+Äàí.=Dan
+Äàíèèë=Dan
+îñ=Hos
+îñ.=Hos
+Îñ=Hos
+Îñ.=Hos
+Îñèÿ=Hos
+èîèë=Joel
+èîèë.=Joel
+Èîèë=Joel
+Èîèë.=Joel
+Èîèëü=Joel
+àì=Amos
+àì.=Amos
+Àì=Amos
+Àì.=Amos
+àìîñ=Amos
+Àìîñ=Amos
+àâä.=Obad
+Àâäèé=Obad
+àâä=Obad
+èîí=Jonah
+èîí.=Jonah
+Èîí=Jonah
+Èîí.=Jonah
+Èîíà=Jonah
+ìèõ=Mic
+ìèõ.=Mic
+Ìèõ=Mic
+Ìèõ.=Mic
+Ìèõåé=Mic
+íàóì=Nah
+íàóì.=Nah
+Íàóì=Nah
+àââ=Hab
+àââ.=Hab
+Àââ=Hab
+Àââ.=Hab
+Àââàêóì=Hab
+ñîô=Zeph
+ñîô.=Zeph
+Ñîô=Zeph
+Ñîô.=Zeph
+Ñîôîíèÿ=Zeph
+àãã=Hag
+àãã.=Hag
+Àãã=Hag
+Àãã.=Hag
+Àããåé=Hag
+çàõ=Zech
+çàõ.=Zech
+Çàõ=Zech
+Çàõ.=Zech
+Çàõàðèÿ=Zech
+ìàë=Mal
+ìàë.=Mal
+Ìàë=Mal
+Ìàë.=Mal
+Ìàëàõèÿ=Mal
+ìàòô=Matt
+ìàòô.=Matt
+ìô=Matt
+ìô.=Matt
+Ìô=Matt
+Ìô.=Matt
+Îò Ìàòôåÿ=Matt
+ìàð=Mark
+ìàð.=Mark
+ìê=Mark
+ìê.=Mark
+Ìê=Mark
+Ìê.=Mark
+Îò Ìàðêà=Mark
+ëóê=Luke
+ëóê.=Luke
+ëê=Luke
+ëê.=Luke
+Ëê=Luke
+Ëê.=Luke
+Îò Ëóêè=Luke
+èîàí=John
+èîàí.=John
+èí=John
+èí.=John
+Èí=John
+Èí.=John
+Îò Èîàííà=John
+äåÿí=Acts
+äåÿí.=Acts
+Äåÿí=Acts
+Äåÿí.=Acts
+Äåÿíèÿ=Acts
+ðèì=Rom
+ðèì.=Rom
+Ðèì=Rom
+Ðèì.=Rom
+Ê Ðèìëÿíàì=Rom
+
+1. Êîðèíôÿíàì=1Cor
+1 Êîðèíôÿíàì=1Cor
+1Êîðèíôÿíàì=1Cor
+1êîð=1Cor
+1êîð.=1Cor
+1 êîð=1Cor
+1 êîð.=1Cor
+1Êîð=1Cor
+1Êîð.=1Cor
+1 Êîð=1Cor
+1 Êîð.=1Cor
+
+2. Êîðèíôÿíàì=2Cor
+2 Êîðèíôÿíàì=2Cor
+2Êîðèíôÿíàì=2Cor
+2êîð=2Cor
+2êîð.=2Cor
+2 êîð=2Cor
+2 êîð.=2Cor
+2Êîð=2Cor
+2Êîð.=2Cor
+2 Êîð=2Cor
+2 Êîð.=2Cor
+
+ãàë=Gal
+ãàë.=Gal
+Ãàë=Gal
+Ãàë.=Gal
+Ê Ãàëàòàì=Gal
+åô=Eph
+åô.=Eph
+Åô=Eph
+Åô.=Eph
+Ê Åôåñÿíàì=Eph
+ôèë=Phil
+ôèë.=Phil
+Ôèë=Phil
+Ôèë.=Phil
+ôëï=Phil
+ôëï.=Phil
+Ôëï=Phil
+Ôëï.=Phil
+Ê Ôèëèïïèéöàì=Phil
+Ê Êîëîññÿíàì=Col
+êîë=Col
+êîë.=Col
+Êîë=Col
+Êîë.=Col
+
+1. Ôåññàëîíèêèéöàì=1Thess
+1 Ôåññàëîíèêèéöàì=1Thess
+1Ôåññàëîíèêèéöàì=1Thess
+1ôåñ=1Thess
+1ôåñ.=1Thess
+1 ôåñ=1Thess
+1 ôåñ.=1Thess
+1 Ôåñ=1Thess
+1 Ôåñ.=1Thess
+
+2. Ôåññàëîíèêèéöàì=2Thess
+2 Ôåññàëîíèêèéöàì=2Thess
+2Ôåññàëîíèêèéöàì=2Thess
+2ôåñ=2Thess
+2ôåñ.=2Thess
+2 ôåñ=2Thess
+2 ôåñ.=2Thess
+2Ôåñ=2Thess
+2Ôåñ.=2Thess
+2 Ôåñ=2Thess
+2 Ôåñ.=2Thess
+
+1. Òèìîôåþ=1Tim
+1 Òèìîôåþ=1Tim
+1Òèìîôåþ=1Tim
+1òèì=1Tim
+1òèì.=1Tim
+1 òèì=1Tim
+1 òèì.=1Tim
+1Òèì=1Tim
+1Òèì.=1Tim
+1 Òèì=1Tim
+1 Òèì.=1Tim
+
+2. Òèìîôåþ=2Tim
+2 Òèìîôåþ=2Tim
+2Òèìîôåþ=2Tim
+2òèì=2Tim
+2òèì.=2Tim
+2 òèì=2Tim
+2 òèì.=2Tim
+2Òèì=2Tim
+2Òèì.=2Tim
+2 Òèì=2Tim
+2 Òèì.=2Tim
+
+Ê Òèòó=Titus
+òèò=Titus
+òèò.=Titus
+Òèò=Titus
+Òèò.=Titus
+ôëì=Phlm
+ôëì.=Phlm
+Ôëì=Phlm
+Ôëì.=Phlm
+Ê Ôèëèìîíó=Phlm
+åâð.=Heb
+åâð=Heb
+Åâð=Heb
+Åâð.=Heb
+Ê Åâðåÿì=Heb
+èàê=Jas
+èàê.=Jas
+Èàê=Jas
+Èàê.=Jas
+èàêîâà=Jas
+Èàêîâà=Jas
+
+1. Ïåòðà=1Pet
+1 Ïåòðà=1Pet
+1Ïåòðà=1Pet
+1ïåò=1Pet
+1ïåò.=1Pet
+1 ïåò=1Pet
+1 ïåò.=1Pet
+1Ïåò=1Pet
+1Ïåò.=1Pet
+1 Ïåò=1Pet
+1 Ïåò.=1Pet
+
+2. Ïåòðà=2Pet
+2 Ïåòðà=2Pet
+2Ïåòðà=2Pet
+2ïåò=2Pet
+2ïåò.=2Pet
+2 ïåò=2Pet
+2 ïåò.=2Pet
+2Ïåò=2Pet
+2Ïåò.=2Pet
+2 Ïåò=2Pet
+2 Ïåò.=2Pet
+
+1. Èîàííà=1John
+1 Èîàííà=1John
+1Èîàííà=1John
+1èîàí=1John
+1èîàí.=1John
+1èí=1John
+1èí.=1John
+1 èí=1John
+1 èí.=1John
+1Èí=1John
+1Èí.=1John
+1 Èí=1John
+1 Èí.=1John
+
+2. Èîàííà=2John
+2 Èîàííà=2John
+2Èîàííà=2John
+2èîàí=2John
+2èîàí.=2John
+2èí=2John
+2èí.=2John
+2 èí=2John
+2 èí.=2John
+2Èí=2John
+2Èí.=2John
+2 Èí=2John
+2 Èí.=2John
+
+3. Èîàííà=3John
+3 Èîàííà=3John
+3Èîàííà=3John
+3èîàí=3John
+3èîàí.=3John
+3èí=3John
+3èí.=3John
+3 èí=3John
+3 èí.=3John
+3Èí=3John
+3Èí.=3John
+
+èóä=Jude
+èóä.=Jude
+Èóäû=Jude
+îòêð=Rev
+îòêð.=Rev
+Îòêð=Rev
+Îòêð.=Rev
+Îòêðîâåíèå=Rev
diff --git a/locales.d/ru_RU-koi8-r.conf b/locales.d/ru_RU-koi8-r.conf
new file mode 100755
index 0000000..6b5f50f
--- /dev/null
+++ b/locales.d/ru_RU-koi8-r.conf
@@ -0,0 +1,557 @@
+# Russian BIBLE
+# âéâìéñ, ëîéçé ó÷ñýåîîïçï ðéóáîéñ ÷åôèïçï é îï÷ïçï úá÷åôá.
+# ðÒÁÃÀ¤ Ð¦Ä Linux ¦ Windows ×ÅÒÓ¦§ ÐÒÏÅËÔÕ SWORD
+# Pavlo Bohmat bohm@ukr.net
+
+[Meta]
+Name=ru_RU-koi8-r
+Description=Russian (KOI8-R)
+Encoding=KOI8-R
+
+[Text]
+Genesis=âÙÔÉÅ
+Exodus=éÓÈÏÄ
+Leviticus=ìÅ×ÉÔ
+Numbers=þÉÓÌÁ
+Deuteronomy=÷ÔÏÒÏÚÁËÏÎÉÅ
+Joshua=éÉÓÕÓ îÁ×ÉÎ
+Judges=óÕÄØÉ
+Ruth=òÕÆØ
+I Samuel=1. ãÁÒÓÔ×
+II Samuel=2. ãÁÒÓÔ×
+I Kings=3. ãÁÒÓÔ×
+II Kings=4. ãÁÒÓÔ×
+I Chronicles=1. ðÁÒÁÌÉÐÏÍÅÎÏÎ
+II Chronicles=2. ðÁÒÁÌÉÐÏÍÅÎÏÎ
+Ezra=åÚÄÒÁ
+Nehemiah=îÅÅÍÉÑ
+Esther=åÓÆÉÒØ
+Job=éÏ×
+Psalms=ðÓÁÌÔÉÒØ
+Proverbs=ðÒÉÔÞÉ
+Ecclesiastes=åËËÌÅÓÉÁÓÔ
+Song of Solomon=ðÅÓÎÑ ðÅÓÎÅÊ
+Isaiah=éÓÁÉÑ
+Jeremiah=éÅÒÅÍÉÑ
+Lamentations=ðÌÁÞ éÅÒÅÍÉÉ
+Ezekiel=éÅÚÅËÉÉÌØ
+Daniel=äÁÎÉÉÌ
+Hosea=ïÓÉÑ
+Joel=éÏÉÌØ
+Amos=áÍÏÓ
+Obadiah=á×ÄÉÊ
+Jonah=éÏÎÁ
+Micah=íÉÈÅÊ
+Nahum=îÁÕÍ
+Habakkuk=á××ÁËÕÍ
+Zephaniah=óÏÆÏÎÉÑ
+Haggai=áÇÇÅÊ
+Zechariah=úÁÈÁÒÉÑ
+Malachi=íÁÌÁÈÉÑ
+Matthew=ïÔ íÁÔÆÅÑ
+Mark=ïÔ íÁÒËÁ
+Luke=ïÔ ìÕËÉ
+John=ïÔ éÏÁÎÎÁ
+Acts=äÅÑÎÉÑ
+Romans=ë òÉÍÌÑÎÁÍ
+I Corinthians=1. ëÏÒÉÎÆÑÎÁÍ
+II Corinthians=2. ëÏÒÉÎÆÑÎÁÍ
+Galatians=ë çÁÌÁÔÁÍ
+Ephesians=ë åÆÅÓÑÎÁÍ
+Philippians=ë æÉÌÉÐÐÉÊÃÁÍ
+Colossians=ë ëÏÌÏÓÓÑÎÁÍ
+I Thessalonians=1. æÅÓÓÁÌÏÎÉËÉÊÃÁÍ
+II Thessalonians=2. æÅÓÓÁÌÏÎÉËÉÊÃÁÍ
+I Timothy=1. ôÉÍÏÆÅÀ
+II Timothy=2. ôÉÍÏÆÅÀ
+Titus=ë ôÉÔÕ
+Philemon=ë æÉÌÉÍÏÎÕ
+Hebrews=ë å×ÒÅÑÍ
+James=éÁËÏ×Á
+I Peter=1. ðÅÔÒÁ
+II Peter=2. ðÅÔÒÁ
+I John=1. éÏÁÎÎÁ
+II John=2. éÏÁÎÎÁ
+III John=3. éÏÁÎÎÁ
+Jude=éÕÄÙ
+Revelation of John=ïÔËÒÏ×ÅÎÉÅ
+
+[Book Abbrevs]
+
+1í=Gen
+1í.=Gen
+ÂÙÔ=Gen
+ÂÙÔ.=Gen
+âÙÔ=Gen
+âÙÔ.=Gen
+ÂÙÔÉÅ=Gen
+âÙÔÉÅ=Gen
+2í=Exod
+2í.=Exod
+ÉÓÈ=Exod
+ÉÓÈ.=Exod
+éÓÈ=Exod
+éÓÈ.=Exod
+ÉÓÈÏÄ=Exod
+éÓÈÏÄ=Exod
+3í=Lev
+3í.=Lev
+ÌÅ×=Lev
+ÌÅ×.=Lev
+ìÅ×=Lev
+ìÅ×.=Lev
+ÌÅ×ÉÔ=Lev
+ìÅ×ÉÔ=Lev
+4í=Num
+4í.=Num
+ÞÉÓ=Num
+ÞÉÓ.=Num
+þÉÓ=Num
+þÉÓ.=Num
+ÞÉÓÌÁ=Num
+þÉÓÌÁ=Num
+5í=Deut
+5í.=Deut
+×ÔÏÒ=Deut
+×ÔÏÒ.=Deut
+÷ÔÏÒ=Deut
+÷ÔÏÒ.=Deut
+÷ÔÏÒÏÚÁËÏÎÉÅ=Deut
+ÉÉÓ.ÎÁ×.=Josh
+ÅÇÏÛÕÉ=Josh
+åÇÏÛÕÉ=Josh
+ÅÇ=Josh
+ÅÇ.=Josh
+ÉÉÓÕÓ ÎÁ×ÉÎ=Josh
+éÉÓÕÓ îÁ×ÉÎ=Josh
+ÓÕÄ=Judg
+ÓÕÄ.=Judg
+ÓÕÄØÉ=Judg
+óÕÄØÉ=Judg
+ÒÕÆ=Ruth
+ÒÕÆ.=Ruth
+ÒÕÆØ=Ruth
+òÕÆØ=Ruth
+
+1. ãÁÒÓÔ×=1Sam
+1 ãÁÒÓÔ×=1Sam
+1ãÁÒÓÔ×=1Sam
+1ÃÁÒ=1Sam
+1ÃÁÒ.=1Sam
+1 ÃÁÒ=1Sam
+1 ÃÁÒ.=1Sam
+1ãÁÒ=1Sam
+1ãÁÒ.=1Sam
+1 ãÁÒ=1Sam
+1 ãÁÒ.=1Sam
+
+2. ãÁÒÓÔ×=2Sam
+2 ãÁÒÓÔ×=2Sam
+2ãÁÒÓÔ×=2Sam
+2ÃÁÒ=2Sam
+2ÃÁÒ.=2Sam
+2 ÃÁÒ=2Sam
+2 ÃÁÒ.=2Sam
+2ãÁÒ=2Sam
+2ãÁÒ.=2Sam
+2 ãÁÒ=2Sam
+2 ãÁÒ.=2Sam
+
+3. ãÁÒÓÔ×=1Kgs
+3 ãÁÒÓÔ×=1Kgs
+3ãÁÒÓÔ×=1Kgs
+3ÃÁÒ=1Kgs
+3ÃÁÒ.=1Kgs
+3 ÃÁÒ=1Kgs
+3 ÃÁÒ.=1Kgs
+3ãÁÒ=1Kgs
+3ãÁÒ.=1Kgs
+3 ãÁÒ=1Kgs
+3 ãÁÒ.=1Kgs
+
+4. ãÁÒÓÔ×=2Kgs
+4 ãÁÒÓÔ×=2Kgs
+4ãÁÒÓÔ×=2Kgs
+4ÃÁÒ=2Kgs
+4ÃÁÒ.=2Kgs
+4 ÃÁÒ=2Kgs
+4 ÃÁÒ.=2Kgs
+4ãÁÒ=2Kgs
+4ãÁÒ.=2Kgs
+4 ãÁÒ=2Kgs
+4 ãÁÒ.=2Kgs
+
+1. ðÁÒÁÌÉÐÏÍÅÎÏÎ=1Chr
+1 ðÁÒÁÌÉÐÏÍÅÎÏÎ=1Chr
+1ðÁÒÁÌÉÐÏÍÅÎÏÎ=1Chr
+1ÐÁÒ=1Chr
+1ÐÁÒ.=1Chr
+1 ÐÁÒ=1Chr
+1 ÐÁÒ.=1Chr
+1 ðÁÒ=1Chr
+1 ðÁÒ.=1Chr
+
+2. ðÁÒÁÌÉÐÏÍÅÎÏÎ=2Chr
+2 ðÁÒÁÌÉÐÏÍÅÎÏÎ=2Chr
+2ðÁÒÁÌÉÐÏÍÅÎÏÎ=2Chr
+2ÐÁÒ=2Chr
+2ÐÁÒ.=2Chr
+2 ÐÁÒ=2Chr
+2 ÐÁÒ.=2Chr
+2ðÁÒ=2Chr
+2ðÁÒ.=2Chr
+2 ðÁÒ=2Chr
+2 ðÁÒ.=2Chr
+
+ÅÚÄÒ=Ezra
+ÅÚÄÒ.=Ezra
+åÚÄÒ=Ezra
+åÚÄÒ.=Ezra
+ÅÚÄ=Ezra
+ÅÚÄ.=Ezra
+åÚÄ=Ezra
+åÚÄ.=Ezra
+åÚÄÒÁ=Ezra
+ÎÅÅÍ=Neh
+ÎÅÅÍ.=Neh
+îÅÅÍ=Neh
+îÅÅÍ.=Neh
+îÅÅÍÉÑ=Neh
+ÅÓÆ=Esth
+ÅÓÆ.=Esth
+åÓÆ=Esth
+åÓÆ.=Esth
+åÓÆÉÒØ=Esth
+ÉÏ×=Job
+ÉÏ×.=Job
+éÏ×=Job
+ÐÓ=Ps
+ÐÓ.=Ps
+ðÓ=Ps
+ðÓ.=Ps
+ðÓÁÌÔÉÒØ=Ps
+ÐÒÉÔ=Prov
+ÐÒÉÔ.=Prov
+ðÒÉÔ=Prov
+ðÒÉÔ.=Prov
+ðÒÉÔÞÉ=Prov
+ÅËËÌ=Eccl
+ÅËËÌ.=Eccl
+åËËÌ=Eccl
+åËËÌ.=Eccl
+åËËÌÅÓÉÁÓÔ=Eccl
+ÐÅÓÎ=Song
+ÐÅÓÎ.=Song
+ðÅÓÎ=Song
+ðÅÓÎ.=Song
+ðÅÓÎÑ ðÅÓÎÅÊ=Song
+ÉÓ=Isa
+ÉÓ.=Isa
+éÓ=Isa
+éÓ.=Isa
+éÓÁÉÑ=Isa
+ÉÅÒ=Jer
+ÉÅÒ.=Jer
+éÅÒ=Jer
+éÅÒ.=Jer
+éÅÒÅÍÉÑ=Jer
+ÐÌÁÞ=Lam
+ÐÌÁÞ.=Lam
+ðÌÁÞ=Lam
+ðÌÁÞ.=Lam
+ðÌÁÞ éÅÒÅÍÉÉ=Lam
+ÉÅÚ=Ezek
+ÉÅÚ.=Ezek
+éÅÚ=Ezek
+éÅÚ.=Ezek
+éÅÚÅËÉÉÌØ=Ezek
+ÄÁÎ=Dan
+ÄÁÎ.=Dan
+äÁÎ=Dan
+äÁÎ.=Dan
+äÁÎÉÉÌ=Dan
+ÏÓ=Hos
+ÏÓ.=Hos
+ïÓ=Hos
+ïÓ.=Hos
+ïÓÉÑ=Hos
+ÉÏÉÌ=Joel
+ÉÏÉÌ.=Joel
+éÏÉÌ=Joel
+éÏÉÌ.=Joel
+éÏÉÌØ=Joel
+ÁÍ=Amos
+ÁÍ.=Amos
+áÍ=Amos
+áÍ.=Amos
+ÁÍÏÓ=Amos
+áÍÏÓ=Amos
+Á×Ä.=Obad
+á×ÄÉÊ=Obad
+Á×Ä=Obad
+ÉÏÎ=Jonah
+ÉÏÎ.=Jonah
+éÏÎ=Jonah
+éÏÎ.=Jonah
+éÏÎÁ=Jonah
+ÍÉÈ=Mic
+ÍÉÈ.=Mic
+íÉÈ=Mic
+íÉÈ.=Mic
+íÉÈÅÊ=Mic
+ÎÁÕÍ=Nah
+ÎÁÕÍ.=Nah
+îÁÕÍ=Nah
+Á××=Hab
+Á××.=Hab
+á××=Hab
+á××.=Hab
+á××ÁËÕÍ=Hab
+ÓÏÆ=Zeph
+ÓÏÆ.=Zeph
+óÏÆ=Zeph
+óÏÆ.=Zeph
+óÏÆÏÎÉÑ=Zeph
+ÁÇÇ=Hag
+ÁÇÇ.=Hag
+áÇÇ=Hag
+áÇÇ.=Hag
+áÇÇÅÊ=Hag
+ÚÁÈ=Zech
+ÚÁÈ.=Zech
+úÁÈ=Zech
+úÁÈ.=Zech
+úÁÈÁÒÉÑ=Zech
+ÍÁÌ=Mal
+ÍÁÌ.=Mal
+íÁÌ=Mal
+íÁÌ.=Mal
+íÁÌÁÈÉÑ=Mal
+ÍÁÔÆ=Matt
+ÍÁÔÆ.=Matt
+ÍÆ=Matt
+ÍÆ.=Matt
+íÆ=Matt
+íÆ.=Matt
+ïÔ íÁÔÆÅÑ=Matt
+ÍÁÒ=Mark
+ÍÁÒ.=Mark
+ÍË=Mark
+ÍË.=Mark
+íË=Mark
+íË.=Mark
+ïÔ íÁÒËÁ=Mark
+ÌÕË=Luke
+ÌÕË.=Luke
+ÌË=Luke
+ÌË.=Luke
+ìË=Luke
+ìË.=Luke
+ïÔ ìÕËÉ=Luke
+ÉÏÁÎ=John
+ÉÏÁÎ.=John
+ÉÎ=John
+ÉÎ.=John
+éÎ=John
+éÎ.=John
+ïÔ éÏÁÎÎÁ=John
+ÄÅÑÎ=Acts
+ÄÅÑÎ.=Acts
+äÅÑÎ=Acts
+äÅÑÎ.=Acts
+äÅÑÎÉÑ=Acts
+ÒÉÍ=Rom
+ÒÉÍ.=Rom
+òÉÍ=Rom
+òÉÍ.=Rom
+ë òÉÍÌÑÎÁÍ=Rom
+
+1. ëÏÒÉÎÆÑÎÁÍ=1Cor
+1 ëÏÒÉÎÆÑÎÁÍ=1Cor
+1ëÏÒÉÎÆÑÎÁÍ=1Cor
+1ËÏÒ=1Cor
+1ËÏÒ.=1Cor
+1 ËÏÒ=1Cor
+1 ËÏÒ.=1Cor
+1ëÏÒ=1Cor
+1ëÏÒ.=1Cor
+1 ëÏÒ=1Cor
+1 ëÏÒ.=1Cor
+
+2. ëÏÒÉÎÆÑÎÁÍ=2Cor
+2 ëÏÒÉÎÆÑÎÁÍ=2Cor
+2ëÏÒÉÎÆÑÎÁÍ=2Cor
+2ËÏÒ=2Cor
+2ËÏÒ.=2Cor
+2 ËÏÒ=2Cor
+2 ËÏÒ.=2Cor
+2ëÏÒ=2Cor
+2ëÏÒ.=2Cor
+2 ëÏÒ=2Cor
+2 ëÏÒ.=2Cor
+
+ÇÁÌ=Gal
+ÇÁÌ.=Gal
+çÁÌ=Gal
+çÁÌ.=Gal
+ë çÁÌÁÔÁÍ=Gal
+ÅÆ=Eph
+ÅÆ.=Eph
+åÆ=Eph
+åÆ.=Eph
+ë åÆÅÓÑÎÁÍ=Eph
+ÆÉÌ=Phil
+ÆÉÌ.=Phil
+æÉÌ=Phil
+æÉÌ.=Phil
+ÆÌÐ=Phil
+ÆÌÐ.=Phil
+æÌÐ=Phil
+æÌÐ.=Phil
+ë æÉÌÉÐÐÉÊÃÁÍ=Phil
+ë ëÏÌÏÓÓÑÎÁÍ=Col
+ËÏÌ=Col
+ËÏÌ.=Col
+ëÏÌ=Col
+ëÏÌ.=Col
+
+1. æÅÓÓÁÌÏÎÉËÉÊÃÁÍ=1Thess
+1 æÅÓÓÁÌÏÎÉËÉÊÃÁÍ=1Thess
+1æÅÓÓÁÌÏÎÉËÉÊÃÁÍ=1Thess
+1ÆÅÓ=1Thess
+1ÆÅÓ.=1Thess
+1 ÆÅÓ=1Thess
+1 ÆÅÓ.=1Thess
+1 æÅÓ=1Thess
+1 æÅÓ.=1Thess
+
+2. æÅÓÓÁÌÏÎÉËÉÊÃÁÍ=2Thess
+2 æÅÓÓÁÌÏÎÉËÉÊÃÁÍ=2Thess
+2æÅÓÓÁÌÏÎÉËÉÊÃÁÍ=2Thess
+2ÆÅÓ=2Thess
+2ÆÅÓ.=2Thess
+2 ÆÅÓ=2Thess
+2 ÆÅÓ.=2Thess
+2æÅÓ=2Thess
+2æÅÓ.=2Thess
+2 æÅÓ=2Thess
+2 æÅÓ.=2Thess
+
+1. ôÉÍÏÆÅÀ=1Tim
+1 ôÉÍÏÆÅÀ=1Tim
+1ôÉÍÏÆÅÀ=1Tim
+1ÔÉÍ=1Tim
+1ÔÉÍ.=1Tim
+1 ÔÉÍ=1Tim
+1 ÔÉÍ.=1Tim
+1ôÉÍ=1Tim
+1ôÉÍ.=1Tim
+1 ôÉÍ=1Tim
+1 ôÉÍ.=1Tim
+
+2. ôÉÍÏÆÅÀ=2Tim
+2 ôÉÍÏÆÅÀ=2Tim
+2ôÉÍÏÆÅÀ=2Tim
+2ÔÉÍ=2Tim
+2ÔÉÍ.=2Tim
+2 ÔÉÍ=2Tim
+2 ÔÉÍ.=2Tim
+2ôÉÍ=2Tim
+2ôÉÍ.=2Tim
+2 ôÉÍ=2Tim
+2 ôÉÍ.=2Tim
+
+ë ôÉÔÕ=Titus
+ÔÉÔ=Titus
+ÔÉÔ.=Titus
+ôÉÔ=Titus
+ôÉÔ.=Titus
+ÆÌÍ=Phlm
+ÆÌÍ.=Phlm
+æÌÍ=Phlm
+æÌÍ.=Phlm
+ë æÉÌÉÍÏÎÕ=Phlm
+Å×Ò.=Heb
+Å×Ò=Heb
+å×Ò=Heb
+å×Ò.=Heb
+ë å×ÒÅÑÍ=Heb
+ÉÁË=Jas
+ÉÁË.=Jas
+éÁË=Jas
+éÁË.=Jas
+ÉÁËÏ×Á=Jas
+éÁËÏ×Á=Jas
+
+1. ðÅÔÒÁ=1Pet
+1 ðÅÔÒÁ=1Pet
+1ðÅÔÒÁ=1Pet
+1ÐÅÔ=1Pet
+1ÐÅÔ.=1Pet
+1 ÐÅÔ=1Pet
+1 ÐÅÔ.=1Pet
+1ðÅÔ=1Pet
+1ðÅÔ.=1Pet
+1 ðÅÔ=1Pet
+1 ðÅÔ.=1Pet
+
+2. ðÅÔÒÁ=2Pet
+2 ðÅÔÒÁ=2Pet
+2ðÅÔÒÁ=2Pet
+2ÐÅÔ=2Pet
+2ÐÅÔ.=2Pet
+2 ÐÅÔ=2Pet
+2 ÐÅÔ.=2Pet
+2ðÅÔ=2Pet
+2ðÅÔ.=2Pet
+2 ðÅÔ=2Pet
+2 ðÅÔ.=2Pet
+
+1. éÏÁÎÎÁ=1John
+1 éÏÁÎÎÁ=1John
+1éÏÁÎÎÁ=1John
+1ÉÏÁÎ=1John
+1ÉÏÁÎ.=1John
+1ÉÎ=1John
+1ÉÎ.=1John
+1 ÉÎ=1John
+1 ÉÎ.=1John
+1éÎ=1John
+1éÎ.=1John
+1 éÎ=1John
+1 éÎ.=1John
+
+2. éÏÁÎÎÁ=2John
+2 éÏÁÎÎÁ=2John
+2éÏÁÎÎÁ=2John
+2ÉÏÁÎ=2John
+2ÉÏÁÎ.=2John
+2ÉÎ=2John
+2ÉÎ.=2John
+2 ÉÎ=2John
+2 ÉÎ.=2John
+2éÎ=2John
+2éÎ.=2John
+2 éÎ=2John
+2 éÎ.=2John
+
+3. éÏÁÎÎÁ=3John
+3 éÏÁÎÎÁ=3John
+3éÏÁÎÎÁ=3John
+3ÉÏÁÎ=3John
+3ÉÏÁÎ.=3John
+3ÉÎ=3John
+3ÉÎ.=3John
+3 ÉÎ=3John
+3 ÉÎ.=3John
+3éÎ=3John
+3éÎ.=3John
+
+ÉÕÄ=Jude
+ÉÕÄ.=Jude
+éÕÄÙ=Jude
+ÏÔËÒ=Rev
+ÏÔËÒ.=Rev
+ïÔËÒ=Rev
+ïÔËÒ.=Rev
+ïÔËÒÏ×ÅÎÉÅ=Rev
diff --git a/locales.d/ru_RU-utf8.conf b/locales.d/ru_RU-utf8.conf
new file mode 100644
index 0000000..ce11c7d
--- /dev/null
+++ b/locales.d/ru_RU-utf8.conf
@@ -0,0 +1,681 @@
+# Russian BIBLE
+# БИБЛИЯ, К�ИГИ СВЯЩЕ��ОГО ПИС��ИЯ ВЕТХОГО И �ОВОГО З�ВЕТ�.
+# Працює під Linux і Windows вер�ії проекту SWORD
+# Pavlo Bohmat bohm@ukr.net
+
+# Converted with iconv by Martin Gruner
+
+[Meta]
+Name=ru_RU
+Description=Russian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Бытие
+Exodus=И�ход
+Leviticus=Левит
+Numbers=Чи�ла
+Deuteronomy=Второзаконие
+Joshua=Ии�у� �авин
+Judges=Судьи
+Ruth=Руфь
+I Samuel=1. Цар�тв
+II Samuel=2. Цар�тв
+I Kings=3. Цар�тв
+II Kings=4. Цар�тв
+I Chronicles=1. Паралипоменон
+II Chronicles=2. Паралипоменон
+Prayer of Manasses=Молитва Мана��ии
+Ezra=Ездра
+Nehemiah=�ееми�
+I Esdras=2. Ездры
+Tobit=Товита
+Judith=Иудифь
+Esther=Е�фирь
+Job=Иов
+Psalms=П�алтирь
+Proverbs=Притчи
+Ecclesiastes=Еккле�иа�т
+Song of Solomon=Пе�н� Пе�ней
+Wisdom=Премудро�ть Соломона
+Sirach=Сирах
+Isaiah=И�аи�
+Jeremiah=Иереми�
+Lamentations=Плач Иеремии
+Epistle of Jeremiah=По�лание Иеремии
+Baruch=Варуха
+Ezekiel=Иезекииль
+Daniel=Даниил
+Hosea=О�и�
+Joel=Иоиль
+Amos=�мо�
+Obadiah=�вдий
+Jonah=Иона
+Micah=Михей
+Nahum=�аум
+Habakkuk=�ввакум
+Zephaniah=Софони�
+Haggai=�ггей
+Zechariah=Захари�
+Malachi=Малахи�
+I Maccabees=1. Маккавей�ка�
+II Maccabees=2. Маккавей�ка�
+III Maccabees=3. Маккавей�ка�
+II Esdras=3. Ездры
+Matthew=От Матфе�
+Mark=От Марка
+Luke=От Луки
+John=От Иоанна
+Acts=Де�ни�
+Romans=К Римл�нам
+I Corinthians=1. Коринф�нам
+II Corinthians=2. Коринф�нам
+Galatians=К Галатам
+Ephesians=К Ефе��нам
+Philippians=К Филиппийцам
+Colossians=К Коло���нам
+I Thessalonians=1. Фе��алоникийцам
+II Thessalonians=2. Фе��алоникийцам
+I Timothy=1. Тимофею
+II Timothy=2. Тимофею
+Titus=К Титу
+Philemon=К Филимону
+Hebrews=К Евре�м
+James=Иакова
+I Peter=1. Петра
+II Peter=2. Петра
+I John=1. Иоанна
+II John=2. Иоанна
+III John=3. Иоанна
+Jude=Иуды
+Revelation of John=Откровение
+
+[Book Abbrevs]
+
+1М=Gen
+1М.=Gen
+быт=Gen
+быт.=Gen
+Быт=Gen
+Быт.=Gen
+бытие=Gen
+Бытие=Gen
+2М=Exod
+2М.=Exod
+и�х=Exod
+и�х.=Exod
+И�х=Exod
+И�х.=Exod
+и�ход=Exod
+И�ход=Exod
+3М=Lev
+3М.=Lev
+лев=Lev
+лев.=Lev
+Лев=Lev
+Лев.=Lev
+левит=Lev
+Левит=Lev
+4М=Num
+4М.=Num
+чи�=Num
+чи�.=Num
+Чи�=Num
+Чи�.=Num
+чи�ла=Num
+Чи�ла=Num
+5М=Deut
+5М.=Deut
+втор=Deut
+втор.=Deut
+Втор=Deut
+Втор.=Deut
+Второзаконие=Deut
+ии�.нав.=Josh
+егошуи=Josh
+Егошуи=Josh
+ег=Josh
+ег.=Josh
+ии�у� навин=Josh
+Ии�у� �авин=Josh
+�уд=Judg
+�уд.=Judg
+�удьи=Judg
+Судьи=Judg
+руф=Ruth
+руф.=Ruth
+руфь=Ruth
+Руфь=Ruth
+
+1. Цар�тв=1Sam
+1 Цар�тв=1Sam
+1Цар�тв=1Sam
+1цар=1Sam
+1цар.=1Sam
+1 цар=1Sam
+1 цар.=1Sam
+1Цар=1Sam
+1Цар.=1Sam
+1 Цар=1Sam
+1 Цар.=1Sam
+
+2. Цар�тв=2Sam
+2 Цар�тв=2Sam
+2Цар�тв=2Sam
+2цар=2Sam
+2цар.=2Sam
+2 цар=2Sam
+2 цар.=2Sam
+2Цар=2Sam
+2Цар.=2Sam
+2 Цар=2Sam
+2 Цар.=2Sam
+
+3. Цар�тв=1Kgs
+3 Цар�тв=1Kgs
+3Цар�тв=1Kgs
+3цар=1Kgs
+3цар.=1Kgs
+3 цар=1Kgs
+3 цар.=1Kgs
+3Цар=1Kgs
+3Цар.=1Kgs
+3 Цар=1Kgs
+3 Цар.=1Kgs
+
+4. Цар�тв=2Kgs
+4 Цар�тв=2Kgs
+4Цар�тв=2Kgs
+4цар=2Kgs
+4цар.=2Kgs
+4 цар=2Kgs
+4 цар.=2Kgs
+4Цар=2Kgs
+4Цар.=2Kgs
+4 Цар=2Kgs
+4 Цар.=2Kgs
+
+1. Паралипоменон=1Chr
+1 Паралипоменон=1Chr
+1Паралипоменон=1Chr
+1пар=1Chr
+1пар.=1Chr
+1 пар=1Chr
+1 пар.=1Chr
+1 Пар=1Chr
+1 Пар.=1Chr
+
+2. Паралипоменон=2Chr
+2 Паралипоменон=2Chr
+2Паралипоменон=2Chr
+2пар=2Chr
+2пар.=2Chr
+2 пар=2Chr
+2 пар.=2Chr
+2Пар=2Chr
+2Пар.=2Chr
+2 Пар=2Chr
+2 Пар.=2Chr
+
+Молитва Мана��ии=PrMan
+Мана��ии=PrMan
+Ман.=PrMan
+ман.=PrMan
+Ман=PrMan
+ман=PrMan
+
+ездр=Ezra
+ездр.=Ezra
+Ездр=Ezra
+Ездр.=Ezra
+езд=Ezra
+езд.=Ezra
+Езд=Ezra
+Езд.=Ezra
+Ездра=Ezra
+неем=Neh
+неем.=Neh
+�еем=Neh
+�еем.=Neh
+�ееми�=Neh
+
+2. Ездры=1Esd
+2 Ездры=1Esd
+2Ездры=1Esd
+2Езд.=1Esd
+2Езд=1Esd
+2-� Ездры=1Esd
+2-� Езд.=1Esd
+2-� Езд=1Esd
+2 Ездры=1Esd
+2 Езд.=1Esd
+2 Езд=1Esd
+2 езд=1Esd
+2 ездр=1Esd
+2езд=1Esd
+2ездр=1Esd
+2. езд=1Esd
+2. ездр=1Esd
+
+Товита=Tob
+Товит=Tob
+Тов.=Tob
+Тов=Tob
+
+Юдифь=Jdt
+Иудифь=Jdt
+юдифь=Jdt
+иудифь=Jdt
+
+е�ф=Esth
+е�ф.=Esth
+Е�ф=Esth
+Е�ф.=Esth
+Е�фирь=Esth
+иов=Job
+иов.=Job
+Иов=Job
+п�=Ps
+п�.=Ps
+П�=Ps
+П�.=Ps
+П�алтирь=Ps
+прит=Prov
+прит.=Prov
+Прит=Prov
+Прит.=Prov
+Притчи=Prov
+еккл=Eccl
+еккл.=Eccl
+Еккл=Eccl
+Еккл.=Eccl
+Еккле�иа�т=Eccl
+пе�н=Song
+пе�н.=Song
+Пе�н=Song
+Пе�н.=Song
+Пе�н� Пе�ней=Song
+
+Премудро�ть Соломона=Wis
+Премудро�ти=Wis
+Премудро�ть=Wis
+Прем.=Wis
+Прем. Сол.=Wis
+Прем Сол=Wis
+прем.=Wis
+прем=Wis
+
+Сирахова=Sir
+Сираха=Sir
+Сирах=Sir
+Сир.=Sir
+Сир=Sir
+�ир=Sir
+�ирах=Sir
+Премудро�ть Ии�у�а, �ына Сирахова=Sir
+
+и�=Isa
+и�.=Isa
+И�=Isa
+И�.=Isa
+И�аи�=Isa
+иер=Jer
+иер.=Jer
+Иер=Jer
+Иер.=Jer
+Иереми�=Jer
+плач=Lam
+плач.=Lam
+Плач=Lam
+Плач.=Lam
+Плач Иеремии=Lam
+
+По�лание Иеремии=EpJer
+По�л. Иер.=EpJer
+По�л Иер=EpJer
+
+Варуха=Bar
+Варух=Bar
+Вар.=Bar
+Вар=Bar
+
+иез=Ezek
+иез.=Ezek
+Иез=Ezek
+Иез.=Ezek
+Иезекииль=Ezek
+дан=Dan
+дан.=Dan
+Дан=Dan
+Дан.=Dan
+Даниил=Dan
+о�=Hos
+о�.=Hos
+О�=Hos
+О�.=Hos
+О�и�=Hos
+иоил=Joel
+иоил.=Joel
+Иоил=Joel
+Иоил.=Joel
+Иоиль=Joel
+ам=Amos
+ам.=Amos
+�м=Amos
+�м.=Amos
+амо�=Amos
+�мо�=Amos
+авд.=Obad
+�вдий=Obad
+авд=Obad
+ион=Jonah
+ион.=Jonah
+Ион=Jonah
+Ион.=Jonah
+Иона=Jonah
+мих=Mic
+мих.=Mic
+Мих=Mic
+Мих.=Mic
+Михей=Mic
+наум=Nah
+наум.=Nah
+�аум=Nah
+авв=Hab
+авв.=Hab
+�вв=Hab
+�вв.=Hab
+�ввакум=Hab
+�оф=Zeph
+�оф.=Zeph
+Соф=Zeph
+Соф.=Zeph
+Софони�=Zeph
+агг=Hag
+агг.=Hag
+�гг=Hag
+�гг.=Hag
+�ггей=Hag
+зах=Zech
+зах.=Zech
+Зах=Zech
+Зах.=Zech
+Захари�=Zech
+мал=Mal
+мал.=Mal
+Мал=Mal
+Мал.=Mal
+Малахи�=Mal
+
+1. Маккавей�ка�=1Macc
+1 Маккавей�ка�=1Macc
+1Маккавей�ка�=1Macc
+1. Мак=1Macc
+1 Мак=1Macc
+1Мак=1Macc
+1 мак.=1Macc
+1 мак=1Macc
+1мак=1Macc
+
+2. Маккавей�ка�=2Macc
+2 Маккавей�ка�=2Macc
+2Маккавей�ка�=2Macc
+2. Мак=2Macc
+2 Мак=2Macc
+2Мак=2Macc
+2 мак.=1Macc
+2 мак=1Macc
+2мак=1Macc
+
+3. Маккавей�ка�=3Macc
+3 Маккавей�ка�=3Macc
+3Маккавей�ка�=3Macc
+3. Мак=3Macc
+3 Мак=3Macc
+3Мак=3Macc
+3 мак.=1Macc
+3 мак=1Macc
+3мак=1Macc
+
+3. Ездры=2Esd
+3 Ездры=2Esd
+3Ездры=2Esd
+3. Езд=2Esd
+3 Езд=2Esd
+3Езд=2Esd
+3езд=2Esd
+3ездр=2Esd
+3 езд=2Esd
+3 ездр=2Esd
+3. езд=2Esd
+3. ездр=2Esd
+
+
+матф=Matt
+матф.=Matt
+мф=Matt
+мф.=Matt
+Мф=Matt
+Мф.=Matt
+От Матфе�=Matt
+мар=Mark
+мар.=Mark
+мк=Mark
+мк.=Mark
+Мк=Mark
+Мк.=Mark
+От Марка=Mark
+лук=Luke
+лук.=Luke
+лк=Luke
+лк.=Luke
+Лк=Luke
+Лк.=Luke
+От Луки=Luke
+иоан=John
+иоан.=John
+ин=John
+ин.=John
+Ин=John
+Ин.=John
+От Иоанна=John
+де�н=Acts
+де�н.=Acts
+Де�н=Acts
+Де�н.=Acts
+Де�ни�=Acts
+рим=Rom
+рим.=Rom
+Рим=Rom
+Рим.=Rom
+К Римл�нам=Rom
+
+1. Коринф�нам=1Cor
+1 Коринф�нам=1Cor
+1Коринф�нам=1Cor
+1кор=1Cor
+1кор.=1Cor
+1 кор=1Cor
+1 кор.=1Cor
+1Кор=1Cor
+1Кор.=1Cor
+1 Кор=1Cor
+1 Кор.=1Cor
+
+2. Коринф�нам=2Cor
+2 Коринф�нам=2Cor
+2Коринф�нам=2Cor
+2кор=2Cor
+2кор.=2Cor
+2 кор=2Cor
+2 кор.=2Cor
+2Кор=2Cor
+2Кор.=2Cor
+2 Кор=2Cor
+2 Кор.=2Cor
+
+гал=Gal
+гал.=Gal
+Гал=Gal
+Гал.=Gal
+К Галатам=Gal
+еф=Eph
+еф.=Eph
+Еф=Eph
+Еф.=Eph
+К Ефе��нам=Eph
+фил=Phil
+фил.=Phil
+Фил=Phil
+Фил.=Phil
+флп=Phil
+флп.=Phil
+Флп=Phil
+Флп.=Phil
+К Филиппийцам=Phil
+К Коло���нам=Col
+кол=Col
+кол.=Col
+Кол=Col
+Кол.=Col
+
+1. Фе��алоникийцам=1Thess
+1 Фе��алоникийцам=1Thess
+1Фе��алоникийцам=1Thess
+1фе�=1Thess
+1фе�.=1Thess
+1 фе�=1Thess
+1 фе�.=1Thess
+1 Фе�=1Thess
+1 Фе�.=1Thess
+
+2. Фе��алоникийцам=2Thess
+2 Фе��алоникийцам=2Thess
+2Фе��алоникийцам=2Thess
+2фе�=2Thess
+2фе�.=2Thess
+2 фе�=2Thess
+2 фе�.=2Thess
+2Фе�=2Thess
+2Фе�.=2Thess
+2 Фе�=2Thess
+2 Фе�.=2Thess
+
+1. Тимофею=1Tim
+1 Тимофею=1Tim
+1Тимофею=1Tim
+1тим=1Tim
+1тим.=1Tim
+1 тим=1Tim
+1 тим.=1Tim
+1Тим=1Tim
+1Тим.=1Tim
+1 Тим=1Tim
+1 Тим.=1Tim
+
+2. Тимофею=2Tim
+2 Тимофею=2Tim
+2Тимофею=2Tim
+2тим=2Tim
+2тим.=2Tim
+2 тим=2Tim
+2 тим.=2Tim
+2Тим=2Tim
+2Тим.=2Tim
+2 Тим=2Tim
+2 Тим.=2Tim
+
+К Титу=Titus
+тит=Titus
+тит.=Titus
+Тит=Titus
+Тит.=Titus
+флм=Phlm
+флм.=Phlm
+Флм=Phlm
+Флм.=Phlm
+К Филимону=Phlm
+евр.=Heb
+евр=Heb
+Евр=Heb
+Евр.=Heb
+К Евре�м=Heb
+иак=Jas
+иак.=Jas
+Иак=Jas
+Иак.=Jas
+иакова=Jas
+Иакова=Jas
+
+1. Петра=1Pet
+1 Петра=1Pet
+1Петра=1Pet
+1пет=1Pet
+1пет.=1Pet
+1 пет=1Pet
+1 пет.=1Pet
+1Пет=1Pet
+1Пет.=1Pet
+1 Пет=1Pet
+1 Пет.=1Pet
+
+2. Петра=2Pet
+2 Петра=2Pet
+2Петра=2Pet
+2пет=2Pet
+2пет.=2Pet
+2 пет=2Pet
+2 пет.=2Pet
+2Пет=2Pet
+2Пет.=2Pet
+2 Пет=2Pet
+2 Пет.=2Pet
+
+1. Иоанна=1John
+1 Иоанна=1John
+1Иоанна=1John
+1иоан=1John
+1иоан.=1John
+1ин=1John
+1ин.=1John
+1 ин=1John
+1 ин.=1John
+1Ин=1John
+1Ин.=1John
+1 Ин=1John
+1 Ин.=1John
+
+2. Иоанна=2John
+2 Иоанна=2John
+2Иоанна=2John
+2иоан=2John
+2иоан.=2John
+2ин=2John
+2ин.=2John
+2 ин=2John
+2 ин.=2John
+2Ин=2John
+2Ин.=2John
+2 Ин=2John
+2 Ин.=2John
+
+3. Иоанна=3John
+3 Иоанна=3John
+3Иоанна=3John
+3иоан=3John
+3иоан.=3John
+3ин=3John
+3ин.=3John
+3 ин=3John
+3 ин.=3John
+3Ин=3John
+3Ин.=3John
+
+иуд=Jude
+иуд.=Jude
+Иуды=Jude
+откр=Rev
+откр.=Rev
+Откр=Rev
+Откр.=Rev
+Откровение=Rev
diff --git a/locales.d/sk-utf8.conf b/locales.d/sk-utf8.conf
new file mode 100644
index 0000000..3c280f5
--- /dev/null
+++ b/locales.d/sk-utf8.conf
@@ -0,0 +1,391 @@
+#
+#               Slovak Bible books for Sword.
+#
+#       2001/01/06 (c) zdpo@post.sk, GNU GPL 2.0.
+#       2009/05/06 (c) zdposter@gmail.sk, GNU GPL 2.0.
+#
+#
+
+[Meta]
+Name=sk
+Description=Slovak (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Levitikus
+Numbers=Numeri
+Deuteronomy=Deuteronómium
+Joshua=Jozue
+Judges=Sudcov
+Ruth=Rút
+I Samuel=1 Samuelova
+II Samuel=2 Samuelova
+I Kings=1 Kráľov
+II Kings=2 Kráľov
+I Chronicles=1 Kroník
+II Chronicles=2 Kroník
+Ezra=Ezdráš
+Nehemiah=Nehemiáš
+Esther=Ester
+Job=Jób
+Psalms=Žalmy
+Proverbs=Príslovia
+Ecclesiastes=Kazateľ
+Song of Solomon=Pieseň piesní
+Isaiah=Izaiáš
+Jeremiah=Jeremiáš
+Lamentations=Náreky
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Ozeáš
+Joel=Joel
+Amos=�mos
+Obadiah=Abdiáš
+Jonah=Jonáš
+Micah=Micheáš
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sofoniáš
+Haggai=Aggeus
+Zechariah=Zachariáš
+Malachi=Malachiáš
+Matthew=Matúš
+Mark=Marek
+Luke=Lukáš
+John=Ján
+Acts=Skutky
+Romans=Rimanom
+I Corinthians=1 Korinťanom
+II Corinthians=2 Korinťanom
+Galatians=Galaťanom
+Ephesians=Efezanom
+Philippians=Filipanom
+Colossians=Kolosanom
+I Thessalonians=1 Solún�anom
+II Thessalonians=2 Solún�anom
+I Timothy=1 Timotejovi
+II Timothy=2 Timotejovi
+Titus=Títovi
+Philemon=Filemónovi
+Hebrews=Hebrejom
+James=Jakubov
+I Peter=1 Petrov
+II Peter=2 Petrov
+I John=1 Jánov
+II John=2 Jánov
+III John=3 Jánov
+Jude=Júdov
+Revelation of John=Zjavenie Jána
+
+#Apocr
+I Esdras=1 Ezdráša
+II Esdras=2 Ezdráša
+Tobit=Tobiáš
+Judith=Judita
+Additions to Esther=Prídavok k Esteri
+Esther (Greek)=Ester (gréc.)
+Wisdom=Múdrosti
+Sirach=Sirachovec
+Baruch=Báruch
+Prayer of Azariah=Modlitba Azariášova
+Susanna=Zuzana
+Bel and the Dragon=Bél a Drak
+Prayer of Manasses=Modlitba Manasesa
+I Maccabees=1 Machabejcov
+II Maccabees=2 Machabejcov
+III Maccabees=3 Machabejcov
+IV Maccabees=4 Machabejcov
+Additional Psalm=Ďalšie Žalmy
+
+[Book Abbrevs]
+
+GENESIS=Gen
+GN=Gen
+1M=Gen
+1 M=Gen
+1 MOJŽIŠOVA=Gen
+EXODUS=Exod
+EX=Exod
+2M=Exod
+2 M=Exod
+2 MOJŽIŠOVA=Exod
+LEVITICUS=Lev
+LEVITIKUS=Lev
+LV=Lev
+3M=Lev
+3 M=Lev
+3 MOJŽIŠOVA=Lev
+NUMERI=Num
+NM=Num
+NU=Num
+4M=Num
+4 M=Num
+4 MOJŽIŠOVA=Num
+DEUTERONOMIUM=Deut
+DEUTERONÓMIUM=Deut
+DT=Deut
+5M=Deut
+5 M=Deut
+5 MOJŽIŠOVA=Deut
+JOZUE=Josh
+JOZ=Josh
+SUDCOV=Judg
+SUD=Judg
+SDC=Judg
+RÚT=Ruth
+RUT=Ruth
+RT=Ruth
+1 SAMUELOVA=1Sam
+1SAM=1Sam
+1S=1Sam
+1 S=1Sam
+2 SAMUELOVA=2Sam
+2SAM=2Sam
+2S=2Sam
+2 S=2Sam
+1 KR�ĽOVSK�=1Kgs
+1KR=1Kgs
+1 KR=1Kgs
+2 KR�ĽOVSK�=2Kgs
+2KR=2Kgs
+2 KR=2Kgs
+1 KRONICK�=1Chr
+1 KRON�K=1Chr
+1 PARALIPOMENOM=1Chr
+1KRN=1Chr
+1PA=1Chr
+1 PA=1Chr
+1 KRO=1Chr
+2 KRONICK�=2Chr
+2 KRON�K=2Chr
+2 PARALIPOMENOM=2Chr
+2KRN=2Chr
+2PA=2Chr
+2 PA=2Chr
+2 KRO=2Chr
+EZDR�Š=Ezra
+EZD=Ezra
+NEHEMI�Š=Neh
+NEH=Neh
+ESTER=Esth
+EST=Esth
+JÓB=Job
+JOB=Job
+JB=Job
+ŽALMY=Ps
+Ž=Ps
+Z=Ps
+PR�SLOVIA=Prov
+PRIS=Prov
+PR=Prov
+KAZATEĽ=Eccl
+KOHELET=Eccl
+KOH=Eccl
+KAZ=Eccl
+VEĽPIESEŇ=Song
+PIESEŇ PIESN�=Song
+PIESEŇ ŠALAMÚNOVA=Song
+PIES=Song
+PIE=Song
+VEĽ=Song
+IZAI�Š=Isa
+IZ=Isa
+JEREMI�Š=Jer
+JER=Jer
+JR=Jer
+PLAČ JEREMI�ŠOV=Lam
+N�REKY=Lam
+NAR=Lam
+N�R=Lam
+PL=Lam
+EZECHIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DAN=Dan
+DN=Dan
+OZE�Š=Hos
+HOZE�Š=Hos
+OZ=Hos
+JOEL=Joel
+JL=Joel
+�MOS=Amos
+AM=Amos
+OBADI�Š=Obad
+ABDI�Š=Obad
+ABD=Obad
+OBA=Obad
+JON�Š=Jonah
+JON=Jonah
+MICHE�Š=Mic
+MICH=Mic
+MI=Mic
+N�HUM=Nah
+NAH=Nah
+NA=Nah
+HABAKUK=Hab
+HAB=Hab
+SOFONI�Š=Zeph
+SOF=Zeph
+SF=Zeph
+HAGEUS=Hag
+AGGEUS=Hag
+AG=Hag
+HAG=Hag
+ZACHARI�Š=Zech
+ZACH=Zech
+ZA=Zech
+MALACHI�Š=Mal
+MAL=Mal
+MATÚŠ=Matt
+MT=Matt
+MAREK=Mark
+MK=Mark
+LUK�Š=Luke
+LK=Luke
+L=Luke
+J�N=John
+JN=John
+J=John
+SKUTKY=Acts
+SK=Acts
+RIMANOM=Rom
+RIM=Rom
+1 KORINŤANOM=1Cor
+1KOR=1Cor
+1K=1Cor
+1 K=1Cor
+2 KORINŤANOM=2Cor
+2KOR=2Cor
+2K=2Cor
+2 K=2Cor
+GALAŤANOM=Gal
+GAL=Gal
+GA=Gal
+EFEZANOM=Eph
+EF=Eph
+FILIPANOM=Phil
+FLP=Phil
+FP=Phil
+KOLOSANOM=Col
+KOL=Col
+KO=Col
+1 TESALONIÄŒANOM=1Thess
+1 SOLÚNČANOM=1Thess
+1SOL=1Thess
+1TE=1Thess
+1 TE=1Thess
+2 TESALONIÄŒANOM=2Thess
+2 SOLÚNČANOM=2Thess
+2SOL=2Thess
+2TE=2Thess
+2 TE=2Thess
+1 TIMOTEJOVI=1Tim
+1TIM=1Tim
+1TM=1Tim
+1 TM=1Tim
+2 TIMOTEJOVI=2Tim
+2TIM=2Tim
+2TM=2Tim
+2 TM=2Tim
+T�TOVI=Titus
+TIT=Titus
+FILEMONOVI=Phlm
+FILEMÓNOVI=Phlm
+FLM=Phlm
+FM=Phlm
+HEBREJOM=Heb
+HEBR=Heb
+HE=Heb
+ŽIDOM=Heb
+ŽID=Heb
+ŽD=Heb
+JAKUBOV=Jas
+JAK=Jas
+JK=Jas
+1 PETROV=1Pet
+1PT=1Pet
+1 PT=1Pet
+2 PETROV=2Pet
+2PT=2Pet
+2 PT=2Pet
+1 J�NOV=1John
+1J=1John
+1Jn=1John
+1 J=1John
+2 J�NOV=2John
+2J=2John
+2Jn=2John
+2 J=2John
+3 J�NOV=3John
+3J=3John
+3Jn=3John
+3 J=3John
+JÚDOV=Jude
+JÚ=Jude
+JUD=Jude
+ZJAVENIE J�NA=Rev
+ZJV=Rev
+ZJ=Rev
+
+1EZD=1Esd
+2EZD=2Esd
+
+TB=Tob
+TBT=Tob
+TOB=Tob
+
+MÚDR=Wis
+MUDR=Wis
+
+SIR=Sir
+SIRACH=Sir
+
+MODLITBA AZARI�ŠOVA=PrAzar
+AZARI�Š=PrAzar
+AZAR=PrAzar
+
+MODLITBA MANASESA=PrMan
+MANASES=PrMan
+MAN=PrMan
+
+ZUZ=Sus
+
+1MAK=1Macc
+1 MAK=1Macc
+2MAK=2Macc
+2 MAK=2Macc
+3MAK=3Macc
+3 MAK=3Macc
+4MAK=4Macc
+4 MAK=4Macc
+
+BARUCH=Bar
+BAR=Bar
+
+JDT=Jdt
+
+PR�DAVOK K ESTERI=AddEsth
+
+ESTERr (GRÉC.)=EsthGr
+
+ĎALŠIE ŽALMY=AddPs
+
+BEL=Bel
+BÉL AND DRAK=Bel
+
+TOBI�Š=Tob
+JUDITA=Jdt
+ESTER (GRÉC.)=EsthGr
+MÚDROSTI=Wis
+SIRACHOVEC=Sir
+B�RUCH=Bar
+ZUZANA=Sus
+BÉL A DRAK=Bel
+1 MACHABEJCOV=1Macc
+2 MACHABEJCOV=2Macc
+1 EZDR�ŠA=1Esd
+3 MACHABEJCOV=3Macc
+2 EZDR�ŠA=2Esd
+4 MACHABEJCOV=4Macc
diff --git a/locales.d/sk.conf b/locales.d/sk.conf
new file mode 100644
index 0000000..2bd9c8c
--- /dev/null
+++ b/locales.d/sk.conf
@@ -0,0 +1,395 @@
+#
+#               Slovak Bible books for Sword.
+#
+#       2001/01/06 (c) zdpo@post.sk, GNU GPL 2.0.
+#       2009/05/06 (c) zdposter@gmail.sk, GNU GPL 2.0.
+#
+# Notice: The locales name of slovak language is sk. For correct
+# 	  slovak environment you must set locales to "sk_SK"
+# 	  if you are using bash try this:
+# 	  export LC_ALL=sk_SK LANG=sk
+#
+
+[Meta]
+Name=sk
+Description=Slovak
+Encoding=ISO8859-2
+
+[Text]
+Genesis=Genesis
+Exodus=Exodus
+Leviticus=Levitikus
+Numbers=Numeri
+Deuteronomy=Deuteronómium
+Joshua=Jozue
+Judges=Sudcov
+Ruth=Rút
+I Samuel=1 Samuelova
+II Samuel=2 Samuelova
+I Kings=1 Kráµov
+II Kings=2 Kráµov
+I Chronicles=1 Kroník
+II Chronicles=2 Kroník
+Ezra=Ezdrá¹
+Nehemiah=Nehemiá¹
+Esther=Ester
+Job=Jób
+Psalms=®almy
+Proverbs=Príslovia
+Ecclesiastes=Kazateµ
+Song of Solomon=Pieseò piesní
+Isaiah=Izaiá¹
+Jeremiah=Jeremiá¹
+Lamentations=Náreky
+Ezekiel=Ezechiel
+Daniel=Daniel
+Hosea=Ozeá¹
+Joel=Joel
+Amos=Ámos
+Obadiah=Abdiá¹
+Jonah=Joná¹
+Micah=Micheá¹
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sofoniá¹
+Haggai=Aggeus
+Zechariah=Zachariá¹
+Malachi=Malachiá¹
+Matthew=Matú¹
+Mark=Marek
+Luke=Luká¹
+John=Ján
+Acts=Skutky
+Romans=Rimanom
+I Corinthians=1 Korin»anom
+II Corinthians=2 Korin»anom
+Galatians=Gala»anom
+Ephesians=Efezanom
+Philippians=Filipanom
+Colossians=Kolosanom
+I Thessalonians=1 Solúnèanom
+II Thessalonians=2 Solúnèanom
+I Timothy=1 Timotejovi
+II Timothy=2 Timotejovi
+Titus=Títovi
+Philemon=Filemónovi
+Hebrews=Hebrejom
+James=Jakubov
+I Peter=1 Petrov
+II Peter=2 Petrov
+I John=1 Jánov
+II John=2 Jánov
+III John=3 Jánov
+Jude=Júdov
+Revelation of John=Zjavenie Jána
+
+#Apocr
+I Esdras=1 Ezdrá¹a
+II Esdras=2 Ezdrá¹a
+Tobit=Tobiá¹
+Judith=Judita
+Additions to Esther=Prídavok k Esteri
+Esther (Greek)=Ester (gréc.)
+Wisdom=Múdrosti
+Sirach=Sirachovec
+Baruch=Báruch
+Prayer of Azariah=Modlitba Azariá¹ova
+Susanna=Zuzana
+Bel and the Dragon=Bél a Drak
+Prayer of Manasses=Modlitba Manasesa
+I Maccabees=1 Machabejcov
+II Maccabees=2 Machabejcov
+III Maccabees=3 Machabejcov
+IV Maccabees=4 Machabejcov
+Additional Psalm=Ïal¹ie ®almy
+
+[Book Abbrevs]
+
+GENESIS=Gen
+GN=Gen
+1M=Gen
+1 M=Gen
+1 MOJ®I©OVA=Gen
+EXODUS=Exod
+EX=Exod
+2M=Exod
+2 M=Exod
+2 MOJ®I©OVA=Exod
+LEVITICUS=Lev
+LEVITIKUS=Lev
+LV=Lev
+3M=Lev
+3 M=Lev
+3 MOJ®I©OVA=Lev
+NUMERI=Num
+NM=Num
+NU=Num
+4M=Num
+4 M=Num
+4 MOJ®I©OVA=Num
+DEUTERONOMIUM=Deut
+DEUTERONÓMIUM=Deut
+DT=Deut
+5M=Deut
+5 M=Deut
+5 MOJ®I©OVA=Deut
+JOZUE=Josh
+JOZ=Josh
+SUDCOV=Judg
+SUD=Judg
+SDC=Judg
+RÚT=Ruth
+RUT=Ruth
+RT=Ruth
+1 SAMUELOVA=1Sam
+1SAM=1Sam
+1S=1Sam
+1 S=1Sam
+2 SAMUELOVA=2Sam
+2SAM=2Sam
+2S=2Sam
+2 S=2Sam
+1 KRÁ¥OVSKÁ=1Kgs
+1KR=1Kgs
+1 KR=1Kgs
+2 KRÁ¥OVSKÁ=2Kgs
+2KR=2Kgs
+2 KR=2Kgs
+1 KRONICKÁ=1Chr
+1 KRONÍK=1Chr
+1 PARALIPOMENOM=1Chr
+1KRN=1Chr
+1PA=1Chr
+1 PA=1Chr
+1 KRO=1Chr
+2 KRONICKÁ=2Chr
+2 KRONÍK=2Chr
+2 PARALIPOMENOM=2Chr
+2KRN=2Chr
+2PA=2Chr
+2 PA=2Chr
+2 KRO=2Chr
+EZDRÁ©=Ezra
+EZD=Ezra
+NEHEMIÁ©=Neh
+NEH=Neh
+ESTER=Esth
+EST=Esth
+JÓB=Job
+JOB=Job
+JB=Job
+®ALMY=Ps
+®=Ps
+Z=Ps
+PRÍSLOVIA=Prov
+PRIS=Prov
+PR=Prov
+KAZATE¥=Eccl
+KOHELET=Eccl
+KOH=Eccl
+KAZ=Eccl
+VE¥PIESEÒ=Song
+PIESEÒ PIESNÍ=Song
+PIESEÒ ©ALAMÚNOVA=Song
+PIES=Song
+PIE=Song
+VE¥=Song
+IZAIÁ©=Isa
+IZ=Isa
+JEREMIÁ©=Jer
+JER=Jer
+JR=Jer
+PLAÈ JEREMIÁ©OV=Lam
+NÁREKY=Lam
+NAR=Lam
+NÁR=Lam
+PL=Lam
+EZECHIEL=Ezek
+EZ=Ezek
+DANIEL=Dan
+DAN=Dan
+DN=Dan
+OZEÁ©=Hos
+HOZEÁ©=Hos
+OZ=Hos
+JOEL=Joel
+JL=Joel
+ÁMOS=Amos
+AM=Amos
+OBADIÁ©=Obad
+ABDIÁ©=Obad
+ABD=Obad
+OBA=Obad
+JONÁ©=Jonah
+JON=Jonah
+MICHEÁ©=Mic
+MICH=Mic
+MI=Mic
+NÁHUM=Nah
+NAH=Nah
+NA=Nah
+HABAKUK=Hab
+HAB=Hab
+SOFONIÁ©=Zeph
+SOF=Zeph
+SF=Zeph
+HAGEUS=Hag
+AGGEUS=Hag
+AG=Hag
+HAG=Hag
+ZACHARIÁ©=Zech
+ZACH=Zech
+ZA=Zech
+MALACHIÁ©=Mal
+MAL=Mal
+MATÚ©=Matt
+MT=Matt
+MAREK=Mark
+MK=Mark
+LUKÁ©=Luke
+LK=Luke
+L=Luke
+JÁN=John
+JN=John
+J=John
+SKUTKY=Acts
+SK=Acts
+RIMANOM=Rom
+RIM=Rom
+1 KORIN«ANOM=1Cor
+1KOR=1Cor
+1K=1Cor
+1 K=1Cor
+2 KORIN«ANOM=2Cor
+2KOR=2Cor
+2K=2Cor
+2 K=2Cor
+GALA«ANOM=Gal
+GAL=Gal
+GA=Gal
+EFEZANOM=Eph
+EF=Eph
+FILIPANOM=Phil
+FLP=Phil
+FP=Phil
+KOLOSANOM=Col
+KOL=Col
+KO=Col
+1 TESALONIÈANOM=1Thess
+1 SOLÚNÈANOM=1Thess
+1SOL=1Thess
+1TE=1Thess
+1 TE=1Thess
+2 TESALONIÈANOM=2Thess
+2 SOLÚNÈANOM=2Thess
+2SOL=2Thess
+2TE=2Thess
+2 TE=2Thess
+1 TIMOTEJOVI=1Tim
+1TIM=1Tim
+1TM=1Tim
+1 TM=1Tim
+2 TIMOTEJOVI=2Tim
+2TIM=2Tim
+2TM=2Tim
+2 TM=2Tim
+TÍTOVI=Titus
+TIT=Titus
+FILEMONOVI=Phlm
+FILEMÓNOVI=Phlm
+FLM=Phlm
+FM=Phlm
+HEBREJOM=Heb
+HEBR=Heb
+HE=Heb
+®IDOM=Heb
+®ID=Heb
+®D=Heb
+JAKUBOV=Jas
+JAK=Jas
+JK=Jas
+1 PETROV=1Pet
+1PT=1Pet
+1 PT=1Pet
+2 PETROV=2Pet
+2PT=2Pet
+2 PT=2Pet
+1 JÁNOV=1John
+1J=1John
+1Jn=1John
+1 J=1John
+2 JÁNOV=2John
+2J=2John
+2Jn=2John
+2 J=2John
+3 JÁNOV=3John
+3J=3John
+3Jn=3John
+3 J=3John
+JÚDOV=Jude
+JÚ=Jude
+JUD=Jude
+ZJAVENIE JÁNA=Rev
+ZJV=Rev
+ZJ=Rev
+
+1EZD=1Esd
+2EZD=2Esd
+
+TB=Tob
+TBT=Tob
+TOB=Tob
+
+MÚDR=Wis
+MUDR=Wis
+
+SIR=Sir
+SIRACH=Sir
+
+MODLITBA AZARIÁ©OVA=PrAzar
+AZARIÁ©=PrAzar
+AZAR=PrAzar
+
+MODLITBA MANASESA=PrMan
+MANASES=PrMan
+MAN=PrMan
+
+ZUZ=Sus
+
+1MAK=1Macc
+1 MAK=1Macc
+2MAK=2Macc
+2 MAK=2Macc
+3MAK=3Macc
+3 MAK=3Macc
+4MAK=4Macc
+4 MAK=4Macc
+
+BARUCH=Bar
+BAR=Bar
+
+JDT=Jdt
+
+PRÍDAVOK K ESTERI=AddEsth
+
+ESTERr (GRÉC.)=EsthGr
+
+ÏAL©IE ®ALMY=AddPs
+
+BEL=Bel
+BÉL AND DRAK=Bel
+
+TOBIÁ©=Tob
+JUDITA=Jdt
+ESTER (GRÉC.)=EsthGr
+MÚDROSTI=Wis
+SIRACHOVEC=Sir
+BÁRUCH=Bar
+ZUZANA=Sus
+BÉL A DRAK=Bel
+1 MACHABEJCOV=1Macc
+2 MACHABEJCOV=2Macc
+1 EZDRÁ©A=1Esd
+3 MACHABEJCOV=3Macc
+2 EZDRÁ©A=2Esd
+4 MACHABEJCOV=4Macc
diff --git a/locales.d/sl-utf8.conf b/locales.d/sl-utf8.conf
new file mode 100644
index 0000000..61ccf80
--- /dev/null
+++ b/locales.d/sl-utf8.conf
@@ -0,0 +1,254 @@
+[Meta]
+Name=sl
+Description=Slovenian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Geneza
+Exodus=Eksodus
+Leviticus=Levitik
+Numbers=Numeri
+Deuteronomy=Devteronomij
+Joshua=Jozue
+Judges=Sodniki
+Ruth=Ruta
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Kraljev
+II Kings=2 Kraljev
+I Chronicles=1 Kroniska
+II Chronicles=2 Kroniska
+Ezra=Ezra
+Nehemiah=Nehemija
+Esther=Estera
+Job=Job
+Psalms=Psalmi
+Proverbs=Pregovori
+Ecclesiastes=Pridigar
+Song of Solomon=Visoka pesem
+Isaiah=Izaija
+Jeremiah=Jeremija
+Lamentations=Zalostinke
+Ezekiel=Ezekiel
+Daniel=Daniel
+Hosea=Ozej
+Joel=Joel
+Amos=Amos
+Obadiah=Abdija
+Jonah=Jona
+Micah=Mihej
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sofonija
+Haggai=Agej
+Zechariah=Zaharija
+Malachi=Malahija
+Matthew=Matej
+Mark=Marko
+Luke=Luka
+John=Janez
+Acts=Dela
+Romans=Rimljanom
+I Corinthians=1 Korincanom
+II Corinthians=2 Korincanom
+Galatians=Galacanom
+Ephesians=Efezanom
+Philippians=Filipljanom
+Colossians=Kolosanom
+I Thessalonians=1 Tesalonicanom
+II Thessalonians=2 Tesalonicanom
+I Timothy=1 Timotej
+II Timothy=2 Timotej
+Titus=Tit
+Philemon=Filemon
+Hebrews=Hebrejcem
+James=Jakob
+I Peter=1 Peter
+II Peter=2 Peter
+I John=1 Janez
+II John=2 Janez
+III John=3 Janez
+Jude=Juda
+Revelation of John=Razodetje
+
+[Book Abbrevs]
+
+GENEZA=Gen
+GEN=Gen
+1MZ=Gen
+1 MZ=Gen
+EKSODUS=Exod
+EXO=Exod
+2MZ=Exod
+2 MZ=Exod
+LEVITIK=Lev
+LEV=Lev
+3MZ=Lev
+3 MZ=Lev
+NUMERI=Num
+NUM=Num
+4MZ=Num
+4 MZ=Num
+DEVTERONOMIJ=Deut
+DEU=Deut
+5MZ=Deut
+5 MZ=Deut
+JOZUE=Josh
+JOZ=Josh
+SODNIKI=Judg
+SOD=Judg
+RUTA=Ruth
+RUT=Ruth
+1SAMUEL=1Sam
+1 SAMUEL=1Sam
+1SAM=1Sam
+1 SAM=1Sam
+2SAMUEL=2Sam
+2 SAMUEL=2Sam
+2SAM=2Sam
+2 SAM=2Sam
+1KRALJEV=1Kgs
+1 KRALJEV=1Kgs
+1KR=1Kgs
+1 KR=1Kgs
+2KRALJEV=2Kgs
+2 KRALJEV=2Kgs
+2KR=2Kgs
+2 KR=2Kgs
+1KRONISKA=1Chr
+1 KRONISKA=1Chr
+1KRN=1Chr
+1 KRN=1Chr
+2KRONISKA=2Chr
+2 KRONISKA=2Chr
+2KRN=2Chr
+2 KRN=2Chr
+EZRA=Ezra
+EZR=Ezra
+NEHEMIJA=Neh
+NEH=Neh
+ESTERA=Esth
+EST=Esth
+JOB=Job
+PSALMI=Ps
+PS=Ps
+PREGOVORI=Prov
+PRG=Prov
+PRIDIGAR=Eccl
+PRD=Eccl
+VISOKA PESEM=Song
+VP=Song
+IZAIJA=Isa
+IZ=Isa
+JEREMIJA=Jer
+JER=Jer
+ZALOSTINKE=Lam
+ZAL=Lam
+EZEKIEL=Ezek
+EZK=Ezek
+DANIEL=Dan
+DAN=Dan
+OZEJ=Hos
+OZ=Hos
+JOEL=Joel
+JL=Joel
+AMOS=Amos
+AM=Amos
+ABDIJA=Obad
+ABD=Obad
+JONA=Jonah
+JON=Jonah
+MIHEJ=Mic
+MIH=Mic
+NAHUM=Nah
+NAH=Nah
+HABAKUK=Hab
+HAB=Hab
+SOFONIJA=Zeph
+SOF=Zeph
+AGEJ=Hag
+AG=Hag
+ZAHARIJA=Zech
+ZAH=Zech
+MALAHIJA=Mal
+MAL=Mal
+MATEJ=Matt
+MT=Matt
+MARKO=Mark
+MR=Mark
+LUKA=Luke
+LK=Luke
+JANEZ=John
+JN=John
+APOSTOLSKA DELA=Acts
+DELA=Acts
+APD=Acts
+RIMLJANOM=Rom
+RIM=Rom
+1KORINCANOM=1Cor
+1 KORINCANOM=1Cor
+1KOR=1Cor
+1 KOR=1Cor
+2KORINCANOM=2Cor
+2 KORINCANOM=2Cor
+2KOR=2Cor
+2 KOR=2Cor
+GALACANOM=Gal
+GAL=Gal
+EFEZANOM=Eph
+EF=Eph
+FILIPLJANOM=Phil
+FLP=Phil
+KOLOSANOM=Col
+KOL=Col
+1TESALONICANOM=1Thess
+1 TESALONICANOM=1Thess
+1TES=1Thess
+1 TES=1Thess
+2TESALONICANOM=2Thess
+2 TESALONICANOM=2Thess
+2TES=2Thess
+2 TES=2Thess
+1TIMOTEJ=1Tim
+1 TIMOTEJ=1Tim
+1TIM=1Tim
+1 TIM=1Tim
+2TIMOTEJ=2Tim
+2 TIMOTEJ=2Tim
+2TIM=2Tim
+2 TIM=2Tim
+TIT=Titus
+FILEMON=Phlm
+FLM=Phlm
+HEBREJCEM=Heb
+HEB=Heb
+JAKOB=Jas
+JAK=Jas
+1PETER=1Pet
+1 PETER=1Pet
+1PET=1Pet
+1 PET=1Pet
+1PT=1Pet
+1 PT=1Pet
+2PETER=2Pet
+2 PETER=2Pet
+2PET=2Pet
+2 PET=2Pet
+2PT=2Pet
+2 PT=2Pet
+1JANEZ=1John
+1 JANEZ=1John
+1JN=1John
+1 JN=1John
+2JANEZ=2John
+2 JANEZ=2John
+2JN=2John
+2 JN=2John
+3JANEZ=3John
+3 JANEZ=3John
+3JN=3John
+3 JN=3John
+JUDA=Jude
+JUD=Jude
+RAZODETJE=Rev
+RAZ=Rev
diff --git a/locales.d/sl.conf b/locales.d/sl.conf
new file mode 100644
index 0000000..fb59af2
--- /dev/null
+++ b/locales.d/sl.conf
@@ -0,0 +1,254 @@
+[Meta]
+Name=sl
+Description=Slovenian
+Encoding=ISO8859-1
+
+[Text]
+Genesis=Geneza
+Exodus=Eksodus
+Leviticus=Levitik
+Numbers=Numeri
+Deuteronomy=Devteronomij
+Joshua=Jozue
+Judges=Sodniki
+Ruth=Ruta
+I Samuel=1 Samuel
+II Samuel=2 Samuel
+I Kings=1 Kraljev
+II Kings=2 Kraljev
+I Chronicles=1 Kroniska
+II Chronicles=2 Kroniska
+Ezra=Ezra
+Nehemiah=Nehemija
+Esther=Estera
+Job=Job
+Psalms=Psalmi
+Proverbs=Pregovori
+Ecclesiastes=Pridigar
+Song of Solomon=Visoka pesem
+Isaiah=Izaija
+Jeremiah=Jeremija
+Lamentations=Zalostinke
+Ezekiel=Ezekiel
+Daniel=Daniel
+Hosea=Ozej
+Joel=Joel
+Amos=Amos
+Obadiah=Abdija
+Jonah=Jona
+Micah=Mihej
+Nahum=Nahum
+Habakkuk=Habakuk
+Zephaniah=Sofonija
+Haggai=Agej
+Zechariah=Zaharija
+Malachi=Malahija
+Matthew=Matej
+Mark=Marko
+Luke=Luka
+John=Janez
+Acts=Dela
+Romans=Rimljanom
+I Corinthians=1 Korincanom
+II Corinthians=2 Korincanom
+Galatians=Galacanom
+Ephesians=Efezanom
+Philippians=Filipljanom
+Colossians=Kolosanom
+I Thessalonians=1 Tesalonicanom
+II Thessalonians=2 Tesalonicanom
+I Timothy=1 Timotej
+II Timothy=2 Timotej
+Titus=Tit
+Philemon=Filemon
+Hebrews=Hebrejcem
+James=Jakob
+I Peter=1 Peter
+II Peter=2 Peter
+I John=1 Janez
+II John=2 Janez
+III John=3 Janez
+Jude=Juda
+Revelation of John=Razodetje
+
+[Book Abbrevs]
+
+GENEZA=Gen
+GEN=Gen
+1MZ=Gen
+1 MZ=Gen
+EKSODUS=Exod
+EXO=Exod
+2MZ=Exod
+2 MZ=Exod
+LEVITIK=Lev
+LEV=Lev
+3MZ=Lev
+3 MZ=Lev
+NUMERI=Num
+NUM=Num
+4MZ=Num
+4 MZ=Num
+DEVTERONOMIJ=Deut
+DEU=Deut
+5MZ=Deut
+5 MZ=Deut
+JOZUE=Josh
+JOZ=Josh
+SODNIKI=Judg
+SOD=Judg
+RUTA=Ruth
+RUT=Ruth
+1SAMUEL=1Sam
+1 SAMUEL=1Sam
+1SAM=1Sam
+1 SAM=1Sam
+2SAMUEL=2Sam
+2 SAMUEL=2Sam
+2SAM=2Sam
+2 SAM=2Sam
+1KRALJEV=1Kgs
+1 KRALJEV=1Kgs
+1KR=1Kgs
+1 KR=1Kgs
+2KRALJEV=2Kgs
+2 KRALJEV=2Kgs
+2KR=2Kgs
+2 KR=2Kgs
+1KRONISKA=1Chr
+1 KRONISKA=1Chr
+1KRN=1Chr
+1 KRN=1Chr
+2KRONISKA=2Chr
+2 KRONISKA=2Chr
+2KRN=2Chr
+2 KRN=2Chr
+EZRA=Ezra
+EZR=Ezra
+NEHEMIJA=Neh
+NEH=Neh
+ESTERA=Esth
+EST=Esth
+JOB=Job
+PSALMI=Ps
+PS=Ps
+PREGOVORI=Prov
+PRG=Prov
+PRIDIGAR=Eccl
+PRD=Eccl
+VISOKA PESEM=Song
+VP=Song
+IZAIJA=Isa
+IZ=Isa
+JEREMIJA=Jer
+JER=Jer
+ZALOSTINKE=Lam
+ZAL=Lam
+EZEKIEL=Ezek
+EZK=Ezek
+DANIEL=Dan
+DAN=Dan
+OZEJ=Hos
+OZ=Hos
+JOEL=Joel
+JL=Joel
+AMOS=Amos
+AM=Amos
+ABDIJA=Obad
+ABD=Obad
+JONA=Jonah
+JON=Jonah
+MIHEJ=Mic
+MIH=Mic
+NAHUM=Nah
+NAH=Nah
+HABAKUK=Hab
+HAB=Hab
+SOFONIJA=Zeph
+SOF=Zeph
+AGEJ=Hag
+AG=Hag
+ZAHARIJA=Zech
+ZAH=Zech
+MALAHIJA=Mal
+MAL=Mal
+MATEJ=Matt
+MT=Matt
+MARKO=Mark
+MR=Mark
+LUKA=Luke
+LK=Luke
+JANEZ=John
+JN=John
+APOSTOLSKA DELA=Acts
+DELA=Acts
+APD=Acts
+RIMLJANOM=Rom
+RIM=Rom
+1KORINCANOM=1Cor
+1 KORINCANOM=1Cor
+1KOR=1Cor
+1 KOR=1Cor
+2KORINCANOM=2Cor
+2 KORINCANOM=2Cor
+2KOR=2Cor
+2 KOR=2Cor
+GALACANOM=Gal
+GAL=Gal
+EFEZANOM=Eph
+EF=Eph
+FILIPLJANOM=Phil
+FLP=Phil
+KOLOSANOM=Col
+KOL=Col
+1TESALONICANOM=1Thess
+1 TESALONICANOM=1Thess
+1TES=1Thess
+1 TES=1Thess
+2TESALONICANOM=2Thess
+2 TESALONICANOM=2Thess
+2TES=2Thess
+2 TES=2Thess
+1TIMOTEJ=1Tim
+1 TIMOTEJ=1Tim
+1TIM=1Tim
+1 TIM=1Tim
+2TIMOTEJ=2Tim
+2 TIMOTEJ=2Tim
+2TIM=2Tim
+2 TIM=2Tim
+TIT=Titus
+FILEMON=Phlm
+FLM=Phlm
+HEBREJCEM=Heb
+HEB=Heb
+JAKOB=Jas
+JAK=Jas
+1PETER=1Pet
+1 PETER=1Pet
+1PET=1Pet
+1 PET=1Pet
+1PT=1Pet
+1 PT=1Pet
+2PETER=2Pet
+2 PETER=2Pet
+2PET=2Pet
+2 PET=2Pet
+2PT=2Pet
+2 PT=2Pet
+1JANEZ=1John
+1 JANEZ=1John
+1JN=1John
+1 JN=1John
+2JANEZ=2John
+2 JANEZ=2John
+2JN=2John
+2 JN=2John
+3JANEZ=3John
+3 JANEZ=3John
+3JN=3John
+3 JN=3John
+JUDA=Jude
+JUD=Jude
+RAZODETJE=Rev
+RAZ=Rev
diff --git a/locales.d/sv-utf8.conf b/locales.d/sv-utf8.conf
new file mode 100644
index 0000000..3efb964
--- /dev/null
+++ b/locales.d/sv-utf8.conf
@@ -0,0 +1,343 @@
+[Meta]
+Name=sv
+Description=Svensk (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josua
+Judges=Domarboken
+Ruth=Rut
+I Samuel=1. Samuelsboken
+II Samuel=2. Samuelsboken
+I Kings=1. Kungaboken
+II Kings=2. Kungaboken
+I Chronicles=1. Krönikeboken
+II Chronicles=2. Krönikeboken
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Psaltaren
+Proverbs=Ordspråksboken
+Ecclesiastes=Predikaren
+Song of Solomon=Höga Visan
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagovisorna
+Ezekiel=Hesekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habackuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlagärningarna
+Romans=Romarbrevet
+I Corinthians=1. Korintierbrevet
+II Corinthians=2. Korintierbrevet
+Galatians=Galaterbrevet
+Ephesians=Efesierbrevet
+Philippians=Filipperbrevet
+Colossians=Kolosserbrevet
+I Thessalonians=1. Tessalonikerbrevet
+II Thessalonians=2. Tessalonikerbrevet
+I Timothy=1. Timoteusbrevet
+II Timothy=2. Timoteusbrevet
+Titus=Brevet till Titus
+Philemon=Brevet till Filemon
+Hebrews=Hebreerbrevet
+James=Jakobs brev
+I Peter=1. Petrusbrevet
+II Peter=2. Petrusbrevet
+I John=1. Johannesbrevet
+II John=2. Johannesbrevet
+III John=3. Johannesbrevet
+Jude=Judas brev
+Revelation of John=Uppenbarelseboken
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+
+JOSUA=Josh
+DOMARBOKEN=Judg
+RUT=Ruth
+
+1. SAMUELSBOKEN=1Sam
+1 SAMUELSBOKEN=1Sam
+
+2. SAMUELSBOKEN=2Sam
+2 SAMUELSBOKEN=2Sam
+
+1. KUNGABOKEN=1Kgs
+1 KUNGABOKEN=1Kgs
+
+2. KUNGABOKEN=2Kgs
+2 KUNGABOKEN=2Kgs
+
+1. KRÖNIKEBOKEN=1Chr
+1 KRÖNIKEBOKEN=1Chr
+
+2. KRÖNIKEBOKEN=2Chr
+2 KRÖNIKEBOKEN=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+PSALTAREN=Ps
+ORDSPRÃ…KSBOKEN=Prov
+PREDIKAREN=Eccl
+HÖGA VISAN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGOVISORNA=Lam
+HESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAAHUM=Nah
+HABACKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLAGÄRNINGARNA=Acts
+ROMARBREVET=Rom
+
+1. KORINTIERBREVET=1Cor
+1 KORINTIERBREVET=1Cor
+
+2. KORINTIERBREVET=2Cor
+2 KORINTIERBREVET=2Cor
+
+GALATERBREVET=Gal
+EFESIERBREVET=Eph
+FILIPPERBREVET=Phil
+KOLOSSERBREVET=Col
+
+1. TESSALONIKERBREVET=1Thess
+1 TESSALONIKERBREVET=1Thess
+
+2. TESSALONIKERBREVET=2Thess
+2 TESSALONIKERBREVET=2Thess
+
+1. TIMOTEUSBREVET=1Tim
+1 TIMOTEUSBREVET=1Tim
+
+2. TIMOTEUSBREVET=2Tim
+2 TIMOTEUSBREVET=2Tim
+
+BREVET TILL TITUS=Titus
+BREVET TILL FILEMON=Phlm
+HEBREERBREVET=Heb
+JAKOBS BREV=Jas
+
+1. PETRUSBREVET=1Pet
+1 PETRUSBREVET=1Pet
+
+2. PETRUSBREVET=2Pet
+2 PETRUSBREVET=2Pet
+
+1. JOHANNESBREVET=1John
+1 JOHANNESBREVET=1John
+
+2. JOHANNESBREVET=2John
+2 JOHANNESBREVET=2John
+
+3. JOHANNESBREVET=3John
+3 JOHANNESBREVET=3John
+
+JUDAS BREV=Jude
+UPPENBARELSEBOKEN=Rev
+1. MOS=Gen
+1.MOS=Gen
+1 MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2.MOS=Exod
+2 MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3.MOS=Lev
+3 MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4.MOS=Num
+4 MOS=Num
+4MOS=Num
+5. MOS=Deut
+5.MOS=Deut
+5 MOS=Deut
+5MOS=Deut
+JOS=Josh
+RUT=Ruth
+DOM=Judg
+1. SAM=1Sam
+1.SAM=1Sam
+1 SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2.SAM=2Sam
+2 SAM=2Sam
+2SAM=2Sam
+1. KUNG=1Kgs
+1.KUNG=1Kgs
+1 KUNG=1Kgs
+1KUNG=1Kgs
+2. KUNG=2Kgs
+2.KUNG=2Kgs
+2 KUNG=2Kgs
+2KUNG=2Kgs
+1. KRÖN=1Chr
+1.KRÖN=1Chr
+1 KRÖN=1Chr
+1KRÖN=1Chr
+2. KRÖN=2Chr
+2.KRÖN=2Chr
+2 KRÖN=2Chr
+2KRÖN=2Chr
+NEH=Neh
+EST=Esth
+PS=Ps
+ORDS=Prov
+PRED=Eccl
+HÖGAV=Song
+HÖGAV.=Song
+HÖGA V=Song
+HÖGA V.=Song
+HÖG V=Song
+HÖG. V=Song
+HÖG. V.=Song
+HÖG V.=Song
+HV=Song
+H.V=Song
+H.V.=Song
+H V.=Song
+H V=Song
+HÖGA VISAN=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+HES=Ezek
+DAN=Dan
+HOS=Hos
+JOEL=Joel
+AM=Amos
+AMOS=Amos
+OB=Obad
+JONA=Jonah
+MIK=Mic
+MIKA=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAGG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+AP=Acts
+ROM=Rom
+1. KOR=1Cor
+1.KOR=1Cor
+1 KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2.KOR=2Cor
+2 KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1.TESS=1Thess
+1 TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2.TESS=2Thess
+2 TESS=2Thess
+2TESS=2Thess
+1. THESS=1Thess
+1.THESS=1Thess
+1 THESS=1Thess
+1THESS=1Thess
+2. THESS=2Thess
+2.THESS=2Thess
+2 THESS=2Thess
+2THESS=2Thess
+1. TIM=1Tim
+1.TIM=1Tim
+1 TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2.TIM=2Tim
+2 TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1.PET=1Pet
+1 PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2.PET=2Pet
+2 PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1.JOH=1John
+1 JOH=1John
+1JOH=1John
+2. JOH=2John
+2.JOH=2John
+2 JOH=2John
+2JOH=2John
+3. JOH=3John
+3.JOH=3John
+3 JOH=3John
+3JOH=3John
+JUD=Jude
+UPP=Rev
diff --git a/locales.d/sv.conf b/locales.d/sv.conf
new file mode 100644
index 0000000..68f0afd
--- /dev/null
+++ b/locales.d/sv.conf
@@ -0,0 +1,344 @@
+[Meta]
+Name=sv
+Description=Svensk
+Encoding=ISO8859-1
+
+[Text]
+Genesis=1. Mosebok
+Exodus=2. Mosebok
+Leviticus=3. Mosebok
+Numbers=4. Mosebok
+Deuteronomy=5. Mosebok
+Joshua=Josua
+Judges=Domarboken
+Ruth=Rut
+I Samuel=1. Samuelsboken
+II Samuel=2. Samuelsboken
+I Kings=1. Kungaboken
+II Kings=2. Kungaboken
+I Chronicles=1. Krönikeboken
+II Chronicles=2. Krönikeboken
+Ezra=Esra
+Nehemiah=Nehemja
+Esther=Ester
+Job=Job
+Psalms=Psaltaren
+Proverbs=Ordspråksboken
+Ecclesiastes=Predikaren
+Song of Solomon=Höga Visan
+Isaiah=Jesaja
+Jeremiah=Jeremia
+Lamentations=Klagovisorna
+Ezekiel=Hesekiel
+Daniel=Daniel
+Hosea=Hosea
+Joel=Joel
+Amos=Amos
+Obadiah=Obadja
+Jonah=Jona
+Micah=Mika
+Nahum=Nahum
+Habakkuk=Habackuk
+Zephaniah=Sefanja
+Haggai=Haggai
+Zechariah=Sakarja
+Malachi=Malaki
+Matthew=Matteus
+Mark=Markus
+Luke=Lukas
+John=Johannes
+Acts=Apostlagärningarna
+Romans=Romarbrevet
+I Corinthians=1. Korintierbrevet
+II Corinthians=2. Korintierbrevet
+Galatians=Galaterbrevet
+Ephesians=Efesierbrevet
+Philippians=Filipperbrevet
+Colossians=Kolosserbrevet
+I Thessalonians=1. Tessalonikerbrevet
+II Thessalonians=2. Tessalonikerbrevet
+I Timothy=1. Timoteusbrevet
+II Timothy=2. Timoteusbrevet
+Titus=Brevet till Titus
+Philemon=Brevet till Filemon
+Hebrews=Hebreerbrevet
+James=Jakobs brev
+I Peter=1. Petrusbrevet
+II Peter=2. Petrusbrevet
+I John=1. Johannesbrevet
+II John=2. Johannesbrevet
+III John=3. Johannesbrevet
+Jude=Judas brev
+Revelation of John=Uppenbarelseboken
+
+[Book Abbrevs]
+
+1. MOSEBOK=Gen
+1 MOSEBOK=Gen
+
+2. MOSEBOK=Exod
+2 MOSEBOK=Exod
+
+3. MOSEBOK=Lev
+3 MOSEBOK=Lev
+
+4. MOSEBOK=Num
+4 MOSEBOK=Num
+
+5. MOSEBOK=Deut
+5 MOSEBOK=Deut
+
+JOSUA=Josh
+DOMARBOKEN=Judg
+RUT=Ruth
+
+1. SAMUELSBOKEN=1Sam
+1 SAMUELSBOKEN=1Sam
+
+2. SAMUELSBOKEN=2Sam
+2 SAMUELSBOKEN=2Sam
+
+1. KUNGABOKEN=1Kgs
+1 KUNGABOKEN=1Kgs
+
+2. KUNGABOKEN=2Kgs
+2 KUNGABOKEN=2Kgs
+
+1. KRÖNIKEBOKEN=1Chr
+1 KRÖNIKEBOKEN=1Chr
+
+2. KRÖNIKEBOKEN=2Chr
+2 KRÖNIKEBOKEN=2Chr
+
+ESRA=Ezra
+NEHEMJA=Neh
+ESTER=Esth
+JOB=Job
+PSALTAREN=Ps
+ORDSPRÅKSBOKEN=Prov
+PREDIKAREN=Eccl
+HÖGA VISAN=Song
+JESAJA=Isa
+JEREMIA=Jer
+KLAGOVISORNA=Lam
+HESEKIEL=Ezek
+DANIEL=Dan
+HOSEA=Hos
+JOEL=Joel
+AMOS=Amos
+OBADJA=Obad
+JONA=Jonah
+MIKA=Mic
+NAAHUM=Nah
+HABACKUK=Hab
+SEFANJA=Zeph
+HAGGAI=Hag
+SAKARJA=Zech
+MALAKI=Mal
+MATTEUS=Matt
+MARKUS=Mark
+LUKAS=Luke
+JOHANNES=John
+APOSTLAGÄRNINGARNA=Acts
+ROMARBREVET=Rom
+
+1. KORINTIERBREVET=1Cor
+1 KORINTIERBREVET=1Cor
+
+2. KORINTIERBREVET=2Cor
+2 KORINTIERBREVET=2Cor
+
+GALATERBREVET=Gal
+EFESIERBREVET=Eph
+FILIPPERBREVET=Phil
+KOLOSSERBREVET=Col
+
+1. TESSALONIKERBREVET=1Thess
+1 TESSALONIKERBREVET=1Thess
+
+2. TESSALONIKERBREVET=2Thess
+2 TESSALONIKERBREVET=2Thess
+
+1. TIMOTEUSBREVET=1Tim
+1 TIMOTEUSBREVET=1Tim
+
+2. TIMOTEUSBREVET=2Tim
+2 TIMOTEUSBREVET=2Tim
+
+BREVET TILL TITUS=Titus
+BREVET TILL FILEMON=Phlm
+HEBREERBREVET=Heb
+JAKOBS BREV=Jas
+
+1. PETRUSBREVET=1Pet
+1 PETRUSBREVET=1Pet
+
+2. PETRUSBREVET=2Pet
+2 PETRUSBREVET=2Pet
+
+1. JOHANNESBREVET=1John
+1 JOHANNESBREVET=1John
+
+2. JOHANNESBREVET=2John
+2 JOHANNESBREVET=2John
+
+3. JOHANNESBREVET=3John
+3 JOHANNESBREVET=3John
+
+JUDAS BREV=Jude
+UPPENBARELSEBOKEN=Rev
+1. MOS=Gen
+1.MOS=Gen
+1 MOS=Gen
+1MOS=Gen
+2. MOS=Exod
+2.MOS=Exod
+2 MOS=Exod
+2MOS=Exod
+3. MOS=Lev
+3.MOS=Lev
+3 MOS=Lev
+3MOS=Lev
+4. MOS=Num
+4.MOS=Num
+4 MOS=Num
+4MOS=Num
+5. MOS=Deut
+5.MOS=Deut
+5 MOS=Deut
+5MOS=Deut
+JOS=Josh
+RUT=Ruth
+DOM=Judg
+1. SAM=1Sam
+1.SAM=1Sam
+1 SAM=1Sam
+1SAM=1Sam
+2. SAM=2Sam
+2.SAM=2Sam
+2 SAM=2Sam
+2SAM=2Sam
+1. KUNG=1Kgs
+1.KUNG=1Kgs
+1 KUNG=1Kgs
+1KUNG=1Kgs
+2. KUNG=2Kgs
+2.KUNG=2Kgs
+2 KUNG=2Kgs
+2KUNG=2Kgs
+1. KRÖN=1Chr
+1.KRÖN=1Chr
+1 KRÖN=1Chr
+1KRÖN=1Chr
+2. KRÖN=2Chr
+2.KRÖN=2Chr
+2 KRÖN=2Chr
+2KRÖN=2Chr
+NEH=Neh
+EST=Esth
+PS=Ps
+ORDS=Prov
+PRED=Eccl
+HÖGAV=Song
+HÖGAV.=Song
+HÖGA V=Song
+HÖGA V.=Song
+HÖG V=Song
+HÖG. V=Song
+HÖG. V.=Song
+HÖG V.=Song
+HV=Song
+H.V=Song
+H.V.=Song
+H V.=Song
+H V=Song
+HÖGA VISAN=Song
+JES=Isa
+JER=Jer
+KLAG=Lam
+HES=Ezek
+DAN=Dan
+HOS=Hos
+JOEL=Joel
+AM=Amos
+AMOS=Amos
+OB=Obad
+JONA=Jonah
+MIK=Mic
+MIKA=Mic
+NAH=Nah
+HAB=Hab
+SEF=Zeph
+HAGG=Hag
+SAK=Zech
+MAL=Mal
+MATT=Matt
+MARK=Mark
+LUK=Luke
+JOH=John
+APG=Acts
+AP=Acts
+ROM=Rom
+1. KOR=1Cor
+1.KOR=1Cor
+1 KOR=1Cor
+1KOR=1Cor
+2. KOR=2Cor
+2.KOR=2Cor
+2 KOR=2Cor
+2KOR=2Cor
+GAL=Gal
+EF=Eph
+FIL=Phil
+KOL=Col
+1. TESS=1Thess
+1.TESS=1Thess
+1 TESS=1Thess
+1TESS=1Thess
+2. TESS=2Thess
+2.TESS=2Thess
+2 TESS=2Thess
+2TESS=2Thess
+1. THESS=1Thess
+1.THESS=1Thess
+1 THESS=1Thess
+1THESS=1Thess
+2. THESS=2Thess
+2.THESS=2Thess
+2 THESS=2Thess
+2THESS=2Thess
+1. TIM=1Tim
+1.TIM=1Tim
+1 TIM=1Tim
+1TIM=1Tim
+2. TIM=2Tim
+2.TIM=2Tim
+2 TIM=2Tim
+2TIM=2Tim
+TIT=Titus
+FILEM=Phlm
+HEBR=Heb
+JAK=Jas
+1. PET=1Pet
+1.PET=1Pet
+1 PET=1Pet
+1PET=1Pet
+2. PET=2Pet
+2.PET=2Pet
+2 PET=2Pet
+2PET=2Pet
+1. JOH=1John
+1.JOH=1John
+1 JOH=1John
+1JOH=1John
+2. JOH=2John
+2.JOH=2John
+2 JOH=2John
+2JOH=2John
+3. JOH=3John
+3.JOH=3John
+3 JOH=3John
+3JOH=3John
+JUD=Jude
+UPP=Rev
+
diff --git a/locales.d/th-utf8.conf b/locales.d/th-utf8.conf
new file mode 100644
index 0000000..5e1179b
--- /dev/null
+++ b/locales.d/th-utf8.conf
@@ -0,0 +1,208 @@
+[Meta]
+Name=th
+Description=Thai (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=ป�ม�าล
+Exodus=อพยพ
+Leviticus=เลวีนิติ
+Numbers=�ันดารวิถี
+Deuteronomy=เฉลยธรรมบั��ัติ
+Joshua=โยชูวา
+Judges=ผู้วินิจฉัย
+Ruth=นางรูธ
+I Samuel=1 ซามูเอล
+II Samuel=2 ซามูเอล
+I Kings=1 พงศ์�ษัตริย์
+II Kings=2 พงศ์�ษัตริย์
+I Chronicles=1 พงศาวดาร
+II Chronicles=2 พงศาวดาร
+Ezra=เอสรา
+Nehemiah=เนหมีย์
+Esther=เอสเธอร์
+Job=โยบ
+Psalms=สดุดี
+Proverbs=สุภาษิต
+Ecclesiastes=ปั��าจารย์
+Song of Solomon=เพลงซาโลมอน
+Isaiah=อิสยาห์
+Jeremiah=เยเรมีย์
+Lamentations=บทเพลงคร่ำครว�
+Ezekiel=เอเสเคียล
+Daniel=ดาเนียล
+Hosea=โฮเชยา
+Joel=โยเอล
+Amos=อาโมส
+Obadiah=โอบาดีห์
+Jonah=โยนาห์
+Micah=มีคาห์
+Nahum=นาฮูม
+Habakkuk=ฮาบา�ุ�
+Zephaniah=เศฟันยาห์
+Haggai=ฮั��ัย
+Zechariah=เศคาริยาห์
+Malachi=มาลาคี
+Matthew=มัทธิว
+Mark=มาระโ�
+Luke=ลู�า
+John=ยอห์น
+Acts=�ิจ�าร
+Romans=โรม
+I Corinthians=1 โครินธ์
+II Corinthians=2 โครินธ์
+Galatians=�าลาเทีย
+Ephesians=เอเฟซัส
+Philippians=ฟีลิปปี
+Colossians=โคโลสี
+I Thessalonians=1 เธสะโลนิ�า
+II Thessalonians=2 เธสะโลนิ�า
+I Timothy=1 ทิโมธี
+II Timothy=2 ทิโมธี
+Titus=ทิตัส
+Philemon=ฟีเลโมน
+Hebrews=ฮีบรู
+James=ยา�อบ
+I Peter=1 เปโตร
+II Peter=2 เปโตร
+I John=1 ยอห์น
+II John=2 ยอห์น
+III John=3 ยอห์น
+Jude=ยูดาห์
+Revelation of John=วิวรณ์
+
+[Book Abbrevs]
+ป�ม�าล=Gen
+ป��=Gen
+อพยพ=Exod
+อพย=Exod
+เลวีนิติ=Lev
+ลนต=Lev
+�ันดารวิถี=Num
+�ดว=Num
+เฉลยธรรมบั��ัติ=Deut
+
+ฉธบ=Deut
+โยชูวา=Josh
+
+ยชว=Josh
+ผู้วินิจฉัย=Judg
+วนฉ=Judg
+นางรูธ=Ruth
+นรธ=Ruth
+1 ซามูเอล=1Sam
+1ซมอ=1Sam
+2 ซามูเอล=2Sam
+2ซมอ=2Sam
+1 พงศ์�ษัตริย์=1Kgs
+1พ�ษ=1Kgs
+2 พงศ์�ษัตริย์=2Kgs
+2พ�ษ=2Kgs
+1 พงศาวดาร=1Chr
+1พศด=1Chr
+2 พงศาวดาร=2Chr
+2พศด=2Chr
+เอสรา=Ezra
+อสร=Ezra
+เนหมีย์=Neh
+นหม=Neh
+เอสเธอร์=Esth
+อสธ=Esth
+โยบ=Job
+สดุดี=Ps
+สดด=Ps
+สุภาษิต=Prov
+สภษ=Prov
+ปั��าจารย์=Eccl
+ป�จ=Eccl
+เพลงซาโลมอน=Song
+พซม=Song
+อิสยาห์=Isa
+อสย=Isa
+เยเรมีย์=Jer
+ยรม=Jer
+บทเพลงคร่ำครว�=Lam
+พคค=Lam
+เอเสเคียล=Ezek
+อสค=Ezek
+ดาเนียล=Dan
+ดนล=Dan
+โฮเชยา=Hos
+ฮชย=Hos
+โยเอล=Joel
+ยอล=Joel
+อาโมส=Amos
+อมส=Amos
+โอบาดีห์=Obad
+อบด=Obad
+โยนาห์=Jonah
+ยนา=Jonah
+มีคาห์=Mic
+มคา=Mic
+นาฮูม=Nah
+นฮม=Nah
+ฮาบา�ุ�=Hab
+ฮบ�=Hab
+เศฟันยาห์=Zeph
+ศฟย=Zeph
+ฮั��ัย=Hag
+ฮ��=Hag
+เศคาริยาห์=Zech
+ศคย=Zech
+มาลาคี=Mal
+มลค=Mal
+มัทธิว=Matt
+มธ=Matt
+มาระโ�=Mark
+ม�=Mark
+ลู�า=Luke
+ล�=Luke
+ยอห์น=John
+ยน=John
+�ิจ�าร=Acts
+�จ=Acts
+โรม=Rom
+รม=Rom
+1 โครินธ์=1Cor
+1คร=1Cor
+2 โครินธ์=2Cor
+2คร=2Cor
+�าลาเทีย=Gal
+�ท=Gal
+เอเฟซัส=Eph
+อฟ=Eph
+ฟีลิปปี=Phil
+ฟป=Phil
+โคโลสี=Col
+คส=Col
+1 เธสะโลนิ�า=1Thess
+1ธส=1Thess
+2 เธสะโลนิ�า=2Thess
+2ธส=2Thess
+1 ทิโมธี=1Tim
+1ทธ=1Tim
+2 ทิโมธี=2Tim
+2ทธ=2Tim
+ทิตัส=Titus
+ทต=Titus
+ฟีเลโมน=Phlm
+ฟม=Phlm
+ฮีบรู=Heb
+ฮบ=Heb
+ยา�อบ=Jas
+ย�=Jas
+1 เปโตร=1Pet
+1ปต=1Pet
+2 เปโตร=2Pet
+2ปต=2Pet
+1 ยอห์น=1John
+1ยน=1John
+2 ยอห์น=2John
+2ยน=2John
+3 ยอห์น=3John
+3ยน=3John
+ยูดาห์=Jude
+ยด=Jude
+วิวรณ์=Rev
+วว=Rev
+
diff --git a/locales.d/uk-utf8.conf b/locales.d/uk-utf8.conf
new file mode 100644
index 0000000..4397581
--- /dev/null
+++ b/locales.d/uk-utf8.conf
@@ -0,0 +1,555 @@
+# Ukrainian BIBLE
+# БІБЛІЯ або К�ИГИ СВЯТОГО ПИСЬМ� СТ�РОГО Й �ОВОГО З�ПОВІТУ
+# Працює під Linux і Windows вер�ії проекту SWORD
+# Pavlo Bohmat bohm@ukr.net
+
+[Meta]
+Name=uk
+Description=Ukrainian (Unicode)
+Encoding=UTF-8
+
+[Text]
+Genesis=Бутт�
+Exodus=Вихід
+Leviticus=Левит
+Numbers=Чи�ла
+Deuteronomy=Повторенн� Закону
+Joshua=І�у� �авин
+Judges=Суддів
+Ruth=Рут
+I Samuel=1. Самуїла
+II Samuel=2. Самуїла
+I Kings=1. Царів
+II Kings=2. Царів
+I Chronicles=1. Хроніки
+II Chronicles=2. Хроніки
+Ezra=Ездри
+Nehemiah=�еемії
+Esther=E�тер
+Job=Йова
+Psalms=П�алмів
+Proverbs=Припові�тей
+Ecclesiastes=Екклезі��т
+Song of Solomon=Пі�н� над пі�н�ми
+Isaiah=І�аї
+Jeremiah=Єремії
+Lamentations=Плач Єремії
+Ezekiel=Єзекіїл�
+Daniel=Даниїла
+Hosea=О�ії
+Joel=Йоіла
+Amos=Aмо�а
+Obadiah=Овді�
+Jonah=Йони
+Micah=Mихе�
+Nahum=�аума
+Habakkuk=�вакума
+Zephaniah=Софонії
+Haggai=Огі�
+Zechariah=Захарі�
+Malachi=Малахії
+Matthew=Матві�
+Mark=Марка
+Luke=Луки
+John=Івана
+Acts=Дії
+Romans=Римл�н
+I Corinthians=1. Коринт�н
+II Corinthians=2. Коринт�н
+Galatians=Галатів
+Ephesians=Ефе��н
+Philippians=Филип'�н
+Colossians=Коло��н
+I Thessalonians=1. Солун�н
+II Thessalonians=2. Солун�н
+I Timothy=1. Тимофі�
+II Timothy=2. Тимофі�
+Titus=Тита
+Philemon=Филимона
+Hebrews=Євреїв
+James=Якова
+I Peter=1. Петра
+II Peter=2. Петра
+I John=1. Івана
+II John=2. Івана
+III John=3. Івана
+Jude=Юди
+Revelation of John=Об'�вленн�
+
+[Book Abbrevs]
+
+Бутт�=Gen
+Вихід=Exod
+Левит=Lev
+Чи�ла=Num
+Повторенн� Закону=Deut
+І�у� �авин=Josh
+Суддів=Judg
+Рут=Ruth
+
+1. Самуїла=1Sam
+1 Самуїла=1Sam
+1Самуїла=1Sam
+
+2. Самуїла=2Sam
+2 Самуїла=2Sam
+2Самуїла=2Sam
+
+1. Царів=1Kgs
+1 Царів=1Kgs
+1Царів=1Kgs
+
+2. Царів=2Kgs
+2 Царів=2Kgs
+2Царів=2Kgs
+
+1. Хроніки=1Chr
+1 Хроніки=1Chr
+1Хроніки=1Chr
+
+2. Хроніки=2Chr
+2 Хроніки=2Chr
+2Хроніки=2Chr
+
+Ездри=Ezra
+�еемії=Neh
+E�тер=Esth
+Йова=Job
+П�алмів=Ps
+Припові�тей=Prov
+Екклезі��т=Eccl
+Пі�н� над пі�н�ми=Song
+І�аї=Isa
+Єремії=Jer
+Плач Єремії=Lam
+Єзекіїл�=Ezek
+Даниїла=Dan
+О�ії=Hos
+Йоіла=Joel
+Aмо�а=Amos
+Овді�=Obad
+Йони=Jonah
+Mихе�=Mic
+�аума=Nah
+�вакума=Hab
+Софонії=Zeph
+Огі�=Hag
+Захарі�=Zech
+Малахії=Mal
+Матві�=Matt
+Марка=Mark
+Луки=Luke
+Івана=John
+Дії=Acts
+Римл�н=Rom
+
+1. Коринт�н=1Cor
+1 Коринт�н=1Cor
+1Коринт�н=1Cor
+
+2. Коринт�н=2Cor
+2 Коринт�н=2Cor
+2Коринт�н=2Cor
+
+Галатів=Gal
+Ефе��н=Eph
+Филип'�н=Phil
+Коло��н=Col
+
+1. Солун�н=1Thess
+1 Солун�н=1Thess
+1Солун�н=1Thess
+
+2. Солун�н=2Thess
+2 Солун�н=2Thess
+2Солун�н=2Thess
+
+1. Тимофі�=1Tim
+1 Тимофі�=1Tim
+1Тимофі�=1Tim
+
+2. Тимофі�=2Tim
+2 Тимофі�=2Tim
+2Тимофі�=2Tim
+
+Тита=Titus
+Филимона=Phlm
+Євреїв=Heb
+Якова=Jas
+
+1. Петра=1Pet
+1 Петра=1Pet
+1Петра=1Pet
+
+2. Петра=2Pet
+2 Петра=2Pet
+2Петра=2Pet
+
+1. Івана=1John
+1 Івана=1John
+1Івана=1John
+
+2. Івана=2John
+2 Івана=2John
+2Івана=2John
+
+3. Івана=3John
+3 Івана=3John
+3Івана=3John
+
+Юди=Jude
+Об'�вленн�=Rev
+
+бут=Gen
+бут.=Gen
+Бут=Gen
+Бут.=Gen
+1М=Gen
+1М.=Gen
+1 М=Gen
+1 М.=Gen
+вих=Exod
+вих.=Exod
+Вих=Exod
+Вих.=Exod
+2М=Exod
+2М.=Exod
+2 М=Exod
+2 М.=Exod
+лев=Lev
+лев.=Lev
+Лев=Lev
+Лев.=Lev
+3М=Lev
+3М.=Lev
+3 М=Lev
+3 М.=Lev
+чи�=Num
+чи�.=Num
+Чи�=Num
+Чи�.=Num
+4М=Num
+4М.=Num
+4 М=Num
+4 М.=Num
+повт. зак.=Deut
+повт зак=Deut
+Повт Зак=Deut
+Повт. Зак.=Deut
+5М=Deut
+5М.=Deut
+5 М=Deut
+5 М.=Deut
+і�у� навин=Josh
+�авин=Josh
+навин=Josh
+єгошуї=Josh
+Єгошуї=Josh
+єг=Josh
+єг.=Josh
+Єг=Josh
+Єг.=Josh
+�уд=Judg
+�уд.=Judg
+Суд=Judg
+Суд.=Judg
+рут=Ruth
+Рут=Ruth
+1�ам=1Sam
+1�ам.=1Sam
+1 �ам=1Sam
+1 �ам.=1Sam
+1Сам=1Sam
+1Сам.=1Sam
+1 Сам=1Sam
+1 Сам.=1Sam
+2�ам=2Sam
+2�ам.=2Sam
+2 �ам=2Sam
+2 �ам.=2Sam
+2Сам=2Sam
+2Сам.=2Sam
+2 Сам=2Sam
+2 Сам.=2Sam
+1цар=1Kgs
+1цар.=1Kgs
+1 цар=1Kgs
+1 цар.=1Kgs
+1Цар=1Kgs
+1Цар.=1Kgs
+1 Цар=1Kgs
+1 Цар.=1Kgs
+2цар=2Kgs
+2цар.=2Kgs
+2 цар=2Kgs
+2 цар.=2Kgs
+2Цар=2Kgs
+2Цар.=2Kgs
+2 Цар=2Kgs
+2 Цар.=2Kgs
+1Ñ…Ñ€=1Chr
+1Ñ…Ñ€.=1Chr
+1 Ñ…Ñ€=1Chr
+1 Ñ…Ñ€.=1Chr
+1Хр=1Chr
+1Хр.=1Chr
+1 Хр=1Chr
+1 Хр.=1Chr
+2Ñ…Ñ€=2Chr
+2Ñ…Ñ€.=2Chr
+2 Ñ…Ñ€=2Chr
+2 Ñ…Ñ€.=2Chr
+2Хр=2Chr
+2Хр.=2Chr
+2 Хр=2Chr
+2 Хр.=2Chr
+езд=Ezra
+езд.=Ezra
+Езд=Ezra
+Езд.=Ezra
+неем=Neh
+неем.=Neh
+�еем=Neh
+�еем.=Neh
+е�т=Esth
+е�т.=Esth
+Е�т=Esth
+Е�т.=Esth
+йов=Job
+Йов=Job
+п�=Ps
+п�.=Ps
+П�=Ps
+П�.=Ps
+пр=Prov
+пр.20
+Пр=Prov
+Пр.=Prov
+прип=Prov
+прип.=Prov
+Прип=Prov
+Прип.=Prov
+екл=Eccl
+екл.=Eccl
+еккл=Eccl
+еклл.=Eccl
+Еккл=Eccl
+Еккл.=Eccl
+Екл=Eccl
+Екл.=Eccl
+пі�н=Song
+пі�н.=Song
+Пі�н=Song
+Пі�н.=Song
+і�=Isa
+і�.=Isa
+І�=Isa
+І�.=Isa
+єр=Jer
+єр.=Jer
+Єр=Jer
+Єр.=Jer
+плач=Lam
+плач.=Lam
+Плач=Lam
+Плач.=Lam
+єз=Ezek
+єз.=Ezek
+Єз=Ezek
+Єз.=Ezek
+дан=Dan
+дан.=Dan
+Дан=Dan
+Дан.=Dan
+о�=Hos
+о�.=Hos
+О�=Hos
+О�.=Hos
+йоіл=Joel
+Йоіл=Joel
+ам=Amos
+ам.=Amos
+�м=Amos
+�м.=Amos
+овд=Obad
+овд.=Obad
+Овд=Obad
+Овд.=Obad
+йона=Jonah
+Йона=Jonah
+мих=Mic
+мих.=Mic
+Мих=Mic
+Мих.=Mic
+наум=Nah
+�аум=Nah
+ав=Hab
+ав.=Hab
+�в=Hab
+�в.=Hab
+�оф=Zeph
+�оф.=Zeph
+Соф=Zeph
+Соф.=Zeph
+ог=Hag
+ог.=Hag
+Ог=Hag
+Ог.=Hag
+зах=Zech
+зах.=Zech
+Зах=Zech
+Зах.=Zech
+мал=Mal
+мал.=Mal
+Мал=Mal
+Мал.=Mal
+мт=Matt
+мт.=Matt
+Мт=Matt
+Мт.=Matt
+мр=Mark
+мр.=Mark
+Мр=Mark
+Мр.=Mark
+лк=Luke
+лк.=Luke
+Лк=Luke
+Лк.=Luke
+ів=John
+ів.=John
+Ів=John
+Ів.=John
+дії=Acts
+Дії=Acts
+рим=Rom
+рим.=Rom
+Рим=Rom
+Рим.=Rom
+1кор=1Cor
+1кор.=1Cor
+1 кор=1Cor
+1 кор.=1Cor
+1Кор=1Cor
+1Кор.=1Cor
+1 Кор=1Cor
+1 Кор.=1Cor
+2кор=2Cor
+2кор.=2Cor
+2 кор=2Cor
+2 кор.=2Cor
+2Кор=2Cor
+2Кор.=2Cor
+2 Кор=2Cor
+2 Кор.=2Cor
+гал=Gal
+гал.=Gal
+Гал=Gal
+Гал.=Gal
+еф=Eph
+еф.=Eph
+Еф=Eph
+Еф.=Eph
+фил=Phil
+фил.=Phil
+Фил=Phil
+Фил.=Phil
+кол=Col
+кол.=Col
+Кол=Col
+Кол.=Col
+1�ол=1Thess
+1�ол.=1Thess
+1 �ол=1Thess
+1 �ол.=1Thess
+1Сол=1Thess
+1Сол.=1Thess
+1 Сол=1Thess
+1 Сол.=1Thess
+2�ол=2Thess
+2�ол.=2Thess
+2 �ол=2Thess
+2 �ол.=2Thess
+2Сол=2Thess
+2Сол.=2Thess
+2 Сол=2Thess
+2 Сол.=2Thess
+1тим=1Tim
+1тим.=1Tim
+1 тим=1Tim
+1 тим.=1Tim
+1Тим=1Tim
+1Тим.=1Tim
+1 Тим=1Tim
+1 Тим.=1Tim
+2тим=2Tim
+2тим.=2Tim
+2 тим=2Tim
+2 тим.=2Tim
+2Тим=2Tim
+2Тим.=2Tim
+2 Тим=2Tim
+2 Тим.=2Tim
+тит=Titus
+тит.=Titus
+Тит=Titus
+Тит.=Titus
+филим=Phlm
+филим.=Phlm
+Филим=Phlm
+Филим.=Phlm
+євр=Heb
+євр.=Heb
+Євр=Heb
+Євр.=Heb
+�к=Jas
+�к.=Jas
+Як=Jas
+Як.=Jas
+1петр=1Pet
+1петр.=1Pet
+1 петр=1Pet
+1 петр.=1Pet
+1Петр=1Pet
+1Петр.=1Pet
+1 Петр=1Pet
+1 Петр.=1Pet
+2петр=2Pet
+2петр.=2Pet
+2 петр=2Pet
+2 петр.=2Pet
+2Петр=2Pet
+2Петр.=2Pet
+2 Петр=2Pet
+2 Петр.=2Pet
+1ів=1John
+1ів.=1John
+1 ів=1John
+1 ів.=1John
+1Ів=1John
+1Ів.=1John
+1 Ів=1John
+1 Ів.=1John
+2ів=2John
+2ів.=2John
+2 ів=2John
+2 ів.=2John
+2Ів=2John
+2Ів.=2John
+2 Ів=2John
+2 Ів.=2John
+3ів=3John
+3ів.=3John
+3 ів=3John
+3 ів.=3John
+3Ів=3John
+3Ів.=3John
+3 Ів=3John
+3 Ів.=3John
+юд=Jude
+юд.=Jude
+Юд=Jude
+Юд.=Jude
+об=Rev
+об.=Rev
+Об=Rev
+Об.=Rev
diff --git a/locales.d/uk_UA-cp1251.conf b/locales.d/uk_UA-cp1251.conf
new file mode 100755
index 0000000..4b4cd2d
--- /dev/null
+++ b/locales.d/uk_UA-cp1251.conf
@@ -0,0 +1,555 @@
+# Ukrainian BIBLE
+# Á²ÁË²ß àáî ÊÍÈÃÈ ÑÂßÒÎÃÎ ÏÈÑÜÌÀ ÑÒÀÐÎÃÎ É ÍÎÂÎÃÎ ÇÀÏβÒÓ
+# Ïðàöþº ï³ä Linux ³ Windows âåðñ³¿ ïðîåêòó SWORD
+# Pavlo Bohmat bohm@ukr.net
+
+[Meta]
+Name=uk_UA-cp1251
+Description=Ukrainian (CP1251)
+Encoding=CP1251
+
+[Text]
+Genesis=Áóòòÿ
+Exodus=Âèõ³ä
+Leviticus=Ëåâèò
+Numbers=×èñëà
+Deuteronomy=Ïîâòîðåííÿ Çàêîíó
+Joshua=²ñóñ Íàâèí
+Judges=Ñóää³â
+Ruth=Ðóò
+I Samuel=1. Ñàìó¿ëà
+II Samuel=2. Ñàìó¿ëà
+I Kings=1. Öàð³â
+II Kings=2. Öàð³â
+I Chronicles=1. Õðîí³êè
+II Chronicles=2. Õðîí³êè
+Ezra=Åçäðè
+Nehemiah=Íåå쳿
+Esther=Eñòåð
+Job=Éîâà
+Psalms=Ïñàëì³â
+Proverbs=Ïðèïîâ³ñòåé
+Ecclesiastes=Åêêëåç³ÿñò
+Song of Solomon=ϳñíÿ íàä ï³ñíÿìè
+Isaiah=²ñà¿
+Jeremiah=ªðå쳿
+Lamentations=Ïëà÷ ªðå쳿
+Ezekiel=ªçå곿ëÿ
+Daniel=Äàíè¿ëà
+Hosea=Îñ³¿
+Joel=Éî³ëà
+Amos=Aìîñà
+Obadiah=Îâä³ÿ
+Jonah=Éîíè
+Micah=Mèõåÿ
+Nahum=Íàóìà
+Habakkuk=Àâàêóìà
+Zephaniah=Ñîôîí³¿
+Haggai=Îã³ÿ
+Zechariah=Çàõàð³ÿ
+Malachi=Ìàëàõ³¿
+Matthew=Ìàòâ³ÿ
+Mark=Ìàðêà
+Luke=Ëóêè
+John=²âàíà
+Acts=ij¿
+Romans=Ðèìëÿí
+I Corinthians=1. Êîðèíòÿí
+II Corinthians=2. Êîðèíòÿí
+Galatians=Ãàëàò³â
+Ephesians=Åôåñÿí
+Philippians=Ôèëèï'ÿí
+Colossians=Êîëîñÿí
+I Thessalonians=1. Ñîëóíÿí
+II Thessalonians=2. Ñîëóíÿí
+I Timothy=1. Òèìîô³ÿ
+II Timothy=2. Òèìîô³ÿ
+Titus=Òèòà
+Philemon=Ôèëèìîíà
+Hebrews=ªâðå¿â
+James=ßêîâà
+I Peter=1. Ïåòðà
+II Peter=2. Ïåòðà
+I John=1. ²âàíà
+II John=2. ²âàíà
+III John=3. ²âàíà
+Jude=Þäè
+Revelation of John=Îá'ÿâëåííÿ
+
+[Book Abbrevs]
+
+Áóòòÿ=Gen
+Âèõ³ä=Exod
+Ëåâèò=Lev
+×èñëà=Num
+Ïîâòîðåííÿ Çàêîíó=Deut
+²ñóñ Íàâèí=Josh
+Ñóää³â=Judg
+Ðóò=Ruth
+
+1. Ñàìó¿ëà=1Sam
+1 Ñàìó¿ëà=1Sam
+1Ñàìó¿ëà=1Sam
+
+2. Ñàìó¿ëà=2Sam
+2 Ñàìó¿ëà=2Sam
+2Ñàìó¿ëà=2Sam
+
+1. Öàð³â=1Kgs
+1 Öàð³â=1Kgs
+1Öàð³â=1Kgs
+
+2. Öàð³â=2Kgs
+2 Öàð³â=2Kgs
+2Öàð³â=2Kgs
+
+1. Õðîí³êè=1Chr
+1 Õðîí³êè=1Chr
+1Õðîí³êè=1Chr
+
+2. Õðîí³êè=2Chr
+2 Õðîí³êè=2Chr
+2Õðîí³êè=2Chr
+
+Åçäðè=Ezra
+Íåå쳿=Neh
+Eñòåð=Esth
+Éîâà=Job
+Ïñàëì³â=Ps
+Ïðèïîâ³ñòåé=Prov
+Åêêëåç³ÿñò=Eccl
+ϳñíÿ íàä ï³ñíÿìè=Song
+²ñà¿=Isa
+ªðå쳿=Jer
+Ïëà÷ ªðå쳿=Lam
+ªçå곿ëÿ=Ezek
+Äàíè¿ëà=Dan
+Îñ³¿=Hos
+Éî³ëà=Joel
+Aìîñà=Amos
+Îâä³ÿ=Obad
+Éîíè=Jonah
+Mèõåÿ=Mic
+Íàóìà=Nah
+Àâàêóìà=Hab
+Ñîôîí³¿=Zeph
+Îã³ÿ=Hag
+Çàõàð³ÿ=Zech
+Ìàëàõ³¿=Mal
+Ìàòâ³ÿ=Matt
+Ìàðêà=Mark
+Ëóêè=Luke
+²âàíà=John
+ij¿=Acts
+Ðèìëÿí=Rom
+
+1. Êîðèíòÿí=1Cor
+1 Êîðèíòÿí=1Cor
+1Êîðèíòÿí=1Cor
+
+2. Êîðèíòÿí=2Cor
+2 Êîðèíòÿí=2Cor
+2Êîðèíòÿí=2Cor
+
+Ãàëàò³â=Gal
+Åôåñÿí=Eph
+Ôèëèï'ÿí=Phil
+Êîëîñÿí=Col
+
+1. Ñîëóíÿí=1Thess
+1 Ñîëóíÿí=1Thess
+1Ñîëóíÿí=1Thess
+
+2. Ñîëóíÿí=2Thess
+2 Ñîëóíÿí=2Thess
+2Ñîëóíÿí=2Thess
+
+1. Òèìîô³ÿ=1Tim
+1 Òèìîô³ÿ=1Tim
+1Òèìîô³ÿ=1Tim
+
+2. Òèìîô³ÿ=2Tim
+2 Òèìîô³ÿ=2Tim
+2Òèìîô³ÿ=2Tim
+
+Òèòà=Titus
+Ôèëèìîíà=Phlm
+ªâðå¿â=Heb
+ßêîâà=Jas
+
+1. Ïåòðà=1Pet
+1 Ïåòðà=1Pet
+1Ïåòðà=1Pet
+
+2. Ïåòðà=2Pet
+2 Ïåòðà=2Pet
+2Ïåòðà=2Pet
+
+1. ²âàíà=1John
+1 ²âàíà=1John
+1²âàíà=1John
+
+2. ²âàíà=2John
+2 ²âàíà=2John
+2²âàíà=2John
+
+3. ²âàíà=3John
+3 ²âàíà=3John
+3²âàíà=3John
+
+Þäè=Jude
+Îá'ÿâëåííÿ=Rev
+
+áóò=Gen
+áóò.=Gen
+Áóò=Gen
+Áóò.=Gen
+1Ì=Gen
+1Ì.=Gen
+1 Ì=Gen
+1 Ì.=Gen
+âèõ=Exod
+âèõ.=Exod
+Âèõ=Exod
+Âèõ.=Exod
+2Ì=Exod
+2Ì.=Exod
+2 Ì=Exod
+2 Ì.=Exod
+ëåâ=Lev
+ëåâ.=Lev
+Ëåâ=Lev
+Ëåâ.=Lev
+3Ì=Lev
+3Ì.=Lev
+3 Ì=Lev
+3 Ì.=Lev
+÷èñ=Num
+÷èñ.=Num
+×èñ=Num
+×èñ.=Num
+4Ì=Num
+4Ì.=Num
+4 Ì=Num
+4 Ì.=Num
+ïîâò. çàê.=Deut
+ïîâò çàê=Deut
+Ïîâò Çàê=Deut
+Ïîâò. Çàê.=Deut
+5Ì=Deut
+5Ì.=Deut
+5 Ì=Deut
+5 Ì.=Deut
+³ñóñ íàâèí=Josh
+Íàâèí=Josh
+íàâèí=Josh
+ºãîøó¿=Josh
+ªãîøó¿=Josh
+ºã=Josh
+ºã.=Josh
+ªã=Josh
+ªã.=Josh
+ñóä=Judg
+ñóä.=Judg
+Ñóä=Judg
+Ñóä.=Judg
+ðóò=Ruth
+Ðóò=Ruth
+1ñàì=1Sam
+1ñàì.=1Sam
+1 ñàì=1Sam
+1 ñàì.=1Sam
+1Ñàì=1Sam
+1Ñàì.=1Sam
+1 Ñàì=1Sam
+1 Ñàì.=1Sam
+2ñàì=2Sam
+2ñàì.=2Sam
+2 ñàì=2Sam
+2 ñàì.=2Sam
+2Ñàì=2Sam
+2Ñàì.=2Sam
+2 Ñàì=2Sam
+2 Ñàì.=2Sam
+1öàð=1Kgs
+1öàð.=1Kgs
+1 öàð=1Kgs
+1 öàð.=1Kgs
+1Öàð=1Kgs
+1Öàð.=1Kgs
+1 Öàð=1Kgs
+1 Öàð.=1Kgs
+2öàð=2Kgs
+2öàð.=2Kgs
+2 öàð=2Kgs
+2 öàð.=2Kgs
+2Öàð=2Kgs
+2Öàð.=2Kgs
+2 Öàð=2Kgs
+2 Öàð.=2Kgs
+1õð=1Chr
+1õð.=1Chr
+1 õð=1Chr
+1 õð.=1Chr
+1Õð=1Chr
+1Õð.=1Chr
+1 Õð=1Chr
+1 Õð.=1Chr
+2õð=2Chr
+2õð.=2Chr
+2 õð=2Chr
+2 õð.=2Chr
+2Õð=2Chr
+2Õð.=2Chr
+2 Õð=2Chr
+2 Õð.=2Chr
+åçä=Ezra
+åçä.=Ezra
+Åçä=Ezra
+Åçä.=Ezra
+íååì=Neh
+íååì.=Neh
+Íååì=Neh
+Íååì.=Neh
+åñò=Esth
+åñò.=Esth
+Åñò=Esth
+Åñò.=Esth
+éîâ=Job
+Éîâ=Job
+ïñ=Ps
+ïñ.=Ps
+Ïñ=Ps
+Ïñ.=Ps
+ïð=Prov
+ïð.20
+Ïð=Prov
+Ïð.=Prov
+ïðèï=Prov
+ïðèï.=Prov
+Ïðèï=Prov
+Ïðèï.=Prov
+åêë=Eccl
+åêë.=Eccl
+åêêë=Eccl
+åêëë.=Eccl
+Åêêë=Eccl
+Åêêë.=Eccl
+Åêë=Eccl
+Åêë.=Eccl
+ï³ñí=Song
+ï³ñí.=Song
+ϳñí=Song
+ϳñí.=Song
+³ñ=Isa
+³ñ.=Isa
+²ñ=Isa
+²ñ.=Isa
+ºð=Jer
+ºð.=Jer
+ªð=Jer
+ªð.=Jer
+ïëà÷=Lam
+ïëà÷.=Lam
+Ïëà÷=Lam
+Ïëà÷.=Lam
+ºç=Ezek
+ºç.=Ezek
+ªç=Ezek
+ªç.=Ezek
+äàí=Dan
+äàí.=Dan
+Äàí=Dan
+Äàí.=Dan
+îñ=Hos
+îñ.=Hos
+Îñ=Hos
+Îñ.=Hos
+éî³ë=Joel
+Éî³ë=Joel
+àì=Amos
+àì.=Amos
+Àì=Amos
+Àì.=Amos
+îâä=Obad
+îâä.=Obad
+Îâä=Obad
+Îâä.=Obad
+éîíà=Jonah
+Éîíà=Jonah
+ìèõ=Mic
+ìèõ.=Mic
+Ìèõ=Mic
+Ìèõ.=Mic
+íàóì=Nah
+Íàóì=Nah
+àâ=Hab
+àâ.=Hab
+Àâ=Hab
+Àâ.=Hab
+ñîô=Zeph
+ñîô.=Zeph
+Ñîô=Zeph
+Ñîô.=Zeph
+îã=Hag
+îã.=Hag
+Îã=Hag
+Îã.=Hag
+çàõ=Zech
+çàõ.=Zech
+Çàõ=Zech
+Çàõ.=Zech
+ìàë=Mal
+ìàë.=Mal
+Ìàë=Mal
+Ìàë.=Mal
+ìò=Matt
+ìò.=Matt
+Ìò=Matt
+Ìò.=Matt
+ìð=Mark
+ìð.=Mark
+Ìð=Mark
+Ìð.=Mark
+ëê=Luke
+ëê.=Luke
+Ëê=Luke
+Ëê.=Luke
+³â=John
+³â.=John
+²â=John
+²â.=John
+䳿=Acts
+ij¿=Acts
+ðèì=Rom
+ðèì.=Rom
+Ðèì=Rom
+Ðèì.=Rom
+1êîð=1Cor
+1êîð.=1Cor
+1 êîð=1Cor
+1 êîð.=1Cor
+1Êîð=1Cor
+1Êîð.=1Cor
+1 Êîð=1Cor
+1 Êîð.=1Cor
+2êîð=2Cor
+2êîð.=2Cor
+2 êîð=2Cor
+2 êîð.=2Cor
+2Êîð=2Cor
+2Êîð.=2Cor
+2 Êîð=2Cor
+2 Êîð.=2Cor
+ãàë=Gal
+ãàë.=Gal
+Ãàë=Gal
+Ãàë.=Gal
+åô=Eph
+åô.=Eph
+Åô=Eph
+Åô.=Eph
+ôèë=Phil
+ôèë.=Phil
+Ôèë=Phil
+Ôèë.=Phil
+êîë=Col
+êîë.=Col
+Êîë=Col
+Êîë.=Col
+1ñîë=1Thess
+1ñîë.=1Thess
+1 ñîë=1Thess
+1 ñîë.=1Thess
+1Ñîë=1Thess
+1Ñîë.=1Thess
+1 Ñîë=1Thess
+1 Ñîë.=1Thess
+2ñîë=2Thess
+2ñîë.=2Thess
+2 ñîë=2Thess
+2 ñîë.=2Thess
+2Ñîë=2Thess
+2Ñîë.=2Thess
+2 Ñîë=2Thess
+2 Ñîë.=2Thess
+1òèì=1Tim
+1òèì.=1Tim
+1 òèì=1Tim
+1 òèì.=1Tim
+1Òèì=1Tim
+1Òèì.=1Tim
+1 Òèì=1Tim
+1 Òèì.=1Tim
+2òèì=2Tim
+2òèì.=2Tim
+2 òèì=2Tim
+2 òèì.=2Tim
+2Òèì=2Tim
+2Òèì.=2Tim
+2 Òèì=2Tim
+2 Òèì.=2Tim
+òèò=Titus
+òèò.=Titus
+Òèò=Titus
+Òèò.=Titus
+ôèëèì=Phlm
+ôèëèì.=Phlm
+Ôèëèì=Phlm
+Ôèëèì.=Phlm
+ºâð=Heb
+ºâð.=Heb
+ªâð=Heb
+ªâð.=Heb
+ÿê=Jas
+ÿê.=Jas
+ßê=Jas
+ßê.=Jas
+1ïåòð=1Pet
+1ïåòð.=1Pet
+1 ïåòð=1Pet
+1 ïåòð.=1Pet
+1Ïåòð=1Pet
+1Ïåòð.=1Pet
+1 Ïåòð=1Pet
+1 Ïåòð.=1Pet
+2ïåòð=2Pet
+2ïåòð.=2Pet
+2 ïåòð=2Pet
+2 ïåòð.=2Pet
+2Ïåòð=2Pet
+2Ïåòð.=2Pet
+2 Ïåòð=2Pet
+2 Ïåòð.=2Pet
+1³â=1John
+1³â.=1John
+1 ³â=1John
+1 ³â.=1John
+1²â=1John
+1²â.=1John
+1 ²â=1John
+1 ²â.=1John
+2³â=2John
+2³â.=2John
+2 ³â=2John
+2 ³â.=2John
+2²â=2John
+2²â.=2John
+2 ²â=2John
+2 ²â.=2John
+3³â=3John
+3³â.=3John
+3 ³â=3John
+3 ³â.=3John
+3²â=3John
+3²â.=3John
+3 ²â=3John
+3 ²â.=3John
+þä=Jude
+þä.=Jude
+Þä=Jude
+Þä.=Jude
+îá=Rev
+îá.=Rev
+Îá=Rev
+Îá.=Rev
diff --git a/locales.d/uk_UA-koi8-u.conf b/locales.d/uk_UA-koi8-u.conf
new file mode 100755
index 0000000..38342f4
--- /dev/null
+++ b/locales.d/uk_UA-koi8-u.conf
@@ -0,0 +1,555 @@
+# Ukrainian BIBLE
+# â¶âì¶ñ ÁÂÏ ëîéçé ó÷ñôïçï ðéóøíá óôáòïçï ê îï÷ïçï úáðï÷¶ôõ
+# ðÒÁÃÀ¤ Ð¦Ä Linux ¦ Windows ×ÅÒÓ¦§ ÐÒÏÅËÔÕ SWORD
+# Pavlo Bohmat bohm@ukr.net
+
+[Meta]
+Name=uk_UA-koi8-u
+Description=Ukrainian (KOI8-U)
+Encoding=KOI8-U
+
+[Text]
+Genesis=âÕÔÔÑ
+Exodus=÷ÉȦÄ
+Leviticus=ìÅ×ÉÔ
+Numbers=þÉÓÌÁ
+Deuteronomy=ðÏ×ÔÏÒÅÎÎÑ úÁËÏÎÕ
+Joshua=¶ÓÕÓ îÁ×ÉÎ
+Judges=óÕÄĦ×
+Ruth=òÕÔ
+I Samuel=1. óÁÍÕ§ÌÁ
+II Samuel=2. óÁÍÕ§ÌÁ
+I Kings=1. ãÁÒ¦×
+II Kings=2. ãÁÒ¦×
+I Chronicles=1. èÒÏΦËÉ
+II Chronicles=2. èÒÏΦËÉ
+Ezra=åÚÄÒÉ
+Nehemiah=îÅÅͦ§
+Esther=EÓÔÅÒ
+Job=êÏ×Á
+Psalms=ðÓÁÌͦ×
+Proverbs=ðÒÉÐÏצÓÔÅÊ
+Ecclesiastes=åËËÌÅÚ¦ÑÓÔ
+Song of Solomon=ð¦ÓÎÑ ÎÁÄ Ð¦ÓÎÑÍÉ
+Isaiah=¶ÓÁ§
+Jeremiah=´ÒÅͦ§
+Lamentations=ðÌÁÞ ´ÒÅͦ§
+Ezekiel=´ÚÅ˦§ÌÑ
+Daniel=äÁÎɧÌÁ
+Hosea=ïÓ¦§
+Joel=êϦÌÁ
+Amos=AÍÏÓÁ
+Obadiah=ï×ĦÑ
+Jonah=êÏÎÉ
+Micah=MÉÈÅÑ
+Nahum=îÁÕÍÁ
+Habakkuk=á×ÁËÕÍÁ
+Zephaniah=óÏÆÏΦ§
+Haggai=ïǦÑ
+Zechariah=úÁÈÁÒ¦Ñ
+Malachi=íÁÌÁȦ§
+Matthew=íÁÔצÑ
+Mark=íÁÒËÁ
+Luke=ìÕËÉ
+John=¶×ÁÎÁ
+Acts=䦧
+Romans=òÉÍÌÑÎ
+I Corinthians=1. ëÏÒÉÎÔÑÎ
+II Corinthians=2. ëÏÒÉÎÔÑÎ
+Galatians=çÁÌÁÔ¦×
+Ephesians=åÆÅÓÑÎ
+Philippians=æÉÌÉÐ'ÑÎ
+Colossians=ëÏÌÏÓÑÎ
+I Thessalonians=1. óÏÌÕÎÑÎ
+II Thessalonians=2. óÏÌÕÎÑÎ
+I Timothy=1. ôÉÍÏƦÑ
+II Timothy=2. ôÉÍÏƦÑ
+Titus=ôÉÔÁ
+Philemon=æÉÌÉÍÏÎÁ
+Hebrews=´×Òŧ×
+James=ñËÏ×Á
+I Peter=1. ðÅÔÒÁ
+II Peter=2. ðÅÔÒÁ
+I John=1. ¶×ÁÎÁ
+II John=2. ¶×ÁÎÁ
+III John=3. ¶×ÁÎÁ
+Jude=àÄÉ
+Revelation of John=ïÂ'Ñ×ÌÅÎÎÑ
+
+[Book Abbrevs]
+
+âÕÔÔÑ=Gen
+÷ÉȦÄ=Exod
+ìÅ×ÉÔ=Lev
+þÉÓÌÁ=Num
+ðÏ×ÔÏÒÅÎÎÑ úÁËÏÎÕ=Deut
+¶ÓÕÓ îÁ×ÉÎ=Josh
+óÕÄĦ×=Judg
+òÕÔ=Ruth
+
+1. óÁÍÕ§ÌÁ=1Sam
+1 óÁÍÕ§ÌÁ=1Sam
+1óÁÍÕ§ÌÁ=1Sam
+
+2. óÁÍÕ§ÌÁ=2Sam
+2 óÁÍÕ§ÌÁ=2Sam
+2óÁÍÕ§ÌÁ=2Sam
+
+1. ãÁÒ¦×=1Kgs
+1 ãÁÒ¦×=1Kgs
+1ãÁÒ¦×=1Kgs
+
+2. ãÁÒ¦×=2Kgs
+2 ãÁÒ¦×=2Kgs
+2ãÁÒ¦×=2Kgs
+
+1. èÒÏΦËÉ=1Chr
+1 èÒÏΦËÉ=1Chr
+1èÒÏΦËÉ=1Chr
+
+2. èÒÏΦËÉ=2Chr
+2 èÒÏΦËÉ=2Chr
+2èÒÏΦËÉ=2Chr
+
+åÚÄÒÉ=Ezra
+îÅÅͦ§=Neh
+EÓÔÅÒ=Esth
+êÏ×Á=Job
+ðÓÁÌͦ×=Ps
+ðÒÉÐÏצÓÔÅÊ=Prov
+åËËÌÅÚ¦ÑÓÔ=Eccl
+ð¦ÓÎÑ ÎÁÄ Ð¦ÓÎÑÍÉ=Song
+¶ÓÁ§=Isa
+´ÒÅͦ§=Jer
+ðÌÁÞ ´ÒÅͦ§=Lam
+´ÚÅ˦§ÌÑ=Ezek
+äÁÎɧÌÁ=Dan
+ïÓ¦§=Hos
+êϦÌÁ=Joel
+AÍÏÓÁ=Amos
+ï×ĦÑ=Obad
+êÏÎÉ=Jonah
+MÉÈÅÑ=Mic
+îÁÕÍÁ=Nah
+á×ÁËÕÍÁ=Hab
+óÏÆÏΦ§=Zeph
+ïǦÑ=Hag
+úÁÈÁÒ¦Ñ=Zech
+íÁÌÁȦ§=Mal
+íÁÔצÑ=Matt
+íÁÒËÁ=Mark
+ìÕËÉ=Luke
+¶×ÁÎÁ=John
+䦧=Acts
+òÉÍÌÑÎ=Rom
+
+1. ëÏÒÉÎÔÑÎ=1Cor
+1 ëÏÒÉÎÔÑÎ=1Cor
+1ëÏÒÉÎÔÑÎ=1Cor
+
+2. ëÏÒÉÎÔÑÎ=2Cor
+2 ëÏÒÉÎÔÑÎ=2Cor
+2ëÏÒÉÎÔÑÎ=2Cor
+
+çÁÌÁÔ¦×=Gal
+åÆÅÓÑÎ=Eph
+æÉÌÉÐ'ÑÎ=Phil
+ëÏÌÏÓÑÎ=Col
+
+1. óÏÌÕÎÑÎ=1Thess
+1 óÏÌÕÎÑÎ=1Thess
+1óÏÌÕÎÑÎ=1Thess
+
+2. óÏÌÕÎÑÎ=2Thess
+2 óÏÌÕÎÑÎ=2Thess
+2óÏÌÕÎÑÎ=2Thess
+
+1. ôÉÍÏƦÑ=1Tim
+1 ôÉÍÏƦÑ=1Tim
+1ôÉÍÏƦÑ=1Tim
+
+2. ôÉÍÏƦÑ=2Tim
+2 ôÉÍÏƦÑ=2Tim
+2ôÉÍÏƦÑ=2Tim
+
+ôÉÔÁ=Titus
+æÉÌÉÍÏÎÁ=Phlm
+´×Òŧ×=Heb
+ñËÏ×Á=Jas
+
+1. ðÅÔÒÁ=1Pet
+1 ðÅÔÒÁ=1Pet
+1ðÅÔÒÁ=1Pet
+
+2. ðÅÔÒÁ=2Pet
+2 ðÅÔÒÁ=2Pet
+2ðÅÔÒÁ=2Pet
+
+1. ¶×ÁÎÁ=1John
+1 ¶×ÁÎÁ=1John
+1¶×ÁÎÁ=1John
+
+2. ¶×ÁÎÁ=2John
+2 ¶×ÁÎÁ=2John
+2¶×ÁÎÁ=2John
+
+3. ¶×ÁÎÁ=3John
+3 ¶×ÁÎÁ=3John
+3¶×ÁÎÁ=3John
+
+àÄÉ=Jude
+ïÂ'Ñ×ÌÅÎÎÑ=Rev
+
+ÂÕÔ=Gen
+ÂÕÔ.=Gen
+âÕÔ=Gen
+âÕÔ.=Gen
+1í=Gen
+1í.=Gen
+1 í=Gen
+1 í.=Gen
+×ÉÈ=Exod
+×ÉÈ.=Exod
+÷ÉÈ=Exod
+÷ÉÈ.=Exod
+2í=Exod
+2í.=Exod
+2 í=Exod
+2 í.=Exod
+ÌÅ×=Lev
+ÌÅ×.=Lev
+ìÅ×=Lev
+ìÅ×.=Lev
+3í=Lev
+3í.=Lev
+3 í=Lev
+3 í.=Lev
+ÞÉÓ=Num
+ÞÉÓ.=Num
+þÉÓ=Num
+þÉÓ.=Num
+4í=Num
+4í.=Num
+4 í=Num
+4 í.=Num
+ÐÏ×Ô. ÚÁË.=Deut
+ÐÏ×Ô ÚÁË=Deut
+ðÏ×Ô úÁË=Deut
+ðÏ×Ô. úÁË.=Deut
+5í=Deut
+5í.=Deut
+5 í=Deut
+5 í.=Deut
+¦ÓÕÓ ÎÁ×ÉÎ=Josh
+îÁ×ÉÎ=Josh
+ÎÁ×ÉÎ=Josh
+¤ÇÏÛÕ§=Josh
+´ÇÏÛÕ§=Josh
+¤Ç=Josh
+¤Ç.=Josh
+´Ç=Josh
+´Ç.=Josh
+ÓÕÄ=Judg
+ÓÕÄ.=Judg
+óÕÄ=Judg
+óÕÄ.=Judg
+ÒÕÔ=Ruth
+òÕÔ=Ruth
+1ÓÁÍ=1Sam
+1ÓÁÍ.=1Sam
+1 ÓÁÍ=1Sam
+1 ÓÁÍ.=1Sam
+1óÁÍ=1Sam
+1óÁÍ.=1Sam
+1 óÁÍ=1Sam
+1 óÁÍ.=1Sam
+2ÓÁÍ=2Sam
+2ÓÁÍ.=2Sam
+2 ÓÁÍ=2Sam
+2 ÓÁÍ.=2Sam
+2óÁÍ=2Sam
+2óÁÍ.=2Sam
+2 óÁÍ=2Sam
+2 óÁÍ.=2Sam
+1ÃÁÒ=1Kgs
+1ÃÁÒ.=1Kgs
+1 ÃÁÒ=1Kgs
+1 ÃÁÒ.=1Kgs
+1ãÁÒ=1Kgs
+1ãÁÒ.=1Kgs
+1 ãÁÒ=1Kgs
+1 ãÁÒ.=1Kgs
+2ÃÁÒ=2Kgs
+2ÃÁÒ.=2Kgs
+2 ÃÁÒ=2Kgs
+2 ÃÁÒ.=2Kgs
+2ãÁÒ=2Kgs
+2ãÁÒ.=2Kgs
+2 ãÁÒ=2Kgs
+2 ãÁÒ.=2Kgs
+1ÈÒ=1Chr
+1ÈÒ.=1Chr
+1 ÈÒ=1Chr
+1 ÈÒ.=1Chr
+1èÒ=1Chr
+1èÒ.=1Chr
+1 èÒ=1Chr
+1 èÒ.=1Chr
+2ÈÒ=2Chr
+2ÈÒ.=2Chr
+2 ÈÒ=2Chr
+2 ÈÒ.=2Chr
+2èÒ=2Chr
+2èÒ.=2Chr
+2 èÒ=2Chr
+2 èÒ.=2Chr
+ÅÚÄ=Ezra
+ÅÚÄ.=Ezra
+åÚÄ=Ezra
+åÚÄ.=Ezra
+ÎÅÅÍ=Neh
+ÎÅÅÍ.=Neh
+îÅÅÍ=Neh
+îÅÅÍ.=Neh
+ÅÓÔ=Esth
+ÅÓÔ.=Esth
+åÓÔ=Esth
+åÓÔ.=Esth
+ÊÏ×=Job
+êÏ×=Job
+ÐÓ=Ps
+ÐÓ.=Ps
+ðÓ=Ps
+ðÓ.=Ps
+ÐÒ=Prov
+ÐÒ.20
+ðÒ=Prov
+ðÒ.=Prov
+ÐÒÉÐ=Prov
+ÐÒÉÐ.=Prov
+ðÒÉÐ=Prov
+ðÒÉÐ.=Prov
+ÅËÌ=Eccl
+ÅËÌ.=Eccl
+ÅËËÌ=Eccl
+ÅËÌÌ.=Eccl
+åËËÌ=Eccl
+åËËÌ.=Eccl
+åËÌ=Eccl
+åËÌ.=Eccl
+ЦÓÎ=Song
+ЦÓÎ.=Song
+ð¦ÓÎ=Song
+ð¦ÓÎ.=Song
+¦Ó=Isa
+¦Ó.=Isa
+¶Ó=Isa
+¶Ó.=Isa
+¤Ò=Jer
+¤Ò.=Jer
+´Ò=Jer
+´Ò.=Jer
+ÐÌÁÞ=Lam
+ÐÌÁÞ.=Lam
+ðÌÁÞ=Lam
+ðÌÁÞ.=Lam
+¤Ú=Ezek
+¤Ú.=Ezek
+´Ú=Ezek
+´Ú.=Ezek
+ÄÁÎ=Dan
+ÄÁÎ.=Dan
+äÁÎ=Dan
+äÁÎ.=Dan
+ÏÓ=Hos
+ÏÓ.=Hos
+ïÓ=Hos
+ïÓ.=Hos
+ÊϦÌ=Joel
+êϦÌ=Joel
+ÁÍ=Amos
+ÁÍ.=Amos
+áÍ=Amos
+áÍ.=Amos
+Ï×Ä=Obad
+Ï×Ä.=Obad
+ï×Ä=Obad
+ï×Ä.=Obad
+ÊÏÎÁ=Jonah
+êÏÎÁ=Jonah
+ÍÉÈ=Mic
+ÍÉÈ.=Mic
+íÉÈ=Mic
+íÉÈ.=Mic
+ÎÁÕÍ=Nah
+îÁÕÍ=Nah
+Á×=Hab
+Á×.=Hab
+á×=Hab
+á×.=Hab
+ÓÏÆ=Zeph
+ÓÏÆ.=Zeph
+óÏÆ=Zeph
+óÏÆ.=Zeph
+ÏÇ=Hag
+ÏÇ.=Hag
+ïÇ=Hag
+ïÇ.=Hag
+ÚÁÈ=Zech
+ÚÁÈ.=Zech
+úÁÈ=Zech
+úÁÈ.=Zech
+ÍÁÌ=Mal
+ÍÁÌ.=Mal
+íÁÌ=Mal
+íÁÌ.=Mal
+ÍÔ=Matt
+ÍÔ.=Matt
+íÔ=Matt
+íÔ.=Matt
+ÍÒ=Mark
+ÍÒ.=Mark
+íÒ=Mark
+íÒ.=Mark
+ÌË=Luke
+ÌË.=Luke
+ìË=Luke
+ìË.=Luke
+¦×=John
+¦×.=John
+¶×=John
+¶×.=John
+Ħ§=Acts
+䦧=Acts
+ÒÉÍ=Rom
+ÒÉÍ.=Rom
+òÉÍ=Rom
+òÉÍ.=Rom
+1ËÏÒ=1Cor
+1ËÏÒ.=1Cor
+1 ËÏÒ=1Cor
+1 ËÏÒ.=1Cor
+1ëÏÒ=1Cor
+1ëÏÒ.=1Cor
+1 ëÏÒ=1Cor
+1 ëÏÒ.=1Cor
+2ËÏÒ=2Cor
+2ËÏÒ.=2Cor
+2 ËÏÒ=2Cor
+2 ËÏÒ.=2Cor
+2ëÏÒ=2Cor
+2ëÏÒ.=2Cor
+2 ëÏÒ=2Cor
+2 ëÏÒ.=2Cor
+ÇÁÌ=Gal
+ÇÁÌ.=Gal
+çÁÌ=Gal
+çÁÌ.=Gal
+ÅÆ=Eph
+ÅÆ.=Eph
+åÆ=Eph
+åÆ.=Eph
+ÆÉÌ=Phil
+ÆÉÌ.=Phil
+æÉÌ=Phil
+æÉÌ.=Phil
+ËÏÌ=Col
+ËÏÌ.=Col
+ëÏÌ=Col
+ëÏÌ.=Col
+1ÓÏÌ=1Thess
+1ÓÏÌ.=1Thess
+1 ÓÏÌ=1Thess
+1 ÓÏÌ.=1Thess
+1óÏÌ=1Thess
+1óÏÌ.=1Thess
+1 óÏÌ=1Thess
+1 óÏÌ.=1Thess
+2ÓÏÌ=2Thess
+2ÓÏÌ.=2Thess
+2 ÓÏÌ=2Thess
+2 ÓÏÌ.=2Thess
+2óÏÌ=2Thess
+2óÏÌ.=2Thess
+2 óÏÌ=2Thess
+2 óÏÌ.=2Thess
+1ÔÉÍ=1Tim
+1ÔÉÍ.=1Tim
+1 ÔÉÍ=1Tim
+1 ÔÉÍ.=1Tim
+1ôÉÍ=1Tim
+1ôÉÍ.=1Tim
+1 ôÉÍ=1Tim
+1 ôÉÍ.=1Tim
+2ÔÉÍ=2Tim
+2ÔÉÍ.=2Tim
+2 ÔÉÍ=2Tim
+2 ÔÉÍ.=2Tim
+2ôÉÍ=2Tim
+2ôÉÍ.=2Tim
+2 ôÉÍ=2Tim
+2 ôÉÍ.=2Tim
+ÔÉÔ=Titus
+ÔÉÔ.=Titus
+ôÉÔ=Titus
+ôÉÔ.=Titus
+ÆÉÌÉÍ=Phlm
+ÆÉÌÉÍ.=Phlm
+æÉÌÉÍ=Phlm
+æÉÌÉÍ.=Phlm
+¤×Ò=Heb
+¤×Ò.=Heb
+´×Ò=Heb
+´×Ò.=Heb
+ÑË=Jas
+ÑË.=Jas
+ñË=Jas
+ñË.=Jas
+1ÐÅÔÒ=1Pet
+1ÐÅÔÒ.=1Pet
+1 ÐÅÔÒ=1Pet
+1 ÐÅÔÒ.=1Pet
+1ðÅÔÒ=1Pet
+1ðÅÔÒ.=1Pet
+1 ðÅÔÒ=1Pet
+1 ðÅÔÒ.=1Pet
+2ÐÅÔÒ=2Pet
+2ÐÅÔÒ.=2Pet
+2 ÐÅÔÒ=2Pet
+2 ÐÅÔÒ.=2Pet
+2ðÅÔÒ=2Pet
+2ðÅÔÒ.=2Pet
+2 ðÅÔÒ=2Pet
+2 ðÅÔÒ.=2Pet
+1¦×=1John
+1¦×.=1John
+1 ¦×=1John
+1 ¦×.=1John
+1¶×=1John
+1¶×.=1John
+1 ¶×=1John
+1 ¶×.=1John
+2¦×=2John
+2¦×.=2John
+2 ¦×=2John
+2 ¦×.=2John
+2¶×=2John
+2¶×.=2John
+2 ¶×=2John
+2 ¶×.=2John
+3¦×=3John
+3¦×.=3John
+3 ¦×=3John
+3 ¦×.=3John
+3¶×=3John
+3¶×.=3John
+3 ¶×=3John
+3 ¶×.=3John
+ÀÄ=Jude
+ÀÄ.=Jude
+àÄ=Jude
+àÄ.=Jude
+ÏÂ=Rev
+ÏÂ.=Rev
+ïÂ=Rev
+ïÂ.=Rev
diff --git a/locales.d/vi-utf8.conf b/locales.d/vi-utf8.conf
new file mode 100644
index 0000000..3c2c32b
--- /dev/null
+++ b/locales.d/vi-utf8.conf
@@ -0,0 +1,237 @@
+# Vietnamese also known as Tiếng Việt
+# Provided by Daniel Owens
+# 6 May 2009
+
+[Meta]
+Name=vi
+Description=Tiếng Việt
+Encoding=UTF-8
+
+
+[Text]
+
+Genesis=Sáng Thế Ký
+Exodus=Xuất Êdíptô Ký
+Leviticus=Lêvi Ký
+Numbers=Dân Số Ký
+Deuteronomy=Phục Truy�n Luật Lệ Ký
+Joshua=Giôsuê
+Judges=Các Quan Xét
+Ruth=Rutơ
+I Samuel=I Samuên
+II Samuel=II Samuên
+I Kings=I Các Vua
+II Kings=II Các Vua
+I Chronicles=I Sử ký
+II Chronicles=II Sử ký
+Ezra=Exơra
+Nehemiah=Nêhêmi
+Esther=Êxơtê
+Job=Gióp
+Psalms=Thi Thiên
+Proverbs=Châm Ngôn
+Ecclesiastes=Truy�n �ạo
+Song of Solomon=Nhã Ca
+Isaiah=Êsai
+Jeremiah=Giêrêmi
+Lamentations=Ca ThÆ°Æ¡ng
+Ezekiel=Êxêchiên
+Daniel=�aniên
+Hosea=Ôsê
+Joel=Giôên
+Amos=Amốt
+Obadiah=�pđia
+Jonah=Giôna
+Micah=Michê
+Nahum=Nahum
+Habakkuk=Habacúc
+Zephaniah=Sôphôni
+Haggai=Aghê
+Zechariah=Xachari
+Malachi=Malachi
+
+Matthew=Mathiơ
+Mark=Mác
+Luke=Luca
+John=Giăng
+Acts=Công Vụ Các Sứ �ồ
+Romans=Rôma
+I Corinthians=I Côrinhtô
+II Corinthians=II Côrinhtô
+Galatians=Galati
+Ephesians=Êphêsô
+Philippians=Philíp
+Colossians=Côlôse
+I Thessalonians=I Têsalônica
+II Thessalonians=II Têsalônica
+I Timothy=I Timôthê
+II Timothy=II Timôthê
+Titus=Tít
+Philemon=Philêmôn
+Hebrews=Hêbơrơ
+James=Giacơ
+I Peter=I Phierơ
+II Peter=II Phierơ
+I John=I Giăng
+II John=II Giăng
+III John=III Giăng
+Jude=Giuđe
+Revelation of John=Khải Huy�n
+
+
+#Apocr
+
+
+I Esdras=I Esdras
+II Esdras=II Esdras
+Tobit=Tôbia
+Judith=Giuđitha
+Additions to Esther=Phần Bổ Sung Êxơtê
+Esther (Greek)=Êxơtê (Tiếng Hy Lạp)
+Wisdom=Khôn Ngoan
+Sirach=Huấn Ca
+Baruch=Barúc
+Prayer of Azariah=Cầu Nguyện của Axaria
+Susanna=Susanna
+# Bel
+#Bel and the Dragon=
+# PrMan
+#Prayer of Manasses=
+I Maccabees=Macabê Quyển 1
+II Maccabees=Macabê Quyển 2
+III Maccabees=Macabê Quyển 3
+IV Maccabees=Macabê Quyển 4
+Additional Psalm=Thi Thiên 151
+
+
+# These aren't yet included but probably will soon,
+# so if you'd like to get a headstart now, you may but don't
+# complain if the strings change before final release! :)
+
+# Jub
+#Jubilees=
+# SirP
+#Sirach (Prologue)=
+# 1En
+#I Enoch=
+# 1Meq
+#I Meqabyan=
+# 2Meq
+#II Meqabyan=
+# 3Meq
+#III Meqabyan=
+II Baruch=II Barúc
+# 4Bar
+#IV Baruch=
+Daniel (Greek)=�aniên (Tiếng Hy Lạp)
+Additions to Daniel=Phần Bổ Sung �aniên
+# EpJer
+#Epistle of Jeremiah=
+# EpLao
+#Laodiceans=
+# Odes
+#Odes=
+Psalms of Solomon=Thi Thiên của Salômôn
+
+
+[Book Abbrevs]
+
+AGHÊ=Hag
+AM�T=Amos
+�P�IA=Obad
+BARÚC=Bar
+BEL AND THE DRAGON=Bel
+CA THƯƠNG=Lam
+C�C QUAN XÉT=Judg
+CẦU NGUYỆN CỦA AXARIA=PrAzar
+CHÂM NGÔN=Prov
+CÔLÔSE=Col
+CÔNG VỤ C�C SỨ �Ồ=Acts
+DÂN S� K�=Num
+�ANIÊN=Dan
+�ANIÊN (TIẾNG HY LẠP)=DanGr
+ÊPHÊSÔ=Eph
+EPISTLE OF JEREMIAH=EpJer
+ÊSAI=Isa
+ÊXÊCHIÊN=Ezek
+EXÆ RA=Ezra
+ÊXƠTÊ=Esth
+ÊXƠTÊ (TIẾNG HY LẠP)=EsthGr
+GALATI=Gal
+GIACÆ =Jas
+GIÄ‚NG=John
+GIÊRÊMI=Jer
+GIÔÊN=Joel
+GIÔNA=Jonah
+GIÓP=Job
+GIÔSUÊ=Josh
+GIU�E=Jude
+GIU�ITHA=Jdt
+HABACÚC=Hab
+HÊBƠRƠ=Heb
+HUẤN CA=Sir
+I C�C VUA=1Kgs
+I CÔRINHTÔ=1Cor
+I ENOCH=1En
+I ESDRAS=1Esd
+I GIÄ‚NG=1John
+I MEQABYAN=1Meq
+I PHIERÆ =1Pet
+I SAMUÊN=1Sam
+I SỬ K�=1Chr
+I TÊSALÔNICA=1Thess
+I TIMÔTHÊ=1Tim
+II BARÚC=2Bar
+II C�C VUA=2Kgs
+II CÔRINHTÔ=2Cor
+II ESDRAS=2Esd
+II GIÄ‚NG=2John
+II MEQABYAN=2Meq
+II PHIERÆ =2Pet
+II SAMUÊN=2Sam
+II SỬ K�=2Chr
+II TÊSALÔNICA=2Thess
+II TIMÔTHÊ=2Tim
+III GIÄ‚NG=3John
+III MEQABYAN=3Meq
+IV BARÚC=4Bar
+JUBILEES=Jub
+KHẢI HUYỀN=Rev
+KHÔN NGOAN=Wis
+LAODICEANS=EpLao
+LÊVI K�=Lev
+LUCA=Luke
+M�C=Mark
+MACABÊ QUYỂN 1=1Macc
+MACABÊ QUYỂN 2=2Macc
+MACABÊ QUYỂN 3=3Macc
+MACABÊ QUYỂN 4=4Macc
+MALACHI=Mal
+MATHIÆ =Matt
+MICHÊ=Mic
+NAHUM=Nah
+NÊHÊMI=Neh
+NHÃ CA=Song
+ODES=Odes
+ÔSÊ=Hos
+PHẦN BỔ SUNG �ANIÊN=AddDan
+PHẦN BỔ SUNG ÊXƠTÊ=AddEsth
+PHILÊMÔN=Phlm
+PHIL�P=Phil
+PHỤC TRUYỀN LUẬT LỆ K�=Deut
+PRAYER OF MANASSES=PrMan
+RÔMA=Rom
+RUTÆ =Ruth
+S�NG THẾ K�=Gen
+SIRACH (PROLOGUE)=SirP
+SÔPHÔNI=Zeph
+SUSANNA=Sus
+THI THIÊN=Ps
+THI THIÊN 151=AddPs
+THI THIÊN CỦA SALÔMÔN=PssSol
+T�T=Titus
+TÔBIA=Tob
+TRUYỀN �ẠO=Eccl
+XACHARI=Zech
+XUẤT ÊD�PTÔ K�=Exod
+
diff --git a/locales.d/zh_CN-utf8.conf b/locales.d/zh_CN-utf8.conf
new file mode 100644
index 0000000..7ab8d86
--- /dev/null
+++ b/locales.d/zh_CN-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=zh_CN
+Description=中文 (中国等)
+Encoding=UTF-8
+
+[Text]
+Genesis=创世记
+Exodus=出埃�记
+Leviticus=利未记
+Numbers=æ°‘æ•°è®°
+Deuteronomy=申命记
+Joshua=约书亚记
+Judges=士师记
+Ruth=路得记
+I Samuel=撒�耳记上
+II Samuel=撒�耳记下
+I Kings=列王记上
+II Kings=列王记下
+I Chronicles=历代志上
+II Chronicles=历代志下
+Ezra=以斯拉记
+Nehemiah=尼希米记
+Esther=以斯帖记
+Job=约伯记
+Psalms=诗篇
+Proverbs=箴言
+Ecclesiastes=传�书
+Song of Solomon=雅歌
+Isaiah=以賽亚书
+Jeremiah=耶利米书
+Lamentations=耶利米哀歌
+Ezekiel=以西�书
+Daniel=但以�书
+Hosea=何西阿书
+Joel=约�书
+Amos=阿摩�书
+Obadiah=俄巴底亚书
+Jonah=约拿书
+Micah=弥迦书
+Nahum=那鴻书
+Habakkuk=哈巴谷书
+Zephaniah=西番雅书
+Haggai=哈該书
+Zechariah=撒迦利亚书
+Malachi=玛拉基书
+Matthew=马太�音
+Mark=马��音
+Luke=路加�音
+John=约翰�音
+Acts=使徒行传
+Romans=罗马书
+I Corinthians=哥林多�书
+II Corinthians=哥林多�书
+Galatians=加拉太书
+Ephesians=以弗所书
+Philippians=腓立比书
+Colossians=歌罗西书
+I Thessalonians=帖撒罗尼迦�书
+II Thessalonians=帖撒罗尼迦�书
+I Timothy=�摩太�书
+II Timothy=�摩太�书
+Titus=�多书
+Philemon=腓利门书
+Hebrews=希伯來书
+James=雅�书
+I Peter=彼得�书
+II Peter=彼得�书
+I John=约翰一书
+II John=约翰二书
+III John=约翰三书
+Jude=犹大书
+Revelation of John=�示录
+
+[Book Abbrevs]
+
+创世记=Gen
+出埃�记=Exod
+利未记=Lev
+æ°‘æ•°è®°=Num
+申命记=Deut
+约书亚记=Josh
+士师记=Judg
+路得记=Ruth
+撒�耳记上=1Sam
+撒�耳记下=2Sam
+列王记上=1Kgs
+列王记下=2Kgs
+历代志上=1Chr
+历代志下=2Chr
+以斯拉记=Ezra
+尼希米记=Neh
+以斯帖记=Esth
+约伯记=Job
+诗篇=Ps
+箴言=Prov
+传�书=Eccl
+雅歌=Song
+以賽亚书=Isa
+耶利米书=Jer
+耶利米哀歌=Lam
+以西�书=Ezek
+但以�书=Dan
+何西阿书=Hos
+约�书=Joel
+阿摩�书=Amos
+俄巴底亚书=Obad
+约拿书=Jonah
+弥迦书=Mic
+那鴻书=Nah
+哈巴谷书=Hab
+西番雅书=Zeph
+哈該书=Hag
+撒迦利亚书=Zech
+玛拉基书=Mal
+马太�音=Matt
+马��音=Mark
+路加�音=Luke
+约翰�音=John
+使徒行传=Acts
+罗马书=Rom
+哥林多�书=1Cor
+哥林多�书=2Cor
+加拉太书=Gal
+以弗所书=Eph
+腓立比书=Phil
+歌罗西书=Col
+帖撒罗尼迦�书=1Thess
+帖撒罗尼迦�书=2Thess
+�摩太�书=1Tim
+�摩太�书=2Tim
+�多书=Titus
+腓利门书=Phlm
+希伯來书=Heb
+雅�书=Jas
+彼得�书=1Pet
+彼得�书=2Pet
+约翰一书=1John
+约翰二书=2John
+约翰三书=3John
+犹大书=Jude
+�示录=Rev
diff --git a/locales.d/zh_Hans-utf8.conf b/locales.d/zh_Hans-utf8.conf
new file mode 100644
index 0000000..a4c2a12
--- /dev/null
+++ b/locales.d/zh_Hans-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=zh_Hans
+Description=中文 (简体)
+Encoding=UTF-8
+
+[Text]
+Genesis=创世记
+Exodus=出埃�记
+Leviticus=利未记
+Numbers=æ°‘æ•°è®°
+Deuteronomy=申命记
+Joshua=约书亚记
+Judges=士师记
+Ruth=路得记
+I Samuel=撒�耳记上
+II Samuel=撒�耳记下
+I Kings=列王记上
+II Kings=列王记下
+I Chronicles=历代志上
+II Chronicles=历代志下
+Ezra=以斯拉记
+Nehemiah=尼希米记
+Esther=以斯帖记
+Job=约伯记
+Psalms=诗篇
+Proverbs=箴言
+Ecclesiastes=传�书
+Song of Solomon=雅歌
+Isaiah=以賽亚书
+Jeremiah=耶利米书
+Lamentations=耶利米哀歌
+Ezekiel=以西�书
+Daniel=但以�书
+Hosea=何西阿书
+Joel=约�书
+Amos=阿摩�书
+Obadiah=俄巴底亚书
+Jonah=约拿书
+Micah=弥迦书
+Nahum=那鴻书
+Habakkuk=哈巴谷书
+Zephaniah=西番雅书
+Haggai=哈該书
+Zechariah=撒迦利亚书
+Malachi=玛拉基书
+Matthew=马太�音
+Mark=马��音
+Luke=路加�音
+John=约翰�音
+Acts=使徒行传
+Romans=罗马书
+I Corinthians=哥林多�书
+II Corinthians=哥林多�书
+Galatians=加拉太书
+Ephesians=以弗所书
+Philippians=腓立比书
+Colossians=歌罗西书
+I Thessalonians=帖撒罗尼迦�书
+II Thessalonians=帖撒罗尼迦�书
+I Timothy=�摩太�书
+II Timothy=�摩太�书
+Titus=�多书
+Philemon=腓利门书
+Hebrews=希伯來书
+James=雅�书
+I Peter=彼得�书
+II Peter=彼得�书
+I John=约翰一书
+II John=约翰二书
+III John=约翰三书
+Jude=犹大书
+Revelation of John=�示录
+
+[Book Abbrevs]
+
+创世记=Gen
+出埃�记=Exod
+利未记=Lev
+æ°‘æ•°è®°=Num
+申命记=Deut
+约书亚记=Josh
+士师记=Judg
+路得记=Ruth
+撒�耳记上=1Sam
+撒�耳记下=2Sam
+列王记上=1Kgs
+列王记下=2Kgs
+历代志上=1Chr
+历代志下=2Chr
+以斯拉记=Ezra
+尼希米记=Neh
+以斯帖记=Esth
+约伯记=Job
+诗篇=Ps
+箴言=Prov
+传�书=Eccl
+雅歌=Song
+以賽亚书=Isa
+耶利米书=Jer
+耶利米哀歌=Lam
+以西�书=Ezek
+但以�书=Dan
+何西阿书=Hos
+约�书=Joel
+阿摩�书=Amos
+俄巴底亚书=Obad
+约拿书=Jonah
+弥迦书=Mic
+那鴻书=Nah
+哈巴谷书=Hab
+西番雅书=Zeph
+哈該书=Hag
+撒迦利亚书=Zech
+玛拉基书=Mal
+马太�音=Matt
+马��音=Mark
+路加�音=Luke
+约翰�音=John
+使徒行传=Acts
+罗马书=Rom
+哥林多�书=1Cor
+哥林多�书=2Cor
+加拉太书=Gal
+以弗所书=Eph
+腓立比书=Phil
+歌罗西书=Col
+帖撒罗尼迦�书=1Thess
+帖撒罗尼迦�书=2Thess
+�摩太�书=1Tim
+�摩太�书=2Tim
+�多书=Titus
+腓利门书=Phlm
+希伯來书=Heb
+雅�书=Jas
+彼得�书=1Pet
+彼得�书=2Pet
+约翰一书=1John
+约翰二书=2John
+约翰三书=3John
+犹大书=Jude
+�示录=Rev
diff --git a/locales.d/zh_Hant-utf8.conf b/locales.d/zh_Hant-utf8.conf
new file mode 100644
index 0000000..2a961d7
--- /dev/null
+++ b/locales.d/zh_Hant-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=zh_Hant
+Description=中文 (�體)
+Encoding=UTF-8
+
+[Text]
+Genesis=創世紀
+Exodus=出埃�記
+Leviticus=利未記
+Numbers=民數記
+Deuteronomy=申命記
+Joshua=約書亞記
+Judges=士師記
+Ruth=路得記
+I Samuel=撒�耳記上
+II Samuel=撒�耳記下
+I Kings=列王紀上
+II Kings=列王紀下
+I Chronicles=歷代志上
+II Chronicles=歷代志下
+Ezra=以斯拉記
+Nehemiah=尼希米記
+Esther=以斯帖記
+Job=約伯記
+Psalms=詩篇
+Proverbs=箴言
+Ecclesiastes=傳�書
+Song of Solomon=雅歌
+Isaiah=以賽亞書
+Jeremiah=耶利米書
+Lamentations=耶利米哀歌
+Ezekiel=以西�書
+Daniel=但以�書
+Hosea=何西阿書
+Joel=約�書
+Amos=阿摩�書
+Obadiah=俄巴底亞書
+Jonah=約拿書
+Micah=彌迦書
+Nahum=那鴻書
+Habakkuk=哈巴谷書
+Zephaniah=西番雅書
+Haggai=哈該書
+Zechariah=撒迦利亞書
+Malachi=瑪拉基書
+Matthew=馬太�音
+Mark=馬��音
+Luke=路加�音
+John=約翰�音
+Acts=使徒行傳
+Romans=羅馬書
+I Corinthians=哥林多�書
+II Corinthians=哥林多後書
+Galatians=加拉太書
+Ephesians=以弗所書
+Philippians=腓立比書
+Colossians=歌羅西書
+I Thessalonians=帖撒羅尼迦�書
+II Thessalonians=帖撒羅尼迦後書
+I Timothy=�摩太�書
+II Timothy=�摩太後書
+Titus=�多書
+Philemon=腓利門書
+Hebrews=希伯來書
+James=雅�書
+I Peter=彼得�書
+II Peter=彼得後書
+I John=約翰壹書
+II John=約翰貳書
+III John=約翰�書
+Jude=猶大書
+Revelation of John=啟示錄
+
+[Book Abbrevs]
+
+創世紀=Gen
+出埃�記=Exod
+利未記=Lev
+民數記=Num
+申命記=Deut
+約書亞記=Josh
+士師記=Judg
+路得記=Ruth
+撒�耳記上=1Sam
+撒�耳記下=2Sam
+列王紀上=1Kgs
+列王紀下=2Kgs
+歷代志上=1Chr
+歷代志下=2Chr
+以斯拉記=Ezra
+尼希米記=Neh
+以斯帖記=Esth
+約伯記=Job
+詩篇=Ps
+箴言=Prov
+傳�書=Eccl
+雅歌=Song
+以賽亞書=Isa
+耶利米書=Jer
+耶利米哀歌=Lam
+以西�書=Ezek
+但以�書=Dan
+何西阿書=Hos
+約�書=Joel
+阿摩�書=Amos
+俄巴底亞書=Obad
+約拿書=Jonah
+彌迦書=Mic
+那鴻書=Nah
+哈巴谷書=Hab
+西番雅書=Zeph
+哈該書=Hag
+撒迦利亞書=Zech
+瑪拉基書=Mal
+馬太�音=Matt
+馬��音=Mark
+路加�音=Luke
+約翰�音=John
+使徒行傳=Acts
+羅馬書=Rom
+哥林多�書=1Cor
+哥林多後書=2Cor
+加拉太書=Gal
+以弗所書=Eph
+腓立比書=Phil
+歌羅西書=Col
+帖撒羅尼迦�書=1Thess
+帖撒羅尼迦後書=2Thess
+�摩太�書=1Tim
+�摩太後書=2Tim
+�多書=Titus
+腓利門書=Phlm
+希伯來書=Heb
+雅�書=Jas
+彼得�書=1Pet
+彼得後書=2Pet
+約翰壹書=1John
+約翰貳書=2John
+約翰�書=3John
+猶大書=Jude
+啟示錄=Rev
diff --git a/locales.d/zh_TW-utf8.conf b/locales.d/zh_TW-utf8.conf
new file mode 100644
index 0000000..eba9429
--- /dev/null
+++ b/locales.d/zh_TW-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=zh_TW
+Description=中文 (��)
+Encoding=UTF-8
+
+[Text]
+Genesis=創世紀
+Exodus=出埃�記
+Leviticus=利未記
+Numbers=民數記
+Deuteronomy=申命記
+Joshua=約書亞記
+Judges=士師記
+Ruth=路得記
+I Samuel=撒�耳記上
+II Samuel=撒�耳記下
+I Kings=列王紀上
+II Kings=列王紀下
+I Chronicles=歷代志上
+II Chronicles=歷代志下
+Ezra=以斯拉記
+Nehemiah=尼希米記
+Esther=以斯帖記
+Job=約伯記
+Psalms=詩篇
+Proverbs=箴言
+Ecclesiastes=傳�書
+Song of Solomon=雅歌
+Isaiah=以賽亞書
+Jeremiah=耶利米書
+Lamentations=耶利米哀歌
+Ezekiel=以西�書
+Daniel=但以�書
+Hosea=何西阿書
+Joel=約�書
+Amos=阿摩�書
+Obadiah=俄巴底亞書
+Jonah=約拿書
+Micah=彌迦書
+Nahum=那鴻書
+Habakkuk=哈巴谷書
+Zephaniah=西番雅書
+Haggai=哈該書
+Zechariah=撒迦利亞書
+Malachi=瑪拉基書
+Matthew=馬太�音
+Mark=馬��音
+Luke=路加�音
+John=約翰�音
+Acts=使徒行傳
+Romans=羅馬書
+I Corinthians=哥林多�書
+II Corinthians=哥林多後書
+Galatians=加拉太書
+Ephesians=以弗所書
+Philippians=腓立比書
+Colossians=歌羅西書
+I Thessalonians=帖撒羅尼迦�書
+II Thessalonians=帖撒羅尼迦後書
+I Timothy=�摩太�書
+II Timothy=�摩太後書
+Titus=�多書
+Philemon=腓利門書
+Hebrews=希伯來書
+James=雅�書
+I Peter=彼得�書
+II Peter=彼得後書
+I John=約翰壹書
+II John=約翰貳書
+III John=約翰�書
+Jude=猶大書
+Revelation of John=啟示錄
+
+[Book Abbrevs]
+
+創世紀=Gen
+出埃�記=Exod
+利未記=Lev
+民數記=Num
+申命記=Deut
+約書亞記=Josh
+士師記=Judg
+路得記=Ruth
+撒�耳記上=1Sam
+撒�耳記下=2Sam
+列王紀上=1Kgs
+列王紀下=2Kgs
+歷代志上=1Chr
+歷代志下=2Chr
+以斯拉記=Ezra
+尼希米記=Neh
+以斯帖記=Esth
+約伯記=Job
+詩篇=Ps
+箴言=Prov
+傳�書=Eccl
+雅歌=Song
+以賽亞書=Isa
+耶利米書=Jer
+耶利米哀歌=Lam
+以西�書=Ezek
+但以�書=Dan
+何西阿書=Hos
+約�書=Joel
+阿摩�書=Amos
+俄巴底亞書=Obad
+約拿書=Jonah
+彌迦書=Mic
+那鴻書=Nah
+哈巴谷書=Hab
+西番雅書=Zeph
+哈該書=Hag
+撒迦利亞書=Zech
+瑪拉基書=Mal
+馬太�音=Matt
+馬��音=Mark
+路加�音=Luke
+約翰�音=John
+使徒行傳=Acts
+羅馬書=Rom
+哥林多�書=1Cor
+哥林多後書=2Cor
+加拉太書=Gal
+以弗所書=Eph
+腓立比書=Phil
+歌羅西書=Col
+帖撒羅尼迦�書=1Thess
+帖撒羅尼迦後書=2Thess
+�摩太�書=1Tim
+�摩太後書=2Tim
+�多書=Titus
+腓利門書=Phlm
+希伯來書=Heb
+雅�書=Jas
+彼得�書=1Pet
+彼得後書=2Pet
+約翰壹書=1John
+約翰貳書=2John
+約翰�書=3John
+猶大書=Jude
+啟示錄=Rev
diff --git a/locales.d/zh_english-utf8.conf b/locales.d/zh_english-utf8.conf
new file mode 100644
index 0000000..2095f72
--- /dev/null
+++ b/locales.d/zh_english-utf8.conf
@@ -0,0 +1,141 @@
+[Meta]
+Name=zh_English
+Description=中文 (��)
+Encoding=UTF-8
+
+[Text]
+Genesis=創世紀Genesis
+Exodus=出埃�記Exodus
+Leviticus=利未記Leviticus
+Numbers=民數記Numbers
+Deuteronomy=申命記Deuteronomy
+Joshua=約書亞記Joshua
+Judges=士師記Judges
+Ruth=路得記Ruth
+I Samuel=撒�耳記上I Samuel
+II Samuel=撒�耳記下II Samuel
+I Kings=列王紀上I Kings
+II Kings=列王紀下II Kings
+I Chronicles=歷代志上I Chronicles
+II Chronicles=歷代志下II Chronicles
+Ezra=以斯拉記Ezra
+Nehemiah=尼希米記Nehemiah
+Esther=以斯帖記Esther
+Job=約伯記Job
+Psalms=詩篇Psalms
+Proverbs=箴言Proverbs
+Ecclesiastes=傳�書Ecclesiastes
+Song of Solomon=é›…æ­ŒSong of Solomon
+Isaiah=以賽亞書Isaiah
+Jeremiah=耶利米書Jeremiah
+Lamentations=耶利米哀歌Lamentations
+Ezekiel=以西�書Ezekiel
+Daniel=但以�書Daniel
+Hosea=何西阿書Hosea
+Joel=約�書Joel
+Amos=阿摩�書Amos
+Obadiah=俄巴底亞書Obadiah
+Jonah=約拿書Jonah
+Micah=彌迦書Micah
+Nahum=那鴻書Nahum
+Habakkuk=哈巴谷書Habakkuk
+Zephaniah=西番雅書Zephaniah
+Haggai=哈該書Haggai
+Zechariah=撒迦利亞書Zechariah
+Malachi=瑪拉基書Malachi
+Matthew=馬太�音Matthew
+Mark=馬��音Mark
+Luke=路加�音Luke
+John=約翰�音John
+Acts=使徒行傳Acts
+Romans=羅馬書Romans
+I Corinthians=哥林多�書I Corinthians
+II Corinthians=哥林多後書II Corinthians
+Galatians=加拉太書Galatians
+Ephesians=以弗所書Ephesians
+Philippians=腓立比書Philippians
+Colossians=歌羅西書Colossians
+I Thessalonians=帖撒羅尼迦�書I Thessalonians
+II Thessalonians=帖撒羅尼迦後書II Thessalonians
+I Timothy=�摩太�書I Timothy
+II Timothy=�摩太後書II Timothy
+Titus=�多書Titus
+Philemon=腓利門書Philemon
+Hebrews=希伯來書Hebrews
+James=雅�書James
+I Peter=彼得�書I Peter
+II Peter=彼得後書II Peter
+I John=約翰壹書I John
+II John=約翰貳書II John
+III John=約翰�書III John
+Jude=猶大書Jude
+Revelation of John=啟示錄Revelation of John
+
+[Book Abbrevs]
+
+創世紀Genesis=Gen
+出埃�記Exodus=Exod
+利未記Leviticus=Lev
+民數記Numbers=Num
+申命記Deuteronomy=Deut
+約書亞記Joshua=Josh
+士師記Judges=Judg
+路得記Ruth=Ruth
+撒�耳記上I Samuel=1Sam
+撒�耳記下II Samuel=2Sam
+列王紀上I Kings=1Kgs
+列王紀下II Kings=2Kgs
+歷代志上I Chronicles=1Chr
+歷代志下II Chronicles=2Chr
+以斯拉記Ezra=Ezra
+尼希米記Nehemiah=Neh
+以斯帖記Esther=Esth
+約伯記Job=Job
+詩篇Psalms=Ps
+箴言Proverbs=Prov
+傳�書Ecclesiastes=Eccl
+é›…æ­ŒSong of Solomon=Song
+以賽亞書Isaiah=Isa
+耶利米書Jeremiah=Jer
+耶利米哀歌Lamentations=Lam
+以西�書Ezekiel=Ezek
+但以�書Daniel=Dan
+何西阿書Hosea=Hos
+約�書Joel=Joel
+阿摩�書Amos=Amos
+俄巴底亞書Obadiah=Obad
+約拿書Jonah=Jonah
+彌迦書Micah=Mic
+那鴻書Nahum=Nah
+哈巴谷書Habakkuk=Hab
+西番雅書Zephaniah=Zeph
+哈該書Haggai=Hag
+撒迦利亞書Zechariah=Zech
+瑪拉基書Malachi=Mal
+馬太�音Matthew=Matt
+馬��音Mark=Mark
+路加�音Luke=Luke
+約翰�音John=John
+使徒行傳Acts=Acts
+羅馬書Romans=Rom
+哥林多�書I Corinthians=1Cor
+哥林多後書II Corinthians=2Cor
+加拉太書Galatians=Gal
+以弗所書Ephesians=Eph
+腓立比書Philippians=Phil
+歌羅西書Colossians=Col
+帖撒羅尼迦�書I Thessalonians=1Thess
+帖撒羅尼迦後書II Thessalonians=2Thess
+�摩太�書I Timothy=1Tim
+�摩太後書II Timothy=2Tim
+�多書Titus=Titus
+腓利門書Philemon=Phlm
+希伯來書Hebrews=Heb
+雅�書James=Jas
+彼得�書I Peter=1Pet
+彼得後書II Peter=2Pet
+約翰壹書I John=1John
+約翰貳書II John=2John
+約翰�書III John=3John
+猶大書Jude=Jude
+啟示錄Revelation of John=Rev
diff --git a/ltmain.sh b/ltmain.sh
new file mode 100644
index 0000000..63ae69d
--- /dev/null
+++ b/ltmain.sh
@@ -0,0 +1,9655 @@
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool 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, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION=2.4.2
+TIMESTAMP=""
+package_revision=1.3337
+
+# 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+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
+
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
+
+# The name of this program:
+func_dirname_and_basename "$progpath"
+progname=$func_basename_result
+
+# Make sure we have an absolute path for reexecution:
+case $progpath in
+  [\\/]*|[A-Za-z]:\\*) ;;
+  *[\\/]*)
+     progdir=$func_dirname_result
+     progdir=`cd "$progdir" && pwd`
+     progpath="$progdir/$progname"
+     ;;
+  *)
+     save_IFS="$IFS"
+     IFS=${PATH_SEPARATOR-:}
+     for progdir in $PATH; do
+       IFS="$save_IFS"
+       test -x "$progdir/$progname" && break
+     done
+     IFS="$save_IFS"
+     test -n "$progdir" || progdir=`pwd`
+     progpath="$progdir/$progname"
+     ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-`\' parameter expansions in output of double_quote_subst that were
+# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+# in input to double_quote_subst, that '$' was protected from expansion.
+# Since each input `\' is now two `\'s, look for any number of runs of
+# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+bs='\\'
+bs2='\\\\'
+bs4='\\\\\\\\'
+dollar='\$'
+sed_double_backslash="\
+  s/$bs4/&\\
+/g
+  s/^$bs2$dollar/$bs&/
+  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+  s/\n//g"
+
+# Standard options:
+opt_dry_run=false
+opt_help=false
+opt_quiet=false
+opt_verbose=false
+opt_warning=:
+
+# func_echo arg...
+# Echo program name prefixed message, along with the current mode
+# name if it has been set yet.
+func_echo ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
+}
+
+# func_verbose arg...
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+    $opt_verbose && func_echo ${1+"$@"}
+
+    # A bug in bash halts the script if the last line of a function
+    # fails when set -e is in force, so we need another command to
+    # work around that:
+    :
+}
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+# func_error arg...
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
+}
+
+# func_warning arg...
+# Echo program name prefixed warning message to standard error.
+func_warning ()
+{
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+
+    # bash bug again:
+    :
+}
+
+# func_fatal_error arg...
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+    func_error ${1+"$@"}
+    exit $EXIT_FAILURE
+}
+
+# func_fatal_help arg...
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
+{
+    func_error ${1+"$@"}
+    func_fatal_error "$help"
+}
+help="Try \`$progname --help' for more information."  ## default
+
+
+# func_grep expression filename
+# Check whether EXPRESSION matches any line of FILENAME, without output.
+func_grep ()
+{
+    $GREP "$1" "$2" >/dev/null 2>&1
+}
+
+
+# func_mkdir_p directory-path
+# Make sure the entire path to DIRECTORY-PATH is available.
+func_mkdir_p ()
+{
+    my_directory_path="$1"
+    my_dir_list=
+
+    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+
+      # Protect directory names starting with `-'
+      case $my_directory_path in
+        -*) my_directory_path="./$my_directory_path" ;;
+      esac
+
+      # While some portion of DIR does not yet exist...
+      while test ! -d "$my_directory_path"; do
+        # ...make a list in topmost first order.  Use a colon delimited
+	# list incase some portion of path contains whitespace.
+        my_dir_list="$my_directory_path:$my_dir_list"
+
+        # If the last portion added has no slash in it, the list is done
+        case $my_directory_path in */*) ;; *) break ;; esac
+
+        # ...otherwise throw away the child directory and loop
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+      done
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+
+      save_mkdir_p_IFS="$IFS"; IFS=':'
+      for my_dir in $my_dir_list; do
+	IFS="$save_mkdir_p_IFS"
+        # mkdir can fail with a `File exist' error if two processes
+        # try to create one of the directories concurrently.  Don't
+        # stop in that case!
+        $MKDIR "$my_dir" 2>/dev/null || :
+      done
+      IFS="$save_mkdir_p_IFS"
+
+      # Bail out if we (or some other process) failed to create a directory.
+      test -d "$my_directory_path" || \
+        func_fatal_error "Failed to create \`$1'"
+    fi
+}
+
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$opt_dry_run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+        # Failing that, at least try and use $RANDOM to avoid a race
+        my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+        save_mktempdir_umask=`umask`
+        umask 0077
+        $MKDIR "$my_tmpdir"
+        umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || \
+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+    fi
+
+    $ECHO "$my_tmpdir"
+}
+
+
+# func_quote_for_eval arg
+# Aesthetically quote ARG to be evaled later.
+# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+# is double-quoted, suitable for a subsequent eval, whereas
+# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+# which are still active within double quotes backslashified.
+func_quote_for_eval ()
+{
+    case $1 in
+      *[\\\`\"\$]*)
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
+      *)
+        func_quote_for_eval_unquoted_result="$1" ;;
+    esac
+
+    case $func_quote_for_eval_unquoted_result in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and and variable
+      # expansion for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+        ;;
+      *)
+        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+    esac
+}
+
+
+# func_quote_for_expand arg
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+    case $1 in
+      *[\\\`\"]*)
+	my_arg=`$ECHO "$1" | $SED \
+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+      *)
+        my_arg="$1" ;;
+    esac
+
+    case $my_arg in
+      # Double-quote args containing shell metacharacters to delay
+      # word splitting and command substitution for a subsequent eval.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        my_arg="\"$my_arg\""
+        ;;
+    esac
+
+    func_quote_for_expand_result="$my_arg"
+}
+
+
+# func_show_eval cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$my_cmd"
+      my_status=$?
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+
+# func_show_eval_locale cmd [fail_exp]
+# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.  Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+    my_cmd="$1"
+    my_fail_exp="${2-:}"
+
+    ${opt_silent-false} || {
+      func_quote_for_expand "$my_cmd"
+      eval "func_echo $func_quote_for_expand_result"
+    }
+
+    if ${opt_dry_run-false}; then :; else
+      eval "$lt_user_locale
+	    $my_cmd"
+      my_status=$?
+      eval "$lt_safe_locale"
+      if test "$my_status" -eq 0; then :; else
+	eval "(exit $my_status); $my_fail_exp"
+      fi
+    fi
+}
+
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
+
+
+# func_version
+# Echo version message to standard output and exit.
+func_version ()
+{
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
+        s/^# //
+	s/^# *$//
+        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+        p
+     }' < "$progpath"
+     exit $?
+}
+
+# func_usage
+# Echo short help message to standard output and exit.
+func_usage ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
+        s/^# //
+	s/^# *$//
+	s/\$progname/'$progname'/
+	p
+    }' < "$progpath"
+    echo
+    $ECHO "run \`$progname --help | more' for full usage"
+    exit $?
+}
+
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
+func_help ()
+{
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
+        s/^# //
+	s/^# *$//
+	s*\$progname*'$progname'*
+	s*\$host*'"$host"'*
+	s*\$SHELL*'"$SHELL"'*
+	s*\$LTCC*'"$LTCC"'*
+	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+	s*\$LD*'"$LD"'*
+	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	p
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
+}
+
+# func_missing_arg argname
+# Echo program name prefixed message to standard error and set global
+# exit_cmd.
+func_missing_arg ()
+{
+    $opt_debug
+
+    func_error "missing argument for $1."
+    exit_cmd=exit
+}
+
+
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
+
+exit_cmd=:
+
+
+
+
+
+magic="%%%MAGIC variable%%%"
+magic_exe="%%%MAGIC EXE variable%%%"
+
+# Global variables.
+nonopt=
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
+# func_fatal_configuration arg...
+# Echo program name prefixed message to standard error, followed by
+# a configuration failure hint, and exit.
+func_fatal_configuration ()
+{
+    func_error ${1+"$@"}
+    func_error "See the $PACKAGE documentation for more information."
+    func_fatal_error "Fatal configuration error."
+}
+
+
+# func_config
+# Display the configuration for all the tags in this script.
+func_config ()
+{
+    re_begincf='^# ### BEGIN LIBTOOL'
+    re_endcf='^# ### END LIBTOOL'
+
+    # Default configuration.
+    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+    done
+
+    exit $?
+}
+
+# func_features
+# Display the features supported by this script.
+func_features ()
+{
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+
+    exit $?
+}
+
+# func_enable_tag tagname
+# Verify that TAGNAME is valid, and either flag an error and exit, or
+# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+# variable here.
+func_enable_tag ()
+{
+  # Global variable:
+  tagname="$1"
+
+  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+
+  # Validate tagname.
+  case $tagname in
+    *[!-_A-Za-z0-9,/]*)
+      func_fatal_error "invalid tag name: $tagname"
+      ;;
+  esac
+
+  # Don't test for the "default" C tag, as we know it's
+  # there but not specially marked.
+  case $tagname in
+    CC) ;;
+    *)
+      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+	taglist="$taglist $tagname"
+
+	# Evaluate the configuration.  Be careful to quote the path
+	# and the sed script, to avoid splitting on whitespace, but
+	# also don't use non-portable quotes within backquotes within
+	# quotes we have to do it in 2 steps:
+	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+	eval "$extractedcf"
+      else
+	func_error "ignoring unknown tag $tagname"
+      fi
+      ;;
+  esac
+}
+
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
+{
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
+
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
+
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
+    opt="$1"
+    shift
+    case $opt in
+      --debug|-x)	opt_debug='set -x'
+			func_echo "enabling shell trace mode"
+			$opt_debug
+			;;
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
+			;;
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
+			shift
+			;;
+      --preserve-dup-deps)
+			opt_preserve_dup_deps=:
+			;;
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
+			opt_silent=false
+func_append preserve_args " $opt"
+			;;
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
+			shift
+			;;
+
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
+      # Separate optargs to long options:
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
+			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
+    esac
+  done
+
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
+
+  case $host in
+    *cygwin* | *mingw* | *pw32* | *cegcc*)
+      # don't eliminate duplications in $postdeps and $predeps
+      opt_duplicate_compiler_generated_deps=:
+      ;;
+    *)
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+      ;;
+  esac
+
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
+
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
+    fi
+
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
+
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
+
+
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
+
+
+
+
+## ----------- ##
+##    Main.    ##
+## ----------- ##
+
+# func_lalib_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_lalib_p ()
+{
+    test -f "$1" &&
+      $SED -e 4q "$1" 2>/dev/null \
+        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
+# func_lalib_unsafe_p file
+# True iff FILE is a libtool `.la' library or `.lo' object file.
+# This function implements the same check as func_lalib_p without
+# resorting to external programs.  To this end, it redirects stdin and
+# closes it afterwards, without saving the original file descriptor.
+# As a safety measure, use it only where a negative result would be
+# fatal anyway.  Works if `file' does not exist.
+func_lalib_unsafe_p ()
+{
+    lalib_p=no
+    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+	for lalib_p_l in 1 2 3 4
+	do
+	    read lalib_p_line
+	    case "$lalib_p_line" in
+		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+	    esac
+	done
+	exec 0<&5 5<&-
+    fi
+    test "$lalib_p" = yes
+}
+
+# func_ltwrapper_script_p file
+# True iff FILE is a libtool wrapper script
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_script_p ()
+{
+    func_lalib_p "$1"
+}
+
+# func_ltwrapper_executable_p file
+# True iff FILE is a libtool wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_executable_p ()
+{
+    func_ltwrapper_exec_suffix=
+    case $1 in
+    *.exe) ;;
+    *) func_ltwrapper_exec_suffix=.exe ;;
+    esac
+    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+}
+
+# func_ltwrapper_scriptname file
+# Assumes file is an ltwrapper_executable
+# uses $file to determine the appropriate filename for a
+# temporary ltwrapper_script.
+func_ltwrapper_scriptname ()
+{
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+}
+
+# func_ltwrapper_p file
+# True iff FILE is a libtool wrapper script or wrapper executable
+# This function is only a basic sanity check; it will hardly flush out
+# determined imposters.
+func_ltwrapper_p ()
+{
+    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+}
+
+
+# func_execute_cmds commands fail_cmd
+# Execute tilde-delimited COMMANDS.
+# If FAIL_CMD is given, eval that upon failure.
+# FAIL_CMD may read-access the current command in variable CMD!
+func_execute_cmds ()
+{
+    $opt_debug
+    save_ifs=$IFS; IFS='~'
+    for cmd in $1; do
+      IFS=$save_ifs
+      eval cmd=\"$cmd\"
+      func_show_eval "$cmd" "${2-:}"
+    done
+    IFS=$save_ifs
+}
+
+
+# func_source file
+# Source FILE, adding directory component if necessary.
+# Note that it is not necessary on cygwin/mingw to append a dot to
+# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+# `FILE.' does not work on cygwin managed mounts.
+func_source ()
+{
+    $opt_debug
+    case $1 in
+    */* | *\\*)	. "$1" ;;
+    *)		. "./$1" ;;
+    esac
+}
+
+
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    $opt_debug
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	func_append_quoted CC_quoted "$arg"
+      done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	      # Double-quote args containing other shell metacharacters.
+	      func_append_quoted CC_quoted "$arg"
+	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
+	    case "$@ " in
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  func_echo "unable to infer tagged configuration"
+	  func_fatal_error "specify a tag with \`--tag'"
+#	else
+#	  func_verbose "using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+
+# func_write_libtool_object output_name pic_name nonpic_name
+# Create a libtool object file (analogous to a ".la" file),
+# but don't create it if we're doing a dry run.
+func_write_libtool_object ()
+{
+    write_libobj=${1}
+    if test "$build_libtool_libs" = yes; then
+      write_lobj=\'${2}\'
+    else
+      write_lobj=none
+    fi
+
+    if test "$build_old_libs" = yes; then
+      write_oldobj=\'${3}\'
+    else
+      write_oldobj=none
+    fi
+
+    $opt_dry_run || {
+      cat >${write_libobj}T <<EOF
+# $write_libobj - a libtool object file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+pic_object=$write_lobj
+
+# Name of the non-PIC object
+non_pic_object=$write_oldobj
+
+EOF
+      $MV "${write_libobj}T" "${write_libobj}"
+    }
+}
+
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
+# func_mode_compile arg...
+func_mode_compile ()
+{
+    $opt_debug
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+    pie_flag=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  test -n "$libobj" && \
+	    func_fatal_error "you cannot specify \`-o' more than once"
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-pie | -fpie | -fPIE)
+          func_append pie_flag " $arg"
+	  continue
+	  ;;
+
+	-shared | -static | -prefer-pic | -prefer-non-pic)
+	  func_append later " $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  func_stripname '-Wc,' '' "$arg"
+	  args=$func_stripname_result
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+	  for arg in $args; do
+	    IFS="$save_ifs"
+	    func_append_quoted lastarg "$arg"
+	  done
+	  IFS="$save_ifs"
+	  func_stripname ' ' '' "$lastarg"
+	  lastarg=$func_stripname_result
+
+	  # Add the arguments to base_compile.
+	  func_append base_compile " $lastarg"
+	  continue
+	  ;;
+
+	*)
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      func_append_quoted base_compile "$lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      func_fatal_error "you must specify an argument for -Xcompile"
+      ;;
+    target)
+      func_fatal_error "you must specify a target with \`-o'"
+      ;;
+    *)
+      # Get the name of the library object.
+      test -z "$libobj" && {
+	func_basename "$srcfile"
+	libobj="$func_basename_result"
+      }
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    case $libobj in
+    *.[cCFSifmso] | \
+    *.ada | *.adb | *.ads | *.asm | \
+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+      func_xform "$libobj"
+      libobj=$func_xform_result
+      ;;
+    esac
+
+    case $libobj in
+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+    *)
+      func_fatal_error "cannot determine name of library object from \`$libobj'"
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	continue
+	;;
+
+      -static)
+	build_libtool_libs=no
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    func_quote_for_eval "$libobj"
+    test "X$libobj" != "X$func_quote_for_eval_result" \
+      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+    func_dirname_and_basename "$obj" "/" ""
+    objname="$func_basename_result"
+    xdir="$func_dirname_result"
+    lobj=${xdir}$objdir/$objname
+
+    test -z "$base_compile" && \
+      func_fatal_help "you must specify a compilation command"
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2* | cegcc*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$ECHO "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+      func_append removelist " $output_obj"
+      $ECHO "$srcfile" > "$lockfile"
+    fi
+
+    $opt_dry_run || $RM $removelist
+    func_append removelist " $lockfile"
+    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
+    func_quote_for_eval "$srcfile"
+    qsrcfile=$func_quote_for_eval_result
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      func_mkdir_p "$xdir$objdir"
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	func_append command " -o $lobj"
+      fi
+
+      func_show_eval_locale "$command"	\
+          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	func_show_eval '$MV "$output_obj" "$lobj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+	suppress_output=' >/dev/null 2>&1'
+      fi
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile$pie_flag"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	func_append command " -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      func_append command "$suppress_output"
+      func_show_eval_locale "$command" \
+        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$ECHO "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$opt_dry_run || $RM $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	func_show_eval '$MV "$output_obj" "$obj"' \
+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+      fi
+    fi
+
+    $opt_dry_run || {
+      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+
+      # Unlock the critical section if it was locked
+      if test "$need_locks" != no; then
+	removelist=$lockfile
+        $RM "$lockfile"
+      fi
+    }
+
+    exit $EXIT_SUCCESS
+}
+
+$opt_help || {
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+}
+
+func_mode_help ()
+{
+    # We need to display help for each of the modes.
+    case $opt_mode in
+      "")
+        # Generic help is extracted from the usage comments
+        # at the start of this file.
+        func_help
+        ;;
+
+      clean)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      compile)
+      $ECHO \
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -no-suppress      do not suppress compiler output for multiple passes
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
+  -shared           do not build a \`.o' file suitable for static linking
+  -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+        ;;
+
+      execute)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+        ;;
+
+      finish)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+        ;;
+
+      install)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The following components of INSTALL-COMMAND are treated specially:
+
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+        ;;
+
+      link)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+                    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+                    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -shared           only do dynamic linking of libtool libraries
+  -shrext SUFFIX    override the standard shared library file extension
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+                    specify library version info [each variable defaults to 0]
+  -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+        ;;
+
+      uninstall)
+        $ECHO \
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+        ;;
+
+      *)
+        func_fatal_help "invalid operation mode \`$opt_mode'"
+        ;;
+    esac
+
+    echo
+    $ECHO "Try \`$progname --help' for more information about other modes."
+}
+
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
+
+
+# func_mode_execute arg...
+func_mode_execute ()
+{
+    $opt_debug
+    # The first argument is the command name.
+    cmd="$nonopt"
+    test -z "$cmd" && \
+      func_fatal_help "you must specify a COMMAND"
+
+    # Handle -dlopen flags immediately.
+    for file in $opt_dlopen; do
+      test -f "$file" \
+	|| func_fatal_help "\`$file' is not a file"
+
+      dir=
+      case $file in
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+	func_source "$file"
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && \
+	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  func_append dir "/$objdir"
+	else
+	  if test ! -f "$dir/$dlname"; then
+	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+	  fi
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	func_dirname "$file" "" "."
+	dir="$func_dirname_result"
+	;;
+
+      *)
+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -* | *.la | *.lo ) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if func_ltwrapper_script_p "$file"; then
+	  func_source "$file"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	elif func_ltwrapper_executable_p "$file"; then
+	  func_ltwrapper_scriptname "$file"
+	  func_source "$func_ltwrapper_scriptname_result"
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      func_append_quoted args "$file"
+    done
+
+    if test "X$opt_dry_run" = Xfalse; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+                $lt_var=\$save_$lt_var; export $lt_var
+	      else
+		$lt_unset $lt_var
+	      fi"
+      done
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+	echo "export $shlibpath_var"
+      fi
+      $ECHO "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
+
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
+
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+'"$cmd"'"'
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    $opt_silent && exit $EXIT_SUCCESS
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
+
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
+
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
+    exit $EXIT_SUCCESS
+}
+
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+
+
+# func_mode_install arg...
+func_mode_install ()
+{
+    $opt_debug
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       case $nonopt in *shtool*) :;; *) false;; esac; then
+      # Aesthetically quote it.
+      func_quote_for_eval "$nonopt"
+      install_prog="$func_quote_for_eval_result "
+      arg=$1
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    func_quote_for_eval "$arg"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    no_mode=:
+    for arg
+    do
+      arg2=
+      if test -n "$dest"; then
+	func_append files " $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f)
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
+	;;
+      -g | -m | -o)
+	prev=$arg
+	;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      func_quote_for_eval "$arg"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
+    done
+
+    test -z "$install_prog" && \
+      func_fatal_help "you must specify an install program"
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prev' option requires an argument"
+
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	func_fatal_help "no file or destination specified"
+      else
+	func_fatal_help "you must specify a destination"
+      fi
+    fi
+
+    # Strip any trailing slash from the destination.
+    func_stripname '' '/' "$dest"
+    dest=$func_stripname_result
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      func_dirname_and_basename "$dest" "" "."
+      destdir="$func_dirname_result"
+      destname="$func_basename_result"
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files; shift
+      test "$#" -gt 1 && \
+	func_fatal_help "\`$dest' is not a directory"
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  func_fatal_help "\`$destdir' must be an absolute directory name"
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	func_append staticlibs " $file"
+	;;
+
+      *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$file" \
+	  || func_fatal_help "\`$file' is not a valid libtool archive"
+
+	library_names=
+	old_library=
+	relink_command=
+	func_source "$file"
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append current_libdirs " $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) func_append future_libdirs " $libdir" ;;
+	  esac
+	fi
+
+	func_dirname "$file" "/" ""
+	dir="$func_dirname_result"
+	func_append dir "$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  test "$inst_prefix_dir" = "$destdir" && \
+	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  func_warning "relinking \`$file'"
+	  func_show_eval "$relink_command" \
+	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names; shift
+	if test -n "$1"; then
+	  realname="$1"
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
+	      'exit $?'
+	  tstripme="$stripme"
+	  case $host_os in
+	  cygwin* | mingw* | pw32* | cegcc*)
+	    case $realname in
+	    *.dll.a)
+	      tstripme=""
+	      ;;
+	    esac
+	    ;;
+	  esac
+	  if test -n "$tstripme" && test -n "$striplib"; then
+	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      test "$linkname" != "$realname" \
+		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+	fi
+
+	# Install the pseudo-library for information purposes.
+	func_basename "$file"
+	name="$func_basename_result"
+	instname="$dir/$name"i
+	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  func_lo2o "$destfile"
+	  staticdest=$func_lo2o_result
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	test -n "$destfile" && \
+	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  func_lo2o "$file"
+	  staticobj=$func_lo2o_result
+	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  func_basename "$file"
+	  destfile="$func_basename_result"
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      func_stripname '' '.exe' "$file"
+	      file=$func_stripname_result
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin* | *mingw*)
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      wrapper=$func_ltwrapper_scriptname_result
+	    else
+	      func_stripname '' '.exe' "$file"
+	      wrapper=$func_stripname_result
+	    fi
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if func_ltwrapper_script_p "$wrapper"; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  func_source "$wrapper"
+
+	  # Check the variables that should have been set.
+	  test -z "$generated_by_libtool_version" && \
+	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      func_source "$lib"
+	    fi
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      func_warning "\`$lib' has not been installed in \`$libdir'"
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  func_source "$wrapper"
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    $opt_dry_run || {
+	      if test "$finalize" = yes; then
+	        tmpdir=`func_mktempdir`
+		func_basename "$file$stripped_ext"
+		file="$func_basename_result"
+	        outputname="$tmpdir/$file"
+	        # Replace the output file specification.
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
+
+	        $opt_silent || {
+	          func_quote_for_expand "$relink_command"
+		  eval "func_echo $func_quote_for_expand_result"
+	        }
+	        if eval "$relink_command"; then :
+	          else
+		  func_error "error: relink \`$file' with the above command before installing it"
+		  $opt_dry_run || ${RM}r "$tmpdir"
+		  continue
+	        fi
+	        file="$outputname"
+	      else
+	        func_warning "cannot relink \`$file'"
+	      fi
+	    }
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    func_stripname '' '.exe' "$destfile"
+	    destfile=$func_stripname_result
+	    ;;
+	  esac
+	  ;;
+	esac
+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+	$opt_dry_run || if test -n "$outputname"; then
+	  ${RM}r "$tmpdir"
+	fi
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      func_basename "$file"
+      name="$func_basename_result"
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
+
+      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+      fi
+
+      # Do each command in the postinstall commands.
+      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+    done
+
+    test -n "$future_libdirs" && \
+      func_warning "remember to run \`$progname --finish$future_libdirs'"
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+}
+
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
+
+
+# func_generate_dlsyms outputname originator pic_p
+# Extract symbols from dlprefiles and create ${outputname}S.o with
+# a dlpreopen symbol table.
+func_generate_dlsyms ()
+{
+    $opt_debug
+    my_outputname="$1"
+    my_originator="$2"
+    my_pic_p="${3-no}"
+    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+    my_dlsyms=
+
+    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	my_dlsyms="${my_outputname}S.c"
+      else
+	func_error "not configured to extract global symbols from dlpreopened files"
+      fi
+    fi
+
+    if test -n "$my_dlsyms"; then
+      case $my_dlsyms in
+      "") ;;
+      *.c)
+	# Discover the nlist of each of the dlfiles.
+	nlist="$output_objdir/${my_outputname}.nm"
+
+	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+
+	# Parse the name list into a source file.
+	func_verbose "creating $output_objdir/$my_dlsyms"
+
+	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+/* External symbol declarations for the compiler. */\
+"
+
+	if test "$dlself" = yes; then
+	  func_verbose "generating symbol list for \`$output'"
+
+	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+	  # Add our own program objects to the symbol list.
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	  for progfile in $progfiles; do
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -n "$exclude_expsyms"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  if test -n "$export_symbols_regex"; then
+	    $opt_dry_run || {
+	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	    }
+	  fi
+
+	  # Prepare the list of exported symbols
+	  if test -z "$export_symbols"; then
+	    export_symbols="$output_objdir/$outputname.exp"
+	    $opt_dry_run || {
+	      $RM $export_symbols
+	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      case $host in
+	      *cygwin* | *mingw* | *cegcc* )
+                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+	        ;;
+	      esac
+	    }
+	  else
+	    $opt_dry_run || {
+	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval '$MV "$nlist"T "$nlist"'
+	      case $host in
+	        *cygwin* | *mingw* | *cegcc* )
+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+	          ;;
+	      esac
+	    }
+	  fi
+	fi
+
+	for dlprefile in $dlprefiles; do
+	  func_verbose "extracting global C symbols from \`$dlprefile'"
+	  func_basename "$dlprefile"
+	  name="$func_basename_result"
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
+	done
+
+	$opt_dry_run || {
+	  # Make sure we have at least an empty file.
+	  test -f "$nlist" || : > "$nlist"
+
+	  if test -n "$exclude_expsyms"; then
+	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	    $MV "$nlist"T "$nlist"
+	  fi
+
+	  # Try sorting and uniquifying the output.
+	  if $GREP -v "^: " < "$nlist" |
+	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+		sort -k 3
+	      else
+		sort +2
+	      fi |
+	      uniq > "$nlist"S; then
+	    :
+	  else
+	    $GREP -v "^: " < "$nlist" > "$nlist"S
+	  fi
+
+	  if test -f "$nlist"S; then
+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+	  else
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	  fi
+
+	  echo >> "$output_objdir/$my_dlsyms" "\
+
+/* The mapping between symbol names and symbols.  */
+typedef struct {
+  const char *name;
+  void *address;
+} lt_dlsymlist;
+extern LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[];
+LT_DLSYM_CONST lt_dlsymlist
+lt_${my_prefix}_LTX_preloaded_symbols[] =
+{\
+  { \"$my_originator\", (void *) 0 },"
+
+	  case $need_lib_prefix in
+	  no)
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  *)
+	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+	    ;;
+	  esac
+	  echo >> "$output_objdir/$my_dlsyms" "\
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_${my_prefix}_LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	} # !$opt_dry_run
+
+	pic_flag_for_symtable=
+	case "$compile_command " in
+	*" -static "*) ;;
+	*)
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+	  *-*-hpux*)
+	    pic_flag_for_symtable=" $pic_flag"  ;;
+	  *)
+	    if test "X$my_pic_p" != Xno; then
+	      pic_flag_for_symtable=" $pic_flag"
+	    fi
+	    ;;
+	  esac
+	  ;;
+	esac
+	symtab_cflags=
+	for arg in $LTCFLAGS; do
+	  case $arg in
+	  -pie | -fpie | -fPIE) ;;
+	  *) func_append symtab_cflags " $arg" ;;
+	  esac
+	done
+
+	# Now compile the dynamic symbol file.
+	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+
+	# Clean up the generated files.
+	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+
+	# Transform the symbol file into the correct name.
+	symfileobj="$output_objdir/${my_outputname}S.$objext"
+	case $host in
+	*cygwin* | *mingw* | *cegcc* )
+	  if test -f "$output_objdir/$my_outputname.def"; then
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	  else
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  fi
+	  ;;
+	*)
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  ;;
+	esac
+	;;
+      *)
+	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+	;;
+      esac
+    else
+      # We keep going just in case the user didn't refer to
+      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+      # really was required.
+
+      # Nullify the symbol file.
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
+    fi
+}
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
+func_win32_libid ()
+{
+  $opt_debug
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+	$SED -n -e '
+	    1,100{
+		/ I /{
+		    s,.*,import,
+		    p
+		    q
+		}
+	    }'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $ECHO "$win32_libid_type"
+}
+
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    $opt_debug
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+    fi
+}
+
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    $opt_debug
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      func_basename "$my_xlib"
+      my_xlib="$func_basename_result"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  func_arith $extracted_serial + 1
+	  extracted_serial=$func_arith_result
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
+
+      func_mkdir_p "$my_xdir"
+
+      case $host in
+      *-darwin*)
+	func_verbose "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	$opt_dry_run || {
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`basename "$darwin_archive"`
+	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+	  if test -n "$darwin_arches"; then
+	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
+	      $LIPO -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    $RM -rf unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd $darwin_orig_dir
+	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	} # !$opt_dry_run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+	;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
+    done
+
+    func_extract_archives_result="$my_oldobjs"
+}
+
+
+# func_emit_wrapper [arg=no]
+#
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
+
+	$ECHO "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='$sed_quote_subst'
+
+# 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+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='$macro_version'
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$ECHO are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
+"
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
+  done
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
+  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+    # special case for '.'
+    if test \"\$thisdir\" = \".\"; then
+      thisdir=\`pwd\`
+    fi
+    # remove .libs from thisdir
+    case \"\$thisdir\" in
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    $objdir )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $ECHO "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" ||
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $MKDIR \"\$progdir\"
+    else
+      $RM \"\$progdir/\$file\"
+    fi"
+
+	  $ECHO "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$ECHO \"\$relink_command_output\" >&2
+	$RM \"\$progdir/\$file\"
+	exit 1
+      fi
+    fi
+
+    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $RM \"\$progdir/\$program\";
+      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $RM \"\$progdir/\$file\"
+  fi"
+	else
+	  $ECHO "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$ECHO "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $ECHO "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	$ECHO "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+      func_exec_program \${1+\"\$@\"}
+    fi
+  else
+    # The program doesn't exist.
+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+}
+
+
+# func_emit_cwrapperexe_src
+# emit the source code for a wrapper executable on stdout
+# Must ONLY be called from within func_mode_link because
+# it depends on a number of variable set therein.
+func_emit_cwrapperexe_src ()
+{
+	cat <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+*/
+EOF
+	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include <direct.h>
+# include <process.h>
+# include <io.h>
+#else
+# include <unistd.h>
+# include <stdint.h>
+# ifdef __CYGWIN__
+#  include <io.h>
+# endif
+#endif
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef S_IXOTH
+# define S_IXOTH 0
+#endif
+#ifndef S_IXGRP
+# define S_IXGRP 0
+#endif
+
+/* path handling portability macros */
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# define FOPEN_WB "wb"
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#ifndef FOPEN_WB
+# define FOPEN_WB "w"
+#endif
+#ifndef _O_BINARY
+# define _O_BINARY 0
+#endif
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
+#else
+static int lt_debug = 0;
+#endif
+
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
+
+void *xmalloc (size_t num);
+char *xstrdup (const char *string);
+const char *base_name (const char *name);
+char *find_executable (const char *wrapper);
+char *chase_symlinks (const char *pathspec);
+int make_executable (const char *path);
+int check_executable (const char *path);
+char *strendzap (char *str, const char *pat);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
+void lt_setenv (const char *name, const char *value);
+char *lt_extend_str (const char *orig_value, const char *add, int to_end);
+void lt_update_exe_path (const char *name, const char *value);
+void lt_update_lib_path (const char *name, const char *value);
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
+EOF
+
+	    cat <<EOF
+volatile const char * MAGIC_EXE = "$magic_exe";
+const char * LIB_PATH_VARNAME = "$shlibpath_var";
+EOF
+
+	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+              func_to_host_path "$temp_rpath"
+	      cat <<EOF
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * LIB_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test -n "$dllsearchpath"; then
+              func_to_host_path "$dllsearchpath:"
+	      cat <<EOF
+const char * EXE_PATH_VARNAME = "PATH";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
+EOF
+	    else
+	      cat <<"EOF"
+const char * EXE_PATH_VARNAME = "";
+const char * EXE_PATH_VALUE   = "";
+EOF
+	    fi
+
+	    if test "$fast_install" = yes; then
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+EOF
+	    else
+	      cat <<EOF
+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+EOF
+	    fi
+
+
+	    cat <<"EOF"
+
+#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+
+static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int  newargc;
+  char *tmp_pathspec;
+  char *actual_cwrapper_path;
+  char *actual_cwrapper_name;
+  char *target_name;
+  char *lt_argv_zero;
+  intptr_t rval = 127;
+
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  newargz = XMALLOC (char *, argc + 1);
+
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
+  for (i = 1; i < argc; i++)
+    {
+      if (strcmp (argv[i], dumpscript_opt) == 0)
+	{
+EOF
+	    case "$host" in
+	      *mingw* | *cygwin* )
+		# make stdout use "unix" line endings
+		echo "          setmode(1,_O_BINARY);"
+		;;
+	      esac
+
+	    cat <<"EOF"
+	  lt_dump_script (stdout);
+	  return 0;
+	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
+    }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
+  tmp_pathspec = find_executable (argv[0]);
+  if (tmp_pathspec == NULL)
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
+
+  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
+  XFREE (tmp_pathspec);
+
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
+  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+  /* wrapper name transforms */
+  strendzap (actual_cwrapper_name, ".exe");
+  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+  XFREE (actual_cwrapper_name);
+  actual_cwrapper_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  /* target_name transforms -- use actual target program name; might have lt- prefix */
+  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+  strendzap (target_name, ".exe");
+  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+  XFREE (target_name);
+  target_name = tmp_pathspec;
+  tmp_pathspec = 0;
+
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
+EOF
+
+	    cat <<EOF
+  newargz[0] =
+    XMALLOC (char, (strlen (actual_cwrapper_path) +
+		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+  strcpy (newargz[0], actual_cwrapper_path);
+  strcat (newargz[0], "$objdir");
+  strcat (newargz[0], "/");
+EOF
+
+	    cat <<"EOF"
+  /* stop here, and copy so we don't have to do this twice */
+  tmp_pathspec = xstrdup (newargz[0]);
+
+  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+  strcat (newargz[0], actual_cwrapper_name);
+
+  /* DO want the lt- prefix here if it exists, so use target_name */
+  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+  XFREE (tmp_pathspec);
+  tmp_pathspec = NULL;
+EOF
+
+	    case $host_os in
+	      mingw*)
+	    cat <<"EOF"
+  {
+    char* p;
+    while ((p = strchr (newargz[0], '\\')) != NULL)
+      {
+	*p = '/';
+      }
+    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+      {
+	*p = '/';
+      }
+  }
+EOF
+	    ;;
+	    esac
+
+	    cat <<"EOF"
+  XFREE (target_name);
+  XFREE (actual_cwrapper_path);
+  XFREE (actual_cwrapper_name);
+
+  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
+  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
+  for (i = 0; i < newargc; i++)
+    {
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
+    }
+
+EOF
+
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+  /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+  if (rval == -1)
+    {
+      /* failed to start process */
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
+      return 127;
+    }
+  return rval;
+EOF
+		;;
+	      *)
+		cat <<"EOF"
+  execv (lt_argv_zero, newargz);
+  return rval; /* =127, but avoids unused variable warning */
+EOF
+		;;
+	    esac
+
+	    cat <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+  void *p = (void *) malloc (num);
+  if (!p)
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+			  string) : NULL;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable (const char *path)
+{
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+    return 1;
+  else
+    return 0;
+}
+
+int
+make_executable (const char *path)
+{
+  int rval = 0;
+  struct stat st;
+
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
+  if ((!path) || (!*path))
+    return 0;
+
+  if (stat (path, &st) >= 0)
+    {
+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+    }
+  return rval;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise
+   Does not chase symlinks, even on platforms that support them.
+*/
+char *
+find_executable (const char *wrapper)
+{
+  int has_slash = 0;
+  const char *p;
+  const char *p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char *concat_name;
+
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable (concat_name))
+	return concat_name;
+      XFREE (concat_name);
+    }
+  else
+    {
+#endif
+      if (IS_DIR_SEPARATOR (wrapper[0]))
+	{
+	  concat_name = xstrdup (wrapper);
+	  if (check_executable (concat_name))
+	    return concat_name;
+	  XFREE (concat_name);
+	}
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+    }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+      {
+	has_slash = 1;
+	break;
+      }
+  if (!has_slash)
+    {
+      /* no slashes; search PATH */
+      const char *path = getenv ("PATH");
+      if (path != NULL)
+	{
+	  for (p = path; *p; p = p_next)
+	    {
+	      const char *q;
+	      size_t p_len;
+	      for (q = p; *q; q++)
+		if (IS_PATH_SEPARATOR (*q))
+		  break;
+	      p_len = q - p;
+	      p_next = (*q == '\0' ? q : q + 1);
+	      if (p_len == 0)
+		{
+		  /* empty path: current directory */
+		  if (getcwd (tmp, LT_PATHMAX) == NULL)
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
+		  tmp_len = strlen (tmp);
+		  concat_name =
+		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, tmp, tmp_len);
+		  concat_name[tmp_len] = '/';
+		  strcpy (concat_name + tmp_len + 1, wrapper);
+		}
+	      else
+		{
+		  concat_name =
+		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+		  memcpy (concat_name, p, p_len);
+		  concat_name[p_len] = '/';
+		  strcpy (concat_name + p_len + 1, wrapper);
+		}
+	      if (check_executable (concat_name))
+		return concat_name;
+	      XFREE (concat_name);
+	    }
+	}
+      /* not found in PATH; assume curdir */
+    }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
+  tmp_len = strlen (tmp);
+  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable (concat_name))
+    return concat_name;
+  XFREE (concat_name);
+  return NULL;
+}
+
+char *
+chase_symlinks (const char *pathspec)
+{
+#ifndef S_ISLNK
+  return xstrdup (pathspec);
+#else
+  char buf[LT_PATHMAX];
+  struct stat s;
+  char *tmp_pathspec = xstrdup (pathspec);
+  char *p;
+  int has_symlinks = 0;
+  while (strlen (tmp_pathspec) && !has_symlinks)
+    {
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
+      if (lstat (tmp_pathspec, &s) == 0)
+	{
+	  if (S_ISLNK (s.st_mode) != 0)
+	    {
+	      has_symlinks = 1;
+	      break;
+	    }
+
+	  /* search backwards for last DIR_SEPARATOR */
+	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    p--;
+	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+	    {
+	      /* no more DIR_SEPARATORS left */
+	      break;
+	    }
+	  *p = '\0';
+	}
+      else
+	{
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
+	}
+    }
+  XFREE (tmp_pathspec);
+
+  if (!has_symlinks)
+    {
+      return xstrdup (pathspec);
+    }
+
+  tmp_pathspec = realpath (pathspec, buf);
+  if (tmp_pathspec == 0)
+    {
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
+    }
+  return xstrdup (tmp_pathspec);
+#endif
+}
+
+char *
+strendzap (char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert (str != NULL);
+  assert (pat != NULL);
+
+  len = strlen (str);
+  patlen = strlen (pat);
+
+  if (patlen <= len)
+    {
+      str += len - patlen;
+      if (strcmp (str, pat) == 0)
+	*str = '\0';
+    }
+  return str;
+}
+
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
+static void
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
+	       const char *message, va_list ap)
+{
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *file, int line, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
+  va_end (ap);
+}
+
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
+void
+lt_setenv (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
+  {
+#ifdef HAVE_SETENV
+    /* always make a copy, for consistency with !HAVE_SETENV */
+    char *str = xstrdup (value);
+    setenv (name, str, 1);
+#else
+    int len = strlen (name) + 1 + strlen (value) + 1;
+    char *str = XMALLOC (char, len);
+    sprintf (str, "%s=%s", name, value);
+    if (putenv (str) != EXIT_SUCCESS)
+      {
+        XFREE (str);
+      }
+#endif
+  }
+}
+
+char *
+lt_extend_str (const char *orig_value, const char *add, int to_end)
+{
+  char *new_value;
+  if (orig_value && *orig_value)
+    {
+      int orig_value_len = strlen (orig_value);
+      int add_len = strlen (add);
+      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+      if (to_end)
+        {
+          strcpy (new_value, orig_value);
+          strcpy (new_value + orig_value_len, add);
+        }
+      else
+        {
+          strcpy (new_value, add);
+          strcpy (new_value + add_len, orig_value);
+        }
+    }
+  else
+    {
+      new_value = xstrdup (add);
+    }
+  return new_value;
+}
+
+void
+lt_update_exe_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      /* some systems can't cope with a ':'-terminated path #' */
+      int len = strlen (new_value);
+      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+        {
+          new_value[len-1] = '\0';
+        }
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+void
+lt_update_lib_path (const char *name, const char *value)
+{
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
+
+  if (name && *name && value && *value)
+    {
+      char *new_value = lt_extend_str (getenv (name), value, 0);
+      lt_setenv (name, new_value);
+      XFREE (new_value);
+    }
+}
+
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
+
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
+EOF
+}
+# end: func_emit_cwrapperexe_src
+
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
+# func_mode_link arg...
+func_mode_link ()
+{
+    $opt_debug
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args=$nonopt
+    base_compile="$nonopt $@"
+    compile_command=$nonopt
+    finalize_command=$nonopt
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+    new_inherited_linker_flags=
+
+    avoid_version=no
+    bindir=
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+    weak_libs=
+    single_module="${wl}-single_module"
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -shared)
+	test "$build_libtool_libs" != yes && \
+	  func_fatal_configuration "can not build a shared library"
+	build_old_libs=no
+	break
+	;;
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    func_warning "complete static linking is impossible in this configuration"
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	-static)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      func_quote_for_eval "$arg"
+      qarg=$func_quote_for_eval_unquoted_result
+      func_append libtool_args " $func_quote_for_eval_result"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  func_append compile_command " @OUTPUT@"
+	  func_append finalize_command " @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    func_append compile_command " @SYMFILE@"
+	    func_append finalize_command " @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      func_append dlfiles " $arg"
+	    else
+	      func_append dlprefiles " $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  test -f "$arg" \
+	    || func_fatal_error "symbol file \`$arg' does not exist"
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	framework)
+	  case $host in
+	    *-*-darwin*)
+	      case "$deplibs " in
+		*" $qarg.ltframework "*) ;;
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
+		   ;;
+	      esac
+	      ;;
+	  esac
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat "$save_arg"`
+	    do
+#	      func_append moreargs " $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if func_lalib_unsafe_p "$arg"; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		func_source "$arg"
+
+		if test -z "$pic_object" ||
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none &&
+		   test "$non_pic_object" = none; then
+		  func_fatal_error "cannot find name of object for \`$arg'"
+		fi
+
+		# Extract subdirectory from the argument.
+		func_dirname "$arg" "/" ""
+		xdir="$func_dirname_result"
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      func_append dlfiles " $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    func_append dlprefiles " $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  func_append libobjs " $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  func_append non_pic_objects " $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if $opt_dry_run; then
+		  # Extract subdirectory from the argument.
+		  func_dirname "$arg" "/" ""
+		  xdir="$func_dirname_result"
+
+		  func_lo2o "$arg"
+		  pic_object=$xdir$objdir/$func_lo2o_result
+		  non_pic_object=$xdir$func_lo2o_result
+		  func_append libobjs " $pic_object"
+		  func_append non_pic_objects " $non_pic_object"
+	        else
+		  func_fatal_error "\`$arg' is not a valid libtool object"
+		fi
+	      fi
+	    done
+	  else
+	    func_fatal_error "link input file \`$arg' does not exist"
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    func_fatal_error "only absolute run-paths are allowed"
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) func_append rpath " $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) func_append xrpath " $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	shrext)
+	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	weak)
+	  func_append weak_libs " $arg"
+	  prev=
+	  continue
+	  ;;
+	xcclinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xcompiler)
+	  func_append compiler_flags " $qarg"
+	  prev=
+	  func_append compile_command " $qarg"
+	  func_append finalize_command " $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
+	  prev=
+	  func_append compile_command " $wl$qarg"
+	  func_append finalize_command " $wl$qarg"
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  # See comment for -static flag below, for more details.
+	  func_append compile_command " $link_static_flag"
+	  func_append finalize_command " $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework)
+	prev=framework
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  func_append compile_command " $arg"
+	  func_append finalize_command " $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
+	  if test "$#" -gt 0; then
+	    func_fatal_error "require no space between \`-L' and \`$1'"
+	  else
+	    func_fatal_error "need path for \`-L' option"
+	  fi
+	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  test -z "$absdir" && \
+	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
+	*)
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  ::) dllsearchpath=$dir;;
+	  *) func_append dllsearchpath ":$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    func_append deplibs " System.ltframework"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	func_append deplibs " $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      # Darwin uses the -arch flag to determine output architecture.
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	prev=xcompiler
+	continue
+	;;
+
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+	case "$new_inherited_linker_flags " in
+	    *" $arg "*) ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
+	esac
+	continue
+	;;
+
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # and Darwin in order for the loader to find any dlls it needs.
+	  func_warning "\`-no-install' is ignored for $host"
+	  func_warning "assuming \`-no-fast-install' instead"
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	func_stripname '-R' '' "$arg"
+	dir=$func_stripname_result
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
+	*)
+	  func_fatal_error "only absolute run-paths are allowed"
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) func_append xrpath " $dir" ;;
+	esac
+	continue
+	;;
+
+      -shared)
+	# The effects of -shared are defined in a previous loop.
+	continue
+	;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -static | -static-libtool-libs)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -weak)
+        prev=weak
+	continue
+	;;
+
+      -Wc,*)
+	func_stripname '-Wc,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Wl,*)
+	func_stripname '-Wl,' '' "$arg"
+	args=$func_stripname_result
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+          func_quote_for_eval "$flag"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
+	done
+	IFS="$save_ifs"
+	func_stripname ' ' '' "$arg"
+	arg=$func_stripname_result
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # -msg_* for osf cc
+      -msg_*)
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+        func_append compile_command " $arg"
+        func_append finalize_command " $arg"
+        func_append compiler_flags " $arg"
+        continue
+        ;;
+
+      # Some other compiler flag.
+      -* | +*)
+        func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+
+      *.$objext)
+	# A standard object.
+	func_append objs " $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if func_lalib_unsafe_p "$arg"; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  func_source "$arg"
+
+	  if test -z "$pic_object" ||
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none &&
+	     test "$non_pic_object" = none; then
+	    func_fatal_error "cannot find name of object for \`$arg'"
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  func_dirname "$arg" "/" ""
+	  xdir="$func_dirname_result"
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		func_append dlfiles " $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      func_append dlprefiles " $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    func_append libobjs " $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    func_append non_pic_objects " $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if $opt_dry_run; then
+	    # Extract subdirectory from the argument.
+	    func_dirname "$arg" "/" ""
+	    xdir="$func_dirname_result"
+
+	    func_lo2o "$arg"
+	    pic_object=$xdir$objdir/$func_lo2o_result
+	    non_pic_object=$xdir$func_lo2o_result
+	    func_append libobjs " $pic_object"
+	    func_append non_pic_objects " $non_pic_object"
+	  else
+	    func_fatal_error "\`$arg' is not a valid libtool object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	func_resolve_sysroot "$arg"
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  func_append dlfiles " $func_resolve_sysroot_result"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  func_append dlprefiles " $func_resolve_sysroot_result"
+	  prev=
+	else
+	  func_append deplibs " $func_resolve_sysroot_result"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	func_quote_for_eval "$arg"
+	arg="$func_quote_for_eval_result"
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	func_append compile_command " $arg"
+	func_append finalize_command " $arg"
+      fi
+    done # argument parsing loop
+
+    test -n "$prev" && \
+      func_fatal_help "the \`$prevarg' option requires an argument"
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      func_append compile_command " $arg"
+      func_append finalize_command " $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    func_basename "$output"
+    outputname="$func_basename_result"
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    func_dirname "$output" "/" ""
+    output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
+    # Create the object directory.
+    func_mkdir_p "$output_objdir"
+
+    # Determine the type of output
+    case $output in
+    "")
+      func_fatal_help "you must specify an output file"
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if $opt_preserve_dup_deps ; then
+	case "$libs " in
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	esac
+      fi
+      func_append libs " $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if $opt_duplicate_compiler_generated_deps; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
+	  esac
+	  func_append pre_post_deps " $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    notinst_path= # paths that contain not-installed libtool libraries
+
+    case $linkmode in
+    lib)
+	passes="conv dlpreopen link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+
+    for pass in $passes; do
+      # The preopen pass in lib mode reverses $deplibs; put it back here
+      # so that -L comes before libs that need it for instance...
+      if test "$linkmode,$pass" = "lib,link"; then
+	## FIXME: Find the place where the list is rebuilt in the wrong
+	##        order, and fix it there properly
+        tmp_deplibs=
+	for deplib in $deplibs; do
+	  tmp_deplibs="$deplib $tmp_deplibs"
+	done
+	deplibs="$tmp_deplibs"
+      fi
+
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	esac
+      fi
+      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+	# Collect and forward deplibs of preopened libtool libs
+	for lib in $dlprefiles; do
+	  # Ignore non-libtool-libs
+	  dependency_libs=
+	  func_resolve_sysroot "$lib"
+	  case $lib in
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
+	  esac
+
+	  # Collect preopened libtool deplibs, except any this library
+	  # has declared as weak libs
+	  for deplib in $dependency_libs; do
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
+	    case " $weak_libs " in
+	    *" $deplib_base "*) ;;
+	    *) func_append deplibs " $deplib" ;;
+	    esac
+	  done
+	done
+	libs="$dlprefiles"
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    func_append compiler_flags " $deplib"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    func_warning "\`-l' is ignored for archives/objects"
+	    continue
+	  fi
+	  func_stripname '-l' '' "$deplib"
+	  name=$func_stripname_result
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if func_lalib_p "$lib"; then
+		  library_names=
+		  old_library=
+		  func_source "$lib"
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    func_dirname "$lib" "" "."
+		    ladir="$func_dirname_result"
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+		;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	*.ltframework)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    deplibs="$deplib $deplibs"
+	    if test "$linkmode" = lib ; then
+		case "$new_inherited_linker_flags " in
+		    *" $deplib "*) ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
+		esac
+	    fi
+	  fi
+	  continue
+	  ;;
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    func_stripname '-L' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
+	    ;;
+	  *)
+	    func_warning "\`-L' is ignored for archives/objects"
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    func_stripname '-R' '' "$deplib"
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) func_append xrpath " $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    # Linking convenience modules into shared libraries is allowed,
+	    # but linking other static libraries is non-portable.
+	    case " $dlpreconveniencelibs " in
+	    *" $deplib "*) ;;
+	    *)
+	      valid_a_lib=no
+	      case $deplibs_check_method in
+		match_pattern*)
+		  set dummy $deplibs_check_method; shift
+		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		    valid_a_lib=yes
+		  fi
+		;;
+		pass_all)
+		  valid_a_lib=yes
+		;;
+	      esac
+	      if test "$valid_a_lib" != yes; then
+		echo
+		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
+	      else
+		echo
+		$ECHO "*** Warning: Linking the shared library $output against the"
+		$ECHO "*** static library $deplib is not portable!"
+		deplibs="$deplib $deplibs"
+	      fi
+	      ;;
+	    esac
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      func_append newdlprefiles " $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      func_append newdlfiles " $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+	fi
+
+	# Check to see that this really is a libtool archive.
+	func_lalib_unsafe_p "$lib" \
+	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+
+	func_dirname "$lib" "" "."
+	ladir="$func_dirname_result"
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	inherited_linker_flags=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	func_source "$lib"
+
+	# Convert "-framework foo" to "foo.ltframework"
+	if test -n "$inherited_linker_flags"; then
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+	    case " $new_inherited_linker_flags " in
+	      *" $tmp_inherited_linker_flag "*) ;;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
+	    esac
+	  done
+	fi
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      func_fatal_error "cannot find name of link library for \`$lib'"
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    func_fatal_error "\`$lib' is not a convenience library"
+	  fi
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    deplibs="$deplib $deplibs"
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
+	if test -z "$linklib"; then
+	  func_fatal_error "cannot find name of link library for \`$lib'"
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    func_append dlprefiles " $lib $dependency_libs"
+	  else
+	    func_append newdlfiles " $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    func_warning "cannot determine absolute directory name of \`$ladir'"
+	    func_warning "passing it literally to the linker, although it might fail"
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	func_basename "$lib"
+	laname="$func_basename_result"
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    func_warning "library \`$lib' was moved."
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    func_append notinst_path " $abs_ladir"
+	  fi
+	fi # $installed = yes
+	func_stripname 'lib' '.la' "$laname"
+	name=$func_stripname_result
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir" && test "$linkmode" = prog; then
+	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  func_append newlib_search_path " $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) func_stripname '-L' '' "$deplib"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
+		 ;;
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { { test "$prefer_static_libs" = no ||
+	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath:" in
+	      *"$absdir:"*) ;;
+	      *) func_append temp_rpath "$absdir:" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  case $host in
+	  *cygwin* | *mingw* | *cegcc*)
+	      # No point in relinking DLLs because paths are not encoded
+	      func_append notinst_deplibs " $lib"
+	      need_relink=no
+	    ;;
+	  *)
+	    if test "$installed" = no; then
+	      func_append notinst_deplibs " $lib"
+	      need_relink=yes
+	    fi
+	    ;;
+	  esac
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on some
+	  # systems (darwin).  Don't bleat about dlopened modules though!
+	  dlopenmodule=""
+	  for dlpremoduletest in $dlprefiles; do
+	    if test "X$dlpremoduletest" = "X$lib"; then
+	      dlopenmodule="$dlpremoduletest"
+	      break
+	    fi
+	  done
+	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+	    echo
+	    if test "$linkmode" = prog; then
+	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $ECHO "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) func_append compile_rpath " $absdir" ;;
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append finalize_rpath " $libdir" ;;
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    shift
+	    realname="$1"
+	    shift
+	    libname=`eval "\\$ECHO \"$libname_spec\""`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw* | *cegcc*)
+	        func_arith $current - $age
+		major=$func_arith_result
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    func_basename "$soroot"
+	    soname="$func_basename_result"
+	    func_stripname 'lib' '.dll' "$soname"
+	    newlib=libimp-$func_stripname_result.a
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      func_verbose "extracting exported symbol list from \`$soname'"
+	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      func_verbose "generating import library for \`$soname'"
+	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a (non-dlopened) module then we can not
+		    # link against it, someone is ignoring the earlier warnings
+		    if /usr/bin/file -L $add 2> /dev/null |
+			 $GREP ": [^:]* bundle" >/dev/null ; then
+		      if test "X$dlopenmodule" != "X$lib"; then
+			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+			if test -z "$old_library" ; then
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
+			else
+			  add="$dir/$old_library"
+			fi
+		      elif test -n "$old_library"; then
+			add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes &&
+	         test "$hardcode_direct_absolute" = no; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$absdir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      func_fatal_configuration "unsupported hardcode properties"
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes &&
+		 test "$hardcode_minus_L" != yes &&
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes &&
+	       test "$hardcode_direct_absolute" = no; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+		add="$inst_prefix_dir$libdir/$linklib"
+	      else
+		add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    echo
+	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) func_stripname '-R' '' "$libdir"
+	           temp_xrpath=$func_stripname_result
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) func_append xrpath " $temp_xrpath";;
+		   esac;;
+	      *) func_append temp_deplibs " $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  func_append newlib_search_path " $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
+	      case "$tmp_libs " in
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
+	      esac
+	    fi
+	    func_append tmp_libs " $func_resolve_sysroot_result"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      path=
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
+	        func_dirname "$deplib" "" "."
+		dir=$func_dirname_result
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    func_warning "cannot determine absolute directory name of \`$dir'"
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if $GREP "^installed=no" $deplib > /dev/null; then
+		case $host in
+		*-*-darwin*)
+		  depdepl=
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$absdir/$objdir/$depdepl" ; then
+		      depdepl="$absdir/$objdir/$depdepl"
+		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+                      if test -z "$darwin_install_name"; then
+                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+                      fi
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+		      path=
+		    fi
+		  fi
+		  ;;
+		*)
+		  path="-L$absdir/$objdir"
+		  ;;
+		esac
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  test -z "$libdir" && \
+		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+		  test "$absdir" != "$libdir" && \
+		    func_warning "\`$deplib' seems to be moved"
+
+		  path="-L$absdir"
+		fi
+		;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      if test "$pass" = link; then
+	if test "$linkmode" = "prog"; then
+	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+	else
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	fi
+      fi
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) func_append lib_search_path " $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) func_append tmp_libs " $deplib" ;;
+	      esac
+	      ;;
+	    *) func_append tmp_libs " $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  func_append tmp_libs " $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+    fi
+    if test "$linkmode" = prog || test "$linkmode" = lib; then
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for archives"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for archives"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for archives"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info/-version-number' is ignored for archives"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for archives"
+
+      test -n "$export_symbols$export_symbols_regex" && \
+	func_warning "\`-export-symbols' is ignored for archives"
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      func_append objs "$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	func_stripname 'lib' '.la' "$outputname"
+	name=$func_stripname_result
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	test "$module" = no && \
+	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  func_stripname '' '.la' "$outputname"
+	  name=$func_stripname_result
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  func_stripname '' '.la' "$outputname"
+	  libname=$func_stripname_result
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+	else
+	  echo
+	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+	  $ECHO "*** objects $objs is not portable!"
+	  func_append libobjs " $objs"
+	fi
+      fi
+
+      test "$dlself" != no && \
+	func_warning "\`-dlopen self' is ignored for libtool libraries"
+
+      set dummy $rpath
+      shift
+      test "$#" -gt 1 && \
+	func_warning "ignoring multiple \`-rpath's for a libtool library"
+
+      install_libdir="$1"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	test -n "$vinfo" && \
+	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+
+	test -n "$release" && \
+	  func_warning "\`-release' is ignored for convenience libraries"
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	shift
+	IFS="$save_ifs"
+
+	test -n "$7" && \
+	  func_fatal_help "too many parameters to \`-version-info'"
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$1"
+	  number_minor="$2"
+	  number_revision="$3"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
+	  darwin|linux|osf|windows|none)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|qnx|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    func_arith $number_major + $number_minor
+	    current=$func_arith_result
+	    age="$number_minor"
+	    revision="$number_minor"
+	    lt_irix_increment=no
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$1"
+	  revision="$2"
+	  age="$3"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "CURRENT \`$current' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "REVISION \`$revision' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  func_error "AGE \`$age' must be a nonnegative integer"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+	  func_fatal_error "\`$vinfo' is not valid version information"
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  func_arith $current + 1
+	  minor_current=$func_arith_result
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	irix | nonstopux)
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    func_arith $current - $age
+	  else
+	    func_arith $current - $age + 1
+	  fi
+	  major=$func_arith_result
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    func_arith $revision - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux) # correct to gnu/linux during the next big refactor
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    func_arith $current - $loop
+	    iface=$func_arith_result
+	    func_arith $loop - 1
+	    loop=$func_arith_result
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  func_append verstring ":${current}.0"
+	  ;;
+
+	qnx)
+	  major=".$current"
+	  versuffix=".$current"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  func_arith $current - $age
+	  major=$func_arith_result
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  func_fatal_configuration "unknown library version type \`$version_type'"
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    func_warning "undefined symbols not allowed in $host shared libraries"
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+      fi
+
+      func_generate_dlsyms "$libname" "$libname" "yes"
+      func_append libobjs " $symfileobj"
+      test "X$libobjs" = "X " && libobjs=
+
+      if test "$opt_mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$ECHO "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext | *.gcno)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+		 then
+		   continue
+		 fi
+	       fi
+	       func_append removelist " $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	test -n "$removelist" && \
+	  func_show_eval "${RM}r \$removelist"
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	func_append oldlibs " $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      #for path in $notinst_path; do
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
+      #done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) func_append dlfiles " $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) func_append dlprefiles " $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    func_append deplibs " System.ltframework"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      func_append deplibs " -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $opt_dry_run || $RM conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $opt_dry_run || $RM conftest
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    func_append newdeplibs " $i"
+		    i=""
+		    ;;
+		  esac
+		fi
+		if test -n "$i" ; then
+		  libname=`eval "\\$ECHO \"$libname_spec\""`
+		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		  set dummy $deplib_matches; shift
+		  deplib_match=$1
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    func_append newdeplibs " $i"
+		  else
+		    droppeddeps=yes
+		    echo
+		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      case $i in
+	      -l*)
+		func_stripname -l '' "$i"
+		name=$func_stripname_result
+		$opt_dry_run || $RM conftest
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      func_append newdeplibs " $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval "\\$ECHO \"$libname_spec\""`
+		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+		    set dummy $deplib_matches; shift
+		    deplib_match=$1
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      func_append newdeplibs " $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  echo
+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+		;;
+	      *)
+		func_append newdeplibs " $i"
+		;;
+	      esac
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method; shift
+	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null |
+			 $GREP " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+			 $SED -e 10q |
+			 $EGREP "$file_magic_regex" > /dev/null; then
+			func_append newdeplibs " $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method; shift
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    case $a_deplib in
+	    -l*)
+	      func_stripname -l '' "$a_deplib"
+	      name=$func_stripname_result
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  func_append newdeplibs " $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval "\\$ECHO \"$libname_spec\""`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
+		       $EGREP "$match_pattern_regex" > /dev/null; then
+		      func_append newdeplibs " $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	      ;;
+	    *)
+	      # Add a -L argument.
+	      func_append newdeplibs " $a_deplib"
+	      ;;
+	    esac
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+	    done
+	  fi
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	    ;;
+	  esac
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library with the System framework
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+      case $host in
+	*-*-darwin*)
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  ;;
+      esac
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		func_append dep_rpath " $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) func_append perm_rpath " $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      func_append rpath "$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	shift
+	realname="$1"
+	shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  func_append linknames " $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	test "X$libobjs" = "X " && libobjs=
+
+	delfiles=
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+	  export_symbols="$output_objdir/$libname.uexp"
+	  func_append delfiles " $export_symbols"
+	fi
+
+	orig_export_symbols=
+	case $host_os in
+	cygwin* | mingw* | cegcc*)
+	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+	    # exporting using user supplied symfile
+	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+	      # and it's NOT already a .def file. Must figure out
+	      # which of the given symbols are data symbols and tag
+	      # them as such. So, trigger use of export_symbols_cmds.
+	      # export_symbols gets reassigned inside the "prepare
+	      # the list of exported symbols" if statement, so the
+	      # include_expsyms logic still works.
+	      orig_export_symbols="$export_symbols"
+	      export_symbols=
+	      always_export_symbols=yes
+	    fi
+	  fi
+	  ;;
+	esac
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    func_verbose "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $opt_dry_run || $RM $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd1 in $cmds; do
+	      IFS="$save_ifs"
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
+		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
+		skipped_export=false
+	      else
+		# The command line is too long to execute in one step.
+		func_verbose "using reloadable object file for export list..."
+		skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  tmp_export_symbols="$export_symbols"
+	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	fi
+
+	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+	  # The given exports_symbols file has to be filtered, so filter it.
+	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	  # 's' commands which not all seds can handle. GNU sed should be fine
+	  # though. Also, the filter scales superlinearly with the number of
+	  # global variables. join(1) would be nice here, but unfortunately
+	  # isn't a blessed tool.
+	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	  export_symbols=$output_objdir/$libname.def
+	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+	  case " $convenience " in
+	  *" $test_deplib "*) ;;
+	  *)
+	    func_append tmp_deplibs " $test_deplib"
+	    ;;
+	  esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec" &&
+	    test "$compiler_needs_object" = yes &&
+	    test -z "$libobjs"; then
+	    # extract the archives, so we have objects to list.
+	    # TODO: could optimize this to just extract one archive.
+	    whole_archive_flag_spec=
+	  fi
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    func_append generated " $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    func_append libobjs " $func_extract_archives_result"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	fi
+
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  func_append linker_flags " $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    eval test_cmds=\"$archive_expsym_cmds\"
+	    cmds=$archive_expsym_cmds
+	  else
+	    eval test_cmds=\"$archive_cmds\"
+	    cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   func_len " $test_cmds" &&
+	   len=$func_len_result &&
+	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise
+	  # or, if using GNU ld and skipped_export is not :, use a linker
+	  # script.
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  func_basename "$output"
+	  output_la=$func_basename_result
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  last_robj=
+	  k=1
+
+	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+	    output=${output_objdir}/${output_la}.lnkscript
+	    func_verbose "creating GNU ld script: $output"
+	    echo 'INPUT (' > $output
+	    for obj in $save_libobjs
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
+	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+	    output=${output_objdir}/${output_la}.lnk
+	    func_verbose "creating linker input file list: $output"
+	    : > $output
+	    set x $save_libobjs
+	    shift
+	    firstobj=
+	    if test "$compiler_needs_object" = yes; then
+	      firstobj="$1 "
+	      shift
+	    fi
+	    for obj
+	    do
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
+	    done
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
+	  else
+	    if test -n "$save_libobjs"; then
+	      func_verbose "creating reloadable object files..."
+	      output=$output_objdir/$output_la-${k}.$objext
+	      eval test_cmds=\"$reload_cmds\"
+	      func_len " $test_cmds"
+	      len0=$func_len_result
+	      len=$len0
+
+	      # Loop over the list of objects to be linked.
+	      for obj in $save_libobjs
+	      do
+		func_len " $obj"
+		func_arith $len + $func_len_result
+		len=$func_arith_result
+		if test "X$objlist" = X ||
+		   test "$len" -lt "$max_cmd_len"; then
+		  func_append objlist " $obj"
+		else
+		  # The command $test_cmds is almost too long, add a
+		  # command to the queue.
+		  if test "$k" -eq 1 ; then
+		    # The first file doesn't have a previous command to add.
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
+		  else
+		    # All subsequent reloadable object files will link in
+		    # the last one created.
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
+		  fi
+		  last_robj=$output_objdir/$output_la-${k}.$objext
+		  func_arith $k + 1
+		  k=$func_arith_result
+		  output=$output_objdir/$output_la-${k}.$objext
+		  objlist=" $obj"
+		  func_len " $last_robj"
+		  func_arith $len0 + $func_len_result
+		  len=$func_arith_result
+		fi
+	      done
+	      # Handle the remaining objects by creating one last
+	      # reloadable object file.  All subsequent reloadable object
+	      # files will link in the last one created.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+	      if test -n "$last_robj"; then
+	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+	      fi
+	      func_append delfiles " $output"
+
+	    else
+	      output=
+	    fi
+
+	    if ${skipped_export-false}; then
+	      func_verbose "generating symbol list for \`$libname.la'"
+	      export_symbols="$output_objdir/$libname.exp"
+	      $opt_dry_run || $RM $export_symbols
+	      libobjs=$output
+	      # Append the command to create the export file.
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+	      if test -n "$last_robj"; then
+		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+	      fi
+	    fi
+
+	    test -n "$save_libobjs" &&
+	      func_verbose "creating a temporary reloadable object file: $output"
+
+	    # Loop through the commands generated above and execute them.
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $concat_cmds; do
+	      IFS="$save_ifs"
+	      $opt_silent || {
+		  func_quote_for_expand "$cmd"
+		  eval "func_echo $func_quote_for_expand_result"
+	      }
+	      $opt_dry_run || eval "$cmd" || {
+		lt_exit=$?
+
+		# Restore the uninstalled library and exit
+		if test "$opt_mode" = relink; then
+		  ( cd "$output_objdir" && \
+		    $RM "${realname}T" && \
+		    $MV "${realname}U" "$realname" )
+		fi
+
+		exit $lt_exit
+	      }
+	    done
+	    IFS="$save_ifs"
+
+	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+
+          if ${skipped_export-false}; then
+	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	      tmp_export_symbols="$export_symbols"
+	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
+	    fi
+
+	    if test -n "$orig_export_symbols"; then
+	      # The given exports_symbols file has to be filtered, so filter it.
+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+	      # 's' commands which not all seds can handle. GNU sed should be fine
+	      # though. Also, the filter scales superlinearly with the number of
+	      # global variables. join(1) would be nice here, but unfortunately
+	      # isn't a blessed tool.
+	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
+	      export_symbols=$output_objdir/$libname.def
+	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+	    fi
+	  fi
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	    test "X$libobjs" = "X " && libobjs=
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	      cmds=$archive_expsym_cmds
+	    else
+	      cmds=$archive_cmds
+	    fi
+	  fi
+	fi
+
+	if test -n "$delfiles"; then
+	  # Append the command to remove temporary files to $cmds.
+	  eval cmds=\"\$cmds~\$RM $delfiles\"
+	fi
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append libobjs " $func_extract_archives_result"
+	  test "X$libobjs" = "X " && libobjs=
+	fi
+
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $opt_silent || {
+	    func_quote_for_expand "$cmd"
+	    eval "func_echo $func_quote_for_expand_result"
+	  }
+	  $opt_dry_run || eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$opt_mode" = relink; then
+	      ( cd "$output_objdir" && \
+	        $RM "${realname}T" && \
+		$MV "${realname}U" "$realname" )
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$opt_mode" = relink; then
+	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      func_show_eval '${RM}r "$gentop"'
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	func_warning "\`-dlopen' is ignored for objects"
+      fi
+
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+      esac
+
+      test -n "$rpath" && \
+	func_warning "\`-rpath' is ignored for objects"
+
+      test -n "$xrpath" && \
+	func_warning "\`-R' is ignored for objects"
+
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for objects"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for objects"
+
+      case $output in
+      *.lo)
+	test -n "$objs$old_deplibs" && \
+	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+
+	libobj=$output
+	func_lo2o "$libobj"
+	obj=$func_lo2o_result
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $opt_dry_run || $RM $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+	else
+	  gentop="$output_objdir/${obj}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      func_execute_cmds "$reload_cmds" 'exit $?'
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  func_show_eval '${RM}r "$gentop"'
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	func_execute_cmds "$reload_cmds" 'exit $?'
+      fi
+
+      if test -n "$gentop"; then
+	func_show_eval '${RM}r "$gentop"'
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) func_stripname '' '.exe' "$output"
+	          output=$func_stripname_result.exe;;
+      esac
+      test -n "$vinfo" && \
+	func_warning "\`-version-info' is ignored for programs"
+
+      test -n "$release" && \
+	func_warning "\`-release' is ignored for programs"
+
+      test "$preload" = yes \
+        && test "$dlopen_support" = unknown \
+	&& test "$dlopen_self" = unknown \
+	&& test "$dlopen_self_static" = unknown && \
+	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	;;
+      esac
+
+      case $host in
+      *-*-darwin*)
+	# Don't allow lazy linking, it breaks C++ global constructors
+	# But is supposedly fixed on 10.4 or later (yay!).
+	if test "$tagname" = CXX ; then
+	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+	    10.[0123])
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
+	    ;;
+	  esac
+	fi
+	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    func_append new_libs " -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) func_append new_libs " $deplib" ;;
+	  esac
+	  ;;
+	*) func_append new_libs " $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_rpath " $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append perm_rpath " $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  ::) dllsearchpath=$libdir;;
+	  *) func_append dllsearchpath ":$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  ::) dllsearchpath=$testbindir;;
+	  *) func_append dllsearchpath ":$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    func_append rpath " $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+      fi
+
+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+
+      # template prelinking step
+      if test -n "$prelink_cmds"; then
+	func_execute_cmds "$prelink_cmds" 'exit $?'
+      fi
+
+      wrappers_required=yes
+      case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
+      *cygwin* | *mingw* )
+        if test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      *)
+        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+          wrappers_required=no
+        fi
+        ;;
+      esac
+      if test "$wrappers_required" = no; then
+	# Replace the output file specification.
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	exit_status=0
+	func_show_eval "$link_command" 'exit_status=$?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	# Delete the generated files.
+	if test -f "$output_objdir/${outputname}S.${objext}"; then
+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    func_append rpath "$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$opt_dry_run || $RM $output
+	# Link the executable and exit
+	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	func_warning "this platform does not like uninstalled shared libraries"
+	func_warning "\`$output' will be relinked during installation"
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      func_show_eval "$link_command" 'exit $?'
+
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
+      # Now create the wrapper script.
+      func_verbose "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    func_quote_for_eval "$var_value"
+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if not in dry run mode.
+      $opt_dry_run || {
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) func_stripname '' '.exe' "$output"
+	         output=$func_stripname_result ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    func_stripname '' '.exe' "$outputname"
+	    outputname=$func_stripname_result ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+	    func_dirname_and_basename "$output" "" "."
+	    output_name=$func_basename_result
+	    output_path=$func_dirname_result
+	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+	    cwrapper="$output_path/$output_name.exe"
+	    $RM $cwrappersource $cwrapper
+	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_cwrapperexe_src > $cwrappersource
+
+	    # The wrapper executable is built using the $host compiler,
+	    # because it contains $host paths and files. If cross-
+	    # compiling, it, like the target executable, must be
+	    # executed on the $host or under an emulation environment.
+	    $opt_dry_run || {
+	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+	      $STRIP $cwrapper
+	    }
+
+	    # Now, create the wrapper script for func_source use:
+	    func_ltwrapper_scriptname $cwrapper
+	    $RM $func_ltwrapper_scriptname_result
+	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+	    $opt_dry_run || {
+	      # note: this script will not be executed, so do not chmod.
+	      if test "x$build" = "x$host" ; then
+		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+	      else
+		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+	      fi
+	    }
+	  ;;
+	  * )
+	    $RM $output
+	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+
+	    func_emit_wrapper no > $output
+	    chmod +x $output
+	  ;;
+	esac
+      }
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save $symfileobj"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	  if test "$preload" = yes && test -f "$symfileobj"; then
+	    func_append oldobjs " $symfileobj"
+	  fi
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	func_append generated " $gentop"
+
+	func_extract_archives $gentop $addlibs
+	func_append oldobjs " $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	cmds=$old_archive_from_new_cmds
+      else
+
+	# Add any objects from preloaded convenience libraries
+	if test -n "$dlprefiles"; then
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+
+	  func_extract_archives $gentop $dlprefiles
+	  func_append oldobjs " $func_extract_archives_result"
+	fi
+
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      func_basename "$obj"
+	      $ECHO "$func_basename_result"
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  echo "copying selected object files to avoid basename conflicts..."
+	  gentop="$output_objdir/${outputname}x"
+	  func_append generated " $gentop"
+	  func_mkdir_p "$gentop"
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    func_basename "$obj"
+	    objbase="$func_basename_result"
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		func_arith $counter + 1
+		counter=$func_arith_result
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
+	      ;;
+	    *) func_append oldobjs " $obj" ;;
+	    esac
+	  done
+	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
+	eval cmds=\"$old_archive_cmds\"
+
+	func_len " $cmds"
+	len=$func_len_result
+	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  func_verbose "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  eval test_cmds=\"$old_archive_cmds\"
+	  func_len " $test_cmds"
+	  len0=$func_len_result
+	  len=$len0
+	  for obj in $save_oldobjs
+	  do
+	    func_len " $obj"
+	    func_arith $len + $func_len_result
+	    len=$func_arith_result
+	    func_append objlist " $obj"
+	    if test "$len" -lt "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+		RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	      len=$len0
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      func_execute_cmds "$cmds" 'exit $?'
+    done
+
+    test -n "$generated" && \
+      func_show_eval "${RM}r$generated"
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      func_verbose "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  func_quote_for_eval "$var_value"
+	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+      # Only create the output if not a dry run.
+      $opt_dry_run || {
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		func_basename "$deplib"
+		name="$func_basename_result"
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
+		;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+
+	    for lib in $dlfiles; do
+	      case $lib in
+	      *.la)
+	        func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      *) func_append newdlfiles " $lib" ;;
+	      esac
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+	      *.la)
+		# Only pass preopened files to the pseudo-archive (for
+		# eventual linking with the app. that links it) if we
+		# didn't already link the preopened objects directly into
+		# the library:
+		func_basename "$lib"
+		name="$func_basename_result"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+		test -z "$libdir" && \
+		  func_fatal_error "\`$lib' is not a valid libtool archive"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      esac
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlfiles " $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      func_append newdlprefiles " $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $RM $output
+	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
+	  esac
+	  $ECHO > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags='$new_inherited_linker_flags'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Names of additional weak libraries provided by this library
+weak_library_names='$weak_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $ECHO >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      }
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+}
+
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
+    func_mode_link ${1+"$@"}
+
+
+# func_mode_uninstall arg...
+func_mode_uninstall ()
+{
+    $opt_debug
+    RM="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
+      esac
+    done
+
+    test -z "$RM" && \
+      func_fatal_help "you must specify an RM program"
+
+    rmdirs=
+
+    for file in $files; do
+      func_dirname "$file" "" "."
+      dir="$func_dirname_result"
+      if test "X$dir" = X.; then
+	odir="$objdir"
+      else
+	odir="$dir/$objdir"
+      fi
+      func_basename "$file"
+      name="$func_basename_result"
+      test "$opt_mode" = uninstall && odir="$dir"
+
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
+	case " $rmdirs " in
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if { test -L "$file"; } >/dev/null 2>&1 ||
+	 { test -h "$file"; } >/dev/null 2>&1 ||
+	 test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if func_lalib_p "$file"; then
+	  func_source $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    func_append rmfiles " $odir/$n"
+	  done
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
+
+	  case "$opt_mode" in
+	  clean)
+	    case " $library_names " in
+	    *" $dlname "*) ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
+	    esac
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if func_lalib_p "$file"; then
+
+	  # Read the .lo file
+	  func_source $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" &&
+	     test "$pic_object" != none; then
+	    func_append rmfiles " $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" &&
+	     test "$non_pic_object" != none; then
+	    func_append rmfiles " $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$opt_mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    func_stripname '' '.exe' "$file"
+	    file=$func_stripname_result
+	    func_stripname '' '.exe' "$name"
+	    noexename=$func_stripname_result
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    func_append rmfiles " $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if func_ltwrapper_p "$file"; then
+	    if func_ltwrapper_executable_p "$file"; then
+	      func_ltwrapper_scriptname "$file"
+	      relink_command=
+	      func_source $func_ltwrapper_scriptname_result
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
+	    else
+	      relink_command=
+	      func_source $dir/$noexename
+	    fi
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      func_append rmfiles " $odir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      func_append rmfiles " $odir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      func_show_eval "$RM $rmfiles" 'exit_status=1'
+    done
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	func_show_eval "rmdir $dir >/dev/null 2>&1"
+      fi
+    done
+
+    exit $exit_status
+}
+
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
+    func_mode_uninstall ${1+"$@"}
+
+test -z "$opt_mode" && {
+  help="$generic_help"
+  func_fatal_help "you must specify a MODE"
+}
+
+test -z "$exec_cmd" && \
+  func_fatal_help "invalid operation mode \`$opt_mode'"
+
+if test -n "$exec_cmd"; then
+  eval exec "$exec_cmd"
+  exit $EXIT_FAILURE
+fi
+
+exit $exit_status
+
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# vi:sw=2
+
diff --git a/m4/acx_clucene.m4 b/m4/acx_clucene.m4
new file mode 100644
index 0000000..136143c
--- /dev/null
+++ b/m4/acx_clucene.m4
@@ -0,0 +1,88 @@
+dnl CLucene detection m4
+AC_DEFUN([ACX_CLUCENE], [
+AC_LANG_SAVE
+AC_LANG(C++)
+
+
+# Ask user for path to clucene-core stuff:.
+AC_ARG_WITH(clucene,
+	AC_HELP_STRING([ --with-clucene=<path>],
+		[prefix of CLucene-Core installation. e.g. /usr/local or /usr]),,)
+
+AC_MSG_CHECKING([how to include clucene 0.x])
+if test "x$with_clucene" = "xno"; then
+	AC_MSG_RESULT(excluding support)
+else
+#try some default locations
+if test -z "$with_clucene" || test "x$with_clucene" = "xyes"; then
+	#use parent of this directory, and some common library paths
+	with_clucene=$(cd "../" && pwd)
+	with_clucene="$with_clucene /usr /usr/local"
+else
+	#use an absolute path
+	with_clucene=$(cd "$with_clucene" && pwd)
+fi
+clucene_set_failed=
+CLUCENE_CXXFLAGS=
+CLUCENE_LIBS=
+for flag in $with_clucene; do
+	if test -z "$clucene_set_failed"; then
+		if test -e "$flag/include/CLucene.h"; then
+# 64-bit checks first
+			if test -e "$flag/lib64/libclucene.la" || test -e "$flag/lib64/libclucene.so"; then
+				clucene_set_failed=$flag
+				CLUCENE_LIBS="-L$flag/lib64 -lclucene"
+				if test -e "$flag/include/CLucene/clucene-config.h"; then
+					CLUCENE_CXXFLAGS="-I$flag/include"
+				else
+					CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib64"
+				fi
+			else
+# 32-bit checks
+				if test -e "$flag/lib/libclucene.la" || test -e "$flag/lib/libclucene.so"; then
+					clucene_set_failed=$flag
+					CLUCENE_LIBS="-L$flag/lib -lclucene"
+					if test -e "$flag/include/CLucene/clucene-config.h"; then
+						CLUCENE_CXXFLAGS="-I$flag/include"
+					else
+						CLUCENE_CXXFLAGS="-I$flag/include -I$flag/lib"
+					fi
+				fi
+			fi
+		fi
+	fi
+
+	if test -z "$clucene_set_failed"; then
+		if test -e "$flag/src/CLucene/StdHeader.h"; then
+			if test -e "$flag/src/libclucene.la"; then
+				CLUCENE_LIBS="-L$flag/src/ -lclucene"
+				CLUCENE_CXXFLAGS="-I$flag/src/"
+				clucene_set_failed=$flag/src/
+			fi
+		fi
+	fi
+done
+
+if test -z "$clucene_set_failed"; then
+	clucene_set_failed="true"
+        with_clucene="no"
+	AC_MSG_RESULT(excluding support)
+else
+	AC_MSG_RESULT($clucene_set_failed)
+fi
+
+if test "$clucene_set_failed" = "true"; then
+	AC_MSG_WARN([Could not detect clucene location.  To enable clucene, you must
+		call configure with the --with-clucene option specifying the location.
+	    This tells configure where to find the CLucene Core library and headers.
+	    e.g. --with-clucene=/usr/local or --with-clucene=/usr])
+fi
+AC_SUBST(CLUCENE_LIBS)
+AC_SUBST(CLUCENE_CXXFLAGS)
+fi
+
+
+
+AC_LANG_RESTORE
+])dnl ACX_CLUCENE
+
diff --git a/m4/cppunit.m4 b/m4/cppunit.m4
new file mode 100644
index 0000000..0991d51
--- /dev/null
+++ b/m4/cppunit.m4
@@ -0,0 +1,80 @@
+dnl
+dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([AM_PATH_CPPUNIT],
+[
+
+AC_ARG_WITH(cppunit-prefix,[  --with-cppunit-prefix=PFX   Prefix where CppUnit is installed (optional)],
+            cppunit_config_prefix="$withval", cppunit_config_prefix="")
+AC_ARG_WITH(cppunit-exec-prefix,[  --with-cppunit-exec-prefix=PFX  Exec prefix where CppUnit is installed (optional)],
+            cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
+
+  if test x$cppunit_config_exec_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
+     fi
+  fi
+  if test x$cppunit_config_prefix != x ; then
+     cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
+     if test x${CPPUNIT_CONFIG+set} != xset ; then
+        CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
+     fi
+  fi
+
+  AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
+  cppunit_version_min=$1
+
+  AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
+  no_cppunit=""
+  if test "$CPPUNIT_CONFIG" = "no" ; then
+    no_cppunit=yes
+  else
+    CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
+    CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
+    cppunit_version=`$CPPUNIT_CONFIG --version`
+
+    cppunit_major_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    cppunit_minor_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    cppunit_micro_version=`echo $cppunit_version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    cppunit_major_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    cppunit_minor_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    cppunit_micro_min=`echo $cppunit_version_min | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+
+    cppunit_version_proper=`expr \
+        $cppunit_major_version \> $cppunit_major_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \> $cppunit_minor_min \| \
+        $cppunit_major_version \= $cppunit_major_min \& \
+        $cppunit_minor_version \= $cppunit_minor_min \& \
+        $cppunit_micro_version \>= $cppunit_micro_min `
+
+    if test "$cppunit_version_proper" = "1" ; then
+      AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
+    else
+      AC_MSG_RESULT(no)
+      no_cppunit=yes
+    fi
+  fi
+
+  if test "x$no_cppunit" = x ; then
+     ifelse([$2], , :, [$2])     
+  else
+     CPPUNIT_CFLAGS=""
+     CPPUNIT_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+
+  AC_SUBST(CPPUNIT_CFLAGS)
+  AC_SUBST(CPPUNIT_LIBS)
+])
+
+
+
diff --git a/m4/libtool.m4 b/m4/libtool.m4
new file mode 100644
index 0000000..126202f
--- /dev/null
+++ b/m4/libtool.m4
@@ -0,0 +1,7992 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+#   This file is part of GNU Libtool.
+#
+# GNU Libtool 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, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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 General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
+
+# serial 57 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ltmain"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from `configure', and `config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain="$ac_aux_dir/ltmain.sh"
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the `libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to `config.status' so that its
+# declaration there will have the same value as in `configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags="_LT_TAGS"dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into `config.status', and then the shell code to quote escape them in
+# for loops in `config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+\`$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -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
+
+Report bugs to <bug-libtool@gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test $[#] != 0
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try \`$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try \`$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options which allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}" ; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile="${ofile}T"
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+
+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test "X${COLLECT_NAMES+set}" != Xset; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+  _LT_PROG_REPLACE_SHELLFNS
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    TIMESTAMP='$TIMESTAMP'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "${LT_MULTI_MODULE}"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS="$save_LDFLAGS"
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]]*)
+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+  case $cc_basename in
+     ifort*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test "$_lt_dar_can_shared" = "yes"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+    m4_if([$1], [CXX],
+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
+
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE="32"
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE="64"
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out which ABI we are using.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test "$lt_cv_prog_gnu_ld" = yes; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_i386"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVE_CFLAGS"
+  fi
+  ;;
+*-*solaris*)
+  # Find out which ABI we are using.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks="$enable_libtool_lock"
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+])
+
+if test x"[$]$2" = xyes; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring="ABCD"
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8 ; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test $i != 17 # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n $lt_cv_sys_max_cmd_len ; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "$cross_compiling" = yes; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test "x$enable_dlopen" != xyes; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen="load_add_on"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen="LoadLibrary"
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen="dlopen"
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+  # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
+    lt_cv_dlopen="dyld"
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen="shl_load"],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen="dlopen"],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test "x$lt_cv_dlopen" != xno; then
+    enable_dlopen=yes
+  else
+    enable_dlopen=no
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS="$CPPFLAGS"
+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS="$LDFLAGS"
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS="$LIBS"
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test "x$lt_cv_dlopen_self" = xyes; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links="nottested"
+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test "$hard_links" = no; then
+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+  # We can hardcode non-existent directories.
+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+     test "$enable_shared" = no; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP" ; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test "$GCC" = yes; then
+  case $host_os in
+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+    *) lt_awk_arg="/^libraries:/" ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary.
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
+    else
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS=" "; FS="/|\n";} {
+  lt_foo="";
+  lt_count=0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo="/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=".so"
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='${libname}${release}${shared_ext}$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test "$host_cpu" = ia64; then
+    # AIX 5 supports IA64
+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line `#! .'.  This would cause the generated library to
+    # depend on `.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    if test "$aix_use_runtimelinking" = yes; then
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    else
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='${libname}${release}.a $libname.a'
+      soname_spec='${libname}${release}${shared_ext}$major'
+    fi
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='${libname}${shared_ext}'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=".dll"
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+  soname_spec='${libname}${release}${major}$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    if test "X$HPUX_IA64_MODE" = X32; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+    fi
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test "$lt_cv_prog_gnu_ld" = yes; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+    soname_spec='${libname}${release}${shared_ext}$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec="/usr/lib"
+  need_lib_prefix=no
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
+  esac
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    case $host_os in
+      openbsd2.[[89]] | openbsd2.[[89]].*)
+	shlibpath_overrides_runpath=no
+	;;
+      *)
+	shlibpath_overrides_runpath=yes
+	;;
+      esac
+  else
+    shlibpath_overrides_runpath=yes
+  fi
+  ;;
+
+os2*)
+  libname_spec='$name'
+  shrext_cmds=".dll"
+  need_lib_prefix=no
+  library_names_spec='$libname${shared_ext} $libname.a'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=LIBPATH
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='${libname}${release}${shared_ext}$major'
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test "$with_gnu_ld" = yes; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+    soname_spec='$libname${shared_ext}.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=freebsd-elf
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test "$with_gnu_ld" = yes; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+fi
+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
+    [Run-time system search path for libraries])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program which can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD="$MAGIC_CMD"
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$1; then
+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS="$lt_save_ifs"
+  MAGIC_CMD="$lt_save_MAGIC_CMD"
+  ;;
+esac])
+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program which can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test "$withval" = no || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS="$lt_save_ifs"
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break
+	;;
+      *)
+	test "$with_gnu_ld" != yes && break
+	;;
+      esac
+    fi
+  done
+  IFS="$lt_save_ifs"
+else
+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$lt_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# `unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# which responds to the $file_magic_cmd with a given extended regex.
+# If you have `file' or equivalent on your system and you're not sure
+# whether `pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM="$NM"
+else
+  lt_nm_to_check="${ac_tool_prefix}nm"
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS="$lt_save_ifs"
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm="$ac_dir/$lt_tmp_nm"
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+	*/dev/null* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS="$lt_save_ifs"
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test "$lt_cv_path_NM" != "no"; then
+  NM="$lt_cv_path_NM"
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test "$DUMPBIN" != ":"; then
+    NM="$DUMPBIN"
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM="-lm")
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test "$GCC" = yes; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function
+    # and D for any global variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t@_DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS="conftstm.$ac_objext"
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$pipe_works" = yes; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test "$GXX" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test "$host_cpu" = ia64; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    if test "$host_cpu" != ia64; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64 which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd*)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test "$GCC" = yes; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the `-m68020' flag to GCC prevents building anything better,
+            # like `-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test "$host_cpu" = ia64; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      case $cc_basename in
+      # old Intel for x86_64 which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec ;then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms which do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+  # as well as any symbol that contains `d'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='${wl}'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file (1st line
+	# is EXPORTS), use it as is; otherwise, prepend...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	  cp $export_symbols $output_objdir/$soname.def;
+	else
+	  echo EXPORTS > $output_objdir/$soname.def;
+	  cat $export_symbols >> $output_objdir/$soname.def;
+	fi~
+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test "$host_os" = linux-dietlibc; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test "$tmp_diet" = no
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+        if test "x$supports_anon_versioning" = xyes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	    echo "local: *; };" >> $output_objdir/$libname.ver~
+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test "x$supports_anon_versioning" = xyes; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+	      echo "local: *; };" >> $output_objdir/$libname.ver~
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test "$host_cpu" = ia64; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=""
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# need to do runtime linking.
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+      if test "$GCC" = yes; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
+      else
+	# not using gcc
+	if test "$host_cpu" = ia64; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag='${wl}-G'
+	  else
+	    shared_flag='${wl}-bM:SRE'
+	  fi
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test "$aix_use_runtimelinking" = yes; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      else
+	if test "$host_cpu" = ia64; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  # This is similar to how AIX traditionally builds its shared libraries.
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      ;;
+
+    hpux10*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    netbsd*)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	else
+	  case $host_os in
+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	     ;;
+	   *)
+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	     ;;
+	  esac
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+      ;;
+
+    osf3*)
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test "$GCC" = yes; then
+	wlarc='${wl}'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='${wl}'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test "$GCC" = yes; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test "x$host_vendor" = xsequent; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We can NOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test "$GCC" = yes; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test x$host_vendor = xsni; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test "$enable_shared" = yes && test "$GCC" = yes; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC="$CC"
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report which library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test "$can_build_shared" = "no" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test "$enable_shared" = yes && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+      test "$enable_shared" = yes && enable_static=no
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test "$enable_shared" = yes || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC="$lt_save_CC"
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_caught_CXX_error" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test "$GXX" = yes; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test "$GXX" = yes; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test "$with_gnu_ld" = yes; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='${wl}'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test "$host_cpu" = ia64; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=""
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # need to do runtime linking.
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+
+        if test "$GXX" = yes; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`${CC} -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test "$aix_use_runtimelinking" = yes; then
+	    shared_flag="$shared_flag "'${wl}-G'
+	  fi
+        else
+          # not using gcc
+          if test "$host_cpu" = ia64; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test "$aix_use_runtimelinking" = yes; then
+	      shared_flag='${wl}-G'
+	    else
+	      shared_flag='${wl}-bM:SRE'
+	    fi
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+        if test "$aix_use_runtimelinking" = yes; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        else
+          if test "$host_cpu" = ia64; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    # This is similar to how AIX traditionally builds its shared
+	    # libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      gnu*)
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test "$GXX" = yes; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test $with_gnu_ld = no; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test $with_gnu_ld = no; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test "$GXX" = yes; then
+	      if test "$with_gnu_ld" = no; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+		$RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+		rm -rf $tpldir~
+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	    if test "x$supports_anon_versioning" = xyes; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+		echo "local: *; };" >> $output_objdir/$libname.ver~
+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd2*)
+        # C++ shared libraries are fairly broken
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      openbsd*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+	          echo "-hidden">> $lib.exp~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands `-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We can NOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)="$GXX"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test "$_lt_caught_CXX_error" != yes
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case ${prev}${p} in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test $p = "-L" ||
+          test $p = "-R"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test "$pre_test_object_deps_done" = no; then
+	 case ${prev} in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test "$pre_test_object_deps_done" = no; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)="$p"
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+
+linux*)
+  case `$CC -V 2>&1 | sed 5q` in
+  *Sun\ C*)
+    # Sun C++ 5.9
+
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+
+solaris*)
+  case $cc_basename in
+  CC* | sunCC*)
+    # The more standards-conforming stlport4 library is
+    # incompatible with the Cstd library. Avoid specifying
+    # it if it's in CXXFLAGS. Ignore libCrun as
+    # -library=stlport4 depends on it.
+    case " $CXX $CXXFLAGS " in
+    *" -library=stlport4 "*)
+      solaris_use_stlport4=yes
+      ;;
+    esac
+
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    if test "$solaris_use_stlport4" != yes; then
+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
+    fi
+    ;;
+  esac
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_F77" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$G77"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
+fi # test "$_lt_disable_F77" != yes
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test "$_lt_disable_FC" != yes; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC="$CC"
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test "$can_build_shared" = "no" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test "$enable_shared" = yes && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+	  test "$enable_shared" = yes && enable_static=no
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test "$enable_shared" = yes || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
+    _LT_TAGVAR(LD, $1)="$LD"
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test "$_lt_disable_FC" != yes
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code="$lt_simple_compile_test_code"
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f $lt_ac_sed && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test $lt_ac_count -gt 10 && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test $lt_ac_count -gt $lt_ac_max; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
+# Try some XSI features
+xsi_shell=no
+( _lt_dummy="a/b/c"
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
+    && eval 'test $(( 1 + 1 )) -eq 2 \
+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+  && xsi_shell=yes
+AC_MSG_RESULT([$xsi_shell])
+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
+
+AC_MSG_CHECKING([whether the shell understands "+="])
+lt_shell_append=no
+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
+    >/dev/null 2>&1 \
+  && lt_shell_append=yes
+AC_MSG_RESULT([$lt_shell_append])
+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
+
+
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
+
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
+
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
+
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
new file mode 100644
index 0000000..5d9acd8
--- /dev/null
+++ b/m4/ltoptions.m4
@@ -0,0 +1,384 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 7 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option `$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+  		   [_LT_ENABLE_FAST_INSTALL])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the `shared' and
+# `disable-shared' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the `static' and
+# `disable-static' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the `fast-install'
+# and `disable-fast-install' LT_INIT options.
+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for pkg in $enableval; do
+	IFS="$lt_save_ifs"
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the `disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# LT_INIT options.
+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
+    [pic_mode=default])
+
+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the `pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
new file mode 100644
index 0000000..9000a05
--- /dev/null
+++ b/m4/ltsugar.m4
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 6 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59 which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
new file mode 100644
index 0000000..07a8602
--- /dev/null
+++ b/m4/ltversion.m4
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# @configure_input@
+
+# serial 3337 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.2'
+macro_revision='1.3337'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
new file mode 100644
index 0000000..c573da9
--- /dev/null
+++ b/m4/lt~obsolete.m4
@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+# serial 5 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/missing b/missing
new file mode 100755
index 0000000..cdea514
--- /dev/null
+++ b/missing
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2012-06-26.16; # UTC
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# 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, or (at your option)
+# any later version.
+
+# 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 General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'automa4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/obj/Makefile b/obj/Makefile
new file mode 100644
index 0000000..3e531d5
--- /dev/null
+++ b/obj/Makefile
@@ -0,0 +1,8 @@
+
+root := ..
+subdirs :=
+pre-targets := 
+targets := 
+include ${root}/Makefile.cfg
+
+include ${root}/Makefile.post
diff --git a/pix/sword.gif b/pix/sword.gif
new file mode 100644
index 0000000..bb1fa6b
--- /dev/null
+++ b/pix/sword.gif
diff --git a/samples/Makefile.am b/samples/Makefile.am
new file mode 100644
index 0000000..3f64a8f
--- /dev/null
+++ b/samples/Makefile.am
@@ -0,0 +1,33 @@
+EXTRA_DIST += samples/mods.d/globals.conf
+
+modsdatadir = $(pkgdatadir)/mods.d
+
+if INSTCONF
+modsDATA = samples/mods.d/globals.conf
+
+installmodsDATA: $(modsDATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(modsdatadir)
+	@list='$(modsDATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(modsdatadir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(modsdatadir)/$$f; \
+	done
+
+uninstallmodsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(modsDATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(modsdatadir)/$$f"; \
+	  rm -f $(DESTDIR)$(modsdatadir)/$$f; \
+	done
+else
+installmodsDATA: 
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(modsdatadir) \
+	done
+
+uninstallmodsDATA:
+
+endif
diff --git a/samples/mods.d/globals.conf b/samples/mods.d/globals.conf
new file mode 100644
index 0000000..cd98ab2
--- /dev/null
+++ b/samples/mods.d/globals.conf
@@ -0,0 +1,2 @@
+[Globals]
+
diff --git a/samples/recommended/README b/samples/recommended/README
new file mode 100644
index 0000000..95b49ca
--- /dev/null
+++ b/samples/recommended/README
@@ -0,0 +1,24 @@
+In this configuration, a system-wide file is created
+/etc/sword.conf
+which points to the installation of common sword modules located under:
+/usr/share/sword/
+
+To use, as root, copy the sword.conf file located in this directory to /etc
+
+$ su
+Password: ********
+# cp sword.conf /etc
+
+then create a sword repository under /usr/share
+
+# mkdir /usr/share/sword
+
+You may also want to copy the locales directory to your new sword repository
+
+# cp -R ../../locales.d/ /usr/share/sword
+
+then install modules in /usr/share/sword
+
+# cd /usr/share/sword
+# unzip ~/DownloadedSwordModule.zip
+
diff --git a/samples/recommended/sword.conf b/samples/recommended/sword.conf
new file mode 100644
index 0000000..49ea7ee
--- /dev/null
+++ b/samples/recommended/sword.conf
@@ -0,0 +1,2 @@
+[Install]
+DataPath=/usr/share/sword/
diff --git a/scripts/mkswordbase b/scripts/mkswordbase
new file mode 100755
index 0000000..699f223
--- /dev/null
+++ b/scripts/mkswordbase
@@ -0,0 +1,16 @@
+#!/bin/sh
+# This script was used for making loki install swordbase.tar.gz
+# component.  Not likely we'll use this again, but keep around for now.
+cd ..
+make distclean
+./usrinst.sh
+make
+
+echo
+echo Please execute the following commands
+echo su
+echo cd ..
+echo "make install; make distclean; exit"
+echo ./mkswordbase2
+echo
+
diff --git a/scripts/mkswordbase2 b/scripts/mkswordbase2
new file mode 100755
index 0000000..70daef1
--- /dev/null
+++ b/scripts/mkswordbase2
@@ -0,0 +1,44 @@
+#!/bin/sh
+# This script was used for making loki install swordbase.tar.gz
+# component.  Not likely we'll use this again, but keep around for now.
+mkdir /tmp/$$
+cd /tmp/$$
+mkdir etc
+echo [Install] > etc/sword.conf
+echo DataPath=/usr/share/sword >> etc/sword.conf
+echo >> etc/sword.conf
+
+mkdir usr
+mkdir usr/include
+cp -r /usr/include/sword usr/include/sword
+
+mkdir usr/lib
+cp -r /usr/lib/libsword.a /usr/lib/libsword.la usr/lib
+
+mkdir usr/share
+mkdir usr/share/sword
+mkdir usr/share/sword/mods.d
+
+echo [Globals] > usr/share/sword/mods.d/globals.conf
+echo >> usr/share/sword/mods.d/globals.conf
+echo >> usr/share/sword/mods.d/globals.conf
+
+cp -r /usr/share/sword/locales.d usr/share/sword/locales.d
+
+mkdir usr/share/doc
+mkdir usr/share/doc/sword
+
+cd -
+cd ..
+cp -r doc/* /tmp/$$/usr/share/doc/sword/
+cp -r ChangeLog README INSTALL LICENSE examples samples /tmp/$$/usr/share/doc/sword/
+cd -
+cd /tmp/$$
+find . -name CVS -type d -exec rm -rf {} \;
+tar czfv swordbase.tar.gz *
+cd -
+mv /tmp/$$/swordbase.tar.gz ../../
+rm -rf /tmp/$$
+
+cd ../..
+echo swordbase.tar.gz in `pwd`
diff --git a/scripts/mkswordtar b/scripts/mkswordtar
new file mode 100755
index 0000000..a4b3320
--- /dev/null
+++ b/scripts/mkswordtar
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+echo 
+echo "*** Autogening main sword engine build system"
+echo 
+(cd ..;./autogen.sh)
+
+REV=`cd ..;basename \`pwd ..\`|cut -d\- -f2`
+SWORDVER=`grep AC_INIT ../configure.ac|cut -f2 -d' '|cut -f1 -d,`
+
+sed -i "s/^\(PROJECT_NUMBER\).*/\1 = \"$SWORDVER\"/" ../doc/Doxyfile
+sed -i "s/^SET(SWORD_VERSION.*/SET(SWORD_VERSION $SWORDVER)/" ../CMakeLists.txt
+
+if [ "$REV" = "$SWORDVER" ]; then 
+	chmod +x *
+
+	echo 
+	echo "*** Autogening swig bindings build system"
+	echo 
+	cd ../bindings/swig/package; ./autogen.sh; cd ../../..;
+
+	echo 
+	echo "*** Tarring up" sword-$REV.tar.gz
+	echo 
+	cd ..; tar -v -c -p -s -z --exclude sword-$REV/bin --exclude sword-$REV/autom4te.cache --exclude sword-$REV/bindings/swig/package/autom4te.cache -X sword-$REV/distignore -f sword-$REV.tar.gz sword-$REV/*
+
+else
+	echo $"Directory version is $REV, but configure.ac has $SWORDVER"
+	exit 1
+
+fi
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..fc04b62
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,5 @@
+
+root := ..
+
+all:
+	make -C ${root}
diff --git a/src/frontend/Makefile b/src/frontend/Makefile
new file mode 100644
index 0000000..ef8eccd
--- /dev/null
+++ b/src/frontend/Makefile
@@ -0,0 +1,5 @@
+
+root := ../..
+
+all:
+	make -C ${root}
diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
new file mode 100644
index 0000000..df82518
--- /dev/null
+++ b/src/frontend/Makefile.am
@@ -0,0 +1,6 @@
+frontenddir = $(top_srcdir)/src/frontend
+
+libsword_la_SOURCES += $(frontenddir)/swdisp.cpp
+libsword_la_SOURCES += $(frontenddir)/swlog.cpp
+
+
diff --git a/src/frontend/framework/Makefile b/src/frontend/framework/Makefile
new file mode 100644
index 0000000..81f7721
--- /dev/null
+++ b/src/frontend/framework/Makefile
@@ -0,0 +1,4 @@
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/frontend/framework/femain.cpp b/src/frontend/framework/femain.cpp
new file mode 100644
index 0000000..11bf565
--- /dev/null
+++ b/src/frontend/framework/femain.cpp
@@ -0,0 +1,34 @@
+/******************************************************************************
+ *
+ *  femain.cpp -	FEMain class definition
+ *
+ * $Id: femain.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <femain.h>
+
+FEMain::FEMain() {
+}
+
+FEMain::~FEMain() {
+	list <SWDisplay *>::iterator it;
+
+	for (it = displays.begin(); it != displays.end(); ++it)
+		delete *it;
+
+}
diff --git a/src/frontend/im/Makefile b/src/frontend/im/Makefile
new file mode 100644
index 0000000..1a2d00d
--- /dev/null
+++ b/src/frontend/im/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/frontend/im/hebrewmcim.cpp b/src/frontend/im/hebrewmcim.cpp
new file mode 100644
index 0000000..839fcd7
--- /dev/null
+++ b/src/frontend/im/hebrewmcim.cpp
@@ -0,0 +1,666 @@
+/******************************************************************************
+ *
+ *  hebrewmcim.cpp -	HebrewMCIM: Keyboard mapping for Michigan-Claremont
+ *			Hebrew input
+ *
+ * $Id: hebrewmcim.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <hebrewmcim.h>
+
+HebrewMCIM::HebrewMCIM()
+		:SWInputMethod() {
+
+   init();
+}
+
+
+int *HebrewMCIM::translate(char in) {
+	int retVal = 0;
+	static int retString[5];
+	int retStringIndex = 0;
+
+	memset(retString, 0, 5);
+
+	if (getState() > 1) {
+		if (getState() >= 12) { // serious issue with internal structure
+			setState(0);
+			retString[retStringIndex++] = in;
+			return retString;
+		}
+		map<int, int>::iterator find = subst2[getState()].find(in);
+		if (find != subst2[getState()].end())
+			retVal = find->second;
+		else retVal = in;
+
+		setState(0);
+		retString[retStringIndex++] = retVal;
+		return retString;
+	}
+	else {
+		retVal = subst[in];
+
+		if (retVal == 0) {
+			setState(0);
+			retString[retStringIndex++] = in;
+			return retString;
+		}
+		if (retVal > 100) {
+			setState(1);
+			retString[retStringIndex++] = retVal;
+			return retString;
+		}
+		if (retVal == 50) {  // multiChar
+			setState(1);
+			int *chars = multiChars[in];
+			if (chars != 0) {
+				retString[retStringIndex++] = chars[0];
+				retString[retStringIndex++] = chars[1];
+				return retString;
+			}
+		}
+	}
+	setState(retVal);
+	return 0;
+}
+
+
+void HebrewMCIM::init() {
+	memset(subst, 0, 255);
+
+	subst[')'] = 1488;
+	subst['B'] = 1489;
+	subst['G'] = 1490;
+	subst['D'] = 1491;
+	subst['H'] = 1492;
+	subst['W'] = 1493;
+	subst['Z'] = 1494;
+	subst['X'] = 1495;
+	subst['+'] = 1496;
+	subst['Y'] = 1497;
+
+	subst['k'] = 1498;  // finals
+	subst['m'] = 1501;
+	subst['n'] = 1503;
+	subst['c'] = 1509;
+
+	subst['P'] = 1508;
+	subst['K'] = 1499;
+	subst['L'] = 1500;
+	subst['M'] = 1502;
+	subst['N'] = 1504;
+	subst['S'] = 1505;
+	subst['('] = 1506;
+	subst['p'] = 1507;
+	subst['C'] = 1510;
+	subst['Q'] = 1511;
+	subst['R'] = 1512;
+	subst['#'] = 1513;
+
+	// special multiChars
+	subst['&'] = 50;
+	subst['$'] = 50;
+
+	static int x[] = {1513, 1474};
+	multiChars['&'] = x;
+	static int y[] = {1513, 1473};
+	multiChars['$'] = y;
+
+	subst['T'] = 1514;
+
+	// VOWELS
+	subst['A'] = 1463;
+	subst['F'] = 1464;
+	subst['E'] = 1462;
+	subst['"'] = 1461;
+	subst['I'] = 1460;
+	subst['O'] = 1465;
+	subst['U'] = 1467;
+
+
+
+	// OTHER DIACRITICS
+	subst['.'] = 1468;
+	subst['-'] = 1470;
+	subst[','] = 1471;
+
+	// Compound input
+
+	// CANTILLATION
+
+	subst[':'] = 2;
+	subst2[2]['A'] = 1458;
+	subst2[2]['E'] = 1457;
+	subst2[2]['F'] = 1459;
+
+
+	/* Telisha qetana is postpositive as in '04' above. However, Michigan
+# code '24' is for a medial telisha. Graphically, there is no
+# difference.
+	*/
+	subst['2'] = 5;
+	subst2[5]['4'] = 1449;
+
+
+	/* Note Michigan encoding distinguishes between medial metheg '35' (occuring
+# on the left of the vowel), and the ordinary meteg '95' (occuring on the
+# right of the vowel). It is also used for silluq.
+	*/
+	subst['3'] = 6;
+	subst2[6]['3'] = 1433;
+	subst2[6]['5'] = 1469;
+
+
+	/* The Michigan code of telisha gedola in medial position. Graphically,
+# there is no difference.
+	*/
+	subst['4'] = 7;
+	subst2[7]['4'] = 1440;
+
+	subst['6'] = 8;
+	subst2[8]['0'] = 1451;
+	subst2[8]['1'] = 1436;
+
+	subst['1'] = 4;
+	subst2[4]['0'] = 1434;
+
+	/* In the poetic books, prepositive dehi occurs; it's unclear whether
+# tipeha also occurs in the poetic books. Otherwise, we could simply
+# check for what book in the Tanach we are in. Michigan uses the same
+# code for each.
+	*/
+
+	subst2[4]['3'] = 1430;
+
+	/* This is the poetic accent mugrash, which also includes rebia, but is
+# encoded separately as '81' in the Michigan text.
+	*/
+	subst2[4]['1'] = 1437;
+	subst2[4]['4'] = 1440;
+
+
+	subst['0'] = 3;
+	subst2[3]['0'] = 1475;
+	subst2[3]['1'] = 1426;
+
+	/* According to BHS, zarqa and sinnor are both postpositive. However,
+# the Michigan encoding uses one code for both. The Unicode zarqa
+# (0x0598) is definitely NOT postpositive. And further, the shape of
+# the symbol is different in BHS and Uniocde. This needs further
+# research to determine what's going on here. For now, we follow BHS
+# and use the postpositive Unicode zinor or both accents.
+	*/
+
+	subst2[3]['2'] = 1454;
+
+	/* Pashta is postpositive, and the Unicode equivalent reflects
+# this. However, there is a poetic equivalent -- azla legarmeh --
+# which is not postpositive, but no equivalent code point exists in
+# Unicode. The Michigan encoding does not distinguish between the two,
+# although it could be algorithmically determined.
+	*/
+
+	subst2[3]['3'] = 1433;
+	subst2[3]['4'] = 1449;
+	subst2[3]['5'] = 1472;
+
+
+	/* This is the Unicode Hebrew *accent*; there is also another Hebrew
+# *punctuation* called GERSHAYIM 0x05F4. I'm using the more
+# traditional rounded marks, rather than the alternate straight
+# marks.
+	*/
+
+	subst2[8]['2'] = 1438;
+
+	// Also known as azla
+	subst2[8]['3'] = 1448;
+	subst2[8]['4'] = 1452;
+	subst2[8]['5'] = 1427;
+
+
+	subst['8'] = 9;
+	subst2[9]['0'] = 1428;
+	subst2[9]['1'] = 1431;
+
+	/* Note, this accent is actually sinnorit, but it does not exist as a
+# separate glyph in the Unicode standard. The 'ZINOR' Unicode accent
+# is postpositive, while sinnorit is not. ZARQA is as close as I can
+# get to this.
+	*/
+	subst2[9]['2'] = 1432;
+
+	/* The Unicode form does not match the form used by BHS, but the names
+# are the same.
+	*/
+	subst2[9]['3'] = 1441;
+	subst2[9]['4'] = 1439;
+	subst2[9]['5'] = 1429;
+
+	subst['7'] = 10;
+	subst2[10]['0'] = 1444;
+	subst2[10]['1'] = 1445;
+	subst2[10]['2'] = 1446;
+	subst2[10]['3'] = 1430;  // also '13', '73' also is used for majela
+	subst2[10]['4'] = 1443;
+	subst2[10]['5'] = 1469;  // this is silluq; should appear to the left of the vowel
+
+	subst['9'] = 11;
+	subst2[11]['1'] = 1435;
+	subst2[11]['2'] = 1425;
+	subst2[11]['3'] = 1450;
+	subst2[11]['4'] = 1447;
+	subst2[11]['5'] = 1469;  // should appear to the right of the vowel
+
+}
+
+	/*
+
+
+# CANTILLION MARKS
+
+	my  $ETNAHTA =           '&#1425;';
+# officially the Unicode name for this symbol was "SEGOL." However, that is
+# not a unique name, conflicting with the vowel of the same name. Further,
+# the position of the symbol is different. I have changed the name of the
+# accent to "SEGOLTA," the traditional name for this accent.
+	my  $SEGOLTA =           '&#1426;';
+	my  $SHALSHELET =        '&#1427;';
+	my  $ZAQEF_QATAN =       '&#1428;';
+	my  $ZAQEF_GADOL =       '&#1429;';
+	my  $TIPEHA =            '&#1430;';
+	my  $REVIA =             '&#1431;';
+	my  $ZARQA =             '&#1432;';
+	my  $PASHTA =            '&#1433;';
+	my  $YETIV =             '&#1434;';
+	my  $TEVIR =             '&#1435;';
+	my  $GERESH =            '&#1436;';
+	my  $GERESH_MUQDAM =     '&#1437;';
+	my  $GERSHAYIM =         '&#1438;';
+	my  $QARNEY_PARA =       '&#1439;';
+	my  $TELISHA_GEDOLA =    '&#1440;';
+	my  $PAZER =             '&#1441;';
+	my  $MUNAH =             '&#1443;';
+	my  $MAHAPAKH =          '&#1444;';
+	my  $MERKHA =            '&#1445;';
+	my  $MERKHA_KEFULA =     '&#1446;';
+	my  $DARGA =             '&#1447;';
+	my  $QADMA =             '&#1448;';
+	my  $TELISHA_QETANA =    '&#1449;';
+	my  $YERAH_BEN_YOMO =    '&#1450;';
+	my  $OLE =               '&#1451;';
+	my  $ILUY =              '&#1452;';
+	my  $DEHI =              '&#1453;';
+	my  $ZINOR =             '&#1454;';
+# HEBREW MARK
+	my  $MASORA_CIRCLE =     '&#1455;';
+# HEBREW EXTENDED-A  points and punctuation
+	my  $SHEVA =             '&#1456;';
+	my  $HATAF_SEGOL =       '&#1457;';
+	my  $HATAF_PATAH =       '&#1458;';
+	my  $HATAF_QAMATS =      '&#1459;';
+	my  $HIRIQ =             '&#1460;';
+	my  $TSERE =             '&#1461;';
+	my  $SEGOL =             '&#1462;';
+# furtive Patah is not a distinct character
+	my  $PATAH =             '&#1463;';
+	my  $QAMATS =            '&#1464;';
+	my  $HOLAM =             '&#1465;';
+	my  $QUBUTS =            '&#1467;';
+# also used as shuruq
+# falls within the base letter
+	my  $DAGESH_OR_MAPIQ =   '&#1468;';
+# also used as siluq
+	my  $METAG =             '&#1469;';
+	my  $MAQAF =             '&#1470;';
+	my  $RAFE =              '&#1471;';
+# Also used for legarmeh
+#   may be treated as spacing punctuation, not as a point
+	my  $PASEQ =             '&#1472;';
+	my  $SHIN_DOT =          '&#1473;';
+	my  $SIN_DOT =           '&#1474;';
+	my  $SOF_PASUQ =         '&#1475;';
+# HEBREW MARK
+	my  $UPPER_DOT =         '&#1476;';
+# HEBREW LETTERS based on ISO 8859-8
+# aleph
+#  x (alef symbol - 2135)
+	my  $ALEF =              '&#1488;';
+#  x (bet symbol - 2136)
+	my  $BET =               '&#1489;';
+#  x (gimel symbol - 2137)
+	my  $GIMEL =             '&#1490;';
+#  x (dalet symbol - 2138)
+	my  $DALET =             '&#1491;';
+	my  $HE =                '&#1492;';
+	my  $VAV =               '&#1493;';
+	my  $ZAYIN =             '&#1494;';
+	my  $HET =               '&#1495;';
+	my  $TET =               '&#1496;';
+	my  $YOD =               '&#1497;';
+	my  $FINAL_KAF =         '&#1498;';
+	my  $KAF =               '&#1499;';
+	my  $LAMED =             '&#1500;';
+	my  $FINAL_MEM =         '&#1501;';
+	my  $MEM =               '&#1502;';
+	my  $FINAL_NUN =         '&#1503;';
+	my  $NUN =               '&#1504;';
+	my  $SAMEKH =            '&#1505;';
+	my  $AYIN =              '&#1506;';
+	my  $FINAL_PE =          '&#1507;';
+	my  $PE =                '&#1508;';
+	my  $FINAL_TSADI =       '&#1509;';
+# also known as zade
+	my  $TSADI =             '&#1510;';
+	my  $QOF =               '&#1511;';
+	my  $RESH =              '&#1512;';
+	my  $SHIN =              '&#1513;';
+	my  $TAV =               '&#1514;';
+# Yiddish digraphs
+#   Hebrew Ligature
+# tsvey vovn
+	my  $DOUBLE_VAV =        '&#1520;';
+	my  $VAV_YOD =           '&#1521;';
+# tsvey yudn
+	my  $DOUBLE_YOD =        '&#1522;';
+
+# Additional punctuation
+	my  $PUNCT_GERESH =      '&#1523;';
+	my  $PUNCT_GERSHAYIM =   '&#1524;';
+# Reserved: 0x05F5"
+# x (hebrew point judeo-spanish varika - FB1E)
+#my  $JUDEO_SPANISH_VARIKA = pack("U",0xFB1E); # UTF-8 OxFB1E
+
+#############################
+# End of Unicode 2.0 Hebrew #
+#############################
+
+# A hash whose key is a Michagan code, and whose value is a Unicode
+# equvalent
+
+	char subst[] = new char [255];
+	subst[')'] = 1488;
+	'B'  => $BET,
+	'G'  => $GIMEL,
+	'D'  => $DALET,
+	'H'  => $HE,
+	'W'  => $VAV,
+	'Z'  => $ZAYIN,
+	'X'  => $HET,
+	'+'  => $TET,
+	'Y'  => $YOD,
+	'K'  => $KAF,
+	'L'  => $LAMED,
+	'M'  => $MEM,
+	'N'  => $NUN,
+	'S'  => $SAMEKH,
+	'('  => $AYIN,
+	'P'  => $PE,
+	'C'  => $TSADI,
+	'Q'  => $QOF,
+	'R'  => $RESH,
+	'#'  => $SHIN, # the letter shin without a point
+	'&'  => ($SHIN . $SIN_DOT),
+	'$'  => ($SHIN . $SHIN_DOT), # '
+	'T'  => $TAV,
+# VOWELS
+	'A'  => $PATAH,
+	'F'  => $QAMATS,
+	'E'  => $SEGOL,
+	'"'  => $TSERE,
+	'I'  => $HIRIQ,
+	'O'  => $HOLAM,
+	'U'  => $QUBUTS,
+	':'  => $SHEVA,
+	':A' => $HATAF_PATAH,
+	':E' => $HATAF_SEGOL,
+	':F' => $HATAF_QAMATS,
+# OTHER DIACRITICS
+	'.'  => $DAGESH_OR_MAPIQ,
+	'-'  => $MAQAF,
+	','  => $RAFE,
+# CANTILLATION
+	'00' => $SOF_PASUQ,
+	'01' => $SEGOLTA,
+# According to BHS, zarqa and sinnor are both postpositive. However,
+# the Michigan encoding uses one code for both. The Unicode zarqa
+# (0x0598) is definitely NOT postpositive. And further, the shape of
+# the symbol is different in BHS and Uniocde. This needs further
+# research to determine what's going on here. For now, we follow BHS
+# and use the postpositive Unicode zinor or both accents.
+	'02' => $ZINOR,
+# Pashta is postpositive, and the Unicode equivalent reflects
+# this. However, there is a poetic equivalent -- azla legarmeh --
+# which is not postpositive, but no equivalent code point exists in
+# Unicode. The Michigan encoding does not distinguish between the two,
+# although it could be algorithmically determined.
+	'03' => $PASHTA,
+	'04' => $TELISHA_QETANA,
+	'05' => $PASEQ,
+	'10' => $YETIV,
+# In the poetic books, prepositive dehi occurs; it's unclear whether
+# tipeha also occurs in the poetic books. Otherwise, we could simply
+# check for what book in the Tanach we are in. Michigan uses the same
+# code for each.
+	'13' => $TIPEHA, # also $DEHI
+# This is the poetic accent mugrash, which also includes rebia, but is
+# encoded separately as '81' in the Michigan text.
+	'11' => $GERESH_MUQDAM,
+	'14' => $TELISHA_GEDOLA,
+# Telisha qetana is postpositive as in '04' above. However, Michigan
+# code '24' is for a medial telisha. Graphically, there is no
+# difference.
+	'24' => $TELISHA_QETANA,
+	'33' => $PASHTA,
+# The Michigan code of telisha gedola in medial position. Graphically,
+# there is no difference.
+	'44' => $TELISHA_GEDOLA,
+	'60' => $OLE,
+	'61' => $GERESH,
+# This is the Unicode Hebrew *accent*; there is also another Hebrew
+# *punctuation* called GERSHAYIM 0x05F4. I'm using the more
+# traditional rounded marks, rather than the alternate straight
+# marks.
+	'62' => $GERSHAYIM,
+# Also known as azla
+	'63' => $QADMA,
+	'64' => $ILUY,
+	'65' => $SHALSHELET,
+	'80' => $ZAQEF_QATAN,
+	'81' => $REVIA,
+# Note, this accent is actually sinnorit, but it does not exist as a
+# separate glyph in the Unicode standard. The 'ZINOR' Unicode accent
+# is postpositive, while sinnorit is not. ZARQA is as close as I can
+# get to this.
+	'82' => $ZARQA,
+# The Unicode form does not match the form used by BHS, but the names
+# are the same.
+	'83' => $PAZER,
+	'84' => $QARNEY_PARA,
+	'85' => $ZAQEF_GADOL,
+# Note Michigan encoding distinguishes between medial metheg '35' (occuring
+# on the left of the vowel), and the ordinary meteg '95' (occuring on the
+# right of the vowel). It is also used for silluq.
+	'35' => $METAG,
+	'70' => $MAHAPAKH,
+	'71' => $MERKHA,
+	'72' => $MERKHA_KEFULA,
+	'73' => $TIPEHA, # also '13', '73' also is used for majela
+	'74' => $MUNAH,
+	'75' => $METAG, # this is silluq; should appear to the left of the vowel
+	'91' => $TEVIR,
+	'92' => $ETNAHTA,
+	'93' => $YERAH_BEN_YOMO,
+	'94' => $DARGA,
+	'95' => $METAG, # should appear to the right of the vowel
+
+# Not used by the Michigan Encoding
+# $UPPER_DOT = '05C4';
+	);
+
+# declare other variables
+	my (@bhsLines,
+	@bhsVerse,
+	@entity_line) = ();
+
+	my ($i,
+	$verse,
+	$word,
+	$character) = 0;
+
+	my ($element,
+	$saveGuttural) = "";
+
+# read in a line
+	while (<>) {
+# Process one verse
+# iterate over every character and change to XML decimal entity
+	CHAR: for ( $i = 0; ($i < scalar(@bhsVerse)); $i++) {
+	 # find and convert final kaf, mem, nun, pe, tsade
+	 ( # if final form
+	  $bhsVerse[$i] =~ /[KMNPC]/
+	 )
+	   &&
+		(
+		 ( # whitespace or
+		  $bhsVerse[$i+1] =~ /[ \-?]/
+		 )
+		 ||
+		 ( # EOL or
+		  $i == ( scalar(@bhsVerse) - 1 )
+		 )
+		 ||
+		 ( # sof pasuq or
+		  ( $bhsVerse[$i+1] =~ /0/ ) &&
+		  ( $bhsVerse[$i+2] =~ /0/ )
+		 )
+		 ||
+		 ( # one accent followed by white, eol or
+		  (
+		   ( $bhsVerse[$i+1] =~ /\d/ ) &&
+		   ( $bhsVerse[$i+2] =~ /\d/ )
+		  ) &&
+		  (
+		   ( $bhsVerse[$i+3] =~ /[ \-?]/ ) ||
+		   ( $i == ( scalar(@bhsVerse) - 1 ) )
+		  )
+		 )
+		 ||
+		 ( # two accents followed by white, eol
+		  (
+		   ( $bhsVerse[$i+1] =~ /\d/ ) &&
+		   ( $bhsVerse[$i+2] =~ /\d/ ) &&
+		   ( $bhsVerse[$i+3] =~ /\d/ ) &&
+		   ( $bhsVerse[$i+4] =~ /\d/ )
+		  ) &&
+		  (
+		   ( $bhsVerse[$i+5] =~ /[ \-?]/ ) ||
+		   ( $i == ( scalar(@bhsVerse) - 1 ) )
+		  )
+		 )
+		 ||
+		 ( # followed by a vowel and white, eol, sof pasuq
+		  ( $bhsVerse[$i+1] =~ /[:F]/ ) &&
+		  ( # followed by
+		   ( $bhsVerse[$i+2] =~ /[ \-?]/ ) || # whitespace or
+		   ( $i == ( scalar(@bhsVerse) - 1 ) ) || # eol or
+		   ( # sof pasuq
+		    ( $bhsVerse[$i+2] =~ /0/ ) &&
+		    ( $bhsVerse[$i+3] =~ /0/ )
+		   )
+		  )
+		 )
+		) # end of what follows after final letter
+		  &&
+		    do {
+			 $bhsVerse[$i] =~ /K/ && eval { push @entity_line,$FINAL_KAF; }
+			   && next CHAR;
+			 $bhsVerse[$i] =~ /M/ && eval { push @entity_line,$FINAL_MEM; }
+			   && next CHAR;
+			 $bhsVerse[$i] =~ /N/ && eval { push @entity_line,$FINAL_NUN; }
+			   && next CHAR;
+			 $bhsVerse[$i] =~ /P/ && eval { push @entity_line,$FINAL_PE; }
+			   && next CHAR;
+			 $bhsVerse[$i] =~ /C/ && eval { push @entity_line,$FINAL_TSADI; }
+			   && next CHAR;
+		    };
+	 # find and convert "furtive patach"
+	 ( $bhsVerse[$i] =~ /A/ ) &&             # If the letter is a patach
+	   ( $bhsVerse[$i-1] =~ /[)HX(]/ ) &&    #  and is preceeded by a guttural
+	   ( ( $bhsVerse[$i-2] =~ /[AEFOU]/ ) || #  and is preceeded by a vowel
+		( ( $bhsVerse[$i-2] =~ /\./ ) &&    #  or by suruq
+		  ( $bhsVerse[$i-3] =~ /W/ ) ) ||    #
+		( ( $bhsVerse[$i-2] =~ /W/ ) &&      #  or by holem (written plene)
+		  ( $bhsVerse[$i-3] =~ /O/ ) ) ||    #
+		( ( $bhsVerse[$i-2] =~ /Y/ ) &&      #  or by hiriq-yod
+		  ( $bhsVerse[$i-3] =~ /I/ ) ) ) &&
+		  do {
+			 $saveGuttural = pop @entity_line; # snip off the gutteral
+			 push @entity_line,$PATAH;         # push on the patach
+			 push @entity_line,$saveGuttural;  # push back on the gutteral
+			 next CHAR;
+		  };
+	 # convert cantillation
+	 #   since we have previously dealt with all other cases of
+	 #   numbers, two digit patterns are all we have to search for
+	 $bhsVerse[$i] =~ /\d/ && $bhsVerse[$i+1] =~ /\d/ && do {
+		push @entity_line,$Michigan2XMLentity{"$bhsVerse[$i]$bhsVerse[$i+1]"};
+		$i++; # accents are two digits long, so advance past the 2nd digit
+		next CHAR;
+	 };
+	 # convert katef vowels, which are two characters long
+	 $bhsVerse[$i] =~ /:/ && $bhsVerse[$i+1] =~ /[AEF]/ && do {
+		push @entity_line,$Michigan2XMLentity{"$bhsVerse[$i]$bhsVerse[$i+1]"};
+		$i++;
+		next CHAR;
+	 };
+	 # convert everything else
+	 push @entity_line,$Michigan2XMLentity{"$bhsVerse[$i]"};
+	} # end CHAR
+# print the line to standard output with XML character-level encoding
+# each character has the following format:
+# <c id="1kg1.verse#.word#.character#">&#1234;</c>
+
+# set up the verse element
+	$word = 1;
+	$character = 1;
+	print "<verse>\n<word>\n";
+# print each character element
+# if there is a space, then close the word entity, open a new word
+# entity, increment the word number, reset the character number to
+# zero.
+	foreach $element (@entity_line) {
+	 if ( $element =~ " " ) {
+	   $word++;
+	   $character = 1;
+	   print "</word>\n<word>\n";
+	   next;
+	 }
+	 print "<c id=\"1kg1.$verse.$word.$character\">$element</c>\n";
+	 $character++;
+	}
+# close the verse element
+	print "</word></verse>\n";
+# reinitialize variables
+	@bhsVerse = ();
+	@entity_line = ();
+	@bhsLines = ();
+	} # end while
+# close the XML document
+	print "</body>\n";
+	*/
diff --git a/src/frontend/im/nullim.cpp b/src/frontend/im/nullim.cpp
new file mode 100644
index 0000000..6fd9c0e
--- /dev/null
+++ b/src/frontend/im/nullim.cpp
@@ -0,0 +1,33 @@
+/******************************************************************************
+ *
+ *  nullim.cpp -	NullIM: Null keyboard mapping
+ *
+ * $Id: nullim.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <nullim.h>
+
+
+NullIM::NullIM() {
+}
+
+int *NullIM::translate(char ch) {
+	static int retVal[1];
+	*retVal = ch;
+	return retVal;
+}
diff --git a/src/frontend/im/swinputmeth.cpp b/src/frontend/im/swinputmeth.cpp
new file mode 100644
index 0000000..49a7833
--- /dev/null
+++ b/src/frontend/im/swinputmeth.cpp
@@ -0,0 +1,39 @@
+/******************************************************************************
+ *
+ *  swinputmeth.cpp -	SWInputMethod: Input method base class
+ *
+ * $Id: swinputmeth.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swinputmeth.h>
+
+SWInputMethod::SWInputMethod() {
+   state = 0;
+}
+
+void SWInputMethod::setState(int state) {
+   this->state = state;
+}
+
+int SWInputMethod::getState() {
+   return state;
+}
+
+void SWInputMethod::clearState() {
+   state = 0;
+}
diff --git a/src/frontend/swdisp.cpp b/src/frontend/swdisp.cpp
new file mode 100644
index 0000000..268fe7d
--- /dev/null
+++ b/src/frontend/swdisp.cpp
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  swdisp.cpp -	code for base class 'SWDisplay'.  SWDisplay is the
+ *			basis for all types of displays (e.g. raw textout,
+ *			curses, xwindow, etc.)
+ *
+ * $Id: swdisp.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <swmodule.h>
+#include <swdisp.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"SWDisplay", "SWObject", 0};
+SWClass SWDisplay::classdef(classes);
+
+/******************************************************************************
+ * SWDisplay::Display - casts a module to a character pointer and displays it to
+ *			raw output (overriden for different display types and
+ *			module types if necessary)
+ *
+ * ENT:	imodule - module to display
+ *
+ * RET:	error status
+ */
+
+
+SWORD_NAMESPACE_END
diff --git a/src/frontend/swlog.cpp b/src/frontend/swlog.cpp
new file mode 100644
index 0000000..7c05b47
--- /dev/null
+++ b/src/frontend/swlog.cpp
@@ -0,0 +1,134 @@
+/******************************************************************************
+ *
+ *  swlog.cpp -	
+ *
+ * $Id: swlog.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <iostream>
+#if defined(_ICU_) && !defined(_ICUSWORD_)
+#define _USTDIO_
+#include <unicode/ustdio.h>
+#include <unicode/ustream.h>
+#endif
+#include "swlog.h"
+
+
+SWORD_NAMESPACE_START
+
+
+SWLog *SWLog::systemLog = 0;
+
+const int SWLog::LOG_ERROR     = 1;
+const int SWLog::LOG_WARN      = 2;
+const int SWLog::LOG_INFO      = 3;
+const int SWLog::LOG_TIMEDINFO = 4;
+const int SWLog::LOG_DEBUG     = 5;
+
+SWLog *SWLog::getSystemLog() {
+	static class __staticSystemLog {
+	SWLog **clear;
+	public:
+		__staticSystemLog(SWLog **clear) { this->clear = clear; }
+		~__staticSystemLog() { delete *clear; *clear = 0; }
+	} _staticSystemLog(&SWLog::systemLog);
+
+	if (!systemLog)
+		systemLog = new SWLog();
+
+	return systemLog;
+}
+
+
+void SWLog::setSystemLog(SWLog *newLog) {
+	delete getSystemLog();
+	systemLog = newLog;
+}
+
+
+void SWLog::logWarning(const char *fmt, ...) const {
+	char msg[2048];
+	va_list argptr;
+
+	if (logLevel >= LOG_WARN) {
+		va_start(argptr, fmt);
+		vsprintf(msg, fmt, argptr);
+		va_end(argptr);
+		logMessage(msg, LOG_WARN);
+	}
+}
+
+
+void SWLog::logError(const char *fmt, ...) const {
+	char msg[2048];
+	va_list argptr;
+
+	if (logLevel) {
+		va_start(argptr, fmt);
+		vsprintf(msg, fmt, argptr);
+		va_end(argptr);
+		logMessage(msg, LOG_ERROR);
+	}
+}
+
+
+void SWLog::logInformation(const char *fmt, ...) const {
+	char msg[2048];
+	va_list argptr;
+
+	if (logLevel >= LOG_INFO) {
+		va_start(argptr, fmt);
+		vsprintf(msg, fmt, argptr);
+		va_end(argptr);
+		logMessage(msg, LOG_INFO);
+	}
+}
+
+
+void SWLog::logTimedInformation(const char *fmt, ...) const {
+	char msg[2048];
+	va_list argptr;
+
+	if (logLevel >= LOG_TIMEDINFO) {
+		va_start(argptr, fmt);
+		vsprintf(msg, fmt, argptr);
+		va_end(argptr);
+		logMessage(msg, LOG_TIMEDINFO);
+	}
+}
+
+
+void SWLog::logDebug(const char *fmt, ...) const {
+	char msg[2048];
+	va_list argptr;
+
+	if (logLevel >= LOG_DEBUG) {
+		va_start(argptr, fmt);
+		vsprintf(msg, fmt, argptr);
+		va_end(argptr);
+		logMessage(msg, LOG_DEBUG);
+	}
+}
+
+void SWLog::logMessage(const char *message, int level) const {
+	std::cerr << message;
+	std::cerr << std::endl;
+}
+SWORD_NAMESPACE_END
diff --git a/src/keys/Makefile b/src/keys/Makefile
new file mode 100644
index 0000000..339f87a
--- /dev/null
+++ b/src/keys/Makefile
@@ -0,0 +1,4 @@
+root := ../..
+
+all:
+	make -C ${root}
diff --git a/src/keys/Makefile.am b/src/keys/Makefile.am
new file mode 100644
index 0000000..1eced21
--- /dev/null
+++ b/src/keys/Makefile.am
@@ -0,0 +1,10 @@
+keysdir = $(top_srcdir)/src/keys
+
+libsword_la_SOURCES += $(keysdir)/swkey.cpp
+libsword_la_SOURCES += $(keysdir)/listkey.cpp
+libsword_la_SOURCES += $(keysdir)/strkey.cpp
+libsword_la_SOURCES += $(keysdir)/treekey.cpp
+libsword_la_SOURCES += $(keysdir)/treekeyidx.cpp
+libsword_la_SOURCES += $(keysdir)/versekey.cpp
+libsword_la_SOURCES += $(keysdir)/versetreekey.cpp
+
diff --git a/src/keys/listkey.cpp b/src/keys/listkey.cpp
new file mode 100644
index 0000000..4c017d2
--- /dev/null
+++ b/src/keys/listkey.cpp
@@ -0,0 +1,384 @@
+/******************************************************************************
+ *
+ *  listkey.cpp -	code for base class 'ListKey'.  ListKey is the basis
+ *			for all types of keys that have lists of specified
+ *			indexes (e.g. a list of verses, place, etc.)
+ *
+ * $Id: listkey.cpp 2905 2013-07-17 12:18:15Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <utilstr.h>
+#include <stdlib.h>
+#include <swkey.h>
+#include <listkey.h>
+#include <string.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"ListKey", "SWKey", "SWObject", 0};
+SWClass ListKey::classdef(classes);
+
+/******************************************************************************
+ * ListKey Constructor - initializes instance of ListKey
+ *
+ * ENT:	ikey - text key
+ */
+
+ListKey::ListKey(const char *ikey): SWKey(ikey) {
+	arraymax = 0;
+	clear();
+	init();
+}
+
+
+ListKey::ListKey(ListKey const &k) : SWKey(k.keytext) {
+	arraymax = k.arraymax;
+	arraypos = k.arraypos;
+	arraycnt = k.arraycnt;
+	array = (arraymax)?(SWKey **)malloc(k.arraymax * sizeof(SWKey *)):0;
+	for (int i = 0; i < arraycnt; i++)
+		array[i] = k.array[i]->clone();
+	init();
+}
+
+
+void ListKey::init() {
+	myclass = &classdef;
+	// this is a listkey, bound is always set
+	boundSet = true;
+}
+
+
+SWKey *ListKey::clone() const
+{
+	return new ListKey(*this);
+}
+
+/******************************************************************************
+ * ListKey Destructor - cleans up instance of ListKey
+ */
+
+ListKey::~ListKey()
+{
+	clear();
+}
+
+
+/******************************************************************************
+ * ListKey::clear	- Clears out elements of list
+ */
+
+void ListKey::clear()
+{
+	int loop;
+
+	if (arraymax) {
+		for (loop = 0; loop < arraycnt; loop++)
+			delete array[loop];
+
+		free(array);
+		arraymax  = 0;
+	}
+	arraycnt  = 0;
+	arraypos  = 0;
+	array     = 0;
+}
+
+
+/******************************************************************************
+ * ListKey::copyFrom Equates this ListKey to another ListKey object
+ *
+ * ENT:	ikey - other ListKey object
+ */
+
+void ListKey::copyFrom(const ListKey &ikey) {
+	clear();
+
+	arraymax = ikey.arraymax;
+	arraypos = ikey.arraypos;
+	arraycnt = ikey.arraycnt;
+	array = (arraymax)?(SWKey **)malloc(ikey.arraymax * sizeof(SWKey *)):0;
+	for (int i = 0; i < arraycnt; i++)
+		array[i] = ikey.array[i]->clone();
+
+	setToElement(0);
+}
+
+
+/******************************************************************************
+ * ListKey::add - Adds an element to the list
+ */
+
+void ListKey::add(const SWKey &ikey) {
+	if (++arraycnt > arraymax) {
+		array = (SWKey **) ((array) ? realloc(array, (arraycnt + 32) * sizeof(SWKey *)) : calloc(arraycnt + 32, sizeof(SWKey *)));
+		arraymax = arraycnt + 32;
+	}
+	array[arraycnt-1] = ikey.clone();
+	setToElement(arraycnt-1);
+}
+
+
+
+/******************************************************************************
+ * ListKey::setPosition(SW_POSITION)	- Positions this key
+ *
+ * ENT:	p	- position
+ *
+ * RET:	*this
+ */
+
+void ListKey::setPosition(SW_POSITION p) {
+	switch (p) {
+	case 1:	// GCC won't compile P_TOP
+		setToElement(0, p);
+		break;
+	case 2:	// GCC won't compile P_BOTTOM
+		setToElement(arraycnt-1, p);
+		break;
+	}
+}
+
+
+/******************************************************************************
+ * ListKey::increment - Increments a number of elements
+ */
+
+void ListKey::increment(int step) {
+	if (step < 0) {
+		decrement(step*-1);
+		return;
+	}
+	popError();		// clear error
+	for(; step && !popError(); step--) {
+		if (arraypos < arraycnt && arraycnt) {
+			if (array[arraypos]->isBoundSet())
+				(*(array[arraypos]))++;
+			if ((array[arraypos]->popError()) || (!array[arraypos]->isBoundSet())) {
+				setToElement(arraypos+1);
+			}
+			else SWKey::setText((const char *)(*array[arraypos]));
+		}
+		else error = KEYERR_OUTOFBOUNDS;
+	}
+}
+
+
+/******************************************************************************
+ * ListKey::decrement - Decrements a number of elements
+ */
+
+void ListKey::decrement(int step) {
+	if (step < 0) {
+		increment(step*-1);
+		return;
+	}
+	popError();		// clear error
+	for(; step && !popError(); step--) {
+		if (arraypos > -1 && arraycnt) {
+			if (array[arraypos]->isBoundSet())
+				(*(array[arraypos]))--;
+			if ((array[arraypos]->popError()) || (!array[arraypos]->isBoundSet())) {
+				setToElement(arraypos-1, BOTTOM);
+			}
+			else SWKey::setText((const char *)(*array[arraypos]));
+		}
+		else error = KEYERR_OUTOFBOUNDS;
+	}
+}
+
+
+/******************************************************************************
+ * ListKey::getCount	- Returns number of elements in list
+ */
+
+int ListKey::getCount() const {
+	return arraycnt;
+}
+
+
+/******************************************************************************
+ * ListKey::setToElement	- Sets key to element number
+ *
+ * ENT:	ielement	- element number to set to
+ * 	pos		- set the subkey element to position (TOP) or BOTTOM
+ *
+ * RET:	error status
+ */
+
+char ListKey::setToElement(int ielement, SW_POSITION pos) {
+	arraypos = ielement;
+	if (arraypos >= arraycnt) {
+		arraypos = (arraycnt>0)?arraycnt - 1:0;
+		error = KEYERR_OUTOFBOUNDS;
+	}
+	else {
+		if (arraypos < 0) {
+			arraypos = 0;
+			error = KEYERR_OUTOFBOUNDS;
+		}
+		else {
+			error = 0;
+		}
+	}
+	
+	if (arraycnt) {
+		if (array[arraypos]->isBoundSet())
+			(*array[arraypos]) = pos;
+		SWKey::setText((const char *)(*array[arraypos]));
+	}
+	else SWKey::setText("");
+	
+	return error;
+}
+
+
+/******************************************************************************
+ * ListKey::getElement	- Gets a key element number
+ *
+ * ENT:	pos	- element number to get (or default current)
+ *
+ * RET:	Key or null on error
+ */
+
+const SWKey *ListKey::getElement(int pos) const {
+	if (pos < 0)
+		pos = arraypos;
+		
+	if (pos >=arraycnt)
+		error = KEYERR_OUTOFBOUNDS;
+
+	return (error) ? 0:array[pos];
+}
+
+SWKey *ListKey::getElement(int pos) {
+	const ListKey &self = *this;
+	return const_cast<SWKey *>(self.getElement(pos));
+}
+
+	
+
+/******************************************************************************
+ * ListKey::remove	- Removes current element from list
+ */
+
+void ListKey::remove() {
+	if ((arraypos > -1) && (arraypos < arraycnt)) {
+		delete array[arraypos];
+		if (arraypos < arraycnt - 1)
+			memmove(&array[arraypos], &array[arraypos+1], (arraycnt - arraypos - 1) * sizeof(SWKey *));
+		arraycnt--;
+		
+		setToElement((arraypos)?arraypos-1:0);
+	}
+}
+
+
+/******************************************************************************
+ * ListKey::getRangeText - returns parsable range text for this key
+ */
+
+const char *ListKey::getRangeText() const {
+	char *buf = new char[(arraycnt + 1) * 255];
+	buf[0] = 0;
+	for (int i = 0; i < arraycnt; i++) {
+		strcat(buf, array[i]->getRangeText());
+		if (i < arraycnt-1)
+			strcat(buf, "; ");
+	}
+	stdstr(&rangeText, buf);
+	delete [] buf;
+	return rangeText;
+}
+
+
+/******************************************************************************
+ * ListKey::getOSISRefRangeText - returns parsable range text for this key
+ */
+
+const char *ListKey::getOSISRefRangeText() const {
+	char *buf = new char[(arraycnt + 1) * 255];
+	buf[0] = 0;
+	for (int i = 0; i < arraycnt; i++) {
+		strcat(buf, array[i]->getOSISRefRangeText());
+		if (i < arraycnt-1)
+			strcat(buf, ";");
+	}
+	stdstr(&rangeText, buf);
+	delete [] buf;
+	return rangeText;
+}
+
+
+/******************************************************************************
+ * ListKey::getText - returns text key if (const char *) cast is requested
+ */
+
+const char *ListKey::getText() const {
+	int pos = arraypos;
+	SWKey *key = (pos >= arraycnt || !arraycnt) ? 0:array[pos];
+	return (key) ? key->getText() : keytext;
+}
+
+const char *ListKey::getShortText() const {
+	int pos = arraypos;
+	SWKey *key = (pos >= arraycnt || !arraycnt) ? 0:array[pos];
+	return (key) ? key->getShortText() : keytext;
+}
+
+
+void ListKey::setText(const char *ikey) {
+	// at least try to set the current element to this text
+	for (arraypos = 0; arraypos < arraycnt; arraypos++) {
+		SWKey *key = array[arraypos];
+		if (key) {
+			if (key->isTraversable() && key->isBoundSet()) {
+				key->setText(ikey);
+				if (!key->popError())
+					break;
+			}
+			else {
+				if (!strcmp(key->getText(), ikey))
+					break;
+			}
+		}
+	}
+	if (arraypos >= arraycnt) {
+		error = 1;
+		arraypos = arraycnt-1;
+	}
+	
+	SWKey::setText(ikey);
+}
+
+// This sort impl sucks.  Let's change it to a quicksort or some other efficient algol
+void ListKey::sort() {
+	for (int i = 0; i < arraycnt; i++) {
+		for (int j = i; j < arraycnt; j++) {
+			if (*array[j] < *array[i]) {
+				SWKey *tmp = array[i];
+				array[i] = array[j];
+				array[j] = tmp;
+			}
+		}
+	}
+}
+
+SWORD_NAMESPACE_END
+
diff --git a/src/keys/strkey.cpp b/src/keys/strkey.cpp
new file mode 100644
index 0000000..0b5a2cb
--- /dev/null
+++ b/src/keys/strkey.cpp
@@ -0,0 +1,61 @@
+/******************************************************************************
+ *
+ *  strkey.cpp -	code for class 'StrKey'- a standard string key class
+ *			(used for modules that index on single strings (eg.
+ *			cities, names, words, etc.)
+ *
+ * $Id: strkey.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <swmacs.h>
+#include <strkey.h>
+#include <stdio.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"StrKey", "SWKey", "SWObject", 0};
+SWClass StrKey::classdef(classes);
+
+/******************************************************************************
+ * StrKey Constructor - initializes instance of StrKey
+ *
+ * ENT:	ikey - text key (word, city, name, etc.)
+ */
+
+StrKey::StrKey(const char *ikey) : SWKey(ikey)
+{
+	init();
+}
+
+
+void StrKey::init() {
+	myclass = &classdef;
+}
+
+
+/******************************************************************************
+ * StrKey Destructor - cleans up instance of StrKey
+ *
+ * ENT:	ikey - text key
+ */
+
+StrKey::~StrKey() {
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/keys/swkey.cpp b/src/keys/swkey.cpp
new file mode 100644
index 0000000..8e40004
--- /dev/null
+++ b/src/keys/swkey.cpp
@@ -0,0 +1,266 @@
+/******************************************************************************
+ *
+ *  swkey.cpp -	code for base class 'SWKey'.  SWKey is the basis for all
+ *		types of keys for indexing into modules (e.g. verse, word,
+ *		place, etc.)
+ *
+ * $Id: swkey.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <swkey.h>
+#include <utilstr.h>
+#include <string.h>
+#include <localemgr.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"SWKey", "SWObject", 0};
+SWClass SWKey::classdef(classes);
+SWKey::LocaleCache   SWKey::localeCache;
+
+/******************************************************************************
+ * SWKey Constructor - initializes instance of SWKey
+ *
+ * ENT:	ikey - text key
+ */
+
+SWKey::SWKey(const char *ikey)
+{
+	init();
+	index     = 0;
+	persist   = 0;
+	keytext   = 0;
+	rangeText = 0;
+	error     = 0;
+	userData  = 0;
+	stdstr(&keytext, ikey);
+}
+
+SWKey::SWKey(SWKey const &k)
+{
+	init();
+	stdstr(&localeName, k.localeName);
+	index     = k.index;
+	persist   = k.persist;
+	userData  = k.userData;
+	keytext   = 0;
+	rangeText = 0;
+	error     = k.error;
+	setText(k.getText());
+}
+
+void SWKey::init() {
+	myclass = &classdef;
+	boundSet = false;
+	locale = 0;
+	localeName = 0;
+	setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
+}
+
+SWKey *SWKey::clone() const
+{
+	return new SWKey(*this);
+}
+
+/******************************************************************************
+ * SWKey Destructor - cleans up instance of SWKey
+ */
+
+SWKey::~SWKey() {
+	delete [] keytext;
+	delete [] rangeText;
+	delete [] localeName;
+}
+
+
+/******************************************************************************
+ * SWKey::Persist - Gets whether this object itself persists within a
+ *			module that it was used to setKey or just a copy.
+ *			(1 - persists in module; 0 - a copy is attempted
+ *
+ * RET:	value of persist
+ */
+
+bool SWKey::isPersist() const
+{
+	return persist;
+}
+
+
+/******************************************************************************
+ * SWKey::getPrivateLocale - Gets a real locale object from our name
+ *
+ * RET:	locale object associated with our name
+ */
+
+SWLocale *SWKey::getPrivateLocale() const {
+	if (!locale) {
+		if ((!localeCache.name) || (strcmp(localeCache.name, localeName))) {
+			stdstr(&(localeCache.name), localeName);
+			// this line is the entire bit of work we're trying to avoid with the cache
+			// worth it?  compare time examples/cmdline/search KJV "God love world" to
+			// same with this method reduced to:
+			// if (!local) local = ... (call below); return locale;
+			localeCache.locale = LocaleMgr::getSystemLocaleMgr()->getLocale(localeName);
+		}
+		locale = localeCache.locale;
+	}
+	return locale;
+}
+
+
+/******************************************************************************
+ * SWKey::Persist - Set/gets whether this object itself persists within a
+ *			module that it was used to setKey or just a copy.
+ *			(true - persists in module; false - a copy is attempted
+ *
+ * ENT:	ipersist - value which to set persist
+ */
+
+void SWKey::setPersist(bool ipersist)
+{
+	persist = ipersist;
+}
+
+
+/******************************************************************************
+ * SWKey::Error - Gets and clears error status
+ *
+ * RET:	error status
+ */
+
+char SWKey::popError()
+{
+	char retval = error;
+
+	error = 0;
+	return retval;
+}
+
+
+/******************************************************************************
+ * SWKey::setText Equates this SWKey to a character string
+ *
+ * ENT:	ikey - other swkey object
+ */
+
+void SWKey::setText(const char *ikey) {
+	stdstr(&keytext, ikey);
+}
+
+
+/******************************************************************************
+ * SWKey::copyFrom Equates this SWKey to another SWKey object
+ *
+ * ENT:	ikey - other swkey object
+ */
+
+void SWKey::copyFrom(const SWKey &ikey) {
+// not desirable	Persist(ikey.Persist());
+	setLocale(ikey.getLocale());
+	setText((const char *)ikey);
+}
+
+
+/******************************************************************************
+ * SWKey::getText - returns text key if (const char *) cast is requested
+ */
+
+const char *SWKey::getText() const {
+	return keytext;
+}
+
+
+/******************************************************************************
+ * SWKey::getRangeText - returns parsable range text for this key
+ */
+
+const char *SWKey::getRangeText() const {
+	stdstr(&rangeText, keytext);
+	return rangeText;
+}
+
+
+/******************************************************************************
+ * SWKey::getOSISRefRangeText - returns parsable range text for this key
+ */
+
+const char *SWKey::getOSISRefRangeText() const {
+	return getRangeText();
+}
+
+
+/******************************************************************************
+ * SWKey::compare	- Compares another VerseKey object
+ *
+ * ENT:	ikey - key to compare with this one
+ *
+ * RET:	> 0 if this key is greater than compare key
+ *	< 0
+ *	  0
+ */
+
+int SWKey::compare(const SWKey &ikey)
+{
+	return strcmp((const char *)*this, (const char *)ikey);
+}
+
+
+/******************************************************************************
+ * SWKey::setPosition(SW_POSITION)	- Positions this key if applicable
+ */
+
+void SWKey::setPosition(SW_POSITION p) {
+	switch (p) {
+	case POS_TOP:
+//		*this = "";
+		break;
+	case POS_BOTTOM:
+//		*this = "zzzzzzzzz";
+		break;
+	} 
+}
+
+
+/******************************************************************************
+ * SWKey::increment	- Increments key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void SWKey::increment(int) {
+	error = KEYERR_OUTOFBOUNDS;
+}
+
+
+/******************************************************************************
+ * SWKey::decrement	- Decrements key a number of entries
+ *
+ * ENT:	decrement	- Number of entries to jump backward
+ *
+ * RET: *this
+ */
+
+void SWKey::decrement(int) {
+	error = KEYERR_OUTOFBOUNDS;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/keys/treekey.cpp b/src/keys/treekey.cpp
new file mode 100644
index 0000000..a466da6
--- /dev/null
+++ b/src/keys/treekey.cpp
@@ -0,0 +1,99 @@
+/******************************************************************************
+ *
+ *  treekey.cpp -	code for class 'versekey'- a standard Biblical
+ *			verse key
+ *
+ * $Id: treekey.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <treekey.h>
+#include <utilstr.h>
+#include <string.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"TreeKey", "SWKey", "SWObject", 0};
+SWClass TreeKey::classdef(classes);
+
+void TreeKey::init() {
+	myclass = &classdef;
+	unsnappedKeyText = "";
+	posChangeListener = 0;
+}
+
+
+void TreeKey::assureKeyPath(const char *keyBuffer) {
+
+	if (!keyBuffer) {
+		keyBuffer = unsnappedKeyText;
+		//assert we have something to do before setting root
+		if (!*keyBuffer)
+			return;
+	}
+
+	char *keybuf = 0;
+	stdstr(&keybuf, keyBuffer);
+
+	root();
+
+	// TODO: change to NOT use strtok. strtok is dangerous.
+	SWBuf tok = strtok(keybuf, "/");
+	tok.trim();
+	while (tok.size()) {
+		bool foundkey = false;
+		if (hasChildren()) {
+			firstChild();
+			if (tok == getLocalName()) {
+				foundkey = true;
+			}
+			else {
+				while (nextSibling()) {
+					if (getLocalName()) {
+						if (tok == getLocalName()) {
+							foundkey = true;
+							break;
+						}
+					}
+				}
+			}
+			if (!foundkey) {
+				append();
+				setLocalName(tok);
+				save();	    
+			}
+		}
+		else {
+			appendChild();
+			setLocalName(tok);
+			save();
+		}
+
+#ifdef DEBUG
+//      std::cout << getLocalName() << " : " << tok << std::endl;
+#endif
+
+		tok = strtok(0, "/");
+		tok.trim();
+
+	}
+	delete [] keybuf;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp
new file mode 100644
index 0000000..5164277
--- /dev/null
+++ b/src/keys/treekeyidx.cpp
@@ -0,0 +1,672 @@
+/******************************************************************************
+ *
+ *  treekeyidx.cpp -	
+ *
+ * $Id: treekeyidx.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <treekeyidx.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <swlog.h>
+#include <utilstr.h>
+#include <filemgr.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"TreeKeyIdx", "TreeKey", "SWKey", "SWObject", 0};
+SWClass TreeKeyIdx::classdef(classes);
+
+
+TreeKeyIdx::TreeKeyIdx(const TreeKeyIdx &ikey) : currentNode() {
+	init();
+	path = 0;
+	idxfd = 0;
+	datfd = 0;
+	copyFrom(ikey);
+}
+
+TreeKeyIdx::TreeKeyIdx(const char *idxPath, int fileMode) : currentNode() {
+	SWBuf buf;
+
+	init();
+	path = 0;
+	stdstr(&path, idxPath);
+
+	if (fileMode == -1) { // try read/write if possible
+		fileMode = FileMgr::RDWR;
+	}
+		
+	buf.setFormatted("%s.idx", path);
+	idxfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+	buf.setFormatted("%s.dat", path);
+	datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	if (datfd <= 0) {
+		SWLog::getSystemLog()->logError("%d", errno);
+		error = errno;
+	}
+	else {
+		root();
+	}
+}
+
+
+void TreeKeyIdx::init() {
+	myclass = &classdef;
+}
+
+
+TreeKeyIdx::~TreeKeyIdx () {
+	if (path)
+		delete [] path;
+
+	FileMgr::getSystemFileMgr()->close(idxfd);
+	FileMgr::getSystemFileMgr()->close(datfd);
+}
+
+
+const char *TreeKeyIdx::getLocalName() {
+	unsnappedKeyText = "";
+	return currentNode.name;
+}
+
+
+const char *TreeKeyIdx::getUserData(int *size) const {
+	unsnappedKeyText = "";
+	if (size)
+		*size = (int)currentNode.dsize;
+	return currentNode.userData;
+}
+
+
+void TreeKeyIdx::setUserData(const char *userData, int size) {
+	// this makes sure any unsnapped path exists
+	assureKeyPath();
+	if (currentNode.userData)
+		delete currentNode.userData;
+
+	if (!size)
+		size = strlen(userData) + 1;
+
+	currentNode.userData = new char [ size ];
+	memcpy(currentNode.userData, userData, size);
+	currentNode.dsize = size;
+}
+
+const char *TreeKeyIdx::setLocalName(const char *newName) {
+	unsnappedKeyText = "";
+	stdstr(&(currentNode.name), newName);
+	return currentNode.name;
+}
+
+
+void TreeKeyIdx::save() {
+	saveTreeNode(&currentNode);
+}
+
+
+void TreeKeyIdx::root() {
+	error = getTreeNodeFromIdxOffset(0, &currentNode);
+	positionChanged();
+}
+
+int TreeKeyIdx::getLevel() {
+	TreeNode iterator;
+	iterator.parent = currentNode.parent;
+	int level = 0;
+	while (iterator.parent > -1) {
+		level++;
+		getTreeNodeFromIdxOffset(iterator.parent, &iterator);
+	}
+	return level;
+}
+
+
+bool TreeKeyIdx::parent() {
+	if (currentNode.parent > -1) {
+		error = getTreeNodeFromIdxOffset(currentNode.parent, &currentNode);
+		positionChanged();
+		return true;
+	}
+	return false;
+}
+
+
+bool TreeKeyIdx::firstChild() {
+	if (currentNode.firstChild > -1) {
+		error = getTreeNodeFromIdxOffset(currentNode.firstChild, &currentNode);
+		positionChanged();
+		return true;
+	}
+	return false;
+}
+
+
+bool TreeKeyIdx::nextSibling() {
+	if (currentNode.next > -1) {
+		error = getTreeNodeFromIdxOffset(currentNode.next, &currentNode);
+		positionChanged();
+		return true;
+	}
+	return false;
+}
+
+
+bool TreeKeyIdx::previousSibling() {
+	TreeNode iterator;
+	__s32 target = currentNode.offset;
+	if (currentNode.parent > -1) {
+		getTreeNodeFromIdxOffset(currentNode.parent, &iterator);
+		getTreeNodeFromIdxOffset(iterator.firstChild, &iterator);
+		if (iterator.offset != target) {
+			while ((iterator.next != target) && (iterator.next > -1))
+				getTreeNodeFromIdxOffset(iterator.next, &iterator);
+			if (iterator.next > -1) {
+				error = getTreeNodeFromIdxOffset(iterator.offset, &currentNode);
+				positionChanged();
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+
+bool TreeKeyIdx::hasChildren() {
+	return (currentNode.firstChild > -1);
+}
+
+
+void TreeKeyIdx::append() {
+	TreeNode lastSib;
+	if (currentNode.offset) {
+		getTreeNodeFromIdxOffset(currentNode.offset, &lastSib);
+		while (lastSib.next > -1) {
+			getTreeNodeFromIdxOffset(lastSib.next, &lastSib);
+		}
+		__u32 idxOffset = idxfd->seek(0, SEEK_END);
+		lastSib.next = idxOffset;
+		saveTreeNodeOffsets(&lastSib);
+		__u32 parent = currentNode.parent;
+		currentNode.clear();
+		currentNode.offset = idxOffset;
+		currentNode.parent = parent;
+		positionChanged();
+	}
+}
+
+
+void TreeKeyIdx::appendChild() {
+	if (firstChild()) {
+		append();
+	}
+	else {
+		__u32 idxOffset = idxfd->seek(0, SEEK_END);
+		currentNode.firstChild = idxOffset;
+		saveTreeNodeOffsets(&currentNode);
+		__u32 parent = currentNode.offset;
+		currentNode.clear();
+		currentNode.offset = idxOffset;
+		currentNode.parent = parent;
+	}
+	positionChanged();
+}
+
+
+void TreeKeyIdx::insertBefore() {
+}
+
+
+void TreeKeyIdx::remove() {
+	TreeNode node;
+	bool done = false;
+	if (currentNode.offset) {
+		getTreeNodeFromIdxOffset(currentNode.offset, &node);
+		if (node.parent > -1) {
+			TreeNode parent;
+			getTreeNodeFromIdxOffset(node.parent, &parent);
+			if (parent.firstChild == node.offset) {
+				parent.firstChild = node.next;
+				saveTreeNodeOffsets(&parent);
+				getTreeNodeFromIdxOffset(parent.offset, &currentNode);
+				done = true;
+			}
+		}
+		if (!done) {
+			TreeNode iterator;
+			__s32 target = currentNode.offset;
+			if (currentNode.parent > -1) {
+				getTreeNodeFromIdxOffset(currentNode.parent, &iterator);
+				getTreeNodeFromIdxOffset(iterator.firstChild, &iterator);
+				if (iterator.offset != target) {
+					while ((iterator.next != target) && (iterator.next > -1))
+						getTreeNodeFromIdxOffset(iterator.next, &iterator);
+						if (iterator.next > -1) {
+							TreeNode prev;
+							getTreeNodeFromIdxOffset(iterator.offset, &prev);
+							prev.next = node.next;
+							saveTreeNodeOffsets(&prev);
+							getTreeNodeFromIdxOffset(prev.offset, &currentNode);
+					}
+				}
+			}
+		}
+		positionChanged();
+	}
+}
+
+
+/******************************************************************************
+ * TreeKeyIdx::Create	- Creates new key idx/dat files
+ *
+ * ENT: path	- directory to store module files
+ * RET: error status
+ */
+
+signed char TreeKeyIdx::create(const char *ipath) {
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd, *fd2;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s.dat", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s.idx", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	TreeKeyIdx newTree(path);
+	TreeKeyIdx::TreeNode root;
+	stdstr(&(root.name), "");
+	newTree.saveTreeNode(&root);
+
+	delete [] path;
+
+	return 0;
+}
+
+
+/******************************************************************************
+ * zStr::getidxbufdat	- Gets the index string at the given dat offset
+ *				NOTE: buf is calloc'd, or if not null, realloc'd and must
+ *					be free'd by calling function
+ *
+ * ENT:	ioffset	- offset in dat file to lookup
+ *		node		- address of pointer to allocate for storage of string
+ */
+
+void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const {
+	unsnappedKeyText = "";
+	char ch;
+	__s32  tmp;
+	__u16  tmp2;
+
+	if (datfd > 0) {
+
+		datfd->seek(ioffset, SEEK_SET);
+
+		datfd->read(&tmp, 4);
+		node->parent = swordtoarch32(tmp);
+
+		datfd->read(&tmp, 4);
+		node->next = swordtoarch32(tmp);
+
+		datfd->read(&tmp, 4);
+		node->firstChild = swordtoarch32(tmp);
+
+		SWBuf name;
+		do {
+			datfd->read(&ch, 1);
+			name += ch;
+		} while (ch);
+
+		stdstr(&(node->name), name.c_str());
+
+		datfd->read(&tmp2, 2);
+		node->dsize = swordtoarch16(tmp2);
+
+		if (node->dsize) {
+			if (node->userData)
+				delete [] node->userData;
+			node->userData = new char [node->dsize];
+			datfd->read(node->userData, node->dsize);
+		}
+	}
+}
+
+
+/******************************************************************************
+ * zStr::getidxbuf	- Gets the index string at the given idx offset
+ *						NOTE: buf is calloc'd, or if not null, realloc'd
+ *							and must be freed by calling function
+ *
+ * ENT:	ioffset	- offset in idx file to lookup
+ *		buf		- address of pointer to allocate for storage of string
+ */
+
+char TreeKeyIdx::getTreeNodeFromIdxOffset(long ioffset, TreeNode *node) const {
+	unsnappedKeyText = "";
+	__u32 offset;
+	char error = KEYERR_OUTOFBOUNDS;
+	
+	if (ioffset < 0) {
+		ioffset = 0;
+		error = 77;	// out of bounds but still position to 0;
+	}
+
+	node->offset = ioffset;
+	if (idxfd > 0) {
+		if (idxfd->getFd() > 0) {
+			idxfd->seek(ioffset, SEEK_SET);
+			if (idxfd->read(&offset, 4) == 4) {
+				offset = swordtoarch32(offset);
+				error = (error == 77) ? KEYERR_OUTOFBOUNDS : 0;
+				getTreeNodeFromDatOffset(offset, node);
+			}
+			else {
+				idxfd->seek(-4, SEEK_END);
+				if (idxfd->read(&offset, 4) == 4) {
+					offset = swordtoarch32(offset);
+					getTreeNodeFromDatOffset(offset, node);
+				}
+			}
+		}
+	}
+	return error;
+}
+
+
+unsigned long TreeKeyIdx::getOffset() const {
+	unsnappedKeyText = "";
+	return currentNode.offset;
+}
+
+void TreeKeyIdx::setOffset(unsigned long offset) {
+	error = getTreeNodeFromIdxOffset(offset, &currentNode);
+	positionChanged();
+}
+
+
+void TreeKeyIdx::saveTreeNodeOffsets(TreeNode *node) {
+	unsnappedKeyText = "";
+	long datOffset = 0;
+	__s32 tmp;
+
+	if (idxfd > 0) {
+		idxfd->seek(node->offset, SEEK_SET);
+		if (idxfd->read(&tmp, 4) != 4) {
+			datOffset = datfd->seek(0, SEEK_END);
+			tmp = archtosword32(datOffset);
+			idxfd->write(&tmp, 4);
+		}
+		else {
+			datOffset = swordtoarch32(tmp);
+			datfd->seek(datOffset, SEEK_SET);
+		}
+
+		tmp = archtosword32(node->parent);
+		datfd->write(&tmp, 4);
+
+		tmp = archtosword32(node->next);
+		datfd->write(&tmp, 4);
+
+		tmp = archtosword32(node->firstChild);
+		datfd->write(&tmp, 4);
+	}
+}
+
+
+void TreeKeyIdx::copyFrom(const TreeKeyIdx &ikey) {
+	unsnappedKeyText = "";
+
+	SWKey::copyFrom(ikey);
+
+	currentNode.offset = ikey.currentNode.offset;
+	currentNode.parent = ikey.currentNode.parent;
+	currentNode.next = ikey.currentNode.next;
+	currentNode.firstChild = ikey.currentNode.firstChild;
+	stdstr(&(currentNode.name), ikey.currentNode.name);
+	currentNode.dsize = ikey.currentNode.dsize;
+
+	if (currentNode.userData)
+		delete [] currentNode.userData;
+	if (currentNode.dsize) {
+		currentNode.userData = new char [ currentNode.dsize ];
+		memcpy(currentNode.userData, ikey.currentNode.userData, currentNode.dsize);
+	}
+	else currentNode.userData = 0;
+
+	bool newFiles = true;
+
+	if (path && ikey.path)
+		newFiles = strcmp(path, ikey.path);
+
+	if (newFiles) {
+		stdstr(&path, ikey.path);
+
+		if (idxfd) {
+			FileMgr::getSystemFileMgr()->close(idxfd);
+			FileMgr::getSystemFileMgr()->close(datfd);
+		}
+		idxfd = FileMgr::getSystemFileMgr()->open(ikey.idxfd->path, ikey.idxfd->mode, ikey.idxfd->perms);
+		datfd = FileMgr::getSystemFileMgr()->open(ikey.datfd->path, ikey.datfd->mode, ikey.datfd->perms);
+	}
+	positionChanged();
+}
+
+
+void TreeKeyIdx::saveTreeNode(TreeNode *node) {
+	long datOffset = 0;
+	__s32 tmp;
+	if (idxfd > 0) {
+
+		idxfd->seek(node->offset, SEEK_SET);
+		datOffset = datfd->seek(0, SEEK_END);
+		tmp = archtosword32(datOffset);
+		idxfd->write(&tmp, 4);
+
+		saveTreeNodeOffsets(node);
+
+		datfd->write(node->name, strlen(node->name));
+		char null = 0;
+		datfd->write(&null, 1);
+
+		__u16 tmp2 = archtosword16(node->dsize);
+		datfd->write(&tmp2, 2);
+
+		if (node->dsize) {
+			datfd->write(node->userData, node->dsize);
+		}
+	}
+}
+
+
+void TreeKeyIdx::setText(const char *ikey) {
+	char *buf = 0;
+	stdstr(&buf, ikey);
+	SWBuf leaf = strtok(buf, "/");
+	leaf.trim();
+	root();
+	while ((leaf.size()) && (!popError())) {
+		bool ok, inChild = false;
+		error = KEYERR_OUTOFBOUNDS;
+		for (ok = firstChild(); ok; ok = nextSibling()) {
+			inChild = true;
+			if (leaf == getLocalName()) {
+				error = 0;
+				break;
+			}
+		}
+		leaf = strtok(0, "/");
+		leaf.trim();
+		if (!ok) {
+		    	if (inChild) {	// if we didn't find a matching child node, default to first child
+				parent();
+				firstChild();
+			}
+			error = KEYERR_OUTOFBOUNDS;
+		}
+	}
+	if (leaf.size())
+		error = KEYERR_OUTOFBOUNDS;
+	delete [] buf;
+	unsnappedKeyText = ikey;
+	positionChanged();
+}
+
+
+
+void TreeKeyIdx::copyFrom(const SWKey &ikey) {
+	unsnappedKeyText = ikey;
+	SWKey::copyFrom(ikey);
+	positionChanged();
+}
+
+void TreeKeyIdx::setPosition(SW_POSITION p) {
+	switch (p) {
+	case POS_TOP:
+		root();
+		break;
+	case POS_BOTTOM:
+		error = getTreeNodeFromIdxOffset(idxfd->seek(-4, SEEK_END), &currentNode);
+		break;
+	} 
+	positionChanged();
+	popError();	// clear error from normalize
+}
+
+
+int TreeKeyIdx::_compare (const TreeKeyIdx & ikey) {
+		return (getOffset() - ikey.getOffset());
+}
+
+
+int TreeKeyIdx::compare(const SWKey &ikey) {
+	TreeKeyIdx *treeKey = SWDYNAMIC_CAST(TreeKeyIdx, (&ikey));
+	if (treeKey)
+		return _compare(*treeKey);
+	return SWKey::compare(ikey);
+}
+
+
+void TreeKeyIdx::decrement(int steps) {
+	error = getTreeNodeFromIdxOffset(currentNode.offset - (4*steps), &currentNode);
+	positionChanged();
+}
+
+void TreeKeyIdx::increment(int steps) {
+	error = getTreeNodeFromIdxOffset(currentNode.offset + (4*steps), &currentNode);
+	if (error) {
+//		SWLog::getSystemLog()->logError("error: %d", error);
+	}
+	positionChanged();
+
+/*
+	// assert positive
+	if (steps < 0) {
+		decrement(steps * -1);
+		return;
+	}
+
+	while (steps > 0) {
+		if (!firstChild()) {
+			if (!nextSibbling() {
+				error = KEYERR_OUTOFBOUNDS;
+				return;
+			}
+		}
+		steps--;
+	}
+*/
+}
+
+
+
+const char *TreeKeyIdx::getText() const {
+	TreeNode parent;
+	static SWBuf fullPath;
+	fullPath = currentNode.name;
+	parent.parent = currentNode.parent;
+	while (parent.parent > -1) {
+		getTreeNodeFromIdxOffset(parent.parent, &parent);
+		fullPath = ((SWBuf)parent.name) + (SWBuf) "/" + fullPath;
+	}
+	// we've snapped; clear our unsnapped text holder
+	unsnappedKeyText = "";
+	return fullPath.c_str();
+}
+
+
+TreeKeyIdx::TreeNode::TreeNode() {
+
+	name       = 0;
+	stdstr(&name, "");
+	userData   = 0;
+
+	clear();
+}
+
+
+void TreeKeyIdx::TreeNode::clear() {
+	offset     = 0;
+	parent     = -1;
+	next       = -1;
+	firstChild = -1;
+	dsize      = 0;
+
+	if (name)
+		delete [] name;
+	name = 0;
+	stdstr(&name, "");
+
+	if (userData)
+		delete [] userData;
+	userData   = 0;
+}
+
+
+TreeKeyIdx::TreeNode::~TreeNode() {
+	if (name)
+		delete [] name;
+	
+	if (userData)
+		delete [] userData;
+}
+
+
+SWKey *TreeKeyIdx::clone() const
+{
+	return new TreeKeyIdx(*this);
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/keys/versekey.cpp b/src/keys/versekey.cpp
new file mode 100644
index 0000000..6ce0858
--- /dev/null
+++ b/src/keys/versekey.cpp
@@ -0,0 +1,1856 @@
+/******************************************************************************
+ *
+ *  versekey.cpp -	code for class 'VerseKey'- a standard Biblical
+ *			verse key
+ *
+ * $Id: versekey.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <swmacs.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <utilstr.h>
+#include <stringmgr.h>
+#include <swkey.h>
+#include <swlog.h>
+#include <versekey.h>
+#include <swlocale.h>
+#include <roman.h>
+#include <versificationmgr.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"VerseKey", "SWKey", "SWObject", 0};
+SWClass VerseKey::classdef(classes);
+
+/******************************************************************************
+ *  Initialize static members of VerseKey
+ */
+
+int           VerseKey::instance       = 0;
+
+
+/******************************************************************************
+ * VerseKey::init - initializes instance of VerseKey
+ */
+
+void VerseKey::init(const char *v11n) {
+	myclass = &classdef;
+
+	instance++;
+	autonorm = 1;		// default auto normalization to true
+	intros = false;		// default display intros option is false
+	upperBound = 0;
+	lowerBound = 0;
+	boundSet = false;
+	testament = 1;
+	book = 1;
+	chapter = 1;
+	verse = 1;
+	suffix = 0;
+	tmpClone = 0;
+	refSys = 0;
+
+	setVersificationSystem(v11n);
+}
+
+/******************************************************************************
+ * VerseKey Constructor - initializes instance of VerseKey
+ *
+ * ENT:	ikey - base key (will take various forms of 'BOOK CH:VS'.  See
+ *		VerseKey::parse for more detailed information)
+ */
+
+VerseKey::VerseKey(const SWKey &ikey) : SWKey(ikey)
+{
+	init();
+	copyFrom(ikey);
+}
+
+
+VerseKey::VerseKey(const SWKey *ikey) : SWKey(*ikey)
+{
+	init();
+	if (ikey)
+		copyFrom(*ikey);
+}
+
+
+/******************************************************************************
+ * VerseKey Constructor - initializes instance of VerseKey
+ *
+ * ENT:	ikey - text key (will take various forms of 'BOOK CH:VS'.  See
+ *		VerseKey::parse for more detailed information)
+ */
+
+VerseKey::VerseKey(const char *ikeyText) : SWKey(ikeyText)
+{
+	init();
+	if (ikeyText)
+		parse();
+}
+
+
+VerseKey::VerseKey(VerseKey const &k) : SWKey(k)
+{
+	init();
+	copyFrom(k);
+}
+
+
+/******************************************************************************
+ * VerseKey::setFromOther - Positions this VerseKey to another VerseKey
+ */
+
+void VerseKey::setFromOther(const VerseKey &ikey) {
+	if (refSys == ikey.refSys) {
+		testament = ikey.getTestament();
+		book = ikey.getBook();
+		chapter = ikey.getChapter();
+		verse = ikey.getVerse();
+		suffix = ikey.getSuffix();
+        }
+	// TODO: versification mapping
+        // Here is where we will do v11n system conversions in the future
+        // when we have a conversion mechanism
+        // Ben Morgan has started thinking about this
+        // Konstantin Maslyuk <kalemas@mail.ru> has submitted a patch)
+        // Asked Konstantin to try his patch out with his favorite
+        // SWORD frontend and report back how it goes.  Need to follow up
+        else {
+	        // For now, this is the best we can do
+        	setText(ikey.getText());
+        }
+}
+
+
+void VerseKey::positionFrom(const SWKey &ikey) {
+ 	error = 0;
+        const SWKey *fromKey = &ikey;
+	ListKey *tryList = SWDYNAMIC_CAST(ListKey, fromKey);
+	if (tryList) {
+		SWKey *k = tryList->getElement();
+		if (k) fromKey = k;
+	}
+	VerseKey *tryVerse = SWDYNAMIC_CAST(VerseKey, fromKey);
+	if (tryVerse) {
+		setFromOther(*tryVerse);
+	}
+	else {
+		SWKey::positionFrom(*fromKey);
+		parse();
+	}
+
+ 	// should we always perform bounds checks?  Tried but seems to cause infinite recursion
+	if (_compare(getUpperBound()) > 0) {
+		setFromOther(getUpperBound());
+		error = KEYERR_OUTOFBOUNDS;
+	}
+	if (_compare(getLowerBound()) < 0) {
+		setFromOther(getLowerBound());
+		error = KEYERR_OUTOFBOUNDS;
+	}
+}
+
+
+/******************************************************************************
+ * VerseKey::copyFrom - Equates this VerseKey to another VerseKey
+ */
+
+void VerseKey::copyFrom(const VerseKey &ikey) {
+	autonorm = ikey.autonorm;
+	intros = ikey.intros;
+	testament = ikey.getTestament();
+	book = ikey.getBook();
+	chapter = ikey.getChapter();
+	verse = ikey.getVerse();
+	suffix = ikey.getSuffix();
+	setLocale(ikey.getLocale());
+	setVersificationSystem(ikey.getVersificationSystem());
+	if (ikey.isBoundSet()) {
+		setLowerBound(ikey.getLowerBound());
+		setUpperBound(ikey.getUpperBound());
+	}
+}
+
+
+/******************************************************************************
+ * VerseKey::copyFrom - Equates this VerseKey to another SWKey
+ */
+
+void VerseKey::copyFrom(const SWKey &ikey) {
+	// check to see if we can do a more specific copy
+	// plus some optimizations
+	const SWKey *fromKey = &ikey;
+	ListKey *tryList = SWDYNAMIC_CAST(ListKey, fromKey);
+	if (tryList) {
+		SWKey *k = tryList->getElement();
+		if (k) fromKey = k;
+	}
+	VerseKey *tryVerse = SWDYNAMIC_CAST(VerseKey, fromKey);
+	if (tryVerse) {
+		copyFrom(*tryVerse);
+	}
+	else {
+		SWKey::copyFrom(*fromKey);
+		parse();
+	}
+}
+
+
+VerseKey::VerseKey(const char *min, const char *max, const char *v11n) : SWKey()
+{
+	init(v11n);
+	ListKey tmpListKey = parseVerseList(min);
+	if (tmpListKey.getCount()) {
+		VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement(0));
+		setLowerBound(*newElement);
+	}
+	tmpListKey = parseVerseList(max, min, true);
+	if (tmpListKey.getCount()) {
+		VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement(0));
+		setUpperBound((newElement->isBoundSet())?newElement->getUpperBound():*newElement);
+	}
+	setPosition(TOP);
+}
+
+
+SWKey *VerseKey::clone() const
+{
+	return new VerseKey(*this);
+}
+
+
+/******************************************************************************
+ * VerseKey Destructor - cleans up instance of VerseKey
+ *
+ * ENT:	ikey - text key
+ */
+
+VerseKey::~VerseKey() {
+
+	delete tmpClone;
+
+	--instance;
+}
+
+
+void VerseKey::setVersificationSystem(const char *name) {
+	const VersificationMgr::System *newRefSys = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(name);
+	// TODO: cheese, but what should we do if requested v11n system isn't found?
+	if (!newRefSys)   newRefSys = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem("KJV");
+	if (refSys != newRefSys) {
+		refSys = newRefSys;
+		BMAX[0] = refSys->getBMAX()[0];
+		BMAX[1] = refSys->getBMAX()[1];
+
+		// TODO: adjust bounds for versificaion system ???
+		// TODO: when we have mapping done, rethink this
+		//necessary as our bounds might not mean anything in the new v11n system
+		clearBounds();
+	}
+
+}
+
+
+const char *VerseKey::getVersificationSystem() const { return refSys->getName(); }
+
+
+
+/******************************************************************************
+ * VerseKey::parse - parses keytext into testament|book|chapter|verse
+ *
+ * RET:	error status
+ */
+
+char VerseKey::parse(bool checkAutoNormalize)
+{
+	testament = BMAX[1]?2:1;
+	book      = BMAX[BMAX[1]?1:0];
+	chapter   = 1;
+	verse     = 1;
+
+	int error = 0;
+
+	if (keytext) {
+		// pass our own copy of keytext as keytext memory may be freshed during parse 
+		ListKey tmpListKey = parseVerseList(SWBuf(keytext).c_str());
+		if (tmpListKey.getCount()) {
+			this->positionFrom(*tmpListKey.getElement(0));
+			error = this->error;
+		} else error = 1;
+	}
+	if (checkAutoNormalize) {
+		normalize(true);
+	}
+	freshtext();
+
+	return (this->error) ? this->error : (this->error = error);
+}
+
+
+/******************************************************************************
+ * VerseKey::freshtext - refreshes keytext based on
+ *				testament|book|chapter|verse
+ */
+
+void VerseKey::freshtext() const
+{
+	char buf[2024];
+	int realTest = testament;
+	int realbook = book;
+
+	if (book < 1) {
+		if (testament < 1)
+			sprintf(buf, "[ Module Heading ]");
+		else sprintf(buf, "[ Testament %d Heading ]", (int)testament);
+	}
+	else {
+		if (realbook > BMAX[realTest-1]) {
+			realbook -= BMAX[realTest-1];
+			if (realTest < 2)
+				realTest++;
+			if (realbook > BMAX[realTest-1])
+				realbook = BMAX[realTest-1];
+		}
+		sprintf(buf, "%s %d:%d", getBookName(), chapter, verse);
+		if (suffix) {
+			buf[strlen(buf)+1] = 0;
+			buf[strlen(buf)] = suffix;
+		}
+	}
+
+	stdstr((char **)&keytext, buf);
+}
+
+
+
+/************************************************************************
+ * VerseKey::getBookAbbrev - Attempts to find a book no from a name or
+ *                           abbreviation
+ *
+ * ENT:	abbr - key for which to search;
+ * RET:	book number or < 0 = not valid
+ */
+
+int VerseKey::getBookFromAbbrev(const char *iabbr) const
+{
+	int diff, abLen, min, max, target, retVal = -1;
+
+	char *abbr = 0;
+
+	int abbrevsCnt;
+
+	const struct abbrev *abbrevs = getPrivateLocale()->getBookAbbrevs(&abbrevsCnt);
+
+	StringMgr* stringMgr = StringMgr::getSystemStringMgr();
+	const bool hasUTF8Support = StringMgr::hasUTF8Support();
+
+	// The first iteration of this loop tries to uppercase
+	// the string. If we still fail to match, we try
+	// matching the string without any toupper logic.
+	// This is useful for, say, Chinese user input
+	// on a system that doesn't properly support
+	// a true Unicode-toupper function (!hasUTF8Support)
+	for (int i = 0; i < 2; i++) {
+		stdstr(&abbr, iabbr, 2);
+		strstrip(abbr);
+
+		if (!i) {
+			if (hasUTF8Support) { //we have support for UTF-8 handling; we expect UTF-8 encoded locales
+				stringMgr->upperUTF8(abbr, strlen(abbr)*2);
+			}
+			else {
+				stringMgr->upperLatin1(abbr);
+			}
+		}
+
+		abLen = strlen(abbr);
+
+		if (abLen) {
+			min = 0;
+			max = abbrevsCnt;
+
+			// binary search for a match
+			while(1) {
+				target = min + ((max - min) / 2);
+				diff = strncmp(abbr, abbrevs[target].ab, abLen);
+				if ((!diff)||(target >= max)||(target <= min))
+					break;
+				if (diff > 0)
+					min = target;
+				else	max = target;
+			}
+
+			// lets keep backing up till we find the 'first' valid match
+			for (; target > 0; target--) {
+				if (strncmp(abbr, abbrevs[target-1].ab, abLen))
+					break;
+			}
+
+			if (!diff) {
+				// lets keep moving forward till we find an abbrev in our refSys
+				retVal = refSys->getBookNumberByOSISName(abbrevs[target].osis);
+				while ((retVal < 0)  && (target < max) && (!strncmp(abbr, abbrevs[target+1].ab, abLen))) {
+					target++;
+					retVal = refSys->getBookNumberByOSISName(abbrevs[target].osis);
+				}
+			}
+			else retVal = -1;
+		}
+		if (retVal > 0)
+			break;
+	}
+	delete [] abbr;
+	return retVal;
+}
+
+
+/******************************************************************************
+ * VerseKey::validateCurrentLocale - be sure a locale book abbrevs set is complete
+ *
+ */
+void VerseKey::validateCurrentLocale() const {
+	if (SWLog::getSystemLog()->getLogLevel() >= SWLog::LOG_DEBUG) { //make sure log is wanted, this loop stuff costs a lot of time
+		for (int i = 0; i < refSys->getBookCount(); i++) {
+			const int bn = getBookFromAbbrev(getPrivateLocale()->translate(refSys->getBook(i)->getLongName()));
+			if (bn != i+1) {
+				char *abbr = 0;
+				stdstr(&abbr, getPrivateLocale()->translate(refSys->getBook(i)->getLongName()), 2);
+				strstrip(abbr);
+				SWLog::getSystemLog()->logDebug("VerseKey::Book: %s does not have a matching toupper abbrevs entry! book number returned was: %d, should be %d. Required entry to add to locale:", abbr, bn, i);
+
+				StringMgr* stringMgr = StringMgr::getSystemStringMgr();
+				const bool hasUTF8Support = StringMgr::hasUTF8Support();
+				if (hasUTF8Support) { //we have support for UTF-8 handling; we expect UTF-8 encoded locales
+					stringMgr->upperUTF8(abbr, strlen(abbr)*2);
+				}
+				else {
+					stringMgr->upperLatin1(abbr);
+				}
+				SWLog::getSystemLog()->logDebug("%s=%s\n", abbr, refSys->getBook(i)->getOSISName());
+				delete [] abbr;
+			}
+		}
+	}
+}
+
+
+/******************************************************************************
+ * VerseKey::parseVerseList - Attempts to parse a buffer into separate
+ *				verse entries returned in a ListKey
+ *
+ * ENT:	buf		- buffer to parse;
+ *	defaultKey	- if verse, chap, book, or testament is left off,
+ *				pull info from this key (ie. Gen 2:3; 4:5;
+ *				Gen would be used when parsing the 4:5 section)
+ *	expandRange	- whether or not to expand eg. John 1:10-12 or just
+ *				save John 1:10
+ *
+ * RET:	ListKey reference filled with verse entries contained in buf
+ *
+ * COMMENT: This code works but wreaks.  Rewrite to make more maintainable.
+ */
+
+ListKey VerseKey::parseVerseList(const char *buf, const char *defaultKey, bool expandRange, bool useChapterAsVerse) {
+
+	// hold on to our own copy of params, as threads/recursion may change outside values
+	const char *bufStart = buf;
+	SWBuf iBuf = buf;
+	buf = iBuf.c_str();
+	SWBuf iDefaultKey = defaultKey;
+	if (defaultKey) defaultKey = iDefaultKey.c_str();
+
+	char book[2048];	// TODO: bad, remove
+	char number[2048];	// TODO: bad, remove
+	*book = 0;
+	*number = 0;
+	int tobook = 0;
+	int tonumber = 0;
+	char suffix = 0;
+	int chap = -1, verse = -1;
+	int bookno = 0;
+	int loop;
+	char comma = 0;
+	char dash = 0;
+	const char *orig = buf;
+	int q;
+	ListKey tmpListKey;
+	ListKey internalListKey;
+	char lastPartial = 0;
+	bool inTerm = true;
+	int notAllDigits = 0;
+	bool doubleF = false;
+
+	// assert we have a buffer
+	if (!buf) return internalListKey;
+
+	VerseKey *curKey  = (VerseKey *)this->clone();
+	VerseKey *lastKey = (VerseKey *)this->clone();
+	lastKey->clearBounds();
+	curKey->clearBounds();
+
+	// some silly checks for corner cases
+	if (!strcmp(buf, "[ Module Heading ]")) {
+		curKey->setVerse(0);
+		curKey->setChapter(0);
+		curKey->setBook(0);
+		curKey->setTestament(0);
+		lastKey->setLowerBound(*curKey);
+		lastKey->setUpperBound(*curKey);
+		internalListKey << *lastKey;
+		delete curKey;
+		delete lastKey;
+		return internalListKey;
+	}
+	if ((!strncmp(buf, "[ Testament ", 12)) &&
+	    (isdigit(buf[12])) &&
+	    (!strcmp(buf+13, " Heading ]"))) {
+		curKey->setVerse(0);
+		curKey->setChapter(0);
+		curKey->setBook(0);
+		curKey->setTestament(buf[12]-48);
+		lastKey->setLowerBound(*curKey);
+		lastKey->setUpperBound(*curKey);
+		internalListKey << *lastKey;
+		delete curKey;
+		delete lastKey;
+		return internalListKey;
+	}
+
+	curKey->setAutoNormalize(isAutoNormalize());
+	lastKey->setAutoNormalize(false);
+	if (defaultKey) *lastKey = defaultKey;
+
+	while (*buf) {
+		switch (*buf) {
+		case ':':
+			if (buf[1] != ' ') {		// for silly "Mat 1:1: this verse...."
+				number[tonumber] = 0;
+				tonumber = 0;
+				if (*number) {
+					if (chap >= 0)
+						verse = atoi(number);
+					else	chap  = atoi(number);
+				}
+				*number = 0;
+				comma = 0;
+				break;
+			}
+			// otherwise drop down to next case
+		case ' ':
+			inTerm = true;
+			while (true) {
+				if ((!*number) || (chap < 0))
+					break;
+				for (q = 1; ((buf[q]) && (buf[q] != ' ')); q++);
+				if (buf[q] == ':')
+					break;
+				inTerm = false;
+				break;
+			}
+			if (inTerm) {
+				if (tobook < 1 || book[tobook-1] != ' ') {
+					book[tobook++] = ' ';
+				}
+				break;
+			}
+
+		case '-':
+			if (chap == -1) {
+				book[tobook] = *buf;
+				book[tobook+1] = *(buf+1);
+				book[tobook+2] = 0;
+				int bookno = getBookFromAbbrev(book);
+				if (bookno > -1) {
+					tobook++;
+					buf++;
+					break;
+				}
+			}
+		case ',': // on number new verse
+		case ';': // on number new chapter
+			number[tonumber] = 0;
+			tonumber = 0;
+			if (*number) {
+				if (chap >= 0)
+					verse = atoi(number);
+				else	chap = atoi(number);
+			}
+			*number = 0;
+			book[tobook] = 0;
+			tobook = 0;
+			bookno = -1;
+			if (*book) {
+				loop = strlen(book) - 1;
+
+				for (; loop+1; loop--) { if (book[loop] == ' ') book[loop] = 0; else break; }
+
+				if (loop > 0 && isdigit(book[loop-1]) && book[loop] >= 'a' && book[loop] <= 'z') {
+					book[loop--] = 0;
+				}
+				for (; loop+1; loop--) {
+					if ((isdigit(book[loop])) || (book[loop] == ' ')) {
+						book[loop] = 0;
+						continue;
+					}
+					else {
+						if ((SW_toupper(book[loop])=='F')&&(loop)) {
+							if ((isdigit(book[loop-1])) || (book[loop-1] == ' ') || (SW_toupper(book[loop-1]) == 'F')) {
+								book[loop] = 0;
+								continue;
+							}
+						}
+					}
+					break;
+				}
+
+				for (loop = strlen(book) - 1; loop+1; loop--) {
+					if (book[loop] == ' ') {
+						// "PS C" is ok, but "II C" is not ok
+						if (isroman(&book[loop+1]) && !isroman(book,loop)) {
+							if (verse == -1) {
+								verse = chap;
+								chap = from_rom(&book[loop+1]);
+								book[loop] = 0;
+							}
+						}
+	        				break;
+					}
+				}
+
+				// check for special inscriptio and subscriptio which are saved as book intro and chap 1 intro (for INTF)
+				for (loop = strlen(book) - 1; loop+1; loop--) {
+					if (book[loop] == ' ') {
+						if (!strnicmp(&book[loop+1], "inscriptio", strlen(&book[loop+1]))) {
+							book[loop] = 0;
+							verse = 0;
+							chap = 0;
+						}
+						else if (!strnicmp(&book[loop+1], "subscriptio", strlen(&book[loop+1]))) {
+							book[loop] = 0;
+							verse = 0;
+							chap = 1;
+						}
+	        				break;
+					}
+				}
+
+				if ((!stricmp(book, "V")) || (!stricmp(book, "VER"))) {	// Verse abbrev
+					if (verse == -1) {
+						verse = chap;
+						chap = lastKey->getChapter();
+						*book = 0;
+					}
+				}
+				if ((!stricmp(book, "ch")) || (!stricmp(book, "chap"))) {	// Verse abbrev
+					strcpy(book, lastKey->getBookName());
+				}
+				bookno = getBookFromAbbrev(book);
+				if ((bookno > -1) && (suffix == 'f') && (book[strlen(book)-1] == 'f')) {
+					suffix = 0;
+				}
+			}
+			if (((bookno > -1) || (!*book)) && ((*book) || (chap >= 0) || (verse >= 0))) {
+				char partial = 0;
+				curKey->setVerse(1);
+				curKey->setChapter(1);
+				curKey->setBook(1);
+
+				if (bookno < 0) {
+					curKey->setTestament(lastKey->getTestament());
+					curKey->setBook(lastKey->getBook());
+				}
+				else {
+					int t = 1;
+					if (bookno > BMAX[0]) {
+						t++;
+						bookno -= BMAX[0];
+					}
+					curKey->setTestament(t);
+					curKey->setBook(bookno);
+				}
+				
+
+				if (((comma)||((verse < 0)&&(bookno < 0)))&&(!lastPartial)) {
+//				if (comma) {
+					curKey->setChapter(lastKey->getChapter());
+					curKey->setVerse(chap);  // chap because this is the first number captured
+					if (suffix) {
+						curKey->setSuffix(suffix);
+					}
+				}
+				else {
+					if (useChapterAsVerse && verse < 0 && chap > 0 && curKey->getChapterMax() == 1) {
+						verse = chap;
+						chap = 1;
+					}
+
+					
+					if (chap >= 0) {
+						curKey->setChapter(chap);
+					}
+					else {
+						partial++;
+						curKey->setChapter(1);
+					}
+					if (verse >= 0) {
+						curKey->setVerse(verse);
+						if (suffix) {
+							curKey->setSuffix(suffix);
+						}
+					}
+					else {
+						partial++;
+						curKey->setVerse(1);
+					}
+				}
+
+				// check for '-'
+				for (q = 0; ((buf[q]) && (buf[q] == ' ')); q++);
+				if ((buf[q] == '-') && (expandRange)) {	// if this is a dash save lowerBound and wait for upper
+					buf+=q;
+					lastKey->setLowerBound(*curKey);
+					lastKey->setPosition(TOP);
+					tmpListKey << *lastKey;
+					((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize());
+					tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+				}
+				else {
+					if (!dash) { 	// if last separator was not a dash just add
+						if (expandRange && partial) {
+							lastKey->setLowerBound(*curKey);
+							if (partial > 1)
+								curKey->setPosition(MAXCHAPTER);
+							if (partial > 0)
+								*curKey = MAXVERSE;
+							lastKey->setUpperBound(*curKey);
+							*lastKey = TOP;
+							tmpListKey << *lastKey;
+							((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize());
+							tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+						}
+						else {
+							bool f = false;
+							if (curKey->getSuffix() == 'f') {
+								curKey->setSuffix(0);
+								f = true;
+							}
+							lastKey->setLowerBound(*curKey);
+							if (f && doubleF) (*curKey) = MAXVERSE;
+							else if (f) (*curKey)++;
+							lastKey->setUpperBound(*curKey);
+							*lastKey = TOP;
+							tmpListKey << *lastKey;
+							((VerseKey *)tmpListKey.getElement())->setAutoNormalize(isAutoNormalize());
+							tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+						}
+					}
+					else	if (expandRange) {
+						VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement());
+						if (newElement) {
+							if (partial > 1)
+								*curKey = MAXCHAPTER;
+							if (partial > 0)
+								*curKey = MAXVERSE;
+							newElement->setUpperBound(*curKey);
+							*lastKey = *curKey;
+							*newElement = TOP;
+							tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+						}
+					}
+				}
+				lastPartial = partial;
+			}
+			*book = 0;
+			chap = -1;
+			verse = -1;
+			suffix = 0;
+			if (*buf == ',')
+				comma = 1;
+			else	comma = 0;
+			if (*buf == '-')
+				dash = 1;
+			else	dash = 0;
+			break;
+		case 10:	// ignore these
+		case 13:
+		case '[':
+		case ']':
+		case '(':
+		case ')':
+		case '{':
+		case '}':
+			break;
+		case '.':
+			if (buf > orig) {			// ignore (break) if preceeding char is not a digit 
+				for (notAllDigits = tobook; notAllDigits; notAllDigits--) {
+					if ((!isdigit(book[notAllDigits-1])) && (!strchr(" .", book[notAllDigits-1])))
+						break;
+				}
+				if (!notAllDigits && !isdigit(buf[1]))
+					break;
+			}
+
+			number[tonumber] = 0;
+			tonumber = 0;
+			if (*number) {
+				if (chap >= 0)
+					verse = atoi(number);
+				else	chap  = atoi(number);
+				*number = 0;
+			}
+			else if (chap == -1 && (tobook < 1 || book[tobook-1] != ' ')) {
+				book[tobook++] = ' ';
+			}
+			
+			break;
+
+		default:
+			if (isdigit(*buf)) {
+				number[tonumber++] = *buf;
+				suffix = 0;
+				doubleF = 0;
+			}
+			else {
+				switch (*buf) {
+				case ' ':    // ignore these and don't reset number
+				case 'F':
+					break;
+				default:
+					// suffixes (and oddly 'f'-- ff.)
+					if ((*buf >= 'a' && *buf <= 'z' && (chap >=0 || bookno > -1 || lastKey->isBoundSet()))
+							|| *buf == 'f') {
+						// if suffix is already an 'f', then we need to mark if we're doubleF.
+						doubleF = (*buf == 'f' && suffix == 'f');
+						if (suffix && !doubleF) {
+							// we've already had a suffix one, so this is another letter, thus any number is not a number, e.g., '2jn'. We're on 'n'
+							number[tonumber] = 0;
+							tonumber = 0;
+						}
+						suffix = *buf;
+					}
+					else {
+						number[tonumber] = 0;
+						tonumber = 0;
+					}
+					break;
+				}
+			}
+			if (chap == -1)
+				book[tobook++] = *buf;
+		}
+		buf++;
+	}
+	number[tonumber] = 0;
+	tonumber = 0;
+	if (*number) {
+		if (chap >= 0)
+			verse = atoi(number);
+		else	chap  = atoi(number);
+	}
+	*number = 0;
+	book[tobook] = 0;
+	tobook = 0;
+	if (*book) {
+		loop = strlen(book) - 1;
+
+		// strip trailing spaces
+		for (; loop+1; loop--) { if (book[loop] == ' ') book[loop] = 0; else break; }
+
+		// check if endsWith([0-9][a-z]) and kill the last letter, e.g., ...12a, and chop off the 'a'
+		// why?  What's this for? wouldn't this mess up 2t?
+		if (loop > 0 && isdigit(book[loop-1]) && book[loop] >= 'a' && book[loop] <= 'z') {
+			book[loop--] = 0;
+		}
+
+		// skip trailing spaces and numbers
+		for (; loop+1; loop--) {
+			if ((isdigit(book[loop])) || (book[loop] == ' ')) {
+				book[loop] = 0;
+				continue;
+			}
+			else {
+				if ((SW_toupper(book[loop])=='F')&&(loop)) {
+					if ((isdigit(book[loop-1])) || (book[loop-1] == ' ') || (SW_toupper(book[loop-1]) == 'F')) {
+						book[loop] = 0;
+						continue;
+					}
+				}
+			}
+			break;
+		}
+
+		// check for roman numeral chapter
+		for (loop = strlen(book) - 1; loop+1; loop--) {
+			if (book[loop] == ' ') {
+				// "PS C" is ok, but "II C" is not ok
+				if (isroman(&book[loop+1]) && !isroman(book,loop)) {
+					if (verse == -1) {
+						verse = chap;
+						chap = from_rom(&book[loop+1]);
+						book[loop] = 0;
+					}
+				}
+				break;
+			}
+		}
+		// check for special inscriptio and subscriptio which are saved as book intro and chap 1 intro (for INTF)
+		for (loop = strlen(book) - 1; loop+1; loop--) {
+			if (book[loop] == ' ') {
+				if (!strnicmp(&book[loop+1], "inscriptio", strlen(&book[loop+1]))) {
+					book[loop] = 0;
+					verse = 0;
+					chap = 0;
+					suffix = 0;
+				}
+				else if (!strnicmp(&book[loop+1], "subscriptio", strlen(&book[loop+1]))) {
+					book[loop] = 0;
+					verse = 0;
+					chap = 1;
+						suffix = 0;
+				}
+				break;
+			}
+		}
+
+		if ((!stricmp(book, "V")) || (!stricmp(book, "VER"))) {	// Verse abbrev.
+			if (verse == -1) {
+				verse = chap;
+				chap = lastKey->getChapter();
+				*book = 0;
+			}
+		}
+
+		if ((!stricmp(book, "ch")) || (!stricmp(book, "chap"))) {	// Verse abbrev
+			strcpy(book, lastKey->getBookName());
+		}
+		bookno = getBookFromAbbrev(book);
+		if ((bookno > -1) && (suffix == 'f') && (book[strlen(book)-1] == 'f')) {
+			suffix = 0;
+		}
+	}
+	if (((bookno > -1) || (!*book)) && ((*book) || (chap >= 0) || (verse >= 0))) {
+		char partial = 0;
+		curKey->setVerse(1);
+		curKey->setChapter(1);
+		curKey->setBook(1);
+
+		if (bookno < 0) {
+			curKey->setTestament(lastKey->getTestament());
+			curKey->setBook(lastKey->getBook());
+		}
+		else {
+			int t = 1;
+			if (bookno > BMAX[0]) {
+				t++;
+				bookno -= BMAX[0];
+			}
+			curKey->setTestament(t);
+			curKey->setBook(bookno);
+		}
+
+		if (((comma)||((verse < 0)&&(bookno < 0)))&&(!lastPartial)) {
+			curKey->setChapter(lastKey->getChapter());
+			curKey->setVerse(chap);  // chap because this is the first number captured
+			if (suffix) {
+				curKey->setSuffix(suffix);
+			}
+		}
+		else {
+			if (useChapterAsVerse && verse < 0 && chap > 0 && curKey->getChapterMax() == 1) {
+				verse = chap;
+				chap = 1;
+			}
+
+			
+			if (chap >= 0) {
+				curKey->setChapter(chap);
+			}
+			else {
+				partial++;
+				curKey->setChapter(1);
+			}
+			if (verse >= 0) {
+				curKey->setVerse(verse);
+				if (suffix) {
+					curKey->setSuffix(suffix);
+				}
+			}
+			else {
+				partial++;
+				curKey->setVerse(1);
+			}
+		}
+
+		if ((*buf == '-') && (expandRange)) {	// if this is a dash save lowerBound and wait for upper
+			lastKey->setLowerBound(*curKey);
+			*lastKey = TOP;
+			tmpListKey << *lastKey;
+			tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+		}
+		else {
+			if (!dash) { 	// if last separator was not a dash just add
+				if (expandRange && partial) {
+					lastKey->setLowerBound(*curKey);
+					if (partial > 1)
+						*curKey = MAXCHAPTER;
+					if (partial > 0)
+						*curKey = MAXVERSE;
+					lastKey->setUpperBound(*curKey);
+					*lastKey = TOP;
+					tmpListKey << *lastKey;
+					tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+				}
+				else {
+					bool f = false;
+					if (curKey->getSuffix() == 'f') {
+						curKey->setSuffix(0);
+						f = true;
+					}
+					lastKey->setLowerBound(*curKey);
+					if (f && doubleF) (*curKey) = MAXVERSE;
+					else if (f) (*curKey)++;
+					lastKey->setUpperBound(*curKey);
+					*lastKey = TOP;
+					tmpListKey << *lastKey;
+					tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+				}
+			}
+			else if (expandRange) {
+				VerseKey *newElement = SWDYNAMIC_CAST(VerseKey, tmpListKey.getElement());
+				if (newElement) {
+					if (partial > 1)
+						*curKey = MAXCHAPTER;
+					if (partial > 0)
+						*curKey = MAXVERSE;
+					newElement->setUpperBound(*curKey);
+					*newElement = TOP;
+					tmpListKey.getElement()->userData = (__u64)(bufStart+(buf-iBuf.c_str()));
+				}
+			}
+		}
+	}
+	*book = 0;
+	tmpListKey = TOP;
+	internalListKey = tmpListKey;
+	internalListKey = TOP;	// Align internalListKey to first element before passing back;
+
+	delete curKey;
+	delete lastKey;
+
+	return internalListKey;
+}
+
+
+/******************************************************************************
+ * VerseKey::setLowerBound	- sets / gets the lower boundary for this key
+ */
+
+void VerseKey::setLowerBound(const VerseKey &lb)
+{
+	initBounds();
+
+	lowerBound = lb.getIndex();
+	lowerBoundComponents.test   = lb.getTestament();
+	lowerBoundComponents.book   = lb.getBook();
+	lowerBoundComponents.chap   = lb.getChapter();
+	lowerBoundComponents.verse  = lb.getVerse();
+	lowerBoundComponents.suffix = lb.getSuffix();
+
+	// both this following check and UpperBound check force upperBound to
+	// change allowing LowerBound then UpperBound logic to always flow
+	// and set values without restrictions, as expected
+	if (upperBound < lowerBound) upperBound = lowerBound;
+	boundSet = true;
+}
+
+
+/******************************************************************************
+ * VerseKey::setUpperBound	- sets / gets the upper boundary for this key
+ */
+
+void VerseKey::setUpperBound(const VerseKey &ub)
+{
+	initBounds();
+
+	upperBound = ub.getIndex();
+	upperBoundComponents.test   = ub.getTestament();
+	upperBoundComponents.book   = ub.getBook();
+	upperBoundComponents.chap   = ub.getChapter();
+	upperBoundComponents.verse  = ub.getVerse();
+	upperBoundComponents.suffix = ub.getSuffix();
+
+	// see setLowerBound comment, above
+	if (upperBound < lowerBound) upperBound = lowerBound;
+	boundSet = true;
+}
+
+
+/******************************************************************************
+ * VerseKey::getLowerBound	- gets the lower boundary for this key
+ */
+
+VerseKey &VerseKey::getLowerBound() const
+{
+	initBounds();
+	if (!isAutoNormalize()) {
+		tmpClone->testament = lowerBoundComponents.test;
+		tmpClone->book      = lowerBoundComponents.book;
+		tmpClone->chapter   = lowerBoundComponents.chap;
+		tmpClone->setVerse   (lowerBoundComponents.verse);
+		tmpClone->setSuffix  (lowerBoundComponents.suffix);
+	}
+	else {
+		tmpClone->setIndex(lowerBound);
+		tmpClone->setSuffix  (lowerBoundComponents.suffix);
+	}
+
+	return (*tmpClone);
+}
+
+
+/******************************************************************************
+ * VerseKey::getUpperBound	- sets / gets the upper boundary for this key
+ */
+
+VerseKey &VerseKey::getUpperBound() const
+{
+	initBounds();
+	if (!isAutoNormalize()) {
+		tmpClone->testament = upperBoundComponents.test;
+		tmpClone->book      = upperBoundComponents.book;
+		tmpClone->chapter   = upperBoundComponents.chap;
+		tmpClone->setVerse   (upperBoundComponents.verse);
+		tmpClone->setSuffix  (upperBoundComponents.suffix);
+	}
+	else {
+		tmpClone->setIndex(upperBound);
+		tmpClone->setSuffix  (upperBoundComponents.suffix);
+	}
+
+	return (*tmpClone);
+}
+
+
+/******************************************************************************
+ * VerseKey::clearBounds	- clears bounds for this VerseKey
+ */
+
+void VerseKey::clearBounds()
+{
+	delete tmpClone;
+	tmpClone = 0;
+	boundSet = false;
+}
+
+
+void VerseKey::initBounds() const
+{
+	if (!tmpClone) {
+		tmpClone = (VerseKey *)this->clone();
+		tmpClone->setAutoNormalize(false);
+		tmpClone->setIntros(true);
+		tmpClone->setTestament((BMAX[1])?2:1);
+		tmpClone->setBook(BMAX[(BMAX[1])?1:0]);
+		tmpClone->setChapter(tmpClone->getChapterMax());
+		tmpClone->setVerse(tmpClone->getVerseMax());
+		upperBound = tmpClone->getIndex();
+		upperBoundComponents.test   = tmpClone->getTestament();
+		upperBoundComponents.book   = tmpClone->getBook();
+		upperBoundComponents.chap   = tmpClone->getChapter();
+		upperBoundComponents.verse  = tmpClone->getVerse();
+		upperBoundComponents.suffix = tmpClone->getSuffix();
+
+		lowerBound = 0;
+		lowerBoundComponents.test   = 0;
+		lowerBoundComponents.book   = 0;
+		lowerBoundComponents.chap   = 0;
+		lowerBoundComponents.verse  = 0;
+		lowerBoundComponents.suffix = 0;
+
+	}
+	else tmpClone->setLocale(getLocale());
+}
+
+
+/******************************************************************************
+ * VerseKey::getText - refreshes keytext before returning if cast to
+ *				a (char *) is requested
+ */
+
+const char *VerseKey::getText() const {
+	freshtext();
+	return keytext;
+}
+
+
+const char *VerseKey::getShortText() const {
+	static char *stext = 0;
+	char buf[2047];
+	freshtext();
+	if (book < 1) {
+		if (testament < 1)
+			sprintf(buf, "[ Module Heading ]");
+		else sprintf(buf, "[ Testament %d Heading ]", (int)testament);
+	}
+	else {
+		sprintf(buf, "%s %d:%d", getBookAbbrev(), chapter, verse);
+	}
+	stdstr(&stext, buf);
+	return stext;
+}
+
+
+const char *VerseKey::getBookName() const {
+	return getPrivateLocale()->translate(refSys->getBook(((testament>1)?BMAX[0]:0)+book-1)->getLongName());
+}
+
+
+const char *VerseKey::getOSISBookName() const {
+	return refSys->getBook(((testament>1)?BMAX[0]:0)+book-1)->getOSISName();
+}
+
+
+const char *VerseKey::getBookAbbrev() const {
+	return refSys->getBook(((testament>1)?BMAX[0]:0)+book-1)->getPreferredAbbreviation();
+}
+
+
+/******************************************************************************
+ * VerseKey::setPosition(SW_POSITION)	- Positions this key
+ *
+ * ENT:	p	- position
+ *
+ * RET:	*this
+ */
+
+void VerseKey::setPosition(SW_POSITION p) {
+	switch (p) {
+	case POS_TOP: {
+		const VerseKey *lb = &getLowerBound();
+		testament = (lb->getTestament() || intros) ? lb->getTestament() : 1;
+		book      = (lb->getBook()      || intros) ? lb->getBook() : 1;
+		chapter   = (lb->getChapter()   || intros) ? lb->getChapter() : 1;
+		verse     = (lb->getVerse()     || intros) ? lb->getVerse() : 1;
+		suffix    = lb->getSuffix();
+		break;
+	}
+	case POS_BOTTOM: {
+		const VerseKey *ub = &getUpperBound();
+		testament = (ub->getTestament() || intros) ? ub->getTestament() : 1;
+		book      = (ub->getBook()      || intros) ? ub->getBook() : 1;
+		chapter   = (ub->getChapter()   || intros) ? ub->getChapter() : 1;
+		verse     = (ub->getVerse()     || intros) ? ub->getVerse() : 1;
+		suffix    = ub->getSuffix();
+		break;
+	}
+	case POS_MAXVERSE:
+		suffix    = 0;
+		verse     = 1;
+		normalize();
+		verse     = getVerseMax();
+		suffix    = 0;
+		break;
+	case POS_MAXCHAPTER:
+		suffix    = 0;
+		verse     = 1;
+		chapter   = 1;
+		normalize();
+		chapter   = getChapterMax();
+		break;
+	}
+	normalize(true);
+	popError();	// clear error from normalize
+}
+
+int VerseKey::getChapterMax() const {
+	if (book < 1) return 0;
+	const VersificationMgr::Book *b = refSys->getBook(((testament>1)?BMAX[0]:0)+book-1);
+	return (b) ? b->getChapterMax() : -1;
+}
+
+int VerseKey::getVerseMax() const {
+	if (book < 1) return 0;
+	const VersificationMgr::Book *b = refSys->getBook(((testament>1)?BMAX[0]:0)+book-1);
+	return (b) ? b->getVerseMax(chapter) : -1;
+}
+
+
+/******************************************************************************
+ * VerseKey::increment	- Increments key a number of verses
+ *
+ * ENT:	step	- Number of verses to jump forward
+ *
+ * RET: *this
+ */
+
+void VerseKey::increment(int step) {
+	// if we're not autonormalizing and we're already not normalized
+	if (!autonorm && chapter > 0 && verse > getVerseMax()) {
+		verse += step;
+		checkBounds();
+		return;
+	}
+	char ierror = 0;
+	setIndex(getIndex() + step);
+	while ((!verse) && (!intros) && (!ierror)) {
+		setIndex(getIndex() + 1);
+		ierror = popError();
+	}
+
+	error = (ierror) ? ierror : error;
+}
+
+
+/******************************************************************************
+ * VerseKey::decrement	- Decrements key a number of verses
+ *
+ * ENT:	step	- Number of verses to jump backward
+ *
+ * RET: *this
+ */
+
+void VerseKey::decrement(int step) {
+	// if we're not autonormalizing and we're already not normalized
+	if (!autonorm && chapter > 0 && verse > getVerseMax()) {
+		verse -= step;
+		checkBounds();
+		return;
+	}
+	char ierror = 0;
+	setIndex(getIndex() - step);
+	while ((!verse) && (!intros) && (!ierror)) {
+		setIndex(getIndex() - 1);
+		ierror = popError();
+	}
+	if ((ierror) && (!intros))
+		(*this)++;
+
+	error = (ierror) ? ierror : error;
+}
+
+
+/******************************************************************************
+ * VerseKey::normalize	- checks limits and normalizes if necessary (e.g.
+ *				Matthew 29:47 = Mark 2:2).  If last verse is
+ *				exceeded, key is set to last Book CH:VS
+ * RET: *this
+ */
+
+void VerseKey::normalize(bool autocheck)
+{
+
+	if ((!autocheck || autonorm)	// only normalize if we were explicitely called or if autonorm is turned on
+	) {
+		error = 0;
+
+		while ((testament < 3) && (testament > 0)) {
+
+
+			if (book > BMAX[testament-1]) {
+				book -= (BMAX[testament-1] + (intros?1:0));
+				testament++;
+				continue;
+			}
+			if (book < (intros?0:1)) {
+				if (--testament > 0) {
+					book += (BMAX[testament-1] + (intros?1:0));
+				}
+				continue;
+			}
+
+
+			if (chapter > getChapterMax()) {
+				chapter -= (getChapterMax() + (intros?1:0));
+				book++;
+				continue;
+			}
+			if (chapter < (intros?0:1)) {
+				--book;
+				chapter += (getChapterMax() + (intros?1:0));
+				continue;
+			}
+
+
+			if (chapter > 0 && verse > getVerseMax()) {
+				verse -= (getVerseMax() + (intros?1:0));
+				chapter++;
+				continue;
+			}
+			if (verse < (intros?0:1)) {
+				if (--chapter < (intros?0:1)) {
+					--book;
+					chapter += (getChapterMax() + (intros?1:0));
+				}
+				verse += (getVerseMax() + (intros?1:0));
+				continue;
+			}
+
+			break;  // If we've made it this far (all failure checks continue) we're ok
+		}
+
+		if (testament > (BMAX[1]?2:1)) {
+			testament = BMAX[1]?2:1;
+			book      = BMAX[testament-1];
+			chapter   = getChapterMax();
+			verse     = getVerseMax();
+			error     = KEYERR_OUTOFBOUNDS;
+		}
+
+		if (testament < 1) {
+			error     = ((!intros) || (testament < 0) || (book < 0)) ? KEYERR_OUTOFBOUNDS : 0;
+			testament = ((intros) ? 0 : 1);
+			book      = ((intros) ? 0 : 1);
+			chapter   = ((intros) ? 0 : 1);
+			verse     = ((intros) ? 0 : 1);
+		}
+
+			// should we always perform bounds checks?  Tried but seems to cause infinite recursion
+		if (_compare(getUpperBound()) > 0) {
+			positionFrom(getUpperBound());
+			error = KEYERR_OUTOFBOUNDS;
+		}
+		if (_compare(getLowerBound()) < 0) {
+			positionFrom(getLowerBound());
+			error = KEYERR_OUTOFBOUNDS;
+		}
+	}
+}
+
+
+/******************************************************************************
+ * VerseKey::getTestament - Gets testament
+ *
+ * RET:	value of testament
+ */
+
+char VerseKey::getTestament() const
+{
+	return testament;
+}
+
+
+/******************************************************************************
+ * VerseKey::getBook - Gets book
+ *
+ * RET:	value of book
+ */
+
+char VerseKey::getBook() const
+{
+	return book;
+}
+
+
+/******************************************************************************
+ * VerseKey::getChapter - Gets chapter
+ *
+ * RET:	value of chapter
+ */
+
+int VerseKey::getChapter() const
+{
+	return chapter;
+}
+
+
+/******************************************************************************
+ * VerseKey::getVerse - Gets verse
+ *
+ * RET:	value of verse
+ */
+
+int VerseKey::getVerse() const
+{
+	return verse;
+}
+
+
+/******************************************************************************
+ * VerseKey::setTestament - Sets/gets testament
+ *
+ * ENT:	itestament - value which to set testament
+ *		[MAXPOS(char)] - only get
+ *
+ */
+
+void VerseKey::setTestament(char itestament)
+{
+	suffix  = 0;
+	verse   = (intros) ? 0 : 1;
+	chapter = (intros) ? 0 : 1;
+	book    = (intros) ? 0 : 1;
+	testament = itestament;
+	normalize(true);
+}
+
+
+/******************************************************************************
+ * VerseKey::setBook - Sets/gets book
+ *
+ * ENT:	ibook - value which to set book
+ */
+
+void VerseKey::setBook(char ibook)
+{
+	suffix  = 0;
+	verse   = (intros) ? 0 : 1;
+	chapter = (intros) ? 0 : 1;
+	book    = ibook;
+	normalize(true);
+}
+
+
+
+/******************************************************************************
+ * VerseKey::setBookName - Sets/gets book by name
+ *
+ * ENT:	bname - book name/abbrev
+ */
+
+void VerseKey::setBookName(const char *bname)
+{
+	int bnum = getBookFromAbbrev(bname);
+	if (bnum > -1) {
+		if (bnum > BMAX[0]) {
+			bnum -= BMAX[0];
+			testament = 2;
+		}
+		else	testament = 1;
+		setBook(bnum);
+	}
+	else error = KEYERR_OUTOFBOUNDS;
+}
+	
+
+/******************************************************************************
+ * VerseKey::setChapter - Sets/gets chapter
+ *
+ * ENT:	ichapter - value which to set chapter
+ */
+
+void VerseKey::setChapter(int ichapter)
+{
+	suffix  = 0;
+	verse   = (intros) ? 0 : 1;
+	chapter = ichapter;
+	normalize(true);
+}
+
+
+/******************************************************************************
+ * VerseKey::setVerse - Sets/gets verse
+ *
+ * ENT:	iverse - value which to set verse
+ *		[MAXPOS(int)] - only get
+ *
+ * RET:	if unchanged ->          value of verse
+ *	if   changed -> previous value of verse
+ */
+
+void VerseKey::setVerse(int iverse)
+{
+	suffix  = 0;
+	verse   = iverse;
+	normalize(true);
+}
+
+
+char VerseKey::getSuffix() const {
+	return suffix;
+}
+
+void VerseKey::setSuffix(char suf) {
+	suffix = suf;
+}
+
+/******************************************************************************
+ * VerseKey::isAutoNormalize - gets flag that tells VerseKey to auto-
+ *				matically normalize itself when modified
+ */
+
+bool VerseKey::isAutoNormalize() const
+{
+	return autonorm;
+}
+
+void VerseKey::setAutoNormalize(bool iautonorm)
+{
+	autonorm = iautonorm?1:0;
+	normalize(true);
+}
+
+
+/******************************************************************************
+ * VerseKey::setIntros - Sets flag that tells VerseKey to include
+ *					chap/book/testmnt/module introductions
+ *
+ * ENT:	val - value which to set intros
+ *
+ */
+
+void VerseKey::setIntros(bool val)
+{
+	intros = val;
+	normalize(true);
+}
+
+bool VerseKey::isIntros() const
+{
+	return intros;
+}
+
+
+/******************************************************************************
+ * VerseKey::getIndex - Gets index based upon current verse
+ *
+ * RET:	offset
+ */
+
+long VerseKey::getIndex() const
+{
+	long  offset;
+
+	if (!testament) { // if we want module heading
+		offset = 0;
+	}
+	else if (!book) {	// we want testament heading
+		offset = ((testament == 2) ? refSys->getNTStartOffset():0) + 1;
+	}
+	else {
+		offset = refSys->getOffsetFromVerse((((testament>1)?BMAX[0]:0)+book-1), chapter, verse);
+	}
+	return offset;
+}
+
+
+/******************************************************************************
+ * VerseKey::getTestamentIndex - Gets index based upon current verse
+ *
+ * RET:	offset
+ */
+
+long VerseKey::getTestamentIndex() const
+{
+	long offset = getIndex();
+	return (testament > 1) ? offset - refSys->getNTStartOffset() : offset;
+}
+
+
+/******************************************************************************
+ * VerseKey::setIndex - Sets index based upon current verse
+ *
+ * ENT:	iindex - value to set index to
+ *
+ */
+
+void VerseKey::setIndex(long iindex)
+{
+	// assert we're sane
+	if (iindex < 0) {
+		error = KEYERR_OUTOFBOUNDS;
+		return;
+	}
+
+	int b;
+	error = refSys->getVerseFromOffset(iindex, &b, &chapter, &verse);
+	book = (unsigned char)b;
+	testament = 1;
+	if (book > BMAX[0]) {
+		book -= BMAX[0];
+		testament = 2;
+	}
+	// special case for Module and Testament heading
+	if (book < 0) { testament = 0; book = 0; }
+	if (chapter < 0) { book = 0; chapter = 0; }
+
+	checkBounds();
+}
+
+void VerseKey::checkBounds() {
+
+	long i = getIndex();
+
+	initBounds();
+	if (i > upperBound) {
+		setIndex(upperBound);
+		i = getIndex();
+		error = KEYERR_OUTOFBOUNDS;
+	}
+	if (i < lowerBound) {
+		setIndex(lowerBound);
+		error = KEYERR_OUTOFBOUNDS;
+	}
+}
+
+
+/******************************************************************************
+ * VerseKey::compare	- Compares another SWKey object
+ *
+ * ENT:	ikey - key to compare with this one
+ *
+ * RET:	>0 if this versekey is greater than compare versekey
+ *	<0 <
+ *	 0 =
+ */
+
+int VerseKey::compare(const SWKey &ikey)
+{
+	const SWKey *testKey = &ikey;
+	const VerseKey *vkey = (const VerseKey *)SWDYNAMIC_CAST(VerseKey, testKey);
+	if (vkey) {
+		return _compare(*vkey);
+	}
+	const VerseKey ivkey = (const char *)ikey;
+	return _compare(ivkey);
+}
+
+
+/******************************************************************************
+ * VerseKey::_compare	- Compares another VerseKey object
+ *
+ * ENT:	ikey - key to compare with this one
+ *
+ * RET:	>0 if this versekey is greater than compare versekey
+ *	<0 <
+ *	 0 =
+ */
+
+int VerseKey::_compare(const VerseKey &ivkey)
+{
+	unsigned long keyval1 = 0;
+	unsigned long keyval2 = 0;
+
+	keyval1 += getTestament()       * 1000000000;
+	keyval2 += ivkey.getTestament() * 1000000000;
+	keyval1 += getBook()            * 10000000;
+	keyval2 += ivkey.getBook()      * 10000000;
+	keyval1 += getChapter()         * 10000;
+	keyval2 += ivkey.getChapter()   * 10000;
+	keyval1 += getVerse()           * 50;
+	keyval2 += ivkey.getVerse()     * 50;
+	keyval1 += (int)getSuffix();
+	keyval2 += (int)ivkey.getSuffix();
+	keyval1 = (keyval1 != keyval2) ? ((keyval1 > keyval2) ? 1 : -1) : 0; // -1 | 0 | 1
+	return keyval1;
+}
+
+
+const char *VerseKey::getOSISRef() const {
+	static char buf[5][254];
+	static int loop = 0;
+
+	if (loop > 4)
+		loop = 0;
+
+	if (getVerse())
+		sprintf(buf[loop], "%s.%d.%d", getOSISBookName(), getChapter(), getVerse());
+	else if (getChapter())
+		sprintf(buf[loop], "%s.%d", getOSISBookName(), getChapter());
+	else if (getBook())
+		sprintf(buf[loop], "%s", getOSISBookName());
+	else	buf[loop][0] = 0;
+	return buf[loop++];
+}
+
+
+/******************************************************************************
+ * VerseKey::getRangeText - returns parsable range text for this key
+ */
+
+const char *VerseKey::getRangeText() const {
+	if (isBoundSet() && lowerBound != upperBound) {
+		SWBuf buf = (const char *)getLowerBound();
+		buf += "-";
+		buf += (const char *)getUpperBound();
+		stdstr(&rangeText, buf.c_str());
+	}
+	else stdstr(&rangeText, getText());
+	return rangeText;
+}
+
+
+/******************************************************************************
+ * VerseKey::getOSISRefRangeText - returns parsable range text for this key
+ */
+
+const char *VerseKey::getOSISRefRangeText() const {
+	if (isBoundSet() && (lowerBound != upperBound)) {
+		SWBuf buf = getLowerBound().getOSISRef();
+		buf += "-";
+		buf += getUpperBound().getOSISRef();
+		stdstr(&rangeText, buf.c_str());
+	}
+	else stdstr(&rangeText, getOSISRef());
+	return rangeText;
+}
+
+
+// TODO:  this is static so we have no context.  We can only parse KJV v11n now
+// 		possibly add a const char *versification = KJV param?
+const char *VerseKey::convertToOSIS(const char *inRef, const SWKey *lastKnownKey) {
+	static SWBuf outRef;
+
+	outRef = "";
+
+	VerseKey defLanguage;
+	ListKey verses = defLanguage.parseVerseList(inRef, (*lastKnownKey), true);
+	const char *startFrag = inRef;
+	for (int i = 0; i < verses.getCount(); i++) {
+		SWKey *element = verses.getElement(i);
+//		VerseKey *element = SWDYNAMIC_CAST(VerseKey, verses.GetElement(i));
+		SWBuf buf;
+		// TODO: This code really needs to not use fixed size arrays
+		char frag[800];
+		char preJunk[800];
+		char postJunk[800];
+		memset(frag, 0, 800);
+		memset(preJunk, 0, 800);
+		memset(postJunk, 0, 800);
+		while ((*startFrag) && (strchr(" {};,()[].", *startFrag))) {
+			outRef += *startFrag;
+			startFrag++;
+		}
+		memmove(frag, startFrag, ((const char *)element->userData - startFrag) + 1);
+		frag[((const char *)element->userData - startFrag) + 1] = 0;
+		int j;
+		for (j = strlen(frag)-1; j && (strchr(" {};,()[].", frag[j])); j--);
+		if (frag[j+1])
+			strcpy(postJunk, frag+j+1);
+		frag[j+1]=0;
+		startFrag += ((const char *)element->userData - startFrag) + 1;
+		buf = "<reference osisRef=\"";
+		buf += element->getOSISRefRangeText();
+		buf += "\">";
+		buf += frag;
+		buf += "</reference>";
+		buf += postJunk;
+
+		outRef += buf;
+
+	}
+	if (startFrag < (inRef + strlen(inRef)))
+		outRef += startFrag;
+	return outRef.c_str();
+}
+SWORD_NAMESPACE_END
diff --git a/src/keys/versetreekey.cpp b/src/keys/versetreekey.cpp
new file mode 100644
index 0000000..571314f
--- /dev/null
+++ b/src/keys/versetreekey.cpp
@@ -0,0 +1,304 @@
+/******************************************************************************
+ *
+ *  versetreekey.cpp -	code for class 'VerseTreeKey'- versekey using treekey
+ *			for data retrieval
+ * 
+ * $Id: versetreekey.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <versetreekey.h>
+#include <ctype.h>
+
+SWORD_NAMESPACE_START
+
+static const char *classes[] = {"VerseTreeKey", "VerseKey", "SWKey", "SWObject", 0};
+SWClass VerseTreeKey::classdef(classes);
+
+
+/******************************************************************************
+ * VerseTreeKey Constructor - initializes instance of VerseTreeKey
+ *
+ * ENT:	ikey - base key (will take various forms of 'BOOK CH:VS'.  See
+ *		VerseTreeKey::parse for more detailed information)
+ */
+
+VerseTreeKey::VerseTreeKey(TreeKey *treeKey, const SWKey *ikey) : VerseKey(ikey)
+{
+	init(treeKey);
+	if (ikey)
+		parse();
+}
+
+
+/******************************************************************************
+ * VerseTreeKey Constructor - initializes instance of VerseTreeKey
+ *
+ * ENT:	ikey - text key (will take various forms of 'BOOK CH:VS'.  See
+ *		VerseTreeKey::parse for more detailed information)
+ */
+
+VerseTreeKey::VerseTreeKey(TreeKey *treeKey, const char *ikey) : VerseKey(ikey)
+{
+	init(treeKey);
+	if (ikey)
+		parse();
+}
+
+
+VerseTreeKey::VerseTreeKey(VerseTreeKey const &k) : VerseKey(k)
+{
+	init(k.treeKey);
+}
+
+
+VerseTreeKey::VerseTreeKey(TreeKey *treeKey, const char *min, const char *max) : VerseKey(min, max)
+{
+	init(treeKey);
+}
+
+
+void VerseTreeKey::init(TreeKey *treeKey)
+{
+	myclass = &classdef;
+	this->treeKey = (TreeKey *)treeKey->clone();
+	this->treeKey->setPositionChangeListener(this);
+	internalPosChange = false;
+}
+
+
+SWKey *VerseTreeKey::clone() const
+{
+	return new VerseTreeKey(*this);
+}
+
+
+int VerseTreeKey::getBookFromAbbrev(const char *iabbr) const
+{
+	int bookno = VerseKey::getBookFromAbbrev(iabbr);
+	if (bookno < 0) {
+/*
+		vector<struct sbook>::iterator it = find(books, iabbr);
+		if (it == books.end()) {
+			TreeKey *tkey = this->treeKey;
+			int saveError = tkey->popError();
+			long bookmark = tkey->getOffset();
+			SWBuf segment;
+			internalPosChange = true;
+			do {
+				segment = (SWBuf)tkey->getLocalName();
+			} while (tkey->parent());
+			segment << 1;
+			if (saveError) {
+				error = saveError;
+			}
+			tkey->setOffset(bookmark);
+		}
+		books.push_back(sbook(iabbr));
+*/
+	}
+	return bookno;
+}
+
+/******************************************************************************
+ * VerseTreeKey Destructor - cleans up instance of VerseTreeKey
+ *
+ * ENT:	ikey - text key
+ */
+
+VerseTreeKey::~VerseTreeKey() {
+	delete treeKey;
+}
+
+
+void VerseTreeKey::decrement(int steps) {
+	int treeError = 0;
+	if (!error) lastGoodOffset = getTreeKey()->getOffset();
+	do {
+		treeKey->decrement();
+		treeError = treeKey->popError();
+	// iterate until 3 levels and no versekey parse errors
+	} while (!treeError && ((treeKey->getLevel() < 3) || error));
+	if (error && !treeError) {
+		int saveError = error;
+		increment();
+		error = saveError;
+	}
+	if (treeError) {
+		treeKey->setOffset(lastGoodOffset);
+		error = treeError;
+	}
+	if (_compare(getUpperBound()) > 0) {
+		positionFrom(getUpperBound());
+		error = KEYERR_OUTOFBOUNDS;
+	}
+	if (_compare(getLowerBound()) < 0) {
+		positionFrom(getLowerBound());
+		error = KEYERR_OUTOFBOUNDS;
+	}
+}
+
+
+void VerseTreeKey::increment(int steps) {
+	int treeError = 0;
+	if (!error) lastGoodOffset = getTreeKey()->getOffset();
+	do {
+		treeKey->increment();
+		treeError = treeKey->popError();
+	// iterate until 3 levels and no versekey parse errors
+	} while (!treeError && ((treeKey->getLevel() < 3) || error));
+	if (error && !treeError) {
+		int saveError = error;
+		decrement();
+		error = saveError;
+	}
+	if (treeError) {
+		treeKey->setOffset(lastGoodOffset);
+		error = treeError;
+	}
+	// bounds
+	if (_compare(getUpperBound()) > 0) {
+		positionFrom(getUpperBound());
+		error = KEYERR_OUTOFBOUNDS;
+	}
+	if (_compare(getLowerBound()) < 0) {
+		positionFrom(getLowerBound());
+		error = KEYERR_OUTOFBOUNDS;
+	}
+}
+
+
+void VerseTreeKey::positionChanged() {
+	if (!internalPosChange) {
+		TreeKey *tkey = this->TreeKey::PositionChangeListener::getTreeKey();
+		int saveError = tkey->popError();
+		long bookmark = tkey->getOffset();
+		SWBuf seg[4];
+		internalPosChange = true;
+		int legs = 0;
+		do {
+			seg[legs] = tkey->getLocalName();
+			legs++;
+		} while (tkey->parent() && (legs < 4));
+
+		legs--;
+
+		if ((legs < 2) && (!seg[0].length() || seg[0] == "/")) {		//"[ Module Heading ]";
+			testament = 0;
+			book      = 0;
+			chapter   = 0;
+			setVerse(0);
+		}
+		else if ((legs < 2)
+			&& ((!strncmp(seg[0].c_str(), "[ Testament ", 12)) &&		//"[ Testament n Heading ]";
+			    (isdigit(seg[0][12])) &&
+			    (!strcmp(seg[0].c_str()+13, " Heading ]")))) {
+			testament = (seg[0][12]-48);
+			book      = 0;
+			chapter   = 0;
+			setVerse(0);
+		}	//path = "[ Module Heading ]";
+		else {
+			setBookName(seg[--legs]);
+			chapter = (legs > 0) ? atoi(seg[--legs]) : 0;
+			setVerse((legs > 0) ? atoi(seg[--legs]) : 0);
+		}
+
+//		setText(path);
+		if (saveError) {
+			error = saveError;
+		}
+		tkey->setOffset(bookmark);
+		tkey->setError(saveError);
+		internalPosChange = false;
+	}
+}
+
+
+void VerseTreeKey::syncVerseToTree() {
+	internalPosChange = true;
+	SWBuf path;
+	if (!getTestament()) path = "/"; // "[ Module Heading ]";
+	else if (!getBook()) path.setFormatted("/[ Testament %d Heading ]", getTestament());
+	else path.setFormatted("/%s/%d/%d", getOSISBookName(), getChapter(), getVerse());
+	if (getSuffix()) path += getSuffix();
+	long bookmark = treeKey->getOffset();
+	treeKey->setText(path);
+
+	// if our module has jacked inconsistencies, then let's put our tree back to where it was
+	if (treeKey->popError()) {
+		treeKey->setOffset(bookmark);
+	}
+
+	internalPosChange = false;
+}
+
+
+TreeKey *VerseTreeKey::getTreeKey() {
+	syncVerseToTree();
+	return treeKey;
+}
+
+// can autonormalize yet (ever?)
+void VerseTreeKey::Normalize(char autocheck) {
+	error = 0;
+}
+
+long VerseTreeKey::NewIndex() const {
+	return treeKey->getOffset();
+}
+
+
+void VerseTreeKey::setPosition(SW_POSITION p) {
+
+	if (isBoundSet()) {
+		return VerseKey::setPosition(p);
+	}
+
+	switch (p) {
+	case POS_TOP:
+		popError();
+		treeKey->setPosition(p);
+		increment();
+		decrement();
+		popError();
+		break;
+	case POS_BOTTOM:
+		popError();
+		treeKey->setPosition(p);
+		decrement();
+		increment();
+		popError();
+		break;
+	case POS_MAXVERSE:
+	case POS_MAXCHAPTER:
+		VerseKey::setPosition(p);
+		break;
+	}
+}
+
+
+/******************************************************************************
+ * VerseTreeKey::copyFrom - Equates this VerseTreeKey to another VerseTreeKey
+
+void VerseTreeKey::copyFrom(const VerseTreeKey &ikey) {
+	VerseKey::copyFrom(ikey);
+}
+ */
+
+SWORD_NAMESPACE_END
diff --git a/src/mgr/Makefile b/src/mgr/Makefile
new file mode 100644
index 0000000..339f87a
--- /dev/null
+++ b/src/mgr/Makefile
@@ -0,0 +1,4 @@
+root := ../..
+
+all:
+	make -C ${root}
diff --git a/src/mgr/Makefile.am b/src/mgr/Makefile.am
new file mode 100644
index 0000000..6acec3a
--- /dev/null
+++ b/src/mgr/Makefile.am
@@ -0,0 +1,35 @@
+mgrdir = $(top_srcdir)/src/mgr
+
+if CONFDEF
+globdef = -DGLOBCONFPATH=\"${globalconfdir}/sword.conf\"
+else
+globdef =
+endif
+
+AM_CPPFLAGS += $(globdef)
+AM_CPPFLAGS += -D_FTPLIB_NO_COMPAT
+
+if WITHCURL
+FTP_SOURCES = $(mgrdir)/curlftpt.cpp
+FTP_SOURCES += $(mgrdir)/curlhttpt.cpp
+else
+FTP_SOURCES = $(mgrdir)/ftplibftpt.cpp
+endif
+
+libsword_la_SOURCES += $(FTP_SOURCES)
+libsword_la_SOURCES += $(mgrdir)/swconfig.cpp
+libsword_la_SOURCES += $(mgrdir)/swmgr.cpp
+libsword_la_SOURCES += $(mgrdir)/swfiltermgr.cpp
+libsword_la_SOURCES += $(mgrdir)/encfiltmgr.cpp
+libsword_la_SOURCES += $(mgrdir)/markupfiltmgr.cpp
+libsword_la_SOURCES += $(mgrdir)/filemgr.cpp
+libsword_la_SOURCES += $(mgrdir)/versificationmgr.cpp
+libsword_la_SOURCES += $(mgrdir)/remotetrans.cpp
+libsword_la_SOURCES += $(mgrdir)/swlocale.cpp
+libsword_la_SOURCES += $(mgrdir)/localemgr.cpp
+libsword_la_SOURCES += $(mgrdir)/swcacher.cpp
+libsword_la_SOURCES += $(mgrdir)/swsearchable.cpp
+libsword_la_SOURCES += $(mgrdir)/installmgr.cpp
+libsword_la_SOURCES += $(mgrdir)/stringmgr.cpp
+
+
diff --git a/src/mgr/curlftpt.cpp b/src/mgr/curlftpt.cpp
new file mode 100644
index 0000000..0b668b1
--- /dev/null
+++ b/src/mgr/curlftpt.cpp
@@ -0,0 +1,205 @@
+/*****************************************************************************
+ *
+ *  curlftpt.cpp -	CURLFTPTransport
+ *
+ * $Id: curlftpt.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <curlftpt.h>
+
+#include <fcntl.h>
+
+#include <curl/curl.h>
+#include <curl/easy.h>
+
+#include <swlog.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	struct FtpFile {
+		const char *filename;
+		FILE *stream;
+		SWBuf *destBuf;
+	};
+
+
+	// initialize/cleanup SYSTEMWIDE library with life of this static.
+	static class CURLFTPTransport_init {
+	public:
+		CURLFTPTransport_init() {
+			curl_global_init(CURL_GLOBAL_DEFAULT);  // curl_easy_init automatically calls it if needed
+		}
+
+		~CURLFTPTransport_init() {
+			curl_global_cleanup();
+		}
+	} _curlFTPTransport_init;
+
+
+	static int my_fwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
+		struct FtpFile *out=(struct FtpFile *)stream;
+		if (out && !out->stream && !out->destBuf) {
+			/* open file for writing */
+			out->stream=fopen(out->filename, "wb");
+			if (!out->stream)
+				return -1; /* failure, can't open file to write */
+		}
+		if (out->destBuf) {
+			int s = out->destBuf->size();
+			out->destBuf->size(s+(size*nmemb));
+			memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb);
+			return nmemb;
+		}
+		return fwrite(buffer, size, nmemb, out->stream);
+	}
+
+
+	struct MyProgressData {
+		StatusReporter *sr;
+		bool *term;
+	};
+
+
+	static int my_fprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) {
+		if (clientp) {
+			MyProgressData *pd = (MyProgressData *)clientp;
+			SWLog::getSystemLog()->logDebug("CURLFTPTransport report progress: totalSize: %ld; xfered: %ld\n", (long)dltotal, (long)dlnow);
+			if (pd->sr) {
+				if (dltotal < 0) dltotal = 0;
+				if (dlnow < 0) dlnow = 0;
+				if (dlnow > dltotal) dlnow = dltotal;
+				pd->sr->update(dltotal, dlnow);
+			}
+			if (*(pd->term)) return 1;
+		}
+		return 0;
+	}
+
+
+	static int my_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) {
+		SWBuf header;
+		(void)userp; /* prevent compiler warning */
+		(void)handle; /* prevent compiler warning */
+
+		switch (type) {
+		case CURLINFO_TEXT: header = "TEXT"; break;
+		case CURLINFO_HEADER_OUT: header = "=> Send header"; break;
+		case CURLINFO_HEADER_IN: header = "<= Recv header"; break;
+		
+		// these we don't want to log (HUGE)
+		case CURLINFO_DATA_OUT: header = "=> Send data";
+		case CURLINFO_SSL_DATA_OUT: header = "=> Send SSL data";
+		case CURLINFO_DATA_IN: header = "<= Recv data"; 
+		case CURLINFO_SSL_DATA_IN: header = "<= Recv SSL data";
+		default: /* in case a new one is introduced to shock us */
+			return 0;
+		}
+		
+		if (size > 120) size = 120;
+		SWBuf text;
+		text.size(size);
+		memcpy(text.getRawData(), data, size);
+		SWLog::getSystemLog()->logDebug("CURLFTPTransport: %s: %s", header.c_str(), text.c_str());
+		return 0;
+	}
+}
+
+
+CURLFTPTransport::CURLFTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) {
+	session = (CURL *)curl_easy_init();
+}
+
+
+CURLFTPTransport::~CURLFTPTransport() {
+	curl_easy_cleanup(session);
+}
+
+
+char CURLFTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) {
+	signed char retVal = 0;
+	struct FtpFile ftpfile = {destPath, 0, destBuf};
+
+	CURLcode res;
+	
+	if (session) {
+
+		struct MyProgressData pd;
+		pd.sr = statusReporter;
+		pd.term = &term;
+
+		curl_easy_setopt(session, CURLOPT_URL, sourceURL);
+	
+		SWBuf credentials = u + ":" + p;
+		curl_easy_setopt(session, CURLOPT_USERPWD, credentials.c_str());
+		curl_easy_setopt(session, CURLOPT_WRITEFUNCTION, my_fwrite);
+		if (!passive)
+			curl_easy_setopt(session, CURLOPT_FTPPORT, "-");
+		curl_easy_setopt(session, CURLOPT_NOPROGRESS, 0);
+		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, &pd);
+		curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, my_fprogress);
+		curl_easy_setopt(session, CURLOPT_DEBUGFUNCTION, my_trace);
+		/* Set a pointer to our struct to pass to the callback */
+		curl_easy_setopt(session, CURLOPT_FILE, &ftpfile);
+
+		/* Switch on full protocol/debug output */
+		curl_easy_setopt(session, CURLOPT_VERBOSE, true);
+		curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, 45);
+		
+		/* FTP connection settings */
+
+#if (LIBCURL_VERSION_MAJOR > 7) || \
+   ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR > 10)) || \
+   ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 10) && (LIBCURL_VERSION_PATCH >= 5))
+#      define EPRT_AVAILABLE 1
+#endif
+
+#ifdef EPRT_AVAILABLE
+		curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0);
+		SWLog::getSystemLog()->logDebug("***** using CURLOPT_FTP_USE_EPRT\n");
+#endif
+
+		
+		SWLog::getSystemLog()->logDebug("***** About to perform curl easy action. \n");
+		SWLog::getSystemLog()->logDebug("***** destPath: %s \n", destPath);
+		SWLog::getSystemLog()->logDebug("***** sourceURL: %s \n", sourceURL);
+		res = curl_easy_perform(session);
+		SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
+
+		// it seems CURL tries to use this option data later for some reason, so we unset here
+		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
+
+		// it seems CURL tries to use this option data later for some reason, so we unset here
+		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
+
+		if(CURLE_OK != res) {
+			retVal = -1;
+		}
+	}
+
+	if (ftpfile.stream)
+		fclose(ftpfile.stream); /* close the local file */
+
+	return retVal;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/curlhttpt.cpp b/src/mgr/curlhttpt.cpp
new file mode 100644
index 0000000..5db0ee7
--- /dev/null
+++ b/src/mgr/curlhttpt.cpp
@@ -0,0 +1,254 @@
+/*****************************************************************************
+ *
+ *  curlhttpt.cpp -	CURLHTTPTransport
+ *
+ * $Id: curlhttpt.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <fcntl.h>
+
+#include <vector>
+#include <cctype>
+
+#include <curl/curl.h>
+#include <curl/easy.h>
+
+#include <swlog.h>
+#include <filemgr.h>
+#include <curlhttpt.h>
+
+using std::vector;
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	struct FtpFile {
+		const char *filename;
+		FILE *stream;
+		SWBuf *destBuf;
+	};
+
+
+	static int my_httpfwrite(void *buffer, size_t size, size_t nmemb, void *stream) {
+		struct FtpFile *out=(struct FtpFile *)stream;
+		if (out && !out->stream && !out->destBuf) {
+			/* open file for writing */
+			out->stream=fopen(out->filename, "wb");
+			if (!out->stream)
+				return -1; /* failure, can't open file to write */
+		}
+		if (out->destBuf) {
+			int s = out->destBuf->size();
+			out->destBuf->size(s+(size*nmemb));
+			memcpy(out->destBuf->getRawData()+s, buffer, size*nmemb);
+			return nmemb;
+		}
+		return fwrite(buffer, size, nmemb, out->stream);
+	}
+
+
+	static int my_httpfprogress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) {
+		if (clientp) {
+			if (dltotal < 0) dltotal = 0;
+			if (dlnow < 0) dlnow = 0;
+			if (dlnow > dltotal) dlnow = dltotal;
+			((StatusReporter *)clientp)->update(dltotal, dlnow);
+		}
+		return 0;
+	}
+
+
+	static int myhttp_trace(CURL *handle, curl_infotype type, unsigned char *data, size_t size, void *userp) {
+		SWBuf header;
+		(void)userp; /* prevent compiler warning */
+		(void)handle; /* prevent compiler warning */
+
+		switch (type) {
+		case CURLINFO_TEXT: header = "TEXT"; break;
+		case CURLINFO_HEADER_OUT: header = "=> Send header"; break;
+		case CURLINFO_HEADER_IN: header = "<= Recv header"; break;
+
+		// these we don't want to log (HUGE)
+		case CURLINFO_DATA_OUT: header = "=> Send data";
+		case CURLINFO_SSL_DATA_OUT: header = "=> Send SSL data";
+		case CURLINFO_DATA_IN: header = "<= Recv data";
+		case CURLINFO_SSL_DATA_IN: header = "<= Recv SSL data";
+		default: /* in case a new one is introduced to shock us */
+			return 0;
+		}
+
+		if (size > 120) size = 120;
+		SWBuf text;
+		text.size(size);
+		memcpy(text.getRawData(), data, size);
+		SWLog::getSystemLog()->logDebug("CURLHTTPTransport: %s: %s", header.c_str(), text.c_str());
+		return 0;
+	}
+}
+
+
+CURLHTTPTransport::CURLHTTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) {
+	session = (CURL *)curl_easy_init();
+}
+
+
+CURLHTTPTransport::~CURLHTTPTransport() {
+	curl_easy_cleanup(session);
+}
+
+
+char CURLHTTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) {
+	signed char retVal = 0;
+	struct FtpFile ftpfile = {destPath, 0, destBuf};
+
+	CURLcode res;
+
+	if (session) {
+		curl_easy_setopt(session, CURLOPT_URL, sourceURL);
+
+		SWBuf credentials = u + ":" + p;
+		curl_easy_setopt(session, CURLOPT_USERPWD, credentials.c_str());
+		curl_easy_setopt(session, CURLOPT_WRITEFUNCTION, my_httpfwrite);
+		if (!passive)
+			curl_easy_setopt(session, CURLOPT_FTPPORT, "-");
+		curl_easy_setopt(session, CURLOPT_NOPROGRESS, 0);
+		curl_easy_setopt(session, CURLOPT_FAILONERROR, 1);
+		curl_easy_setopt(session, CURLOPT_PROGRESSDATA, statusReporter);
+		curl_easy_setopt(session, CURLOPT_PROGRESSFUNCTION, my_httpfprogress);
+		curl_easy_setopt(session, CURLOPT_DEBUGFUNCTION, myhttp_trace);
+		/* Set a pointer to our struct to pass to the callback */
+		curl_easy_setopt(session, CURLOPT_FILE, &ftpfile);
+
+		/* Switch on full protocol/debug output */
+		curl_easy_setopt(session, CURLOPT_VERBOSE, true);
+		curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, 45);
+		
+		/* Disable checking host certificate */
+		curl_easy_setopt(session, CURLOPT_SSL_VERIFYPEER, false);
+
+		/* FTP connection settings */
+
+#if (LIBCURL_VERSION_MAJOR > 7) || \
+   ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR > 10)) || \
+   ((LIBCURL_VERSION_MAJOR == 7) && (LIBCURL_VERSION_MINOR == 10) && (LIBCURL_VERSION_PATCH >= 5))
+#      define EPRT_AVAILABLE 1
+#endif
+
+#ifdef EPRT_AVAILABLE
+		curl_easy_setopt(session, CURLOPT_FTP_USE_EPRT, 0);
+		SWLog::getSystemLog()->logDebug("***** using CURLOPT_FTP_USE_EPRT\n");
+#endif
+
+
+		SWLog::getSystemLog()->logDebug("***** About to perform curl easy action. \n");
+		SWLog::getSystemLog()->logDebug("***** destPath: %s \n", destPath);
+		SWLog::getSystemLog()->logDebug("***** sourceURL: %s \n", sourceURL);
+		res = curl_easy_perform(session);
+		SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
+
+		if(CURLE_OK != res) {
+			retVal = -1;
+		}
+	}
+
+	if (ftpfile.stream)
+		fclose(ftpfile.stream); /* close the local file */
+
+	return retVal;
+}
+
+
+// we need to find the 2nd "<td" & then find the ">" after that.  The size starts with the next non-space char
+const char *findSizeStart(const char *buffer) {
+	const char *listing = buffer;
+	const char *pEnd;
+	
+	pEnd = strstr(listing, "<td");
+	if(pEnd == NULL) {
+		return NULL;
+	}
+	listing = pEnd+2;
+	pEnd = strstr(listing, "<td");
+	if(pEnd == NULL)
+		return NULL;
+	listing = pEnd+2;
+	pEnd = strchr(listing, '>');
+	if(pEnd == NULL)
+		return NULL;
+
+	return pEnd+1;
+}
+
+
+vector<struct DirEntry> CURLHTTPTransport::getDirList(const char *dirURL) {
+	
+	vector<struct DirEntry> dirList;
+	
+	SWBuf dirBuf;
+	const char *pBuf;
+	char *pBufRes;
+	SWBuf possibleName;
+	double fSize;
+	int possibleNameLength = 0;
+	
+	if (!getURL("", dirURL, &dirBuf)) {
+		pBuf = strstr(dirBuf, "<a href=\"");//Find the next link to a possible file name.
+		while (pBuf != NULL) {
+			pBuf += 9;//move to the start of the actual name.
+			pBufRes = (char *)strchr(pBuf, '\"');//Find the end of the possible file name
+			if (!pBufRes)
+				break;
+			possibleNameLength = pBufRes - pBuf;
+			possibleName.setFormatted("%.*s", possibleNameLength, pBuf);
+			if (isalnum(possibleName[0])) {
+				SWLog::getSystemLog()->logDebug("getDirListHTTP: Found a file: %s", possibleName.c_str());
+				pBuf = pBufRes;
+				pBufRes = (char *)findSizeStart(pBuf);
+				fSize = 0;
+				if(pBufRes != NULL) {
+					pBuf = pBufRes;
+					fSize = strtod(pBuf, &pBufRes);
+					if (pBufRes[0] == 'K')
+						fSize *= 1024;
+					else if (pBufRes[0] == 'M')
+						fSize *= 1048576;
+					pBuf = pBufRes;
+				}
+				struct DirEntry i;
+				i.name = possibleName;
+				i.size = (long unsigned int)fSize;
+				i.isDirectory = possibleName.endsWith("/");
+				dirList.push_back(i);
+			} else {
+				pBuf += possibleNameLength;
+			}
+			pBuf++;
+			pBuf = strstr(pBuf, "<a href=\"");//Find the next link to a possible file name.
+		}
+	}
+	else
+	{
+		SWLog::getSystemLog()->logWarning("FTPURLGetDir: failed to get dir %s\n", dirURL);
+	}
+	return dirList;
+}
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/encfiltmgr.cpp b/src/mgr/encfiltmgr.cpp
new file mode 100644
index 0000000..24938bc
--- /dev/null
+++ b/src/mgr/encfiltmgr.cpp
@@ -0,0 +1,143 @@
+/******************************************************************************
+ *
+ *  encfiltmgr.cpp -	implementaion of class EncodingFilterMgr, subclass of
+ *			SWFilterMgr, used to transcode all module text to a
+ *			requested encoding
+ *
+ * $Id: encfiltmgr.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <encfiltmgr.h>
+#include <utilstr.h>
+
+#include <scsuutf8.h>
+#include <latin1utf8.h>
+
+#include <unicodertf.h>
+#include <utf8latin1.h>
+#include <utf8utf16.h>
+#include <utf8html.h>
+#include <swmodule.h>
+
+#include <swmgr.h>
+
+
+SWORD_NAMESPACE_START
+
+
+/******************************************************************************
+ * EncodingFilterMgr Constructor - initializes instance of EncodingFilterMgr
+ *
+ * ENT:
+ *      enc - Encoding format to emit
+ */
+EncodingFilterMgr::EncodingFilterMgr(char enc)
+		: SWFilterMgr() {
+
+	scsuutf8   = new SCSUUTF8();
+	latin1utf8 = new Latin1UTF8();
+
+	encoding = enc;
+
+	switch (encoding) {
+		case ENC_LATIN1: targetenc = new UTF8Latin1(); break;
+		case ENC_UTF16:  targetenc = new UTF8UTF16();  break;
+		case ENC_RTF:    targetenc = new UnicodeRTF(); break;
+		case ENC_HTML:   targetenc = new UTF8HTML();   break;
+		default: // i.e. case ENC_UTF8
+			targetenc = NULL;
+	}
+}
+
+
+/******************************************************************************
+ * EncodingFilterMgr Destructor - Cleans up instance of EncodingFilterMgr
+ */
+EncodingFilterMgr::~EncodingFilterMgr() {
+	delete scsuutf8;
+	delete latin1utf8;
+	delete targetenc;
+}
+
+
+void EncodingFilterMgr::AddRawFilters(SWModule *module, ConfigEntMap &section) {
+
+	ConfigEntMap::iterator entry;
+
+	SWBuf encoding = ((entry = section.find("Encoding")) != section.end()) ? (*entry).second : (SWBuf)"";
+	if (!encoding.length() || !stricmp(encoding.c_str(), "Latin-1")) {
+                module->addRawFilter(latin1utf8);
+	}
+	else if (!stricmp(encoding.c_str(), "SCSU")) {
+		module->addRawFilter(scsuutf8);
+	}
+}
+
+
+void EncodingFilterMgr::AddEncodingFilters(SWModule *module, ConfigEntMap &section) {
+	if (targetenc)
+		module->addEncodingFilter(targetenc);
+}
+
+
+/******************************************************************************
+ * EncodingFilterMgr::Encoding	- sets/gets encoding
+ *
+ * ENT:	enc	- new encoding or 0 to simply get the current encoding
+ *
+ * RET: encoding
+ */
+char EncodingFilterMgr::Encoding(char enc) {
+	if (enc && enc != encoding) {
+		encoding = enc;
+		SWFilter *oldfilter = targetenc;
+
+		switch (encoding) {
+			case ENC_LATIN1: targetenc = new UTF8Latin1(); break;
+			case ENC_UTF16:  targetenc = new UTF8UTF16();  break;
+			case ENC_RTF:    targetenc = new UnicodeRTF(); break;
+			case ENC_HTML:   targetenc = new UTF8HTML();   break;
+			default: // i.e. case ENC_UTF8
+				targetenc = NULL;
+		}
+
+		ModMap::const_iterator module;
+
+		if (oldfilter != targetenc) {
+			if (oldfilter) {
+				if (!targetenc) {
+					for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
+						module->second->removeRenderFilter(oldfilter);
+					}
+				else {
+					for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
+						module->second->replaceRenderFilter(oldfilter, targetenc);
+				}
+				delete oldfilter;
+			}
+			else if (targetenc) {
+				for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
+					module->second->addRenderFilter(targetenc);
+			}
+		}
+	}
+	return encoding;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/mgr/filemgr.cpp b/src/mgr/filemgr.cpp
new file mode 100644
index 0000000..c6156d2
--- /dev/null
+++ b/src/mgr/filemgr.cpp
@@ -0,0 +1,585 @@
+/******************************************************************************
+ *
+ *  filemgr.cpp -	implementation of class FileMgr used for pooling file
+ *			handles
+ *
+ * $Id: filemgr.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <filemgr.h>
+#include <utilstr.h>
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <stdio.h>
+#include <string.h>
+#include <swbuf.h>
+#if !defined(__GNUC__) && !defined(_WIN32_WCE)
+#include <io.h>
+#include <direct.h>
+#else
+#include <unistd.h>
+#endif
+
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+#ifndef S_IRGRP
+#define S_IRGRP 0
+#endif
+
+#ifndef S_IROTH
+#define S_IROTH 0
+#endif
+
+// Fix for VC6
+#ifndef S_IREAD
+#ifdef _S_IREAD
+#define S_IREAD _S_IREAD
+#define S_IWRITE _S_IWRITE
+#endif
+#endif
+// -----------
+
+// ------- if we still don't have something
+#ifndef S_IREAD
+#define S_IREAD 0400
+#endif
+#ifndef S_IWRITE
+#define S_IWRITE 0200
+#endif
+// -------
+
+
+SWORD_NAMESPACE_START
+
+
+int FileMgr::CREAT = O_CREAT;
+int FileMgr::APPEND = O_APPEND;
+int FileMgr::TRUNC = O_TRUNC;
+int FileMgr::RDONLY = O_RDONLY;
+int FileMgr::RDWR = O_RDWR;
+int FileMgr::WRONLY = O_WRONLY;
+int FileMgr::IREAD = S_IREAD;
+int FileMgr::IWRITE = S_IWRITE;
+
+
+// ---------------- statics -----------------
+FileMgr *FileMgr::systemFileMgr = 0;
+
+class __staticsystemFileMgr {
+public:
+	__staticsystemFileMgr() { }
+	~__staticsystemFileMgr() { delete FileMgr::systemFileMgr; }
+} _staticsystemFileMgr;
+
+
+FileMgr *FileMgr::getSystemFileMgr() {
+	if (!systemFileMgr)
+		systemFileMgr = new FileMgr();
+
+	return systemFileMgr;
+}
+
+
+void FileMgr::setSystemFileMgr(FileMgr *newFileMgr) {
+	if (systemFileMgr)
+		delete systemFileMgr;
+	systemFileMgr = newFileMgr;
+}
+
+// --------------- end statics --------------
+
+
+FileDesc::FileDesc(FileMgr *parent, const char *path, int mode, int perms, bool tryDowngrade) {
+	this->parent = parent;
+	this->path = 0;
+	stdstr(&this->path, path);
+	this->mode = mode;
+	this->perms = perms;
+	this->tryDowngrade = tryDowngrade;
+	offset = 0;
+	fd = -77;
+}
+
+
+FileDesc::~FileDesc() {
+	if (fd > 0)
+		close(fd);
+		
+	if (path)
+		delete [] path;
+}
+
+
+int FileDesc::getFd() {
+	if (fd == -77)
+		fd = parent->sysOpen(this);
+//	if ((fd < -1) && (fd != -77))  // kludge to hand ce
+//		return 777;
+	return fd;
+}
+
+
+long FileDesc::seek(long offset, int whence) {
+	return lseek(getFd(), offset, whence);
+}
+
+
+long FileDesc::read(void *buf, long count) {
+	return ::read(getFd(), buf, count);
+}
+
+
+long FileDesc::write(const void *buf, long count) {
+	return ::write(getFd(), buf, count);
+}
+
+
+FileMgr::FileMgr(int maxFiles) {
+	this->maxFiles = maxFiles;		// must be at least 2
+	files = 0;
+}
+
+
+FileMgr::~FileMgr() {
+	FileDesc *tmp;
+	
+	while(files) {
+		tmp = files->next;
+		delete files;
+		files = tmp;
+	}
+}
+
+
+FileDesc *FileMgr::open(const char *path, int mode, bool tryDowngrade) {
+	return open(path, mode, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH, tryDowngrade);
+}
+
+
+FileDesc *FileMgr::open(const char *path, int mode, int perms, bool tryDowngrade) {
+	FileDesc **tmp, *tmp2;
+	
+	for (tmp = &files; *tmp; tmp = &((*tmp)->next)) {
+		if ((*tmp)->fd < 0)		// insert as first non-system_open file
+			break;
+	}
+
+	tmp2 = new FileDesc(this, path, mode, perms, tryDowngrade);
+	tmp2->next = *tmp;
+	*tmp = tmp2;
+	
+	return tmp2;
+}
+
+
+void FileMgr::close(FileDesc *file) {
+	FileDesc **loop;
+	
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+		if (*loop == file) {
+			*loop = (*loop)->next;
+			delete file;
+			break;
+		}
+	}
+}
+
+
+int FileMgr::sysOpen(FileDesc *file) {
+	FileDesc **loop;
+	int openCount = 1;		// because we are presently opening 1 file, and we need to be sure to close files to accomodate, if necessary
+	
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+
+		if ((*loop)->fd > 0) {
+			if (++openCount > maxFiles) {
+				(*loop)->offset = lseek((*loop)->fd, 0, SEEK_CUR);
+				::close((*loop)->fd);
+				(*loop)->fd = -77;
+			}
+		}
+
+		if (*loop == file) {
+			if (*loop != files) {
+				*loop = (*loop)->next;
+				file->next = files;
+				files = file;
+			}
+			if ((!access(file->path, 04)) || ((file->mode & O_CREAT) == O_CREAT)) {	// check for at least file exists / read access before we try to open
+				char tries = (((file->mode & O_RDWR) == O_RDWR) && (file->tryDowngrade)) ? 2 : 1;  // try read/write if possible
+				for (int i = 0; i < tries; i++) {
+					if (i > 0) {
+						file->mode = (file->mode & ~O_RDWR);	// remove write access
+						file->mode = (file->mode | O_RDONLY);// add read access
+					}
+					file->fd = ::open(file->path, file->mode|O_BINARY, file->perms);
+
+					if (file->fd >= 0)
+						break;
+				}
+
+				if (file->fd >= 0)
+					lseek(file->fd, file->offset, SEEK_SET);
+			}
+			else file->fd = -1;
+			if (!*loop)
+				break;
+		}
+	}
+	return file->fd;
+}
+
+
+// to truncate a file at its current position
+// leaving byte at current possition intact
+// deleting everything afterward.
+signed char FileMgr::trunc(FileDesc *file) {
+
+	static const char *writeTest = "x";
+	long size = file->seek(1, SEEK_CUR);
+	if (size == 1) // was empty
+		size = 0;
+	char nibble [ 32767 ];
+	bool writable = file->write(writeTest, 1);
+	int bytes = 0;
+
+	if (writable) {
+		// get tmpfilename
+		char *buf = new char [ strlen(file->path) + 10 ];
+		int i;
+		for (i = 0; i < 9999; i++) {
+			sprintf(buf, "%stmp%.4d", file->path, i);
+			if (!existsFile(buf))
+				break;
+		}
+		if (i == 9999)
+			return -2;
+
+		int fd = ::open(buf, O_CREAT|O_RDWR, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+		if (fd < 0)
+			return -3;
+	
+		file->seek(0, SEEK_SET);
+		while (size > 0) {	 
+			bytes = file->read(nibble, 32767);
+			bytes = (bytes < size)?bytes:size;
+			if (write(fd, nibble, bytes) != bytes) { break; }
+			size -= bytes;
+		}
+		if (size < 1) {
+			// zero out the file
+			::close(file->fd);
+			file->fd = ::open(file->path, O_TRUNC, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+			::close(file->fd);
+			file->fd = -77;	// force file open by filemgr
+			// copy tmp file back (dumb, but must preserve file permissions)
+			lseek(fd, 0, SEEK_SET);
+			do {
+				bytes = read(fd, nibble, 32767);
+				file->write(nibble, bytes);
+			} while (bytes == 32767);
+		}
+		
+		::close(fd);
+		::close(file->fd);
+		removeFile(buf);		// remove our tmp file
+		file->fd = -77;	// causes file to be swapped out forcing open on next call to getFd()
+	}
+	else { // put offset back and return failure
+		file->seek(-1, SEEK_CUR);
+		return -1;
+	}
+	return 0;
+}
+
+
+signed char FileMgr::existsFile(const char *ipath, const char *ifileName)
+{
+	int len = strlen(ipath) + ((ifileName)?strlen(ifileName):0) + 3;
+	char *ch;
+	char *path = new char [ len ];
+	strcpy(path, ipath);
+	
+	if ((path[strlen(path)-1] == '\\') || (path[strlen(path)-1] == '/'))
+		path[strlen(path)-1] = 0;
+	
+	if (ifileName) {
+		ch = path + strlen(path);
+		sprintf(ch, "/%s", ifileName);
+	}
+	signed char retVal = !access(path, 04);
+	delete [] path;
+	return retVal;
+}
+
+
+signed char FileMgr::existsDir(const char *ipath, const char *idirName)
+{
+	char *ch;
+	int len = strlen(ipath) + ((idirName)?strlen(idirName):0) + 1;
+	if (idirName)
+		len +=  strlen(idirName);
+	char *path = new char [ len ];
+	strcpy(path, ipath);
+	
+	if ((path[strlen(path)-1] == '\\') || (path[strlen(path)-1] == '/'))
+		path[strlen(path)-1] = 0;
+	
+	if (idirName) {
+		ch = path + strlen(path);
+		sprintf(ch, "/%s", idirName);
+	}
+	signed char retVal = !access(path, 04);
+	delete [] path;
+	return retVal;
+}
+
+
+int FileMgr::createParent(const char *pName) {
+	char *buf = new char [ strlen(pName) + 1 ];
+	int retCode = 0;
+	
+	strcpy(buf, pName);
+	int end = strlen(buf) - 1;
+	while (end) {
+		if ((buf[end] == '/') || (buf[end] == '\\'))
+			break;
+		end--;
+	}
+	buf[end] = 0;
+	if (strlen(buf)>0) {
+		if (access(buf, 02)) {  // not exists with write access?
+			if ((retCode = mkdir(buf
+#ifndef WIN32
+					, 0755
+#endif
+					))) {
+				createParent(buf);
+				retCode = mkdir(buf
+#ifndef WIN32
+					, 0755
+#endif
+					);
+			}
+		}
+	}
+	else retCode = -1;
+	delete [] buf;
+	return retCode;
+}
+	
+
+int FileMgr::openFileReadOnly(const char *fName) {
+	int fd = ::open(fName, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+	return fd;
+}
+
+
+int FileMgr::createPathAndFile(const char *fName) {
+	int fd;
+	
+	fd = ::open(fName, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+	if (fd < 1) {
+		createParent(fName);
+		fd = ::open(fName, O_CREAT|O_WRONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+	}
+	return fd;
+}
+
+
+int FileMgr::copyFile(const char *sourceFile, const char *targetFile) {
+  int sfd, dfd, len;
+	char buf[4096];
+
+	if ((sfd = ::open(sourceFile, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH)) < 1)
+		return -1;
+	if ((dfd = createPathAndFile(targetFile)) < 1)
+		return -1;
+
+	do {
+		len = read(sfd, buf, 4096);
+		if (write(dfd, buf, len) != len) break;
+	}
+	while(len == 4096);	
+	::close(dfd);
+	::close(sfd);
+	
+	return 0;
+}
+
+
+int FileMgr::removeFile(const char *fName) {
+	return ::remove(fName);
+}
+
+char FileMgr::getLine(FileDesc *fDesc, SWBuf &line) {
+	int len;
+	bool more = true;
+	char chunk[255];
+
+	line = "";
+
+	// assert we have a valid file handle
+	if (fDesc->getFd() < 1)
+		return 0;
+
+	while (more) {
+		more = false;
+		long index = fDesc->seek(0, SEEK_CUR);
+		len = fDesc->read(chunk, 254);
+
+		// assert we have a readable file (not a directory)
+		if (len < 1)
+			break;
+
+		int start = 0;
+		// clean up any preceding white space if we're at the beginning of line
+		if (!line.length()) {
+			for (;start < len; start++) {
+				if ((chunk[start] != 13) && (chunk[start] != ' ') && (chunk[start] != '\t'))
+					break;
+			}
+		}
+
+		// find the end
+		int end;
+		for (end = start; ((end < (len-1)) && (chunk[end] != 10)); end++);
+	
+		if ((chunk[end] != 10) && (len == 254)) {
+			more = true;
+		}
+		index += (end + 1);
+
+		// reposition to next valid place to read
+		fDesc->seek(index, SEEK_SET);
+
+		// clean up any trailing junk on line if we're at the end
+		if (!more) {
+			for (; end > start; end--) {
+				if ((chunk[end] != 10) && (chunk[end] != 13) && (chunk[end] != ' ') && (chunk[end] != '\t')) {
+					if (chunk[end] == '\\') {
+						more = true;
+						end--;
+					}
+					break;
+				}
+			}
+		}
+		
+		int size = (end - start) + 1;
+
+		if (size > 0) {
+			// line.appendFormatted("%.*s", size, chunk+start);
+			line.append(chunk+start, size);
+		}
+	}
+	return ((len > 0) || line.length());
+}
+
+
+char FileMgr::isDirectory(const char *path) {
+	struct stat stats;
+	if (stat(path, &stats))
+		return 0;
+	return ((stats.st_mode & S_IFDIR) == S_IFDIR);
+}
+
+
+int FileMgr::copyDir(const char *srcDir, const char *destDir) {
+	DIR *dir;
+	struct dirent *ent;
+	if ((dir = opendir(srcDir))) {
+		rewinddir(dir);
+		while ((ent = readdir(dir))) {
+			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+				SWBuf srcPath  = (SWBuf)srcDir  + (SWBuf)"/" + ent->d_name;
+				SWBuf destPath = (SWBuf)destDir + (SWBuf)"/" + ent->d_name;
+				if (!isDirectory(srcPath.c_str())) {
+					copyFile(srcPath.c_str(), destPath.c_str());
+				}
+				else {
+					copyDir(srcPath.c_str(), destPath.c_str());
+				}
+			}
+		}
+		closedir(dir);
+	}
+	return 0;
+}
+
+
+int FileMgr::removeDir(const char *targetDir) {
+	DIR *dir = opendir(targetDir);
+	struct dirent *ent;
+	if (dir) {
+		rewinddir(dir);
+		while ((ent = readdir(dir))) {
+			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+				SWBuf targetPath = (SWBuf)targetDir + (SWBuf)"/" + ent->d_name;
+				if (!isDirectory(targetPath.c_str())) {
+					FileMgr::removeFile(targetPath.c_str());
+				}
+				else {
+					FileMgr::removeDir(targetPath.c_str());
+				}
+			}
+		}
+		closedir(dir);
+		FileMgr::removeFile(targetDir);
+/*
+		int status = FileMgr::removeFile(targetDir);
+          int stuff = errno;
+          char *err = strerror(errno);
+          int x = stuff;
+*/
+	}
+	return 0;
+}
+
+
+void FileMgr::flush() {
+	FileDesc **loop;
+	
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+		if ((*loop)->fd > 0) {
+			(*loop)->offset = lseek((*loop)->fd, 0, SEEK_CUR);
+			::close((*loop)->fd);
+			(*loop)->fd = -77;
+		}
+	}
+}
+
+long FileMgr::resourceConsumption() {
+	long count = 0;
+	FileDesc **loop;
+	for (loop = &files; *loop; loop = &((*loop)->next)) {
+		if ((*loop)->fd > 0) {
+			count++;
+		}
+	}
+	return count;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/mgr/ftplibftpt.cpp b/src/mgr/ftplibftpt.cpp
new file mode 100644
index 0000000..f1d1655
--- /dev/null
+++ b/src/mgr/ftplibftpt.cpp
@@ -0,0 +1,183 @@
+/*****************************************************************************
+ *
+ *  ftplibftpt.cpp -	FTPLibFTPTransport
+ *
+ * $Id: ftplibftpt.cpp 2983 2013-09-15 16:22:32Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+ 
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <ftplib.h>
+
+#include <ftplibftpt.h>
+#include <swlog.h>
+#include <filemgr.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	struct MyProgressData {
+		StatusReporter *sr;
+		long totalSize;
+		bool *term;
+	};
+
+	static int my_swbufwriter(netbuf *nControl, void *buffer, size_t size, void *swbuf) {
+		SWBuf &output = *(SWBuf *)swbuf;
+		int s = output.size();
+		output.size(s+size);
+		memcpy(output.getRawData()+s, buffer, size);
+		return size;
+	}
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+	static int my_fprogress(netbuf *nControl, int xfered, void *arg) {
+		if (arg) {
+			MyProgressData *pd = (MyProgressData *)arg;
+	SWLog::getSystemLog()->logDebug("FTPLibFTPTransport report progress: totalSize: %ld; xfered: %d\n", pd->totalSize, xfered);
+			if (pd->sr) {
+				pd->sr->statusUpdate(pd->totalSize, xfered);
+			}
+			if (*(pd->term)) return 0;
+		}
+		return 1;
+	}
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
+
+	// initialize/cleanup SYSTEMWIDE library with life of this static.
+	static class FTPLibFTPTransport_init {
+	public:
+		FTPLibFTPTransport_init() {
+			FtpInit();
+		}
+
+		~FTPLibFTPTransport_init() {
+		}
+
+	} _ftpLibFTPTransport_init;
+
+}
+
+
+FTPLibFTPTransport::FTPLibFTPTransport(const char *host, StatusReporter *sr) : RemoteTransport(host, sr) {
+
+	ftpConnection = 0;
+}
+
+
+FTPLibFTPTransport::~FTPLibFTPTransport() {
+	if (ftpConnection)
+		FtpQuit(ftpConnection);
+}
+
+
+char FTPLibFTPTransport::assureLoggedIn() {
+	char retVal = 0;
+	if (ftpConnection == 0) {
+		SWLog::getSystemLog()->logDebug("connecting to host: %s...\n", host.c_str());
+		if (FtpConnect(host, &ftpConnection)) {
+			FtpOptions(FTPLIB_CONNMODE, (passive) ? FTPLIB_PASSIVE : FTPLIB_PORT, ftpConnection);
+
+			SWLog::getSystemLog()->logDebug("connected. logging in...\n");
+			if (FtpLogin(u.c_str(), p.c_str(), ftpConnection)) {
+				SWLog::getSystemLog()->logDebug("logged in.\n");
+				retVal = 0;
+			}
+			else {
+				SWLog::getSystemLog()->logError("Failed to login to %s\n", host.c_str());
+				retVal = -2;
+			}
+		}
+		else {
+			SWLog::getSystemLog()->logError("Failed to connect to %s\n", host.c_str());
+			retVal = -1;
+		}
+	}
+	return retVal;
+}
+
+
+char FTPLibFTPTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) {
+
+	char retVal = 0;
+
+	SWLog::getSystemLog()->logDebug("FTPLibFTPTransport::getURL(%s, %s, ...);\n", (destPath)?destPath:"(null)", sourceURL);
+	// assert we can login
+	retVal = assureLoggedIn();
+	if (retVal) return retVal;
+	SWLog::getSystemLog()->logDebug("FTPLibFTPTransport - logged in.\n");
+
+	SWBuf sourcePath = sourceURL;
+
+	SWBuf outFile;
+	if (!destBuf) {
+		outFile = destPath;
+	}
+
+	sourcePath << (6 + host.length()); // shift << "ftp://hostname";
+	SWLog::getSystemLog()->logDebug("getting file %s to %s\n", sourcePath.c_str(), destBuf ? "*internal buffer*" : outFile.c_str());
+	struct MyProgressData pd;
+	pd.sr = statusReporter;
+	pd.term = &term;
+	pd.totalSize = 0;
+
+	if (destBuf) {
+		FtpOptions(FTPLIB_CALLBACK_WRITER, (long)&my_swbufwriter, ftpConnection);
+		FtpOptions(FTPLIB_CALLBACK_WRITERARG, (long)destBuf, ftpConnection);
+	}
+	else {
+		FtpOptions(FTPLIB_CALLBACK_WRITER, 0L, ftpConnection);
+	}
+
+	FtpOptions(FTPLIB_CALLBACK, (long)&my_fprogress, ftpConnection);
+	FtpOptions(FTPLIB_CALLBACKARG, (long)&pd, ftpConnection);
+	FtpOptions(FTPLIB_CALLBACKBYTES, (long)2048, ftpConnection);
+
+	if (sourcePath.endsWith("/") || sourcePath.endsWith("\\")) {
+//		SWLog::getSystemLog()->logDebug("getting test directory %s\n", sourcePath.c_str());
+//		FtpDir(NULL, sourcePath, ftpConnection);
+		SWLog::getSystemLog()->logDebug("getting real directory %s\n", sourcePath.c_str());
+		retVal = FtpDir(destBuf ? 0 : outFile.c_str(), sourcePath, ftpConnection) - 1;
+		SWLog::getSystemLog()->logDebug("got real directory %s to %s\n", sourcePath.c_str(), destBuf ? "*internal buffer*" : outFile.c_str());
+	}
+	else {
+		SWLog::getSystemLog()->logDebug("getting file %s\n", sourcePath.c_str());
+		int size;
+		FtpSize(sourcePath, &size, FTPLIB_IMAGE, ftpConnection);
+		pd.totalSize = size;
+		retVal = FtpGet(destBuf ? 0 : outFile.c_str(), sourcePath, FTPLIB_IMAGE, ftpConnection) - 1;
+	}
+
+	SWLog::getSystemLog()->logDebug("FTPLibFTPTransport - returning: %d\n", retVal);
+	return retVal;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/installmgr.cpp b/src/mgr/installmgr.cpp
new file mode 100644
index 0000000..1e83db5
--- /dev/null
+++ b/src/mgr/installmgr.cpp
@@ -0,0 +1,762 @@
+/*****************************************************************************
+ *
+ *  installmgr.cpp -	InstallMgr functions
+ *
+ * $Id: installmgr.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef EXCLUDEZLIB
+extern "C" {
+#include <untgz.h>
+}
+#endif
+
+#include <installmgr.h>
+#include <filemgr.h>
+#include <utilstr.h>
+
+#include <fcntl.h>
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <swversion.h>
+#include <swlog.h>
+#include <dirent.h>
+
+#include <stdio.h>
+#include <map>
+
+#ifdef CURLAVAILABLE
+#include <curlftpt.h>
+#include <curlhttpt.h>
+#else
+#include <ftplibftpt.h>
+#endif
+
+#include <iostream>
+
+
+using std::map;
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static void removeTrailingSlash(SWBuf &buf) {
+		int len = buf.size();
+		if ((buf[len-1] == '/')
+		 || (buf[len-1] == '\\'))
+			buf.size(len-1);
+	}
+
+	static const char *masterRepoList = "masterRepoList.conf";
+
+}
+
+
+const int InstallMgr::MODSTAT_OLDER            = 0x001;
+const int InstallMgr::MODSTAT_SAMEVERSION      = 0x002;
+const int InstallMgr::MODSTAT_UPDATED          = 0x004;
+const int InstallMgr::MODSTAT_NEW              = 0x008;
+const int InstallMgr::MODSTAT_CIPHERED         = 0x010;
+const int InstallMgr::MODSTAT_CIPHERKEYPRESENT = 0x020;
+
+
+// override this method and provide your own custom RemoteTransport subclass
+// here we try a couple defaults if sword was compiled with support for them.
+// see these classes for examples of how to make your own
+RemoteTransport *InstallMgr::createFTPTransport(const char *host, StatusReporter *statusReporter) {
+#ifdef CURLAVAILABLE
+	return new CURLFTPTransport(host, statusReporter);
+#else
+	return new FTPLibFTPTransport(host, statusReporter);
+#endif
+}
+
+
+RemoteTransport *InstallMgr::createHTTPTransport(const char *host, StatusReporter *statusReporter) {
+#ifdef CURLAVAILABLE
+	return new CURLHTTPTransport(host, statusReporter);
+#else
+	return 0;
+#endif
+}
+
+
+InstallMgr::InstallMgr(const char *privatePath, StatusReporter *sr, SWBuf u, SWBuf p) {
+	userDisclaimerConfirmed = false;
+	statusReporter = sr;
+	this->u = u;
+	this->p = p;
+	this->privatePath = 0;
+	this->transport = 0;
+	installConf = 0;
+	stdstr(&(this->privatePath), privatePath);
+	if (this->privatePath) {
+		int len = strlen(this->privatePath);
+		if ((this->privatePath[len-1] == '/')
+		 || (this->privatePath[len-1] == '\\'))
+			this->privatePath[len-1] = 0;
+	}
+	confPath = (SWBuf)privatePath + "/InstallMgr.conf";
+	FileMgr::createParent(confPath.c_str());
+	
+	readInstallConf();
+}
+
+
+InstallMgr::~InstallMgr() {
+	delete [] privatePath;
+	delete installConf;
+	clearSources();
+}
+
+
+void InstallMgr::clearSources() {
+	for (InstallSourceMap::iterator it = sources.begin(); it != sources.end(); ++it) {
+		delete it->second;
+	}
+	sources.clear();
+}
+
+
+void InstallMgr::readInstallConf() {
+
+	if (installConf) delete installConf;
+
+	installConf = new SWConfig(confPath.c_str());
+
+	clearSources();
+	
+	setFTPPassive(stricmp((*installConf)["General"]["PassiveFTP"].c_str(), "false") != 0);
+
+	SectionMap::iterator confSection = installConf->Sections.find("Sources");
+	ConfigEntMap::iterator sourceBegin;
+	ConfigEntMap::iterator sourceEnd;
+
+	if (confSection != installConf->Sections.end()) {
+
+		sourceBegin = confSection->second.lower_bound("FTPSource");
+		sourceEnd = confSection->second.upper_bound("FTPSource");
+
+		while (sourceBegin != sourceEnd) {
+			InstallSource *is = new InstallSource("FTP", sourceBegin->second.c_str());
+			sources[is->caption] = is;
+			SWBuf parent = (SWBuf)privatePath + "/" + is->uid + "/file";
+			FileMgr::createParent(parent.c_str());
+			is->localShadow = (SWBuf)privatePath + "/" + is->uid;
+			sourceBegin++;
+		}
+
+#ifdef CURLSFTPAVAILABLE
+		sourceBegin = confSection->second.lower_bound("SFTPSource");
+		sourceEnd   = confSection->second.upper_bound("SFTPSource");
+
+		while (sourceBegin != sourceEnd) {
+			InstallSource *is = new InstallSource("SFTP", sourceBegin->second.c_str());
+			sources[is->caption] = is;
+			SWBuf parent = (SWBuf)privatePath + "/" + is->uid + "/file";
+			FileMgr::createParent(parent.c_str());
+			is->localShadow = (SWBuf)privatePath + "/" + is->uid;
+			sourceBegin++;
+		}
+#endif // CURLSFTPAVAILABLE
+
+		sourceBegin = confSection->second.lower_bound("HTTPSource");
+		sourceEnd = confSection->second.upper_bound("HTTPSource");
+
+		while (sourceBegin != sourceEnd) {
+			InstallSource *is = new InstallSource("HTTP", sourceBegin->second.c_str());
+			sources[is->caption] = is;
+			SWBuf parent = (SWBuf)privatePath + "/" + is->uid + "/file";
+			FileMgr::createParent(parent.c_str());
+			is->localShadow = (SWBuf)privatePath + "/" + is->uid;
+			sourceBegin++;
+		}
+
+		sourceBegin = confSection->second.lower_bound("HTTPSSource");
+		sourceEnd   = confSection->second.upper_bound("HTTPSSource");
+
+		while (sourceBegin != sourceEnd) {
+			InstallSource *is = new InstallSource("HTTPS", sourceBegin->second.c_str());
+			sources[is->caption] = is;
+			SWBuf parent = (SWBuf)privatePath + "/" + is->uid + "/file";
+			FileMgr::createParent(parent.c_str());
+			is->localShadow = (SWBuf)privatePath + "/" + is->uid;
+			sourceBegin++;
+		}
+	}
+
+	defaultMods.clear();
+	confSection = installConf->Sections.find("General");
+	if (confSection != installConf->Sections.end()) {
+		sourceBegin = confSection->second.lower_bound("DefaultMod");
+		sourceEnd = confSection->second.upper_bound("DefaultMod");
+
+		while (sourceBegin != sourceEnd) {
+			defaultMods.insert(sourceBegin->second.c_str());
+			sourceBegin++;
+		}
+	}
+}
+
+
+void InstallMgr::saveInstallConf() {
+
+	installConf->Sections["Sources"].clear();
+
+	for (InstallSourceMap::iterator it = sources.begin(); it != sources.end(); ++it) {
+		if (it->second) {
+			installConf->Sections["Sources"].insert(ConfigEntMap::value_type(it->second->type + "Source", it->second->getConfEnt().c_str()));
+		}
+	}
+	(*installConf)["General"]["PassiveFTP"] = (isFTPPassive()) ? "true" : "false";
+
+	installConf->Save();
+}
+
+
+void InstallMgr::terminate() { if (transport) transport->terminate(); }
+
+
+int InstallMgr::removeModule(SWMgr *manager, const char *moduleName) {
+	SectionMap::iterator module;
+	ConfigEntMap::iterator fileBegin;
+	ConfigEntMap::iterator fileEnd, entry;
+
+	// save our own copy, cuz when we remove the module from the SWMgr
+	// it's likely we'll free the memory passed to us in moduleName
+	SWBuf modName = moduleName;
+	module = manager->config->Sections.find(modName);
+
+	if (module != manager->config->Sections.end()) {
+		// to be sure all files are closed
+		// this does not remove the .conf information from SWMgr
+		manager->deleteModule(modName);
+
+		fileBegin = module->second.lower_bound("File");
+		fileEnd = module->second.upper_bound("File");
+
+		SWBuf modFile;
+		SWBuf modDir;
+		entry = module->second.find("AbsoluteDataPath");
+		modDir = entry->second.c_str();
+		removeTrailingSlash(modDir);
+		if (fileBegin != fileEnd) {	// remove each file
+			while (fileBegin != fileEnd) {
+				modFile = modDir;
+				modFile += "/";
+				modFile += fileBegin->second.c_str();
+				//remove file
+				FileMgr::removeFile(modFile.c_str());
+				fileBegin++;
+			}
+		}
+		else {	//remove all files in DataPath directory
+
+			DIR *dir;
+			struct dirent *ent;
+			ConfigEntMap::iterator entry;
+
+			FileMgr::removeDir(modDir.c_str());
+
+			if ((dir = opendir(manager->configPath))) {	// find and remove .conf file
+				rewinddir(dir);
+				while ((ent = readdir(dir))) {
+					if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+						modFile = manager->configPath;
+						removeTrailingSlash(modFile);
+						modFile += "/";
+						modFile += ent->d_name;
+						SWConfig *config = new SWConfig(modFile.c_str());
+						if (config->Sections.find(modName) != config->Sections.end()) {
+							delete config;
+							FileMgr::removeFile(modFile.c_str());
+						}
+						else	delete config;
+					}
+				}
+				closedir(dir);
+			}
+		}
+		return 0;
+	}
+	return 1;
+}
+
+
+// TODO: rename to netCopy
+int InstallMgr::remoteCopy(InstallSource *is, const char *src, const char *dest, bool dirTransfer, const char *suffix) {
+SWLog::getSystemLog()->logDebug("remoteCopy: %s, %s, %s, %c, %s", (is?is->source.c_str():"null"), src, (dest?dest:"null"), (dirTransfer?'t':'f'), (suffix?suffix:"null"));
+
+	// assert user disclaimer has been confirmed
+	if (!isUserDisclaimerConfirmed()) return -1;
+
+	int retVal = 0;
+	RemoteTransport *trans = 0;
+	if (is->type == "FTP" 
+#ifdef CURLSFTPAVAILABLE
+		|| is->type == "SFTP"
+#endif
+		) {
+
+		trans = createFTPTransport(is->source, statusReporter);
+		trans->setPassive(passive);
+	}
+	else if (is->type == "HTTP" || is->type == "HTTPS") {
+		trans = createHTTPTransport(is->source, statusReporter);
+	}
+	transport = trans; // set classwide current transport for other thread terminate() call
+	if (is->u.length()) {
+		trans->setUser(is->u);
+		trans->setPasswd(is->p);
+	}
+	else {
+		trans->setUser(u);
+		trans->setPasswd(p);
+	}
+
+	SWBuf urlPrefix;
+	if (is->type == "HTTP") {
+		urlPrefix = (SWBuf) "http://";
+	}
+	else if (is->type == "HTTPS") {
+		urlPrefix = (SWBuf) "https://";
+	}
+#ifdef CURLSFTPAVAILABLE
+	else if (is->type == "SFTP") {
+		urlPrefix = (SWBuf) "sftp://";
+	}
+#endif
+	else {
+		urlPrefix = (SWBuf) "ftp://";
+	}
+	urlPrefix.append(is->source);
+
+	// let's be sure we can connect.  This seems to be necessary but sucks
+//	SWBuf url = urlPrefix + is->directory.c_str() + "/"; //dont forget the final slash
+//	if (trans->getURL("swdirlist.tmp", url.c_str())) {
+//		 SWLog::getSystemLog()->logDebug("FTPCopy: failed to get dir %s\n", url.c_str());
+//		 return -1;
+//	}
+
+
+	if (dirTransfer) {
+		SWBuf dir = (SWBuf)is->directory.c_str();
+		removeTrailingSlash(dir);
+		dir += (SWBuf)"/" + src; //dont forget the final slash
+
+		retVal = trans->copyDirectory(urlPrefix, dir, dest, suffix);
+
+
+	}
+	else {
+		SWTRY {
+			SWBuf url = urlPrefix + is->directory.c_str();
+			removeTrailingSlash(url);
+			url += (SWBuf)"/" + src; //dont forget the final slash
+			if (trans->getURL(dest, url.c_str())) {
+				SWLog::getSystemLog()->logDebug("netCopy: failed to get file %s", url.c_str());
+				retVal = -1;
+			}
+		}
+		SWCATCH (...) {
+			retVal = -1;
+		}
+	}
+	SWTRY {
+		RemoteTransport *deleteMe = trans;
+		// do this order for threadsafeness
+		// (see terminate())
+		trans = transport = 0;
+		delete deleteMe;
+	}
+	SWCATCH (...) {}
+	return retVal;
+}
+
+
+int InstallMgr::installModule(SWMgr *destMgr, const char *fromLocation, const char *modName, InstallSource *is) {
+	SectionMap::iterator module, section;
+	ConfigEntMap::iterator fileBegin;
+	ConfigEntMap::iterator fileEnd;
+	ConfigEntMap::iterator entry;
+	SWBuf sourceDir;
+	SWBuf buffer;
+	bool aborted = false;
+	bool cipher = false;
+	DIR *dir;
+	struct dirent *ent;
+	SWBuf modFile;
+
+	SWLog::getSystemLog()->logDebug("***** InstallMgr::installModule\n");
+	if (fromLocation)
+		SWLog::getSystemLog()->logDebug("***** fromLocation: %s \n", fromLocation);
+	SWLog::getSystemLog()->logDebug("***** modName: %s \n", modName);
+
+	if (is)
+		sourceDir = (SWBuf)privatePath + "/" + is->uid;
+	else	sourceDir = fromLocation;
+
+	removeTrailingSlash(sourceDir);
+	sourceDir += '/';
+
+	SWMgr mgr(sourceDir.c_str());
+	
+	module = mgr.config->Sections.find(modName);
+
+	if (module != mgr.config->Sections.end()) {
+	
+		entry = module->second.find("CipherKey");
+		if (entry != module->second.end())
+			cipher = true;
+		
+		//
+		// This first check is a method to allow a module to specify each
+		// file that needs to be copied
+		//
+		fileEnd = module->second.upper_bound("File");
+		fileBegin = module->second.lower_bound("File");
+
+		if (fileBegin != fileEnd) {	// copy each file
+			if (is) {
+				while (fileBegin != fileEnd) {	// netCopy each file first
+					buffer = sourceDir + fileBegin->second.c_str();
+					if (remoteCopy(is, fileBegin->second.c_str(), buffer.c_str())) {
+						aborted = true;
+						break;	// user aborted
+					}
+					fileBegin++;
+				}
+				fileBegin = module->second.lower_bound("File");
+			}
+
+			if (!aborted) {
+				// DO THE INSTALL
+				while (fileBegin != fileEnd) {
+					SWBuf sourcePath = sourceDir;
+					sourcePath += fileBegin->second.c_str();
+					SWBuf dest = destMgr->prefixPath;
+					removeTrailingSlash(dest);
+					dest += '/';
+					dest += fileBegin->second.c_str();
+					FileMgr::copyFile(sourcePath.c_str(), dest.c_str());
+
+					fileBegin++;
+				}
+			}
+			//---------------
+
+			if (is) {
+				fileBegin = module->second.lower_bound("File");
+				while (fileBegin != fileEnd) {	// delete each tmp netCopied file
+					buffer = sourceDir + fileBegin->second.c_str();
+					FileMgr::removeFile(buffer.c_str());
+					fileBegin++;
+				}
+			}
+		}
+
+		// This is the REAL install code, the above code I don't think has
+		// ever been used
+		//
+		// Copy all files in DataPath directory
+		// 
+		else {
+			ConfigEntMap::iterator entry;
+
+			entry = module->second.find("AbsoluteDataPath");
+			if (entry != module->second.end()) {
+				SWBuf absolutePath = entry->second.c_str();
+				SWBuf relativePath = absolutePath;
+				entry = module->second.find("PrefixPath");
+				if (entry != module->second.end()) {
+					relativePath << strlen(entry->second.c_str());
+				}
+				else {
+					relativePath << strlen(mgr.prefixPath);
+				}
+				SWLog::getSystemLog()->logDebug("***** mgr.prefixPath: %s \n", mgr.prefixPath);
+				SWLog::getSystemLog()->logDebug("***** destMgr->prefixPath: %s \n", destMgr->prefixPath);
+				SWLog::getSystemLog()->logDebug("***** absolutePath: %s \n", absolutePath.c_str());
+				SWLog::getSystemLog()->logDebug("***** relativePath: %s \n", relativePath.c_str());
+
+				if (is) {
+					if (remoteCopy(is, relativePath.c_str(), absolutePath.c_str(), true)) {
+						aborted = true;	// user aborted
+					}
+				}
+				if (!aborted) {
+					SWBuf destPath = (SWBuf)destMgr->prefixPath + relativePath;
+					FileMgr::copyDir(absolutePath.c_str(), destPath.c_str());
+				}
+				if (is) {		// delete tmp netCopied files
+//					mgr->deleteModule(modName);
+					FileMgr::removeDir(absolutePath.c_str());
+				}
+			}
+		}
+		if (!aborted) {
+			SWBuf confDir = sourceDir + "mods.d/";
+			if ((dir = opendir(confDir.c_str()))) {	// find and copy .conf file
+				rewinddir(dir);
+				while ((ent = readdir(dir))) {
+					if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+						modFile = confDir;
+						modFile += ent->d_name;
+						SWConfig *config = new SWConfig(modFile.c_str());
+						if (config->Sections.find(modName) != config->Sections.end()) {
+							SWBuf targetFile = destMgr->configPath; //"./mods.d/";
+							removeTrailingSlash(targetFile);
+							targetFile += "/";
+							targetFile += ent->d_name;
+							FileMgr::copyFile(modFile.c_str(), targetFile.c_str());
+							if (cipher) {
+								if (getCipherCode(modName, config)) {
+									SWMgr newDest(destMgr->prefixPath);
+									removeModule(&newDest, modName);
+									aborted = true;
+								}
+								else {
+									config->Save();
+									FileMgr::copyFile(modFile.c_str(), targetFile.c_str());
+								}
+							}
+						}
+						delete config;
+					}
+				}
+				closedir(dir);
+			}
+		}
+		return (aborted) ? -1 : 0;
+	}
+	return 1;
+}
+
+
+int InstallMgr::refreshRemoteSource(InstallSource *is) {
+
+	// assert user disclaimer has been confirmed
+	if (!isUserDisclaimerConfirmed()) return -1;
+
+	SWBuf root = (SWBuf)privatePath + (SWBuf)"/" + is->uid.c_str();
+	removeTrailingSlash(root);
+	SWBuf target = root + "/mods.d";
+	int errorCode = -1; //0 means successful
+
+	FileMgr::removeDir(target.c_str());
+
+	if (!FileMgr::existsDir(target))
+		FileMgr::createPathAndFile(target+"/globals.conf");
+
+#ifndef EXCLUDEZLIB
+	SWBuf archive = root + "/mods.d.tar.gz";
+
+	errorCode = remoteCopy(is, "mods.d.tar.gz", archive.c_str(), false);
+	if (!errorCode) { //sucessfully downloaded the tar,gz of module configs
+		FileDesc *fd = FileMgr::getSystemFileMgr()->open(archive.c_str(), FileMgr::RDONLY);
+		untargz(fd->getFd(), root.c_str());
+		FileMgr::getSystemFileMgr()->close(fd);
+	}
+	else
+#endif
+	errorCode = remoteCopy(is, "mods.d", target.c_str(), true, ".conf"); //copy the whole directory
+
+	is->flush();
+	return errorCode;
+}
+
+
+bool InstallMgr::isDefaultModule(const char *modName) {
+	return defaultMods.count(modName);
+}
+
+
+/************************************************************************
+ * getModuleStatus - compare the modules of two SWMgrs and return a 
+ * 	vector describing the status of each.  See MODSTAT_*
+ */
+map<SWModule *, int> InstallMgr::getModuleStatus(const SWMgr &base, const SWMgr &other) {
+	map<SWModule *, int> retVal;
+	SWBuf targetVersion;
+	SWBuf sourceVersion;
+	SWBuf softwareVersion;
+	bool cipher;
+	bool keyPresent;
+	int modStat;
+	
+	for (ModMap::const_iterator mod = other.Modules.begin(); mod != other.Modules.end(); mod++) {
+	
+		modStat = 0;
+
+		cipher = false;
+		keyPresent = false;
+		
+		const char *v = mod->second->getConfigEntry("CipherKey");
+		if (v) {
+			cipher = true;
+			keyPresent = *v;
+		}
+		
+		targetVersion = "0.0";
+		sourceVersion = "1.0";
+		softwareVersion = (const char *)SWVersion::currentVersion;
+		
+		v = mod->second->getConfigEntry("Version");
+		if (v) sourceVersion = v;
+
+		v = mod->second->getConfigEntry("MinimumVersion");
+		if (v) softwareVersion = v;
+
+		const SWModule *baseMod = base.getModule(mod->first);
+		if (baseMod) {
+			targetVersion = "1.0";
+			v = baseMod->getConfigEntry("Version");
+			if (v) targetVersion = v;
+			modStat |= (SWVersion(sourceVersion.c_str()) > SWVersion(targetVersion.c_str())) ? MODSTAT_UPDATED : (SWVersion(sourceVersion.c_str()) < SWVersion(targetVersion.c_str())) ? MODSTAT_OLDER : MODSTAT_SAMEVERSION;
+		}
+		else modStat |= MODSTAT_NEW;
+
+		if (cipher) modStat |= MODSTAT_CIPHERED;
+		if (keyPresent) modStat |= MODSTAT_CIPHERKEYPRESENT;
+		retVal[mod->second] = modStat;
+	}
+	return retVal;
+}
+
+
+/************************************************************************
+ * refreshRemoteSourceConfiguration - grab master list of know remote
+ * 	sources and integrate it with our configurations.
+ */
+int InstallMgr::refreshRemoteSourceConfiguration() {
+
+	// assert user disclaimer has been confirmed
+	if (!isUserDisclaimerConfirmed()) return -1;
+
+	SWBuf root = (SWBuf)privatePath;
+	removeTrailingSlash(root);
+	SWBuf masterRepoListPath = root + "/" + masterRepoList;
+	InstallSource is("FTP");
+	is.source = "ftp.crosswire.org";
+	is.directory = "/pub/sword";
+	int errorCode = remoteCopy(&is, masterRepoList, masterRepoListPath.c_str(), false);
+	if (!errorCode) { //sucessfully downloaded the repo list
+		SWConfig masterList(masterRepoListPath);
+		SectionMap::iterator sections = masterList.Sections.find("Repos");
+		if (sections != masterList.Sections.end()) {
+			for (ConfigEntMap::iterator actions = sections->second.begin(); actions != sections->second.end(); actions++) {
+				// Search through our current sources and see if we have a matching UID
+				InstallSourceMap::iterator it;
+				for (it = sources.begin(); it != sources.end(); ++it) {
+					// is this our UID?
+					if ((it->second) && (it->second->uid == actions->first)) {
+						if (actions->second == "REMOVE") {
+							// be sure to call save/reload after this
+							// or this could be dangerous
+							delete it->second;
+							it->second = 0;
+						}
+						else {
+							SWBuf key = actions->second.stripPrefix('=');
+							if (key == "FTPSource") {
+								// we might consider instantiating a temp IS
+								// from our config string and then copy only
+								// some entries.  This would allow the use to
+								// change some fields and not have them overwritten
+								// but it seems like we might want to change any
+								// of the current fields so we don't do this now
+								// InstallSource i("FTP", actions->second);
+								delete it->second;
+								it->second = new InstallSource("FTP", actions->second.c_str());
+								it->second->uid = actions->first;
+							}
+						}
+						break;
+					}
+				}
+				// didn't find our UID, let's add it
+				if (it == sources.end()) {
+					SWBuf key = actions->second.stripPrefix('=');
+					if (key == "FTPSource") {
+						if (actions->second != "REMOVE") {
+							InstallSource *is = new InstallSource("FTP", actions->second.c_str());
+							is->uid = actions->first;
+							sources[is->caption] = is;
+						}
+					}
+				}
+			}
+
+			// persist and re-read
+			saveInstallConf();
+			readInstallConf();
+
+			return 0;
+		}
+	}
+	return -1;
+}
+
+
+InstallSource::InstallSource(const char *type, const char *confEnt) {
+	this->type = type;
+	mgr = 0;
+	userData = 0;
+	if (confEnt) {
+		SWBuf buf = confEnt;
+		caption   = buf.stripPrefix('|', true);
+		source    = buf.stripPrefix('|', true);
+		directory = buf.stripPrefix('|', true);
+		u         = buf.stripPrefix('|', true);
+		p         = buf.stripPrefix('|', true);
+		uid       = buf.stripPrefix('|', true);
+
+		if (!uid.length()) uid = source;
+
+		removeTrailingSlash(directory);
+	}
+}
+
+
+InstallSource::~InstallSource() {
+	if (mgr)
+		delete mgr;
+}
+
+
+void InstallSource::flush() {
+	if (mgr) {
+		delete mgr;
+		mgr = 0;
+	}
+}
+
+
+SWMgr *InstallSource::getMgr() {
+	if (!mgr)
+		// ..., false = don't augment ~home directory.
+		mgr = new SWMgr(localShadow.c_str(), true, 0, false, false);
+	return mgr;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/localemgr.cpp b/src/mgr/localemgr.cpp
new file mode 100644
index 0000000..90d4716
--- /dev/null
+++ b/src/mgr/localemgr.cpp
@@ -0,0 +1,282 @@
+/******************************************************************************
+ *
+ *  localemgr.cpp -	implementation of class LocaleMgr used to interact with
+ *			registered locales for a SWORD installation
+ *
+ * $Id: localemgr.cpp 3005 2014-01-09 04:06:11Z greg.hellings $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+
+#include <sys/stat.h>
+#include <dirent.h>
+
+#include <swmgr.h>
+#include <utilstr.h>
+
+#include <stringmgr.h>
+#include <filemgr.h>
+#include <localemgr.h>
+#include <swlocale.h>
+#include <swlog.h>
+
+
+SWORD_NAMESPACE_START
+
+
+LocaleMgr *LocaleMgr::systemLocaleMgr = 0;
+
+
+class __staticsystemLocaleMgr {
+public:
+	__staticsystemLocaleMgr() { }
+	~__staticsystemLocaleMgr() { delete LocaleMgr::systemLocaleMgr; }
+} _staticsystemLocaleMgr;
+
+
+LocaleMgr *LocaleMgr::getSystemLocaleMgr() {
+	if (!systemLocaleMgr) {
+		setSystemLocaleMgr(new LocaleMgr());
+	}
+
+	return systemLocaleMgr;
+}
+
+
+void LocaleMgr::setSystemLocaleMgr(LocaleMgr *newLocaleMgr) {
+	if (systemLocaleMgr)
+		delete systemLocaleMgr;
+	systemLocaleMgr = newLocaleMgr;
+	SWLocale *locale = new SWLocale(0);
+	systemLocaleMgr->locales->insert(LocaleMap::value_type(locale->getName(), locale));
+}
+
+
+LocaleMgr::LocaleMgr(const char *iConfigPath) {
+	locales = new LocaleMap();
+	char *prefixPath = 0;
+	char *configPath = 0;
+	SWConfig *sysConf = 0;
+	char configType = 0;
+	SWBuf path;
+	std::list<SWBuf> augPaths;
+	ConfigEntMap::iterator entry;
+	
+	defaultLocaleName = 0;
+	
+	if (!iConfigPath) {
+		SWLog::getSystemLog()->logDebug("LOOKING UP LOCALE DIRECTORY...");
+		SWMgr::findConfig(&configType, &prefixPath, &configPath, &augPaths, &sysConf);
+		if (sysConf) {
+			if ((entry = sysConf->Sections["Install"].find("LocalePath")) != sysConf->Sections["Install"].end()) {
+				configType = 9;	// our own
+				stdstr(&prefixPath, (char *)entry->second.c_str());
+				SWLog::getSystemLog()->logDebug("LocalePath provided in sysConfig.");
+			}
+		}
+		SWLog::getSystemLog()->logDebug("LOOKING UP LOCALE DIRECTORY COMPLETE.");
+	}
+	else {
+		loadConfigDir(iConfigPath);
+	}
+	
+	if (prefixPath) {
+		switch (configType) {
+		case 2:
+			int i;
+			for (i = strlen(configPath)-1; ((i) && (configPath[i] != '/') && (configPath[i] != '\\')); i--);
+			configPath[i] = 0;
+			path = configPath;
+			path += "/";
+			break;
+		default:
+			path = prefixPath;
+			if ((prefixPath[strlen(prefixPath)-1] != '\\') && (prefixPath[strlen(prefixPath)-1] != '/'))
+				path += "/";
+
+			break;
+		}
+		if (FileMgr::existsDir(path.c_str(), "locales.d")) {
+			path += "locales.d";
+			loadConfigDir(path.c_str());
+		}
+	}
+	
+	if (augPaths.size() && configType != 9) { //load locale files from all augmented paths
+		std::list<SWBuf>::iterator it = augPaths.begin();
+		std::list<SWBuf>::iterator end = augPaths.end();
+		
+		for (;it != end; ++it) {
+			if (FileMgr::existsDir((*it).c_str(), "locales.d")) {
+				SWBuf path = (*it) + "locales.d";
+				loadConfigDir(path.c_str());
+			}
+		}
+	}
+
+	// Locales will be invalidated if you change the StringMgr
+	// So only use the default hardcoded locale and let the
+	// frontends change the locale if they want
+	stdstr(&defaultLocaleName, SWLocale::DEFAULT_LOCALE_NAME);
+
+	if (prefixPath)
+		delete [] prefixPath;
+
+	if (configPath)
+		delete [] configPath;
+
+	if (sysConf)
+		delete sysConf;
+}
+
+
+LocaleMgr::~LocaleMgr() {
+	if (defaultLocaleName)
+		delete [] defaultLocaleName;
+     	deleteLocales();
+	delete locales;
+}
+
+
+void LocaleMgr::loadConfigDir(const char *ipath) {
+	DIR *dir;
+	struct dirent *ent;
+	SWBuf newmodfile;
+	LocaleMap::iterator it;
+	SWLog::getSystemLog()->logInformation("LocaleMgr::loadConfigDir loading %s", ipath);
+ 
+	if ((dir = opendir(ipath))) {
+		rewinddir(dir);
+		while ((ent = readdir(dir))) {
+			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+				newmodfile = ipath;
+				if ((ipath[strlen(ipath)-1] != '\\') && (ipath[strlen(ipath)-1] != '/'))
+					newmodfile += "/";
+				newmodfile += ent->d_name;
+				SWLocale *locale = new SWLocale(newmodfile.c_str());
+				
+				if (locale->getName()) {					
+					bool supported = false;
+					if (StringMgr::hasUTF8Support()) {
+						supported = (locale->getEncoding() && (!strcmp(locale->getEncoding(), "UTF-8") || !strcmp(locale->getEncoding(), "ASCII")) );
+					}
+					else {
+						supported = !locale->getEncoding() || (locale->getEncoding() && (strcmp(locale->getEncoding(), "UTF-8") != 0)); //exclude UTF-8 locales
+					}
+					
+					if (!supported) { //not supported
+						delete locale;
+						continue;
+					}
+				
+					it = locales->find(locale->getName());
+					if (it != locales->end()) { // already present
+						*((*it).second) += *locale;
+						delete locale;
+					}
+					else locales->insert(LocaleMap::value_type(locale->getName(), locale));
+				}
+				else	delete locale;
+			}
+		}
+		closedir(dir);
+	}
+}
+
+
+void LocaleMgr::deleteLocales() {
+
+	LocaleMap::iterator it;
+
+	for (it = locales->begin(); it != locales->end(); it++)
+		delete (*it).second;
+
+	locales->erase(locales->begin(), locales->end());
+}
+
+
+SWLocale *LocaleMgr::getLocale(const char *name) {
+	LocaleMap::iterator it;
+
+	it = locales->find(name);
+	if (it != locales->end())
+		return (*it).second;
+
+	SWLog::getSystemLog()->logWarning("LocaleMgr::getLocale failed to find %s\n", name);
+	return (*locales)[SWLocale::DEFAULT_LOCALE_NAME];
+}
+
+
+std::list <SWBuf> LocaleMgr::getAvailableLocales() {
+	std::list <SWBuf> retVal;
+	for (LocaleMap::iterator it = locales->begin(); it != locales->end(); it++) {
+		if (strcmp(it->second->getName(), "locales")) {
+			retVal.push_back((*it).second->getName());
+		}
+	}
+
+	return retVal;
+}
+
+
+const char *LocaleMgr::translate(const char *text, const char *localeName) {
+	SWLocale *target;
+	if (!localeName) {
+		localeName = getDefaultLocaleName();
+	}
+	target = getLocale(localeName);
+	if (target)
+		return target->translate(text);
+	return text;
+}
+
+
+const char *LocaleMgr::getDefaultLocaleName() {
+	return defaultLocaleName;
+}
+
+
+void LocaleMgr::setDefaultLocaleName(const char *name) {
+	char *tmplang=0;
+	stdstr(&tmplang, name);
+	// discard everything after '.' usually encoding e.g. .UTF-8
+	strtok(tmplang, ".");
+	// also discard after '@' so e.g. @euro locales are found
+	strtok(tmplang, "@");
+
+	stdstr(&defaultLocaleName, tmplang);
+
+	// First check for what we ask for
+	if (locales->find(tmplang) == locales->end()) {
+		// check for locale without country
+		char *nocntry=0;
+		stdstr(&nocntry, tmplang);
+		strtok(nocntry, "_");
+		if (locales->find(nocntry) != locales->end()) {
+			stdstr(&defaultLocaleName, nocntry);
+		}
+		delete [] nocntry;
+	}
+	delete [] tmplang;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/markupfiltmgr.cpp b/src/mgr/markupfiltmgr.cpp
new file mode 100644
index 0000000..fb12583
--- /dev/null
+++ b/src/mgr/markupfiltmgr.cpp
@@ -0,0 +1,319 @@
+/******************************************************************************
+ *
+ *  markupfiltmgr.cpp -	implementaion of class MarkupFilterMgr, subclass of
+ *			used to transcode all module text to a requested
+ *			markup
+ *
+ * $Id: markupfiltmgr.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <thmlplain.h>
+#include <gbfplain.h>
+#include <osisplain.h>
+#include <teiplain.h>
+#include <thmlgbf.h>
+#include <gbfthml.h>
+#include <thmlhtml.h>
+#include <gbfhtml.h>
+#include <thmlhtmlhref.h>
+#include <gbfhtmlhref.h>
+#include <teihtmlhref.h>
+#include <thmlrtf.h>
+#include <gbfrtf.h>
+#include <gbfosis.h>
+#include <thmlosis.h>
+#include <osisrtf.h>
+#include <teirtf.h>
+#include <osisosis.h>
+#include <osishtmlhref.h>
+#include <gbfwebif.h>
+#include <thmlwebif.h>
+#include <osiswebif.h>
+#include <swmodule.h>
+#include <thmlxhtml.h>
+#include <gbfxhtml.h>
+#include <osisxhtml.h>
+#include <teixhtml.h>
+
+#include <markupfiltmgr.h>
+
+#include <swmgr.h>
+
+
+SWORD_NAMESPACE_START
+
+
+/******************************************************************************
+ * MarkupFilterMgr Constructor - initializes instance of MarkupFilterMgr
+ *
+ * ENT:
+ *      enc - Encoding format to emit
+ *      mark - Markup format to emit
+ */
+
+MarkupFilterMgr::MarkupFilterMgr(char mark, char enc)
+		: EncodingFilterMgr(enc) {
+
+	markup = mark;
+
+	CreateFilters(markup);
+}
+
+
+/******************************************************************************
+ * MarkupFilterMgr Destructor - Cleans up instance of MarkupFilterMgr
+ */
+
+MarkupFilterMgr::~MarkupFilterMgr() {
+	delete fromthml;
+	delete fromgbf;
+	delete fromplain;
+	delete fromosis;
+	delete fromtei;
+}
+
+
+/******************************************************************************
+ * MarkupFilterMgr::Markup	- sets/gets markup
+ *
+ * ENT:	mark	- new encoding or 0 to simply get the current markup
+ *
+ * RET: markup
+ */
+char MarkupFilterMgr::Markup(char mark) {
+	if (mark && mark != markup) {
+		markup = mark;
+		ModMap::const_iterator module;
+
+		SWFilter *oldplain = fromplain;
+		SWFilter *oldthml  = fromthml;
+		SWFilter *oldgbf   = fromgbf;
+		SWFilter *oldosis  = fromosis;
+		SWFilter *oldtei   = fromtei;
+
+		CreateFilters(markup);
+
+		for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); ++module) {
+			switch (module->second->getMarkup()) {
+			case FMT_THML:
+				if (oldthml != fromthml) {
+					if (oldthml) {
+						if (!fromthml) {
+							module->second->removeRenderFilter(oldthml);
+						}
+						else {
+							module->second->replaceRenderFilter(oldthml, fromthml);
+						}
+					}
+					else if (fromthml) {
+						module->second->addRenderFilter(fromthml);
+					}
+				}
+				break;
+
+			case FMT_GBF:
+				if (oldgbf != fromgbf) {
+					if (oldgbf) {
+						if (!fromgbf) {
+							module->second->removeRenderFilter(oldgbf);
+						}
+						else {
+							module->second->replaceRenderFilter(oldgbf, fromgbf);
+						}
+					}
+					else if (fromgbf) {
+						module->second->addRenderFilter(fromgbf);
+					}
+				}
+				break;
+
+			case FMT_PLAIN:
+				if (oldplain != fromplain) {
+					if (oldplain) {
+						if (!fromplain) {
+							module->second->removeRenderFilter(oldplain);
+						}
+						else {
+							module->second->replaceRenderFilter(oldplain, fromplain);
+						}
+					}
+					else if (fromplain) {
+						module->second->addRenderFilter(fromplain);
+					}
+				}
+				break;
+
+			case FMT_OSIS:
+				if (oldosis != fromosis) {
+					if (oldosis) {
+						if (!fromosis) {
+							module->second->removeRenderFilter(oldosis);
+						}
+						else {
+							module->second->replaceRenderFilter(oldosis, fromosis);
+						}
+					}
+					else if (fromosis) {
+						module->second->addRenderFilter(fromosis);
+					}
+				}
+				break;
+
+			case FMT_TEI:
+				if (oldtei != fromtei) {
+					if (oldtei) {
+						if (!fromtei) {
+							module->second->removeRenderFilter(oldtei);
+						}
+						else {
+							module->second->replaceRenderFilter(oldtei, fromtei);
+						}
+					}
+					else if (fromtei) {
+						module->second->addRenderFilter(fromtei);
+					}
+				}
+				break;
+			}
+		}
+
+		delete oldthml;
+		delete oldgbf;
+		delete oldplain;
+		delete oldosis;
+		delete oldtei;
+	}
+	return markup;
+}
+
+
+void MarkupFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section) {
+	switch (module->getMarkup()) {
+	case FMT_THML:
+		if (fromthml)
+			module->addRenderFilter(fromthml);
+		break;
+	case FMT_GBF:
+		if (fromgbf)
+			module->addRenderFilter(fromgbf);
+		break;
+	case FMT_PLAIN:
+		if (fromplain)
+			module->addRenderFilter(fromplain);
+		break;
+	case FMT_OSIS:
+		if (fromosis)
+			module->addRenderFilter(fromosis);
+		break;
+	case FMT_TEI:
+		if (fromtei)
+			module->addRenderFilter(fromtei);
+		break;
+	}
+}
+
+
+void MarkupFilterMgr::CreateFilters(char markup) {
+
+	switch (markup) {
+	case FMT_PLAIN:
+		fromplain = NULL;
+		fromthml  = new ThMLPlain();
+		fromgbf   = new GBFPlain();
+		fromosis  = new OSISPlain();
+		fromtei   = new TEIPlain();
+		break;
+
+	case FMT_THML:
+		fromplain = NULL;
+		fromthml  = NULL;
+		fromgbf   = new GBFThML();
+		fromosis  = NULL;
+		fromtei   = NULL;
+		break;
+
+	case FMT_GBF:
+		fromplain = NULL;
+		fromthml  = new ThMLGBF();
+		fromgbf   = NULL;
+		fromosis  = NULL;
+		fromtei   = NULL;
+		break;
+
+	case FMT_HTML:
+		fromplain = NULL;
+		fromthml  = new ThMLHTML();
+		fromgbf   = new GBFHTML();
+		fromosis  = NULL;
+		fromtei   = NULL;
+		break;
+
+	case FMT_HTMLHREF:
+		fromplain = NULL;
+		fromthml  = new ThMLHTMLHREF();
+		fromgbf   = new GBFHTMLHREF();
+		fromosis  = new OSISHTMLHREF();
+		fromtei   = new TEIHTMLHREF();
+		break;
+
+	case FMT_RTF:
+		fromplain = NULL;
+		fromthml  = new ThMLRTF();
+		fromgbf   = new GBFRTF();
+		fromosis  = new OSISRTF();
+		fromtei   = new TEIRTF();
+		break;
+
+	case FMT_OSIS:
+		fromplain = NULL;
+		fromthml  = new ThMLOSIS();
+		fromgbf   = new GBFOSIS();
+		fromosis  = new OSISOSIS();
+		fromtei   = NULL;
+		break;
+
+	case FMT_WEBIF:
+		fromplain = NULL;
+		fromthml  = new ThMLWEBIF();
+		fromgbf   = new GBFWEBIF();
+		fromosis  = new OSISWEBIF();
+		fromtei   = NULL;
+		break;
+
+	case FMT_TEI:
+		fromplain = NULL;
+		fromthml  = NULL;
+		fromgbf   = NULL;
+		fromosis  = NULL;
+		fromtei   = NULL;
+		break;
+
+	case FMT_XHTML:
+		fromplain = NULL;
+		fromthml  = new ThMLXHTML();
+		fromgbf   = new GBFXHTML();
+		fromosis  = new OSISXHTML();
+		fromtei   = new TEIXHTML();
+		break;
+	}
+
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/remotetrans.cpp b/src/mgr/remotetrans.cpp
new file mode 100644
index 0000000..03ad3e4
--- /dev/null
+++ b/src/mgr/remotetrans.cpp
@@ -0,0 +1,204 @@
+/*****************************************************************************
+ *
+ *  remotetrans.cpp -	
+ *
+ * $Id: remotetrans.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <remotetrans.h>
+#include <filemgr.h>
+
+#include <fcntl.h>
+#include <dirent.h>
+#include <swlog.h>
+
+
+extern "C" {
+#include <ftpparse.h>
+}
+
+
+using std::vector;
+
+
+SWORD_NAMESPACE_START
+
+
+namespace {
+
+	void removeTrailingSlash(SWBuf &buf) {
+		int len = buf.size();
+		if ((buf[len-1] == '/')
+		 || (buf[len-1] == '\\'))
+			buf.size(len-1);
+	}
+
+};
+
+
+void StatusReporter::preStatus(long totalBytes, long completedBytes, const char *message) {
+}
+
+
+void StatusReporter::statusUpdate(double dtTotal, double dlNow) {
+}
+
+
+RemoteTransport::RemoteTransport(const char *host, StatusReporter *statusReporter) {
+	this->statusReporter = statusReporter;
+	this->host = host;
+	u = "ftp";
+	p = "installmgr@user.com";
+	term = false;
+}
+
+
+RemoteTransport::~RemoteTransport() {
+}
+
+
+// override this method in your real transport class
+char RemoteTransport::getURL(const char *destPath, const char *sourceURL, SWBuf *destBuf) {
+	char retVal = 0;
+	return retVal;
+}
+
+
+vector<struct DirEntry> RemoteTransport::getDirList(const char *dirURL) {
+
+	vector<struct DirEntry> dirList;
+	
+	SWBuf dirBuf;
+	if (!getURL("", dirURL, &dirBuf)) {
+		char *start = dirBuf.getRawData();
+		char *end = start;
+		while (start < (dirBuf.getRawData()+dirBuf.size())) {
+			struct ftpparse item;
+			bool looking = true;
+			for (end = start; *end; end++) {
+				if (looking) {
+					if ((*end == 10) || (*end == 13)) {
+						*end = 0;
+						looking = false;
+					}
+				}
+				else if ((*end != 10) && (*end != 13))
+					break;
+			}
+			SWLog::getSystemLog()->logWarning("getDirList: parsing item %s(%d)\n", start, end-start);
+			int status = ftpparse(&item, start, end - start);
+			// in ftpparse.h, there is a warning that name is not necessarily null terminated
+			SWBuf name;
+			name.append(item.name, item.namelen);
+			SWLog::getSystemLog()->logWarning("getDirList: got item %s\n", name.c_str());
+			if (status && name != "." && name != "..") {
+				struct DirEntry i;
+				i.name = name;
+				i.size = item.size;
+				i.isDirectory = (item.flagtrycwd == 1);
+				dirList.push_back(i);
+			}
+			start = end;
+		}
+	}
+	else {
+		SWLog::getSystemLog()->logWarning("getDirList: failed to get dir %s\n", dirURL);
+	}
+	return dirList;
+}
+
+
+int RemoteTransport::copyDirectory(const char *urlPrefix, const char *dir, const char *dest, const char *suffix) {
+	unsigned int i;
+	int retVal = 0;
+	
+	SWBuf url = SWBuf(urlPrefix) + SWBuf(dir);
+	removeTrailingSlash(url);
+	url += '/';
+	
+	SWLog::getSystemLog()->logWarning("NetTransport: getting dir %s\n", url.c_str());
+	vector<struct DirEntry> dirList = getDirList(url.c_str());
+
+	if (!dirList.size()) {
+		SWLog::getSystemLog()->logWarning("NetTransport: failed to read dir %s\n", url.c_str());
+		return -1;
+	}
+				
+	long totalBytes = 0;
+	for (i = 0; i < dirList.size(); i++)
+		totalBytes += dirList[i].size;
+	long completedBytes = 0;
+	for (i = 0; i < dirList.size(); i++) {
+		struct DirEntry &dirEntry = dirList[i];
+		SWBuf buffer = (SWBuf)dest;
+		removeTrailingSlash(buffer);
+		buffer += "/";
+		buffer += dirEntry.name;
+		if (!strcmp(&buffer.c_str()[buffer.length()-strlen(suffix)], suffix)) {
+			SWBuf buffer2 = "Downloading (";
+			buffer2.appendFormatted("%d", i+1);
+			buffer2 += " of ";
+			buffer2.appendFormatted("%d", dirList.size());
+			buffer2 += "): ";
+			buffer2 += dirEntry.name;
+			if (statusReporter)
+				statusReporter->preStatus(totalBytes, completedBytes, buffer2.c_str());
+			FileMgr::createParent(buffer.c_str());	// make sure parent directory exists
+			SWTRY {
+				SWBuf url = (SWBuf)urlPrefix + (SWBuf)dir;
+				removeTrailingSlash(url);
+				url += "/";
+				url += dirEntry.name; //dont forget the final slash
+				if (!dirEntry.isDirectory) {
+					if (getURL(buffer.c_str(), url.c_str())) {
+						SWLog::getSystemLog()->logWarning("copyDirectory: failed to get file %s\n", url.c_str());
+						return -2;
+					}
+					completedBytes += dirEntry.size;
+				}
+				else {
+					SWBuf subdir = (SWBuf)dir;
+					removeTrailingSlash(subdir);
+					subdir += (SWBuf)"/" + dirEntry.name;
+					if (copyDirectory(urlPrefix, subdir, buffer.c_str(), suffix)) {
+						SWLog::getSystemLog()->logWarning("copyDirectory: failed to get file %s\n", subdir.c_str());
+						return -2;
+					}
+				}
+			}
+			SWCATCH (...) {}
+			if (term) {
+				retVal = -3;
+				break;
+			}
+		}
+	}
+	return retVal;
+}
+
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+void StatusReporter::update(unsigned long totalBytes, unsigned long completedBytes) {
+	statusUpdate(totalBytes, completedBytes);
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/stringmgr.cpp b/src/mgr/stringmgr.cpp
new file mode 100644
index 0000000..0390905
--- /dev/null
+++ b/src/mgr/stringmgr.cpp
@@ -0,0 +1,287 @@
+/******************************************************************************
+ *
+ *  stringmgr.cpp -	implementation of class StringMgr
+ *
+ * $Id: stringmgr.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stringmgr.h>
+#include <swlog.h>
+#include <localemgr.h>
+#include <utilstr.h>
+
+#ifdef _ICU_
+
+#include <unicode/utypes.h>
+#include <unicode/ucnv.h>
+#include <unicode/ustring.h>
+#include <unicode/uchar.h>
+
+#include <unicode/unistr.h>
+#include <unicode/translit.h>
+
+#include <unicode/locid.h>
+
+#endif
+
+
+SWORD_NAMESPACE_START
+
+
+StringMgr *StringMgr::systemStringMgr = 0;
+
+class __staticsystemStringMgr {
+public:
+	__staticsystemStringMgr() { }
+	~__staticsystemStringMgr() { if (StringMgr::systemStringMgr) delete StringMgr::systemStringMgr; StringMgr::systemStringMgr = 0; }
+} _staticsystemStringMgr;
+
+
+namespace {
+
+	/**
+	 * Determine whether the string contains a valid unicode sequence. The following table give the pattern of a valid UTF-8 character.
+	 * Unicode Range            1st       2nd       3rd       4th       5th       6th
+	 * U-00000000 - U-0000007F  0nnnnnnn
+	 * U-00000080 - U-000007FF  110nnnnn  10nnnnnn
+	 * U-00000800 - U-0000FFFF  1110nnnn  10nnnnnn  10nnnnnn
+	 * U-00010000 - U-001FFFFF  11110nnn  10nnnnnn  10nnnnnn  10nnnnnn
+	 * U-00200000 - U-03FFFFFF  111110nn  10nnnnnn  10nnnnnn  10nnnnnn  10nnnnnn
+	 * U-04000000 - U-7FFFFFFF  1111110n  10nnnnnn  10nnnnnn  10nnnnnn  10nnnnnn  10nnnnnn
+	 * Note:
+	 *   The latest UTF-8 RFC allows for a max of 4 bytes. Earlier allowed 6.
+	 *   The number of bits of the leading byte before the first 0 is the total number of bytes
+	 *   The "n" are the bits of the unicode codepoint.
+	 *
+	 * This routine does not check to see if the code point is in the range. It could.
+	 *
+	 * @param txt the text to check
+	 * @return  1 if all high order characters form a valid unicode sequence
+	 *         -1 if there are no high order characters
+	 *          0 if there are high order characters that do not form a valid unicode sequence
+	 * @author DM Smith [dmsmith555 at yahoo dot com]
+	 */
+	int isValidUTF8(unsigned char *txt) {
+		unsigned int  countUTF8 = 0;
+	#if 0
+		unsigned char parts     = 0;
+
+
+		unsigned char *p = txt;
+		while (*p) {
+			// Is the high order bit set?
+			if (*p & 0x80) {
+				// then count the number of high order bits that are set
+				// this determines the number of following bytes need to have high order bits set
+				unsigned char i = *p;
+				for (parts = 0; i & 0x80; parts++) {
+					i <<= 1;
+				}
+
+
+				// The pattern 10nnnnnn is not a unicode character
+				if (parts == 1) {
+					return 0;
+				}
+				else {
+					while (--parts && ++*p) {
+						// The pattern of each following character must be: 10nnnnnn
+						if (0xc0 & *p != 0x80) {
+							return  0;
+						}
+					}
+
+					// Oops, we've run out of bytes too soon: Cannot be UTF-8
+					if (parts) {
+						return 0;
+					}
+				}
+				countUTF8++;
+			}
+		}
+
+		// At this point it is either UTF-8 or ascii
+	#endif
+		return countUTF8 ? 1 : -1;
+	}
+}
+
+
+#ifdef _ICU_
+
+//here comes our ICUStringMgr reimplementation
+class ICUStringMgr : public StringMgr {
+public:
+	virtual char *upperUTF8(char *, unsigned int maxlen = 0) const;
+	
+protected:
+	virtual bool supportsUnicode() const { return true; };
+};
+
+#endif
+
+
+/** Default constructor
+*/		
+StringMgr::StringMgr() {
+}
+
+/** Copy constructor
+*/	
+StringMgr::StringMgr(const StringMgr &m) {
+}
+
+/** Destructor
+*/	
+StringMgr::~StringMgr() {
+}
+
+/** Sets the global StringMgr handle
+* @param newStringMgr The new global StringMgr. This pointer will be deleted by this StringMgr
+*/	
+void StringMgr::setSystemStringMgr(StringMgr *newStringMgr) {
+	if (systemStringMgr) 
+		delete systemStringMgr;
+	
+	systemStringMgr = newStringMgr;
+
+   // TODO: this is magic. apparently we have to reset the system localemgr upon changing stringmgr.
+   // setting system stringmgr should be set before localemgr and not possible to change.
+   // rework this design.
+	LocaleMgr::getSystemLocaleMgr()->setSystemLocaleMgr(new LocaleMgr());
+}
+
+/** Returns the global StringMgr handle
+* @return The global string handle
+*/
+StringMgr* StringMgr::getSystemStringMgr() {
+	if (!systemStringMgr) {
+#ifdef _ICU_
+		systemStringMgr = new ICUStringMgr();
+// 		SWLog::getSystemLog()->logInformation("created default ICUStringMgr");
+#else
+		systemStringMgr = new StringMgr();
+//  		SWLog::getSystemLog()->logInformation("created default StringMgr");
+#endif
+	}
+	
+	return systemStringMgr;
+}
+
+
+/**
+ * This is a fallback method.  It should never be called.
+ * If UTF8 support is desired, then a UTF8 StringMgr needs
+ * to be used.
+ *
+ * Here we just do our best.
+ *
+ * Converts the param to an upper case UTF8 string
+ * @param t - The text encoded in utf8 which should be turned into an upper case string
+ *
+ */	
+char *StringMgr::upperUTF8(char *t, unsigned int maxlen) const {
+	// try to decide if it's worth trying to toupper.  Do we have more
+	// characters which are probably lower latin than not?
+	// we still don't use isValidUTF8 optimally. what if we have 1 unicode
+	// character in the string?  should we not try to upper any of the string?
+	// dunno.  Best solution is to upper all other characters. Don't have
+	// time to write that before release.
+	long performOp = 0;
+	if (!isValidUTF8((unsigned char *)t)) {
+		performOp = 1;
+	}
+	else {
+		for (const char *ch = t; *ch; ch++) {
+			performOp += (*ch > 0) ? 1 : -1;
+		}
+	}
+
+	if (performOp > 0) {
+		return upperLatin1(t);
+	}
+
+	return t;
+}
+
+
+/**
+ * Converts the param to an uppercase latin1 string
+ * @param The text encoded in latin1 which should be turned into an upper case string
+ */	
+char *StringMgr::upperLatin1(char *buf, unsigned int maxlen) const {
+	if (!buf)
+		return 0;
+		
+	char *ret = buf;
+	bool checkMax = maxlen;
+
+	while (*buf && (!checkMax || maxlen--)) {
+		*buf = SW_toupper(*buf);
+		buf++;
+	}
+
+	return ret;
+}
+
+bool StringMgr::supportsUnicode() const {
+	return false; //default impl has no UTF8 support
+}
+
+
+#ifdef _ICU_
+
+char *ICUStringMgr::upperUTF8(char *buf, unsigned int maxlen) const {
+	char *ret = buf;
+	int max = (maxlen) ? maxlen : strlen(buf);
+		
+	UErrorCode err = U_ZERO_ERROR;
+		
+	if (!buf || !max) {
+		return ret;
+	}
+		
+	UChar *lowerStr = new UChar[max+10];
+	UChar *upperStr = new UChar[max+10];
+		
+	u_strFromUTF8(lowerStr, max+9, 0, buf, -1, &err);
+	if (err != U_ZERO_ERROR) {
+//		SWLog::getSystemLog()->logError("from: %s", u_errorName(err));
+		delete [] lowerStr;
+		delete [] upperStr;
+		return ret;
+	}
+
+	u_strToUpper(upperStr, max+9, lowerStr, -1, 0, &err);
+	if (err != U_ZERO_ERROR) {
+//		SWLog::getSystemLog()->logError("upperCase: %s", u_errorName(err));
+		delete [] lowerStr;
+		delete [] upperStr;
+		return ret;
+	}
+
+	ret = u_strToUTF8(ret, max, 0, upperStr, -1, &err);
+		
+	delete [] lowerStr;
+	delete [] upperStr;
+	return ret;
+}
+	
+#endif
+
+SWORD_NAMESPACE_END
diff --git a/src/mgr/swcacher.cpp b/src/mgr/swcacher.cpp
new file mode 100644
index 0000000..e12bdcb
--- /dev/null
+++ b/src/mgr/swcacher.cpp
@@ -0,0 +1,52 @@
+/******************************************************************************
+ *
+ *  swcacher.cpp -	definition of class SWCacher used to provide an
+ *			interface for objects that cache and want a standard
+ *			interface for cleaning up
+ *
+ * $Id: swcacher.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swcacher.h>
+
+
+SWORD_NAMESPACE_START
+
+
+SWCacher::SWCacher() {
+}
+
+
+SWCacher::~SWCacher() {
+}
+
+
+void SWCacher::flush() {
+}
+
+long SWCacher::resourceConsumption() {
+	return 0;
+}
+
+long SWCacher::lastAccess() {
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/swconfig.cpp b/src/mgr/swconfig.cpp
new file mode 100644
index 0000000..748071c
--- /dev/null
+++ b/src/mgr/swconfig.cpp
@@ -0,0 +1,173 @@
+/******************************************************************************
+ *
+ *  swconfig.cpp -	used for saving and retrieval of configuration
+ *			information
+ *
+ * $Id: swconfig.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swconfig.h>
+#include <utilstr.h>
+#include <filemgr.h>
+#include <fcntl.h>
+
+
+SWORD_NAMESPACE_START
+
+
+SWConfig::SWConfig() {
+}
+
+
+SWConfig::SWConfig(const char * ifilename) {
+	filename = ifilename;
+	Load();
+}
+
+
+SWConfig::~SWConfig() {
+}
+
+
+void SWConfig::Load() {
+
+	if (!filename.size()) return;	// assert we have a filename
+
+	FileDesc *cfile;
+	char *buf, *data;
+	SWBuf line;
+	ConfigEntMap cursect;
+	SWBuf sectname;
+	bool first = true;
+	
+	Sections.erase(Sections.begin(), Sections.end());
+	
+	cfile = FileMgr::getSystemFileMgr()->open(filename.c_str(), FileMgr::RDONLY);
+	if (cfile->getFd() > 0) {
+		bool goodLine = FileMgr::getLine(cfile, line);
+
+		// clean UTF encoding tags at start of file
+		while (goodLine && line.length() && 
+				((((unsigned char)line[0]) == 0xEF) ||
+				 (((unsigned char)line[0]) == 0xBB) ||
+				 (((unsigned char)line[0]) == 0xBF))) {
+			line << 1;
+		}
+		
+		while (goodLine) {
+			// ignore commented lines
+			if (!line.startsWith("#")) {
+				buf = new char [ line.length() + 1 ];
+				strcpy(buf, line.c_str());
+				if (*strstrip(buf) == '[') {
+					if (!first)
+						Sections.insert(SectionMap::value_type(sectname, cursect));
+					else first = false;
+					
+					cursect.erase(cursect.begin(), cursect.end());
+
+					strtok(buf, "]");
+					sectname = buf+1;
+				}
+				else {
+					strtok(buf, "=");
+					if ((*buf) && (*buf != '=')) {
+						if ((data = strtok(NULL, "")))
+							cursect.insert(ConfigEntMap::value_type(buf, strstrip(data)));
+						else cursect.insert(ConfigEntMap::value_type(buf, ""));
+					}
+				}
+				delete [] buf;
+			}
+			goodLine = FileMgr::getLine(cfile, line);
+		}
+		if (!first)
+			Sections.insert(SectionMap::value_type(sectname, cursect));
+
+		FileMgr::getSystemFileMgr()->close(cfile);
+	}
+}
+
+
+void SWConfig::Save() {
+
+	if (!filename.size()) return;	// assert we have a filename
+
+	FileDesc *cfile;
+	SWBuf buf;
+	SectionMap::iterator sit;
+	ConfigEntMap::iterator entry;
+	SWBuf sectname;
+	
+	cfile = FileMgr::getSystemFileMgr()->open(filename.c_str(), FileMgr::RDWR|FileMgr::CREAT|FileMgr::TRUNC);
+	if (cfile->getFd() > 0) {
+		
+		for (sit = Sections.begin(); sit != Sections.end(); sit++) {
+			buf =  "\n[";
+			buf += (*sit).first.c_str();
+			buf += "]\n";
+			cfile->write(buf.c_str(), buf.length());
+			for (entry = (*sit).second.begin(); entry != (*sit).second.end(); entry++) {
+				buf = (*entry).first.c_str();
+				buf += "=";
+				buf += (*entry).second.c_str();
+				buf += "\n";
+				cfile->write(buf.c_str(), buf.length());
+			}
+		}
+		buf = "\n";
+		cfile->write(buf.c_str(), buf.length());
+		FileMgr::getSystemFileMgr()->close(cfile);
+	}
+}
+
+
+void SWConfig::augment(SWConfig &addFrom) {
+
+	SectionMap::iterator section;
+	ConfigEntMap::iterator entry, start, end;
+
+	for (section = addFrom.Sections.begin(); section != addFrom.Sections.end(); section++) {
+		for (entry = (*section).second.begin(); entry != (*section).second.end(); entry++) {
+			start = Sections[section->first].lower_bound(entry->first);
+			end   = Sections[section->first].upper_bound(entry->first);
+			if (start != end) {
+				if (((++start) != end)
+						|| ((++(addFrom.Sections[section->first].lower_bound(entry->first))) != addFrom.Sections[section->first].upper_bound(entry->first))) {
+					for (--start; start != end; start++) {
+						if (!strcmp(start->second.c_str(), entry->second.c_str()))
+							break;
+					}
+					if (start == end)
+						Sections[(*section).first].insert(ConfigEntMap::value_type((*entry).first, (*entry).second));
+				}
+				else	Sections[section->first][entry->first.c_str()] = entry->second.c_str();
+			}		
+			else	Sections[section->first][entry->first.c_str()] = entry->second.c_str();
+		}
+	}
+}
+
+
+ConfigEntMap & SWConfig::operator [] (const char *section) {
+    return Sections[section];
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/swfiltermgr.cpp b/src/mgr/swfiltermgr.cpp
new file mode 100644
index 0000000..5240014
--- /dev/null
+++ b/src/mgr/swfiltermgr.cpp
@@ -0,0 +1,97 @@
+/******************************************************************************
+ *
+ *  swfiltermgr.cpp -	Implementation of SWFilterMgr, used as an interface
+ *			to manage filters on a module
+ *
+ * $Id: swfiltermgr.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swfiltermgr.h>
+
+
+SWORD_NAMESPACE_START
+
+
+SWFilterMgr::SWFilterMgr() {
+}
+
+
+SWFilterMgr::~SWFilterMgr() {
+}
+
+
+void SWFilterMgr::setParentMgr(SWMgr *parentMgr) {
+	this->parentMgr = parentMgr;
+}
+
+
+SWMgr *SWFilterMgr::getParentMgr() {
+	return parentMgr;
+}
+
+
+void SWFilterMgr::AddGlobalOptions(SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
+}
+
+
+void SWFilterMgr::AddLocalOptions(SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
+}
+
+
+/**
+* Adds the encoding filters which are defined in "section" to the SWModule object "module".
+* @param module To this module the encoding filter(s) are added
+* @param section We use this section to get a list of filters we should apply to the module
+*/
+
+void SWFilterMgr::AddEncodingFilters(SWModule * module, ConfigEntMap & section) {
+}
+
+
+/**
+* Adds the render filters which are defined in "section" to the SWModule object "module".
+* @param module To this module the render filter(s) are added
+* @param section We use this section to get a list of filters we should apply to the module
+*/
+
+void SWFilterMgr::AddRenderFilters(SWModule * module, ConfigEntMap & section) {
+}
+
+
+/**
+* Adds the strip filters which are defined in "section" to the SWModule object "module".
+* @param module To this module the strip filter(s) are added
+* @param section We use this section to get a list of filters we should apply to the module
+*/
+
+void SWFilterMgr::AddStripFilters(SWModule * module, ConfigEntMap & section) {
+}
+
+
+/**
+* Adds the raw filters which are defined in "section" to the SWModule object "module".
+* @param module To this module the raw filter(s) are added
+* @param section We use this section to get a list of filters we should apply to the module
+*/
+
+void SWFilterMgr::AddRawFilters(SWModule * module, ConfigEntMap & section) {
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/swlocale.cpp b/src/mgr/swlocale.cpp
new file mode 100644
index 0000000..a007238
--- /dev/null
+++ b/src/mgr/swlocale.cpp
@@ -0,0 +1,196 @@
+/******************************************************************************
+ *
+ *  swlocale.cpp -	implementation of Class SWLocale used for retrieval
+ *			of locale lookups
+ *
+ * $Id: swlocale.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swlocale.h>
+#include <utilstr.h>
+#include <map>
+#include <swconfig.h>
+#include <versekey.h>
+#include <versificationmgr.h>
+
+
+SWORD_NAMESPACE_START
+
+
+namespace {
+	typedef std::map < SWBuf, SWBuf, std::less < SWBuf > >LookupMap;
+}
+
+
+const char *SWLocale::DEFAULT_LOCALE_NAME="en";
+
+
+// I hate bridge patterns, but this hides swconfig and map from lots o stuff
+class SWLocale::Private {
+public:
+	LookupMap lookupTable;
+	LookupMap mergedAbbrevs;
+};
+
+
+SWLocale::SWLocale(const char *ifilename) {
+	p = new Private;
+	ConfigEntMap::iterator confEntry;
+
+	name           = 0;
+	description    = 0;
+	encoding       = 0;
+	bookAbbrevs    = 0;
+	bookLongNames  = 0;
+	bookPrefAbbrev = 0;
+	if (ifilename) {
+		localeSource   = new SWConfig(ifilename);
+	}
+	else {
+		localeSource   = new SWConfig(0);
+		(*localeSource)["Meta"]["Name"] = DEFAULT_LOCALE_NAME;
+		(*localeSource)["Meta"]["Description"] = "English (US)";
+		bookAbbrevs = (struct abbrev *)builtin_abbrevs;
+		for (abbrevsCnt = 0; builtin_abbrevs[abbrevsCnt].osis[0]; abbrevsCnt++);
+	}
+
+	confEntry = localeSource->Sections["Meta"].find("Name");
+	if (confEntry != localeSource->Sections["Meta"].end())
+		stdstr(&name, (*confEntry).second.c_str());
+	
+	confEntry = localeSource->Sections["Meta"].find("Description");
+	if (confEntry != localeSource->Sections["Meta"].end())
+		stdstr(&description, (*confEntry).second.c_str());
+
+	confEntry = localeSource->Sections["Meta"].find("Encoding"); //Either empty (==Latin1) or UTF-8
+	if (confEntry != localeSource->Sections["Meta"].end())
+		stdstr(&encoding, (*confEntry).second.c_str());
+}
+
+
+SWLocale::~SWLocale() {
+
+	delete localeSource;
+
+	if (encoding)
+		delete [] encoding;
+	
+	if (description)
+		delete [] description;
+
+	if (name)
+		delete [] name;
+
+	if (bookAbbrevs != builtin_abbrevs)
+		delete [] bookAbbrevs;
+
+	delete p;
+}
+
+
+const char *SWLocale::translate(const char *text) {
+	LookupMap::iterator entry;
+
+	entry = p->lookupTable.find(text);
+
+	if (entry == p->lookupTable.end()) {
+		ConfigEntMap::iterator confEntry;
+		confEntry = localeSource->Sections["Text"].find(text);
+		if (confEntry == localeSource->Sections["Text"].end())
+			p->lookupTable.insert(LookupMap::value_type(text, text));
+		else {//valid value found
+			/*
+			- If Encoding==Latin1 and we have a StringHelper, convert to UTF-8
+			- If StringHelper present and Encoding is UTF-8, use UTF8
+			- If StringHelper not present and Latin1, use Latin1
+			- If StringHelper not present and UTF-8, no idea what to do. Should't happen
+			*/
+/*			if (StringHelper::getSystemStringHelper()) {
+				if (!strcmp(encoding, "UTF-8")) {
+					p->lookupTable.insert(LookupMap::value_type(text, (*confEntry).second.c_str()));
+				}
+				else { //latin1 expected, convert to UTF-8
+					SWBuf t((*confEntry).second.c_str());
+					t = StringHelper::getSystemStringHelper()->latin2unicode( t );
+					
+					p->lookupTable.insert(LookupMap::value_type(text, t.c_str()));
+				}
+			}
+			else { //no stringhelper, just insert. Nothing we can do*/
+				p->lookupTable.insert(LookupMap::value_type(text, (*confEntry).second.c_str()));
+// 			}
+			
+		}
+		entry = p->lookupTable.find(text);
+	}
+	return (*entry).second.c_str();
+}
+
+
+const char *SWLocale::getName() {
+	return name;
+}
+
+
+const char *SWLocale::getDescription() {
+	return description;
+}
+
+
+const char *SWLocale::getEncoding() {
+	return encoding;
+}
+
+
+void SWLocale::augment(SWLocale &addFrom) {
+	*localeSource += *addFrom.localeSource;
+}
+
+
+const struct abbrev *SWLocale::getBookAbbrevs(int *retSize) {
+	static const char *nullstr = "";
+	if (!bookAbbrevs) {
+		// Assure all english abbrevs are present
+		for (int j = 0; builtin_abbrevs[j].osis[0]; j++) {
+			p->mergedAbbrevs[builtin_abbrevs[j].ab] = builtin_abbrevs[j].osis;
+		}
+		ConfigEntMap::iterator it = localeSource->Sections["Book Abbrevs"].begin();
+		ConfigEntMap::iterator end = localeSource->Sections["Book Abbrevs"].end();
+		for (; it != end; it++) {
+			p->mergedAbbrevs[it->first.c_str()] = it->second.c_str();
+		}
+		int size = p->mergedAbbrevs.size();
+		bookAbbrevs = new struct abbrev[size + 1];
+		int i = 0;
+		for (LookupMap::iterator it = p->mergedAbbrevs.begin(); it != p->mergedAbbrevs.end(); it++, i++) {
+			bookAbbrevs[i].ab = it->first.c_str();
+			bookAbbrevs[i].osis = it->second.c_str();
+		}
+
+		bookAbbrevs[i].ab = nullstr;
+		bookAbbrevs[i].osis = nullstr;
+		abbrevsCnt = size;
+	}
+		
+	*retSize = abbrevsCnt;
+	return bookAbbrevs;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/swmgr.cpp b/src/mgr/swmgr.cpp
new file mode 100644
index 0000000..0a2d583
--- /dev/null
+++ b/src/mgr/swmgr.cpp
@@ -0,0 +1,1485 @@
+/******************************************************************************
+ *
+ *  swmgr.cpp -	used to interact with an install base of sword modules
+ *
+ * $Id: swmgr.cpp 2985 2013-10-04 14:38:14Z scribe $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>
+
+#include <sys/stat.h>
+#ifndef _MSC_VER
+#include <iostream>
+#endif
+#include <dirent.h>
+
+#include <swmgr.h>
+#include <rawtext.h>
+#include <rawtext4.h>
+#include <filemgr.h>
+#include <rawgenbook.h>
+#include <rawcom.h>
+#include <rawcom4.h>
+#include <hrefcom.h>
+#include <rawld.h>
+#include <rawld4.h>
+#include <utilstr.h>
+#include <gbfplain.h>
+#include <thmlplain.h>
+#include <osisplain.h>
+#include <teiplain.h>
+#include <papyriplain.h>
+#include <gbfstrongs.h>
+#include <gbffootnotes.h>
+#include <gbfheadings.h>
+#include <gbfredletterwords.h>
+#include <gbfmorph.h>
+#include <osisenum.h>
+#include <osisglosses.h>
+#include <osisheadings.h>
+#include <osisfootnotes.h>
+#include <osisstrongs.h>
+#include <osismorph.h>
+#include <osislemma.h>
+#include <osisredletterwords.h>
+#include <osismorphsegmentation.h>
+#include <osisscripref.h>
+#include <osisvariants.h>
+#include <osisxlit.h>
+#include <osisreferencelinks.h>
+#include <thmlstrongs.h>
+#include <thmlfootnotes.h>
+#include <thmlheadings.h>
+#include <thmlmorph.h>
+#include <thmlvariants.h>
+#include <thmllemma.h>
+#include <thmlscripref.h>
+#include <cipherfil.h>
+#include <rawfiles.h>
+#include <ztext.h>
+#include <zld.h>
+#include <zcom.h>
+#include <lzsscomprs.h>
+#include <utf8greekaccents.h>
+#include <utf8cantillation.h>
+#include <utf8hebrewpoints.h>
+#include <utf8arabicpoints.h>
+#include <greeklexattribs.h>
+#include <swfiltermgr.h>
+#include <swcipher.h>
+#include <swoptfilter.h>
+#include <rtfhtml.h>
+
+#include <swlog.h>
+
+#include <iterator>
+
+#ifndef EXCLUDEZLIB
+#include "zipcomprs.h"
+#include "bz2comprs.h"
+#include "xzcomprs.h"
+#endif
+
+
+#ifdef _ICU_
+#include <utf8transliterator.h>
+#endif
+
+
+SWORD_NAMESPACE_START
+
+
+#ifdef _ICU_
+bool SWMgr::isICU = true;
+#else
+bool SWMgr::isICU = false;
+#endif
+
+
+#ifdef GLOBCONFPATH
+const char *SWMgr::globalConfPath = GLOBCONFPATH;
+#else
+const char *SWMgr::globalConfPath = "/etc/sword.conf:/usr/local/etc/sword.conf";
+#endif
+
+
+const char *SWMgr::MODTYPE_BIBLES = "Biblical Texts";
+const char *SWMgr::MODTYPE_COMMENTARIES = "Commentaries";
+const char *SWMgr::MODTYPE_LEXDICTS = "Lexicons / Dictionaries";
+const char *SWMgr::MODTYPE_GENBOOKS = "Generic Books";
+const char *SWMgr::MODTYPE_DAILYDEVOS = "Daily Devotional";
+
+
+void SWMgr::init() {
+	SWOptionFilter *tmpFilter = 0;
+	configPath  = 0;
+	prefixPath  = 0;
+	configType  = 0;
+	myconfig    = 0;
+	mysysconfig = 0;
+	homeConfig  = 0;
+	augmentHome = true;
+
+	cipherFilters.clear();
+	optionFilters.clear();
+	cleanupFilters.clear();
+	extraFilters.clear();
+	tmpFilter = new ThMLVariants();
+	optionFilters.insert(OptionFilterMap::value_type("ThMLVariants", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new GBFStrongs();
+	optionFilters.insert(OptionFilterMap::value_type("GBFStrongs", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new GBFFootnotes();
+	optionFilters.insert(OptionFilterMap::value_type("GBFFootnotes", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new GBFRedLetterWords();
+	optionFilters.insert(OptionFilterMap::value_type("GBFRedLetterWords", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new GBFMorph();
+	optionFilters.insert(OptionFilterMap::value_type("GBFMorph", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new GBFHeadings();
+	optionFilters.insert(OptionFilterMap::value_type("GBFHeadings", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISHeadings();
+	optionFilters.insert(OptionFilterMap::value_type("OSISHeadings", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISStrongs();
+	optionFilters.insert(OptionFilterMap::value_type("OSISStrongs", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISMorph();
+	optionFilters.insert(OptionFilterMap::value_type("OSISMorph", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISLemma();
+	optionFilters.insert(OptionFilterMap::value_type("OSISLemma", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISFootnotes();
+	optionFilters.insert(OptionFilterMap::value_type("OSISFootnotes", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISScripref();
+	optionFilters.insert(OptionFilterMap::value_type("OSISScripref", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISRedLetterWords();
+	optionFilters.insert(OptionFilterMap::value_type("OSISRedLetterWords", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISMorphSegmentation();
+	optionFilters.insert(OptionFilterMap::value_type("OSISMorphSegmentation", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISGlosses();
+	optionFilters.insert(OptionFilterMap::value_type("OSISGlosses", tmpFilter));
+	optionFilters.insert(OptionFilterMap::value_type("OSISRuby", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISXlit();
+	optionFilters.insert(OptionFilterMap::value_type("OSISXlit", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISEnum();
+	optionFilters.insert(OptionFilterMap::value_type("OSISEnum", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new OSISVariants();
+	optionFilters.insert(OptionFilterMap::value_type("OSISVariants", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new ThMLStrongs();
+	optionFilters.insert(OptionFilterMap::value_type("ThMLStrongs", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new ThMLFootnotes();
+	optionFilters.insert(OptionFilterMap::value_type("ThMLFootnotes", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new ThMLMorph();
+	optionFilters.insert(OptionFilterMap::value_type("ThMLMorph", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new ThMLHeadings();
+	optionFilters.insert(OptionFilterMap::value_type("ThMLHeadings", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new ThMLLemma();
+	optionFilters.insert(OptionFilterMap::value_type("ThMLLemma", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new ThMLScripref();
+	optionFilters.insert(OptionFilterMap::value_type("ThMLScripref", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new UTF8GreekAccents();
+	optionFilters.insert(OptionFilterMap::value_type("UTF8GreekAccents", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new UTF8HebrewPoints();
+	optionFilters.insert(OptionFilterMap::value_type("UTF8HebrewPoints", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new UTF8ArabicPoints();
+	optionFilters.insert(OptionFilterMap::value_type("UTF8ArabicPoints", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new UTF8Cantillation();
+	optionFilters.insert(OptionFilterMap::value_type("UTF8Cantillation", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new GreekLexAttribs();
+	optionFilters.insert(OptionFilterMap::value_type("GreekLexAttribs", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+	tmpFilter = new PapyriPlain();
+	optionFilters.insert(OptionFilterMap::value_type("PapyriPlain", tmpFilter));
+	cleanupFilters.push_back(tmpFilter);
+
+// UTF8Transliterator needs to be handled differently because it should always available as an option, for all modules
+#ifdef _ICU_
+	transliterator = new UTF8Transliterator();
+	optionFilters.insert(OptionFilterMap::value_type("UTF8Transliterator", transliterator));
+	options.push_back(transliterator->getOptionName());
+	cleanupFilters.push_back(transliterator);
+#endif
+
+	gbfplain = new GBFPlain();
+	cleanupFilters.push_back(gbfplain);
+	extraFilters.insert(FilterMap::value_type("GBFPlain", gbfplain));
+
+	thmlplain = new ThMLPlain();
+	cleanupFilters.push_back(thmlplain);
+	extraFilters.insert(FilterMap::value_type("ThMLPlain", thmlplain));
+
+	osisplain = new OSISPlain();
+	cleanupFilters.push_back(osisplain);
+	extraFilters.insert(FilterMap::value_type("OSISPlain", osisplain));
+
+	teiplain = new TEIPlain();
+	cleanupFilters.push_back(teiplain);
+	extraFilters.insert(FilterMap::value_type("TEIPlain", teiplain));
+
+	// filters which aren't really used anywhere but which we want available for a "FilterName" -> filter mapping (e.g., filterText)
+	SWFilter *f = new RTFHTML();
+	extraFilters.insert(FilterMap::value_type("RTFHTML", f));
+	cleanupFilters.push_back(f);
+	
+}
+
+
+SWBuf SWMgr::getHomeDir() {
+
+	// figure out 'home' directory for app data
+	SWBuf homeDir = getenv("HOME");
+	if (!homeDir.length()) {
+		// silly windows
+		homeDir = getenv("APPDATA");
+	}
+	if (homeDir.length()) {
+		if ((homeDir[homeDir.length()-1] != '\\') && (homeDir[homeDir.length()-1] != '/')) {
+			homeDir += "/";
+		}
+	}
+
+	return homeDir;
+}
+
+
+void SWMgr::commonInit(SWConfig *iconfig, SWConfig *isysconfig, bool autoload, SWFilterMgr *filterMgr, bool multiMod) {
+
+	init();
+
+	mgrModeMultiMod = multiMod;
+	this->filterMgr = filterMgr;
+	if (filterMgr)
+		filterMgr->setParentMgr(this);
+	
+	if (iconfig) {
+		config   = iconfig;
+		myconfig = 0;
+	}
+	else config = 0;
+	if (isysconfig) {
+		sysConfig   = isysconfig;
+		mysysconfig = 0;
+	}
+	else sysConfig = 0;
+
+	if (autoload)
+		Load();
+}
+
+
+SWMgr::SWMgr(SWFilterMgr *filterMgr, bool multiMod) {
+	commonInit(0, 0, true, filterMgr, multiMod);
+}
+
+
+SWMgr::SWMgr(SWConfig *iconfig, SWConfig *isysconfig, bool autoload, SWFilterMgr *filterMgr, bool multiMod) {
+	commonInit(iconfig, isysconfig, autoload, filterMgr, multiMod);
+}
+
+
+SWMgr::SWMgr(const char *iConfigPath, bool autoload, SWFilterMgr *filterMgr, bool multiMod, bool augmentHome) {
+
+	init();
+
+	mgrModeMultiMod = multiMod;
+	SWBuf path;
+	
+	this->filterMgr = filterMgr;
+	if (filterMgr)
+		filterMgr->setParentMgr(this);
+	
+	this->augmentHome = augmentHome;
+
+	path = iConfigPath;
+	int len = path.length();
+	if ((len < 1) || ((iConfigPath[len-1] != '\\') && (iConfigPath[len-1] != '/')))
+		path += "/";
+	if (FileMgr::existsFile(path.c_str(), "mods.conf")) {
+		stdstr(&prefixPath, path.c_str());
+		path += "mods.conf";
+		stdstr(&configPath, path.c_str());
+	}
+	else {
+		if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+			stdstr(&prefixPath, path.c_str());
+			path += "mods.d";
+			stdstr(&configPath, path.c_str());
+			configType = 1;
+		}
+	}
+
+	config = 0;
+	sysConfig = 0;
+
+	if (autoload && configPath)
+		Load();
+}
+
+
+SWMgr::~SWMgr() {
+
+	DeleteMods();
+
+	for (FilterList::iterator it = cleanupFilters.begin(); it != cleanupFilters.end(); it++)
+		delete (*it);
+			
+	if (homeConfig)
+		delete homeConfig;
+
+	if (mysysconfig)
+		delete mysysconfig;
+
+	if (myconfig)
+		delete myconfig;
+
+	if (prefixPath)
+		delete [] prefixPath;
+
+	if (configPath)
+		delete [] configPath;
+
+	if (filterMgr)
+		delete filterMgr;
+}
+
+
+void SWMgr::findConfig(char *configType, char **prefixPath, char **configPath, std::list<SWBuf> *augPaths, SWConfig **providedSysConf) {
+	SWBuf path;
+	SWBuf sysConfPath;
+	ConfigEntMap::iterator entry;
+	ConfigEntMap::iterator lastEntry;
+
+	SWConfig *sysConf = 0;
+	SWBuf sysConfDataPath = "";
+
+	*configType = 0;
+
+	SWBuf homeDir = getHomeDir();
+
+	// check for a sysConf passed in to us
+	SWLog::getSystemLog()->logDebug("Checking for provided SWConfig(\"sword.conf\")...");
+	if (providedSysConf && *providedSysConf) {
+		sysConf = *providedSysConf;
+		SWLog::getSystemLog()->logDebug("found.");
+	}
+
+	// if we haven't been given our datapath in a sysconf, we need to track it down
+	if (!sysConf) {
+		// check working directory
+		SWLog::getSystemLog()->logDebug("Checking working directory for sword.conf...");
+		if (FileMgr::existsFile(".", "sword.conf")) {
+			SWLog::getSystemLog()->logDebug("Overriding any systemwide or ~/.sword/ sword.conf with one found in current directory.");
+			sysConfPath = "./sword.conf";
+			sysConf = new SWConfig(sysConfPath);
+			if ((entry = sysConf->Sections["Install"].find("DataPath")) != sysConf->Sections["Install"].end()) {
+				sysConfDataPath = (*entry).second;
+			}
+			if (providedSysConf) {
+				*providedSysConf = sysConf;
+			}
+			else {
+				delete sysConf;
+				sysConf = 0;
+			}
+		}
+		if (!sysConfDataPath.size()) {
+			SWLog::getSystemLog()->logDebug("Checking working directory for mods.conf...");
+			if (FileMgr::existsFile(".", "mods.conf")) {
+				SWLog::getSystemLog()->logDebug("found.");
+				stdstr(prefixPath, "./");
+				stdstr(configPath, "./mods.conf");
+				return;
+			}
+
+			SWLog::getSystemLog()->logDebug("Checking working directory for mods.d...");
+			if (FileMgr::existsDir(".", "mods.d")) {
+				SWLog::getSystemLog()->logDebug("found.");
+				stdstr(prefixPath, "./");
+				stdstr(configPath, "./mods.d");
+				*configType = 1;
+				return;
+			}
+
+			// check working directory ../library/
+			SWLog::getSystemLog()->logDebug("Checking working directory ../library/ for mods.d...");
+			if (FileMgr::existsDir("../library", "mods.d")) {
+				SWLog::getSystemLog()->logDebug("found.");
+				stdstr(prefixPath, "../library/");
+				stdstr(configPath, "../library/mods.d");
+				*configType = 1;
+				return;
+			}
+
+			// check environment variable SWORD_PATH
+			SWLog::getSystemLog()->logDebug("Checking $SWORD_PATH...");
+
+			SWBuf envsworddir = getenv("SWORD_PATH");
+			if (envsworddir.length()) {
+				
+				SWLog::getSystemLog()->logDebug("found (%s).", envsworddir.c_str());
+				path = envsworddir;
+				if ((envsworddir[envsworddir.length()-1] != '\\') && (envsworddir[envsworddir.length()-1] != '/'))
+					path += "/";
+
+				SWLog::getSystemLog()->logDebug("Checking $SWORD_PATH for mods.conf...");
+				if (FileMgr::existsFile(path.c_str(), "mods.conf")) {
+					SWLog::getSystemLog()->logDebug("found.");
+					stdstr(prefixPath, path.c_str());
+					path += "mods.conf";
+					stdstr(configPath, path.c_str());
+					return;
+				}
+
+				SWLog::getSystemLog()->logDebug("Checking $SWORD_PATH for mods.d...");
+				if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+					SWLog::getSystemLog()->logDebug("found.");
+					stdstr(prefixPath, path.c_str());
+					path += "mods.d";
+					stdstr(configPath, path.c_str());
+					*configType = 1;
+					return;
+				}
+			}
+
+
+			// check for systemwide globalConfPath
+
+			SWLog::getSystemLog()->logDebug("Parsing %s...", globalConfPath);
+			char *globPaths = 0;
+			char *gfp;
+			stdstr(&globPaths, globalConfPath);
+			for (gfp = strtok(globPaths, ":"); gfp; gfp = strtok(0, ":")) {
+				SWLog::getSystemLog()->logDebug("Checking for %s...", gfp);
+				if (FileMgr::existsFile(gfp)) {
+					SWLog::getSystemLog()->logDebug("found.");
+					break;
+				}
+			}
+			if (gfp)
+				sysConfPath = gfp;
+			delete [] globPaths;
+
+			if (homeDir.length()) {
+				SWBuf tryPath = homeDir;
+				tryPath += ".sword/sword.conf";
+				if (FileMgr::existsFile(tryPath)) {
+					SWLog::getSystemLog()->logDebug("Overriding any systemwide sword.conf with one found in users home directory (%s)", tryPath.c_str());
+					sysConfPath = tryPath;
+				}
+				else {
+					SWBuf tryPath = homeDir;
+					tryPath += "sword/sword.conf";
+					if (FileMgr::existsFile(tryPath)) {
+						SWLog::getSystemLog()->logDebug("Overriding any systemwide sword.conf with one found in users home directory (%s)", tryPath.c_str());
+						sysConfPath = tryPath;
+					}
+				}
+			}
+		}
+	}
+
+	if (!sysConf && sysConfPath.size()) {
+		sysConf = new SWConfig(sysConfPath);
+	}
+
+	if (sysConf) {
+		if ((entry = sysConf->Sections["Install"].find("DataPath")) != sysConf->Sections["Install"].end()) {
+			sysConfDataPath = (*entry).second;
+		}
+		if (sysConfDataPath.size()) {
+			if ((!sysConfDataPath.endsWith("\\")) && (!sysConfDataPath.endsWith("/")))
+				sysConfDataPath += "/";
+
+			path = sysConfDataPath;
+			SWLog::getSystemLog()->logDebug("DataPath in %s is set to %s.", sysConfPath.c_str(), path.c_str());
+			SWLog::getSystemLog()->logDebug("Checking for mods.conf in DataPath...");
+			
+			if (FileMgr::existsFile(path.c_str(), "mods.conf")) {
+				SWLog::getSystemLog()->logDebug("found.");
+				stdstr(prefixPath, path.c_str());
+				path += "mods.conf";
+				stdstr(configPath, path.c_str());
+				*configType = 1;
+			}
+
+			SWLog::getSystemLog()->logDebug("Checking for mods.d in DataPath...");
+
+			if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+				SWLog::getSystemLog()->logDebug("found.");
+				stdstr(prefixPath, path.c_str());
+				path += "mods.d";
+				stdstr(configPath, path.c_str());
+				*configType = 1;
+			}
+		}
+	}
+
+	// do some extra processing of sysConf if we have one
+	if (sysConf) {
+		if (augPaths) {
+			augPaths->clear();
+			entry     = sysConf->Sections["Install"].lower_bound("AugmentPath");
+			lastEntry = sysConf->Sections["Install"].upper_bound("AugmentPath");
+			for (;entry != lastEntry; entry++) {
+				path = entry->second;
+				if ((entry->second.c_str()[strlen(entry->second.c_str())-1] != '\\') && (entry->second.c_str()[strlen(entry->second.c_str())-1] != '/'))
+					path += "/";
+				augPaths->push_back(path);
+			}
+		}
+		if (providedSysConf) {
+			*providedSysConf = sysConf;
+		}
+		else delete sysConf;
+	}
+
+	if (*configType)
+		return;
+
+	// WE STILL HAVEN'T FOUND A CONFIGURATION.  LET'S LOOK IN SOME OS SPECIFIC
+	// LOCATIONS
+	//
+	// for various flavors of windoze...
+	// check %ALLUSERSPROFILE%/Application Data/sword/
+
+	SWLog::getSystemLog()->logDebug("Checking $ALLUSERSPROFILE/Application Data/sword/...");
+
+	SWBuf envallusersdir  = getenv("ALLUSERSPROFILE");
+	if (envallusersdir.length()) {
+		SWLog::getSystemLog()->logDebug("found (%s).", envallusersdir.c_str());
+		path = envallusersdir;
+		if ((!path.endsWith("\\")) && (!path.endsWith("/")))
+			path += "/";
+
+		path += "Application Data/sword/";
+		SWLog::getSystemLog()->logDebug("Checking %s for mods.d...", path.c_str());
+		if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+			SWLog::getSystemLog()->logDebug("found.");
+			stdstr(prefixPath, path.c_str());
+			path += "mods.d";
+			stdstr(configPath, path.c_str());
+			*configType = 1;
+			return;
+		}
+	}
+
+	// for Mac OSX...
+	// check $HOME/Library/Application Support/Sword/
+
+	SWLog::getSystemLog()->logDebug("Checking $HOME/Library/Application Support/Sword/...");
+
+	SWBuf pathCheck = getHomeDir();
+	if (pathCheck.length()) {
+		SWLog::getSystemLog()->logDebug("found (%s).", pathCheck.c_str());
+		path = pathCheck;
+		if ((!path.endsWith("\\")) && (!path.endsWith("/")))
+			path += "/";
+
+		SWLog::getSystemLog()->logDebug("Checking %s for mods.d...", path.c_str());
+		if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+			SWLog::getSystemLog()->logDebug("found.");
+			stdstr(prefixPath, path.c_str());
+			path += "mods.d";
+			stdstr(configPath, path.c_str());
+			*configType = 1;
+			return;
+		}
+	}
+
+	// FINALLY CHECK PERSONAL HOME DIRECTORY LOCATIONS
+	// check ~/.sword/
+
+	SWLog::getSystemLog()->logDebug("Checking home directory for ~/.sword...");
+
+	if (homeDir.length()) {
+		path = homeDir;
+		path += ".sword/";
+		SWLog::getSystemLog()->logDebug("  Checking for %smods.conf...", path.c_str());
+		if (FileMgr::existsFile(path.c_str(), "mods.conf")) {
+			SWLog::getSystemLog()->logDebug("found.");
+			stdstr(prefixPath, path.c_str());
+			path += "mods.conf";
+			stdstr(configPath, path.c_str());
+			return;
+		}
+
+		SWLog::getSystemLog()->logDebug("  Checking for %smods.d...", path.c_str());
+		if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+			SWLog::getSystemLog()->logDebug("found.");
+			stdstr(prefixPath, path.c_str());
+			path += "mods.d";
+			stdstr(configPath, path.c_str());
+			*configType = 2;
+			return;
+		}
+
+		path = homeDir;
+		path += "sword/";
+		SWLog::getSystemLog()->logDebug("  Checking for %smods.d...", path.c_str());
+		if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+			SWLog::getSystemLog()->logDebug("found.");
+			stdstr(prefixPath, path.c_str());
+			path += "mods.d";
+			stdstr(configPath, path.c_str());
+			*configType = 2;
+			return;
+		}
+	}
+}
+
+
+void SWMgr::loadConfigDir(const char *ipath)
+{
+	DIR *dir;
+	struct dirent *ent;
+	SWBuf newmodfile;
+ 
+	if ((dir = opendir(ipath))) {
+		rewinddir(dir);
+		while ((ent = readdir(dir))) {
+			//check whether it ends with .conf, if it doesn't skip it!
+			if (!ent->d_name || (strlen(ent->d_name) <= 5) || strncmp(".conf", (ent->d_name + strlen(ent->d_name) - 5), 5 )) {
+				continue;
+			}
+			
+			newmodfile = ipath;
+			if ((ipath[strlen(ipath)-1] != '\\') && (ipath[strlen(ipath)-1] != '/'))
+				newmodfile += "/";
+			newmodfile += ent->d_name;
+			if (config) {
+				SWConfig tmpConfig(newmodfile.c_str());
+				*config += tmpConfig;
+			}
+			else	config = myconfig = new SWConfig(newmodfile.c_str());
+		}
+		closedir(dir);
+		
+		if (!config) {	// if no .conf file exist yet, create a default
+			newmodfile = ipath;
+			if ((ipath[strlen(ipath)-1] != '\\') && (ipath[strlen(ipath)-1] != '/'))
+				newmodfile += "/";
+			newmodfile += "globals.conf";
+			config = myconfig = new SWConfig(newmodfile.c_str());
+		}
+	}
+}
+
+
+void SWMgr::augmentModules(const char *ipath, bool multiMod) {
+	SWBuf path = ipath;
+	if ((ipath[strlen(ipath)-1] != '\\') && (ipath[strlen(ipath)-1] != '/'))
+		path += "/";
+	if (FileMgr::existsDir(path.c_str(), "mods.d")) {
+		char *savePrefixPath = 0;
+		char *saveConfigPath = 0;
+		SWConfig *saveConfig = 0;
+		stdstr(&savePrefixPath, prefixPath);
+		stdstr(&prefixPath, path.c_str());
+		path += "mods.d";
+		stdstr(&saveConfigPath, configPath);
+		stdstr(&configPath, path.c_str());
+		saveConfig = config;
+		config = myconfig = 0;
+		loadConfigDir(configPath);
+
+		if (multiMod) {
+			// fix config's Section names to rename modules which are available more than once
+			// find out which sections are in both config objects
+			// inserting all configs first is not good because that overwrites old keys and new modules would share the same config
+			for (SectionMap::iterator it = config->Sections.begin(); it != config->Sections.end();) {
+				if (saveConfig->Sections.find( (*it).first ) != saveConfig->Sections.end()) { //if the new section is already present rename it
+					ConfigEntMap entMap((*it).second);
+					
+					SWBuf name;
+					int i = 1;
+					do { //module name already used?
+						name.setFormatted("%s_%d", (*it).first.c_str(), i);
+						i++;
+					} while (config->Sections.find(name) != config->Sections.end());
+					
+					config->Sections.insert(SectionMap::value_type(name, entMap) );
+					SectionMap::iterator toErase = it++;
+					config->Sections.erase(toErase);
+				}
+				else ++it;
+			}
+		}
+		
+		CreateMods(multiMod);
+
+		stdstr(&prefixPath, savePrefixPath);
+		delete []savePrefixPath;
+		stdstr(&configPath, saveConfigPath);
+		delete []saveConfigPath;
+
+		(*saveConfig) += *config;
+		
+		homeConfig = myconfig;
+		config = myconfig = saveConfig;
+	}
+}
+
+
+/***********************************************************************
+ * SWMgr::Load - loads actual modules
+ *
+ * RET: status - 0 = ok; -1 no config found; 1 = no modules installed
+ *
+ */
+
+signed char SWMgr::Load() {
+	signed char ret = 0;
+
+	if (!config) {	// If we weren't passed a config object at construction, find a config file
+		if (!configPath) {	// If we weren't passed a config path at construction...
+			SWLog::getSystemLog()->logDebug("LOOKING UP MODULE CONFIGURATION...");
+			SWConfig *externalSysConf = sysConfig;	// if we have a sysConf before findConfig, then we were provided one from an external source.
+			findConfig(&configType, &prefixPath, &configPath, &augPaths, &sysConfig);
+			if (!externalSysConf) mysysconfig = sysConfig;	// remind us to delete our own sysConfig in d-tor
+			SWLog::getSystemLog()->logDebug("LOOKING UP MODULE CONFIGURATION COMPLETE.");
+		}
+		if (configPath) {
+			if (configType)
+				loadConfigDir(configPath);
+			else	config = myconfig = new SWConfig(configPath);
+		}
+	}
+
+	if (config) {
+		SectionMap::iterator Sectloop, Sectend;
+		ConfigEntMap::iterator Entryloop, Entryend;
+
+		DeleteMods();
+
+		for (Sectloop = config->Sections.lower_bound("Globals"), Sectend = config->Sections.upper_bound("Globals"); Sectloop != Sectend; Sectloop++) {		// scan thru all 'Globals' sections
+			for (Entryloop = (*Sectloop).second.lower_bound("AutoInstall"), Entryend = (*Sectloop).second.upper_bound("AutoInstall"); Entryloop != Entryend; Entryloop++)	// scan thru all AutoInstall entries
+				InstallScan((*Entryloop).second.c_str());		// Scan AutoInstall entry directory for new modules and install
+		}		
+		if (configType) {	// force reload on config object because we may have installed new modules
+			delete myconfig;
+			config = myconfig = 0;
+			loadConfigDir(configPath);
+		}
+		else	config->Load();
+
+		CreateMods(mgrModeMultiMod);
+
+		for (std::list<SWBuf>::iterator pathIt = augPaths.begin(); pathIt != augPaths.end(); pathIt++) {
+			augmentModules(pathIt->c_str(), mgrModeMultiMod);
+		}
+		if (augmentHome) {
+			// augment config with ~/.sword/mods.d if it exists ---------------------
+			SWBuf homeDir = getHomeDir();
+			if (homeDir.length() && configType != 2) { // 2 = user only
+				SWBuf path = homeDir;
+				path += ".sword/";
+				augmentModules(path.c_str(), mgrModeMultiMod);
+				path = homeDir;
+				path += "sword/";
+				augmentModules(path.c_str(), mgrModeMultiMod);
+			}
+		}
+// -------------------------------------------------------------------------
+		if (!Modules.size()) // config exists, but no modules
+			ret = 1;
+
+	}
+	else {
+		SWLog::getSystemLog()->logError("SWMgr: Can't find 'mods.conf' or 'mods.d'.  Try setting:\n\tSWORD_PATH=<directory containing mods.conf>\n\tOr see the README file for a full description of setup options (%s)", (configPath) ? configPath : "<configPath is null>");
+		ret = -1;
+	}
+
+	return ret;
+}
+
+
+SWModule *SWMgr::createModule(const char *name, const char *driver, ConfigEntMap &section)
+{
+	SWBuf description, datapath, misc1;
+	ConfigEntMap::iterator entry;
+	SWModule *newmod = 0;
+	SWBuf lang, sourceformat, encoding;
+	signed char direction, enc, markup;
+
+	description  = ((entry = section.find("Description")) != section.end()) ? (*entry).second : (SWBuf)"";
+	lang  = ((entry = section.find("Lang")) != section.end()) ? (*entry).second : (SWBuf)"en";
+ 	sourceformat = ((entry = section.find("SourceType"))  != section.end()) ? (*entry).second : (SWBuf)"";
+ 	encoding = ((entry = section.find("Encoding"))  != section.end()) ? (*entry).second : (SWBuf)"";
+	datapath = prefixPath;
+	if ((prefixPath[strlen(prefixPath)-1] != '\\') && (prefixPath[strlen(prefixPath)-1] != '/'))
+		datapath += "/";
+
+	SWBuf versification = ((entry = section.find("Versification"))  != section.end()) ? (*entry).second : (SWBuf)"KJV";
+
+	// DataPath - relative path to data used by module driver.  May be a directory, may be a File.
+	//   Typically not useful by outside world.  See AbsoluteDataPath, PrefixPath, and RelativePrefixPath
+	//   below.
+	misc1 += ((entry = section.find("DataPath")) != section.end()) ? (*entry).second : (SWBuf)"";
+	char *buf = new char [ strlen(misc1.c_str()) + 1 ];
+	char *buf2 = buf;
+	strcpy(buf, misc1.c_str());
+//	for (; ((*buf2) && ((*buf2 == '.') || (*buf2 == '/') || (*buf2 == '\\'))); buf2++);
+	for (; ((*buf2) && ((*buf2 == '/') || (*buf2 == '\\'))); buf2++);
+	if (!strncmp(buf2, "./", 2)) { //remove the leading ./ in the module data path to make it look better
+		buf2 += 2;
+	}
+	// PrefixPath - absolute directory path to the repository in which this module was found
+	section["PrefixPath"] = datapath;
+	if (*buf2)
+		datapath += buf2;
+	delete [] buf;
+
+	section["AbsoluteDataPath"] = datapath;
+
+	if (!stricmp(sourceformat.c_str(), "GBF"))
+		markup = FMT_GBF;
+	else if (!stricmp(sourceformat.c_str(), "ThML"))
+		markup = FMT_THML;
+	else if (!stricmp(sourceformat.c_str(), "OSIS"))
+		markup = FMT_OSIS;
+	else if (!stricmp(sourceformat.c_str(), "TEI"))
+		markup = FMT_TEI;
+	else
+		markup = FMT_GBF;
+
+	if (!stricmp(encoding.c_str(), "SCSU"))
+		enc = ENC_SCSU;
+	else if (!stricmp(encoding.c_str(), "UTF-8")) {
+		enc = ENC_UTF8;
+	}
+	else enc = ENC_LATIN1;
+
+	if ((entry = section.find("Direction")) == section.end()) {
+		direction = DIRECTION_LTR;
+	}
+	else if (!stricmp((*entry).second.c_str(), "rtol")) {
+		direction = DIRECTION_RTL;
+	}
+	else if (!stricmp((*entry).second.c_str(), "bidi")) {
+		direction = DIRECTION_BIDI;
+	}
+	else {
+		direction = DIRECTION_LTR;
+	}
+
+	if ((!stricmp(driver, "zText")) || (!stricmp(driver, "zCom"))) {
+		SWCompress *compress = 0;
+		int blockType = CHAPTERBLOCKS;
+		misc1 = ((entry = section.find("BlockType")) != section.end()) ? (*entry).second : (SWBuf)"CHAPTER";
+		if (!stricmp(misc1.c_str(), "VERSE"))
+			blockType = VERSEBLOCKS;
+		else if (!stricmp(misc1.c_str(), "CHAPTER"))
+			blockType = CHAPTERBLOCKS;
+		else if (!stricmp(misc1.c_str(), "BOOK"))
+			blockType = BOOKBLOCKS;
+		
+		misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (SWBuf)"LZSS";
+#ifndef EXCLUDEZLIB
+		if (!stricmp(misc1.c_str(), "ZIP"))
+			compress = new ZipCompress();
+		else
+		if (!stricmp(misc1.c_str(), "BZIP2_UNSUPPORTED"))
+			compress = new Bzip2Compress();
+		else
+		if (!stricmp(misc1.c_str(), "XZ_UNSUPPORTED"))
+			compress = new XzCompress();
+		else
+#endif
+		if (!stricmp(misc1.c_str(), "LZSS"))
+			compress = new LZSSCompress();
+
+		if (compress) {
+			if (!stricmp(driver, "zText"))
+				newmod = new zText(datapath.c_str(), name, description.c_str(), blockType, compress, 0, enc, direction, markup, lang.c_str(), versification);
+			else	newmod = new zCom(datapath.c_str(), name, description.c_str(), blockType, compress, 0, enc, direction, markup, lang.c_str(), versification);
+		}
+	}
+
+	if (!stricmp(driver, "RawText")) {
+		newmod = new RawText(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), versification);
+	}
+
+	if (!stricmp(driver, "RawText4")) {
+		newmod = new RawText4(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), versification);
+	}
+
+	// backward support old drivers
+	if (!stricmp(driver, "RawGBF")) {
+		newmod = new RawText(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str());
+	}
+
+	if (!stricmp(driver, "RawCom")) {
+		newmod = new RawCom(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), versification);
+	}
+
+	if (!stricmp(driver, "RawCom4")) {
+		newmod = new RawCom4(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), versification);
+	}
+
+	if (!stricmp(driver, "RawFiles")) {
+		newmod = new RawFiles(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str());
+	}
+
+	if (!stricmp(driver, "HREFCom")) {
+		misc1 = ((entry = section.find("Prefix")) != section.end()) ? (*entry).second : (SWBuf)"";
+		newmod = new HREFCom(datapath.c_str(), misc1.c_str(), name, description.c_str());
+	}
+
+        int pos = 0;  //used for position of final / in AbsoluteDataPath, but also set to 1 for modules types that need to strip module name
+	if (!stricmp(driver, "RawLD")) {
+		bool caseSensitive = ((entry = section.find("CaseSensitiveKeys")) != section.end()) ? (*entry).second == "true": false;
+		bool strongsPadding = ((entry = section.find("StrongsPadding")) != section.end()) ? (*entry).second == "true": true;
+		newmod = new RawLD(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), caseSensitive, strongsPadding);
+                pos = 1;
+        }
+
+	if (!stricmp(driver, "RawLD4")) {
+		bool caseSensitive = ((entry = section.find("CaseSensitiveKeys")) != section.end()) ? (*entry).second == "true": false;
+		bool strongsPadding = ((entry = section.find("StrongsPadding")) != section.end()) ? (*entry).second == "true": true;
+		newmod = new RawLD4(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), caseSensitive, strongsPadding);
+                pos = 1;
+        }
+
+	if (!stricmp(driver, "zLD")) {
+		SWCompress *compress = 0;
+		int blockCount;
+		bool caseSensitive = ((entry = section.find("CaseSensitiveKeys")) != section.end()) ? (*entry).second == "true": false;
+		bool strongsPadding = ((entry = section.find("StrongsPadding")) != section.end()) ? (*entry).second == "true": true;
+		misc1 = ((entry = section.find("BlockCount")) != section.end()) ? (*entry).second : (SWBuf)"200";
+		blockCount = atoi(misc1.c_str());
+		blockCount = (blockCount) ? blockCount : 200;
+
+		misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (SWBuf)"LZSS";
+#ifndef EXCLUDEZLIB
+		if (!stricmp(misc1.c_str(), "ZIP"))
+			compress = new ZipCompress();
+		else
+#endif
+		if (!stricmp(misc1.c_str(), "LZSS"))
+			compress = new LZSSCompress();
+
+		if (compress) {
+			newmod = new zLD(datapath.c_str(), name, description.c_str(), blockCount, compress, 0, enc, direction, markup, lang.c_str(), caseSensitive, strongsPadding);
+		}
+		pos = 1;
+	}
+
+	if (!stricmp(driver, "RawGenBook")) {
+		misc1 = ((entry = section.find("KeyType")) != section.end()) ? (*entry).second : (SWBuf)"TreeKey";
+		newmod = new RawGenBook(datapath.c_str(), name, description.c_str(), 0, enc, direction, markup, lang.c_str(), misc1.c_str());
+		pos = 1;
+	}
+
+	if (pos == 1) {
+		SWBuf &dp = section["AbsoluteDataPath"];
+		for (int i = dp.length() - 1; i; i--) {
+			if (dp[i] == '/') {
+				dp.setSize(i);
+				break;
+			}
+		}
+/*
+		SWBuf &rdp = section["RelativeDataPath"];
+		for (int i = rdp.length() - 1; i; i--) {
+			if (rdp[i] == '/') {
+				rdp.setSize(i);
+				break;
+			}
+		}
+*/
+	}
+
+	if (newmod) {
+		// if a specific module type is set in the config, use this
+		if ((entry = section.find("Type")) != section.end())
+			newmod->setType(entry->second.c_str());
+
+		newmod->setConfig(&section);
+	}
+	
+	return newmod;
+}
+
+
+void SWMgr::AddGlobalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end) {
+
+	for (;start != end; ++start) {
+		OptionFilterMap::iterator it;
+		SWBuf filterName = start->second;
+
+
+		// special cases for filters with parameters
+
+		if (filterName.startsWith("OSISReferenceLinks")) {
+			SWBuf params = filterName;
+			filterName = params.stripPrefix('|', true);
+			SWBuf optionName = params.stripPrefix('|', true);
+			SWBuf optionTip = params.stripPrefix('|', true);
+			SWBuf optionType = params.stripPrefix('|', true);
+			SWBuf optionSubType = params.stripPrefix('|', true);
+			SWBuf optionDefaultValue = params.stripPrefix('|', true);
+			// we'll key off of type and subtype.
+			filterName = filterName + "." + optionType + "." + optionSubType;
+
+			it = optionFilters.find(filterName);
+			if (it == optionFilters.end()) {
+				SWOptionFilter *tmpFilter = new OSISReferenceLinks(optionName, optionTip, optionType, optionSubType, optionDefaultValue);
+				optionFilters.insert(OptionFilterMap::value_type(filterName, tmpFilter));
+				cleanupFilters.push_back(tmpFilter);
+			}
+		}
+
+
+		it = optionFilters.find(filterName);
+		if (it != optionFilters.end()) {
+			module->addOptionFilter((*it).second);	// add filter to module and option as a valid option
+			StringList::iterator loop;
+			for (loop = options.begin(); loop != options.end(); loop++) {
+				if (!strcmp((*loop).c_str(), (*it).second->getOptionName()))
+					break;
+			}
+			if (loop == options.end())	// if we have not yet included the option
+				options.push_back((*it).second->getOptionName());
+		}
+	}
+	if (filterMgr)
+		filterMgr->AddGlobalOptions(module, section, start, end);
+#ifdef _ICU_
+	   module->addOptionFilter(transliterator);
+#endif
+}
+
+
+char SWMgr::filterText(const char *filterName, SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	char retVal = -1;
+	// why didn't we use find here?
+	for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) {
+		if ((*it).second->getOptionName()) {
+			if (!stricmp(filterName, (*it).second->getOptionName())) {
+				retVal = it->second->processText(text, key, module);
+				break;
+			}
+		}
+	}
+
+	if (retVal == -1) {
+		FilterMap::iterator it = extraFilters.find(filterName);
+		if (it != extraFilters.end()) {
+			retVal = it->second->processText(text, key, module);
+		}
+	}
+
+	return retVal;
+}
+
+
+void SWMgr::AddLocalOptions(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end)
+{
+	for (;start != end; start++) {
+		OptionFilterMap::iterator it;
+		it = optionFilters.find((*start).second);
+		if (it != optionFilters.end()) {
+			module->addOptionFilter((*it).second);	// add filter to module
+		}
+	}
+
+	if (filterMgr)
+		filterMgr->AddLocalOptions(module, section, start, end);
+}
+
+
+// manually specified StripFilters for special cases, like Papyri marks and such
+void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap &section, ConfigEntMap::iterator start, ConfigEntMap::iterator end)
+{
+	for (;start != end; start++) {
+		OptionFilterMap::iterator it;
+		it = optionFilters.find((*start).second);
+		if (it != optionFilters.end()) {
+			module->addStripFilter((*it).second);	// add filter to module
+		}
+	}
+}
+
+
+void SWMgr::AddRawFilters(SWModule *module, ConfigEntMap &section) {
+	SWBuf sourceformat, cipherKey;
+	ConfigEntMap::iterator entry;
+
+	cipherKey = ((entry = section.find("CipherKey")) != section.end()) ? (*entry).second : (SWBuf)"";
+	if (cipherKey.length()) {
+		SWFilter *cipherFilter = new CipherFilter(cipherKey.c_str());
+		cipherFilters.insert(FilterMap::value_type(module->getName(), cipherFilter));
+		cleanupFilters.push_back(cipherFilter);
+		module->addRawFilter(cipherFilter);
+	}
+
+	if (filterMgr)
+		filterMgr->AddRawFilters(module, section);
+}
+
+
+void SWMgr::AddEncodingFilters(SWModule *module, ConfigEntMap &section) {
+	if (filterMgr)
+		filterMgr->AddEncodingFilters(module, section);
+}
+
+
+void SWMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section) {
+	SWBuf sourceformat;
+	ConfigEntMap::iterator entry;
+
+	sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (SWBuf)"";
+
+	// Temporary: To support old module types
+	// TODO: Remove at 1.6.0 release?
+	if (!sourceformat.length()) {
+		sourceformat = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (SWBuf)"";
+		if (!stricmp(sourceformat.c_str(), "RawGBF"))
+			sourceformat = "GBF";
+		else sourceformat = "";
+	}
+
+// process module	- eg. follows
+//	if (!stricmp(sourceformat.c_str(), "GBF")) {
+//		module->AddRenderFilter(gbftortf);
+//	}
+
+	if (filterMgr)
+		filterMgr->AddRenderFilters(module, section);
+
+}
+
+
+void SWMgr::AddStripFilters(SWModule *module, ConfigEntMap &section)
+{
+	SWBuf sourceformat;
+	ConfigEntMap::iterator entry;
+
+	sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (SWBuf)"";
+	// Temporary: To support old module types
+	if (!sourceformat.length()) {
+		sourceformat = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (SWBuf)"";
+		if (!stricmp(sourceformat.c_str(), "RawGBF"))
+			sourceformat = "GBF";
+		else sourceformat = "";
+	}
+	
+	if (!stricmp(sourceformat.c_str(), "GBF")) {
+		module->addStripFilter(gbfplain);
+	}
+	else if (!stricmp(sourceformat.c_str(), "ThML")) {
+		module->addStripFilter(thmlplain);
+	}
+	else if (!stricmp(sourceformat.c_str(), "OSIS")) {
+		module->addStripFilter(osisplain);
+	}
+	else if (!stricmp(sourceformat.c_str(), "TEI")) {
+		module->addStripFilter(teiplain);
+	}
+
+	if (filterMgr)
+		filterMgr->AddStripFilters(module, section);
+
+}
+
+
+void SWMgr::CreateMods(bool multiMod) {
+	SectionMap::iterator it;
+	ConfigEntMap::iterator start;
+	ConfigEntMap::iterator end;
+	ConfigEntMap::iterator entry;
+	SWModule *newmod;
+	SWBuf driver, misc1;
+	for (it = config->Sections.begin(); it != config->Sections.end(); it++) {
+		ConfigEntMap &section = (*it).second;
+		newmod = 0;
+		
+		driver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (SWBuf)"";
+		if (driver.length()) {
+			newmod = createModule((*it).first, driver, section);
+			if (newmod) {
+				// Filters to add for this module and globally announce as an option to the user
+				// e.g. translit, strongs, redletterwords, etc, so users can turn these on and off globally
+				start = section.lower_bound("GlobalOptionFilter");
+				end   = section.upper_bound("GlobalOptionFilter");
+				AddGlobalOptions(newmod, section, start, end);
+
+				// Only add the option to the module, don't announce it's availability
+				// These are useful for like: filters that parse special entryAttribs in a text
+				// or whatever you might want to happen on entry lookup
+				start = section.lower_bound("LocalOptionFilter");
+				end   = section.upper_bound("LocalOptionFilter");
+				AddLocalOptions(newmod, section, start, end);
+
+				//STRIP FILTERS
+
+				// add all basic ones for for the modtype
+				AddStripFilters(newmod, section);
+
+				// Any special processing for this module when searching:
+				// e.g. for papyri, removed all [](). notation
+				start = section.lower_bound("LocalStripFilter");
+				end   = section.upper_bound("LocalStripFilter");
+				AddStripFilters(newmod, section, start, end);
+
+				AddRawFilters(newmod, section);
+				AddRenderFilters(newmod, section);
+				AddEncodingFilters(newmod, section);
+				
+				SWModule *oldmod = Modules[newmod->getName()];
+				if (oldmod) {
+					delete oldmod;
+				}
+				
+				Modules[newmod->getName()] = newmod;
+			}
+		}
+	}
+}
+
+
+void SWMgr::DeleteMods() {
+
+	ModMap::iterator it;
+
+	for (it = Modules.begin(); it != Modules.end(); it++)
+		delete (*it).second;
+
+	Modules.clear();
+}
+
+
+void SWMgr::deleteModule(const char *modName) {
+	ModMap::iterator it = Modules.find(modName);
+	if (it != Modules.end()) {
+		delete (*it).second;
+		Modules.erase(it);
+	}
+}
+
+
+void SWMgr::InstallScan(const char *dirname)
+{
+   DIR *dir;
+   struct dirent *ent;
+   FileDesc *conffd = 0;
+   SWBuf newmodfile;
+   SWBuf targetName;
+ 
+	if (FileMgr::existsDir(dirname)) {
+		if ((dir = opendir(dirname))) {
+			rewinddir(dir);
+			while ((ent = readdir(dir))) {
+				if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {
+					newmodfile = dirname;
+					if ((dirname[strlen(dirname)-1] != '\\') && (dirname[strlen(dirname)-1] != '/'))
+						newmodfile += "/";
+					newmodfile += ent->d_name;
+
+					// mods.d
+					if (configType) {
+						if (conffd)
+							FileMgr::getSystemFileMgr()->close(conffd);
+						targetName = configPath;
+						if ((configPath[strlen(configPath)-1] != '\\') && (configPath[strlen(configPath)-1] != '/'))
+							targetName += "/";
+						targetName += ent->d_name;
+						conffd = FileMgr::getSystemFileMgr()->open(targetName.c_str(), FileMgr::WRONLY|FileMgr::CREAT, FileMgr::IREAD|FileMgr::IWRITE);
+					}
+
+					// mods.conf
+					else {
+						if (!conffd) {
+							conffd = FileMgr::getSystemFileMgr()->open(config->filename.c_str(), FileMgr::WRONLY|FileMgr::APPEND);
+							if (conffd > 0)
+								conffd->seek(0L, SEEK_END);
+							else {
+								FileMgr::getSystemFileMgr()->close(conffd);
+								conffd = 0;
+							}
+						}
+					}
+					AddModToConfig(conffd, newmodfile.c_str());
+					FileMgr::removeFile(newmodfile.c_str());
+				}
+			}
+			if (conffd)
+				FileMgr::getSystemFileMgr()->close(conffd);
+			closedir(dir);
+		}
+	}
+}
+
+
+char SWMgr::AddModToConfig(FileDesc *conffd, const char *fname)
+{
+	FileDesc *modfd;
+	char ch;
+
+	SWLog::getSystemLog()->logTimedInformation("Found new module [%s]. Installing...", fname);
+	modfd = FileMgr::getSystemFileMgr()->open(fname, FileMgr::RDONLY);
+	ch = '\n';
+	conffd->write(&ch, 1);
+	while (modfd->read(&ch, 1) == 1)
+		conffd->write(&ch, 1);
+	ch = '\n';
+	conffd->write(&ch, 1);
+	FileMgr::getSystemFileMgr()->close(modfd);
+	return 0;
+}
+
+
+void SWMgr::setGlobalOption(const char *option, const char *value)
+{
+	for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) {
+		if ((*it).second->getOptionName()) {
+			if (!stricmp(option, (*it).second->getOptionName()))
+				(*it).second->setOptionValue(value);
+		}
+	}
+}
+
+
+const char *SWMgr::getGlobalOption(const char *option)
+{
+	for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) {
+		if ((*it).second->getOptionName()) {
+			if (!stricmp(option, (*it).second->getOptionName()))
+				return (*it).second->getOptionValue();
+		}
+	}
+	return 0;
+}
+
+
+const char *SWMgr::getGlobalOptionTip(const char *option)
+{
+	for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) {
+		if ((*it).second->getOptionName()) {
+			if (!stricmp(option, (*it).second->getOptionName()))
+				return (*it).second->getOptionTip();
+		}
+	}
+	return 0;
+}
+
+
+StringList SWMgr::getGlobalOptions()
+{
+	return options;
+}
+
+
+StringList SWMgr::getGlobalOptionValues(const char *option)
+{
+	StringList options;
+	for (OptionFilterMap::iterator it = optionFilters.begin(); it != optionFilters.end(); it++) {
+		if ((*it).second->getOptionName()) {
+			if (!stricmp(option, (*it).second->getOptionName())) {
+				options = (*it).second->getOptionValues();
+				break;	// just find the first one.  All option filters with the same option name should expect the same values
+			}
+		}
+	}
+	return options;
+}
+
+
+signed char SWMgr::setCipherKey(const char *modName, const char *key) {
+	FilterMap::iterator it;
+	ModMap::iterator it2;
+
+	// check for filter that already exists
+	it = cipherFilters.find(modName);
+	if (it != cipherFilters.end()) {
+		((CipherFilter *)(*it).second)->getCipher()->setCipherKey(key);
+		return 0;
+	}
+	// check if module exists
+	else {
+		it2 = Modules.find(modName);
+		if (it2 != Modules.end()) {
+			SWFilter *cipherFilter = new CipherFilter(key);
+			cipherFilters.insert(FilterMap::value_type(modName, cipherFilter));
+			cleanupFilters.push_back(cipherFilter);
+			(*it2).second->addRawFilter(cipherFilter);
+			return 0;
+		}
+	}
+	return -1;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/swsearchable.cpp b/src/mgr/swsearchable.cpp
new file mode 100644
index 0000000..5837c9c
--- /dev/null
+++ b/src/mgr/swsearchable.cpp
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ *  swsearchable.cpp -	used to provide an interface for objects that
+ *			can be searched
+ *
+ * $Id: swsearchable.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swsearchable.h>
+#include <listkey.h>
+
+
+SWORD_NAMESPACE_START
+
+
+void SWSearchable::nullPercent(char percent, void *percentUserData) {}
+
+
+SWSearchable::SWSearchable() {
+}
+
+
+SWSearchable::~SWSearchable() {
+}
+
+
+// special search framework
+signed char SWSearchable::createSearchFramework(void (*percent)(char, void *), void *percentUserData) {
+	return 0;
+}
+
+
+void SWSearchable::deleteSearchFramework() {
+}
+
+
+bool SWSearchable::isSearchOptimallySupported(const char *istr, int searchType, int flags, SWKey *scope) {
+	bool retVal = false;
+	search(istr, searchType, flags, scope, &retVal);
+	return retVal;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/mgr/versificationmgr.cpp b/src/mgr/versificationmgr.cpp
new file mode 100644
index 0000000..7972488
--- /dev/null
+++ b/src/mgr/versificationmgr.cpp
@@ -0,0 +1,396 @@
+/******************************************************************************
+ *
+ *  versificationmgr.cpp -	implementation of class VersificationMgr used
+ *				for managing versification systems
+ *
+ * $Id: versificationmgr.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <versificationmgr.h>
+#include <vector>
+#include <map>
+#include <treekey.h>
+#include <canon.h>		// KJV internal versification system
+#include <swlog.h>
+#include <algorithm>
+
+#include <canon_null.h>		// null v11n system
+
+#include <canon_leningrad.h>	// Leningrad Codex (WLC) v11n system
+#include <canon_mt.h>		// Masoretic Text (MT) v11n system
+#include <canon_kjva.h>		// KJV + Apocrypha v11n system
+#include <canon_nrsv.h>		// NRSV v11n system
+#include <canon_nrsva.h>	// NRSV + Apocrypha v11n system
+#include <canon_synodal.h>	// Russian Synodal v11n system
+#include <canon_synodalprot.h>	// Russian Synodal v11n system
+#include <canon_vulg.h>		// Vulgate v11n system
+#include <canon_german.h>	// German v11n system
+#include <canon_luther.h>	// Luther v11n system
+#include <canon_catholic.h>	// Catholic v11n system (10 chapter Esther)
+#include <canon_catholic2.h>	// Catholic2 v11n system (16 chapter Esther)
+#include <canon_lxx.h>		// General LXX v11n system (includes GNT, as used in Orthodox Bibles)
+#include <canon_orthodox.h>	// Orthodox v11n system as used in Orthodox Bibles
+
+using std::vector;
+using std::map;
+using std::distance;
+using std::lower_bound;
+
+
+SWORD_NAMESPACE_START
+
+
+VersificationMgr *VersificationMgr::getSystemVersificationMgr() {
+	if (!systemVersificationMgr) {
+		systemVersificationMgr = new VersificationMgr();
+		systemVersificationMgr->registerVersificationSystem("KJV", otbooks, ntbooks, vm);
+		systemVersificationMgr->registerVersificationSystem("Leningrad", otbooks_leningrad, ntbooks_null, vm_leningrad);
+		systemVersificationMgr->registerVersificationSystem("MT", otbooks_mt, ntbooks_null, vm_mt);
+		systemVersificationMgr->registerVersificationSystem("KJVA", otbooks_kjva, ntbooks, vm_kjva);
+		systemVersificationMgr->registerVersificationSystem("NRSV", otbooks, ntbooks, vm_nrsv);
+		systemVersificationMgr->registerVersificationSystem("NRSVA", otbooks_nrsva, ntbooks, vm_nrsva);
+		systemVersificationMgr->registerVersificationSystem("Synodal", otbooks_synodal, ntbooks_synodal, vm_synodal);
+		systemVersificationMgr->registerVersificationSystem("SynodalProt", otbooks_synodalProt, ntbooks_synodal, vm_synodalProt);
+		systemVersificationMgr->registerVersificationSystem("Vulg", otbooks_vulg, ntbooks_vulg, vm_vulg);
+		systemVersificationMgr->registerVersificationSystem("German", otbooks_german, ntbooks, vm_german);
+		systemVersificationMgr->registerVersificationSystem("Luther", otbooks_luther, ntbooks_luther, vm_luther);
+		systemVersificationMgr->registerVersificationSystem("Catholic", otbooks_catholic, ntbooks, vm_catholic);
+		systemVersificationMgr->registerVersificationSystem("Catholic2", otbooks_catholic2, ntbooks, vm_catholic2);
+		systemVersificationMgr->registerVersificationSystem("LXX", otbooks_lxx, ntbooks, vm_lxx);
+		systemVersificationMgr->registerVersificationSystem("Orthodox", otbooks_orthodox, ntbooks, vm_orthodox);
+	}
+	return systemVersificationMgr;
+}
+
+
+class VersificationMgr::System::Private {
+public:
+	/** Array[chapmax] of maximum verses in chapters */
+	vector<Book> books;
+	map<SWBuf, int> osisLookup;
+
+	Private() {
+	}
+	Private(const VersificationMgr::System::Private &other) {
+		books = other.books;
+		osisLookup = other.osisLookup;
+	}
+	VersificationMgr::System::Private &operator =(const VersificationMgr::System::Private &other) {
+		books = other.books;
+		osisLookup = other.osisLookup;
+		return *this;
+	}
+};
+
+
+class VersificationMgr::Book::Private {
+friend struct BookOffsetLess;
+public:
+	/** Array[chapmax] of maximum verses in chapters */
+	vector<int> verseMax;
+	vector<long> offsetPrecomputed;
+
+	Private() {
+		verseMax.clear();
+	}
+	Private(const VersificationMgr::Book::Private &other) {
+		verseMax.clear();
+		verseMax = other.verseMax;
+		offsetPrecomputed = other.offsetPrecomputed;
+	}
+	VersificationMgr::Book::Private &operator =(const VersificationMgr::Book::Private &other) {
+		verseMax.clear();
+		verseMax = other.verseMax;
+		offsetPrecomputed = other.offsetPrecomputed;
+		return *this;
+	}
+};
+
+
+struct BookOffsetLess {
+	bool operator() (const VersificationMgr::Book &o1, const VersificationMgr::Book &o2) const { return o1.p->offsetPrecomputed[0] < o2.p->offsetPrecomputed[0]; }
+	bool operator() (const long &o1, const VersificationMgr::Book &o2) const { return o1 < o2.p->offsetPrecomputed[0]; }
+	bool operator() (const VersificationMgr::Book &o1, const long &o2) const { return o1.p->offsetPrecomputed[0] < o2; }
+	bool operator() (const long &o1, const long &o2) const { return o1 < o2; }
+};
+
+
+void VersificationMgr::Book::init() {
+	p = new Private();
+}
+
+
+void VersificationMgr::System::init() {
+	p = new Private();
+	BMAX[0] = 0;
+	BMAX[1] = 0;
+	ntStartOffset = 0;
+}
+
+
+VersificationMgr::System::System(const System &other) {
+	init();
+	name = other.name;
+	BMAX[0] = other.BMAX[0];
+	BMAX[1] = other.BMAX[1];
+	(*p) = *(other.p);
+	ntStartOffset = other.ntStartOffset;
+}
+
+
+VersificationMgr::System &VersificationMgr::System::operator =(const System &other) {
+	name = other.name;
+	BMAX[0] = other.BMAX[0];
+	BMAX[1] = other.BMAX[1];
+	(*p) = *(other.p);
+	ntStartOffset = other.ntStartOffset;
+	return *this;
+}
+
+
+VersificationMgr::System::~System() {
+	delete p;
+}
+
+
+const VersificationMgr::Book *VersificationMgr::System::getBook(int number) const {
+	return (number < (signed int)p->books.size()) ? &(p->books[number]) : 0;
+}
+
+
+int VersificationMgr::System::getBookNumberByOSISName(const char *bookName) const {
+	map<SWBuf, int>::const_iterator it = p->osisLookup.find(bookName);
+	return (it != p->osisLookup.end()) ? it->second : -1;
+}
+
+
+void VersificationMgr::System::loadFromSBook(const sbook *ot, const sbook *nt, int *chMax) {
+	int chap = 0;
+	int book = 0;
+	long offset = 0;	// module heading
+	offset++;			// testament heading
+	while (ot->chapmax) {
+		p->books.push_back(Book(ot->name, ot->osis, ot->prefAbbrev, ot->chapmax));
+		offset++;		// book heading
+		Book &b = p->books[p->books.size()-1];
+		p->osisLookup[b.getOSISName()] = p->books.size();
+		for (int i = 0; i < ot->chapmax; i++) {
+			b.p->verseMax.push_back(chMax[chap]);
+			offset++;		// chapter heading
+			b.p->offsetPrecomputed.push_back(offset);
+			offset += chMax[chap++];
+		}
+		ot++;
+		book++;
+	}
+	BMAX[0] = book;
+	book = 0;
+	ntStartOffset = offset;
+	offset++;			// testament heading
+	while (nt->chapmax) {
+		p->books.push_back(Book(nt->name, nt->osis, nt->prefAbbrev, nt->chapmax));
+		offset++;		// book heading
+		Book &b = p->books[p->books.size()-1];
+		p->osisLookup[b.getOSISName()] = p->books.size();
+		for (int i = 0; i < nt->chapmax; i++) {
+			b.p->verseMax.push_back(chMax[chap]);
+			offset++;		// chapter heading
+			b.p->offsetPrecomputed.push_back(offset);
+			offset += chMax[chap++];
+		}
+		nt++;
+		book++;
+	}
+	BMAX[1] = book;
+
+	// TODO: build offset speed array
+}
+
+
+VersificationMgr::Book::Book(const Book &other) {
+	longName = other.longName;
+	osisName = other.osisName;
+	prefAbbrev = other.prefAbbrev;
+	chapMax = other.chapMax;
+	init();
+	(*p) = *(other.p);
+}
+
+
+VersificationMgr::Book& VersificationMgr::Book::operator =(const Book &other) {
+	longName = other.longName;
+	osisName = other.osisName;
+	prefAbbrev = other.prefAbbrev;
+	chapMax = other.chapMax;
+	init();
+	(*p) = *(other.p);
+	return *this;
+}
+
+
+VersificationMgr::Book::~Book() {
+	delete p;
+}
+
+
+int VersificationMgr::Book::getVerseMax(int chapter) const {
+	chapter--;
+	return (p && (chapter < (signed int)p->verseMax.size()) && (chapter > -1)) ? p->verseMax[chapter] : -1;
+}
+
+
+int VersificationMgr::System::getBookCount() const {
+	return (p ? p->books.size() : 0);
+}
+
+
+long VersificationMgr::System::getOffsetFromVerse(int book, int chapter, int verse) const {
+	long  offset = -1;
+	chapter--;
+
+	const Book *b = getBook(book);
+
+	if (!b)                                        return -1;	// assert we have a valid book
+	if ((chapter > -1) && (chapter >= (signed int)b->p->offsetPrecomputed.size())) return -1;	// assert we have a valid chapter
+
+	offset = b->p->offsetPrecomputed[(chapter > -1)?chapter:0];
+	if (chapter < 0) offset--;
+
+/* old code
+ *
+	offset = offsets[testament-1][0][book];
+	offset = offsets[testament-1][1][(int)offset + chapter];
+	if (!(offset|verse)) // if we have a testament but nothing else.
+		offset = 1;
+
+*/
+
+	return (offset + verse);
+}
+
+
+char VersificationMgr::System::getVerseFromOffset(long offset, int *book, int *chapter, int *verse) const {
+
+	if (offset < 1) {	// just handle the module heading corner case up front (and error case)
+		(*book) = -1;
+		(*chapter) = 0;
+		(*verse) = 0;
+		return offset;	// < 0 = error
+	}
+
+	// binary search for book
+	vector<Book>::iterator b = lower_bound(p->books.begin(), p->books.end(), offset, BookOffsetLess());
+	if (b == p->books.end()) b--;
+	(*book)    = distance(p->books.begin(), b)+1;
+	if (offset < (*(b->p->offsetPrecomputed.begin()))-((((!(*book)) || (*book)==BMAX[0]+1))?2:1)) { // -1 for chapter headings
+		(*book)--;
+		if (b != p->books.begin()) {
+			b--;	
+		}
+	}
+	vector<long>::iterator c = lower_bound(b->p->offsetPrecomputed.begin(), b->p->offsetPrecomputed.end(), offset);
+
+	// if we're a book heading, we are lessthan chapter precomputes, but greater book.  This catches corner case.
+	if (c == b->p->offsetPrecomputed.end()) {
+		c--;
+	}
+	if ((offset < *c) && (c == b->p->offsetPrecomputed.begin())) {
+		(*chapter) = (offset - *c)+1;	// should be 0 or -1 (for testament heading)
+		(*verse) = 0;
+	}
+	else {
+		if (offset < *c) c--;
+		(*chapter) = distance(b->p->offsetPrecomputed.begin(), c)+1;
+		(*verse)   = (offset - *c);
+	}
+	return ((*chapter > 0) && (*verse > b->getVerseMax(*chapter))) ? KEYERR_OUTOFBOUNDS : 0;
+}
+
+
+/***************************************************
+ * VersificationMgr
+ */
+
+class VersificationMgr::Private {
+public:
+	Private() {
+	}
+	Private(const VersificationMgr::Private &other) {
+		systems = other.systems;
+	}
+	VersificationMgr::Private &operator =(const VersificationMgr::Private &other) {
+		systems = other.systems;
+		return *this;
+	}
+	map<SWBuf, System> systems;
+};
+// ---------------- statics -----------------
+VersificationMgr *VersificationMgr::systemVersificationMgr = 0;
+
+class __staticsystemVersificationMgr {
+public:
+	__staticsystemVersificationMgr() { }
+	~__staticsystemVersificationMgr() { delete VersificationMgr::systemVersificationMgr; }
+} _staticsystemVersificationMgr;
+
+
+void VersificationMgr::init() {
+	p = new Private();
+}
+
+
+VersificationMgr::~VersificationMgr() {
+	delete p;
+}
+
+
+void VersificationMgr::setSystemVersificationMgr(VersificationMgr *newVersificationMgr) {
+	if (systemVersificationMgr)
+		delete systemVersificationMgr;
+	systemVersificationMgr = newVersificationMgr;
+}
+
+
+const VersificationMgr::System *VersificationMgr::getVersificationSystem(const char *name) const {
+	map<SWBuf, System>::const_iterator it = p->systems.find(name);
+	return (it != p->systems.end()) ? &(it->second) : 0;
+}
+
+
+void VersificationMgr::registerVersificationSystem(const char *name, const sbook *ot, const sbook *nt, int *chMax) {
+	p->systems[name] = name;
+	System &s = p->systems[name];
+	s.loadFromSBook(ot, nt, chMax);
+}
+
+
+void VersificationMgr::registerVersificationSystem(const char *name, const TreeKey *tk) {
+}
+
+
+const StringList VersificationMgr::getVersificationSystems() const {
+	StringList retVal;
+	for (map<SWBuf, System>::const_iterator it = p->systems.begin(); it != p->systems.end(); it++) {
+		retVal.push_back(it->first);
+	}
+	return retVal;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/Makefile b/src/modules/Makefile
new file mode 100644
index 0000000..ef8eccd
--- /dev/null
+++ b/src/modules/Makefile
@@ -0,0 +1,5 @@
+
+root := ../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
new file mode 100644
index 0000000..944dc18
--- /dev/null
+++ b/src/modules/Makefile.am
@@ -0,0 +1,10 @@
+modulesdir = $(top_srcdir)/src/modules
+
+libsword_la_SOURCES += $(modulesdir)/swmodule.cpp
+
+include ../src/modules/common/Makefile.am
+include ../src/modules/filters/Makefile.am
+include ../src/modules/genbook/Makefile.am
+include ../src/modules/texts/Makefile.am
+include ../src/modules/comments/Makefile.am
+include ../src/modules/lexdict/Makefile.am
diff --git a/src/modules/comments/Makefile b/src/modules/comments/Makefile
new file mode 100644
index 0000000..1a2d00d
--- /dev/null
+++ b/src/modules/comments/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/comments/Makefile.am b/src/modules/comments/Makefile.am
new file mode 100644
index 0000000..7139cf8
--- /dev/null
+++ b/src/modules/comments/Makefile.am
@@ -0,0 +1,9 @@
+commentsdir = $(top_srcdir)/src/modules/comments
+
+libsword_la_SOURCES += $(commentsdir)/swcom.cpp
+
+include ../src/modules/comments/rawcom/Makefile.am
+include ../src/modules/comments/rawcom4/Makefile.am
+include ../src/modules/comments/rawfiles/Makefile.am
+include ../src/modules/comments/zcom/Makefile.am
+include ../src/modules/comments/hrefcom/Makefile.am
diff --git a/src/modules/comments/hrefcom/Makefile b/src/modules/comments/hrefcom/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/comments/hrefcom/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/comments/hrefcom/Makefile.am b/src/modules/comments/hrefcom/Makefile.am
new file mode 100644
index 0000000..dba4294
--- /dev/null
+++ b/src/modules/comments/hrefcom/Makefile.am
@@ -0,0 +1,2 @@
+hrefcomdir = $(top_srcdir)/src/modules/comments/hrefcom
+libsword_la_SOURCES += $(hrefcomdir)/hrefcom.cpp
diff --git a/src/modules/comments/hrefcom/hrefcom.cpp b/src/modules/comments/hrefcom/hrefcom.cpp
new file mode 100644
index 0000000..3716dbf
--- /dev/null
+++ b/src/modules/comments/hrefcom/hrefcom.cpp
@@ -0,0 +1,95 @@
+/******************************************************************************
+ *
+ *  hrefcom.cpp -	code for class 'HREFCom'- a module that produces HTML
+ *			HREFs pointing to actual text desired.  Uses standard
+ *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: hrefcom.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <utilstr.h>
+#include <rawverse.h>
+#include <hrefcom.h>
+#include <swbuf.h>
+#include <versekey.h>
+
+SWORD_NAMESPACE_START
+
+ /******************************************************************************
+ * HREFCom Constructor - Initializes data for instance of HREFCom
+ *
+ * ENT:	iname - Internal name for module
+ *	iprefix - string to prepend to each HREF (e.g. "file://mods/com/jfb/")
+ *	idesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+HREFCom::HREFCom(const char *ipath, const char *iprefix, const char *iname, const char *idesc, SWDisplay *idisp) : RawVerse(ipath), SWCom(iname, idesc, idisp)
+{
+	prefix   = 0;
+	stdstr(&prefix, iprefix);
+}
+
+
+/******************************************************************************
+ * HREFCom Destructor - Cleans up instance of HREFCom
+ */
+
+HREFCom::~HREFCom()
+{
+	if (prefix)
+		delete [] prefix;
+}
+
+
+/******************************************************************************
+ * HREFCom::operator char *	- Returns the correct verse when char * cast
+ *					is requested
+ *
+ * RET: string buffer with verse
+ */
+
+SWBuf &HREFCom::getRawEntryBuf() const {
+	long  start;
+	unsigned short size;
+	VerseKey *key = 0;
+
+        key = &getVerseKey();
+
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
+	entrySize = size;        // support getEntrySize call
+
+	SWBuf tmpbuf;
+
+	readText(key->getTestament(), start, size, tmpbuf);
+	entryBuf = prefix;
+	entryBuf += tmpbuf.c_str();
+	prepText(entryBuf);
+
+	if (key != this->key)
+		delete key;
+
+	return entryBuf;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/comments/rawcom/Makefile b/src/modules/comments/rawcom/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/comments/rawcom/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/comments/rawcom/Makefile.am b/src/modules/comments/rawcom/Makefile.am
new file mode 100644
index 0000000..116d706
--- /dev/null
+++ b/src/modules/comments/rawcom/Makefile.am
@@ -0,0 +1,2 @@
+rawcomdir = $(top_srcdir)/src/modules/comments/rawcom
+libsword_la_SOURCES += $(rawcomdir)/rawcom.cpp
diff --git a/src/modules/comments/rawcom/rawcom.cpp b/src/modules/comments/rawcom/rawcom.cpp
new file mode 100644
index 0000000..5189cdc
--- /dev/null
+++ b/src/modules/comments/rawcom/rawcom.cpp
@@ -0,0 +1,184 @@
+/******************************************************************************
+ *
+ *  rawcom.cpp -	code for class 'RawCom'- a module that reads raw
+ *			commentary files:
+ *			ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawcom.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <filemgr.h>
+#include <rawverse.h>
+#include <rawcom.h>
+#include <versekey.h>
+
+SWORD_NAMESPACE_START
+
+ /******************************************************************************
+ * RawCom Constructor - Initializes data for instance of RawCom
+ *
+ * ENT:	iname - Internal name for module
+ *	idesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+RawCom::RawCom(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding encoding, SWTextDirection dir, SWTextMarkup markup, const char *ilang, const char *versification)
+		: RawVerse(ipath),
+            SWCom(iname, idesc, idisp, encoding, dir, markup, ilang, versification) {
+}
+
+
+/******************************************************************************
+ * RawCom Destructor - Cleans up instance of RawCom
+ */
+
+RawCom::~RawCom()
+{
+}
+
+
+bool RawCom::isWritable() const {
+	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+/******************************************************************************
+ * RawCom::getRawEntry()	- Returns the correct verse when char * cast
+ *					is requested
+ *
+ * RET: string buffer with verse
+ */
+
+SWBuf &RawCom::getRawEntryBuf() const {
+	long  start = 0;
+	unsigned short size = 0;
+	VerseKey *key = &getVerseKey();
+
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
+	entrySize = size;        // support getEntrySize call
+
+	entryBuf = "";
+	readText(key->getTestament(), start, size, entryBuf);
+
+	rawFilter(entryBuf, 0);	// hack, decipher
+	rawFilter(entryBuf, key);
+
+//	if (!isUnicode())
+		prepText(entryBuf);
+
+	return entryBuf;
+}
+
+
+/******************************************************************************
+ * RawCom::increment	- Increments module key a number of entries
+ *
+ * ENT:	steps	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void RawCom::increment(int steps) {
+	long  start;
+	unsigned short size;
+	VerseKey *tmpkey = &getVerseKey();
+
+	findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
+
+	SWKey lastgood = *tmpkey;
+	while (steps) {
+		long laststart = start;
+		unsigned short lastsize = size;
+		SWKey lasttry = *tmpkey;
+		(steps > 0) ? ++(*key) : --(*key);
+		tmpkey = &getVerseKey();
+
+		if ((error = key->popError())) {
+			*key = lastgood;
+			break;
+		}
+		long index = tmpkey->getTestamentIndex();
+		findOffset(tmpkey->getTestament(), index, &start, &size);
+		if (
+			(((laststart != start) || (lastsize != size))	// we're a different entry
+//				&& (start > 0)
+				&& (size))	// and we actually have a size
+				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
+			steps += (steps < 0) ? 1 : -1;
+			lastgood = *tmpkey;
+		}
+	}
+	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
+}
+
+
+void RawCom::setEntry(const char *inbuf, long len) {
+	VerseKey *key = &getVerseKey();
+	doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len);
+}
+
+
+void RawCom::linkEntry(const SWKey *inkey) {
+	VerseKey *destkey = &getVerseKey();
+	const VerseKey *srckey = &getVerseKey(inkey);
+
+	doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
+
+	if (inkey != srckey) // free our key if we created a VerseKey
+		delete srckey;
+}
+
+
+/******************************************************************************
+ * RawCom::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawCom::deleteEntry() {
+
+	VerseKey *key = &getVerseKey();
+	doSetText(key->getTestament(), key->getTestamentIndex(), "");
+}
+
+bool RawCom::isLinked(const SWKey *k1, const SWKey *k2) const {
+	long start1, start2;
+	unsigned short size1, size2;
+	VerseKey *vk1 = &getVerseKey(k1);
+	VerseKey *vk2 = &getVerseKey(k2);
+	if (vk1->getTestament() != vk2->getTestament()) return false;
+
+	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
+	if (!size1 || !size2) return false;
+	return start1 == start2;
+}
+
+bool RawCom::hasEntry(const SWKey *k) const {
+	long start;
+	unsigned short size;
+	VerseKey *vk = &getVerseKey(k);
+
+	findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
+	return size;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/comments/rawcom4/Makefile b/src/modules/comments/rawcom4/Makefile
new file mode 100644
index 0000000..a08e07e
--- /dev/null
+++ b/src/modules/comments/rawcom4/Makefile
@@ -0,0 +1,5 @@
+

+root := ../../../..

+

+all:

+	make -C ${root}

diff --git a/src/modules/comments/rawcom4/Makefile.am b/src/modules/comments/rawcom4/Makefile.am
new file mode 100644
index 0000000..346dbc5
--- /dev/null
+++ b/src/modules/comments/rawcom4/Makefile.am
@@ -0,0 +1,2 @@
+rawcom4dir = $(top_srcdir)/src/modules/comments/rawcom4
+libsword_la_SOURCES += $(rawcom4dir)/rawcom4.cpp
diff --git a/src/modules/comments/rawcom4/rawcom4.cpp b/src/modules/comments/rawcom4/rawcom4.cpp
new file mode 100644
index 0000000..7cfc603
--- /dev/null
+++ b/src/modules/comments/rawcom4/rawcom4.cpp
@@ -0,0 +1,179 @@
+/******************************************************************************
+ *
+ *  rawcom4.cpp -	code for class 'RawCom4'- a module that reads raw
+ *			commentary files:
+ *			ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawcom4.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <filemgr.h>
+#include <rawverse4.h>
+#include <rawcom4.h>
+#include <versekey.h>
+
+SWORD_NAMESPACE_START
+
+ /******************************************************************************
+ * RawCom4 Constructor - Initializes data for instance of RawCom4
+ *
+ * ENT:	iname - Internal name for module
+ *	idesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+RawCom4::RawCom4(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding encoding, SWTextDirection dir, SWTextMarkup markup, const char *ilang, const char *versification)
+		: RawVerse4(ipath),
+            SWCom(iname, idesc, idisp, encoding, dir, markup, ilang, versification) {
+}
+
+
+/******************************************************************************
+ * RawCom4 Destructor - Cleans up instance of RawCom4
+ */
+
+RawCom4::~RawCom4()
+{
+}
+
+
+bool RawCom4::isWritable() const {
+	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+/******************************************************************************
+ * RawCom4::getRawEntry()	- Returns the correct verse when char * cast
+ *					is requested
+ *
+ * RET: string buffer with verse
+ */
+
+SWBuf &RawCom4::getRawEntryBuf() const {
+	long  start = 0;
+	unsigned long size = 0;
+	VerseKey *key = &getVerseKey();
+
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
+	entrySize = size;        // support getEntrySize call
+
+	entryBuf = "";
+	readText(key->getTestament(), start, size, entryBuf);
+
+	rawFilter(entryBuf, 0);	// hack, decipher
+	rawFilter(entryBuf, key);
+
+//	if (!isUnicode())
+		prepText(entryBuf);
+
+	return entryBuf;
+}
+
+
+/******************************************************************************
+ * RawCom4::increment	- Increments module key a number of entries
+ *
+ * ENT:	steps	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void RawCom4::increment(int steps) {
+	long  start;
+	unsigned long size;
+	VerseKey *tmpkey = &getVerseKey();
+
+	findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
+
+	SWKey lastgood = *tmpkey;
+	while (steps) {
+		long laststart = start;
+		unsigned long lastsize = size;
+		SWKey lasttry = *tmpkey;
+		(steps > 0) ? ++(*key) : --(*key);
+		tmpkey = &getVerseKey();
+
+		if ((error = key->popError())) {
+			*key = lastgood;
+			break;
+		}
+		long index = tmpkey->getTestamentIndex();
+		findOffset(tmpkey->getTestament(), index, &start, &size);
+		if (
+			(((laststart != start) || (lastsize != size))	// we're a different entry
+//				&& (start > 0)
+				&& (size))	// and we actually have a size
+				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
+			steps += (steps < 0) ? 1 : -1;
+			lastgood = *tmpkey;
+		}
+	}
+	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
+}
+
+
+void RawCom4::setEntry(const char *inbuf, long len) {
+	VerseKey *key = &getVerseKey();
+	doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len);
+}
+
+
+void RawCom4::linkEntry(const SWKey *inkey) {
+	VerseKey *destkey = &getVerseKey();
+	const VerseKey *srckey = &getVerseKey(inkey);
+	doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
+}
+
+
+/******************************************************************************
+ * RawCom4::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawCom4::deleteEntry() {
+
+	VerseKey *key = &getVerseKey();
+	doSetText(key->getTestament(), key->getTestamentIndex(), "");
+}
+
+bool RawCom4::isLinked(const SWKey *k1, const SWKey *k2) const {
+	long start1, start2;
+	unsigned long size1, size2;
+	VerseKey *vk1 = &getVerseKey(k1);
+	VerseKey *vk2 = &getVerseKey(k2);
+	if (vk1->getTestament() != vk2->getTestament()) return false;
+
+	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
+	if (!size1 || !size2) return false;
+	return start1 == start2;
+}
+
+bool RawCom4::hasEntry(const SWKey *k) const {
+	long start;
+	unsigned long size;
+	VerseKey *vk = &getVerseKey(k);
+
+	findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
+	return size;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/comments/rawfiles/Makefile b/src/modules/comments/rawfiles/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/comments/rawfiles/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/comments/rawfiles/Makefile.am b/src/modules/comments/rawfiles/Makefile.am
new file mode 100644
index 0000000..a9b7dbe
--- /dev/null
+++ b/src/modules/comments/rawfiles/Makefile.am
@@ -0,0 +1,2 @@
+rawfilesdir = $(top_srcdir)/src/modules/comments/rawfiles
+libsword_la_SOURCES += $(rawfilesdir)/rawfiles.cpp
diff --git a/src/modules/comments/rawfiles/rawfiles.cpp b/src/modules/comments/rawfiles/rawfiles.cpp
new file mode 100644
index 0000000..7c2d524
--- /dev/null
+++ b/src/modules/comments/rawfiles/rawfiles.cpp
@@ -0,0 +1,232 @@
+/******************************************************************************
+ *
+ *  rawfiles.cpp -	code for class 'RawFiles'- a module that produces HTML
+ *			HREFs pointing to actual text desired.  Uses standard
+ *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawfiles.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <rawverse.h>
+#include <rawfiles.h>
+#include <filemgr.h>
+#include <versekey.h>
+#include <sysdata.h>
+
+SWORD_NAMESPACE_START
+
+ /******************************************************************************
+ * RawFiles Constructor - Initializes data for instance of RawFiles
+ *
+ * ENT:	iname - Internal name for module
+ *	idesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+RawFiles::RawFiles(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : RawVerse(ipath, FileMgr::RDWR), SWCom(iname, idesc, idisp, enc, dir, mark, ilang)
+{
+}
+
+
+/******************************************************************************
+ * RawFiles Destructor - Cleans up instance of RawFiles
+ */
+
+RawFiles::~RawFiles()
+{
+}
+
+
+/** Is the module writable? :)
+* @return yes or no
+*/
+bool RawFiles::isWritable() const {
+	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * RawFiles::getRawEntry	- Retrieve the unprocessed entry contents at
+ *					the current key position of this module
+ *
+ * RET: entry contents
+ */
+
+SWBuf &RawFiles::getRawEntryBuf() const {
+	FileDesc *datafile;
+	long  start = 0;
+	unsigned short size = 0;
+	VerseKey *key = &getVerseKey();
+
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
+
+	entryBuf = "";
+	if (size) {
+		SWBuf tmpbuf = path;
+		tmpbuf += '/';
+		readText(key->getTestament(), start, size, entryBuf);
+		tmpbuf += entryBuf;
+		entryBuf = "";
+		datafile = FileMgr::getSystemFileMgr()->open(tmpbuf.c_str(), FileMgr::RDONLY);
+		if (datafile->getFd() > 0) {
+			size = datafile->seek(0, SEEK_END);
+			char *tmpBuf = new char [ size + 1 ];
+			memset(tmpBuf, 0, size + 1);
+			datafile->seek(0, SEEK_SET);
+			datafile->read(tmpBuf, size);
+			entryBuf = tmpBuf;
+			delete [] tmpBuf;
+//			preptext(entrybuf);
+		}
+		FileMgr::getSystemFileMgr()->close(datafile);
+	}
+	return entryBuf;
+}
+
+
+/******************************************************************************
+ * RawFiles::setEntry(char *)- Update the module's current key entry with
+ *				provided text
+ */
+
+void RawFiles::setEntry(const char *inbuf, long len) {
+	FileDesc *datafile;
+	long  start;
+	unsigned short size;
+	VerseKey *key = &getVerseKey();
+
+	len = (len<0)?strlen(inbuf):len;
+
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
+
+	if (size) {
+		SWBuf tmpbuf;
+		entryBuf = path;
+		entryBuf += '/';
+		readText(key->getTestament(), start, size, tmpbuf);
+		entryBuf += tmpbuf;
+	}
+	else {
+		SWBuf tmpbuf;
+		entryBuf = path;
+		entryBuf += '/';
+		tmpbuf = getNextFilename();
+		doSetText(key->getTestament(), key->getTestamentIndex(), tmpbuf);
+		entryBuf += tmpbuf;
+	}
+	datafile = FileMgr::getSystemFileMgr()->open(entryBuf, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
+	if (datafile->getFd() > 0) {
+		datafile->write(inbuf, len);
+	}
+	FileMgr::getSystemFileMgr()->close(datafile);
+}
+
+
+/******************************************************************************
+ * RawFiles::linkEntry(SWKey *)- Link the modules current key entry with
+ *				another module entry
+ *
+ * RET: *this
+ */
+
+void RawFiles::linkEntry(const SWKey *inkey) {
+
+	long  start;
+	unsigned short size;
+	const VerseKey *key = &getVerseKey();
+
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size);
+
+	if (size) {
+		SWBuf tmpbuf;
+		readText(key->getTestament(), start, size + 2, tmpbuf);
+
+		key = &getVerseKey(inkey);
+		doSetText(key->getTestament(), key->getTestamentIndex(), tmpbuf.c_str());
+	}
+}
+
+
+/******************************************************************************
+ * RawFiles::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawFiles::deleteEntry() {
+	VerseKey *key = &getVerseKey();
+	doSetText(key->getTestament(), key->getTestamentIndex(), "");
+}
+
+
+/******************************************************************************
+ * RawFiles::getNextfilename - generates a valid filename in which to store
+ *				an entry
+ *
+ * RET: filename
+ */
+
+const char *RawFiles::getNextFilename() {
+	static SWBuf incfile;
+	__u32 number = 0;
+	FileDesc *datafile;
+
+	incfile.setFormatted("%s/incfile", path);
+	datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::RDONLY);
+	if (datafile->getFd() != -1) {
+		if (datafile->read(&number, 4) != 4) number = 0;
+		number = swordtoarch32(number);
+	}
+	number++;
+	FileMgr::getSystemFileMgr()->close(datafile);
+	
+	datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
+	incfile.setFormatted("%.7d", number-1);
+
+	number = archtosword32(number);
+	datafile->write(&number, 4);
+
+	FileMgr::getSystemFileMgr()->close(datafile);
+	return incfile;
+}
+
+
+char RawFiles::createModule(const char *path) {
+	char *incfile = new char [ strlen (path) + 16 ];
+
+	__u32 zero = 0;
+	zero = archtosword32(zero);
+
+	FileDesc *datafile;
+
+	sprintf(incfile, "%s/incfile", path);
+	datafile = FileMgr::getSystemFileMgr()->open(incfile, FileMgr::CREAT|FileMgr::WRONLY|FileMgr::TRUNC);
+	delete [] incfile;
+	datafile->write(&zero, 4);
+	FileMgr::getSystemFileMgr()->close(datafile);
+
+    return RawVerse::createModule (path);
+}
+
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/comments/swcom.cpp b/src/modules/comments/swcom.cpp
new file mode 100644
index 0000000..52bd61b
--- /dev/null
+++ b/src/modules/comments/swcom.cpp
@@ -0,0 +1,123 @@
+/******************************************************************************
+ *
+ *  swcom.cpp -	code for base class 'SWCom'- The basis for all commentary
+ *		modules
+ *
+ * $Id: swcom.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <utilstr.h>
+#include <swcom.h>
+#include <localemgr.h>
+#include <versekey.h>
+
+
+SWORD_NAMESPACE_START
+
+
+/******************************************************************************
+ * SWCom Constructor - Initializes data for instance of SWCom
+ *
+ * ENT:	imodname - Internal name for module
+ *	imoddesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+SWCom::SWCom(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char *ilang, const char *versification): SWModule(imodname, imoddesc, idisp, "Commentaries", enc, dir, mark, ilang) {
+	this->versification = 0;
+	stdstr(&(this->versification), versification);
+	delete key;
+	key = (VerseKey *)createKey();
+	tmpVK1 = (VerseKey *)createKey();
+	tmpVK2 = (VerseKey *)createKey();
+        tmpSecond = false;
+}
+
+
+/******************************************************************************
+ * SWCom Destructor - Cleans up instance of SWCom
+ */
+
+SWCom::~SWCom() {
+	delete tmpVK1;
+	delete tmpVK2;
+	delete [] versification;
+}
+
+
+SWKey *SWCom::createKey() const {
+	VerseKey *vk = new VerseKey();
+
+	vk->setVersificationSystem(versification);
+
+	return vk;
+}
+
+
+long SWCom::getIndex() const {
+	VerseKey *key = &getVerseKey();
+	entryIndex = key->getIndex();
+	return entryIndex;
+}
+
+void SWCom::setIndex(long iindex) {
+	VerseKey *key = &getVerseKey();
+	key->setTestament(1);
+	key->setIndex(iindex);
+
+	if (key != this->key) {
+		this->key->copyFrom(*key);
+	}
+}
+
+
+VerseKey &SWCom::getVerseKey(const SWKey *keyToConvert) const {
+	const SWKey *thisKey = keyToConvert ? keyToConvert : this->key;
+
+	VerseKey *key = 0;
+	// see if we have a VerseKey * or decendant
+	SWTRY {
+		key = SWDYNAMIC_CAST(VerseKey, thisKey);
+	}
+	SWCATCH ( ... ) {	}
+	if (!key) {
+		ListKey *lkTest = 0;
+		SWTRY {
+			lkTest = SWDYNAMIC_CAST(ListKey, thisKey);
+		}
+		SWCATCH ( ... ) {	}
+		if (lkTest) {
+			SWTRY {
+				key = SWDYNAMIC_CAST(VerseKey, lkTest->getElement());
+			}
+			SWCATCH ( ... ) {	}
+		}
+	}
+	if (!key) {
+                VerseKey *retKey = (tmpSecond) ? tmpVK1 : tmpVK2;
+                tmpSecond = !tmpSecond;
+		retKey->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
+		(*retKey) = *(thisKey);
+		return (*retKey);
+	}
+	else	return *key;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/comments/zcom/Makefile b/src/modules/comments/zcom/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/comments/zcom/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/comments/zcom/Makefile.am b/src/modules/comments/zcom/Makefile.am
new file mode 100644
index 0000000..f22700c
--- /dev/null
+++ b/src/modules/comments/zcom/Makefile.am
@@ -0,0 +1,2 @@
+zcomdir = $(top_srcdir)/src/modules/comments/zcom
+libsword_la_SOURCES += $(zcomdir)/zcom.cpp
diff --git a/src/modules/comments/zcom/zcom.cpp b/src/modules/comments/zcom/zcom.cpp
new file mode 100644
index 0000000..65c4ca8
--- /dev/null
+++ b/src/modules/comments/zcom/zcom.cpp
@@ -0,0 +1,220 @@
+/******************************************************************************
+ *
+ *  zcom.cpp -	code for class 'zCom'- a module that reads raw commentary
+ *		files
+ *
+ * $Id: zcom.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <swbuf.h>
+#include <zverse.h>
+#include <versekey.h>
+#include <zcom.h>
+#include <filemgr.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * zCom Constructor - Initializes data for instance of zCom
+ *
+ * ENT:	ipath - path to data files
+ *		iname - Internal name for module
+ *		idesc - Name to display to user for module
+ *		iblockType - verse, chapter, book, etc. of index chunks
+ *		icomp - Compressor object
+ *		idisp - Display object to use for displaying
+ */
+
+zCom::zCom(const char *ipath, const char *iname, const char *idesc, int iblockType, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char *ilang, const char *versification) : zVerse(ipath, -1, iblockType, icomp), SWCom(iname, idesc, idisp, enc, dir, mark, ilang, versification)/*, SWCompress()*/
+{
+	blockType = iblockType;
+	lastWriteKey = 0;
+}
+
+/******************************************************************************
+ * zCom Destructor - Cleans up instance of zCom
+ */
+
+zCom::~zCom() {
+	flushCache();
+
+	if (lastWriteKey)
+		delete lastWriteKey;
+}
+
+
+bool zCom::isWritable() const {
+	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * zCom::getRawEntry	- Returns the correct verse when char * cast
+ *					is requested
+ *
+ * RET: string buffer with verse
+ */
+SWBuf &zCom::getRawEntryBuf() const {
+	long  start = 0;
+	unsigned short size = 0;
+	unsigned long buffnum;
+	VerseKey *key = &getVerseKey();
+
+	findOffset(key->getTestament(), key->getTestamentIndex(), &start, &size, &buffnum);
+	entrySize = size;        // support getEntrySize call
+
+	entryBuf = "";
+	zReadText(key->getTestament(), start, size, buffnum, entryBuf);
+
+	rawFilter(entryBuf, key);
+
+//	if (!isUnicode())
+		prepText(entryBuf);
+
+	return entryBuf;
+}
+
+
+bool zCom::sameBlock(VerseKey *k1, VerseKey *k2) {
+	if (k1->getTestament() != k2->getTestament())
+		return false;
+
+	switch (blockType) {
+	case VERSEBLOCKS:
+		if (k1->getVerse() != k2->getVerse())
+			return false;
+	case CHAPTERBLOCKS:
+		if (k1->getChapter() != k2->getChapter())
+			return false;
+	case BOOKBLOCKS:
+		if (k1->getBook() != k2->getBook())
+			return false;
+	}
+	return true;
+}
+
+void zCom::setEntry(const char *inbuf, long len) {
+	VerseKey *key = &getVerseKey();
+
+	// see if we've jumped across blocks since last write
+	if (lastWriteKey) {
+		if (!sameBlock(lastWriteKey, key)) {
+			flushCache();
+		}
+		delete lastWriteKey;
+	}
+
+	doSetText(key->getTestament(), key->getTestamentIndex(), inbuf, len);
+
+	lastWriteKey = (VerseKey *)key->clone();	// must delete
+}
+
+
+void zCom::linkEntry(const SWKey *inkey) {
+	VerseKey *destkey = &getVerseKey();
+	const VerseKey *srckey = &getVerseKey(inkey);
+
+	doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
+
+	if (inkey != srckey) // free our key if we created a VerseKey
+		delete srckey;
+}
+
+/******************************************************************************
+ * zCom::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void zCom::deleteEntry() {
+
+	VerseKey *key = &getVerseKey();
+	doSetText(key->getTestament(), key->getTestamentIndex(), "");
+}
+
+
+/******************************************************************************
+ * zCom::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void zCom::increment(int steps) {
+	long  start;
+	unsigned short size;
+	unsigned long buffnum;
+	VerseKey *tmpkey = &getVerseKey();
+
+	findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum);
+
+	SWKey lastgood = *tmpkey;
+	while (steps) {
+		long laststart = start;
+		unsigned short lastsize = size;
+		SWKey lasttry = *tmpkey;
+		(steps > 0) ? ++(*key) : --(*key);
+		tmpkey = &getVerseKey();
+
+		if ((error = key->popError())) {
+			*key = lastgood;
+			break;
+		}
+		long index = tmpkey->getTestamentIndex();
+		findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum);
+		if (
+			(((laststart != start) || (lastsize != size))	// we're a different entry
+//				&& (start > 0) 
+				&& (size))	// and we actually have a size
+				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
+			steps += (steps < 0) ? 1 : -1;
+			lastgood = *tmpkey;
+		}
+	}
+	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
+}
+
+bool zCom::isLinked(const SWKey *k1, const SWKey *k2) const {
+	long start1, start2;
+	unsigned short size1, size2;
+	unsigned long buffnum1, buffnum2;
+	VerseKey *vk1 = &getVerseKey(k1);
+	VerseKey *vk2 = &getVerseKey(k2);
+	if (vk1->getTestament() != vk2->getTestament()) return false;
+
+	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1);
+	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2);
+	return start1 == start2 && buffnum1 == buffnum2;
+}
+
+bool zCom::hasEntry(const SWKey *k) const {
+	long start;
+	unsigned short size;
+	unsigned long buffnum;
+	VerseKey *vk = &getVerseKey(k);
+
+	findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum);
+	return size;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/Makefile b/src/modules/common/Makefile
new file mode 100644
index 0000000..81f7721
--- /dev/null
+++ b/src/modules/common/Makefile
@@ -0,0 +1,4 @@
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/common/Makefile.am b/src/modules/common/Makefile.am
new file mode 100644
index 0000000..90a3f98
--- /dev/null
+++ b/src/modules/common/Makefile.am
@@ -0,0 +1,23 @@
+commondir = $(top_srcdir)/src/modules/common
+
+libsword_la_SOURCES += $(commondir)/rawstr.cpp
+libsword_la_SOURCES += $(commondir)/rawstr4.cpp
+libsword_la_SOURCES += $(commondir)/swcomprs.cpp
+libsword_la_SOURCES += $(commondir)/lzsscomprs.cpp
+
+if HAVE_LIBZ
+SWZLIB =  $(commondir)/zipcomprs.cpp
+SWZLIB += $(commondir)/bz2comprs.cpp
+SWZLIB += $(commondir)/xzcomprs.cpp
+else
+SWZLIB =
+endif
+libsword_la_SOURCES += $(SWZLIB)
+libsword_la_SOURCES += $(commondir)/rawverse.cpp
+libsword_la_SOURCES += $(commondir)/rawverse4.cpp
+libsword_la_SOURCES += $(commondir)/swcipher.cpp
+libsword_la_SOURCES += $(commondir)/zverse.cpp
+libsword_la_SOURCES += $(commondir)/zstr.cpp
+libsword_la_SOURCES += $(commondir)/entriesblk.cpp
+libsword_la_SOURCES += $(commondir)/sapphire.cpp
+
diff --git a/src/modules/common/bz2comprs.cpp b/src/modules/common/bz2comprs.cpp
new file mode 100644
index 0000000..16f6d11
--- /dev/null
+++ b/src/modules/common/bz2comprs.cpp
@@ -0,0 +1,181 @@
+/******************************************************************************
+ *
+ *  bz2comprs.cpp -	Bzip2Compress, a driver class that provides bzip2
+ *			compression (Burrows–Wheeler with Huffman coding)
+ *				
+ * $Id: bz2comprs.cpp 2858 2013-07-08 03:08:10Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <bz2comprs.h>
+#include <zlib.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * Bzip2Compress Constructor - Initializes data for instance of Bzip2Compress
+ *
+ */
+
+Bzip2Compress::Bzip2Compress() : SWCompress() {
+}
+
+
+/******************************************************************************
+ * Bzip2Compress Destructor - Cleans up instance of Bzip2Compress
+ */
+
+Bzip2Compress::~Bzip2Compress() {
+}
+
+
+/******************************************************************************
+ * Bzip2Compress::Encode - This function "encodes" the input stream into the
+ *			output stream.
+ *			The GetChars() and SendChars() functions are
+ *			used to separate this method from the actual
+ *			i/o.
+ * 		NOTE:	must set zlen for parent class to know length of
+ * 			compressed buffer.
+ */
+
+void Bzip2Compress::Encode(void)
+{
+/*
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least 0.1% larger than
+   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+	direct = 0;	// set direction needed by parent [Get|Send]Chars()
+
+	// get buffer
+	char chunk[1024];
+	char *buf = (char *)calloc(1, 1024);
+	char *chunkbuf = buf;
+	unsigned long chunklen;
+	unsigned long len = 0;
+	while((chunklen = GetChars(chunk, 1023))) {
+		memcpy(chunkbuf, chunk, chunklen);
+		len += chunklen;
+		if (chunklen < 1023)
+			break;
+		else	buf = (char *)realloc(buf, len + 1024);
+		chunkbuf = buf+len;
+	}
+
+
+	zlen = (long) (len*1.001)+15;
+	char *zbuf = new char[zlen+1];
+	if (len)
+	{
+		//printf("Doing compress\n");
+		if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK)
+		{
+			printf("ERROR in compression\n");
+		}
+		else {
+			SendChars(zbuf, zlen);
+		}
+	}
+	else
+	{
+		fprintf(stderr, "ERROR: no buffer to compress\n");
+	}
+	delete [] zbuf;
+	free (buf);
+}
+
+
+/******************************************************************************
+ * Bzip2Compress::Decode - This function "decodes" the input stream into the
+ *			output stream.
+ *			The GetChars() and SendChars() functions are
+ *			used to separate this method from the actual
+ *			i/o.
+ */
+
+void Bzip2Compress::Decode(void)
+{
+/*
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+
+	// get buffer
+	char chunk[1024];
+	char *zbuf = (char *)calloc(1, 1024);
+	char *chunkbuf = zbuf;
+	int chunklen;
+	unsigned long zlen = 0;
+	while((chunklen = GetChars(chunk, 1023))) {
+		memcpy(chunkbuf, chunk, chunklen);
+		zlen += chunklen;
+		if (chunklen < 1023)
+			break;
+		else	zbuf = (char *)realloc(zbuf, zlen + 1024);
+		chunkbuf = zbuf + zlen;
+	}
+
+	//printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen);
+	if (zlen) {
+		unsigned long blen = zlen*20;	// trust compression is less than 1000%
+		char *buf = new char[blen]; 
+		//printf("Doing decompress {%s}\n", zbuf);
+		slen = 0;
+		switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){
+			case Z_OK: SendChars(buf, blen); slen = blen; break;
+			case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break;
+			case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break;
+			case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break;
+			default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break;
+		}
+		delete [] buf;
+	}
+	else {
+		fprintf(stderr, "ERROR: no buffer to decompress!\n");
+	}
+	//printf("Finished decoding\n");
+	free (zbuf);
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/entriesblk.cpp b/src/modules/common/entriesblk.cpp
new file mode 100644
index 0000000..4872d28
--- /dev/null
+++ b/src/modules/common/entriesblk.cpp
@@ -0,0 +1,194 @@
+/******************************************************************************
+ *
+ *  entriesblk.cpp -	EntriesBlock facilitates compressed lex/dict modules
+ *
+ * $Id: entriesblk.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <entriesblk.h>
+#include <stdlib.h>
+#include <string.h>
+
+SWORD_NAMESPACE_START
+
+const int EntriesBlock::METAHEADERSIZE = 4;
+	// count(4);
+const int EntriesBlock::METAENTRYSIZE = 8;
+	// offset(4); size(4);
+
+EntriesBlock::EntriesBlock(const char *iBlock, unsigned long size) {
+	if (size) {
+		block = (char *)calloc(1, size);
+		memcpy(block, iBlock, size);
+	}
+	else {
+		block = (char *)calloc(1, sizeof(__u32));
+	}
+}
+
+
+EntriesBlock::EntriesBlock() {
+	block = (char *)calloc(1, sizeof(__u32));
+}
+
+
+EntriesBlock::~EntriesBlock() {
+	free(block);
+}
+
+
+void EntriesBlock::setCount(int count) {
+	__u32 rawCount = archtosword32(count);
+	memcpy(block, &rawCount, sizeof(__u32));
+}
+
+
+int EntriesBlock::getCount() {
+	__u32 count = 0;
+	memcpy(&count, block, sizeof(__u32));
+	count = swordtoarch32(count);
+	return count;
+}
+
+
+void EntriesBlock::getMetaEntry(int index, unsigned long *offset, unsigned long *size) {
+	__u32 rawOffset = 0;
+	__u32 rawSize = 0;
+	*offset = 0;
+	*size = 0;
+	if (index >= getCount())	// assert index < count
+		return;
+
+	// first 4 bytes is count, each 6 bytes after is each meta entry
+	memcpy(&rawOffset, block + METAHEADERSIZE + (index * METAENTRYSIZE), sizeof(rawOffset));
+	memcpy(&rawSize, block + METAHEADERSIZE + (index * METAENTRYSIZE) + sizeof(rawOffset), sizeof(rawSize));
+
+	*offset = (unsigned long)swordtoarch32(rawOffset);
+	*size   = (unsigned long)swordtoarch32(rawSize);
+}
+
+
+void EntriesBlock::setMetaEntry(int index, unsigned long offset, unsigned long size) {
+	__u32 rawOffset = archtosword32(offset);
+	__u32 rawSize = archtosword32(size);
+
+	if (index >= getCount())	// assert index < count
+		return;
+
+	// first 4 bytes is count, each 6 bytes after is each meta entry
+	memcpy(block + METAHEADERSIZE + (index * METAENTRYSIZE), &rawOffset, sizeof(rawOffset));
+	memcpy(block + METAHEADERSIZE + (index * METAENTRYSIZE) + sizeof(rawOffset), &rawSize, sizeof(rawSize));
+}
+
+
+const char *EntriesBlock::getRawData(unsigned long *retSize) {
+	unsigned long max = 4;
+	int loop;
+	unsigned long offset;
+	unsigned long size;
+	for (loop = 0; loop < getCount(); loop++) {
+		getMetaEntry(loop, &offset, &size);
+		max = ((offset + size) > max) ? (offset + size) : max;
+	}
+	*retSize = max;
+	return block;
+}
+
+
+int EntriesBlock::addEntry(const char *entry) {
+	unsigned long dataSize;
+	getRawData(&dataSize);
+	unsigned long  len = strlen(entry);
+	unsigned long offset;
+	unsigned long size;
+	int count = getCount();
+	unsigned long dataStart = METAHEADERSIZE + (count * METAENTRYSIZE);
+	// new meta entry + new data size + 1 because null 
+	block = (char *)realloc(block, dataSize + METAENTRYSIZE + len + 1);
+	// shift right to make room for new meta entry
+	memmove(block + dataStart + METAENTRYSIZE, block + dataStart, dataSize - dataStart);
+
+	for (int loop = 0; loop < count; loop++) {
+		getMetaEntry(loop, &offset, &size);
+		if (offset) {	// if not a deleted entry
+			offset += METAENTRYSIZE;
+			setMetaEntry(loop, offset, size);
+		}
+	}
+
+	offset = dataSize;	// original dataSize before realloc
+	size = len + 1;
+	// add our text to the end
+	memcpy(block + offset + METAENTRYSIZE, entry, size);
+	// increment count
+	setCount(count + 1);
+	// add our meta entry
+	setMetaEntry(count, offset + METAENTRYSIZE, size);
+	// return index of our new entry
+	return count;
+}
+
+
+const char *EntriesBlock::getEntry(int entryIndex) {
+	unsigned long offset;
+	unsigned long size;
+	static const char *empty = "";
+
+	getMetaEntry(entryIndex, &offset, &size);
+	return (offset) ? block+offset : empty;
+}
+
+
+unsigned long EntriesBlock::getEntrySize(int entryIndex) {
+	unsigned long offset;
+	unsigned long size;
+
+	getMetaEntry(entryIndex, &offset, &size);
+	return (offset) ? size : 0;
+}
+
+
+void EntriesBlock::removeEntry(int entryIndex) {
+	unsigned long offset;
+	unsigned long size, size2;
+	unsigned long dataSize;
+	getRawData(&dataSize);
+	getMetaEntry(entryIndex, &offset, &size);
+	int count = getCount();
+
+	if (!offset)	// already deleted
+		return;
+
+	// shift left to retrieve space used for old entry
+	memmove(block + offset, block + offset + size, dataSize - (offset + size));
+
+	// fix offset for all entries after our entry that were shifted left
+	for (int loop = entryIndex + 1; loop < count; loop++) {
+		getMetaEntry(loop, &offset, &size2);
+		if (offset) {	// if not a deleted entry
+			offset -= size;
+			setMetaEntry(loop, offset, size2);
+		}
+	}
+
+	// zero out our meta entry
+	setMetaEntry(entryIndex, 0L, 0);
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/lzsscomprs.cpp b/src/modules/common/lzsscomprs.cpp
new file mode 100644
index 0000000..ef1bc8c
--- /dev/null
+++ b/src/modules/common/lzsscomprs.cpp
@@ -0,0 +1,732 @@
+/******************************************************************************
+ *
+ *  lzssomprs.cpp -	LZSSCompress: a driver class that provides LZSS
+ *			compression
+ *		
+ * $Id: lzsscomprs.cpp 2935 2013-08-02 11:06:30Z scribe $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <lzsscomprs.h>
+
+// The following are constant sizes used by the compression algorithm.
+//
+//  N         - This is the size of the ring buffer.  It is set
+//              to 4K.  It is important to note that a position
+//              within the ring buffer requires 12 bits.  
+//
+//  F         - This is the maximum length of a character sequence
+//              that can be taken from the ring buffer.  It is set
+//              to 18.  Note that a length must be 3 before it is
+//              worthwhile to store a position/length pair, so the
+//              length can be encoded in only 4 bits.  Or, put yet
+//              another way, it is not necessary to encode a length
+//              of 0-18, it is necessary to encode a length of
+//              3-18, which requires 4 bits.
+//              
+//  THRESHOLD - It takes 2 bytes to store an offset and
+//              a length.  If a character sequence only
+//              requires 1 or 2 characters to store 
+//              uncompressed, then it is better to store
+//              it uncompressed than as an offset into
+//              the ring buffer.
+//
+// Note that the 12 bits used to store the position and the 4 bits
+// used to store the length equal a total of 16 bits, or 2 bytes.
+
+#define N		4096
+#define F		18
+#define THRESHOLD	3
+#define NOT_USED	N
+
+
+SWORD_NAMESPACE_START
+
+class LZSSCompress::Private {
+public:
+	static unsigned char m_ring_buffer[N + F - 1];
+	static short int m_match_position;
+	static short int m_match_length;
+	static short int m_lson[N + 1];
+	static short int m_rson[N + 257];
+	static short int m_dad[N + 1];
+	void InitTree();
+	void InsertNode(short int Pos);
+	void DeleteNode(short int Node);
+};
+
+/******************************************************************************
+ * LZSSCompress Statics
+ */
+
+// m_ring_buffer is a text buffer.  It contains "nodes" of
+// uncompressed text that can be indexed by position.  That is,
+// a substring of the ring buffer can be indexed by a position
+// and a length.  When decoding, the compressed text may contain
+// a position in the ring buffer and a count of the number of
+// bytes from the ring buffer that are to be moved into the
+// uncompressed buffer.  
+//
+// This ring buffer is not maintained as part of the compressed
+// text.  Instead, it is reconstructed dynamically.  That is,
+// it starts out empty and gets built as the text is decompressed.
+//
+// The ring buffer contain N bytes, with an additional F - 1 bytes
+// to facilitate string comparison.
+
+unsigned char LZSSCompress::Private::m_ring_buffer[N + F - 1];
+
+// m_match_position and m_match_length are set by InsertNode().
+//
+// These variables indicate the position in the ring buffer 
+// and the number of characters at that position that match
+// a given string.
+
+short int LZSSCompress::Private::m_match_position;
+short int LZSSCompress::Private::m_match_length;
+
+// m_lson, m_rson, and m_dad are the Japanese way of referring to
+// a tree structure.  The dad is the parent and it has a right and
+// left son (child).
+//
+// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right 
+// and left children of node i.  
+//
+// For i = 0 to N-1, m_dad[i] is the parent of node i.
+//
+// For i = 0 to 255, rson[N + i + 1] is the root of the tree for 
+// strings that begin with the character i.  Note that this requires 
+// one byte characters.
+//
+// These nodes store values of 0...(N-1).  Memory requirements
+// can be reduces by using 2-byte integers instead of full 4-byte
+// integers (for 32-bit applications).  Therefore, these are 
+// defined as "short ints."
+
+short int LZSSCompress::Private::m_lson[N + 1];
+short int LZSSCompress::Private::m_rson[N + 257];
+short int LZSSCompress::Private::m_dad[N + 1];
+
+
+/******************************************************************************
+ * LZSSCompress Constructor - Initializes data for instance of LZSSCompress
+ *
+ */
+
+LZSSCompress::LZSSCompress() : SWCompress() {
+	p = new Private();
+}
+
+
+/******************************************************************************
+ * LZSSCompress Destructor - Cleans up instance of LZSSCompress
+ */
+
+LZSSCompress::~LZSSCompress() {
+	delete p;
+}
+
+
+/******************************************************************************
+ * LZSSCompress::InitTree	- This function initializes the tree nodes to
+ *							"empty" states. 
+ */
+
+void LZSSCompress::Private::InitTree(void) {
+	int  i;
+
+	// For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right
+	// and left children of node i.  These nodes need not be
+	// initialized.  However, for debugging purposes, it is nice to
+	// have them initialized.  Since this is only used for compression
+	// (not decompression), I don't mind spending the time to do it.
+	//
+	// For the same range of i, m_dad[i] is the parent of node i.
+	// These are initialized to a known value that can represent
+	// a "not used" state.
+	
+	for (i = 0; i < N; i++) {
+		m_lson[i] = NOT_USED;
+		m_rson[i] = NOT_USED;
+		m_dad[i] = NOT_USED;
+	}
+
+	// For i = 0 to 255, m_rson[N + i + 1] is the root of the tree
+	// for strings that begin with the character i.  This is why
+	// the right child array is larger than the left child array.
+	// These are also initialzied to a "not used" state.
+	//
+	// Note that there are 256 of these, one for each of the possible
+	// 256 characters.
+
+	for (i = N + 1; i <= (N + 256); i++) {
+		m_rson[i] = NOT_USED;
+	}
+}
+
+
+/******************************************************************************
+ * LZSSCompress::InsertNode	- This function inserts a string from the ring
+ *							buffer into one of the trees.  It loads the
+ *							match position and length member variables
+ *							for the longest match.
+ *	
+ *							The string to be inserted is identified by
+ *							the parameter Pos, A full F bytes are
+ *							inserted.  So,
+ *							m_ring_buffer[Pos ... Pos+F-1]
+ *							are inserted.
+ *
+ *							If the matched length is exactly F, then an
+ *							old node is removed in favor of the new one
+ *							(because the old one will be deleted
+ *							sooner).
+ *
+ *							Note that Pos plays a dual role.  It is
+ *							used as both a position in the ring buffer
+ *							and also as a tree node.
+ *							m_ring_buffer[Pos] defines a character that
+ *							is used to identify a tree node.
+ *
+ * ENT:	pos	- position in the buffer
+ */
+
+void LZSSCompress::Private::InsertNode(short int Pos)
+{
+	short int i;
+	short int p;
+	int cmp;
+	unsigned char * key;
+
+/*
+	ASSERT(Pos >= 0);
+	ASSERT(Pos < N);
+*/
+
+	cmp = 1;
+	key = &(m_ring_buffer[Pos]);
+
+	// The last 256 entries in m_rson contain the root nodes for
+	// strings that begin with a letter.  Get an index for the
+	// first letter in this string.
+
+	p = (short int) (N + 1 + key[0]);
+
+	// Set the left and right tree nodes for this position to "not
+	// used."
+
+	m_lson[Pos] = NOT_USED;
+	m_rson[Pos] = NOT_USED;
+
+	// Haven't matched anything yet.
+
+	m_match_length = 0;
+
+	for ( ; ; ) {
+		if (cmp >= 0) {
+			if (m_rson[p] != NOT_USED) {
+				p = m_rson[p];
+			}
+			else {
+				m_rson[p] = Pos;
+				m_dad[Pos] = p;
+				return;
+			}
+		}
+		else {
+			if (m_lson[p] != NOT_USED) {
+				p = m_lson[p];
+			}
+			else {
+				m_lson[p] = Pos;
+				m_dad[Pos] = p;
+				return;
+			}
+		}
+
+		// Should we go to the right or the left to look for the
+		// next match?
+
+		for (i = 1; i < F; i++) {
+			cmp = key[i] - m_ring_buffer[p + i];
+			if (cmp != 0)
+				break;
+		}
+
+		if (i > m_match_length) {
+			m_match_position = p;
+			m_match_length = i;
+
+			if (i >= F)
+				break;
+		}
+	}
+
+	m_dad[Pos] = m_dad[p];
+	m_lson[Pos] = m_lson[p];
+	m_rson[Pos] = m_rson[p];
+
+	m_dad[ m_lson[p] ] = Pos;
+	m_dad[ m_rson[p] ] = Pos;
+
+	if (m_rson[ m_dad[p] ] == p) {
+		m_rson[ m_dad[p] ] = Pos;
+	}
+	else {
+		m_lson[ m_dad[p] ] = Pos;
+	}
+
+	// Remove "p"
+
+	m_dad[p] = NOT_USED;
+}
+
+
+/******************************************************************************
+ * LZSSCompress::DeleteNode	- This function removes the node "Node" from the
+ *							tree.
+ *
+ * ENT:	node	- node to be removed
+ */
+
+void LZSSCompress::Private::DeleteNode(short int Node)
+{
+	short int  q;
+
+/*
+	ASSERT(Node >= 0);
+	ASSERT(Node < (N+1));
+*/
+
+	if (m_dad[Node] == NOT_USED) { // not in tree, nothing to do
+		return;
+	}
+
+	if (m_rson[Node] == NOT_USED) {
+		q = m_lson[Node];
+	}
+	else if (m_lson[Node] == NOT_USED) {
+		q = m_rson[Node];
+	}
+	else {
+		q = m_lson[Node];
+		if (m_rson[q] != NOT_USED) {
+			do {
+				q = m_rson[q];
+			} while (m_rson[q] != NOT_USED);
+
+			m_rson[ m_dad[q] ] = m_lson[q];
+			m_dad[ m_lson[q] ] = m_dad[q];
+			m_lson[q] = m_lson[Node];
+			m_dad[ m_lson[Node] ] = q;
+		}
+
+		m_rson[q] = m_rson[Node];
+		m_dad[ m_rson[Node] ] = q;
+	}
+
+	m_dad[q] = m_dad[Node];
+
+	if (m_rson[ m_dad[Node] ] == Node) {
+		m_rson[ m_dad[Node] ] = q;
+	}
+	else {
+		m_lson[ m_dad[Node] ] = q;
+	}
+
+	m_dad[Node] = NOT_USED;
+}
+
+
+/******************************************************************************
+ * LZSSCompress::Encode	- This function "encodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ * 		NOTE:			must set zlen for parent class to know length of
+ * 						compressed buffer.
+ */
+
+void LZSSCompress::Encode(void)
+{
+	short int i;						// an iterator
+	short int r;						// node number in the binary tree
+	short int s;						// position in the ring buffer
+	unsigned short int len;			 // len of initial string
+	short int last_match_length;		// length of last match
+	short int code_buf_pos;			 // position in the output buffer
+	unsigned char code_buf[17];		 // the output buffer
+	unsigned char mask;				 // bit mask for byte 0 of out buf
+	unsigned char c;					// character read from string
+
+	// Start with a clean tree.
+
+	p->InitTree();
+	direct = 0;	// set direction needed by parent [Get|Send]Chars()
+
+	// code_buf[0] works as eight flags.  A "1" represents that the
+	// unit is an unencoded letter (1 byte), and a "0" represents
+	// that the next unit is a <position,length> pair (2 bytes).
+	//
+	// code_buf[1..16] stores eight units of code.  Since the best
+	// we can do is store eight <position,length> pairs, at most 16 
+	// bytes are needed to store this.
+	//
+	// This is why the maximum size of the code buffer is 17 bytes.
+
+	code_buf[0] = 0;
+	code_buf_pos = 1;
+
+	// Mask iterates over the 8 bits in the code buffer.  The first
+	// character ends up being stored in the low bit.
+	//
+	//  bit   8   7   6   5   4   3   2   1
+	//		|						   |
+	//		|			 first sequence in code buffer
+	//		|
+	//	  last sequence in code buffer		
+
+	mask = 1;
+
+	s = 0;
+	r = (short int) N - (short int) F;
+
+	// Initialize the ring buffer with spaces...
+
+	// Note that the last F bytes of the ring buffer are not filled.
+	// This is because those F bytes will be filled in immediately
+	// with bytes from the input stream.
+
+	memset(p->m_ring_buffer, ' ', N - F);
+	
+	// Read F bytes into the last F bytes of the ring buffer.
+	//
+	// This function loads the buffer with X characters and returns
+	// the actual amount loaded.
+
+	len = GetChars((char *) &(p->m_ring_buffer[r]), F);
+
+	// Make sure there is something to be compressed.
+
+	if (len == 0)
+		return;
+
+	// Insert the F strings, each of which begins with one or more
+	// 'space' characters.  Note the order in which these strings
+	// are inserted.  This way, degenerate trees will be less likely
+	// to occur.
+
+	for (i = 1; i <= F; i++) {
+		p->InsertNode((short int) (r - i));
+	}
+
+	// Finally, insert the whole string just read.  The
+	// member variables match_length and match_position are set.
+
+	p->InsertNode(r);
+
+	// Now that we're preloaded, continue till done.
+
+	do {
+
+		// m_match_length may be spuriously long near the end of
+		// text.
+
+		if (p->m_match_length > len) {
+			p->m_match_length = len;
+		}
+
+		// Is it cheaper to store this as a single character?  If so,
+		// make it so.
+
+		if (p->m_match_length < THRESHOLD) {
+			// Send one character.  Remember that code_buf[0] is the
+			// set of flags for the next eight items.
+
+			p->m_match_length = 1;	 
+			code_buf[0] |= mask;  
+			code_buf[code_buf_pos++] = p->m_ring_buffer[r];
+		}
+
+		// Otherwise, we do indeed have a string that can be stored
+		// compressed to save space.
+
+		else {
+			// The next 16 bits need to contain the position (12 bits)
+			// and the length (4 bits).
+
+			code_buf[code_buf_pos++] = (unsigned char) p->m_match_position;
+			code_buf[code_buf_pos++] = (unsigned char) (
+				((p->m_match_position >> 4) & 0xf0) | 
+				(p->m_match_length - THRESHOLD) );
+		}
+
+		// Shift the mask one bit to the left so that it will be ready
+		// to store the new bit.
+
+		mask = (unsigned char) (mask << 1);
+
+		// If the mask is now 0, then we know that we have a full set
+		// of flags and items in the code buffer.  These need to be
+		// output.
+
+		if (!mask) {
+			// code_buf is the buffer of characters to be output.
+			// code_buf_pos is the number of characters it contains.
+
+			SendChars((char *) code_buf, code_buf_pos);
+
+			// Reset for next buffer...
+
+			code_buf[0] = 0;
+			code_buf_pos = 1;
+			mask = 1;
+		}
+
+		last_match_length = p->m_match_length;
+
+		// Delete old strings and read new bytes...
+
+		for (i = 0; i < last_match_length; i++) {
+			// Get next character...
+
+			if (GetChars((char *) &c, 1) != 1)
+				break;
+
+			// Delete "old strings"
+
+			p->DeleteNode(s);
+
+			// Put this character into the ring buffer.
+			//		  
+			// The original comment here says "If the position is near
+			// the end of the buffer, extend the buffer to make
+			// string comparison easier."
+			//
+			// That's a little misleading, because the "end" of the 
+			// buffer is really what we consider to be the "beginning"
+			// of the buffer, that is, positions 0 through F.
+			//
+			// The idea is that the front end of the buffer is duplicated
+			// into the back end so that when you're looking at characters
+			// at the back end of the buffer, you can index ahead (beyond
+			// the normal end of the buffer) and see the characters
+			// that are at the front end of the buffer wihtout having
+			// to adjust the index.
+			//
+			// That is...
+			//
+			//	  1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234
+			//	  |							   |  |
+			//	  position 0		  end of buffer  |
+			//										 |
+			//				  duplicate of front of buffer
+
+			p->m_ring_buffer[s] = c;
+
+			if (s < F - 1) {
+				p->m_ring_buffer[s + N] = c;
+			}
+
+			// Increment the position, and wrap around when we're at
+			// the end.  Note that this relies on N being a power of 2.
+
+			s = (short int) ( (s + 1) & (N - 1) );
+			r = (short int) ( (r + 1) & (N - 1) );
+
+			// Register the string that is found in 
+			// m_ring_buffer[r..r+F-1].
+
+			p->InsertNode(r);
+		}
+
+		// If we didn't quit because we hit the last_match_length,
+		// then we must have quit because we ran out of characters
+		// to process.
+
+		while (i++ < last_match_length) {							  
+			p->DeleteNode(s);
+
+			s = (short int) ( (s + 1) & (N - 1) );
+			r = (short int) ( (r + 1) & (N - 1) );
+
+			// Note that len hitting 0 is the key that causes the
+			// do...while() to terminate.  This is the only place
+			// within the loop that len is modified.
+			//
+			// Its original value is F (or a number less than F for
+			// short strings).
+
+			if (--len) {
+				p->InsertNode(r);	   /* buffer may not be empty. */
+			}
+		}
+
+		// End of do...while() loop.  Continue processing until there
+		// are no more characters to be compressed.  The variable
+		// "len" is used to signal this condition.
+	} while (len > 0);
+
+	// There could still be something in the output buffer.  Send it
+	// now.
+
+	if (code_buf_pos > 1) {
+		// code_buf is the encoded string to send.
+		// code_buf_ptr is the number of characters.
+
+		SendChars((char *) code_buf, code_buf_pos);
+	}
+
+
+	// must set zlen for parent class to know length of compressed buffer
+	zlen = zpos;
+}
+
+
+/******************************************************************************
+ * LZSSCompress::Decode	- This function "decodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ */
+
+void LZSSCompress::Decode(void)
+{
+	int k;
+	int r;							  // node number
+	unsigned char c[F];				 // an array of chars
+	unsigned char flags;				// 8 bits of flags
+	int flag_count;					 // which flag we're on
+	short int pos;					  // position in the ring buffer
+	short int len;					  // number of chars in ring buffer
+	unsigned long totalLen = 0;
+
+	direct = 1;	// set direction needed by parent [Get|Send]Chars()
+
+	// Initialize the ring buffer with a common string.
+	//
+	// Note that the last F bytes of the ring buffer are not filled.
+
+	memset(p->m_ring_buffer, ' ', N - F);
+	
+	r = N - F;
+
+	flags = (char) 0;
+	flag_count = 0;
+
+	for ( ; ; ) {
+
+		// If there are more bits of interest in this flag, then
+		// shift that next interesting bit into the 1's position.
+		//
+		// If this flag has been exhausted, the next byte must 
+		// be a flag.
+
+		if (flag_count > 0) {
+			flags = (unsigned char) (flags >> 1);
+			flag_count--;
+		}
+		else {
+			// Next byte must be a flag.
+
+			if (GetChars((char *) &flags, 1) != 1)
+				break;
+
+			// Set the flag counter.  While at first it might appear
+			// that this should be an 8 since there are 8 bits in the
+			// flag, it should really be a 7 because the shift must
+			// be performed 7 times in order to see all 8 bits.
+
+			flag_count = 7;
+		}
+
+		// If the low order bit of the flag is now set, then we know
+		// that the next byte is a single, unencoded character.
+
+		if (flags & 1) {
+			if (GetChars((char *) c, 1) != 1)
+				break;
+
+			if (SendChars((char *) c, 1) != 1) {
+				break;
+			}
+			totalLen++;
+
+			// Add to buffer, and increment to next spot. Wrap at end.
+
+			p->m_ring_buffer[r] = c[0];
+			r = (short int) ( (r + 1) & (N - 1) );
+		}
+
+		// Otherwise, we know that the next two bytes are a
+		// <position,length> pair.  The position is in 12 bits and
+		// the length is in 4 bits.
+
+		else {
+			// Original code:
+			//  if ((i = getc(infile)) == EOF)
+			//	  break;
+			//  if ((j = getc(infile)) == EOF)
+			//	  break;
+			//  i |= ((j & 0xf0) << 4);	
+			//  j = (j & 0x0f) + THRESHOLD;
+			//
+			// I've modified this to only make one input call, and
+			// have changed the variable names to something more
+			// obvious.
+
+			if (GetChars((char *) c, 2) != 2)
+				break;
+
+			// Convert these two characters into the position and
+			// length.  Note that the length is always at least
+			// THRESHOLD, which is why we're able to get a length
+			// of 18 out of only 4 bits.
+
+			pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) );
+
+			len = (short int) ( (c[1] & 0x0f) + THRESHOLD );
+
+			// There are now "len" characters at position "pos" in
+			// the ring buffer that can be pulled out.  Note that
+			// len is never more than F.
+
+			for (k = 0; k < len; k++) {
+				c[k] = p->m_ring_buffer[(pos + k) & (N - 1)];
+
+				// Add to buffer, and increment to next spot. Wrap at end.
+
+				p->m_ring_buffer[r] = c[k];
+				r = (short int) ( (r + 1) & (N - 1) );
+			}
+
+			// Add the "len" :characters to the output stream.
+
+			if (SendChars((char *) c, len) != (unsigned int)len) {
+				break;
+			}
+			totalLen += len;
+		}
+	}
+	slen = totalLen;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/lzsscomprs.txt b/src/modules/common/lzsscomprs.txt
new file mode 100644
index 0000000..b6817f2
--- /dev/null
+++ b/src/modules/common/lzsscomprs.txt
@@ -0,0 +1,802 @@
+The following is the original information send from Parson's Technologies via
+Craig Rairden.
+_______________________________________________________________________________
+Compression Info, 10-11-95
+Jeff Wheeler
+
+Source of Algorithm
+-------------------
+
+The compression algorithms used here are based upon the algorithms developed
+and published by Haruhiko Okumura in a paper entitled "Data Compression
+Algorithms of LARC and LHarc."  This paper discusses three compression
+algorithms, LSZZ, LZARI, and LZHUF.  LZSS is described as the "first" of
+these, and is described as providing moderate compression with good speed. 
+LZARI is described as an improved LZSS, a combination of the LZSS algorithm
+with adaptive arithmetic compression.  It is described as being slower than
+LZSS but with better compression.  LZHUF (the basis of the common LHA
+compression program) was included in the paper, however, a free usage license
+was not included. 
+
+The following are copies of the statements included at the beginning of each
+source code listing that was supplied in the working paper.
+
+        LZSS, dated 4/6/89, marked as "Use, distribute and
+        modify this program freely."
+
+        LZARI, dated 4/7/89, marked as "Use, distribute and
+        modify this program freely."
+
+        LZHUF, dated 11/20/88, written by Haruyasu Yoshizaki,
+        translated by Haruhiko Okumura on 4/7/89.  Not
+        expressly marked as redistributable or modifiable.
+
+Since both LZSS and LZARI are marked as "use, distribute and modify freely" we
+have felt at liberty basing our compression algorithm on either of these.
+
+Selection of Algorithm
+----------------------
+
+Working samples of three possible compression algorithms are supplied in
+Okumura's paper.  Which should be used?
+
+LZSS is the fastest at decompression, but does not generated as small a
+compressed file as the other methods. The other two methods provided, perhaps,
+a 15% improvement in compression.  Or, put another way, on a 100K file, LZSS
+might compress it to 50K while the others might approach 40-45K.  For STEP
+purposes, it was decided that decoding speed was of more importance than
+tighter compression. For these reasons, the first compression algorithm
+implemented is the LZSS algorithm.
+
+About LZSS Encoding
+-------------------
+
+(adapted from Haruhiko Okumura's paper)
+
+This scheme was proposed by Ziv and Lempel [1].  A slightly modified version
+is described by Storer and Szymanski [2]. An implementation using a binary
+tree has been proposed by Bell [3].
+
+The algorithm is quite simple.
+1. Keep a ring buffer which initially contains all space characters.
+2. Read several letters from the file to the buffer.
+3. Search the buffer for the longest string that matches the letters just
+   read, and send its length and position into the buffer.
+
+If the ring buffer is 4096 bytes, the position can be stored in 12 bits.  If the
+length is represented in 4 bits, the <position, length> pair is two bytes
+long.  If the longest match is no more than two characters, then just one
+character is sent without encoding.  The process starts again with the next
+character.  An extra bit is sent each time to tell the decoder whether the
+next item is a character of a <position, length> pair.
+
+[1] J. Ziv and A. Lempel, IEEE Transactions IT-23, 337-343 (1977).
+[2] J. A. Storer and T. G. Szymanski, J. ACM, 29, 928-951 (1982).
+[3] T.C. Gell, IEEE Transactions COM-34, 1176-1182 (1986).
+
+class SWCompress {
+public:
+void InitTree(                      // no return value
+    void);                          // no parameters
+
+void InsertNode(                    // no return value
+    short int Pos);                 // position in the buffer
+
+void DeleteNode(                    // no return value
+    short int Node);                // node to be removed
+
+void Encode(                        // no return value
+    void);                          // no parameters
+
+void Decode(                        // no return value
+    void);                          // no parameters
+};
+
+// The following are constant sizes used by the compression algorithm.
+//
+//  N         - This is the size of the ring buffer.  It is set
+//              to 4K.  It is important to note that a position
+//              within the ring buffer requires 12 bits.  
+//
+//  F         - This is the maximum length of a character sequence
+//              that can be taken from the ring buffer.  It is set
+//              to 18.  Note that a length must be 3 before it is
+//              worthwhile to store a position/length pair, so the
+//              length can be encoded in only 4 bits.  Or, put yet
+//              another way, it is not necessary to encode a length
+//              of 0-18, it is necessary to encode a length of
+//              3-18, which requires 4 bits.
+//              
+//  THRESHOLD - It takes 2 bytes to store an offset and
+//              a length.  If a character sequence only
+//              requires 1 or 2 characters to store 
+//              uncompressed, then it is better to store
+//              it uncompressed than as an offset into
+//              the ring buffer.
+//
+// Note that the 12 bits used to store the position and the 4 bits
+// used to store the length equal a total of 16 bits, or 2 bytes.
+
+#define N		4096
+#define F		18
+#define THRESHOLD	3
+#define NOT_USED	N
+
+// m_ring_buffer is a text buffer.  It contains "nodes" of
+// uncompressed text that can be indexed by position.  That is,
+// a substring of the ring buffer can be indexed by a position
+// and a length.  When decoding, the compressed text may contain
+// a position in the ring buffer and a count of the number of
+// bytes from the ring buffer that are to be moved into the
+// uncompressed buffer.  
+//
+// This ring buffer is not maintained as part of the compressed
+// text.  Instead, it is reconstructed dynamically.  That is,
+// it starts out empty and gets built as the text is decompressed.
+//
+// The ring buffer contain N bytes, with an additional F - 1 bytes
+// to facilitate string comparison.
+
+unsigned char m_ring_buffer[N + F - 1];
+
+// m_match_position and m_match_length are set by InsertNode().
+//
+// These variables indicate the position in the ring buffer 
+// and the number of characters at that position that match
+// a given string.
+
+short int m_match_position;
+short int m_match_length;
+
+// m_lson, m_rson, and m_dad are the Japanese way of referring to
+// a tree structure.  The dad is the parent and it has a right and
+// left son (child).
+//
+// For i = 0 to N-1, m_rson[i] and m_lson[i] will be the right 
+// and left children of node i.  
+//
+// For i = 0 to N-1, m_dad[i] is the parent of node i.
+//
+// For i = 0 to 255, rson[N + i + 1] is the root of the tree for 
+// strings that begin with the character i.  Note that this requires 
+// one byte characters.
+//
+// These nodes store values of 0...(N-1).  Memory requirements
+// can be reduces by using 2-byte integers instead of full 4-byte
+// integers (for 32-bit applications).  Therefore, these are 
+// defined as "short ints."
+
+short int m_lson[N + 1];
+short int m_rson[N + 257];
+short int m_dad[N + 1];
+
+
+
+
+/*
+ -------------------------------------------------------------------------
+    cLZSS::InitTree
+    
+    This function initializes the tree nodes to "empty" states. 
+ -------------------------------------------------------------------------
+*/
+
+void cLZSS::InitTree(               // no return value
+    void)                           // no parameters
+    throw()                         // exception list
+
+    {
+    int  i;
+
+    // For i = 0 to N - 1, m_rson[i] and m_lson[i] will be the right
+    // and left children of node i.  These nodes need not be
+    // initialized.  However, for debugging purposes, it is nice to
+    // have them initialized.  Since this is only used for compression
+    // (not decompression), I don't mind spending the time to do it.
+    //
+    // For the same range of i, m_dad[i] is the parent of node i.
+    // These are initialized to a known value that can represent
+    // a "not used" state.
+    
+    for (i = 0; i < N; i++)
+        {
+        m_lson[i] = NOT_USED;
+        m_rson[i] = NOT_USED;
+        m_dad[i] = NOT_USED;
+        }
+
+    // For i = 0 to 255, m_rson[N + i + 1] is the root of the tree
+    // for strings that begin with the character i.  This is why
+    // the right child array is larger than the left child array.
+    // These are also initialzied to a "not used" state.
+    //
+    // Note that there are 256 of these, one for each of the possible
+    // 256 characters.
+
+    for (i = N + 1; i <= (N + 256); i++)
+        {
+        m_rson[i] = NOT_USED;
+        }
+
+    // Done.
+    }
+
+/*
+ -------------------------------------------------------------------------
+    cLZSS::InsertNode
+    
+    This function inserts a string from the ring buffer into one of
+    the trees.  It loads the match position and length member variables
+    for the longest match.
+    
+    The string to be inserted is identified by the parameter Pos,
+    A full F bytes are inserted.  So, m_ring_buffer[Pos ... Pos+F-1]
+    are inserted.
+
+    If the matched length is exactly F, then an old node is removed
+    in favor of the new one (because the old one will be deleted
+    sooner).
+
+    Note that Pos plays a dual role.  It is used as both a position
+    in the ring buffer and also as a tree node.  m_ring_buffer[Pos]
+    defines a character that is used to identify a tree node.
+ -------------------------------------------------------------------------
+*/
+
+void cLZSS::InsertNode(                 // no return value
+    short int Pos)                      // position in the buffer
+    throw()                             // exception list
+
+    {
+    short int i;
+    short int p;
+    int cmp;
+    unsigned char * key;
+
+    ASSERT(Pos >= 0);
+    ASSERT(Pos < N);
+
+    cmp = 1;
+    key = &(m_ring_buffer[Pos]);
+
+    // The last 256 entries in m_rson contain the root nodes for
+    // strings that begin with a letter.  Get an index for the
+    // first letter in this string.
+
+    p = (short int) (N + 1 + key[0]);
+
+    // Set the left and right tree nodes for this position to "not
+    // used."
+
+    m_lson[Pos] = NOT_USED;
+    m_rson[Pos] = NOT_USED;
+
+    // Haven't matched anything yet.
+
+    m_match_length = 0;
+
+    for ( ; ; )
+        {
+        if (cmp >= 0)
+            {
+            if (m_rson[p] != NOT_USED)
+                {
+                p = m_rson[p];
+                }
+            else
+                {
+                m_rson[p] = Pos;
+                m_dad[Pos] = p;
+                return;
+                }
+            }
+        else
+            {
+            if (m_lson[p] != NOT_USED)
+                {
+                p = m_lson[p];
+                }
+            else
+                {
+                m_lson[p] = Pos;
+                m_dad[Pos] = p;
+                return;
+                }
+            }
+
+        // Should we go to the right or the left to look for the
+        // next match?
+
+        for (i = 1; i < F; i++)
+            {
+            cmp = key[i] - m_ring_buffer[p + i];
+            if (cmp != 0)
+                break;
+            }
+
+        if (i > m_match_length)
+            {
+            m_match_position = p;
+            m_match_length = i;
+
+            if (i >= F)
+                break;
+            }
+        }
+
+    m_dad[Pos] = m_dad[p];
+    m_lson[Pos] = m_lson[p];
+    m_rson[Pos] = m_rson[p];
+
+    m_dad[ m_lson[p] ] = Pos;
+    m_dad[ m_rson[p] ] = Pos;
+
+    if (m_rson[ m_dad[p] ] == p)
+        {
+        m_rson[ m_dad[p] ] = Pos;
+        }
+    else
+        {
+        m_lson[ m_dad[p] ] = Pos;
+        }
+
+    // Remove "p"
+
+    m_dad[p] = NOT_USED;
+    }
+
+/*
+ -------------------------------------------------------------------------
+    cLZSS::DeleteNode   
+
+    This function removes the node "Node" from the tree.
+ -------------------------------------------------------------------------
+*/
+
+void cLZSS::DeleteNode(                 // no return value
+    short int Node)                     // node to be removed
+    throw()                             // exception list
+
+    {
+    short int  q;
+
+    ASSERT(Node >= 0);
+    ASSERT(Node < (N+1));
+
+    if (m_dad[Node] == NOT_USED)
+        {
+        // not in tree, nothing to do
+        return;
+        }
+
+    if (m_rson[Node] == NOT_USED)
+        {
+        q = m_lson[Node];
+        }
+    else if (m_lson[Node] == NOT_USED)
+        {
+        q = m_rson[Node];
+        }
+    else
+        {
+        q = m_lson[Node];
+        if (m_rson[q] != NOT_USED)
+            {
+            do
+                {
+                q = m_rson[q];
+                }
+            while (m_rson[q] != NOT_USED);
+
+            m_rson[ m_dad[q] ] = m_lson[q];
+            m_dad[ m_lson[q] ] = m_dad[q];
+            m_lson[q] = m_lson[Node];
+            m_dad[ m_lson[Node] ] = q;
+            }
+
+        m_rson[q] = m_rson[Node];
+        m_dad[ m_rson[Node] ] = q;
+        }
+
+    m_dad[q] = m_dad[Node];
+
+    if (m_rson[ m_dad[Node] ] == Node)
+        {
+        m_rson[ m_dad[Node] ] = q;
+        }
+    else
+        {
+        m_lson[ m_dad[Node] ] = q;
+        }
+
+    m_dad[Node] = NOT_USED;
+    }
+
+/*
+ -------------------------------------------------------------------------
+    cLZSS::Encode
+
+    This function "encodes" the input stream into the output stream.
+    The GetChars() and SendChars() functions are used to separate
+    this method from the actual i/o.
+ -------------------------------------------------------------------------
+*/
+
+void cLZSS::Encode(                     // no return value
+    void)                               // no parameters
+
+    {
+    short int i;                        // an iterator
+    short int r;                        // node number in the binary tree
+    short int s;                        // position in the ring buffer
+    unsigned short int len;             // len of initial string
+    short int last_match_length;        // length of last match
+    short int code_buf_pos;             // position in the output buffer
+    unsigned char code_buf[17];         // the output buffer
+    unsigned char mask;                 // bit mask for byte 0 of out buf
+    unsigned char c;                    // character read from string
+
+    // Start with a clean tree.
+
+    InitTree();
+
+    // code_buf[0] works as eight flags.  A "1" represents that the
+    // unit is an unencoded letter (1 byte), and a "0" represents
+    // that the next unit is a <position,length> pair (2 bytes).
+    //
+    // code_buf[1..16] stores eight units of code.  Since the best
+    // we can do is store eight <position,length> pairs, at most 16 
+    // bytes are needed to store this.
+    //
+    // This is why the maximum size of the code buffer is 17 bytes.
+
+    code_buf[0] = 0;
+    code_buf_pos = 1;
+
+    // Mask iterates over the 8 bits in the code buffer.  The first
+    // character ends up being stored in the low bit.
+    //
+    //  bit   8   7   6   5   4   3   2   1
+    //        |                           |
+    //        |             first sequence in code buffer
+    //        |
+    //      last sequence in code buffer        
+
+    mask = 1;
+
+    s = 0;
+    r = (short int) N - (short int) F;
+
+    // Initialize the ring buffer with spaces...
+
+    // Note that the last F bytes of the ring buffer are not filled.
+    // This is because those F bytes will be filled in immediately
+    // with bytes from the input stream.
+
+    memset(m_ring_buffer, ' ', N - F);
+    
+    // Read F bytes into the last F bytes of the ring buffer.
+    //
+    // This function loads the buffer with X characters and returns
+    // the actual amount loaded.
+
+    len = GetChars(&(m_ring_buffer[r]), F);
+
+    // Make sure there is something to be compressed.
+
+    if (len == 0)
+        return;
+
+    // Insert the F strings, each of which begins with one or more
+    // 'space' characters.  Note the order in which these strings
+    // are inserted.  This way, degenerate trees will be less likely
+    // to occur.
+
+    for (i = 1; i <= F; i++)
+        {
+        InsertNode((short int) (r - i));
+        }
+
+    // Finally, insert the whole string just read.  The
+    // member variables match_length and match_position are set.
+
+    InsertNode(r);
+
+    // Now that we're preloaded, continue till done.
+
+    do
+        {
+
+        // m_match_length may be spuriously long near the end of
+        // text.
+
+        if (m_match_length > len)
+            {
+            m_match_length = len;
+            }
+
+        // Is it cheaper to store this as a single character?  If so,
+        // make it so.
+
+        if (m_match_length < THRESHOLD)
+            {
+            // Send one character.  Remember that code_buf[0] is the
+            // set of flags for the next eight items.
+
+            m_match_length = 1;     
+            code_buf[0] |= mask;  
+            code_buf[code_buf_pos++] = m_ring_buffer[r];
+            }
+
+        // Otherwise, we do indeed have a string that can be stored
+        // compressed to save space.
+
+        else
+            {
+            // The next 16 bits need to contain the position (12 bits)
+            // and the length (4 bits).
+
+            code_buf[code_buf_pos++] = (unsigned char) m_match_position;
+            code_buf[code_buf_pos++] = (unsigned char) (
+                ((m_match_position >> 4) & 0xf0) | 
+                (m_match_length - THRESHOLD) );
+            }
+
+        // Shift the mask one bit to the left so that it will be ready
+        // to store the new bit.
+
+        mask = (unsigned char) (mask << 1);
+
+        // If the mask is now 0, then we know that we have a full set
+        // of flags and items in the code buffer.  These need to be
+        // output.
+
+        if (mask == 0)
+            {
+            // code_buf is the buffer of characters to be output.
+            // code_buf_pos is the number of characters it contains.
+
+            SendChars(code_buf, code_buf_pos);
+
+            // Reset for next buffer...
+
+            code_buf[0] = 0;
+            code_buf_pos = 1;
+            mask = 1;
+            }
+
+        last_match_length = m_match_length;
+
+        // Delete old strings and read new bytes...
+
+        for (i = 0; i < last_match_length; i++)
+            {
+
+            // Get next character...
+
+            if (GetChars(&c, 1) != 1)
+                break;
+
+            // Delete "old strings"
+
+            DeleteNode(s);
+
+            // Put this character into the ring buffer.
+            //          
+            // The original comment here says "If the position is near
+            // the end of the buffer, extend the buffer to make
+            // string comparison easier."
+            //
+            // That's a little misleading, because the "end" of the 
+            // buffer is really what we consider to be the "beginning"
+            // of the buffer, that is, positions 0 through F.
+            //
+            // The idea is that the front end of the buffer is duplicated
+            // into the back end so that when you're looking at characters
+            // at the back end of the buffer, you can index ahead (beyond
+            // the normal end of the buffer) and see the characters
+            // that are at the front end of the buffer wihtout having
+            // to adjust the index.
+            //
+            // That is...
+            //
+            //      1234xxxxxxxxxxxxxxxxxxxxxxxxxxxxx1234
+            //      |                               |  |
+            //      position 0          end of buffer  |
+            //                                         |
+            //                  duplicate of front of buffer
+
+            m_ring_buffer[s] = c;
+
+            if (s < F - 1)
+                {
+                m_ring_buffer[s + N] = c;
+                }
+
+            // Increment the position, and wrap around when we're at
+            // the end.  Note that this relies on N being a power of 2.
+
+            s = (short int) ( (s + 1) & (N - 1) );
+            r = (short int) ( (r + 1) & (N - 1) );
+
+            // Register the string that is found in 
+            // m_ring_buffer[r..r+F-1].
+
+            InsertNode(r);
+            }
+
+        // If we didn't quit because we hit the last_match_length,
+        // then we must have quit because we ran out of characters
+        // to process.
+
+        while (i++ < last_match_length)
+            {                              
+            DeleteNode(s);
+
+            s = (short int) ( (s + 1) & (N - 1) );
+            r = (short int) ( (r + 1) & (N - 1) );
+
+            // Note that len hitting 0 is the key that causes the
+            // do...while() to terminate.  This is the only place
+            // within the loop that len is modified.
+            //
+            // Its original value is F (or a number less than F for
+            // short strings).
+
+            if (--len)
+                {
+                InsertNode(r);       /* buffer may not be empty. */
+                }
+            }
+
+        // End of do...while() loop.  Continue processing until there
+        // are no more characters to be compressed.  The variable
+        // "len" is used to signal this condition.
+        }
+    while (len > 0);
+
+    // There could still be something in the output buffer.  Send it
+    // now.
+
+    if (code_buf_pos > 1)
+        {
+        // code_buf is the encoded string to send.
+        // code_buf_ptr is the number of characters.
+
+        SendChars(code_buf, code_buf_pos);
+        }
+
+    // Done!
+    }
+
+/*
+ -------------------------------------------------------------------------
+    cLZSS::Decode   
+
+    This function "decodes" the input stream into the output stream.
+    The GetChars() and SendChars() functions are used to separate
+    this method from the actual i/o.
+ -------------------------------------------------------------------------
+*/
+
+void cLZSS::Decode(                     // no return value
+    void)                               // no parameters
+
+    {
+    int k;
+    int r;                              // node number
+    unsigned char c[F];                 // an array of chars
+    unsigned char flags;                // 8 bits of flags
+    int flag_count;                     // which flag we're on
+    short int pos;                      // position in the ring buffer
+    short int len;                      // number of chars in ring buffer
+
+    // Initialize the ring buffer with a common string.
+    //
+    // Note that the last F bytes of the ring buffer are not filled.
+
+    memset(m_ring_buffer, ' ', N - F);
+    
+    r = N - F;
+
+    flags = (char) 0;
+    flag_count = 0;
+
+    for ( ; ; )
+        {
+
+        // If there are more bits of interest in this flag, then
+        // shift that next interesting bit into the 1's position.
+        //
+        // If this flag has been exhausted, the next byte must 
+        // be a flag.
+
+        if (flag_count > 0)
+            {
+            flags = (unsigned char) (flags >> 1);
+            flag_count--;
+            }
+        else
+            {
+            // Next byte must be a flag.
+
+            if (GetChars(&flags, 1) != 1)
+                break;
+
+            // Set the flag counter.  While at first it might appear
+            // that this should be an 8 since there are 8 bits in the
+            // flag, it should really be a 7 because the shift must
+            // be performed 7 times in order to see all 8 bits.
+
+            flag_count = 7;
+            }
+
+        // If the low order bit of the flag is now set, then we know
+        // that the next byte is a single, unencoded character.
+
+        if (flags & 1)
+            {
+            if (GetChars(c, 1) != 1)
+                break;
+
+            if (SendChars(c, 1) != 1)
+                break;
+
+            // Add to buffer, and increment to next spot. Wrap at end.
+
+            m_ring_buffer[r] = c[0];
+            r = (short int) ( (r + 1) & (N - 1) );
+            }
+
+        // Otherwise, we know that the next two bytes are a
+        // <position,length> pair.  The position is in 12 bits and
+        // the length is in 4 bits.
+
+        else
+            {
+            // Original code:
+            //  if ((i = getc(infile)) == EOF)
+            //      break;
+            //  if ((j = getc(infile)) == EOF)
+            //      break;
+            //  i |= ((j & 0xf0) << 4);    
+            //  j = (j & 0x0f) + THRESHOLD;
+            //
+            // I've modified this to only make one input call, and
+            // have changed the variable names to something more
+            // obvious.
+
+            if (GetChars(c, 2) != 2)
+                break;
+
+            // Convert these two characters into the position and
+            // length.  Note that the length is always at least
+            // THRESHOLD, which is why we're able to get a length
+            // of 18 out of only 4 bits.
+
+            pos = (short int) ( c[0] | ((c[1] & 0xf0) << 4) );
+
+            len = (short int) ( (c[1] & 0x0f) + THRESHOLD );
+
+            // There are now "len" characters at position "pos" in
+            // the ring buffer that can be pulled out.  Note that
+            // len is never more than F.
+
+            for (k = 0; k < len; k++)
+                {
+                c[k] = m_ring_buffer[(pos + k) & (N - 1)];
+
+                // Add to buffer, and increment to next spot. Wrap at end.
+
+                m_ring_buffer[r] = c[k];
+                r = (short int) ( (r + 1) & (N - 1) );
+                }
+
+            // Add the "len" characters to the output stream.
+
+            if (SendChars(c, len) != len)
+                break;
+            }
+        }
+    }
+
diff --git a/src/modules/common/rawstr.cpp b/src/modules/common/rawstr.cpp
new file mode 100644
index 0000000..788ab6e
--- /dev/null
+++ b/src/modules/common/rawstr.cpp
@@ -0,0 +1,529 @@
+/******************************************************************************
+ *
+ *  rawstr.cpp -	code for class 'RawStr'- a module that reads raw text
+ *			files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *			and provides lookup and parsing functions based on
+ *			class StrKey
+ *
+ * $Id: rawstr.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <stdlib.h>
+#include <utilstr.h>
+#include <rawstr.h>
+#include <sysdata.h>
+#include <swlog.h>
+#include <filemgr.h>
+#include <swbuf.h>
+#include <stringmgr.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * RawStr Statics
+ */
+
+int RawStr::instance = 0;
+char RawStr::nl = '\n';
+const int RawStr::IDXENTRYSIZE = 6;
+
+
+
+/******************************************************************************
+ * RawStr Constructor - Initializes data for instance of RawStr
+ *
+ * ENT:	ipath - path of the directory where data and index files are located.
+ *		be sure to include the trailing separator (e.g. '/' or '\')
+ *		(e.g. 'modules/texts/rawtext/webster/')
+ */
+
+RawStr::RawStr(const char *ipath, int fileMode, bool caseSensitive) : caseSensitive(caseSensitive)
+{
+	SWBuf buf;
+
+	lastoff = -1;
+	path = 0;
+	stdstr(&path, ipath);
+
+	if (fileMode == -1) { // try read/write if possible
+		fileMode = FileMgr::RDWR;
+	}
+		
+	buf.setFormatted("%s.idx", path);
+	idxfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s.dat", path);
+	datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	if (datfd < 0) {
+		SWLog::getSystemLog()->logError("%d", errno);
+	}
+
+	instance++;
+}
+
+
+/******************************************************************************
+ * RawStr Destructor - Cleans up instance of RawStr
+ */
+
+RawStr::~RawStr()
+{
+	if (path)
+		delete [] path;
+
+	--instance;
+
+	FileMgr::getSystemFileMgr()->close(idxfd);
+	FileMgr::getSystemFileMgr()->close(datfd);
+}
+
+
+/******************************************************************************
+ * RawStr::getidxbufdat	- Gets the index string at the given idx offset
+ *						NOTE: buf is allocated and must be freed by
+ *							calling function
+ *
+ * ENT:	ioffset	- offset in dat file to lookup
+ *		buf		- address of pointer to allocate for storage of string
+ */
+
+void RawStr::getIDXBufDat(long ioffset, char **buf) const
+{
+	int size;
+	char ch;
+	if (datfd > 0) {
+		datfd->seek(ioffset, SEEK_SET);
+		for (size = 0; datfd->read(&ch, 1) == 1; size++) {
+			if ((ch == '\\') || (ch == 10) || (ch == 13))
+				break;
+		}
+		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
+		if (size) {
+			datfd->seek(ioffset, SEEK_SET);
+			datfd->read(*buf, size);
+		}
+		(*buf)[size] = 0;
+		if (!caseSensitive) toupperstr_utf8(*buf, size*2);
+	}
+	else {
+		*buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1);
+		**buf = 0;
+	}
+}
+
+
+/******************************************************************************
+ * RawStr::getidxbuf	- Gets the index string at the given idx offset
+ *						NOTE: buf is allocated and must be freed by
+ *							calling function
+ *
+ * ENT:	ioffset	- offset in idx file to lookup
+ *		buf		- address of pointer to allocate for storage of string
+ */
+
+void RawStr::getIDXBuf(long ioffset, char **buf) const
+{
+	__u32 offset;
+	
+	if (idxfd > 0) {
+		idxfd->seek(ioffset, SEEK_SET);
+		idxfd->read(&offset, 4);
+
+		offset = swordtoarch32(offset);
+
+		getIDXBufDat(offset, buf);
+	}
+}
+
+
+/******************************************************************************
+ * RawStr::findoffset	- Finds the offset of the key string from the indexes
+ *
+ * ENT:	key		- key string to lookup
+ *		start	- address to store the starting offset
+ *		size		- address to store the size of the entry
+ *		away		- number of entries before of after to jump
+ *					(default = 0)
+ *
+ * RET: error status -1 general error; -2 new file
+ */
+
+signed char RawStr::findOffset(const char *ikey, __u32 *start, __u16 *size, long away, __u32 *idxoff) const
+{
+	char *trybuf, *maxbuf, *key = 0, quitflag = 0;
+	signed char retval = -1;
+	long headoff, tailoff, tryoff = 0, maxoff = 0;
+	int diff = 0;
+	bool awayFromSubstrCheck = false;	
+
+	if (idxfd->getFd() >=0) {
+		tailoff = maxoff = idxfd->seek(0, SEEK_END) - 6;
+		retval = (tailoff >= 0) ? 0 : -2;	// if NOT new file
+		if (*ikey && retval != -2) {
+			headoff = 0;
+
+			stdstr(&key, ikey, 3);
+			if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3);
+
+			int keylen = strlen(key);
+			bool substr = false;
+
+			trybuf = maxbuf = 0;
+			getIDXBuf(maxoff, &maxbuf);
+                        
+			while (headoff < tailoff) {
+				tryoff = (lastoff == -1) ? headoff + ((((tailoff / 6) - (headoff / 6))) / 2) * 6 : lastoff;
+				lastoff = -1;
+				getIDXBuf(tryoff, &trybuf);
+
+				if (!*trybuf && tryoff) {		// In case of extra entry at end of idx (not first entry)
+					tryoff += (tryoff > (maxoff / 2))?-6:6;
+					retval = -1;
+					break;
+				}
+
+				diff = strcmp(key, trybuf);
+
+				if (!diff)
+					break;
+
+				if (!strncmp(trybuf, key, keylen)) substr = true;
+
+				if (diff < 0)
+					tailoff = (tryoff == headoff) ? headoff : tryoff;
+				else headoff = tryoff;
+
+				if (tailoff == headoff + 6) {
+					if (quitflag++)
+						headoff = tailoff;
+				}
+			}
+
+			// didn't find exact match
+			if (headoff >= tailoff) {
+				tryoff = headoff;
+				if (!substr && ((tryoff != maxoff)||(strncmp(key, maxbuf, keylen)<0))) {
+					awayFromSubstrCheck = true;
+					away--;	// if our entry doesn't startwith our key, prefer the previous entry over the next
+				}
+			}
+			if (trybuf)
+				free(trybuf);
+			delete [] key;
+                        if (maxbuf)
+                        	free(maxbuf);
+		}
+		else	tryoff = 0;
+
+		idxfd->seek(tryoff, SEEK_SET);
+
+		__u32 tmpStart;
+		__u16 tmpSize;
+		*start = *size = tmpStart = tmpSize = 0;
+		idxfd->read(&tmpStart, 4);
+		idxfd->read(&tmpSize, 2);
+		if (idxoff)
+			*idxoff = tryoff;
+
+		*start = swordtoarch32(tmpStart);
+		*size  = swordtoarch16(tmpSize);
+
+		while (away) {
+			unsigned long laststart = *start;
+			unsigned short lastsize = *size;
+			long lasttry = tryoff;
+			tryoff += (away > 0) ? 6 : -6;
+		
+			bool bad = false;
+			if (((tryoff + (away*6)) < -6) || (tryoff + (away*6) > (maxoff+6)))
+				bad = true;
+			else if (idxfd->seek(tryoff, SEEK_SET) < 0)
+				bad = true;
+			if (bad) {
+				if(!awayFromSubstrCheck)
+					retval = -1;
+				*start = laststart;
+				*size = lastsize;
+				tryoff = lasttry;
+				if (idxoff)
+					*idxoff = tryoff;
+				break;
+			}
+			idxfd->read(&tmpStart, 4);
+			idxfd->read(&tmpSize, 2);
+			if (idxoff)
+				*idxoff = tryoff;
+
+			*start = swordtoarch32(tmpStart);
+			*size  = swordtoarch16(tmpSize);
+
+			if (((laststart != *start) || (lastsize != *size)) && (*size))
+				away += (away < 0) ? 1 : -1;
+		}
+	
+		lastoff = tryoff;
+	}
+	else {
+		*start = 0;
+		*size  = 0;
+		if (idxoff)
+			*idxoff = 0;
+		retval = -1;
+	}
+	return retval;
+}
+
+
+/******************************************************************************
+ * RawStr::readtext	- gets text at a given offset
+ *
+ * ENT:
+ *	start	- starting offset where the text is located in the file
+ *	size		- size of text entry
+ *	buf		- buffer to store text
+ *
+ */
+
+void RawStr::readText(__u32 istart, __u16 *isize, char **idxbuf, SWBuf &buf) const
+{
+	unsigned int ch;
+	char *idxbuflocal = 0;
+	getIDXBufDat(istart, &idxbuflocal);
+	__u32 start = istart;
+
+	do {
+		if (*idxbuf)
+			delete [] *idxbuf;
+
+		buf = "";
+		buf.setFillByte(0);
+		buf.setSize(++(*isize));
+
+		*idxbuf = new char [ (*isize) ];
+
+		datfd->seek(start, SEEK_SET);
+		datfd->read(buf.getRawData(), (int)((*isize) - 1));
+
+		for (ch = 0; buf[ch]; ch++) {		// skip over index string
+			if (buf[ch] == 10) {
+				ch++;
+				break;
+			}
+		}
+		buf = SWBuf(buf.c_str()+ch);
+		// resolve link
+		if (!strncmp(buf.c_str(), "@LINK", 5)) {
+			for (ch = 0; buf[ch]; ch++) {		// null before nl
+				if (buf[ch] == 10) {
+					buf[ch] = 0;
+					break;
+				}
+			}
+			findOffset(buf.c_str() + 6, &start, isize);
+		}
+		else break;
+	}
+	while (true);	// while we're resolving links
+
+	if (idxbuflocal) {
+		int localsize = strlen(idxbuflocal);
+		localsize = (localsize < (*isize - 1)) ? localsize : (*isize - 1);
+		strncpy(*idxbuf, idxbuflocal, localsize);
+		(*idxbuf)[localsize] = 0;
+		free(idxbuflocal);
+	}
+}
+
+
+/******************************************************************************
+ * RawLD::settext	- Sets text for current offset
+ *
+ * ENT: key	- key for this entry
+ *	buf	- buffer to store
+ *      len     - length of buffer (0 - null terminated)
+ */
+
+void RawStr::doSetText(const char *ikey, const char *buf, long len)
+{
+
+	__u32 start, outstart;
+	__u32 idxoff;
+	__u32 endoff;
+	__s32 shiftSize;
+	__u16 size;
+	__u16 outsize;
+	static const char nl[] = {13, 10};
+	char *tmpbuf = 0;
+	char *key = 0;
+	char *dbKey = 0;
+	char *idxBytes = 0;
+	char *outbuf = 0;
+	char *ch = 0;
+
+	char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff);
+	stdstr(&key, ikey, 2);
+	if (!caseSensitive) toupperstr_utf8(key, strlen(key)*2);
+
+	len = (len < 0) ? strlen(buf) : len;
+
+	getIDXBufDat(start, &dbKey);
+
+	if (strcmp(key, dbKey) < 0) {
+	}
+	else if (strcmp(key, dbKey) > 0) {
+		if (errorStatus != (char)-2)	// not a new file
+			idxoff += 6;
+		else idxoff = 0;
+	}
+	else if ((!strcmp(key, dbKey)) && (len>0 /*we're not deleting*/)) { // got absolute entry
+		do {
+			tmpbuf = new char [ size + 2 ];
+			memset(tmpbuf, 0, size + 2);
+			datfd->seek(start, SEEK_SET);
+			datfd->read(tmpbuf, (int)(size - 1));
+
+			for (ch = tmpbuf; *ch; ch++) {		// skip over index string
+				if (*ch == 10) {
+					ch++;
+					break;
+				}
+			}
+			memmove(tmpbuf, ch, size - (unsigned short)(ch-tmpbuf));
+
+			// resolve link
+			if (!strncmp(tmpbuf, "@LINK", 5) && (len)) {
+				for (ch = tmpbuf; *ch; ch++) {		// null before nl
+					if (*ch == 10) {
+						*ch = 0;
+						break;
+					}
+				}
+				findOffset(tmpbuf + 6, &start, &size, 0, &idxoff);
+			}
+			else break;
+		}
+		while (true);	// while we're resolving links
+	}
+
+	endoff = idxfd->seek(0, SEEK_END);
+
+	shiftSize = endoff - idxoff;
+
+	if (shiftSize > 0) {
+		idxBytes = new char [ shiftSize ];
+		idxfd->seek(idxoff, SEEK_SET);
+		idxfd->read(idxBytes, shiftSize);
+	}
+
+	outbuf = new char [ len + strlen(key) + 5 ];
+	sprintf(outbuf, "%s%c%c", key, 13, 10);
+	size = strlen(outbuf);
+	memcpy(outbuf + size, buf, len);
+	size = outsize = size + (len);
+
+	start = outstart = datfd->seek(0, SEEK_END);
+
+	outstart = archtosword32(start);
+	outsize  = archtosword16(size);
+
+	idxfd->seek(idxoff, SEEK_SET);
+	if (len > 0) {
+		datfd->seek(start, SEEK_SET);
+		datfd->write(outbuf, (int)size);
+
+		// add a new line to make data file easier to read in an editor
+		datfd->write(&nl, 2);
+		
+		idxfd->write(&outstart, 4);
+		idxfd->write(&outsize, 2);
+		if (idxBytes) {
+			idxfd->write(idxBytes, shiftSize);
+			delete [] idxBytes;
+		}
+	}
+	else {	// delete entry
+		if (idxBytes) {
+			idxfd->write(idxBytes+6, shiftSize-6);
+			idxfd->seek(-1, SEEK_CUR);	// last valid byte
+			FileMgr::getSystemFileMgr()->trunc(idxfd);	// truncate index
+			delete [] idxBytes;
+		}
+	}
+
+	delete [] key;
+	delete [] outbuf;
+	free(dbKey);
+}
+
+
+/******************************************************************************
+ * RawLD::linkentry	- links one entry to another
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	destidxoff	- dest offset into .vss
+ *	srcidxoff		- source offset into .vss
+ */
+
+void RawStr::doLinkEntry(const char *destkey, const char *srckey) {
+	char *text = new char [ strlen(destkey) + 7 ];
+	sprintf(text, "@LINK %s", destkey);
+	doSetText(srckey, text);
+	delete [] text;
+}
+
+/******************************************************************************
+ * RawLD::CreateModule	- Creates new module files
+ *
+ * ENT: path	- directory to store module files
+ * RET: error status
+ */
+
+signed char RawStr::createModule(const char *ipath)
+{
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd, *fd2;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s.dat", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s.idx", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	delete [] path;
+	
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/rawstr4.cpp b/src/modules/common/rawstr4.cpp
new file mode 100644
index 0000000..e2ce899
--- /dev/null
+++ b/src/modules/common/rawstr4.cpp
@@ -0,0 +1,538 @@
+/******************************************************************************
+ *
+ *  rawstr4.cpp -	code for class 'RawStr'- a module that reads raw text
+ *			files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *			and provides lookup and parsing functions based on
+ *			class StrKey
+ *
+ * $Id: rawstr4.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include <utilstr.h>
+#include <rawstr4.h>
+#include <sysdata.h>
+#include <swlog.h>
+#include <filemgr.h>
+#include <swbuf.h>
+#include <stringmgr.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * RawStr Statics
+ */
+
+int RawStr4::instance = 0;
+const int RawStr4::IDXENTRYSIZE = 8;
+
+
+/******************************************************************************
+ * RawStr Constructor - Initializes data for instance of RawStr
+ *
+ * ENT:	ipath - path of the directory where data and index files are located.
+ *		be sure to include the trailing separator (e.g. '/' or '\')
+ *		(e.g. 'modules/texts/rawtext/webster/')
+ */
+
+RawStr4::RawStr4(const char *ipath, int fileMode, bool caseSensitive) : caseSensitive(caseSensitive)
+{
+	SWBuf buf;
+
+	nl = '\n';
+	lastoff = -1;
+	path = 0;
+	stdstr(&path, ipath);
+
+	if (fileMode == -1) { // try read/write if possible
+		fileMode = FileMgr::RDWR;
+	}
+		
+	buf.setFormatted("%s.idx", path);
+	idxfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s.dat", path);
+	datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	if (datfd < 0) {
+		SWLog::getSystemLog()->logError("%d", errno);
+	}
+
+	instance++;
+}
+
+
+/******************************************************************************
+ * RawStr Destructor - Cleans up instance of RawStr
+ */
+
+RawStr4::~RawStr4()
+{
+	if (path)
+		delete [] path;
+
+	--instance;
+
+	FileMgr::getSystemFileMgr()->close(idxfd);
+	FileMgr::getSystemFileMgr()->close(datfd);
+}
+
+
+/******************************************************************************
+ * RawStr4::getidxbufdat	- Gets the index string at the given idx offset
+ *						NOTE: buf is allocated and must be freed by
+ *							calling function
+ *
+ * ENT:	ioffset	- offset in dat file to lookup
+ *		buf		- address of pointer to allocate for storage of string
+ */
+
+void RawStr4::getIDXBufDat(long ioffset, char **buf) const
+{
+	int size;
+	char ch;
+	if (datfd > 0) {
+		datfd->seek(ioffset, SEEK_SET);
+		for (size = 0; datfd->read(&ch, 1) == 1; size++) {
+			if ((ch == '\\') || (ch == 10) || (ch == 13))
+				break;
+		}
+		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
+		if (size) {
+			datfd->seek(ioffset, SEEK_SET);
+			datfd->read(*buf, size);
+		}
+		(*buf)[size] = 0;
+		if (!caseSensitive) toupperstr_utf8(*buf, size*2);
+	}
+	else {
+		*buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1);
+		**buf = 0;
+	}
+}
+
+
+/******************************************************************************
+ * RawStr4::getidxbuf	- Gets the index string at the given idx offset
+ *						NOTE: buf is allocated and must be freed by
+ *							calling function
+ *
+ * ENT:	ioffset	- offset in idx file to lookup
+ *		buf		- address of pointer to allocate for storage of string
+ */
+
+void RawStr4::getIDXBuf(long ioffset, char **buf) const
+{
+	__u32 offset;
+	
+	if (idxfd > 0) {
+		idxfd->seek(ioffset, SEEK_SET);
+
+		idxfd->read(&offset, 4);
+		offset = swordtoarch32(offset);
+
+		getIDXBufDat(offset, buf);
+		
+/* What the heck is this supposed to do??????
+		for (trybuf = targetbuf = *buf; *trybuf; trybuf++, targetbuf++) {
+			*targetbuf = *trybuf;
+		}
+		*targetbuf = 0;
+		trybuf = 0;
+		if (!caseSensitive) toupperstr_utf8(targetbuf);
+*/
+	}
+}
+
+
+/******************************************************************************
+ * RawStr4::findoffset	- Finds the offset of the key string from the indexes
+ *
+ * ENT:	key		- key string to lookup
+ *		start	- address to store the starting offset
+ *		size		- address to store the size of the entry
+ *		away		- number of entries before of after to jump
+ *					(default = 0)
+ *
+ * RET: error status -1 general error; -2 new file
+ */
+
+signed char RawStr4::findOffset(const char *ikey, __u32 *start, __u32 *size, long away, __u32 *idxoff) const
+{
+	char *trybuf, *maxbuf, *key = 0, quitflag = 0;
+	signed char retval = -1;
+	long headoff, tailoff, tryoff = 0, maxoff = 0;
+	int diff = 0;
+	bool awayFromSubstrCheck = false;
+
+	if (idxfd->getFd() >=0) {
+		tailoff = maxoff = idxfd->seek(0, SEEK_END) - 8;
+
+		retval = (tailoff >= 0) ? 0 : -2;	// if NOT new file
+		if (*ikey && retval != -2) {
+			headoff = 0;
+
+			stdstr(&key, ikey, 3);
+			if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3);
+
+			int keylen = strlen(key);
+			bool substr = false;
+
+			trybuf = maxbuf = 0;
+			getIDXBuf(maxoff, &maxbuf);
+
+			while (headoff < tailoff) {
+				tryoff = (lastoff == -1) ? headoff + ((((tailoff / 8) - (headoff / 8))) / 2) * 8 : lastoff;
+				lastoff = -1;
+				getIDXBuf(tryoff, &trybuf);
+
+				if (!*trybuf && tryoff) {		// In case of extra entry at end of idx (not first entry)
+					tryoff += (tryoff > (maxoff / 2))?-8:8;
+					retval = -1;
+					break;
+				}
+
+				diff = strcmp(key, trybuf);
+
+				if (!diff)
+					break;
+
+				if (!strncmp(trybuf, key, keylen)) substr = true;
+
+				if (diff < 0)
+					tailoff = (tryoff == headoff) ? headoff : tryoff;
+				else headoff = tryoff;
+
+				if (tailoff == headoff + 8) {
+					if (quitflag++)
+						headoff = tailoff;
+				}
+			}
+
+			// didn't find exact match
+			if (headoff >= tailoff) {
+				tryoff = headoff;
+				if (!substr && ((tryoff != maxoff)||(strncmp(key, maxbuf, keylen)<0))) {
+					awayFromSubstrCheck = true;
+					away--;	// if our entry doesn't startwith our key, prefer the previous entry over the next
+				}
+			}
+			if (trybuf)
+				free(trybuf);
+			delete [] key;
+                        if (maxbuf)
+                        	free(maxbuf);
+		}
+		else	tryoff = 0;
+
+		idxfd->seek(tryoff, SEEK_SET);
+
+		__u32 tmpStart, tmpSize;
+		*start = *size = tmpStart = tmpSize = 0;
+		idxfd->read(&tmpStart, 4);
+		idxfd->read(&tmpSize, 4);
+		if (idxoff)
+			*idxoff = tryoff;
+
+		*start = swordtoarch32(tmpStart);
+		*size  = swordtoarch32(tmpSize);
+
+		while (away) {
+			unsigned long laststart = *start;
+			unsigned long lastsize = *size;
+			long lasttry = tryoff;
+			tryoff += (away > 0) ? 8 : -8;
+
+			bool bad = false;
+			if (((tryoff + (away*8)) < -8) || (tryoff + (away*8) > (maxoff+8)))
+				bad = true;
+			else if (idxfd->seek(tryoff, SEEK_SET) < 0)
+				bad = true;
+			if (bad) {
+				if(!awayFromSubstrCheck)
+					retval = -1;
+				*start = laststart;
+				*size = lastsize;
+				tryoff = lasttry;
+				if (idxoff)
+					*idxoff = tryoff;
+				break;
+			}
+			idxfd->read(&tmpStart, 4);
+			idxfd->read(&tmpSize, 4);
+			if (idxoff)
+				*idxoff = tryoff;
+
+			*start = swordtoarch32(tmpStart);
+			*size  = swordtoarch32(tmpSize);
+
+			if (((laststart != *start) || (lastsize != *size)) && (*size)) 
+				away += (away < 0) ? 1 : -1;
+		}
+	
+		lastoff = tryoff;
+	}
+	else {
+		*start = 0;
+		*size  = 0;
+		if (idxoff)
+			*idxoff = 0;
+		retval = -1;
+	}
+	return retval;
+}
+
+
+/******************************************************************************
+ * RawStr4::readtext	- gets text at a given offset
+ *
+ * ENT:
+ *	start	- starting offset where the text is located in the file
+ *	size		- size of text entry
+ *	buf		- buffer to store text
+ *
+ */
+
+void RawStr4::readText(__u32 istart, __u32 *isize, char **idxbuf, SWBuf &buf) const
+{
+	unsigned int ch;
+	char *idxbuflocal = 0;
+	getIDXBufDat(istart, &idxbuflocal);
+	__u32 start = istart;
+
+	do {
+		if (*idxbuf)
+			delete [] *idxbuf;
+
+		buf = "";
+		buf.setFillByte(0);
+		buf.setSize(++(*isize));
+
+		*idxbuf = new char [ (*isize) ];
+
+		datfd->seek(start, SEEK_SET);
+		datfd->read(buf.getRawData(), (int)((*isize) - 1));
+
+		for (ch = 0; buf[ch]; ch++) {		// skip over index string
+			if (buf[ch] == 10) {
+				ch++;
+				break;
+			}
+		}
+		buf = SWBuf(buf.c_str()+ch);
+		// resolve link
+		if (!strncmp(buf.c_str(), "@LINK", 5)) {
+			for (ch = 0; buf[ch]; ch++) {		// null before nl
+				if (buf[ch] == 10) {
+					buf[ch] = 0;
+					break;
+				}
+			}
+			findOffset(buf.c_str() + 6, &start, isize);
+		}
+		else break;
+	}
+	while (true);	// while we're resolving links
+
+	if (idxbuflocal) {
+		unsigned int localsize = strlen(idxbuflocal);
+		localsize = (localsize < (*isize - 1)) ? localsize : (*isize - 1);
+		strncpy(*idxbuf, idxbuflocal, localsize);
+		(*idxbuf)[localsize] = 0;
+		free(idxbuflocal);
+	}
+}
+
+
+/******************************************************************************
+ * RawLD::settext	- Sets text for current offset
+ *
+ * ENT: key	- key for this entry
+ *	buf	- buffer to store
+ *      len     - length of buffer (0 - null terminated)
+ */
+
+void RawStr4::doSetText(const char *ikey, const char *buf, long len) {
+
+	__u32 start, outstart;
+	__u32 idxoff;
+	__u32 endoff;
+	__s32 shiftSize;
+	__u32 size;
+	__u32 outsize;
+	static const char nl[] = {13, 10};
+	char *tmpbuf = 0;
+	char *key = 0;
+	char *dbKey = 0;
+	char *idxBytes = 0;
+	char *outbuf = 0;
+	char *ch = 0;
+
+	char errorStatus = findOffset(ikey, &start, &size, 0, &idxoff);
+	stdstr(&key, ikey, 3);
+	if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3);
+
+	len = (len < 0) ? strlen(buf) : len;
+	getIDXBufDat(start, &dbKey);
+
+	if (strcmp(key, dbKey) < 0) {
+	}
+	else if (strcmp(key, dbKey) > 0) {
+		if (errorStatus != (char)-2)	// not a new file
+			idxoff += 8;
+		else idxoff = 0;
+	}
+	else if ((!strcmp(key, dbKey)) && (len>0/*we're not deleting*/)) { // got absolute entry
+		do {
+			tmpbuf = new char [ size + 2 ];
+			memset(tmpbuf, 0, size + 2);
+			datfd->seek(start, SEEK_SET);
+			datfd->read(tmpbuf, (int)(size - 1));
+
+			for (ch = tmpbuf; *ch; ch++) {		// skip over index string
+				if (*ch == 10) {
+					ch++;
+					break;
+				}
+			}
+			memmove(tmpbuf, ch, size - (unsigned long)(ch-tmpbuf));
+
+			// resolve link
+			if (!strncmp(tmpbuf, "@LINK", 5) && (len > 0)) {
+				for (ch = tmpbuf; *ch; ch++) {		// null before nl
+					if (*ch == 10) {
+						*ch = 0;
+						break;
+					}
+				}
+				findOffset(tmpbuf + 8, &start, &size, 0, &idxoff);
+				++size;
+			}
+			else break;
+		}
+		while (true);	// while we're resolving links
+	}
+
+	endoff = idxfd->seek(0, SEEK_END);
+
+	shiftSize = endoff - idxoff;
+
+	if (shiftSize > 0) {
+		idxBytes = new char [ shiftSize ];
+		idxfd->seek(idxoff, SEEK_SET);
+		idxfd->read(idxBytes, shiftSize);
+	}
+
+	outbuf = new char [ len + strlen(key) + 5 ];
+	sprintf(outbuf, "%s%c%c", key, 13, 10);
+	size = strlen(outbuf);
+	memcpy(outbuf + size, buf, len);
+	size = outsize = size + len;
+
+	start = outstart = datfd->seek(0, SEEK_END);
+
+	outstart = archtosword32(start);
+	outsize  = archtosword32(size);
+
+	idxfd->seek(idxoff, SEEK_SET);
+	if (len>0) {
+		datfd->seek(start, SEEK_SET);
+		datfd->write(outbuf, (long)size);
+
+		// add a new line to make data file easier to read in an editor
+		datfd->write(&nl, 2);
+		
+		idxfd->write(&outstart, 4);
+		idxfd->write(&outsize, 4);
+		if (idxBytes) {
+			idxfd->write(idxBytes, shiftSize);
+			delete [] idxBytes;
+		}
+	}
+	else {	// delete entry
+		if (idxBytes) {
+			idxfd->write(idxBytes+8, shiftSize-8);
+			idxfd->seek(-1, SEEK_CUR);	// last valid byte
+			FileMgr::getSystemFileMgr()->trunc(idxfd);	// truncate index
+			delete [] idxBytes;
+		}
+	}
+
+	delete [] key;
+	delete [] outbuf;
+	free(dbKey);
+}
+
+
+/******************************************************************************
+ * RawLD::linkentry	- links one entry to another
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	destidxoff	- dest offset into .vss
+ *	srcidxoff		- source offset into .vss
+ */
+
+void RawStr4::doLinkEntry(const char *destkey, const char *srckey) {
+	char *text = new char [ strlen(destkey) + 7 ];
+	sprintf(text, "@LINK %s", destkey);
+	doSetText(srckey, text);
+	delete [] text;
+}
+
+
+/******************************************************************************
+ * RawLD::CreateModule	- Creates new module files
+ *
+ * ENT: path	- directory to store module files
+ * RET: error status
+ */
+
+signed char RawStr4::createModule(const char *ipath)
+{
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd, *fd2;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s.dat", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s.idx", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	delete [] path;
+	
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/rawverse.cpp b/src/modules/common/rawverse.cpp
new file mode 100644
index 0000000..5527d38
--- /dev/null
+++ b/src/modules/common/rawverse.cpp
@@ -0,0 +1,311 @@
+/******************************************************************************
+ *
+ *  rawverse.cpp -	code for class 'RawVerse'- a module that reads raw text
+ *			files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *			and provides lookup and parsing functions based on
+ *			class VerseKey
+ *
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <utilstr.h>
+#include <rawverse.h>
+#include <versekey.h>
+#include <sysdata.h>
+#include <filemgr.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * RawVerse Statics
+ */
+
+int RawVerse::instance = 0;
+const char *RawVerse::nl = "\r\n";
+
+
+/******************************************************************************
+ * RawVerse Constructor - Initializes data for instance of RawVerse
+ *
+ * ENT:	ipath - path of the directory where data and index files are located.
+ *		be sure to include the trailing separator (e.g. '/' or '\')
+ *		(e.g. 'modules/texts/rawtext/webster/')
+ */
+
+RawVerse::RawVerse(const char *ipath, int fileMode)
+{
+	SWBuf buf;
+
+	path = 0;
+	stdstr(&path, ipath);
+	
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	if (fileMode == -1) { // try read/write if possible
+		fileMode = FileMgr::RDWR;
+	}
+		
+	buf.setFormatted("%s/ot.vss", path);
+	idxfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/nt.vss", path);
+	idxfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/ot", path);
+	textfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/nt", path);
+	textfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	instance++;
+}
+
+
+/******************************************************************************
+ * RawVerse Destructor - Cleans up instance of RawVerse
+ */
+
+RawVerse::~RawVerse()
+{
+	int loop1;
+
+	if (path)
+		delete [] path;
+
+	--instance;
+
+	for (loop1 = 0; loop1 < 2; loop1++) {
+		FileMgr::getSystemFileMgr()->close(idxfp[loop1]);
+		FileMgr::getSystemFileMgr()->close(textfp[loop1]);
+	}
+}
+
+
+/******************************************************************************
+ * RawVerse::findoffset	- Finds the offset of the key verse from the indexes
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	idxoff	- offset into .vss
+ *	start	- address to store the starting offset
+ *	size	- address to store the size of the entry
+ */
+
+void RawVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *size) const {
+	idxoff *= 6;
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+		
+	if (idxfp[testmt-1]->getFd() >= 0) {
+		idxfp[testmt-1]->seek(idxoff, SEEK_SET);
+		__s32 tmpStart;
+		__u16 tmpSize;
+		idxfp[testmt-1]->read(&tmpStart, 4);
+		long len = idxfp[testmt-1]->read(&tmpSize, 2); 		// read size
+
+		*start = swordtoarch32(tmpStart);
+		*size  = swordtoarch16(tmpSize);
+
+		if (len < 2) {
+			*size = (unsigned short)((*start) ? (textfp[testmt-1]->seek(0, SEEK_END) - (long)*start) : 0);	// if for some reason we get an error reading size, make size to end of file
+		}
+	}
+	else {
+		*start = 0;
+		*size = 0;
+	}
+}
+
+
+/******************************************************************************
+ * RawVerse::readtext	- gets text at a given offset
+ *
+ * ENT:	testmt	- testament file to search in (0 - Old; 1 - New)
+ *	start	- starting offset where the text is located in the file
+ *	size	- size of text entry + 2 (null)(null)
+ *	buf	- buffer to store text
+ *
+ */
+
+void RawVerse::readText(char testmt, long start, unsigned short size, SWBuf &buf) const {
+	buf = "";
+	buf.setFillByte(0);
+	buf.setSize(size + 1);
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+	if (size) {
+		if (textfp[testmt-1]->getFd() >= 0) {
+			textfp[testmt-1]->seek(start, SEEK_SET);
+			textfp[testmt-1]->read(buf.getRawData(), (int)size); 
+		}
+	}
+}
+
+
+/******************************************************************************
+ * RawVerse::settext	- Sets text for current offset
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	idxoff	- offset into .vss
+ *	buf	- buffer to store
+ *      len     - length of buffer (0 - null terminated)
+ */
+
+void RawVerse::doSetText(char testmt, long idxoff, const char *buf, long len)
+{
+	__s32 start;
+	__u16 size;
+
+	idxoff *= 6;
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+
+	size = (len < 0) ? strlen(buf) : len;
+
+	start = textfp[testmt-1]->seek(0, SEEK_END);
+	idxfp[testmt-1]->seek(idxoff, SEEK_SET);
+
+	if (size) {
+		textfp[testmt-1]->seek(start, SEEK_SET);
+		textfp[testmt-1]->write(buf, (int)size);
+
+		// add a new line to make data file easier to read in an editor
+		textfp[testmt-1]->write(nl, 2);
+	}
+	else {
+		start = 0;
+	}
+
+	start = archtosword32(start);
+	size  = archtosword16(size);
+
+	idxfp[testmt-1]->write(&start, 4);
+	idxfp[testmt-1]->write(&size, 2);
+}
+
+
+/******************************************************************************
+ * RawVerse::linkentry	- links one entry to another
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	destidxoff	- dest offset into .vss
+ *	srcidxoff		- source offset into .vss
+ */
+
+void RawVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) {
+	__s32 start;
+	__u16 size;
+
+	destidxoff *= 6;
+	srcidxoff  *= 6;
+
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+
+	// get source
+	idxfp[testmt-1]->seek(srcidxoff, SEEK_SET);
+	idxfp[testmt-1]->read(&start, 4);
+	idxfp[testmt-1]->read(&size, 2);
+
+	// write dest
+	idxfp[testmt-1]->seek(destidxoff, SEEK_SET);
+	idxfp[testmt-1]->write(&start, 4);
+	idxfp[testmt-1]->write(&size, 2);
+}
+
+
+/******************************************************************************
+ * RawVerse::createModule	- Creates new module files
+ *
+ * ENT: path	- directory to store module files
+ * RET: error status
+ */
+
+char RawVerse::createModule(const char *ipath, const char *v11n)
+{
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd, *fd2;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s/ot", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/nt", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/ot.vss", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+
+	sprintf(buf, "%s/nt.vss", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+
+	VerseKey vk;
+	vk.setVersificationSystem(v11n);
+	vk.setIntros(1);
+
+	__s32 offset = 0;
+	__u16 size = 0;
+	offset = archtosword32(offset);
+	size = archtosword16(size);
+
+	for (vk = TOP; !vk.popError(); vk++) {
+		if (vk.getTestament() < 2) {
+			fd->write(&offset, 4);
+			fd->write(&size, 2);
+		}
+		else	{
+			fd2->write(&offset, 4);
+			fd2->write(&size, 2);
+		}
+	}
+	fd2->write(&offset, 4);
+	fd2->write(&size, 2);
+
+	FileMgr::getSystemFileMgr()->close(fd);
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	delete [] path;
+	delete [] buf;
+	
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/rawverse4.cpp b/src/modules/common/rawverse4.cpp
new file mode 100644
index 0000000..b87ea0d
--- /dev/null
+++ b/src/modules/common/rawverse4.cpp
@@ -0,0 +1,312 @@
+/******************************************************************************
+ *
+ *  rawverse4.cpp -	code for class 'RawVerse4'- a module that reads raw
+ *			text files:
+ *			ot and nt using indexs ??.bks ??.cps ??.vss
+ *			and provides lookup and parsing functions based on
+ *			class VerseKey
+ *
+ * $Id: rawverse4.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <utilstr.h>
+#include <rawverse4.h>
+#include <versekey.h>
+#include <sysdata.h>
+#include <filemgr.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * RawVerse4 Statics
+ */
+
+int RawVerse4::instance = 0;
+const char *RawVerse4::nl = "\r\n";
+
+
+/******************************************************************************
+ * RawVerse4 Constructor - Initializes data for instance of RawVerse4
+ *
+ * ENT:	ipath - path of the directory where data and index files are located.
+ *		be sure to include the trailing separator (e.g. '/' or '\')
+ *		(e.g. 'modules/texts/rawtext/webster/')
+ */
+
+RawVerse4::RawVerse4(const char *ipath, int fileMode)
+{
+	SWBuf buf;
+
+	path = 0;
+	stdstr(&path, ipath);
+	
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	if (fileMode == -1) { // try read/write if possible
+		fileMode = FileMgr::RDWR;
+	}
+		
+	buf.setFormatted("%s/ot.vss", path);
+	idxfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/nt.vss", path);
+	idxfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/ot", path);
+	textfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/nt", path);
+	textfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	instance++;
+}
+
+
+/******************************************************************************
+ * RawVerse4 Destructor - Cleans up instance of RawVerse4
+ */
+
+RawVerse4::~RawVerse4()
+{
+	int loop1;
+
+	if (path)
+		delete [] path;
+
+	--instance;
+
+	for (loop1 = 0; loop1 < 2; loop1++) {
+		FileMgr::getSystemFileMgr()->close(idxfp[loop1]);
+		FileMgr::getSystemFileMgr()->close(textfp[loop1]);
+	}
+}
+
+
+/******************************************************************************
+ * RawVerse4::findoffset	- Finds the offset of the key verse from the indexes
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	idxoff	- offset into .vss
+ *	start	- address to store the starting offset
+ *	size	- address to store the size of the entry
+ */
+
+void RawVerse4::findOffset(char testmt, long idxoff, long *start, unsigned long *size) const {
+	idxoff *= 8;
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+		
+	if (idxfp[testmt-1]->getFd() >= 0) {
+		idxfp[testmt-1]->seek(idxoff, SEEK_SET);
+		__u32 tmpStart;
+		__u32 tmpSize;
+		idxfp[testmt-1]->read(&tmpStart, 4);
+		long len = idxfp[testmt-1]->read(&tmpSize, 4); 		// read size
+
+		*start = swordtoarch32(tmpStart);
+		*size  = swordtoarch32(tmpSize);
+
+		if (len < 2) {
+			*size = (unsigned long)((*start) ? (textfp[testmt-1]->seek(0, SEEK_END) - (long)*start) : 0);	// if for some reason we get an error reading size, make size to end of file
+		}
+	}
+	else {
+		*start = 0;
+		*size = 0;
+	}
+}
+
+
+/******************************************************************************
+ * RawVerse4::readtext	- gets text at a given offset
+ *
+ * ENT:	testmt	- testament file to search in (0 - Old; 1 - New)
+ *	start	- starting offset where the text is located in the file
+ *	size	- size of text entry + 2 (null)(null)
+ *	buf	- buffer to store text
+ *
+ */
+
+void RawVerse4::readText(char testmt, long start, unsigned long size, SWBuf &buf) const {
+	buf = "";
+	buf.setFillByte(0);
+	buf.setSize(size + 1);
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+	if (size) {
+		if (textfp[testmt-1]->getFd() >= 0) {
+			textfp[testmt-1]->seek(start, SEEK_SET);
+			textfp[testmt-1]->read(buf.getRawData(), (int)size); 
+		}
+	}
+}
+
+
+/******************************************************************************
+ * RawVerse4::settext	- Sets text for current offset
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	idxoff	- offset into .vss
+ *	buf	- buffer to store
+ *      len     - length of buffer (0 - null terminated)
+ */
+
+void RawVerse4::doSetText(char testmt, long idxoff, const char *buf, long len)
+{
+	__u32 start;
+	__u32 size;
+
+	idxoff *= 8;
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+
+	size = (len < 0) ? strlen(buf) : len;
+
+	start = textfp[testmt-1]->seek(0, SEEK_END);
+	idxfp[testmt-1]->seek(idxoff, SEEK_SET);
+
+	if (size) {
+		textfp[testmt-1]->seek(start, SEEK_SET);
+		textfp[testmt-1]->write(buf, (int)size);
+
+		// add a new line to make data file easier to read in an editor
+		textfp[testmt-1]->write(nl, 2);
+	}
+	else {
+		start = 0;
+	}
+
+	start = archtosword32(start);
+	size  = archtosword32(size);
+
+	idxfp[testmt-1]->write(&start, 4);
+	idxfp[testmt-1]->write(&size, 4);
+}
+
+
+/******************************************************************************
+ * RawVerse4::linkentry	- links one entry to another
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	destidxoff	- dest offset into .vss
+ *	srcidxoff		- source offset into .vss
+ */
+
+void RawVerse4::doLinkEntry(char testmt, long destidxoff, long srcidxoff) {
+	__u32 start;
+	__u32 size;
+
+	destidxoff *= 8;
+	srcidxoff  *= 8;
+
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+
+	// get source
+	idxfp[testmt-1]->seek(srcidxoff, SEEK_SET);
+	idxfp[testmt-1]->read(&start, 4);
+	idxfp[testmt-1]->read(&size, 4);
+
+	// write dest
+	idxfp[testmt-1]->seek(destidxoff, SEEK_SET);
+	idxfp[testmt-1]->write(&start, 4);
+	idxfp[testmt-1]->write(&size, 4);
+}
+
+
+/******************************************************************************
+ * RawVerse4::CreateModule	- Creates new module files
+ *
+ * ENT: path	- directory to store module files
+ * RET: error status
+ */
+
+char RawVerse4::createModule(const char *ipath, const char *v11n)
+{
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd, *fd2;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s/ot", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/nt", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/ot.vss", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+
+	sprintf(buf, "%s/nt.vss", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+
+	VerseKey vk;
+	vk.setVersificationSystem(v11n);
+	vk.setIntros(1);
+	__u32 offset = 0;
+	__u32 size = 0;
+	offset = archtosword32(offset);
+	size   = archtosword32(size);
+
+	for (vk = TOP; !vk.popError(); vk++) {
+		if (vk.getTestament() < 2) {
+			fd->write(&offset, 4);
+			fd->write(&size, 4);
+		}
+		else	{
+			fd2->write(&offset, 4);
+			fd2->write(&size, 4);
+		}
+	}
+	fd2->write(&offset, 4);
+	fd2->write(&size, 4);
+
+	FileMgr::getSystemFileMgr()->close(fd);
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	delete [] path;
+	delete [] buf;
+	
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/sapphire.cpp b/src/modules/common/sapphire.cpp
new file mode 100644
index 0000000..8cc3e15
--- /dev/null
+++ b/src/modules/common/sapphire.cpp
@@ -0,0 +1,236 @@
+/******************************************************************************
+ *
+ *  sapphire.cpp -	the Saphire II stream cipher class
+ *
+ * $Id: sapphire.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ * 
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/******************************************************************************
+ *
+ * Original license notice & credits:
+ * Dedicated to the Public Domain the author and inventor:
+ * (Michael Paul Johnson).  This code comes with no warranty.
+ * Use it at your own risk.
+ * Ported from the Pascal implementation of the Sapphire Stream
+ * Cipher 9 December 1994.
+ * Added hash pre- and post-processing 27 December 1994.
+ * Modified initialization to make index variables key dependent,
+ * made the output function more resistant to cryptanalysis,
+ * and renamed to Sapphire II 2 January 1995
+ *
+ */
+
+#include <string.h>
+
+#include "sapphire.h"
+
+SWORD_NAMESPACE_START
+
+unsigned char sapphire::keyrand(int limit,
+                                unsigned char *user_key,
+                                unsigned char keysize,
+                                unsigned char *rsum,
+                                unsigned *keypos)
+    {
+    unsigned u,             // Value from 0 to limit to return.
+        retry_limiter,      // No infinite loops allowed.
+        mask;               // Select just enough bits.
+
+    if (!limit) return 0;   // Avoid divide by zero error.
+    retry_limiter = 0;
+    mask = 1;               // Fill mask with enough bits to cover
+    while (mask < (unsigned)limit)    // the desired range.
+        mask = (mask << 1) + 1;
+    do
+        {
+        *rsum = cards[*rsum] + user_key[(*keypos)++];
+        if (*keypos >= keysize)
+            {
+            *keypos = 0;            // Recycle the user key.
+            *rsum += keysize;   // key "aaaa" != key "aaaaaaaa"
+            }
+        u = mask & *rsum;
+        if (++retry_limiter > 11)
+            u %= limit;     // Prevent very rare long loops.
+        }
+    while (u > (unsigned)limit);
+    return u;
+    }
+
+void sapphire::initialize(unsigned char *key, unsigned char keysize)
+    {
+    // Key size may be up to 256 bytes.
+    // Pass phrases may be used directly, with longer length
+    // compensating for the low entropy expected in such keys.
+    // Alternatively, shorter keys hashed from a pass phrase or
+    // generated randomly may be used. For random keys, lengths
+    // of from 4 to 16 bytes are recommended, depending on how
+    // secure you want this to be.
+
+    int i;
+    unsigned char toswap, swaptemp, rsum;
+    unsigned keypos;
+
+    // If we have been given no key, assume the default hash setup.
+
+    if (keysize < 1)
+        {
+        hash_init();
+        return;
+        }
+
+    // Start with cards all in order, one of each.
+
+    for (i=0;i<256;i++)
+        cards[i] = i;
+
+    // Swap the card at each position with some other card.
+
+    toswap = 0;
+    keypos = 0;         // Start with first byte of user key.
+    rsum = 0;
+    for (i=255;i>=0;i--)
+        {
+        toswap = keyrand(i, key, keysize, &rsum, &keypos);
+        swaptemp = cards[i];
+        cards[i] = cards[toswap];
+        cards[toswap] = swaptemp;
+        }
+
+    // Initialize the indices and data dependencies.
+    // Indices are set to different values instead of all 0
+    // to reduce what is known about the state of the cards
+    // when the first byte is emitted.
+
+    rotor = cards[1];
+    ratchet = cards[3];
+    avalanche = cards[5];
+    last_plain = cards[7];
+    last_cipher = cards[rsum];
+
+    toswap = swaptemp = rsum = 0;
+    keypos = 0;
+    }
+
+void sapphire::hash_init(void)
+    {
+    // This function is used to initialize non-keyed hash
+    // computation.
+
+    int i, j;
+
+    // Initialize the indices and data dependencies.
+
+    rotor = 1;
+    ratchet = 3;
+    avalanche = 5;
+    last_plain = 7;
+    last_cipher = 11;
+
+    // Start with cards all in inverse order.
+
+    for (i=0, j=255;i<256;i++,j--)
+        cards[i] = (unsigned char) j;
+    }
+
+sapphire::sapphire(unsigned char *key, unsigned char keysize)
+    {
+    if (key && keysize)
+        initialize(key, keysize);
+    }
+
+void sapphire::burn(void)
+    {
+    // Destroy the key and state information in RAM.
+    memset(cards, 0, 256);
+    rotor = ratchet = avalanche = last_plain = last_cipher = 0;
+    }
+
+sapphire::~sapphire()
+    {
+    burn();
+    }
+
+unsigned char sapphire::encrypt(unsigned char b)
+    {
+    // Picture a single enigma rotor with 256 positions, rewired
+    // on the fly by card-shuffling.
+
+    // This cipher is a variant of one invented and written
+    // by Michael Paul Johnson in November, 1993.
+
+    unsigned char swaptemp;
+
+    // Shuffle the deck a little more.
+
+    ratchet += cards[rotor++];
+    swaptemp = cards[last_cipher];
+    cards[last_cipher] = cards[ratchet];
+    cards[ratchet] = cards[last_plain];
+    cards[last_plain] = cards[rotor];
+    cards[rotor] = swaptemp;
+    avalanche += cards[swaptemp];
+
+    // Output one byte from the state in such a way as to make it
+    // very hard to figure out which one you are looking at.
+
+    last_cipher = b^cards[(cards[ratchet] + cards[rotor]) & 0xFF] ^
+                  cards[cards[(cards[last_plain] +
+                               cards[last_cipher] +
+                               cards[avalanche])&0xFF]];
+    last_plain = b;
+    return last_cipher;
+    }
+
+unsigned char sapphire::decrypt(unsigned char b)
+    {
+    unsigned char swaptemp;
+
+    // Shuffle the deck a little more.
+
+    ratchet += cards[rotor++];
+    swaptemp = cards[last_cipher];
+    cards[last_cipher] = cards[ratchet];
+    cards[ratchet] = cards[last_plain];
+    cards[last_plain] = cards[rotor];
+    cards[rotor] = swaptemp;
+    avalanche += cards[swaptemp];
+
+    // Output one byte from the state in such a way as to make it
+    // very hard to figure out which one you are looking at.
+
+    last_plain = b^cards[(cards[ratchet] + cards[rotor]) & 0xFF] ^
+                   cards[cards[(cards[last_plain] +
+                                cards[last_cipher] +
+                                cards[avalanche])&0xFF]];
+    last_cipher = b;
+    return last_plain;
+    }
+
+void sapphire::hash_final(unsigned char *hash,      // Destination
+                          unsigned char hashlength) // Size of hash.
+    {
+    int i;
+
+    for (i=255;i>=0;i--)
+        encrypt((unsigned char) i);
+    for (i=0;i<hashlength;i++)
+        hash[i] = encrypt(0);
+    }
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/swcipher.cpp b/src/modules/common/swcipher.cpp
new file mode 100644
index 0000000..16279dc
--- /dev/null
+++ b/src/modules/common/swcipher.cpp
@@ -0,0 +1,147 @@
+/******************************************************************************
+ *
+ *  swcipher.cpp -	code for class 'SWCipher'- a driver class that
+ *			provides cipher utilities
+ *
+ * $Id: swcipher.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <swcipher.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * SWCipher Constructor - Initializes data for instance of SWCipher
+ *
+ */
+
+SWCipher::SWCipher(unsigned char *key) {
+	master.initialize(key, strlen((char *)key));
+	buf = 0;
+}
+
+
+/******************************************************************************
+ * SWCipher Destructor - Cleans up instance of SWCipher
+ */
+
+SWCipher::~SWCipher()
+{
+	if (buf)
+		free(buf);
+}
+
+
+char *SWCipher::Buf(const char *ibuf, unsigned long ilen)
+{
+	if (ibuf) {
+	
+		if (buf)
+			free(buf);
+
+		if (!ilen) {
+		        len = strlen(buf);
+			ilen = len + 1;
+		}
+		else len = ilen;
+
+		buf = (char *) malloc(ilen);
+		memcpy(buf, ibuf, ilen);
+		cipher = false;
+	}
+
+	Decode();
+
+	return buf;
+}
+
+
+char *SWCipher::cipherBuf(unsigned long *ilen, const char *ibuf)
+{
+	if (ibuf) {
+	
+		if (buf)
+			free(buf);
+			
+		buf = (char *) malloc(*ilen+1);
+		memcpy(buf, ibuf, *ilen);
+		len = *ilen;
+		cipher = true;
+	}
+
+	Encode();
+
+	*ilen = len;
+	return buf;
+}
+
+
+/******************************************************************************
+ * SWCipher::Encode	- This function "encodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ */
+
+void SWCipher::Encode(void)
+{
+	if (!cipher) {
+		work = master;
+		for (unsigned long i = 0; i < len; i++)
+			buf[i] = work.encrypt(buf[i]);
+		cipher = true;
+	}
+}
+
+
+/******************************************************************************
+ * SWCipher::Decode	- This function "decodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ */
+
+void SWCipher::Decode(void)
+{
+	if (cipher) {
+		work = master;
+		unsigned long i;
+		for (i = 0; i < len; i++)
+			buf[i] = work.decrypt(buf[i]);
+		buf[i] = 0;
+		cipher = false;
+	}
+}
+
+
+/******************************************************************************
+ * SWCipher::setCipherKey	- setter for a new CipherKey
+ *
+ */
+
+void SWCipher::setCipherKey(const char *ikey) {
+	unsigned char *key = (unsigned char *)ikey;
+	master.initialize(key, strlen((char *)key));
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/swcomprs.cpp b/src/modules/common/swcomprs.cpp
new file mode 100644
index 0000000..9df8e7d
--- /dev/null
+++ b/src/modules/common/swcomprs.cpp
@@ -0,0 +1,211 @@
+/******************************************************************************
+ *
+ *  swcomprs.cpp - 	a driver class that provides compression utilities
+ *
+ * $Id: swcomprs.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <swcomprs.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * SWCompress Constructor - Initializes data for instance of SWCompress
+ *
+ */
+
+SWCompress::SWCompress()
+{
+	buf = zbuf = 0;
+	Init();
+}
+
+
+/******************************************************************************
+ * SWCompress Destructor - Cleans up instance of SWCompress
+ */
+
+SWCompress::~SWCompress()
+{
+	if (zbuf)
+		free(zbuf);
+
+	if (buf)
+		free(buf);
+}
+
+
+void SWCompress::Init()
+{
+		if (buf)
+			free(buf);
+
+		if (zbuf)
+			free(zbuf);
+
+		buf    = 0;
+		zbuf   = 0;
+		direct  = 0;
+		zlen    = 0;
+		slen    = 0;
+		zpos    = 0;
+		pos     = 0;
+}
+
+
+char *SWCompress::Buf(const char *ibuf, unsigned long *len) {
+	// setting an uncompressed buffer
+	if (ibuf) {
+		Init();
+		slen = (len) ? *len : strlen(ibuf);
+		buf = (char *) calloc(slen + 1, 1);
+		memcpy(buf, ibuf, slen);
+	}
+
+	// getting an uncompressed buffer
+	if (!buf) {
+		buf = (char *)calloc(1,1); // be sure we at least allocate an empty buf for return;
+		direct = 1;
+		Decode();
+//		slen = strlen(buf);
+		if (len)
+			*len = slen;
+	}
+	return buf;
+}
+
+
+char *SWCompress::zBuf(unsigned long *len, char *ibuf)
+{
+	// setting a compressed buffer
+	if (ibuf) {
+		Init();
+		zbuf = (char *) malloc(*len);
+		memcpy(zbuf, ibuf, *len);
+		zlen = *len;
+	}
+
+	// getting a compressed buffer
+	if (!zbuf) {
+		direct = 0;
+		Encode();
+	}
+
+	*len = zlen;
+	return zbuf;
+}
+
+
+unsigned long SWCompress::GetChars(char *ibuf, unsigned long len)
+{
+	if (direct) {
+		len = (((zlen - zpos) > (unsigned)len) ? len : zlen - zpos);
+		if (len > 0) {
+			memmove(ibuf, &zbuf[zpos], len);
+			zpos += len;
+		}
+	}
+	else {
+//		slen = strlen(buf);
+		len = (((slen - pos) > (unsigned)len) ? len : slen - pos);
+		if (len > 0) {
+			memmove(ibuf, &buf[pos], len);
+			pos += len;
+		}
+	}
+	return len;
+}
+	
+
+unsigned long SWCompress::SendChars(char *ibuf, unsigned long len)
+{
+	if (direct) {
+		if (buf) {
+//			slen = strlen(buf);
+			if ((pos + len) > (unsigned)slen) {
+				buf = (char *) realloc(buf, pos + len + 1024);
+				memset(&buf[pos], 0, len + 1024);
+			}
+		}
+		else	buf = (char *)calloc(1, len + 1024);
+		memmove(&buf[pos], ibuf, len);
+		pos += len;
+	}
+	else {
+		if (zbuf) {
+			if ((zpos + len) > zlen) {
+				zbuf = (char *) realloc(zbuf, zpos + len + 1024);
+				zlen = zpos + len + 1024;
+			}
+		}
+		else {
+			zbuf = (char *)calloc(1, len + 1024);
+			zlen = len + 1024;
+		}
+		memmove(&zbuf[zpos], ibuf, len);
+		zpos += len;
+	}
+	return len;
+}
+
+
+/******************************************************************************
+ * SWCompress::Encode	- This function "encodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ */
+
+void SWCompress::Encode(void)
+{
+	cycleStream();
+}
+
+
+/******************************************************************************
+ * SWCompress::Decode	- This function "decodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ */
+
+void SWCompress::Decode(void)
+{
+	cycleStream();
+}
+
+
+void SWCompress::cycleStream() {
+	char buf[1024];
+	unsigned long len, totlen = 0;
+
+	do {
+		len = GetChars(buf, 1024);
+		if (len)
+			totlen += SendChars(buf, len);
+	} while (len == 1024);
+
+	zlen = slen = totlen;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/xzcomprs.cpp b/src/modules/common/xzcomprs.cpp
new file mode 100644
index 0000000..db8a4a8
--- /dev/null
+++ b/src/modules/common/xzcomprs.cpp
@@ -0,0 +1,181 @@
+/******************************************************************************
+ *
+ *  xzcomprs.cpp -	XzCompress, a driver class that provides xz (LZMA2)
+ *			compression
+ *				
+ * $Id: xzcomprs.cpp 2850 2013-07-02 09:57:20Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <xzcomprs.h>
+#include <zlib.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * XzCompress Constructor - Initializes data for instance of XzCompress
+ *
+ */
+
+XzCompress::XzCompress() : SWCompress() {
+}
+
+
+/******************************************************************************
+ * XzCompress Destructor - Cleans up instance of XzCompress
+ */
+
+XzCompress::~XzCompress() {
+}
+
+
+/******************************************************************************
+ * XzCompress::Encode - This function "encodes" the input stream into the
+ *			output stream.
+ *			The GetChars() and SendChars() functions are
+ *			used to separate this method from the actual
+ *			i/o.
+ * 		NOTE:	must set zlen for parent class to know length of
+ * 			compressed buffer.
+ */
+
+void XzCompress::Encode(void)
+{
+/*
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least 0.1% larger than
+   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+	direct = 0;	// set direction needed by parent [Get|Send]Chars()
+
+	// get buffer
+	char chunk[1024];
+	char *buf = (char *)calloc(1, 1024);
+	char *chunkbuf = buf;
+	unsigned long chunklen;
+	unsigned long len = 0;
+	while((chunklen = GetChars(chunk, 1023))) {
+		memcpy(chunkbuf, chunk, chunklen);
+		len += chunklen;
+		if (chunklen < 1023)
+			break;
+		else	buf = (char *)realloc(buf, len + 1024);
+		chunkbuf = buf+len;
+	}
+
+
+	zlen = (long) (len*1.001)+15;
+	char *zbuf = new char[zlen+1];
+	if (len)
+	{
+		//printf("Doing compress\n");
+		if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK)
+		{
+			printf("ERROR in compression\n");
+		}
+		else {
+			SendChars(zbuf, zlen);
+		}
+	}
+	else
+	{
+		fprintf(stderr, "ERROR: no buffer to compress\n");
+	}
+	delete [] zbuf;
+	free (buf);
+}
+
+
+/******************************************************************************
+ * XzCompress::Decode - This function "decodes" the input stream into the
+ *			output stream.
+ *			The GetChars() and SendChars() functions are
+ *			used to separate this method from the actual
+ *			i/o.
+ */
+
+void XzCompress::Decode(void)
+{
+/*
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+
+	// get buffer
+	char chunk[1024];
+	char *zbuf = (char *)calloc(1, 1024);
+	char *chunkbuf = zbuf;
+	int chunklen;
+	unsigned long zlen = 0;
+	while((chunklen = GetChars(chunk, 1023))) {
+		memcpy(chunkbuf, chunk, chunklen);
+		zlen += chunklen;
+		if (chunklen < 1023)
+			break;
+		else	zbuf = (char *)realloc(zbuf, zlen + 1024);
+		chunkbuf = zbuf + zlen;
+	}
+
+	//printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen);
+	if (zlen) {
+		unsigned long blen = zlen*20;	// trust compression is less than 1000%
+		char *buf = new char[blen]; 
+		//printf("Doing decompress {%s}\n", zbuf);
+		slen = 0;
+		switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){
+			case Z_OK: SendChars(buf, blen); slen = blen; break;
+			case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break;
+			case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break;
+			case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break;
+			default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break;
+		}
+		delete [] buf;
+	}
+	else {
+		fprintf(stderr, "ERROR: no buffer to decompress!\n");
+	}
+	//printf("Finished decoding\n");
+	free (zbuf);
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/zipcomprs.cpp b/src/modules/common/zipcomprs.cpp
new file mode 100644
index 0000000..3e44abd
--- /dev/null
+++ b/src/modules/common/zipcomprs.cpp
@@ -0,0 +1,183 @@
+/******************************************************************************
+ *
+ *  zipcomprs.cpp -	ZipCompress, a driver class that provides zlib
+ *			compression
+ *				
+ * $Id: zipcomprs.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <zipcomprs.h>
+#include <zlib.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * ZipCompress Constructor - Initializes data for instance of ZipCompress
+ *
+ */
+
+ZipCompress::ZipCompress() : SWCompress()
+{
+//	fprintf(stderr, "init compress\n");
+}
+
+
+/******************************************************************************
+ * ZipCompress Destructor - Cleans up instance of ZipCompress
+ */
+
+ZipCompress::~ZipCompress() {
+}
+
+
+/******************************************************************************
+ * ZipCompress::Encode	- This function "encodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ * 		NOTE:			must set zlen for parent class to know length of
+ * 						compressed buffer.
+ */
+
+void ZipCompress::Encode(void)
+{
+/*
+ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
+                                 const Bytef *source, uLong sourceLen));
+     Compresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be at least 0.1% larger than
+   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
+   compressed buffer.
+     This function can be used to compress a whole file at once if the
+   input file is mmap'ed.
+     compress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer.
+*/
+	direct = 0;	// set direction needed by parent [Get|Send]Chars()
+
+	// get buffer
+	char chunk[1024];
+	char *buf = (char *)calloc(1, 1024);
+	char *chunkbuf = buf;
+	unsigned long chunklen;
+	unsigned long len = 0;
+	while((chunklen = GetChars(chunk, 1023))) {
+		memcpy(chunkbuf, chunk, chunklen);
+		len += chunklen;
+		if (chunklen < 1023)
+			break;
+		else	buf = (char *)realloc(buf, len + 1024);
+		chunkbuf = buf+len;
+	}
+
+
+	zlen = (long) (len*1.001)+15;
+	char *zbuf = new char[zlen+1];
+	if (len)
+	{
+		//printf("Doing compress\n");
+		if (compress((Bytef*)zbuf, &zlen, (const Bytef*)buf, len) != Z_OK)
+		{
+			printf("ERROR in compression\n");
+		}
+		else {
+			SendChars(zbuf, zlen);
+		}
+	}
+	else
+	{
+		fprintf(stderr, "ERROR: no buffer to compress\n");
+	}
+	delete [] zbuf;
+	free (buf);
+}
+
+
+/******************************************************************************
+ * ZipCompress::Decode	- This function "decodes" the input stream into the
+ *						output stream.
+ *						The GetChars() and SendChars() functions are
+ *						used to separate this method from the actual
+ *						i/o.
+ */
+
+void ZipCompress::Decode(void)
+{
+/*
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
+                                   const Bytef *source, uLong sourceLen));
+     Decompresses the source buffer into the destination buffer.  sourceLen is
+   the byte length of the source buffer. Upon entry, destLen is the total
+   size of the destination buffer, which must be large enough to hold the
+   entire uncompressed data. (The size of the uncompressed data must have
+   been saved previously by the compressor and transmitted to the decompressor
+   by some mechanism outside the scope of this compression library.)
+   Upon exit, destLen is the actual size of the compressed buffer.
+     This function can be used to decompress a whole file at once if the
+   input file is mmap'ed.
+
+     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+   enough memory, Z_BUF_ERROR if there was not enough room in the output
+   buffer, or Z_DATA_ERROR if the input data was corrupted.
+*/
+
+	// get buffer
+	char chunk[1024];
+	char *zbuf = (char *)calloc(1, 1024);
+	char *chunkbuf = zbuf;
+	int chunklen;
+	unsigned long zlen = 0;
+	while((chunklen = GetChars(chunk, 1023))) {
+		memcpy(chunkbuf, chunk, chunklen);
+		zlen += chunklen;
+		if (chunklen < 1023)
+			break;
+		else	zbuf = (char *)realloc(zbuf, zlen + 1024);
+		chunkbuf = zbuf + zlen;
+	}
+
+	//printf("Decoding complength{%ld} uncomp{%ld}\n", zlen, blen);
+	if (zlen) {
+		unsigned long blen = zlen*20;	// trust compression is less than 1000%
+		char *buf = new char[blen]; 
+		//printf("Doing decompress {%s}\n", zbuf);
+		slen = 0;
+		switch (uncompress((Bytef*)buf, &blen, (Bytef*)zbuf, zlen)){
+			case Z_OK: SendChars(buf, blen); slen = blen; break;
+			case Z_MEM_ERROR: fprintf(stderr, "ERROR: not enough memory during decompression.\n"); break;
+			case Z_BUF_ERROR: fprintf(stderr, "ERROR: not enough room in the out buffer during decompression.\n"); break;
+			case Z_DATA_ERROR: fprintf(stderr, "ERROR: corrupt data during decompression.\n"); break;
+			default: fprintf(stderr, "ERROR: an unknown error occured during decompression.\n"); break;
+		}
+		delete [] buf;
+	}
+	else {
+		fprintf(stderr, "ERROR: no buffer to decompress!\n");
+	}
+	//printf("Finished decoding\n");
+	free (zbuf);
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/zstr.cpp b/src/modules/common/zstr.cpp
new file mode 100644
index 0000000..a745502
--- /dev/null
+++ b/src/modules/common/zstr.cpp
@@ -0,0 +1,700 @@
+/******************************************************************************
+ *
+ *  zstr.cpp -	code for class 'zStr'- a module that reads compressed text
+ *		files and provides lookup and parsing functions based on
+ *		class StrKey
+ *
+ * $Id: zstr.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include <stdlib.h>
+#include <utilstr.h>
+#include <zstr.h>
+#include <swcomprs.h>
+
+#include <sysdata.h>
+#include <entriesblk.h>
+#include <swlog.h>
+#include <stringmgr.h>
+#include <filemgr.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * zStr Statics
+ */
+
+int zStr::instance = 0;
+const int zStr::IDXENTRYSIZE = 8;
+const int zStr::ZDXENTRYSIZE = 8;
+
+
+/******************************************************************************
+ * zStr Constructor - Initializes data for instance of zStr
+ *
+ * ENT:	ipath - path of the directory where data and index files are located.
+ */
+
+zStr::zStr(const char *ipath, int fileMode, long blockCount, SWCompress *icomp, bool caseSensitive) : caseSensitive(caseSensitive)
+{
+	SWBuf buf;
+
+	lastoff = -1;
+	path = 0;
+	stdstr(&path, ipath);
+
+	compressor = (icomp) ? icomp : new SWCompress();
+	this->blockCount = blockCount;
+
+	if (fileMode == -1) { // try read/write if possible
+		fileMode = FileMgr::RDWR;
+	}
+		
+	buf.setFormatted("%s.idx", path);
+	idxfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s.dat", path);
+	datfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s.zdx", path);
+	zdxfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s.zdt", path);
+	zdtfd = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	if (datfd <= 0) {
+		SWLog::getSystemLog()->logError("%d", errno);
+	}
+
+	cacheBlock = 0;
+	cacheBlockIndex = -1;
+	cacheDirty = false;
+
+	instance++;
+}
+
+
+/******************************************************************************
+ * zStr Destructor - Cleans up instance of zStr
+ */
+
+zStr::~zStr() {
+
+	flushCache();
+
+	if (path)
+		delete [] path;
+
+	--instance;
+
+	FileMgr::getSystemFileMgr()->close(idxfd);
+	FileMgr::getSystemFileMgr()->close(datfd);
+	FileMgr::getSystemFileMgr()->close(zdxfd);
+	FileMgr::getSystemFileMgr()->close(zdtfd);
+
+
+	if (compressor)
+		delete compressor;
+
+}
+
+
+/******************************************************************************
+ * zStr::getidxbufdat	- Gets the index string at the given dat offset
+ *				NOTE: buf is calloc'd, or if not null, realloc'd and must
+ *					be free'd by calling function
+ *
+ * ENT:	ioffset	- offset in dat file to lookup
+ *		buf		- address of pointer to allocate for storage of string
+ */
+
+void zStr::getKeyFromDatOffset(long ioffset, char **buf) const
+{
+	int size;
+	char ch;
+	if (datfd > 0) {
+		datfd->seek(ioffset, SEEK_SET);
+		for (size = 0; datfd->read(&ch, 1) == 1; size++) {
+			if ((ch == '\\') || (ch == 10) || (ch == 13))
+				break;
+		}
+		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
+		if (size) {
+			datfd->seek(ioffset, SEEK_SET);
+			datfd->read(*buf, size);
+		}
+		(*buf)[size] = 0;
+		if (!caseSensitive) toupperstr_utf8(*buf, size*2);
+	}
+	else {
+		*buf = (*buf) ? (char *)realloc(*buf, 1) : (char *)malloc(1);
+		**buf = 0;
+	}
+}
+
+
+/******************************************************************************
+ * zStr::getidxbuf	- Gets the index string at the given idx offset
+ *						NOTE: buf is calloc'd, or if not null, realloc'd
+ *							and must be freed by calling function
+ *
+ * ENT:	ioffset	- offset in idx file to lookup
+ *		buf		- address of pointer to allocate for storage of string
+ */
+
+void zStr::getKeyFromIdxOffset(long ioffset, char **buf) const
+{
+	__u32 offset;
+	
+	if (idxfd > 0) {
+		idxfd->seek(ioffset, SEEK_SET);
+		idxfd->read(&offset, 4);
+		offset = swordtoarch32(offset);
+		getKeyFromDatOffset(offset, buf);
+	}
+}
+
+
+/******************************************************************************
+ * zStr::findoffset	- Finds the offset of the key string from the indexes
+ *
+ * ENT:	key		- key string to lookup
+ *		offset	- address to store the starting offset
+ *		size		- address to store the size of the entry
+ *		away		- number of entries before of after to jump
+ *					(default = 0)
+ *
+ * RET: error status
+ */
+
+signed char zStr::findKeyIndex(const char *ikey, long *idxoff, long away) const
+{
+	char *maxbuf = 0, *trybuf = 0, *key = 0, quitflag = 0;
+	signed char retval = 0;
+	__s32 headoff, tailoff, tryoff = 0, maxoff = 0;
+	__u32 start, size;
+	int diff = 0;
+	bool awayFromSubstrCheck = false;
+
+	if (idxfd->getFd() >= 0) {
+		tailoff = maxoff = idxfd->seek(0, SEEK_END) - IDXENTRYSIZE;
+		if (*ikey) {
+			headoff = 0;
+			stdstr(&key, ikey, 3);
+			if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3);
+
+			int keylen = strlen(key);
+			bool substr = false;
+
+			getKeyFromIdxOffset(maxoff, &maxbuf);
+
+			while (headoff < tailoff) {
+				tryoff = (lastoff == -1) ? headoff + (((((tailoff / IDXENTRYSIZE) - (headoff / IDXENTRYSIZE))) / 2) * IDXENTRYSIZE) : lastoff;
+				lastoff = -1;
+
+				getKeyFromIdxOffset(tryoff, &trybuf);
+
+				if (!*trybuf && tryoff) {		// In case of extra entry at end of idx (not first entry)
+					tryoff += (tryoff > (maxoff / 2))?-IDXENTRYSIZE:IDXENTRYSIZE;
+					retval = -1;
+					break;
+				}
+
+				diff = strcmp(key, trybuf);
+
+				if (!diff)
+					break;
+
+				if (!strncmp(trybuf, key, keylen)) substr = true;
+
+				if (diff < 0)
+					tailoff = (tryoff == headoff) ? headoff : tryoff;
+				else headoff = tryoff;
+
+				if (tailoff == headoff + IDXENTRYSIZE) {
+					if (quitflag++)
+						headoff = tailoff;
+				}
+			}
+
+			// didn't find exact match
+			if (headoff >= tailoff) {
+				tryoff = headoff;
+				if (!substr && ((tryoff != maxoff)||(strncmp(key, maxbuf, keylen)<0))) {
+					awayFromSubstrCheck = true;
+					away--;	// if our entry doesn't startwith our key, prefer the previous entry over the next
+				}
+			}
+			if (trybuf)
+				free(trybuf);
+			delete [] key;
+                        if (maxbuf)
+                        	free(maxbuf);
+		}
+		else	{ tryoff = 0; }
+
+		idxfd->seek(tryoff, SEEK_SET);
+
+		start = size = 0;
+		retval = (idxfd->read(&start, 4) == 4) ? retval : -1;
+		retval = (idxfd->read(&size, 4) == 4) ? retval : -1;
+		start = swordtoarch32(start);
+		size  = swordtoarch32(size);
+
+		if (idxoff)
+			*idxoff = tryoff;
+
+		while (away) {
+			__u32 laststart = start;
+			__u32 lastsize = size;
+			__s32 lasttry = tryoff;
+			tryoff += (away > 0) ? IDXENTRYSIZE : -IDXENTRYSIZE;
+
+			bool bad = false;
+			if (((long)(tryoff + (away*IDXENTRYSIZE)) < -IDXENTRYSIZE) || (tryoff + (away*IDXENTRYSIZE) > (maxoff+IDXENTRYSIZE)))
+				bad = true;
+			else	if (idxfd->seek(tryoff, SEEK_SET) < 0)
+				bad = true;
+			if (bad) {
+				if(!awayFromSubstrCheck)
+					retval = -1;
+				start = laststart;
+				size = lastsize;
+				tryoff = lasttry;
+				if (idxoff)
+					*idxoff = tryoff;
+				break;
+			}
+			idxfd->read(&start, 4);
+			idxfd->read(&size, 4);
+			start = swordtoarch32(start);
+			size  = swordtoarch32(size);
+
+			if (idxoff)
+				*idxoff = tryoff;
+
+
+			if (((laststart != start) || (lastsize != size)) && (start >= 0) && (size)) 
+				away += (away < 0) ? 1 : -1;
+		}
+	
+		lastoff = tryoff;
+	}
+	else {
+		if (idxoff)
+			*idxoff = 0;
+		retval = -1;
+	}
+	return retval;
+}
+
+
+/******************************************************************************
+ * zStr::getText	- gets text at a given offset
+ *
+ * ENT:
+ *	offset	- idxoffset where the key is located.
+ *	buf		- buffer to store text
+ *	idxbuf	- buffer to store index key
+ *			NOTE: buffer will be alloc'd / realloc'd and 
+ *			should be free'd by the client
+ *
+ */
+
+void zStr::getText(long offset, char **idxbuf, char **buf) const {
+	char *ch;
+	char *idxbuflocal = 0;
+	getKeyFromIdxOffset(offset, &idxbuflocal);
+	__u32 start;
+	__u32 size;
+
+	do {
+		idxfd->seek(offset, SEEK_SET);
+		idxfd->read(&start, 4);
+		idxfd->read(&size, 4);
+		start = swordtoarch32(start);
+		size = swordtoarch32(size);
+
+		*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
+		*idxbuf = (*idxbuf) ? (char *)realloc(*idxbuf, size*2 + 1) : (char *)malloc(size*2 + 1);
+		memset(*buf, 0, size + 1);
+		memset(*idxbuf, 0, size + 1);
+		datfd->seek(start, SEEK_SET);
+		datfd->read(*buf, (int)(size));
+
+		for (ch = *buf; *ch; ch++) {		// skip over index string
+			if (*ch == 10) {
+				ch++;
+				break;
+			}
+		}
+		memmove(*buf, ch, size - (unsigned long)(ch-*buf));
+
+		// resolve link
+		if (!strncmp(*buf, "@LINK", 5)) {
+			for (ch = *buf; *ch; ch++) {		// null before nl
+				if (*ch == 10) {
+					*ch = 0;
+					break;
+				}
+			}
+			findKeyIndex(*buf + 6, &offset);
+		}
+		else break;
+	}
+	while (true);	// while we're resolving links
+
+	if (idxbuflocal) {
+		__u32 localsize = strlen(idxbuflocal);
+		localsize = (localsize < (size - 1)) ? localsize : (size - 1);
+		strncpy(*idxbuf, idxbuflocal, localsize);
+		(*idxbuf)[localsize] = 0;
+		free(idxbuflocal);
+	}
+	__u32 block = 0;
+	__u32 entry = 0;
+	memmove(&block, *buf, sizeof(__u32));
+	memmove(&entry, *buf + sizeof(__u32), sizeof(__u32));
+	block = swordtoarch32(block);
+	entry = swordtoarch32(entry);
+	getCompressedText(block, entry, buf);
+}
+
+
+/******************************************************************************
+ * zStr::getCompressedText - Get text entry from a compressed index / zdata
+ * 		file.
+ */
+
+void zStr::getCompressedText(long block, long entry, char **buf) const {
+
+	__u32 size = 0;
+
+	if (cacheBlockIndex != block) {
+		__u32 start = 0;
+
+		zdxfd->seek(block * ZDXENTRYSIZE, SEEK_SET);
+		zdxfd->read(&start, 4);
+		zdxfd->read(&size, 4);
+		start = swordtoarch32(start);
+		size = swordtoarch32(size);
+
+		SWBuf buf;
+		buf.setSize(size + 5);
+		zdtfd->seek(start, SEEK_SET);
+		zdtfd->read(buf.getRawData(), size);
+
+		flushCache();
+
+		unsigned long len = size;
+		buf.setSize(size);
+		rawZFilter(buf, 0); // 0 = decipher
+
+		compressor->zBuf(&len, buf.getRawData());
+		char *rawBuf = compressor->Buf(0, &len);
+		cacheBlock = new EntriesBlock(rawBuf, len);
+		cacheBlockIndex = block;
+	}
+	size = cacheBlock->getEntrySize(entry);
+	*buf = (*buf) ? (char *)realloc(*buf, size*2 + 1) : (char *)malloc(size*2 + 1);
+	strcpy(*buf, cacheBlock->getEntry(entry));
+}
+
+
+/******************************************************************************
+ * zLD::settext	- Sets text for current offset
+ *
+ * ENT: key	- key for this entry
+ *	buf	- buffer to store
+ *      len     - length of buffer (0 - null terminated)
+ */
+
+void zStr::setText(const char *ikey, const char *buf, long len) {
+
+	static const char nl[] = {13, 10};
+
+	__u32 start, outstart;
+	__u32 size, outsize;
+	__s32 endoff;
+	long idxoff = 0;
+	__s32 shiftSize;
+	char *tmpbuf = 0;
+	char *key = 0;
+	char *dbKey = 0;
+	char *idxBytes = 0;
+	char *outbuf = 0;
+	char *ch = 0;
+
+	len = (len < 0) ? strlen(buf) : len;
+	stdstr(&key, ikey, 3);
+	if (!caseSensitive) toupperstr_utf8(key, strlen(key)*3);
+
+	char notFound = findKeyIndex(ikey, &idxoff, 0);
+	if (!notFound) {
+		getKeyFromIdxOffset(idxoff, &dbKey);
+		int diff = strcmp(key, dbKey);
+		if (diff < 0) {
+		}
+		else if (diff > 0) {
+			idxoff += IDXENTRYSIZE;
+		}
+		else if ((!diff) && (len > 0 /*we're not deleting*/)) { // got absolute entry
+			do {
+				idxfd->seek(idxoff, SEEK_SET);
+				idxfd->read(&start, 4);
+				idxfd->read(&size, 4);
+				start = swordtoarch32(start);
+				size = swordtoarch32(size);
+
+				tmpbuf = new char [ size + 2 ];
+				memset(tmpbuf, 0, size + 2);
+				datfd->seek(start, SEEK_SET);
+				datfd->read(tmpbuf, size);
+
+				for (ch = tmpbuf; *ch; ch++) {		// skip over index string
+					if (*ch == 10) {
+						ch++;
+						break;
+					}
+				}
+				memmove(tmpbuf, ch, size - (unsigned long)(ch-tmpbuf));
+
+				// resolve link
+				if (!strncmp(tmpbuf, "@LINK", 5) && (len)) {
+					for (ch = tmpbuf; *ch; ch++) {		// null before nl
+						if (*ch == 10) {
+							*ch = 0;
+							break;
+						}
+					}
+					findKeyIndex(tmpbuf + IDXENTRYSIZE, &idxoff);
+					delete [] tmpbuf;
+				}
+				else break;
+			}
+			while (true);	// while we're resolving links
+		}
+	}
+
+	endoff = idxfd->seek(0, SEEK_END);
+
+	shiftSize = endoff - idxoff;
+
+	if (shiftSize > 0) {
+	        idxBytes = new char [ shiftSize ];
+		idxfd->seek(idxoff, SEEK_SET);
+		idxfd->read(idxBytes, shiftSize);
+	}
+
+	outbuf = new char [ len + strlen(key) + 5 ];
+	sprintf(outbuf, "%s%c%c", key, 13, 10);
+	size = strlen(outbuf);
+	if (len > 0) {	// NOT a link
+		if (!cacheBlock) {
+			flushCache();
+			cacheBlock = new EntriesBlock();
+			cacheBlockIndex = (zdxfd->seek(0, SEEK_END) / ZDXENTRYSIZE);
+		}
+		else if (cacheBlock->getCount() >= blockCount) {
+			flushCache();
+			cacheBlock = new EntriesBlock();
+			cacheBlockIndex = (zdxfd->seek(0, SEEK_END) / ZDXENTRYSIZE);
+		}
+		__u32 entry = cacheBlock->addEntry(buf);
+		cacheDirty = true;
+		outstart = archtosword32(cacheBlockIndex);
+		outsize = archtosword32(entry);
+		memcpy (outbuf + size, &outstart, sizeof(__u32));
+		memcpy (outbuf + size + sizeof(__u32), &outsize, sizeof(__u32));
+		size += (sizeof(__u32) * 2);
+	}
+	else {	// link
+		memcpy(outbuf + size, buf, len);
+		size += len;
+	}
+
+	start = datfd->seek(0, SEEK_END);
+
+	outstart = archtosword32(start);
+	outsize  = archtosword32(size);
+
+	idxfd->seek(idxoff, SEEK_SET);
+	if (len > 0) {
+		datfd->seek(start, SEEK_SET);
+		datfd->write(outbuf, size);
+
+		// add a new line to make data file easier to read in an editor
+		datfd->write(&nl, 2);
+		
+		idxfd->write(&outstart, 4);
+		idxfd->write(&outsize, 4);
+		if (idxBytes) {
+			idxfd->write(idxBytes, shiftSize);
+		}
+	}
+	else {	// delete entry
+		if (idxBytes) {
+			idxfd->write(idxBytes+IDXENTRYSIZE, shiftSize-IDXENTRYSIZE);
+			idxfd->seek(-1, SEEK_CUR);	// last valid byte
+			FileMgr::getSystemFileMgr()->trunc(idxfd);	// truncate index
+		}
+	}
+
+	if (idxBytes)
+		delete [] idxBytes;
+	delete [] key;
+	delete [] outbuf;
+	free(dbKey);
+}
+
+
+/******************************************************************************
+ * zLD::linkentry	- links one entry to another
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	destidxoff	- dest offset into .vss
+ *	srcidxoff		- source offset into .vss
+ */
+
+void zStr::linkEntry(const char *destkey, const char *srckey) {
+	char *text = new char [ strlen(destkey) + 7 ];
+	sprintf(text, "@LINK %s", destkey);
+	setText(srckey, text);
+	delete [] text;
+}
+
+
+void zStr::flushCache() const {
+
+	static const char nl[] = {13, 10};
+
+	if (cacheBlock) {
+		if (cacheDirty) {
+			__u32 start = 0;
+			unsigned long size = 0;
+			__u32 outstart = 0, outsize = 0;
+
+			const char *rawBuf = cacheBlock->getRawData(&size);
+			compressor->Buf(rawBuf, &size);
+			compressor->zBuf(&size);
+
+			SWBuf buf;
+			buf.setSize(size + 5);
+			memcpy(buf.getRawData(), compressor->zBuf(&size), size); // 1 = encipher
+			buf.setSize(size);
+			rawZFilter(buf, 1); // 1 = encipher
+
+			long zdxSize = zdxfd->seek(0, SEEK_END);
+			unsigned long zdtSize = zdtfd->seek(0, SEEK_END);
+
+			if ((cacheBlockIndex * ZDXENTRYSIZE) > (zdxSize - ZDXENTRYSIZE)) {	// New Block
+				start = zdtSize;
+			}
+			else {
+				zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET);
+				zdxfd->read(&start, 4);
+				zdxfd->read(&outsize, 4);
+				start = swordtoarch32(start);
+				outsize = swordtoarch32(outsize);
+				if (start + outsize >= zdtSize) {	// last entry, just overwrite
+					// start is already set
+				}
+				else	if (size < outsize) {	// middle entry, but smaller, that's fine and let's preserve bigger size
+					size = outsize;
+				}
+				else {	// middle and bigger-- we have serious problems, for now let's put it at the end = lots of wasted space
+					start = zdtSize;
+				}
+			}
+
+
+
+			outstart = archtosword32(start);
+			outsize  = archtosword32((__u32)size);
+
+			zdxfd->seek(cacheBlockIndex * ZDXENTRYSIZE, SEEK_SET);
+			zdtfd->seek(start, SEEK_SET);
+			zdtfd->write(buf, size);
+
+			// add a new line to make data file easier to read in an editor
+			zdtfd->write(&nl, 2);
+			
+			zdxfd->write(&outstart, 4);
+			zdxfd->write(&outsize, 4);
+		}
+		delete cacheBlock;
+		cacheBlock = 0;
+	}
+	cacheBlockIndex = -1;
+	cacheDirty = false;
+}
+
+
+/******************************************************************************
+ * zLD::CreateModule	- Creates new module files
+ *
+ * ENT: path	- directory to store module files
+ * RET: error status
+ */
+
+signed char zStr::createModule(const char *ipath) {
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd, *fd2;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s.dat", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s.idx", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	sprintf(buf, "%s.zdt", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	sprintf(buf, "%s.zdx", path);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	delete [] path;
+	
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/common/zverse.cpp b/src/modules/common/zverse.cpp
new file mode 100644
index 0000000..c280d98
--- /dev/null
+++ b/src/modules/common/zverse.cpp
@@ -0,0 +1,507 @@
+/******************************************************************************
+ *
+ *  zverse.cpp -	code for class 'zVerse'- a module that reads raw text
+ *			files:  ot and nt using indexs ??.bks ??.cps ??.vss
+ *			and provides lookup and parsing functions based on
+ *			class VerseKey for compressed modules
+ *
+ * $Id: zverse.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include <utilstr.h>
+#include <versekey.h>
+#include <zverse.h>
+#include <sysdata.h>
+#include <swbuf.h>
+#include <filemgr.h>
+#include <swcomprs.h>
+
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * zVerse Statics
+ */
+
+int zVerse::instance = 0;
+
+const char zVerse::uniqueIndexID[] = {'X', 'r', 'v', 'c', 'b'};
+
+/******************************************************************************
+ * zVerse Constructor - Initializes data for instance of zVerse
+ *
+ * ENT:	ipath - path of the directory where data and index files are located.
+ *		be sure to include the trailing separator (e.g. '/' or '\')
+ *		(e.g. 'modules/texts/rawtext/webster/')
+ *		fileMode - open mode for the files (FileMgr::RDONLY, etc.)
+ *		blockType - verse, chapter, book, etc.
+ */
+
+zVerse::zVerse(const char *ipath, int fileMode, int blockType, SWCompress *icomp)
+{
+	// this line, instead of just defaulting, to keep FileMgr out of header
+	if (fileMode == -1) fileMode = FileMgr::RDONLY;
+
+	SWBuf buf;
+
+	nl = '\n';
+	path = 0;
+	cacheBufIdx = -1;
+	cacheTestament = 0;
+	cacheBuf = 0;
+	dirtyCache = false;
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	compressor = (icomp) ? icomp : new SWCompress();
+
+	if (fileMode == -1) { // try read/write if possible
+		fileMode = FileMgr::RDWR;
+	}
+		
+	buf.setFormatted("%s/ot.%czs", path, uniqueIndexID[blockType]);
+	idxfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/nt.%czs", path, uniqueIndexID[blockType]);
+	idxfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/ot.%czz", path, uniqueIndexID[blockType]);
+	textfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/nt.%czz", path, uniqueIndexID[blockType]);
+	textfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/ot.%czv", path, uniqueIndexID[blockType]);
+	compfp[0] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+
+	buf.setFormatted("%s/nt.%czv", path, uniqueIndexID[blockType]);
+	compfp[1] = FileMgr::getSystemFileMgr()->open(buf, fileMode, true);
+	
+	instance++;
+}
+
+
+/******************************************************************************
+ * zVerse Destructor - Cleans up instance of zVerse
+ */
+
+zVerse::~zVerse()
+{
+	int loop1;
+
+	if (cacheBuf) {
+		flushCache();
+		free(cacheBuf);
+	}
+
+	if (path)
+		delete [] path;
+
+	if (compressor)
+		delete compressor;
+
+	--instance;
+
+	for (loop1 = 0; loop1 < 2; loop1++) {
+		FileMgr::getSystemFileMgr()->close(idxfp[loop1]);
+		FileMgr::getSystemFileMgr()->close(textfp[loop1]);
+		FileMgr::getSystemFileMgr()->close(compfp[loop1]);
+	}
+}
+
+
+/******************************************************************************
+ * zVerse::findoffset	- Finds the offset of the key verse from the indexes
+ *
+ *
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	book	- book      to find (0 - testament    introduction)
+ *	chapter	- chapter   to find (0 - book         introduction)
+ *	verse	- verse     to find (0 - chapter      introduction)
+ *	start	- address to store the starting offset
+ *	size	- address to store the size of the entry
+ */
+
+void zVerse::findOffset(char testmt, long idxoff, long *start, unsigned short *size, unsigned long *buffnum) const
+{
+	__u32 ulBuffNum    = 0;	          // buffer number
+	__u32 ulVerseStart = 0;	       // verse offset within buffer
+	__u16 usVerseSize  = 0;	       // verse size
+	// set start to offset in
+	// set size to
+	// set
+	*start = *size = *buffnum = 0;
+	//fprintf(stderr, "Finding offset %ld\n", idxoff);
+	idxoff *= 10;
+	if (!testmt) {
+		testmt = ((idxfp[0]) ? 1:2);
+	}
+	
+	// assert we have and valid file descriptor
+	if (compfp[testmt-1]->getFd() < 1)
+		return;
+		
+	long newOffset = compfp[testmt-1]->seek(idxoff, SEEK_SET);
+	if (newOffset == idxoff) {
+		if (compfp[testmt-1]->read(&ulBuffNum, 4) != 4) {
+			fprintf(stderr, "Error reading ulBuffNum\n");
+			return;
+		}
+	}
+	else return;	
+	
+	if (compfp[testmt-1]->read(&ulVerseStart, 4) < 2)
+	{
+		fprintf(stderr, "Error reading ulVerseStart\n");
+		return;
+	}
+	if (compfp[testmt-1]->read(&usVerseSize, 2) < 2)
+	{
+		fprintf(stderr, "Error reading usVerseSize\n");
+		return;
+	}
+
+	*buffnum = swordtoarch32(ulBuffNum);
+	*start = swordtoarch32(ulVerseStart);
+	*size = swordtoarch16(usVerseSize);
+
+}
+
+
+/******************************************************************************
+ * zVerse::zreadtext	- gets text at a given offset
+ *
+ * ENT:	testmt	- testament file to search in (0 - Old; 1 - New)
+ *	start	- starting offset where the text is located in the file
+ *	size	- size of text entry + 1 (null)
+ *	buf	- buffer to store text
+ *
+ */
+
+void zVerse::zReadText(char testmt, long start, unsigned short size, unsigned long ulBuffNum, SWBuf &inBuf) const {
+	__u32 ulCompOffset = 0;	       // compressed buffer start
+	__u32 ulCompSize   = 0;	             // buffer size compressed
+	__u32 ulUnCompSize = 0;	          // buffer size uncompressed
+
+	if (!testmt) {
+		testmt = ((idxfp[0]) ? 1:2);
+	}
+	
+	// assert we have and valid file descriptor
+	if (compfp[testmt-1]->getFd() < 1)
+		return;
+	
+	if (size && 
+		!(((long) ulBuffNum == cacheBufIdx) && (testmt == cacheTestament) && (cacheBuf))) {
+		//fprintf(stderr, "Got buffer number{%ld} versestart{%ld} versesize{%d}\n", ulBuffNum, ulVerseStart, usVerseSize);
+
+		if (idxfp[testmt-1]->seek(ulBuffNum*12, SEEK_SET)!=(long) ulBuffNum*12)
+		{
+			fprintf(stderr, "Error seeking compressed file index\n");
+			return;
+		}
+		if (idxfp[testmt-1]->read(&ulCompOffset, 4)<4)
+		{
+			fprintf(stderr, "Error reading ulCompOffset\n");
+			return;
+		}
+		if (idxfp[testmt-1]->read(&ulCompSize, 4)<4)
+		{
+			fprintf(stderr, "Error reading ulCompSize\n");
+			return;
+		}
+		if (idxfp[testmt-1]->read(&ulUnCompSize, 4)<4)
+		{
+			fprintf(stderr, "Error reading ulUnCompSize\n");
+			return;
+		}
+
+		ulCompOffset  = swordtoarch32(ulCompOffset);
+		ulCompSize  = swordtoarch32(ulCompSize);
+		ulUnCompSize  = swordtoarch32(ulUnCompSize);
+
+		if (textfp[testmt-1]->seek(ulCompOffset, SEEK_SET)!=(long)ulCompOffset)
+		{
+			fprintf(stderr, "Error: could not seek to right place in compressed text\n");
+			return;
+		}
+		SWBuf pcCompText;
+		pcCompText.setSize(ulCompSize+5);
+
+		if (textfp[testmt-1]->read(pcCompText.getRawData(), ulCompSize)<(long)ulCompSize) {
+			fprintf(stderr, "Error reading compressed text\n");
+			return;
+		}
+		pcCompText.setSize(ulCompSize);
+		rawZFilter(pcCompText, 0); // 0 = decipher
+		
+		unsigned long bufSize = ulCompSize;
+		compressor->zBuf(&bufSize, pcCompText.getRawData());
+
+		if (cacheBuf) {
+			flushCache();
+			free(cacheBuf);
+		}
+		
+		unsigned long len = 0;
+		compressor->Buf(0, &len);
+		cacheBuf = (char *)calloc(len + 1, 1);
+		memcpy(cacheBuf, compressor->Buf(), len);
+		cacheBufSize = strlen(cacheBuf);  // TODO: can we just use len?
+		cacheTestament = testmt;
+		cacheBufIdx = ulBuffNum;
+	}	
+	
+	inBuf = "";
+	if ((size > 0) && cacheBuf && ((unsigned)start < cacheBufSize)) {
+		inBuf.setFillByte(0);
+		inBuf.setSize(size+1);
+		strncpy(inBuf.getRawData(), &(cacheBuf[start]), size);
+		inBuf.setSize(strlen(inBuf.c_str()));
+	}
+}
+
+
+/******************************************************************************
+ * zVerse::settext	- Sets text for current offset
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	idxoff	- offset into .vss
+ *	buf	- buffer to store
+ *      len     - length of buffer (0 - null terminated)
+ */
+
+void zVerse::doSetText(char testmt, long idxoff, const char *buf, long len) {
+
+	len = (len < 0) ? strlen(buf) : len;
+	if (!testmt) 
+		testmt = ((idxfp[0]) ? 1:2);
+	if ((!dirtyCache) || (cacheBufIdx < 0)) {
+		cacheBufIdx = idxfp[testmt-1]->seek(0, SEEK_END) / 12;
+		cacheTestament = testmt;
+		if (cacheBuf)
+			free(cacheBuf);
+		cacheBuf = (char *)calloc(len + 1, 1);
+	}
+	else cacheBuf = (char *)((cacheBuf)?realloc(cacheBuf, strlen(cacheBuf)+(len + 1)):calloc((len + 1), 1));
+
+	dirtyCache = true;
+
+	__u32 start;
+	__u16 size;
+	__u32 outBufIdx = cacheBufIdx;
+
+	idxoff *= 10;
+	size = len;
+
+	start = strlen(cacheBuf);
+
+	if (!size)
+		start = outBufIdx = 0;
+
+	outBufIdx = archtosword32(outBufIdx);
+	start  = archtosword32(start);
+	size   = archtosword16(size);
+
+	compfp[testmt-1]->seek(idxoff, SEEK_SET);
+	compfp[testmt-1]->write(&outBufIdx, 4);
+	compfp[testmt-1]->write(&start, 4);
+	compfp[testmt-1]->write(&size, 2);
+	strcat(cacheBuf, buf);
+}
+
+
+void zVerse::flushCache() const {
+	if (dirtyCache) {
+		__u32 idxoff;
+		__u32 start, outstart;
+		__u32 size, outsize;
+		__u32 zsize, outzsize;
+
+		idxoff = cacheBufIdx * 12;
+		if (cacheBuf) {
+			size = outsize = zsize = outzsize = strlen(cacheBuf);
+			if (size) {
+	//			if (compressor) {
+	//				delete compressor;
+	//				compressor = new LZSSCompress();
+	//			}
+				compressor->Buf(cacheBuf);
+				unsigned long tmpSize;
+				compressor->zBuf(&tmpSize);
+				outzsize = zsize = tmpSize;
+
+				SWBuf buf;
+				buf.setSize(zsize + 5);
+				memcpy(buf.getRawData(), compressor->zBuf(&tmpSize), tmpSize);
+				outzsize = zsize = tmpSize;
+				buf.setSize(zsize);
+				rawZFilter(buf, 1); // 1 = encipher
+
+				start = outstart = textfp[cacheTestament-1]->seek(0, SEEK_END);
+
+				outstart  = archtosword32(start);
+				outsize   = archtosword32(size);
+				outzsize  = archtosword32(zsize);
+
+				textfp[cacheTestament-1]->write(buf, zsize);
+
+				idxfp[cacheTestament-1]->seek(idxoff, SEEK_SET);
+				idxfp[cacheTestament-1]->write(&outstart, 4);
+				idxfp[cacheTestament-1]->write(&outzsize, 4);
+				idxfp[cacheTestament-1]->write(&outsize, 4);
+			}
+			free(cacheBuf);
+			cacheBuf = 0;
+		}
+		dirtyCache = false;
+	}
+}
+
+/******************************************************************************
+ * RawVerse::linkentry	- links one entry to another
+ *
+ * ENT: testmt	- testament to find (0 - Bible/module introduction)
+ *	destidxoff	- dest offset into .vss
+ *	srcidxoff		- source offset into .vss
+ */
+
+void zVerse::doLinkEntry(char testmt, long destidxoff, long srcidxoff) {
+	__s32 bufidx;
+	__s32 start;
+	__u16 size;
+
+	destidxoff *= 10;
+	srcidxoff  *= 10;
+
+	if (!testmt)
+		testmt = ((idxfp[1]) ? 1:2);
+
+	// get source
+	compfp[testmt-1]->seek(srcidxoff, SEEK_SET);
+	compfp[testmt-1]->read(&bufidx, 4);
+	compfp[testmt-1]->read(&start, 4);
+	compfp[testmt-1]->read(&size, 2);
+
+	// write dest
+	compfp[testmt-1]->seek(destidxoff, SEEK_SET);
+	compfp[testmt-1]->write(&bufidx, 4);
+	compfp[testmt-1]->write(&start, 4);
+	compfp[testmt-1]->write(&size, 2);
+}
+
+
+/******************************************************************************
+ * RawVerse::CreateModule	- Creates new module files
+ *
+ * ENT: path	- directory to store module files
+ * RET: error status
+ */
+
+char zVerse::createModule(const char *ipath, int blockBound, const char *v11n)
+{
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd, *fd2;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s/ot.%czs", path, uniqueIndexID[blockBound]);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/nt.%czs", path, uniqueIndexID[blockBound]);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/ot.%czz", path, uniqueIndexID[blockBound]);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/nt.%czz", path, uniqueIndexID[blockBound]);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	sprintf(buf, "%s/ot.%czv", path, uniqueIndexID[blockBound]);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+
+	sprintf(buf, "%s/nt.%czv", path, uniqueIndexID[blockBound]);
+	FileMgr::removeFile(buf);
+	fd2 = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd2->getFd();
+
+	VerseKey vk;
+	vk.setVersificationSystem(v11n);
+	vk.setIntros(true);
+
+	__s32 offset = 0;
+	__s16 size = 0;
+	offset = archtosword32(offset);
+	size   = archtosword16(size);
+
+	for (vk = TOP; !vk.popError(); vk++) {
+		if (vk.getTestament() < 2) {
+			fd->write(&offset, 4);	//compBufIdxOffset
+			fd->write(&offset, 4);
+			fd->write(&size, 2);
+		}
+		else {
+			fd2->write(&offset, 4);	//compBufIdxOffset
+			fd2->write(&offset, 4);
+			fd2->write(&size, 2);
+		}
+	}
+	fd2->write(&offset, 4);	//compBufIdxOffset
+	fd2->write(&offset, 4);
+	fd2->write(&size, 2);
+
+	FileMgr::getSystemFileMgr()->close(fd);
+	FileMgr::getSystemFileMgr()->close(fd2);
+
+	delete [] path;
+	delete [] buf;
+	
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/Makefile b/src/modules/filters/Makefile
new file mode 100644
index 0000000..1a2d00d
--- /dev/null
+++ b/src/modules/filters/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/filters/Makefile.am b/src/modules/filters/Makefile.am
new file mode 100644
index 0000000..a3d1154
--- /dev/null
+++ b/src/modules/filters/Makefile.am
@@ -0,0 +1,109 @@
+filtersdir = $(top_srcdir)/src/modules/filters
+
+libsword_la_SOURCES += $(filtersdir)/swbasicfilter.cpp
+libsword_la_SOURCES += $(filtersdir)/swoptfilter.cpp
+
+GBFFIL = $(filtersdir)/gbfhtml.cpp
+GBFFIL += $(filtersdir)/gbfhtmlhref.cpp
+GBFFIL += $(filtersdir)/gbfxhtml.cpp
+GBFFIL += $(filtersdir)/gbfwebif.cpp
+GBFFIL += $(filtersdir)/gbfplain.cpp
+GBFFIL += $(filtersdir)/gbfrtf.cpp
+GBFFIL += $(filtersdir)/gbfstrongs.cpp
+GBFFIL += $(filtersdir)/gbffootnotes.cpp
+GBFFIL += $(filtersdir)/gbfheadings.cpp
+GBFFIL += $(filtersdir)/gbfredletterwords.cpp
+GBFFIL += $(filtersdir)/gbfmorph.cpp
+GBFFIL += $(filtersdir)/gbfwordjs.cpp
+
+THMLFIL = $(filtersdir)/thmlstrongs.cpp
+THMLFIL += $(filtersdir)/thmlfootnotes.cpp
+THMLFIL += $(filtersdir)/thmlheadings.cpp
+THMLFIL += $(filtersdir)/thmlmorph.cpp
+THMLFIL += $(filtersdir)/thmllemma.cpp
+THMLFIL += $(filtersdir)/thmlscripref.cpp
+THMLFIL += $(filtersdir)/thmlvariants.cpp
+THMLFIL += $(filtersdir)/thmlgbf.cpp
+THMLFIL += $(filtersdir)/thmlrtf.cpp
+THMLFIL += $(filtersdir)/thmlhtml.cpp
+THMLFIL += $(filtersdir)/thmlhtmlhref.cpp
+THMLFIL += $(filtersdir)/thmlxhtml.cpp
+THMLFIL += $(filtersdir)/thmlwebif.cpp
+THMLFIL += $(filtersdir)/thmlwordjs.cpp
+
+TEIFIL = $(filtersdir)/teiplain.cpp
+TEIFIL += $(filtersdir)/teirtf.cpp
+TEIFIL += $(filtersdir)/teihtmlhref.cpp
+TEIFIL += $(filtersdir)/teixhtml.cpp
+
+CONVFIL = $(filtersdir)/gbfthml.cpp
+CONVFIL += $(filtersdir)/gbfosis.cpp
+CONVFIL += $(filtersdir)/thmlosis.cpp
+CONVFIL += $(filtersdir)/thmlplain.cpp
+CONVFIL += $(filtersdir)/osisosis.cpp
+
+OSISFIL = $(filtersdir)/osisheadings.cpp
+OSISFIL += $(filtersdir)/osisfootnotes.cpp 
+OSISFIL += $(filtersdir)/osishtmlhref.cpp
+OSISFIL += $(filtersdir)/osisxhtml.cpp
+OSISFIL += $(filtersdir)/osiswebif.cpp
+OSISFIL += $(filtersdir)/osismorph.cpp
+OSISFIL += $(filtersdir)/osisstrongs.cpp
+OSISFIL += $(filtersdir)/osisplain.cpp
+OSISFIL += $(filtersdir)/osisrtf.cpp
+OSISFIL += $(filtersdir)/osislemma.cpp
+OSISFIL += $(filtersdir)/osisredletterwords.cpp
+OSISFIL += $(filtersdir)/osisscripref.cpp
+OSISFIL += $(filtersdir)/osisvariants.cpp
+OSISFIL += $(filtersdir)/osiswordjs.cpp
+OSISFIL += $(filtersdir)/osismorphsegmentation.cpp
+OSISFIL += $(filtersdir)/osisglosses.cpp
+OSISFIL += $(filtersdir)/osisenum.cpp
+OSISFIL += $(filtersdir)/osisxlit.cpp
+OSISFIL += $(filtersdir)/osisreferencelinks.cpp
+
+libsword_la_SOURCES += $(filtersdir)/latin1utf8.cpp
+libsword_la_SOURCES += $(filtersdir)/latin1utf16.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8utf16.cpp
+libsword_la_SOURCES += $(filtersdir)/utf16utf8.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8html.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8latin1.cpp
+libsword_la_SOURCES += $(filtersdir)/unicodertf.cpp
+libsword_la_SOURCES += $(filtersdir)/scsuutf8.cpp
+
+libsword_la_SOURCES += $(filtersdir)/utf8cantillation.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8hebrewpoints.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8arabicpoints.cpp
+libsword_la_SOURCES += $(filtersdir)/utf8greekaccents.cpp
+
+libsword_la_SOURCES += $(filtersdir)/cipherfil.cpp
+
+PLFIL = $(filtersdir)/rtfhtml.cpp
+PLFIL += $(filtersdir)/greeklexattribs.cpp
+PLFIL += $(filtersdir)/papyriplain.cpp
+
+
+SWICUSRC = $(filtersdir)/utf8transliterator.cpp
+SWICUSRC += $(filtersdir)/utf8nfc.cpp
+SWICUSRC += $(filtersdir)/utf8nfkd.cpp
+SWICUSRC += $(filtersdir)/utf8arshaping.cpp
+SWICUSRC += $(filtersdir)/utf8bidireorder.cpp
+
+if HAVE_ICU
+DISTSWICUSRC =
+SWREALICUSRC = $(SWICUSRC)
+else
+if HAVE_ICUSWORD
+DISTSWICUSRC =
+SWREALICUSRC = $(SWICUSRC)
+else
+DISTSWICUSRC = $(SWICUSRC)
+SWREALICUSRC =
+endif
+endif
+
+libsword_la_SOURCES += $(SWREALICUSRC)
+EXTRA_DIST = $(DISTSWICUSRC)
+
+libsword_la_SOURCES += $(OSISFIL) $(GBFFIL) \
+	$(THMLFIL) $(CONVFIL) $(PLFIL) $(TEIFIL)
diff --git a/src/modules/filters/cipherfil.cpp b/src/modules/filters/cipherfil.cpp
new file mode 100644
index 0000000..e5422f3
--- /dev/null
+++ b/src/modules/filters/cipherfil.cpp
@@ -0,0 +1,68 @@
+/******************************************************************************
+ *
+ *  cipherfil.cpp -	CipherFilter, a SWFilter descendant to decipher
+ *			a module
+ *
+ * $Id: cipherfil.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <cipherfil.h>
+#include <swcipher.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+CipherFilter::CipherFilter(const char *key) {
+	cipher = new SWCipher((unsigned char *)key);
+}
+
+
+CipherFilter::~CipherFilter() {
+	delete cipher;
+}
+
+
+SWCipher *CipherFilter::getCipher() {
+	return cipher;
+}
+
+
+char CipherFilter::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (text.length() > 2) { //check if it's large enough to substract 2 in the next step.
+		unsigned long len = text.length();
+		if (!key) {	// hack, using key to determine encipher, or decipher
+			cipher->cipherBuf(&len, text.getRawData()); //set buffer to enciphered text
+			memcpy(text.getRawData(), cipher->Buf(), len);
+//			text = cipher->Buf(); //get the deciphered buffer
+		}
+		else if ((unsigned long)key == 1) {
+			cipher->Buf(text.getRawData(), len);
+			memcpy(text.getRawData(), cipher->cipherBuf(&len), len);
+//			text = cipher->cipherBuf(&len);
+		}
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/gbffootnotes.cpp b/src/modules/filters/gbffootnotes.cpp
new file mode 100644
index 0000000..7b867f1
--- /dev/null
+++ b/src/modules/filters/gbffootnotes.cpp
@@ -0,0 +1,215 @@
+/******************************************************************************
+ *
+ *  gbffootnotes.cpp -	SWFilter descendant to hide or show footnotes
+ *			in a GBF module
+ *
+ * $Id: gbffootnotes.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <gbffootnotes.h>
+#include <swmodule.h>
+#include <swbuf.h>
+#include <versekey.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Footnotes";
+	static const char oTip[]  = "Toggles Footnotes On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+GBFFootnotes::GBFFootnotes() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+GBFFootnotes::~GBFFootnotes() {
+}
+
+
+char GBFFootnotes::processText (SWBuf &text, const SWKey *key, const SWModule *module)
+{
+
+	SWBuf token;
+	bool intoken    = false;
+	bool hide       = false;
+	SWBuf tagText;
+	XMLTag startTag;
+	SWBuf refs = "";
+	int footnoteNum = 1;
+	char buf[254];
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+
+	//XMLTag tag;
+
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+
+			//XMLTag tag(token);
+			if (!strncmp(token, "RF",2)) {
+// 				tag = token;
+
+				refs = "";
+				startTag = token;
+				hide = true;
+				tagText = "";
+				continue;
+			}
+			else if (!strncmp(token, "Rf",2)) {
+				if (module->isProcessEntryAttributes()) {
+					//tag = token;
+
+					if((tagText.length() == 1) || !strcmp(module->getName(), "IGNT")) {
+						if (option) { // for ASV marks text in verse then put explanation at end of verse
+							text.append(" <FS>[");
+							text.append(tagText);
+							text.append("]<Fs>");
+							hide = false;
+							continue;
+						}
+					}
+					SWBuf fc = module->getEntryAttributes()["Footnote"]["count"]["value"];
+					footnoteNum = (fc.length()) ? atoi(fc.c_str()) : 0;
+					sprintf(buf, "%i", ++footnoteNum);
+					module->getEntryAttributes()["Footnote"]["count"]["value"] = buf;
+					StringList attributes = startTag.getAttributeNames();
+					for (StringList::const_iterator it = attributes.begin(); it != attributes.end(); it++) {
+						module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
+					}
+					module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
+					startTag.setAttribute("swordFootnote", buf);
+				}
+				hide = false;
+				if (option) {
+					text.append(startTag);
+					text.append(tagText);
+				}
+				else	continue;
+			}
+			if (!hide) {
+				text.append('<');
+				text.append(token);
+				text.append('>');
+			}
+			else {
+				tagText.append('<');
+				tagText.append(token);
+				tagText.append('>');
+			}
+			continue;
+		}
+		if (intoken) { //copy token
+			token.append(*from);
+		}
+		else if (!hide) { //copy text which is not inside a token
+			text.append(*from);
+		}
+		else tagText.append(*from);
+	}
+	return 0;
+
+	/*
+	if (!option) {	// if we don't want footnotes
+		char token[4096]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		int len;
+		bool hide = false;
+
+		const char *from;
+		SWBuf orig = text;
+		from = orig.c_str();
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+//				memset(token, 0, 4096);
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				switch (*token) {
+				case 'R':				// Reference
+					switch(token[1]) {
+					case 'F':               // Begin footnote
+						hide = true;
+						break;
+					case 'f':               // end footnote
+						hide = false;
+						break;
+					}
+					continue;	// skip token
+				case 'W':
+					if (token[1] == 'T') {
+						switch (token[2]) {
+						case 'P':
+						case 'S':
+						case 'A':
+							continue; // remove this token
+						default:
+							break;
+						}
+					}
+				}
+				// if not a footnote token, keep token in text
+				if (!hide) {
+					text += '<';
+					text += token;
+					text += '>';
+				}
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 4090)
+					token[tokpos++] = *from;
+					token[tokpos+2] = 0;	// +2 cuz we init token with 2 extra '0' because of switch statement
+			}
+			else	{
+				if (!hide) {
+					text += *from;
+				}
+			}
+		}
+	}
+	return 0;*/
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfheadings.cpp b/src/modules/filters/gbfheadings.cpp
new file mode 100644
index 0000000..7e19ea1
--- /dev/null
+++ b/src/modules/filters/gbfheadings.cpp
@@ -0,0 +1,110 @@
+/******************************************************************************
+ *
+ *  gbfheadings.cpp -	SWFilter descendant to hide or show headings
+ *			in a GBF module
+ *
+ * $Id: gbfheadings.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <gbfheadings.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Headings";
+	static const char oTip[]  = "Toggles Headings On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+GBFHeadings::GBFHeadings() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+GBFHeadings::~GBFHeadings() {
+}
+
+
+char GBFHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (!option) {	// if we don't want headings
+		char token[2048]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		bool hide = false;
+
+	const char *from;
+	SWBuf orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+//				memset(token, 0, 2048);
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				switch (*token) {
+				case 'T':				// Reference
+					switch(token[1]) {
+					case 'S':               // Begin heading
+						hide = true;
+						break;
+					case 's':               // end heading
+						hide = false;
+						break;
+					}
+					continue;	// skip token
+				}
+				// if not a heading token, keep token in text
+				if (!hide) {
+					text += '<';
+					for (char *tok = token; *tok; tok++)
+						text += *tok;
+					text += '>';
+				}
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 2045)
+					token[tokpos++] = *from;
+					token[tokpos+2] = 0;
+			}
+			else	{
+				if (!hide) {
+					text += *from;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfhtml.cpp b/src/modules/filters/gbfhtml.cpp
new file mode 100644
index 0000000..542c4c9
--- /dev/null
+++ b/src/modules/filters/gbfhtml.cpp
@@ -0,0 +1,187 @@
+/***************************************************************************
+ *
+ *  gbfhtml.cpp -	GBF to HTML filter 
+ *
+ * $Id: gbfhtml.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <gbfhtml.h>
+#include <ctype.h>
+
+SWORD_NAMESPACE_START
+
+GBFHTML::GBFHTML() {
+	setTokenStart("<");
+	setTokenEnd(">");
+	
+	setTokenCaseSensitive(true);
+
+	addTokenSubstitute("Rf", ")</small></font>");
+	addTokenSubstitute("Rx", "</a>");
+	addTokenSubstitute("FI", "<i>"); // italics begin
+	addTokenSubstitute("Fi", "</i>");
+	addTokenSubstitute("FB", "<n>"); // bold begin
+	addTokenSubstitute("Fb", "</n>");
+	addTokenSubstitute("FR", "<font color=\"#FF0000\">"); // words of Jesus begin
+	addTokenSubstitute("Fr", "</font>");
+	addTokenSubstitute("FU", "<u>"); // underline begin
+	addTokenSubstitute("Fu", "</u>");
+	addTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
+	addTokenSubstitute("Fo", "</cite>");
+	addTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
+	addTokenSubstitute("Fs", "</sup>");
+	addTokenSubstitute("FV", "<sub>"); // Subscript begin
+	addTokenSubstitute("Fv", "</sub>");
+	addTokenSubstitute("TT", "<big>"); // Book title begin
+	addTokenSubstitute("Tt", "</big>");
+	addTokenSubstitute("PP", "<cite>"); //  poetry  begin
+	addTokenSubstitute("Pp", "</cite>");
+	addTokenSubstitute("Fn", "</font>"); //  font  end
+	addTokenSubstitute("CL", "<br />"); //  new line
+	addTokenSubstitute("CM", "<br /><br />"); //  two new-lines
+	addTokenSubstitute("CG", ""); //  ???
+	addTokenSubstitute("CT", ""); // ???
+	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
+	addTokenSubstitute("JC", "<div align=\"center\">"); // center align begin
+	addTokenSubstitute("JL", "</div>"); // align end
+	
+}
+
+
+bool GBFHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	const char *tok;
+	char val[128];
+	char *valto;
+	const char *num;
+	MyUserData *u = (MyUserData *)userData;
+
+	if (!substituteToken(buf, token)) {		
+		// deal with OSIS note tags.  Just hide till OSISRTF		
+		if (!strncmp(token, "note ", 5)) {
+			// let's stop text from going to output
+			u->suspendTextPassThru = true;
+		}
+		
+		else if (!strncmp(token, "/note", 5)) {
+			u->suspendTextPassThru = false;
+		}		
+
+		else if (!strncmp(token, "w", 1)) {
+			// OSIS Word (temporary until OSISRTF is done)
+			valto = val;
+			num = strstr(token, "lemma=\"x-Strongs:");
+			if (num) {
+				for (num+=17; ((*num) && (*num != '\"')); num++)
+					*valto++ = *num;
+				*valto = 0;
+				if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+					buf += " <small><em>&lt;";
+					for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
+							buf += *tok;
+					buf += "&gt;</em></small> ";					
+				}
+			} else {
+				num = strstr(token, "lemma=\"strong:");
+				if (num) {
+					for (num+=14; ((*num) && (*num != '\"')); num++)
+						*valto++ = *num;
+					*valto = 0;
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						buf += " <small><em>&lt;";
+						for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
+								buf += *tok;
+						buf += "&gt;</em></small> ";					
+					}
+				}
+			}
+			valto = val;
+			num = strstr(token, "morph=\"x-Robinson:");
+			if (num) {
+				for (num+=18; ((*num) && (*num != '\"')); num++)
+					*valto++ = *num;
+				*valto = 0;
+				// normal robinsons tense
+				buf += " <small><em>(";
+				for (tok = val; *tok; tok++)
+						buf += *tok;		
+				buf += ")</em></small> ";					
+			}
+		}
+		
+		else if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
+			buf += " <small><em>&lt;";
+			for (tok = token + 2; *tok; tok++)
+					buf += *tok;
+			buf += "&gt;</em></small> ";
+		}
+
+		else if (!strncmp(token, "WTG", 3) || !strncmp(token, "WTH", 3)) { // strong's numbers tense
+			buf += " <small><em>&lt;";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += ")</em></small> ";
+		}
+
+		else if (!strncmp(token, "RX", 2)) {
+			buf += "<i>";
+			for (tok = token + 3; *tok; tok++) {
+			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
+			    buf += *tok;
+			  }
+			  else {
+			    break;
+			  }
+			}
+			buf += "</i>";
+		}
+
+		else if (!strncmp(token, "RB", 2)) {
+			buf += "<i>";
+			u->hasFootnotePreTag = true;
+		}
+
+		else if (!strncmp(token, "RF", 2)) {
+			if (u->hasFootnotePreTag) {
+				u->hasFootnotePreTag = false;
+				buf += "</i> ";
+			}
+			buf += "<font color=\"#800000\"><small> (";
+		}
+
+		else if (!strncmp(token, "FN", 2)) {
+			buf += "<font face=\"";
+			for (tok = token + 2; *tok; tok++)				
+				if(*tok != '\"') 			
+					buf += *tok;
+			buf += "\">";
+		}
+
+		else if (!strncmp(token, "CA", 2)) {	// ASCII value
+			buf += (char)atoi(&token[2]);
+		}
+		
+		else {
+			return false;
+		}
+	}
+	return true;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfhtmlhref.cpp b/src/modules/filters/gbfhtmlhref.cpp
new file mode 100644
index 0000000..6df038e
--- /dev/null
+++ b/src/modules/filters/gbfhtmlhref.cpp
@@ -0,0 +1,297 @@
+/***************************************************************************
+ *
+ *  gbfhtmlhref.cpp -	GBF to HTML filter with hrefs
+ *
+ * $Id: gbfhtmlhref.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+ 
+#include <stdlib.h>
+#include <gbfhtmlhref.h>
+#include <swmodule.h>
+#include <utilxml.h>
+#include <versekey.h>
+#include <ctype.h>
+#include <url.h>
+
+SWORD_NAMESPACE_START
+
+GBFHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	if (module) {
+		version = module->getName(); 
+	}	
+}
+
+GBFHTMLHREF::GBFHTMLHREF() {
+	setTokenStart("<");
+	setTokenEnd(">");
+	
+	setTokenCaseSensitive(true);
+
+	//addTokenSubstitute("Rf", ")</small></font>");
+	addTokenSubstitute("FA", "<font color=\"#800000\">"); // for ASV footnotes to mark text
+	addTokenSubstitute("Rx", "</a>");
+	addTokenSubstitute("FI", "<i>"); // italics begin
+	addTokenSubstitute("Fi", "</i>");
+	addTokenSubstitute("FB", "<b>"); // bold begin
+	addTokenSubstitute("Fb", "</b>");
+	addTokenSubstitute("FR", "<font color=\"#FF0000\">"); // words of Jesus begin
+	addTokenSubstitute("Fr", "</font>");
+	addTokenSubstitute("FU", "<u>"); // underline begin
+	addTokenSubstitute("Fu", "</u>");
+	addTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
+	addTokenSubstitute("Fo", "</cite>");
+	addTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
+	addTokenSubstitute("Fs", "</sup>");
+	addTokenSubstitute("FV", "<sub>"); // Subscript begin
+	addTokenSubstitute("Fv", "</sub>");
+	addTokenSubstitute("TT", "<big>"); // Book title begin
+	addTokenSubstitute("Tt", "</big>");
+	addTokenSubstitute("PP", "<cite>"); //  poetry  begin
+	addTokenSubstitute("Pp", "</cite>");
+	addTokenSubstitute("Fn", "</font>"); //  font  end
+	addTokenSubstitute("CL", "<br />"); //  new line
+	addTokenSubstitute("CM", "<!P><br />"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
+	addTokenSubstitute("CG", ""); //  ???
+	addTokenSubstitute("CT", ""); // ???
+	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
+	addTokenSubstitute("JC", "<div align=\"center\">"); // center align begin
+	addTokenSubstitute("JL", "</div>"); // align end
+
+	renderNoteNumbers = false;
+}
+
+
+bool GBFHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	const char *tok;
+	MyUserData *u = (MyUserData *)userData;
+
+	if (!substituteToken(buf, token)) {
+		XMLTag tag(token);
+		/*if (!strncmp(token, "w", 1)) {
+			// OSIS Word (temporary until OSISRTF is done)
+			valto = val;
+			num = strstr(token, "lemma=\"x-Strongs:");
+			if (num) {
+				for (num+=17; ((*num) && (*num != '\"')); num++)
+					*valto++ = *num;
+				*valto = 0;
+				if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+					buf += " <small><em>&lt;<a href=\"type=Strongs value=";
+					for (tok = val; *tok; tok++)
+							buf += *tok;
+					buf += "\">";
+					for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
+							buf += *tok;
+					buf += "</a>&gt;</em></small> ";
+					//cout << buf;
+					
+				}
+				//	forget these for now
+				//else {
+					// verb morph
+					//sprintf(wordstr, "%03d", word-1);
+					//module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+				//}
+			}
+			else {
+				num = strstr(token, "lemma=\"strong:");
+				if (num) {
+					for (num+=14; ((*num) && (*num != '\"')); num++)
+						*valto++ = *num;
+					*valto = 0;
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						buf += " <small><em>&lt;<a href=\"type=Strongs value=";
+						for (tok = val; *tok; tok++)
+								buf += *tok;
+						buf += "\">";
+						for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
+								buf += *tok;
+						buf += "</a>&gt;</em></small> ";
+						//cout << buf;
+						
+					}
+					//	forget these for now
+					//else {
+						// verb morph
+						//sprintf(wordstr, "%03d", word-1);
+						//module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+					//}
+				}
+			}
+			valto = val;
+			num = strstr(token, "morph=\"x-Robinson:");
+			if (num) {
+				for (num+=18; ((*num) && (*num != '\"')); num++)
+					*valto++ = *num;
+				*valto = 0;
+				buf += " <small><em>(<a href=\"type=morph class=Robinson value=";
+				for (tok = val; *tok; tok++)
+				// normal robinsons tense
+						buf += *tok;
+				buf += "\">";
+				for (tok = val; *tok; tok++)				
+					//if(*tok != '\"') 			
+						buf += *tok;		
+				buf += "</a>)</em></small> ";					
+			}
+		}*/
+		
+		// else 
+		if (!strncmp(token, "WG", 2)) { // strong's numbers
+			//buf += " <small><em>&lt;<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=Greek&value=";
+			for (tok = token+2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "</a>&gt;</em></small>";
+		}
+		else if (!strncmp(token, "WH", 2)) { // strong's numbers
+			//buf += " <small><em>&lt;<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=Hebrew&value=";
+			for (tok = token+2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "</a>&gt;</em></small>";
+		}
+		else if (!strncmp(token, "WTG", 3)) { // strong's numbers tense
+			//buf += " <small><em>(<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">(<a href=\"passagestudy.jsp?action=showStrongs&type=Greek&value=";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "</a>)</em></small>";
+		}
+		else if (!strncmp(token, "WTH", 3)) { // strong's numbers tense
+			//buf += " <small><em>(<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">(<a href=\"passagestudy.jsp?action=showStrongs&type=Hebrew&value=";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "</a>)</em></small>";
+		}
+
+		else if (!strncmp(token, "WT", 2) && strncmp(token, "WTH", 3) && strncmp(token, "WTG", 3)) { // morph tags
+			//buf += " <small><em>(<a href=\"type=morph class=none value=";
+			buf += " <small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=Greek&value=";
+			
+			for (tok = token + 2; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "\" class=\"morph\">";
+			for (tok = token + 2; *tok; tok++)				
+				if(*tok != '\"') 			
+					buf += *tok;		
+			buf += "</a>)</em></small>";
+		}
+
+		else if (!strcmp(tag.getName(), "RX")) {
+			buf += "<a href=\"";
+			for (tok = token + 3; *tok; tok++) {
+			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
+			    buf += *tok;
+			  }
+			  else {
+			    break;
+			  }
+			}
+			buf += "\">";
+		}
+		else if (!strcmp(tag.getName(), "RF")) {
+			SWBuf type = tag.getAttribute("type");
+			SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+			SWBuf noteName = tag.getAttribute("n");
+			VerseKey *vkey = NULL;
+			// see if we have a VerseKey * or descendant
+			SWTRY {
+				vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+			}
+			SWCATCH ( ... ) {	}
+			if (vkey) {
+				// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+				//char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+				buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a> ", 
+					URL::encode(footnoteNumber.c_str()).c_str(),
+					URL::encode(u->version.c_str()).c_str(), 
+					URL::encode(vkey->getText()).c_str(), 
+					(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str(): ""));
+			}
+			u->suspendTextPassThru = true;
+		}
+		else if (!strcmp(tag.getName(), "Rf")) {
+			u->suspendTextPassThru = false;
+		}
+/*
+		else if (!strncmp(token, "RB", 2)) {
+			buf += "<i> ";
+			u->hasFootnotePreTag = true;
+		}
+
+		else if (!strncmp(token, "Rf", 2)) {
+			buf += "&nbsp<a href=\"note=";
+			buf += u->lastTextNode.c_str();
+			buf += "\">";
+			buf += "<small><sup>*n</sup></small></a>&nbsp";
+			// let's let text resume to output again
+			u->suspendTextPassThru = false;
+		}
+		
+		else if (!strncmp(token, "RF", 2)) {
+			if (u->hasFootnotePreTag) {
+				u->hasFootnotePreTag = false;
+				buf += "</i> ";
+			}
+			u->suspendTextPassThru = true;
+		}
+*/
+		else if (!strncmp(token, "FN", 2)) {
+			buf += "<font face=\"";
+			for (tok = token + 2; *tok; tok++)				
+				if(*tok != '\"') 			
+					buf += *tok;
+			buf += "\">";
+		}
+
+		else if (!strncmp(token, "CA", 2)) {	// ASCII value
+			buf += (char)atoi(&token[2]);
+		}
+		
+		else {
+			return false;
+		}
+	}
+	return true;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfmorph.cpp b/src/modules/filters/gbfmorph.cpp
new file mode 100644
index 0000000..3399ae8
--- /dev/null
+++ b/src/modules/filters/gbfmorph.cpp
@@ -0,0 +1,100 @@
+/******************************************************************************
+ *
+ *  gbfmorph.cpp -	SWFilter descendant to hide or show morph tags
+ *			in a GBF module
+ *
+ * $Id: gbfmorph.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <gbfmorph.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Morphological Tags";
+	static const char oTip[]  = "Toggles Morphological Tags On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+GBFMorph::GBFMorph() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+GBFMorph::~GBFMorph() {
+}
+
+
+char GBFMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (!option) {	// if we don't want morph tags
+		const char *from;
+		char token[2048]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		bool lastspace = false;
+
+		SWBuf orig = text;
+		from = orig.c_str();
+
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (*token == 'W' && token[1] == 'T') {	// Morph
+				  if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
+				    if (lastspace)
+				      text--;
+				  }
+				  continue;
+				}
+				// if not a morph tag token, keep token in text
+				text += '<';
+				text += token;
+				text += '>';
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 2045)
+					token[tokpos++] = *from;
+					token[tokpos+2] = 0;
+			}
+			else	{
+				text += *from;
+				lastspace = (*from == ' ');
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfosis.cpp b/src/modules/filters/gbfosis.cpp
new file mode 100644
index 0000000..9333f62
--- /dev/null
+++ b/src/modules/filters/gbfosis.cpp
@@ -0,0 +1,438 @@
+/******************************************************************************
+ *
+ *  gbfosis.cpp -	GBF to OSIS filter
+ *
+ * $Id: gbfosis.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <gbfosis.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <swlog.h>
+#include <stdarg.h>
+
+
+SWORD_NAMESPACE_START
+
+
+GBFOSIS::GBFOSIS() {
+}
+
+
+GBFOSIS::~GBFOSIS() {
+}
+
+
+char GBFOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module) { 
+	char token[2048]; //cheesy, we seem to like cheese :)
+	int tokpos = 0;
+	bool intoken = false;
+	bool keepToken = false;
+	
+//	static QuoteStack quoteStack;
+
+	SWBuf orig = text;
+	SWBuf tmp;
+	SWBuf value;
+	
+	bool suspendTextPassThru = false;
+	bool handled = false;
+	bool newWord = false;
+	bool newText = false;
+	bool lastspace = false;
+	
+	const char *wordStart = text.c_str();
+	const char *wordEnd = NULL;
+	
+	const char *textStart = NULL;
+	const char *textEnd = NULL;
+	
+	SWBuf textNode = "";
+
+	SWBuf buf;
+		
+	text = "";
+	for (const char* from = orig.c_str(); *from; ++from) {
+		if (*from == '<') { //start of new token detected
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			textEnd = from-1; //end of last text node found
+			wordEnd = text.c_str() + text.length();//not good, instead of wordEnd = to!
+			
+			continue;
+		}
+		
+		if (*from == '>') {	// process tokens
+			intoken = false;
+			keepToken = false;
+			suspendTextPassThru = false;
+			newWord = true;
+			handled = false;
+
+			while (wordStart < (text.c_str() + text.length())) { //hack
+				if (strchr(";,. :?!()'\"", *wordStart) && wordStart[0] && wordStart[1])
+					wordStart++;
+				else break;
+			}			
+			while (wordEnd > wordStart) {
+				if (strchr(" ,;:.?!()'\"", *wordEnd))
+					wordEnd--;
+				else break;
+			}
+
+			// Scripture Reference
+			if (!strncmp(token, "scripRef", 8)) {
+				suspendTextPassThru = true;
+				newText = true;
+				handled = true;
+			}
+			else if (!strncmp(token, "/scripRef", 9)) {
+				tmp = "";
+				tmp.append(textStart, (int)(textEnd - textStart)+1);
+				text += VerseKey::convertToOSIS(tmp.c_str(), key);
+				
+				lastspace = false;
+				suspendTextPassThru = false;
+				handled = true;
+			}
+
+			// Footnote
+			if (!strcmp(token, "RF") || !strncmp(token, "RF ", 3)) { //the GBFFootnotes filter adds the attribute "swordFootnote", we want to catch that, too
+	//			pushString(buf, "<reference work=\"Bible.KJV\" reference=\"");
+				text += "<note type=\"x-StudyNote\">";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			else	if (!strcmp(token, "Rf")) {
+				text += "</note>";
+				lastspace = false;
+				handled = true;
+			}
+			// hebrew titles
+			if (!strcmp(token, "TH")) {
+				text += "<title type=\"psalm\">";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			else	if (!strcmp(token, "Th")) {
+				text += "</title>";
+				lastspace = false;
+				handled = true;
+			}
+			// Italics assume transchange
+			if (!strcmp(token, "FI")) {
+				text += "<transChange type=\"added\">";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			else	if (!strcmp(token, "Fi")) {
+				text += "</transChange>";
+				lastspace = false;
+				handled = true;
+			}
+			// less than
+			if (!strcmp(token, "CT")) {
+				text += "&lt;";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			// greater than
+			if (!strcmp(token, "CG")) {
+				text += "&gt;";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			// Paragraph break.  For now use empty paragraph element
+			if (!strcmp(token, "CM")) {
+				text += "<milestone type=\"x-p\" />";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+
+			// Figure
+			else	if (!strncmp(token, "img ", 4)) {
+				const char *src = strstr(token, "src");
+				if (!src)		// assert we have a src attribute
+					continue;
+//					return false;
+
+				text += "<figure src=\"";
+				const char *c;
+				for (c = src;((*c) && (*c != '"')); c++);
+
+// uncomment for SWORD absolute path logic
+//				if (*(c+1) == '/') {
+//					pushString(buf, "file:");
+//					pushString(buf, module->getConfigEntry("AbsoluteDataPath"));
+//					if (*((*buf)-1) == '/')
+//						c++;		// skip '/'
+//				}
+// end of uncomment for asolute path logic 
+
+				for (c++;((*c) && (*c != '"')); c++) {
+					text += *c;
+				}
+				text += "\" />";
+				
+				lastspace = false;
+				handled = true;
+			}
+
+			// Strongs numbers
+			else if (*token == 'W' && (token[1] == 'G' || token[1] == 'H')) {	// Strongs
+				bool divineName = false;
+				value = token+1;
+			
+				// normal strongs number
+				//strstrip(val);
+				if (!strncmp(wordStart, "<w ", 3)) {
+					const char *attStart = strstr(wordStart, "lemma");
+					if (attStart) {
+						attStart += 7;
+						
+						buf = "";
+						buf.appendFormatted("strong:%s ", value.c_str());
+					}
+					else { // no lemma attribute
+						attStart = wordStart + 3;
+						
+						buf = "";
+						buf.appendFormatted(buf, "lemma=\"strong:%s\" ", value.c_str());
+					}
+
+					text.insert(attStart - text.c_str(), buf);
+				}
+				else { //wordStart doesn't point to an existing <w> attribute!
+					if (!strcmp(value.c_str(), "H03068")) {	//divineName
+						buf = "";
+						buf.appendFormatted("<divineName><w lemma=\"strong:%s\">", value.c_str());
+						
+						divineName = true;
+					}
+					else {
+						buf = "";
+						buf.appendFormatted("<w lemma=\"strong:%s\">", value.c_str());
+					}
+
+					text.insert(wordStart - text.c_str(), buf);
+
+					if (divineName) {
+						wordStart += 12;
+						text += "</w></divineName>";
+					}
+					else	text += "</w>";
+
+					lastspace = false;
+				}
+				handled = true;
+			}
+
+			// Morphology
+			else if (*token == 'W' && token[1] == 'T') {
+				if (token[2] == 'G' || token[2] == 'H') {	// Strongs
+					value = token+2;
+				}
+				else value = token+1;
+				
+				if (!strncmp(wordStart, "<w ", 3)) {
+					const char *attStart = strstr(wordStart, "morph");
+					if (attStart) { //existing morph attribute, append this one to it
+						attStart += 7;
+						buf = "";
+						buf.appendFormatted("%s:%s ", "robinson", value.c_str());
+					}
+					else { // no lemma attribute
+						attStart = wordStart + 3;
+						buf = "";
+						buf.appendFormatted("morph=\"%s:%s\" ", "robinson", value.c_str());
+					}
+					
+					text.insert(attStart - text.c_str(), buf); //hack, we have to
+				}
+				else { //no existing <w> attribute fond
+					buf = "";
+					buf.appendFormatted("<w morph=\"%s:%s\">", "robinson", value.c_str());
+					text.insert(wordStart - text.c_str(), buf);
+					text += "</w>";
+					lastspace = false;
+
+				}
+				handled = true;
+			}
+
+			if (!keepToken) {	
+				if (!handled) {
+					SWLog::getSystemLog()->logError("Unprocessed Token: <%s> in key %s", token, key ? (const char*)*key : "<unknown>");
+//					exit(-1);
+				}
+				if (from[1] && strchr(" ,;.:?!()'\"", from[1])) {
+					if (lastspace) {
+						text--;
+					}
+				}
+				if (newText) {
+					textStart = from+1;
+					newText = false; 
+				}
+				continue;
+			}
+
+			// if not a strongs token, keep token in text
+			text.appendFormatted("<%s>", token);
+			
+			if (newText) {
+				textStart = text.c_str() + text.length();
+				newWord = false; 
+			}
+			continue;
+		}
+		if (intoken) {
+			if ((tokpos < 2045) && ((*from != 10)&&(*from != 13))) {
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+			}
+		}
+		else	{
+			switch (*from) {
+			case '\'':
+			case '\"':
+			case '`':
+//				quoteStack.handleQuote(fromStart, from, &to);
+				text += *from;
+				//from++; //this line removes chars after an apostrophe! Needs fixing.
+				break;
+			default:
+				if (newWord && (*from != ' ')) {
+					wordStart = text.c_str() + text.length();
+					newWord = false;
+					
+					//fix this if required?
+					//memset(to, 0, 10);
+
+				}
+
+				if (!suspendTextPassThru) {
+					text += (*from);
+					lastspace = (*from == ' ');
+				}
+			}
+		}
+	}
+
+	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+	if (vkey) {
+		SWBuf ref = "";
+		if (vkey->getVerse()) {
+			ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
+		}
+
+		if (ref.length() > 0) {
+
+			text = ref + text;
+
+			if (vkey->getVerse()) {
+				VerseKey *tmp = (VerseKey *)vkey->clone();
+				*tmp = *vkey;
+				tmp->setAutoNormalize(false);
+				tmp->setIntros(true);
+
+				text += "</verse>";
+
+				*tmp = MAXVERSE;
+				if (*vkey == *tmp) {
+					tmp->setVerse(0);
+//					sprintf(ref, "\t</div>");
+//					pushString(&to, ref);
+					*tmp = MAXCHAPTER;
+					*tmp = MAXVERSE;
+					if (*vkey == *tmp) {
+						tmp->setChapter(0);
+						tmp->setVerse(0);
+//						sprintf(ref, "\t</div>");
+//						pushString(&to, ref);
+/*
+						if (!quoteStack.empty()) {
+							SWLog::getSystemLog()->logError("popping unclosed quote at end of book");
+							quoteStack.clear();
+						}
+*/
+					}
+				}
+                                delete tmp;
+			}
+//			else if (vkey->Chapter()) {
+//				sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
+//			}
+//			else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
+		}
+	}
+	return 0;
+}
+
+
+QuoteStack::QuoteStack() {
+	clear();
+}
+
+
+void QuoteStack::clear() {
+	while (!quotes.empty()) quotes.pop();
+}
+
+
+QuoteStack::~QuoteStack() {
+	clear();
+}
+
+
+void QuoteStack::handleQuote(char *buf, char *quotePos, SWBuf &text) {
+//QuoteInstance(char startChar = '\"', char level = 1, string uniqueID = "", char continueCount = 0) {
+	if (!quotes.empty()) {
+		QuoteInstance last = quotes.top();
+		if (last.startChar == *quotePos) {
+			text += "</quote>";
+			quotes.pop();
+		}
+		else {
+			quotes.push(QuoteInstance(*quotePos, last.level+1));
+			quotes.top().pushStartStream(text);
+		}
+	}
+	else {
+		quotes.push(QuoteInstance(*quotePos));
+		quotes.top().pushStartStream(text);
+	}
+}
+
+void QuoteStack::QuoteInstance::pushStartStream(SWBuf &text) {
+	text.appendFormatted("<quote level=\"%d\">", level);
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfplain.cpp b/src/modules/filters/gbfplain.cpp
new file mode 100644
index 0000000..b2a1ae4
--- /dev/null
+++ b/src/modules/filters/gbfplain.cpp
@@ -0,0 +1,117 @@
+/******************************************************************************
+ *
+ *  gbfplain.cpp -	SWFilter descendant to strip out all GBF tags or
+ *			convert to ASCII rendered symbols
+ *
+ * $Id: gbfplain.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <gbfplain.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+GBFPlain::GBFPlain() {
+}
+
+
+char GBFPlain::processText (SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	char token[2048];
+	int tokpos = 0;
+	bool intoken = false;
+	SWBuf orig = text;
+	const char* from = orig.c_str();
+	
+	for (text = ""; *from; ++from) {
+		if (*from == '<') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			continue;
+		}
+		if (*from == '>') {
+			intoken = false;
+						// process desired tokens
+			switch (*token) {
+			case 'W':	// Strongs
+				switch(token[1]) {
+				case 'G':               // Greek
+				case 'H':               // Hebrew
+				case 'T':               // Tense
+					text.append(" <");
+					//for (char *tok = token + 2; *tok; tok++)
+					//	text += *tok;
+					text.append(token+2);
+					text.append("> ");
+					continue;
+				}
+				break;
+			case 'R':
+				switch(token[1]) {
+				case 'F':               // footnote begin
+					text.append(" [");
+					continue;
+				case 'f':               // footnote end
+					text.append("] ");
+					continue;
+				}
+				break;
+			case 'C':
+				switch(token[1]) {
+				case 'A':               // ASCII value
+					text.append((char)atoi(&token[2]));
+					continue;
+				case 'G':
+					text.append('>');
+					continue;
+/*								Bug in WEB
+				case 'L':
+					*to++ = '<';
+					continue;
+*/
+				case 'L':	//        Bug in WEB.  Use above entry when fixed
+				case 'N':               // new line
+					text.append('\n');
+					continue;
+				case 'M':               // new paragraph
+					text.append("\n\n");
+					continue;
+				}
+				break;
+			}
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else	text.append(*from);
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/gbfredletterwords.cpp b/src/modules/filters/gbfredletterwords.cpp
new file mode 100644
index 0000000..cac3cd9
--- /dev/null
+++ b/src/modules/filters/gbfredletterwords.cpp
@@ -0,0 +1,116 @@
+/******************************************************************************
+ *
+ *  gbfredletterwords.cpp -	SWFilter descendant to toggle red coloring of
+ *				words of Christ in a GBF module
+ *
+ * $Id: gbfredletterwords.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <gbfredletterwords.h>
+#include <swmodule.h>
+#include <ctype.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Words of Christ in Red";
+	static const char oTip[]  = "Toggles Red Coloring for Words of Christ On and Off if they are marked";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+GBFRedLetterWords::GBFRedLetterWords() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+GBFRedLetterWords::~GBFRedLetterWords() {
+}
+
+
+char GBFRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+/** This function removes the red letter words in Bible like the WEB
+* The words are marked by <FR> as start and <Fr> as end tag.
+*/
+	if (!option) {	// if we don't want footnotes
+		char token[4096]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		bool hide = false;
+
+	const char *from;
+	SWBuf orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+//				memset(token, 0, 4096);
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				/*switch (*token) {
+				case 'F':			// Font attribute
+					switch(token[1]) {
+					case 'R':               // Begin red letter words
+						hide = true;
+						break;
+					case 'r':               // end red letter words
+						hide = false;
+						break;
+					}
+					continue;	// skip token
+				}*/
+
+				//hide the token if either FR or Fr was detected
+				hide = (token[0] == 'F' && ( (token[1] == 'R') || (token[1] == 'r') ));
+
+				// if not a red letter word token, keep token in text
+				if (!hide) {
+					text += '<';
+					for (char *tok = token; *tok; tok++)
+						text += *tok;
+					text += '>';
+				}
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 4090)
+					token[tokpos++] = *from;
+					token[tokpos+2] = 0;	// +2 cuz we init token with 2 extra '0' because of switch statement
+			}
+			else {
+				text += *from;
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfrtf.cpp b/src/modules/filters/gbfrtf.cpp
new file mode 100644
index 0000000..8a8e1b1
--- /dev/null
+++ b/src/modules/filters/gbfrtf.cpp
@@ -0,0 +1,325 @@
+/******************************************************************************
+ *
+ *  gbfrtf.cpp -	SWFilter descendant to convert all GBF tags to RTF tags
+ *
+ * $Id: gbfrtf.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <gbfrtf.h>
+#include <utilstr.h>
+#include <ctype.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+GBFRTF::GBFRTF() {
+}
+
+
+char GBFRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	char token[2048];
+	char val[128];
+	char *valto;
+	char *num;
+	int tokpos = 0;
+	bool intoken = false;
+	const char *tok;
+	SWBuf strongnum;
+	SWBuf strongtense;
+	bool hideText = false;
+	int wordCount = 0;
+
+	const char *from;
+	SWBuf orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			wordCount = 0;
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			continue;
+		}
+		if (*from == '>') {
+			intoken = false;
+						// process desired tokens
+			// deal with OSIS note tags.  Just hide till OSISRTF
+			if (!strncmp(token, "note ", 5)) {
+				hideText = true;
+			}
+			if (!strncmp(token, "/note", 5)) {
+				hideText = false;
+			}
+
+			switch (*token) {
+			case 'w':	// OSIS Word (temporary until OSISRTF is done)
+				strongnum = "";
+				strongtense = "";
+				valto = val;
+				num = strstr(token, "lemma=\"x-Strongs:");
+				if (num) {
+					for (num+=17; ((*num) && (*num != '\"')); num++)
+						*valto++ = *num;
+					*valto = 0;
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						// normal strongs number
+						strongnum += "{\\cf3 \\sub <";
+						for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
+							strongnum += *tok;
+						strongnum += ">}";
+					}
+					/*	forget these for now
+					else {
+						// verb morph
+						sprintf(wordstr, "%03d", word-1);
+						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+					}
+					*/
+				}
+				else {
+					num = strstr(token, "lemma=\"strong:");
+					if (num) {
+						for (num+=14; ((*num) && (*num != '\"')); num++)
+							*valto++ = *num;
+						*valto = 0;
+						if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+							// normal strongs number
+							strongnum += "{\\cf3 \\sub <";
+							for (tok = (!isdigit(*val))?val+1:val; *tok; tok++)
+								strongnum += *tok;
+							strongnum += ">}";
+						}
+						/*	forget these for now
+						else {
+							// verb morph
+							sprintf(wordstr, "%03d", word-1);
+							module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+						}
+						*/
+					}
+				}
+				valto = val;
+				num = strstr(token, "morph=\"x-Robinson:");
+				if (num) {
+					for (num+=18; ((*num) && (*num != '\"')); num++)
+						*valto++ = *num;
+					*valto = 0;
+					// normal robinsons tense
+					strongtense += "{\\cf4 \\sub (";
+					for (tok = val; *tok; tok++)
+						strongtense += *tok;
+					strongtense += ")}";
+				}
+				continue;
+
+			case '/':
+				if (token[1] == 'w') {
+					if ((wordCount > 0) || (strongnum != "{\\cf3 \\sub <3588>}")) {
+						//for (i = 0; i < strongnum.length(); i++)
+							text += strongnum;
+					//for (i = 0; i < strongtense.length(); i++)
+						text += strongtense;
+					}
+				}
+				continue;
+
+			case 'W':	// Strongs
+				switch(token[1]) {
+				case 'G':               // Greek
+				case 'H':               // Hebrew
+					text += "{\\cf3 \\sub <";
+					for (tok = token + 2; *tok; tok++)
+						text += *tok;
+					text += ">}";
+					continue;
+
+				case 'T':               // Tense
+					text += "{\\cf4 \\sub (";
+					bool separate = false;
+					for (tok = token + 2; *tok; tok++) {
+						if (separate) {
+							text += "; ";
+							separate = false;
+						}
+						switch (*tok) {
+						case 'G':
+						case 'H':
+							for (tok++; *tok; tok++) {
+								if (isdigit(*tok)) {
+									text += *tok;
+									separate = true;
+								}
+								else {
+									tok--;
+									break;
+								}
+							}
+							break;
+						default:
+							for (; *tok; tok++) {
+							       text += *tok;
+							}
+						}
+					}
+					text += ")}";
+					continue;
+				}
+				break;
+			case 'R':
+				switch(token[1]) {
+				case 'X':
+					text += "<a href=\"\">";
+				  continue;
+				case 'x':
+					text += "</a>";
+				  continue;
+				case 'F':               // footnote begin
+					text += "{\\i1 \\sub [ ";
+					continue;
+				case 'f':               // footnote end
+					text += " ] }";
+					continue;
+				}
+				break;
+			case 'F':			// font tags
+				switch(token[1]) {
+				case 'I':		// italic start
+					text += "\\i1 ";
+					continue;
+				case 'i':		// italic end
+					text += "\\i0 ";
+					continue;
+				case 'B':		// bold start
+					text += "\\b1 ";
+					continue;
+				case 'b':		// bold end
+					text += "\\b0 ";
+					continue;
+				case 'N':
+					text += '{';
+					if (!strnicmp(token+2, "Symbol", 6))
+						text += "\\f7 ";
+                                        if (!strnicmp(token+2, "Courier", 7))
+						text += "\\f8 ";
+					continue;
+				case 'n':
+					text += '}';
+					continue;
+				case 'S':
+					text += "{\\super ";
+					continue;
+				case 's':
+					text += '}';
+					continue;
+				case 'R':
+					text += "{\\cf6 ";
+					continue;
+				case 'r':
+					text += '}';
+					continue;
+				case 'O':
+				case 'C':
+					text += "\\scaps1 ";
+					continue;
+				case 'o':
+				case 'c':
+					text += "\\scaps0 ";
+					continue;
+				case 'V':
+					text += "{\\sub ";
+					continue;
+				case 'v':
+					text += '}';
+					continue;
+				case 'U':
+					text += "\\ul1 ";
+					continue;
+				case 'u':
+					text += "\\ul0 ";
+					continue;
+				}
+				break;
+			case 'C':			// special character tags
+				switch(token[1]) {
+				case 'A':               // ASCII value
+					text += (char)atoi(&token[2]);
+					continue;
+				case 'G':
+					text += '>';
+					continue;
+				case 'L':               // line break
+					text += "\\line ";
+					continue;
+				case 'M':               // new paragraph
+					text += "\\par ";
+					continue;
+				case 'T':
+					text += '<';
+				}
+				break;
+			case 'T':			// title formatting
+			  switch(token[1])
+			    {
+			    case 'T':               // Book title begin
+					text += "{\\large ";
+				 continue;
+			    case 't':
+				 text += '}';
+				 continue;
+			    case 'S':
+					text += "\\par {\\i1\\b1 ";
+			      continue;
+			    case 's':
+					text += "}\\par ";
+			      continue;
+			    }
+			  break;
+			case 'J':	// Strongs
+				switch(token[1]) {
+				case 'L':
+					text += "\\ql ";
+				case 'C':
+					text += "\\qc ";
+				case 'R':
+					text += "\\qr ";
+                                case 'F':
+                                	text += "\\qj ";
+                                }
+			}
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else {
+			if (!hideText) {
+				wordCount++;
+				text += *from;
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/gbfstrongs.cpp b/src/modules/filters/gbfstrongs.cpp
new file mode 100644
index 0000000..dd4e167
--- /dev/null
+++ b/src/modules/filters/gbfstrongs.cpp
@@ -0,0 +1,149 @@
+/******************************************************************************
+ *
+ *  gbfstrongs.cpp -	SWFilter descendant to hide or show Strong's number
+ *			in a GBF module
+ *
+ * $Id: gbfstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <gbfstrongs.h>
+#include <swmodule.h>
+#include <ctype.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Strong's Numbers";
+	static const char oTip[]  = "Toggles Strong's Numbers On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+GBFStrongs::GBFStrongs() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+GBFStrongs::~GBFStrongs() {
+}
+
+
+char GBFStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	char token[2048]; // cheese.  Fix.
+	int tokpos = 0;
+	bool intoken = false;
+	bool lastspace = false;
+	int word = 1;
+	char val[128];
+	char wordstr[5];
+	char *valto;
+	unsigned int textStart = 0, textEnd = 0;
+	bool newText = false;
+	SWBuf tmp;
+	const char *from;
+
+	SWBuf orig = text;
+	from = orig.c_str();
+
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			textEnd = text.size();
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+			if (*token == 'W' && (token[1] == 'G' || token[1] == 'H')) {	// Strongs
+				if (module->isProcessEntryAttributes()) {
+					valto = val;
+					for (unsigned int i = 1; ((token[i]) && (i < 150)); i++)
+						*valto++ = token[i];
+					*valto = 0;
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						// normal strongs number
+						sprintf(wordstr, "%03d", word++);
+						module->getEntryAttributes()["Word"][wordstr]["PartsCount"] = "1";
+						module->getEntryAttributes()["Word"][wordstr]["Lemma"] = val;
+						module->getEntryAttributes()["Word"][wordstr]["LemmaClass"] = "strong";
+						tmp = "";
+						tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
+						module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
+						newText = true;
+					}
+					else {
+						// verb morph
+						sprintf(wordstr, "%03d", word-1);
+						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+						module->getEntryAttributes()["Word"][wordstr]["MorphClass"] = "OLBMorph";
+					}
+				}
+
+				if (!option) {
+					if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
+						if (lastspace)
+							text--;
+					}
+					if (newText) {textStart = text.size(); newText = false; }
+					continue;
+				}
+			}
+			if (module->isProcessEntryAttributes()) {
+				if ((*token == 'W') && (token[1] == 'T')) {	// Morph
+					valto = val;
+					for (unsigned int i = 2; ((token[i]) && (i < 150)); i++)
+						*valto++ = token[i];
+					*valto = 0;
+					sprintf(wordstr, "%03d", word-1);
+					module->getEntryAttributes()["Word"][wordstr]["MorphClass"] = "GBFMorph";
+					module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+					newText = true;
+				}
+			}
+			// if not a strongs token, keep token in text
+			text += '<';
+			text += token;
+			text += '>';
+			if (newText) {textStart = text.size(); newText = false; }
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else	{
+			text += *from;
+			lastspace = (*from == ' ');
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfthml.cpp b/src/modules/filters/gbfthml.cpp
new file mode 100644
index 0000000..303b240
--- /dev/null
+++ b/src/modules/filters/gbfthml.cpp
@@ -0,0 +1,223 @@
+/***************************************************************************
+ *
+ *  gbfthml.cpp -	GBF to ThML filter
+ *
+ * $Id: gbfthml.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <gbfthml.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+GBFThML::GBFThML()
+{
+}
+
+
+char GBFThML::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	const char *from;
+	char token[2048];
+	int tokpos = 0;
+	bool intoken 	= false;
+	const char *tok;
+
+	SWBuf orig = text;
+	from = orig.c_str();
+
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			continue;
+		}
+		if (*from == '>')
+		{
+			intoken = false;
+			// process desired tokens
+			switch (*token) {
+			case 'W':	// Strongs
+			  switch(token[1]) {
+			  case 'G':
+			  case 'H':			    
+			    text += "<sync type=\"Strongs\" value=\"";
+			    for (tok = token + 1; *tok; tok++)
+				 text += *tok;
+			    text += "\" />";
+			    continue;
+			    
+			  case 'T':               // Tense
+			    text += "<sync type=\"Morph\" value=\"";
+			    for (tok = token + 2; *tok; tok++)
+				 text += *tok;
+			    text += "\" />";
+			    continue;
+				}
+			  break;
+			case 'R':
+			  switch(token[1])
+			    {
+			    case 'X':
+				 text += "<a href=\"";
+				 for (tok = token + 3; *tok; tok++) {
+				if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
+				  text += *tok;
+				}
+				else {
+				  break;
+				}
+				 }
+				 text += "\">";
+				 continue;
+			    case 'x':
+				 text += "</a>";
+				 continue;
+			    case 'F':               // footnote begin
+				 text += "<note>";
+				 continue;
+			    case 'f':               // footnote end
+				 text += "</note>";
+				 continue;
+			    }
+			  break;
+			case 'F':			// font tags
+			  switch(token[1])
+			    {
+			    case 'N':
+				 text += "<font face=\"";
+				 for (tok = token + 2; *tok; tok++)
+					text += *tok;
+				text += "\">";
+				 continue;
+			    case 'n':
+				 text += "</font>";
+				 continue;
+			    case 'I':		// italic start
+				 text += "<i>";
+				 continue;
+			    case 'i':		// italic end
+				 text += "</i>";
+				 continue;
+			    case 'B':		// bold start
+				 text += "<b>";
+				 continue;
+			    case 'b':		// bold end
+				 text += "</b>";
+				 continue;
+
+			    case 'R':		// words of Jesus begin
+				 text += "<font color=\"#ff0000\">";
+				 continue;
+			    case 'r':		// words of Jesus end
+				 text += "</font>";
+				 continue;
+			    case 'U':		// Underline start
+				 text += "<u>";
+				 continue;
+			    case 'u':		// Underline end
+				 text += "</u>";
+				 continue;
+			    case 'O':		// Old Testament quote begin
+				 text += "<cite>";
+				 continue;
+			    case 'o':		// Old Testament quote end
+				 text += "</cite>";
+				 continue;
+			    case 'S':		// Superscript begin
+				 text += "<sup>";
+				 continue;
+			    case 's':		// Superscript end
+				 text += "</sup>";
+				 continue;
+			    case 'V':		// Subscript begin
+				 text += "<sub>";
+				 continue;
+			    case 'v':		// Subscript end
+				 text += "</sub>";
+				 continue;
+			    }
+			  break;
+			case 'C':			// special character tags
+			  switch(token[1])
+				{
+				case 'A':               // ASCII value
+				  text += (char)atoi(&token[2]);
+				  continue;
+				case 'G':
+				  //*to++ = ' ';
+				  continue;
+				case 'L':               // line break
+				 text += "<br /> ";
+				  continue;
+				case 'M':               // new paragraph
+				 text += "<p />";
+				  continue;
+				case 'T':
+				  //*to++ = ' ';
+				  continue;
+				}
+			  break;
+			case 'T':			// title formatting
+			  switch(token[1])
+			    {
+			    case 'T':               // Book title begin
+				 text += "<big>";
+				 continue;
+			    case 't':
+				 text += "</big>";
+				 continue;
+			    case 'S':
+				 text += "<div class=\"sechead\">";
+				 continue;
+			    case 's':
+				 text += "</div>";
+				 continue;
+			    }
+			  break;
+
+			case 'P':			// special formatting
+			  switch(token[1]) {
+			    case 'P':               // Poetry begin
+				 text += "<verse>";
+				 continue;
+			    case 'p':
+				 text += "</verse>";
+				 continue;
+			    }
+			  break;
+			}
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else	text += *from;
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfwebif.cpp b/src/modules/filters/gbfwebif.cpp
new file mode 100644
index 0000000..b7b8a0f
--- /dev/null
+++ b/src/modules/filters/gbfwebif.cpp
@@ -0,0 +1,195 @@
+/***************************************************************************
+ *
+ *  gbfwebif.cpp -	GBF to HTML filter with hrefs for strongs and morph
+ *			tags
+ *
+ * $Id: gbfwebif.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <gbfwebif.h>
+#include <ctype.h>
+#include <url.h>
+
+SWORD_NAMESPACE_START
+
+GBFWEBIF::GBFWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp") {
+}
+
+bool GBFWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	const char *tok;
+	char val[128];
+	char *valto;
+	const char *num;
+	SWBuf url;
+
+	if (!substituteToken(buf, token)) {
+		if (!strncmp(token, "w", 1)) {
+			// OSIS Word (temporary until OSISRTF is done)
+			valto = val;
+			num = strstr(token, "lemma=\"x-Strongs:");
+			if (num) {
+				for (num+=17; ((*num) && (*num != '\"')); num++)
+					*valto++ = *num;
+				*valto = 0;
+
+				if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+					buf += " <small><em>&lt;";
+					url = "";
+					for (tok = val; *tok; tok++) {
+						url += *tok;
+					}
+					if ((url.length() > 1) && strchr("GH", url[0])) {
+						if (isdigit(url[1]))
+							url = url.c_str()+1;
+					}
+					buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+
+					for (tok = (!isdigit(*val))?val+1:val; *tok; tok++) {
+						buf += *tok;
+					}
+					buf += "</a>&gt;</em></small> ";
+				}
+			}
+			else {
+				num = strstr(token, "lemma=\"strong:");
+				if (num) {
+					for (num+=14; ((*num) && (*num != '\"')); num++)
+						*valto++ = *num;
+					*valto = 0;
+
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						buf += " <small><em>&lt;";
+						url = "";
+						for (tok = val; *tok; tok++) {
+							url += *tok;
+						}
+						if ((url.length() > 1) && strchr("GH", url[0])) {
+							if (isdigit(url[1]))
+								url = url.c_str()+1;
+						}
+						buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+
+						for (tok = (!isdigit(*val))?val+1:val; *tok; tok++) {
+							buf += *tok;
+						}
+						buf += "</a>&gt;</em></small> ";
+					}
+				}
+			}
+			valto = val;
+			num = strstr(token, "morph=\"x-Robinson:");
+			if (num) {
+				for (num+=18; ((*num) && (*num != '\"')); num++)
+					*valto++ = *num;
+				*valto = 0;
+				buf += " <small><em>(";
+				url = "";
+				for (tok = val; *tok; tok++) {
+				// normal robinsons tense
+					buf += *tok;
+				}
+				buf.appendFormatted("<a href=\"%s?showMorph=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+
+				for (tok = val; *tok; tok++) {
+					buf += *tok;
+				}
+				buf += "</a>)</em></small> ";
+			}
+		}
+
+		else if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
+			buf += " <small><em>&lt;";
+			url = "";
+
+			for (tok = token+1; *tok; tok++) {
+				url += *tok;
+			}
+			if ((url.length() > 1) && strchr("GH", url[0])) {
+				if (isdigit(url[1]))
+					url = url.c_str()+1;
+			}
+			buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+
+			for (tok = token + 2; *tok; tok++) {
+				buf += *tok;
+			}
+			buf += "</a>&gt;</em></small>";
+		}
+
+		else if (!strncmp(token, "WTG", 3) || !strncmp(token, "WTH", 3)) { // strong's numbers tense
+			buf += " <small><em>(";
+			url = "";
+			for (tok = token + 2; *tok; tok++) {
+				if(*tok != '\"')
+					url += *tok;
+			}
+			if ((url.length() > 1) && strchr("GH", url[0])) {
+				if (isdigit(url[1]))
+					url = url.c_str()+1;
+			}
+			buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "</a>)</em></small>";
+		}
+
+		else if (!strncmp(token, "WT", 2) && strncmp(token, "WTH", 3) && strncmp(token, "WTG", 3)) { // morph tags
+			buf += " <small><em>(";
+			for (tok = token + 2; *tok; tok++) {
+				if(*tok != '\"')
+					buf += *tok;
+			}
+			buf.appendFormatted("<a href=\"%s?showMorph=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+
+			for (tok = token + 2; *tok; tok++) {
+				if(*tok != '\"')
+					buf += *tok;
+			}
+			buf += "</a>)</em></small>";
+		}
+
+		else if (!strncmp(token, "RX", 2)) {
+			buf += "<a href=\"";
+			for (tok = token + 3; *tok; tok++) {
+			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
+			    buf += *tok;
+			  }
+			  else {
+			    break;
+			  }
+			}
+
+			buf.appendFormatted("a href=\"%s?key=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+		}
+		// ok to leave these in
+		else if ((!strncmp(token, "span", 4))
+				|| (!strncmp(token, "/span", 5))) {
+			buf.appendFormatted("<%s>", token);
+		}
+
+		else {
+			return GBFXHTML::handleToken(buf, token, userData);
+		}
+	}
+	return true;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfwordjs.cpp b/src/modules/filters/gbfwordjs.cpp
new file mode 100644
index 0000000..c9d1bd3
--- /dev/null
+++ b/src/modules/filters/gbfwordjs.cpp
@@ -0,0 +1,302 @@
+/******************************************************************************
+ *
+ *  gbfwordjs.cpp -	SWFilter descendant for ???
+ *
+ * $Id: gbfwordjs.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <gbfwordjs.h>
+#include <swmodule.h>
+#include <ctype.h>
+#include <utilstr.h>
+#include <versekey.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Word Javascript";
+	static const char oTip[]  = "Toggles Word Javascript data";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+GBFWordJS::GBFWordJS() : SWOptionFilter(oName, oTip, oValues()) {
+
+     defaultGreekLex   = 0;
+     defaultHebLex     = 0;
+     defaultGreekParse = 0;
+     defaultHebParse   = 0;
+     mgr               = 0;
+}
+
+
+GBFWordJS::~GBFWordJS() {
+}
+
+
+char GBFWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (option) {
+		char token[2112]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		int word = 1;
+		char val[128];
+		char wordstr[5];
+		unsigned int textStart = 0, lastAppendLen = 0, textEnd = 0;
+		SWBuf tmp;
+		bool newText = false;
+		bool needWordOut = false;
+		AttributeValue *wordAttrs = 0;
+		SWBuf modName = (module)?module->getName():"";
+		SWBuf wordSrcPrefix = modName;
+		
+		const SWBuf orig = text;
+		const char * from = orig.c_str();
+		VerseKey *vkey = 0;
+		if (key) {
+			vkey = SWDYNAMIC_CAST(VerseKey, key);
+		}
+
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				textEnd = text.length();
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (*token == 'W' && (token[1] == 'G' || token[1] == 'H')) {	// Strongs
+					strcpy(val,token+1);
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						// normal strongs number
+						sprintf(wordstr, "%03d", word++);
+						needWordOut = (word > 2);
+						wordAttrs = &(module->getEntryAttributes()["Word"][wordstr]);
+						(*wordAttrs)["Lemma"] = val;
+	//printf("Adding: [\"Word\"][%s][\"Strongs\"] = %s\n", wordstr, val);
+						tmp = "";
+						tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
+						(*wordAttrs)["Text"] = tmp;
+						text.append("</span>");
+						SWBuf ts;
+						ts.appendFormatted("%d", textStart);
+						(*wordAttrs)["TextStart"] = ts;
+	//printf("Adding: [\"Word\"][%s][\"Text\"] = %s\n", wordstr, tmp.c_str());
+						newText = true;
+					}
+					else {
+						// verb morph
+						if (wordAttrs) {
+							(*wordAttrs)["Morph"] = val;
+						}
+	//printf("Adding: [\"Word\"][%s][\"Morph\"] = %s\n", wordstr, val);
+					}
+
+				}
+				if (*token == 'W' && token[1] == 'T') {	// Morph
+					if (token[2] == 'G' || token[2] == 'H') {
+						strcpy(val, token+2);
+					}
+					else strcpy(val, token+1);
+					if (wordAttrs) {
+						(*wordAttrs)["Morph"] = val;
+						(*wordAttrs)["MorphClass"] = "StrongsMorph";
+					}
+					newText = true;
+				}
+				// if not a strongs token, keep token in text
+				text += '<';
+				text += token;
+				text += '>';
+				if (needWordOut) {
+					char wstr[10];
+					sprintf(wstr, "%03d", word-2);
+					AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
+					needWordOut = false;
+					SWBuf strong = (*wAttrs)["Lemma"];
+					SWBuf morph = (*wAttrs)["Morph"];
+					SWBuf morphClass = (*wAttrs)["MorphClass"];
+					SWBuf wordText = (*wAttrs)["Text"];
+					SWBuf textSt = (*wAttrs)["TextStart"];
+					if (strong.size()) {
+						char gh = 0;
+						gh = isdigit(strong[0]) ? 0:strong[0];
+						if (!gh) {
+							if (vkey) {
+								gh = vkey->getTestament() ? 'H' : 'G';
+							}
+						}
+						else strong << 1;
+
+						SWModule *sLex = 0;
+						SWModule *sMorph = 0;
+						if (gh == 'G') {
+							sLex = defaultGreekLex;
+							sMorph = defaultGreekParse;
+						}
+						if (gh == 'H') {
+							sLex = defaultHebLex;
+							sMorph = defaultHebParse;
+						}
+						SWBuf lexName = "";
+						if (sLex) {
+							// we can pass the real lex name in, but we have some
+							// aliases in the javascript to optimize bandwidth
+							lexName = sLex->getName();
+							if (lexName == "StrongsGreek")
+								lexName = "G";
+							if (lexName == "StrongsHebrew")
+								lexName = "H";
+						}
+						SWBuf wordID;
+						if (vkey) {
+							// optimize for bandwidth and use only the verse as the unique entry id
+							wordID.appendFormatted("%d", vkey->getVerse());
+						}
+						else {
+							wordID = key->getText();
+						}
+						for (unsigned int i = 0; i < wordID.size(); i++) {
+							if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
+								wordID[i] = '_';
+							}
+						}
+						wordID.appendFormatted("_%s%d", wordSrcPrefix.c_str(), atoi(wstr));
+						if (textSt.size()) {
+							int textStr = atoi(textSt.c_str());
+							textStr += lastAppendLen;
+							SWBuf spanStart = "";
+
+
+
+							if (!sMorph) sMorph = 0;	// to pass unused warning for now
+/*
+							if (sMorph) {
+								SWBuf popMorph = "<a onclick=\"";
+								popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->getName(), morph.c_str(), wordID.c_str(), morph.c_str());
+								morph = popMorph;
+							}
+*/
+
+							// 'p' = 'fillpop' to save bandwidth
+							const char *m = strchr(morph.c_str(), ':');
+							if (m) m++;
+							else m = morph.c_str();
+							spanStart.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','','%s');\" >", lexName.c_str(), strong.c_str(), wordID.c_str(), m, modName.c_str());
+							text.insert(textStr, spanStart);
+							lastAppendLen = spanStart.length();
+						}
+					}
+
+				}
+				if (newText) {
+					textStart = text.length(); newText = false;
+				}
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 2045)
+					token[tokpos++] = *from;
+					token[tokpos+2] = 0;
+			}
+			else	{
+				text += *from;
+			}
+		}
+
+		char wstr[10];
+		sprintf(wstr, "%03d", word-1);
+		AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
+		needWordOut = false;
+		SWBuf strong = (*wAttrs)["Lemma"];
+		SWBuf morph = (*wAttrs)["Morph"];
+		SWBuf morphClass = (*wAttrs)["MorphClass"];
+		SWBuf wordText = (*wAttrs)["Text"];
+		SWBuf textSt = (*wAttrs)["TextStart"];
+		if (strong.size()) {
+			char gh = 0;
+			gh = isdigit(strong[0]) ? 0:strong[0];
+			if (!gh) {
+				if (vkey) {
+					gh = vkey->getTestament() ? 'H' : 'G';
+				}
+			}
+			else strong << 1;
+
+			SWModule *sLex = 0;
+			if (gh == 'G') {
+				sLex = defaultGreekLex;
+			}
+			if (gh == 'H') {
+				sLex = defaultHebLex;
+			}
+			SWBuf lexName = "";
+			if (sLex) {
+				// we can pass the real lex name in, but we have some
+				// aliases in the javascript to optimize bandwidth
+				lexName = sLex->getName();
+				if (lexName == "StrongsGreek")
+					lexName = "G";
+				if (lexName == "StrongsHebrew")
+					lexName = "H";
+			}
+			SWBuf wordID;
+			if (vkey) {
+				// optimize for bandwidth and use only the verse as the unique entry id
+				wordID.appendFormatted("%d", vkey->getVerse());
+			}
+			else {
+				wordID = key->getText();
+			}
+			for (unsigned int i = 0; i < wordID.size(); i++) {
+				if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
+					wordID[i] = '_';
+				}
+			}
+			wordID.appendFormatted("_%s%d", wordSrcPrefix.c_str(), atoi(wstr));
+			if (textSt.size()) {
+				int textStr = atoi(textSt.c_str());
+				textStr += lastAppendLen;
+				SWBuf spanStart = "";
+				// 'p' = 'fillpop' to save bandwidth
+				const char *m = strchr(morph.c_str(), ':');
+				if (m) m++;
+				else m = morph.c_str();
+				spanStart.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','','%s');\" >", lexName.c_str(), strong.c_str(), wordID.c_str(), m, modName.c_str());
+				text.insert(textStr, spanStart);
+			}
+		}
+	}
+
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/gbfxhtml.cpp b/src/modules/filters/gbfxhtml.cpp
new file mode 100644
index 0000000..56d7663
--- /dev/null
+++ b/src/modules/filters/gbfxhtml.cpp
@@ -0,0 +1,236 @@
+/******************************************************************************
+ *
+ *  gbfxhtml.cpp -	GBF to classed XHTML
+ *
+ * $Id: gbfxhtml.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+ 
+#include <stdlib.h>
+#include <gbfxhtml.h>
+#include <swmodule.h>
+#include <utilxml.h>
+#include <versekey.h>
+#include <ctype.h>
+#include <url.h>
+
+SWORD_NAMESPACE_START
+
+const char *GBFXHTML::getHeader() const {
+	return "\
+		.wordsOfJesus {\
+			color: red;\
+		}\
+	";
+}
+
+GBFXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	if (module) {
+		version = module->getName(); 
+	}	
+}
+
+GBFXHTML::GBFXHTML() {
+	setTokenStart("<");
+	setTokenEnd(">");
+	
+	setTokenCaseSensitive(true);
+
+	//addTokenSubstitute("Rf", ")</small></font>");
+	addTokenSubstitute("FA", "<font color=\"#800000\">"); // for ASV footnotes to mark text
+	addTokenSubstitute("Rx", "</a>");
+	addTokenSubstitute("FI", "<i>"); // italics begin
+	addTokenSubstitute("Fi", "</i>");
+	addTokenSubstitute("FB", "<b>"); // bold begin
+	addTokenSubstitute("Fb", "</b>");
+	addTokenSubstitute("FR", "<span class=\"wordsOfJesus\">"); // words of Jesus begin
+	addTokenSubstitute("Fr", "</span>");
+	addTokenSubstitute("FU", "<u>"); // underline begin
+	addTokenSubstitute("Fu", "</u>");
+	addTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
+	addTokenSubstitute("Fo", "</cite>");
+	addTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
+	addTokenSubstitute("Fs", "</sup>");
+	addTokenSubstitute("FV", "<sub>"); // Subscript begin
+	addTokenSubstitute("Fv", "</sub>");
+	addTokenSubstitute("TT", "<big>"); // Book title begin
+	addTokenSubstitute("Tt", "</big>");
+	addTokenSubstitute("PP", "<cite>"); //  poetry  begin
+	addTokenSubstitute("Pp", "</cite>");
+	addTokenSubstitute("Fn", "</font>"); //  font  end
+	addTokenSubstitute("CL", "<br />"); //  new line
+	addTokenSubstitute("CM", "<!P><br />"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
+	addTokenSubstitute("CG", ""); //  ???
+	addTokenSubstitute("CT", ""); // ???
+	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
+	addTokenSubstitute("JC", "<div align=\"center\">"); // center align begin
+	addTokenSubstitute("JL", "</div>"); // align end
+	
+	renderNoteNumbers = false;
+}
+
+
+bool GBFXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	const char *tok;
+	MyUserData *u = (MyUserData *)userData;
+
+	if (!substituteToken(buf, token)) {
+		XMLTag tag(token);
+		
+		if (!strncmp(token, "WG", 2)) { // strong's numbers
+			//buf += " <small><em>&lt;<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=Greek&value=";
+			for (tok = token+2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "</a>&gt;</em></small>";
+		}
+		else if (!strncmp(token, "WH", 2)) { // strong's numbers
+			//buf += " <small><em>&lt;<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=Hebrew&value=";
+			for (tok = token+2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 2; *tok; tok++)
+				//if(token[i] != '\"')
+					buf += *tok;
+			buf += "</a>&gt;</em></small>";
+		}
+		else if (!strncmp(token, "WTG", 3)) { // strong's numbers tense
+			//buf += " <small><em>(<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">(<a href=\"passagestudy.jsp?action=showStrongs&type=Greek&value=";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "</a>)</em></small>";
+		}
+		else if (!strncmp(token, "WTH", 3)) { // strong's numbers tense
+			//buf += " <small><em>(<a href=\"type=Strongs value=";
+			buf += " <small><em class=\"strongs\">(<a href=\"passagestudy.jsp?action=showStrongs&type=Hebrew&value=";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "\" class=\"strongs\">";
+			for (tok = token + 3; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "</a>)</em></small>";
+		}
+
+		else if (!strncmp(token, "WT", 2) && strncmp(token, "WTH", 3) && strncmp(token, "WTG", 3)) { // morph tags
+			//buf += " <small><em>(<a href=\"type=morph class=none value=";
+			buf += " <small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=Greek&value=";
+			
+			for (tok = token + 2; *tok; tok++)
+				if(*tok != '\"')
+					buf += *tok;
+			buf += "\" class=\"morph\">";
+			for (tok = token + 2; *tok; tok++)				
+				if(*tok != '\"') 			
+					buf += *tok;		
+			buf += "</a>)</em></small>";
+		}
+
+		else if (!strcmp(tag.getName(), "RX")) {
+			buf += "<a href=\"";
+			for (tok = token + 3; *tok; tok++) {
+			  if(*tok != '<' && *tok+1 != 'R' && *tok+2 != 'x') {
+			    buf += *tok;
+			  }
+			  else {
+			    break;
+			  }
+			}
+			buf += "\">";
+		}
+		else if (!strcmp(tag.getName(), "RF")) {
+			SWBuf type = tag.getAttribute("type");
+			SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+			SWBuf noteName = tag.getAttribute("n");
+			VerseKey *vkey = NULL;
+			// see if we have a VerseKey * or descendant
+			SWTRY {
+				vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+			}
+			SWCATCH ( ... ) {	}
+			if (vkey) {
+				// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+				//char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+				buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a> ", 
+					URL::encode(footnoteNumber.c_str()).c_str(),
+					URL::encode(u->version.c_str()).c_str(), 
+					URL::encode(vkey->getText()).c_str(), 
+					(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str(): ""));
+			}
+			u->suspendTextPassThru = true;
+		}
+		else if (!strcmp(tag.getName(), "Rf")) {
+			u->suspendTextPassThru = false;
+		}
+/*
+		else if (!strncmp(token, "RB", 2)) {
+			buf += "<i> ";
+			u->hasFootnotePreTag = true;
+		}
+
+		else if (!strncmp(token, "Rf", 2)) {
+			buf += "&nbsp<a href=\"note=";
+			buf += u->lastTextNode.c_str();
+			buf += "\">";
+			buf += "<small><sup>*n</sup></small></a>&nbsp";
+			// let's let text resume to output again
+			u->suspendTextPassThru = false;
+		}
+		
+		else if (!strncmp(token, "RF", 2)) {
+			if (u->hasFootnotePreTag) {
+				u->hasFootnotePreTag = false;
+				buf += "</i> ";
+			}
+			u->suspendTextPassThru = true;
+		}
+*/
+		else if (!strncmp(token, "FN", 2)) {
+			buf += "<font face=\"";
+			for (tok = token + 2; *tok; tok++)				
+				if(*tok != '\"') 			
+					buf += *tok;
+			buf += "\">";
+		}
+
+		else if (!strncmp(token, "CA", 2)) {	// ASCII value
+			buf += (char)atoi(&token[2]);
+		}
+		
+		else {
+			return false;
+		}
+	}
+	return true;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/greeklexattribs.cpp b/src/modules/filters/greeklexattribs.cpp
new file mode 100644
index 0000000..1c2533d
--- /dev/null
+++ b/src/modules/filters/greeklexattribs.cpp
@@ -0,0 +1,117 @@
+/******************************************************************************
+ *
+ *  greeklexattribs.cpp -	SWFilter descendant to set entry attributes
+ *				for greek lexicons
+ *
+ * $Id: greeklexattribs.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <string>
+#include <greeklexattribs.h>
+#include <swmodule.h>
+
+using std::string;
+
+SWORD_NAMESPACE_START
+
+GreekLexAttribs::GreekLexAttribs() {
+}
+
+
+char GreekLexAttribs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+
+	if (module->isProcessEntryAttributes()) {
+		const char *from;
+		bool inAV = false;
+		string phrase;
+		string freq;
+		char val[128], *valto;
+		char wordstr[7];
+		const char *currentPhrase = 0;
+		const char *currentPhraseEnd = 0;
+		int number = 0;
+
+
+		for (from = text.c_str(); *from; from++) {
+			if (inAV) {
+				if (currentPhrase == 0) {
+					if (isalpha(*from))
+						currentPhrase = from;
+				}
+				else {
+					if ((!isalpha(*from)) && (*from != ' ') && (*from != '+') && (*from !='(') && (*from != ')') && (*from != '\'')) {
+						if (*from == '<') {
+							if (!currentPhraseEnd)
+								currentPhraseEnd = from - 1;
+							for (; *from && *from != '>'; from++) {
+								if (!strncmp(from, "value=\"", 7)) {
+									valto = val;
+									from += 7;
+									for (unsigned int i = 0; from[i] != '\"' && i < 127; i++)
+										*valto++ = from[i];
+									*valto = 0;
+									sprintf(wordstr, "%03d", number+1);
+									module->getEntryAttributes()["AVPhrase"][wordstr]["CompoundedWith"] = val;
+									from += strlen(val);
+								}
+							}
+							continue;
+						}
+
+						phrase = "";
+						phrase.append(currentPhrase, (int)(((currentPhraseEnd>currentPhrase)?currentPhraseEnd:from) - currentPhrase)-1);
+						currentPhrase = from;
+						while (*from && isdigit(*from)) from++;
+						freq = "";
+						freq.append(currentPhrase, (int)(from - currentPhrase));
+						if ((freq.length() > 0) && (phrase.length() > 0)) {
+							sprintf(wordstr, "%03d", ++number);
+							if ((strchr(phrase.c_str(), '(') > phrase.c_str()) && (strchr(phrase.c_str(), ')') > phrase.c_str() + 1)) {
+								string tmp = phrase.substr(0, phrase.find_first_of("("));
+								phrase.erase(phrase.find_first_of("("), 1);
+								phrase.erase(phrase.find_first_of(")"), 1);
+								phrase.erase(0,phrase.find_first_not_of("\r\n\v\t ")); phrase.erase(phrase.find_last_not_of("\r\n\v\t ")+1);
+								module->getEntryAttributes()["AVPhrase"][wordstr]["Alt"] = phrase.c_str();
+								phrase = tmp;
+							}
+							phrase.erase(0,phrase.find_first_not_of("\r\n\v\t ")); phrase.erase(phrase.find_last_not_of("\r\n\v\t ")+1);
+							freq.erase(0,freq.find_first_not_of("\r\n\v\t ")); freq.erase(freq.find_last_not_of("\r\n\v\t ")+1);
+							module->getEntryAttributes()["AVPhrase"][wordstr]["Phrase"] = phrase.c_str();
+							module->getEntryAttributes()["AVPhrase"][wordstr]["Frequency"] = freq.c_str();
+							currentPhrase = 0;
+							currentPhraseEnd = 0;
+						}
+					}
+				}
+				if (*from == ';') inAV = false;
+
+			}
+			else if (!strncmp(from, "AV-", 3)) {
+				inAV = true;
+				from+=2;
+			}
+		}
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/latin1utf16.cpp b/src/modules/filters/latin1utf16.cpp
new file mode 100644
index 0000000..ef27245
--- /dev/null
+++ b/src/modules/filters/latin1utf16.cpp
@@ -0,0 +1,135 @@
+/******************************************************************************
+ *
+ *  latin1utf16.cpp -	SWFilter descendant Latin1UTF16 to convert a Latin-1
+ *			character to UTF-16
+ *
+ * $Id: latin1utf16.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <latin1utf16.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+Latin1UTF16::Latin1UTF16() {
+}
+
+
+char Latin1UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+    const unsigned char *from;
+	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return (char)-1;
+   
+    
+	SWBuf orig = text;
+	from = (const unsigned char *)orig.c_str();
+
+	for (text = ""; *from; from++) {
+		text.setSize(text.size()+2);
+	   switch (*from) {
+	case 0x80: // '€'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x20AC;
+		break;
+	case 0x82: // '‚'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201A;
+		break;
+	case 0x83: // 'ƒ'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0192;
+		break;
+	case 0x84: // '„'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201E;
+		break;
+	case 0x85: // '…'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2026;
+		break;
+	case 0x86: // '†'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2020;
+		break;
+	case 0x87: // '‡'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2021;
+		break;
+	case 0x88: // 'ˆ'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x02C6;
+		break;
+	case 0x89: // '‰'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2030;
+		break;
+	case 0x8A: // 'Š'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0160;
+		break;
+	case 0x8B: // '‹'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2039;
+		break;
+	case 0x8C: // 'Œ'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0152;
+		break;
+	case 0x8E: // 'Ž'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x017D;
+		break;
+	case 0x91: // '‘'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2018;
+		break;
+	case 0x92: // '’'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2019;
+		break;
+	case 0x93: // '“'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201C;
+		break;
+	case 0x94: // '”'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x201D;
+		break;
+	case 0x95: // '•'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2022;
+		break;
+	case 0x96: // '–'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2013;
+		break;
+	case 0x97: // '—'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2014;
+		break;
+	case 0x98: // '˜'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x02DC;
+		break;
+	case 0x99: // '™'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x2122;
+		break;
+	case 0x9A: // 'š'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0161;
+		break;
+	case 0x9B: // '›'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x203A;
+		break;
+	case 0x9C: // 'œ'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0153;
+		break;
+	case 0x9E: // 'ž'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x017E;
+		break;
+	case 0x9F: // 'Ÿ'
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) 0x0178;
+		break;
+	   default:
+		*((unsigned short *)(text.getRawData()+(text.size()-2))) = (unsigned short) *from;
+	   }
+    }
+    return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/latin1utf8.cpp b/src/modules/filters/latin1utf8.cpp
new file mode 100644
index 0000000..a784893
--- /dev/null
+++ b/src/modules/filters/latin1utf8.cpp
@@ -0,0 +1,192 @@
+/******************************************************************************
+ *
+ *  latin1utf8.cpp -	SWFilter descendant Latin1UTF8 to convert a Latin-1
+ *			character to UTF-8
+ *
+ * $Id: latin1utf8.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <latin1utf8.h>
+#include <swmodule.h>
+
+
+SWORD_NAMESPACE_START
+
+
+Latin1UTF8::Latin1UTF8() {
+}
+
+
+char Latin1UTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+    const unsigned char *from;
+
+	if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return (char)-1;
+
+	SWBuf orig = text;
+	from = (const unsigned char *)orig.c_str();
+
+	for (text = ""; *from; from++) {
+	  if (*from < 0x80) {
+	    text += *from;
+	  }
+	  else if (*from < 0xc0) {
+                switch(*from) {
+        	case 0x80: // '€'
+	        	text += 0xe2; // 'â'
+		        text += 0x82; // '‚'
+        		text += 0xac; // '¬'
+	        	break;
+        	case 0x82: // '‚'
+	        	text += 0xe2; // 'â'
+		        text += 0x80; // '€'
+        		text += 0x9a; // 'š'
+	        	break;
+        	case 0x83: // 'ƒ'
+	        	text += 0xc6; // 'Æ'
+		        text += 0x92; // '’'
+        		break;
+	        case 0x84: // '„'
+		        text += 0xe2; // 'â'
+        		text += 0x80; // '€'
+	        	text += 0x9e; // 'ž'
+		        break;
+        	case 0x85: // '…'
+	        	text += 0xe2; // 'â'
+		        text += 0x80; // '€'
+        		text += 0xa6; // '¦'
+	        	break;
+        	case 0x86: // '†'
+        		text += 0xe2; // 'â'
+	        	text += 0x80; // '€'
+		        text += 0xa0; // ' '
+        		break;
+	        case 0x87: // '‡'
+		        text += 0xe2; // 'â'
+        		text += 0x80; // '€'
+	        	text += 0xa1; // '¡'
+		        break;
+        	case 0x88: // 'ˆ'
+	        	text += 0xcb; // 'Ë'
+		        text += 0x86; // '†'
+        		break;
+	        case 0x89: // '‰'
+		        text += 0xe2; // 'â'
+        		text += 0x80; // '€'
+	        	text += 0xb0; // '°'
+		        break;
+        	case 0x8A: // 'Š'
+	        	text += 0xc5; // 'Å'
+		        text += 0xa0; // ' '
+        		break;
+	        case 0x8B: // '‹'
+		        text += 0xe2; // 'â'
+        		text += 0x80; // '€'
+	        	text += 0xb9; // '¹'
+		        break;
+        	case 0x8C: // 'Œ'
+	        	text += 0xc5; // 'Å'
+		        text += 0x92; // '’'
+        		break;
+	        case 0x8E: // 'Ž'
+		        text += 0xc5; // 'Å'
+        		text += 0xbd; // '½'
+	        	break;
+        	case 0x91: // '‘'
+        		text += 0xe2; // 'â'
+	        	text += 0x80; // '€'
+		        text += 0x98; // '˜'
+        		break;
+	        case 0x92: // '’'
+		        text += 0xe2; // 'â'
+        		text += 0x80; // '€'
+	        	text += 0x99; // '™'
+		        break;
+        	case 0x93: // '“'
+	        	text += 0xe2; // 'â'
+		        text += 0x80; // '€'
+        		text += 0x9c; // 'œ'
+	        	break;
+        	case 0x94: // '”'
+	        	text += 0xe2; // 'â'
+		        text += 0x80; // '€'
+        		text += 0x9d; // '�'
+	        	break;
+        	case 0x95: // '•'
+	        	text += 0xe2; // 'â'
+		        text += 0x80; // '€'
+        		text += 0xa2; // '¢'
+	        	break;
+        	case 0x96: // '–'
+	        	text += 0xe2; // 'â'
+		        text += 0x80; // '€'
+        		text += 0x93; // '“'
+	        	break;
+        	case 0x97: // '—'
+	        	text += 0xe2; // 'â'
+		        text += 0x80; // '€'
+        		text += 0x94; // '”'
+	        	break;
+        	case 0x98: // '˜'
+	        	text += 0xcb; // 'Ë'
+		        text += 0x9c; // 'œ'
+        		break;
+	        case 0x99: // '™'
+		        text += 0xe2; // 'â'
+        		text += 0x84; // '„'
+	        	text += 0xa2; // '¢'
+		        break;
+        	case 0x9A: // 'š'
+	        	text += 0xc5; // 'Å'
+		        text += 0xa1; // '¡'
+        		break;
+	        case 0x9B: // '›'
+		        text += 0xe2; // 'â'
+        		text += 0x80; // '€'
+	        	text += 0xba; // 'º'
+		        break;
+        	case 0x9C: // 'œ'
+	        	text += 0xc5; // 'Å'
+		        text += 0x93; // '“'
+        		break;
+	        case 0x9E: // 'ž'
+		        text += 0xc5; // 'Å'
+        		text += 0xbe; // '¾'
+	        	break;
+        	case 0x9F: // 'Ÿ'
+	        	text += 0xc5; // 'Å'
+		        text += 0xb8; // '¸'
+        		break;
+                default:
+                        text += 0xC2;
+                        text += *from;
+                }
+	  }
+	  else {
+	    text += 0xC3;
+	    text += (*from - 0x40);
+	  }
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisenum.cpp b/src/modules/filters/osisenum.cpp
new file mode 100644
index 0000000..db433b0
--- /dev/null
+++ b/src/modules/filters/osisenum.cpp
@@ -0,0 +1,99 @@
+/******************************************************************************
+ *
+ *  osisenum.cpp -	SWFilter descendant to hide or show word enumations
+ *			in an OSIS module
+ *
+ * $Id: osisenum.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisenum.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Enumerations";
+	static const char oTip[]  = "Toggles Enumerations On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISEnum::OSISEnum() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISEnum::~OSISEnum() {
+}
+
+
+char OSISEnum::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken = false;
+
+	const SWBuf orig = text;
+	const char * from = orig.c_str();
+
+	if (!option) {
+		for (text = ""; *from; ++from) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (token.startsWith("w ")) {	// Word
+					XMLTag wtag(token);
+					const char *l = wtag.getAttribute("n");
+					if (l) {
+						wtag.setAttribute("n", 0);
+						token = wtag;
+						token.trim();
+						// drop <>
+						token << 1;
+						token--;
+					}
+				}
+				
+				// keep token in text
+				text.append('<');
+				text.append(token);
+				text.append('>');
+				
+				continue;
+			}
+			if (intoken) {
+				token += *from;
+			}
+			else	{
+				text.append(*from);
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisfootnotes.cpp b/src/modules/filters/osisfootnotes.cpp
new file mode 100644
index 0000000..8008d5c
--- /dev/null
+++ b/src/modules/filters/osisfootnotes.cpp
@@ -0,0 +1,186 @@
+/******************************************************************************
+ *
+ *  osisfootnotes.cpp -	SWFilter descendant to hide or show footnotes
+ *			in an OSIS module
+ *
+ * $Id: osisfootnotes.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <osisfootnotes.h>
+#include <swmodule.h>
+#include <swbuf.h>
+#include <versekey.h>
+#include <utilxml.h>
+#include <utilstr.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Footnotes";
+	static const char oTip[]  = "Toggles Footnotes On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISFootnotes::OSISFootnotes() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISFootnotes::~OSISFootnotes() {
+}
+
+
+char OSISFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken    = false;
+	bool hide       = false;
+	SWBuf tagText;
+	XMLTag startTag;
+	SWBuf refs = "";
+	int footnoteNum = 1;
+	char buf[254];
+	SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey();
+        VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
+        if (!parser) {
+        	delete p;
+                parser = new VerseKey();
+        }
+        *parser = key->getText();
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+
+	XMLTag tag;
+	bool strongsMarkup = false;
+
+
+	for (text = ""; *from; ++from) {
+
+		// remove all newlines temporarily to fix kjv2003 module
+		if ((*from == 10) || (*from == 13)) {
+			if ((text.length()>1) && (text[text.length()-2] != ' ') && (*(from+1) != ' '))
+				text.append(' ');
+			continue;
+		}
+
+
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+
+
+
+		if (*from == '>') {	// process tokens
+			intoken = false;
+			if (!strncmp(token, "note", 4) || !strncmp(token.c_str(), "/note", 5)) {
+				tag = token;
+
+				if (!tag.isEndTag()) {
+					if (tag.getAttribute("type") && (!strcmp("x-strongsMarkup", tag.getAttribute("type"))
+											|| !strcmp("strongsMarkup", tag.getAttribute("type")))	// deprecated
+							) {
+						tag.setEmpty(false);  // handle bug in KJV2003 module where some note open tags were <note ... />
+						strongsMarkup = true;
+					}
+
+					if (!tag.isEmpty()) {
+//					if ((!tag.isEmpty()) || (SWBuf("strongsMarkup") == tag.getAttribute("type"))) {
+						refs = "";
+						startTag = tag;
+						hide = true;
+						tagText = "";
+						continue;
+					}
+				}
+				if (hide && tag.isEndTag()) {
+					if (module->isProcessEntryAttributes() && !strongsMarkup) { //don`t parse strongsMarkup to EntryAttributes as Footnote
+						sprintf(buf, "%i", footnoteNum++);
+						StringList attributes = startTag.getAttributeNames();
+						for (StringList::const_iterator it = attributes.begin(); it != attributes.end(); it++) {
+							module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
+						}
+						module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
+						startTag.setAttribute("swordFootnote", buf);
+						if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) {
+							if (!refs.length())
+								refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText();
+							module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
+						}
+					}
+					hide = false;
+					if (option || (startTag.getAttribute("type") && !strcmp(startTag.getAttribute("type"), "crossReference"))) {	// we want the tag in the text; crossReferences are handled by another filter
+						text.append(startTag);
+//						text.append(tagText);	// we don't put the body back in because it is retrievable from EntryAttributes["Footnotes"][]["body"].
+					}
+					else	continue;
+				}
+				strongsMarkup = false;
+			}
+
+			// if not a heading token, keep token in text
+			//if ((!strcmp(tag.getName(), "reference")) && (!tag.isEndTag())) {
+			//	SWBuf osisRef = tag.getAttribute("osisRef");
+			if (!strncmp(token, "reference", 9)) {
+				if (refs.length()) {
+					refs.append("; ");
+				}
+
+				const char* attr = strstr(token.c_str() + 9, "osisRef=\"");
+				const char* end  = attr ? strchr(attr+9, '"') : 0;
+
+				if (attr && end) {
+					refs.append(attr+9, end-(attr+9));
+				}
+			}
+			if (!hide) {
+				text.append('<');
+				text.append(token);
+				text.append('>');
+			}
+			else {
+				tagText.append('<');
+				tagText.append(token);
+				tagText.append('>');
+			}
+			continue;
+		}
+		if (intoken) { //copy token
+			token.append(*from);
+		}
+		else if (!hide) { //copy text which is not inside a token
+			text.append(*from);
+		}
+		else tagText.append(*from);
+	}
+        delete parser;
+	return 0;
+}
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/osisglosses.cpp b/src/modules/filters/osisglosses.cpp
new file mode 100644
index 0000000..d232acc
--- /dev/null
+++ b/src/modules/filters/osisglosses.cpp
@@ -0,0 +1,99 @@
+/******************************************************************************
+ *
+ *  osisglosses.cpp -	SWFilter descendant to hide or show glosses
+ *			in an OSIS module
+ *
+ * $Id: osisglosses.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisglosses.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Glosses";
+	static const char oTip[]  = "Toggles Glosses On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISGlosses::OSISGlosses() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISGlosses::~OSISGlosses() {
+}
+
+
+char OSISGlosses::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken = false;
+
+	const SWBuf orig = text;
+	const char * from = orig.c_str();
+
+	if (!option) {
+		for (text = ""; *from; ++from) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (token.startsWith("w ")) {	// Word
+					XMLTag wtag(token);
+					const char *l = wtag.getAttribute("gloss");
+					if (l) {
+						wtag.setAttribute("gloss", 0);
+						token = wtag;
+						token.trim();
+						// drop <>
+						token << 1;
+						token--;
+					}
+				}
+				
+				// keep token in text
+				text.append('<');
+				text.append(token);
+				text.append('>');
+				
+				continue;
+			}
+			if (intoken) {
+				token += *from;
+			}
+			else	{
+				text.append(*from);
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisheadings.cpp b/src/modules/filters/osisheadings.cpp
new file mode 100644
index 0000000..783fa81
--- /dev/null
+++ b/src/modules/filters/osisheadings.cpp
@@ -0,0 +1,147 @@
+/******************************************************************************
+ *
+ *  osisheadings.cpp -	SWFilter descendant to hide or show headings
+ *			in an OSIS module
+ *
+ * $Id: osisheadings.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <osisheadings.h>
+#include <swmodule.h>
+#include <utilxml.h>
+#include <utilstr.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Headings";
+	static const char oTip[]  = "Toggles Headings On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+
+
+	class MyUserData : public BasicFilterUserData {
+	public:
+		SWBuf currentHeadingName;
+		XMLTag currentHeadingTag;
+		const char *sID;
+		SWBuf heading;
+		int depth;
+		int headerNum;
+
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+			clear();
+		}
+		void clear() {
+			currentHeadingName = "";
+			currentHeadingTag = "";
+			sID = 0;
+			heading = "";
+			depth = 0;
+			headerNum = 0;
+		}
+	};
+}
+
+
+BasicFilterUserData *OSISHeadings::createUserData(const SWModule *module, const SWKey *key) {
+	return new MyUserData(module, key);
+}
+
+
+OSISHeadings::OSISHeadings() : SWOptionFilter(oName, oTip, oValues()) {
+	setPassThruUnknownToken(true);
+}
+
+
+bool OSISHeadings::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+
+	MyUserData *u = (MyUserData *)userData;
+	XMLTag tag(token);
+	SWBuf name = tag.getName();
+
+	// we only care about titles and divs or if we're already in a heading
+	//
+	// are we currently in a heading?
+	if (u->currentHeadingName.size()) {
+		u->heading.append(u->lastTextNode);
+		if (name == u->currentHeadingName) {
+			if (tag.isEndTag(u->sID)) {
+				if (!u->depth-- || u->sID) {
+					// we've just finished a heading.  It's all stored up in u->heading
+					bool canonical = (SWBuf("true") == u->currentHeadingTag.getAttribute("canonical"));
+					bool preverse = (SWBuf("x-preverse") == u->currentHeadingTag.getAttribute("subType") || SWBuf("x-preverse") == u->currentHeadingTag.getAttribute("subtype"));
+
+					// do we want to put anything in EntryAttributes?
+					if (u->module->isProcessEntryAttributes() && (option || canonical || !preverse)) {
+						SWBuf buf; buf.appendFormatted("%i", u->headerNum++);
+						u->module->getEntryAttributes()["Heading"][(preverse)?"Preverse":"Interverse"][buf] = u->heading;
+
+						StringList attributes = u->currentHeadingTag.getAttributeNames();
+						for (StringList::const_iterator it = attributes.begin(); it != attributes.end(); it++) {
+							u->module->getEntryAttributes()["Heading"][buf][it->c_str()] = u->currentHeadingTag.getAttribute(it->c_str());
+						}
+					}
+
+					// do we want the heading in the body?
+					if (!preverse && (option || canonical)) {
+						buf.append(u->currentHeadingTag);
+						buf.append(u->heading);
+						buf.append(tag);
+					}
+					u->suspendTextPassThru = false;
+					u->clear();
+				}
+			}
+			else u->depth++;
+		}
+		u->heading.append(tag);
+		return true;
+	}
+
+	// are we a title or a preverse div?
+	else if (   name == "title"
+		|| (name == "div"
+			&& ( SWBuf("x-preverse") == tag.getAttribute("subType")
+			  || SWBuf("x-preverse") == tag.getAttribute("subtype")))) {
+
+		u->currentHeadingName = name;
+		u->currentHeadingTag = tag;
+		u->heading = "";
+		u->sID = u->currentHeadingTag.getAttribute("sID");
+		u->depth = 0;
+		u->suspendTextPassThru = true;
+
+		return true;
+	}
+
+	return false;
+}
+
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/osishtmlhref.cpp b/src/modules/filters/osishtmlhref.cpp
new file mode 100644
index 0000000..74b2da7
--- /dev/null
+++ b/src/modules/filters/osishtmlhref.cpp
@@ -0,0 +1,631 @@
+/***************************************************************************
+ *
+ *  osishtmlhref.cpp -	OSIS to HTML with hrefs filter
+ * 
+ * $Id: osishtmlhref.cpp 3005 2014-01-09 04:06:11Z greg.hellings $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <osishtmlhref.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+#include <swmodule.h>
+#include <url.h>
+#include <stringmgr.h>
+#include <stack>
+
+SWORD_NAMESPACE_START
+
+namespace {
+	typedef std::stack<SWBuf> TagStack;
+// though this might be slightly slower, possibly causing an extra bool check, this is a renderFilter
+// so speed isn't the absolute highest priority, and this is a very minor possible hit
+static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; }
+static inline void outText(char t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; }
+
+void processLemma(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) {
+	const char *attrib;
+	const char *val;
+	if ((attrib = tag.getAttribute("lemma"))) {
+		int count = tag.getAttributePartCount("lemma", ' ');
+		int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+		do {
+			attrib = tag.getAttribute("lemma", i, ' ');
+			if (i < 0) i = 0;	// to handle our -1 condition
+			val = strchr(attrib, ':');
+			val = (val) ? (val + 1) : attrib;
+			SWBuf gh;
+			if(*val == 'G')
+				gh = "Greek";
+			if(*val == 'H')
+				gh = "Hebrew";
+			const char *val2 = val;
+			if ((strchr("GH", *val)) && (isdigit(val[1])))
+				val2++;
+			//if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
+			//	show = false;
+			//else {
+				if (!suspendTextPassThru) {
+					buf.appendFormatted("<small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">%s</a>&gt;</em></small>",
+							(gh.length()) ? gh.c_str() : "", 
+							URL::encode(val2).c_str(),
+							val2);
+				}
+			//}
+			
+		} while (++i < count);
+	}
+}
+
+void processMorph(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) {
+	const char * attrib;
+	const char *val;
+	if ((attrib = tag.getAttribute("morph"))) { // && (show)) {
+		SWBuf savelemma = tag.getAttribute("savlm");
+		//if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
+		//	show = false;
+		//if (show) {
+			int count = tag.getAttributePartCount("morph", ' ');
+			int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+			do {
+				attrib = tag.getAttribute("morph", i, ' ');
+				if (i < 0) i = 0;	// to handle our -1 condition
+				val = strchr(attrib, ':');
+				val = (val) ? (val + 1) : attrib;
+				const char *val2 = val;
+				if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
+					val2+=2;
+				if (!suspendTextPassThru) {
+					buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=%s&value=%s\" class=\"morph\">%s</a>)</em></small>",
+							URL::encode(tag.getAttribute("morph")).c_str(),
+							URL::encode(val).c_str(), 
+							val2);
+				}
+			} while (++i < count);
+		//}
+	}
+}
+}	// end anonymous namespace
+
+// TODO: this bridge pattern is to preserve binary compat on 1.6.x
+class OSISHTMLHREF::TagStacks {
+public:
+	TagStack quoteStack;
+	TagStack hiStack;
+};
+
+OSISHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	inXRefNote    = false;
+	suspendLevel = 0;
+	tagStacks = new TagStacks();
+	wordsOfChristStart = "<font color=\"red\"> ";
+	wordsOfChristEnd   = "</font> ";
+	if (module) {
+		osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+	}
+	else {
+		osisQToTick = true;	// default
+		version = "";
+	}
+}
+
+OSISHTMLHREF::MyUserData::~MyUserData() {
+	delete tagStacks;
+}
+
+OSISHTMLHREF::OSISHTMLHREF() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+	setPassThruNumericEscapeString(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("apos");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	setTokenCaseSensitive(true);
+	
+	//	addTokenSubstitute("lg",  "<br />");
+	//	addTokenSubstitute("/lg", "<br />");
+
+	morphFirst = false;
+	renderNoteNumbers = false;
+}
+
+
+bool OSISHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	MyUserData *u = (MyUserData *)userData;
+	SWBuf scratch;
+	bool sub = (u->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+	if (!sub) {
+  // manually process if it wasn't a simple substitution
+		XMLTag tag(token);
+		
+		// <w> tag
+		if (!strcmp(tag.getName(), "w")) {
+ 
+			// start <w> tag
+			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
+				u->w = token;
+			}
+
+			// end or empty <w> tag
+			else {
+				bool endTag = tag.isEndTag();
+				SWBuf lastText;
+				//bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
+
+				if (endTag) {
+					tag = u->w.c_str();
+					lastText = u->lastTextNode.c_str();
+				}
+				else lastText = "stuff";
+
+				const char *attrib;
+				const char *val;
+				if ((attrib = tag.getAttribute("xlit"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					outText(" ", buf, u);
+					outText(val, buf, u);
+				}
+				if ((attrib = tag.getAttribute("gloss"))) {
+					// I'm sure this is not the cleanest way to do it, but it gets the job done
+					// for rendering ruby chars properly ^_^
+					buf -= lastText.length();
+					
+					outText("<ruby><rb>", buf, u);
+					outText(lastText, buf, u);
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					outText("</rb><rp>(</rp><rt>", buf, u);
+					outText(val, buf, u);
+					outText("</rt><rp>)</rp></ruby>", buf, u);
+				}
+				if (!morphFirst) {
+					processLemma(u->suspendTextPassThru, tag, buf);
+					processMorph(u->suspendTextPassThru, tag, buf);
+				}
+				else {
+					processMorph(u->suspendTextPassThru, tag, buf);
+					processLemma(u->suspendTextPassThru, tag, buf);
+				}
+				if ((attrib = tag.getAttribute("POS"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					outText(" ", buf, u);
+					outText(val, buf, u);
+				}
+
+				/*if (endTag)
+					buf += "}";*/
+			}
+		}
+
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				SWBuf type = tag.getAttribute("type");
+				bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup");	// the latter is deprecated
+				if (strongsMarkup) {
+					tag.setEmpty(false);	// handle bug in KJV2003 module where some note open tags were <note ... />
+				}
+
+				if (!tag.isEmpty()) {
+
+					if (!strongsMarkup) {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
+						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+						SWBuf noteName = tag.getAttribute("n");
+						VerseKey *vkey = NULL;
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+
+						u->inXRefNote = true; // Why this change? Ben Morgan: Any note can have references in, so we need to set this to true for all notes
+//						u->inXRefNote = (ch == 'x');
+
+						// see if we have a VerseKey * or descendant
+						SWTRY {
+							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+						}
+						SWCATCH ( ... ) {	}
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
+						        ch, 
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(), 
+							URL::encode(vkey ? vkey->getText() : u->key->getText()).c_str(), 
+							ch,
+							ch, 
+							(renderNoteNumbers ? noteName.c_str() : ""));
+					}
+				}
+				u->suspendTextPassThru = (++u->suspendLevel);
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = (--u->suspendLevel);
+				u->inXRefNote = false;
+				u->lastSuspendSegment = ""; // fix/work-around for nasb devineName in note bug
+			}
+		}
+
+		// <p> paragraph and <lg> linegroup tags
+		else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
+				outText("<!P><br />", buf, u);
+			}
+			else if (tag.isEndTag()) {	// end tag
+				outText("<!/P><br />", buf, u);
+				userData->supressAdjacentWhitespace = true;
+			}
+			else {					// empty paragraph break marker
+				outText("<!P><br />", buf, u);
+				userData->supressAdjacentWhitespace = true;
+			}
+		}
+
+		// Milestoned paragraphs, created by osis2mod
+		// <div type="paragraph" sID.../>
+		// <div type="paragraph" eID.../>
+		else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) {
+			// <div type="paragraph"  sID... />
+			if (tag.getAttribute("sID")) {	// non-empty start tag
+				outText("<!P><br />", buf, u);
+			}
+			// <div type="paragraph"  eID... />
+			else if (tag.getAttribute("eID")) {
+				outText("<!/P><br />", buf, u);
+				userData->supressAdjacentWhitespace = true;
+			}
+		}
+
+		// <reference> tag
+		else if (!strcmp(tag.getName(), "reference")) {	
+			if (!u->inXRefNote) {	// only show these if we're not in an xref note				
+				if (!tag.isEndTag()) {
+					SWBuf target;
+					SWBuf work;
+					SWBuf ref;
+					bool is_scripRef = false;
+
+					target = tag.getAttribute("osisRef");
+					const char* the_ref = strchr(target, ':');
+					
+					if(!the_ref) {
+						// No work
+						ref = target;
+						is_scripRef = true;
+					}
+					else {
+						// Compensate for starting :
+						ref = the_ref + 1;
+
+						int size = target.size() - ref.size() - 1;
+						work.setSize(size);
+						strncpy(work.getRawData(), target, size);
+
+						// For Bible:Gen.3.15 or Bible.vulgate:Gen.3.15
+						if(!strncmp(work, "Bible", 5))
+							is_scripRef = true;
+					}
+
+					if(is_scripRef)
+					{
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=\">",
+							URL::encode(ref.c_str()).c_str()
+//							(work.size()) ? URL::encode(work.c_str()).c_str() : "")
+							);
+					}
+					else
+					{
+						// Dictionary link, or something
+						buf.appendFormatted("<a href=\"sword://%s/%s\">",
+							URL::encode(work.c_str()).c_str(),
+							URL::encode(ref.c_str()).c_str()
+							);
+					}
+				}
+				else {
+					outText("</a>", buf, u);
+				}
+			}
+		}
+
+		// <l> poetry, etc
+		else if (!strcmp(tag.getName(), "l")) {
+			// end line marker
+			if (tag.getAttribute("eID")) {
+				outText("<br />", buf, u);
+			}
+			// <l/> without eID or sID
+			// Note: this is improper osis. This should be <lb/>
+			else if (tag.isEmpty() && !tag.getAttribute("sID")) {
+				outText("<br />", buf, u);
+			}
+			// end of the line
+			else if (tag.isEndTag()) {
+				outText("<br />", buf, u);
+			}
+		}
+
+		// <lb.../>
+		else if (!strcmp(tag.getName(), "lb") && (!tag.getAttribute("type") || strcmp(tag.getAttribute("type"), "x-optional"))) {
+			outText("<br />", buf, u);
+			userData->supressAdjacentWhitespace = true;
+		}
+		// <milestone type="line"/>
+		// <milestone type="x-p"/>
+		// <milestone type="cQuote" marker="x"/>
+		else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type"))) {
+			if (!strcmp(tag.getAttribute("type"), "line")) {
+				outText("<br />", buf, u);
+				if (tag.getAttribute("subType") && !strcmp(tag.getAttribute("subType"), "x-PM")) {
+					outText("<br />", buf, u);
+				}
+				userData->supressAdjacentWhitespace = true;
+			}
+			else if (!strcmp(tag.getAttribute("type"),"x-p"))  {
+				if (tag.getAttribute("marker"))
+					outText(tag.getAttribute("marker"), buf, u);
+				else outText("<!p>", buf, u);
+			}
+			else if (!strcmp(tag.getAttribute("type"), "cQuote")) {
+				const char *tmp = tag.getAttribute("marker");
+				bool hasMark    = tmp;
+				SWBuf mark      = tmp;
+				tmp             = tag.getAttribute("level");
+				int level       = (tmp) ? atoi(tmp) : 1;
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				// finally, alternate " and ', if config says we should supply a mark
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+			}
+		}
+
+		// <title>
+		else if (!strcmp(tag.getName(), "title")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("<b>", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("</b><br />", buf, u);
+			}
+		}
+		
+		// <list>
+		else if (!strcmp(tag.getName(), "list")) {
+			if((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("<ul>", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("</ul>", buf, u);
+			}
+		}
+
+		// <item>
+		else if (!strcmp(tag.getName(), "item")) {
+			if((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("<li>", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("</li>", buf, u);
+			}
+		}
+		// <catchWord> & <rdg> tags (italicize)
+		else if (!strcmp(tag.getName(), "rdg") || !strcmp(tag.getName(), "catchWord")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("<i>", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("</i>", buf, u);
+			}
+		}
+
+		// divineName  
+		else if (!strcmp(tag.getName(), "divineName")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				u->suspendTextPassThru = (++u->suspendLevel);
+			}
+			else if (tag.isEndTag()) {
+				SWBuf lastText = u->lastSuspendSegment.c_str();
+				u->suspendTextPassThru = (--u->suspendLevel);
+				if (lastText.size()) {
+					toupperstr(lastText);
+					scratch.setFormatted("%c<font size=\"-1\">%s</font>", lastText[0], lastText.c_str()+1);
+
+					const unsigned char *tmpBuf = (const unsigned char *)lastText.c_str();
+					getUniCharFromUTF8(&tmpBuf);
+					int char_length = (tmpBuf - (const unsigned char *)lastText.c_str());
+					scratch.setFormatted("%.*s<font size=\"-1\">%s</font>", 
+						char_length, 
+						lastText.c_str(),
+						lastText.c_str() + char_length
+					);
+					
+					outText(scratch.c_str(), buf, u);
+				}               
+			} 
+		}
+
+		// <hi> text highlighting
+		else if (!strcmp(tag.getName(), "hi")) {
+			SWBuf type = tag.getAttribute("type");
+			// handle tei rend attribute
+			if (!type.length()) type = tag.getAttribute("rend");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				if (type == "bold" || type == "b" || type == "x-b") {
+					outText("<b>", buf, u);
+				}
+				else if (type == "ol") {
+					outText("<span style=\"text-decoration:overline\">", buf, u);
+				}
+				else {	// all other types
+					outText("<i>", buf, u);
+				}
+				u->tagStacks->hiStack.push(tag.toString());
+			}
+			else if (tag.isEndTag()) {
+				SWBuf type = "";
+				if (!u->tagStacks->hiStack.empty()) {
+					XMLTag tag(u->tagStacks->hiStack.top());
+					u->tagStacks->hiStack.pop();
+					type = tag.getAttribute("type");
+					if (!type.length()) type = tag.getAttribute("rend");
+				}
+				if (type == "bold" || type == "b" || type == "x-b") {
+					outText("</b>", buf, u);
+				}
+				else if (type == "ol") {
+					outText("</span>", buf, u);
+				}
+				else outText("</i>", buf, u);
+			}
+		}
+
+		// <q> quote
+		// Rules for a quote element:
+		// If the tag is empty with an sID or an eID then use whatever it specifies for quoting.
+		//    Note: empty elements without sID or eID are ignored.
+		// If the tag is <q> then use it's specifications and push it onto a stack for </q>
+		// If the tag is </q> then use the pushed <q> for specification
+		// If there is a marker attribute, possibly empty, this overrides osisQToTick.
+		// If osisQToTick, then output the marker, using level to determine the type of mark.
+		else if (!strcmp(tag.getName(), "q")) {
+			SWBuf type      = tag.getAttribute("type");
+			SWBuf who       = tag.getAttribute("who");
+			const char *tmp = tag.getAttribute("level");
+			int level       = (tmp) ? atoi(tmp) : 1;
+			tmp             = tag.getAttribute("marker");
+			bool hasMark    = tmp;
+			SWBuf mark      = tmp;
+
+			// open <q> or <q sID... />
+			if ((!tag.isEmpty() && !tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("sID"))) {
+				// if <q> then remember it for the </q>
+				if (!tag.isEmpty()) {
+					u->tagStacks->quoteStack.push(tag.toString());
+				}
+
+				// Do this first so quote marks are included as WoC
+				if (who == "Jesus")
+					outText(u->wordsOfChristStart, buf, u);
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				//alternate " and '
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+			}
+			// close </q> or <q eID... />
+			else if ((tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("eID"))) {
+				// if it is </q> then pop the stack for the attributes
+				if (tag.isEndTag() && !u->tagStacks->quoteStack.empty()) {
+					XMLTag qTag(u->tagStacks->quoteStack.top());
+					u->tagStacks->quoteStack.pop();
+
+					type    = qTag.getAttribute("type");
+					who     = qTag.getAttribute("who");
+					tmp     = qTag.getAttribute("level");
+					level   = (tmp) ? atoi(tmp) : 1;
+					tmp     = qTag.getAttribute("marker");
+					hasMark = tmp;
+					mark    = tmp;
+				}
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				// finally, alternate " and ', if config says we should supply a mark
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+
+				// Do this last so quote marks are included as WoC
+				if (who == "Jesus")
+					outText(u->wordsOfChristEnd, buf, u);
+			}
+		}
+
+		// <transChange>
+		else if (!strcmp(tag.getName(), "transChange")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf type = tag.getAttribute("type");
+				u->lastTransChange = type;
+
+				// just do all transChange tags this way for now
+				if ((type == "added") || (type == "supplied"))
+					outText("<i>", buf, u);
+				else if (type == "tenseChange")
+					buf += "*";
+			}
+			else if (tag.isEndTag()) {
+				SWBuf type = u->lastTransChange;
+				if ((type == "added") || (type == "supplied"))
+					outText("</i>", buf, u);
+			}
+			else {	// empty transChange marker?
+			}
+		}
+
+		// image
+		else if (!strcmp(tag.getName(), "figure")) {
+			const char *src = tag.getAttribute("src");
+			if (!src)		// assert we have a src attribute
+				return false;
+
+			SWBuf filepath;
+			if (userData->module) {
+				filepath = userData->module->getConfigEntry("AbsoluteDataPath");
+				if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (src[0] != '/'))
+					filepath += '/';
+			}
+			filepath += src;
+
+			// images become clickable, if the UI supports showImage.
+			outText("<a href=\"passagestudy.jsp?action=showImage&value=", buf, u);
+			outText(URL::encode(filepath.c_str()).c_str(), buf, u);
+			outText("&module=", buf, u);
+			outText(URL::encode(u->version.c_str()).c_str(), buf, u);
+			outText("\">", buf, u);
+
+			outText("<img src=\"file:", buf, u);
+			outText(filepath, buf, u);
+			outText("\" border=\"0\" />", buf, u);
+
+			outText("</a>", buf, u);
+		}
+
+		else {
+		      return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osislemma.cpp b/src/modules/filters/osislemma.cpp
new file mode 100644
index 0000000..cf5d8f4
--- /dev/null
+++ b/src/modules/filters/osislemma.cpp
@@ -0,0 +1,106 @@
+/******************************************************************************
+ *
+ *  osislemma.cpp -	SWFilter descendant to hide or show lemmata
+ *	       		in a OSIS module
+ *
+ * $Id: osislemma.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osislemma.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Lemmas";
+	static const char oTip[]  = "Toggles Lemmas On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISLemma::OSISLemma() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISLemma::~OSISLemma() {
+}
+
+
+char OSISLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken = false;
+
+	const SWBuf orig = text;
+	const char * from = orig.c_str();
+
+	if (!option) {
+		for (text = ""; *from; ++from) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (token.startsWith("w ")) {	// Word
+					XMLTag wtag(token);
+					int count = wtag.getAttributePartCount("lemma", ' ');
+					for (int i = 0; i < count; i++) {
+						SWBuf a = wtag.getAttribute("lemma", i, ' ');
+						const char *prefix = a.stripPrefix(':');
+						if ((!prefix) || ((SWBuf)prefix).startsWith("lemma.")) {
+							// remove attribute part
+							wtag.setAttribute("lemma", 0, i, ' ');
+							i--;
+							count--;
+						}
+					}
+					token = wtag;
+					token.trim();
+					// drop <>
+					token << 1;
+					token--;
+				}
+				
+				// keep token in text
+				text.append('<');
+				text.append(token);
+				text.append('>');
+				
+				continue;
+			}
+			if (intoken) {
+				token += *from;
+			}
+			else	{
+				text.append(*from);
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osismorph.cpp b/src/modules/filters/osismorph.cpp
new file mode 100644
index 0000000..71de8e5
--- /dev/null
+++ b/src/modules/filters/osismorph.cpp
@@ -0,0 +1,105 @@
+/******************************************************************************
+ *
+ *  osismorph.cpp -	SWFilter descendant to hide or show morph tags
+ *			in a OSIS module
+ *
+ * $Id: osismorph.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osismorph.h>
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Morphological Tags";
+	static const char oTip[]  = "Toggles Morphological Tags On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+
+}
+
+OSISMorph::OSISMorph() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISMorph::~OSISMorph() {
+}
+
+
+char OSISMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (!option) {	// if we don't want morph tags
+		char token[2048]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		SWBuf orig = text;
+		const char *from = orig.c_str();
+		
+		//taken out of the loop for speed
+		const char* start = 0;
+		const char* end = 0;
+
+		for (text = ""; *from; ++from) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+				token[0] = 0;
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				
+				if ((*token == 'w') && (token[1] == ' ')) {
+					start = strstr(token+2, "morph=\""); //we leave out "w " at the start
+					end = start ? strchr(start+7, '"') : 0; //search the end of the morph value
+
+					if (start && end) { //start and end of the morph tag found
+						text.append('<');
+						text.append(token, start-token); //the text before the morph attr
+						text.append(end+1); //text after the morph attr
+						text.append('>');
+						
+						continue; //next loop
+					}
+				}
+				
+				text.append('<');
+				text.append(token);
+				text.append('>');
+				
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 2045)
+					token[tokpos++] = *from;
+					token[tokpos] = 0;
+			}
+			else	{
+				text.append(*from);
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osismorphsegmentation.cpp b/src/modules/filters/osismorphsegmentation.cpp
new file mode 100644
index 0000000..9afc0a1
--- /dev/null
+++ b/src/modules/filters/osismorphsegmentation.cpp
@@ -0,0 +1,130 @@
+/******************************************************************************
+ *
+ *  osismorphsegmentation.cpp -	SWFilter descendant to toggle splitting of
+ *				morphemes (for morpheme segmented Hebrew in
+ *				the WLC)
+ *
+ * $Id: osismorphsegmentation.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <osismorphsegmentation.h>
+#include <stdlib.h>
+#include <utilxml.h>
+#include <swmodule.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Morpheme Segmentation";
+	static const char oTip[]  = "Toggles Morpheme Segmentation On and Off, when present";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISMorphSegmentation::OSISMorphSegmentation() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISMorphSegmentation::~OSISMorphSegmentation() {}
+
+
+char OSISMorphSegmentation::processText(SWBuf &text, const SWKey * /*key*/, const SWModule *module) {
+	SWBuf token;
+	bool intoken    = false;
+	bool hide       = false;
+
+	SWBuf orig( text );
+	const char *from = orig.c_str();
+
+	XMLTag tag;
+	SWBuf tagText = "";
+	unsigned int morphemeNum = 0;
+	bool inMorpheme = false;
+	SWBuf buf;
+
+	for (text = ""; *from; ++from) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+
+		if (*from == '>') { // process tokens
+			intoken = false;
+
+			if (!strncmp(token.c_str(), "seg ", 4) || !strncmp(token.c_str(), "/seg", 4)) {
+				tag = token;
+
+				if (!tag.isEndTag() && tag.getAttribute("type") && !strcmp("morph", tag.getAttribute("type"))) {  //<seg type="morph"> start tag
+					hide = !option; //only hide if option is Off
+					tagText = "";
+					inMorpheme = true;
+				}
+
+				if (tag.isEndTag()) {
+						buf.setFormatted("%.3d", morphemeNum++);
+						module->getEntryAttributes()["Morpheme"][buf]["body"] = tagText;
+						inMorpheme = false;
+				}
+				if (hide) { //hides start and end tags as long as hide is set
+
+					if (tag.isEndTag()) { //</seg>
+						hide = false;
+					}
+
+					continue; //leave out the current token
+				}
+			} //end of seg tag handling
+
+			text.append('<');
+			text.append(token);
+			text.append('>');
+
+			if (inMorpheme) {
+				tagText.append('<');
+				tagText.append(token);
+				tagText.append('>');
+			}
+
+			hide = false;
+
+			continue;
+		} //end of intoken part
+
+		if (intoken) { //copy token
+			token.append(*from);
+		}
+		else { //copy text which is not inside of a tag
+			text.append(*from);
+			if (inMorpheme) {
+				tagText.append(*from);
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisosis.cpp b/src/modules/filters/osisosis.cpp
new file mode 100644
index 0000000..2bc5cbb
--- /dev/null
+++ b/src/modules/filters/osisosis.cpp
@@ -0,0 +1,181 @@
+/***************************************************************************
+ *
+ *  osisosis.cpp -	internal OSIS to public OSIS filter
+ *
+ * $Id: osisosis.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisosis.h>
+#include <utilxml.h>
+#include <versekey.h>
+#include <swmodule.h>
+
+SWORD_NAMESPACE_START
+
+
+OSISOSIS::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
+}
+
+
+OSISOSIS::OSISOSIS() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+	setPassThruNumericEscapeString(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("apos");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	setTokenCaseSensitive(true);
+}
+
+
+char OSISOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module) { 
+	char status = SWBasicFilter::processText(text, key, module);
+	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+	if (vkey) {
+		SWBuf ref = "";
+		if (vkey->getVerse()) {
+			ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
+		}
+
+		if (ref.length() > 0) {
+
+			text = ref + text;
+
+			if (vkey->getVerse()) {
+				VerseKey *tmp = (VerseKey *)vkey->clone();
+				*tmp = *vkey;
+				tmp->setAutoNormalize(false);
+				tmp->setIntros(true);
+
+				text += "</verse>";
+
+				*tmp = MAXVERSE;
+				if (*vkey == *tmp) {
+					tmp->setVerse(0);
+//					sprintf(ref, "\t</div>");
+//					pushString(&to, ref);
+					*tmp = MAXCHAPTER;
+					*tmp = MAXVERSE;
+					if (*vkey == *tmp) {
+						tmp->setChapter(0);
+						tmp->setVerse(0);
+//						sprintf(ref, "\t</div>");
+//						pushString(&to, ref);
+					}
+				}
+                                delete tmp;
+			}
+
+//
+//			else if (vkey->Chapter()) {
+//				sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
+//			}
+//			else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
+//
+		}
+	}
+	return status;
+}
+
+bool OSISOSIS::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+  // manually process if it wasn't a simple substitution
+	if (!substituteToken(buf, token)) {
+		MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+
+		if (!tag.isEmpty() && (!tag.isEndTag()))
+			u->startTag = tag;
+
+		// <w> tag
+		if (!strcmp(tag.getName(), "w")) {
+
+			// start <w> tag
+			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
+				SWBuf attr = tag.getAttribute("lemma");
+				if (attr.length()) {
+					if (!strncmp(attr.c_str(), "x-Strongs:", 10)) {
+						memcpy(attr.getRawData()+3, "strong", 6);
+						attr << 3;
+						tag.setAttribute("lemma", attr);
+					}
+				}
+				attr = tag.getAttribute("morph");
+				if (attr.length()) {
+					if (!strncmp(attr.c_str(), "x-StrongsMorph:", 15)) {
+						memcpy(attr.getRawData()+3, "strong", 6);
+						attr << 3;
+						tag.setAttribute("lemma", attr);
+					}
+					if (!strncmp(attr.c_str(), "x-Robinson:", 11)) {
+						attr[2] = 'r';
+						attr << 2;
+						tag.setAttribute("lemma", attr);
+					}
+				}
+				tag.setAttribute("wn", 0);
+				tag.setAttribute("savlm", 0);
+				tag.setAttribute("splitID", 0);
+			}
+			buf += tag;
+		}
+
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				SWBuf type = tag.getAttribute("type");
+				bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup");	// the latter is deprecated
+				if (strongsMarkup) {
+					tag.setEmpty(false);	// handle bug in KJV2003 module where some note open tags were <note ... />
+				}
+
+				if (!tag.isEmpty()) {
+					tag.setAttribute("swordFootnote", 0);
+
+					if (!strongsMarkup) {
+						buf += tag;
+					}
+					else u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				if (u->suspendTextPassThru == false)
+					buf+=tag;
+				else u->suspendTextPassThru = false;
+			}
+		}
+
+		else {
+			 return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisplain.cpp b/src/modules/filters/osisplain.cpp
new file mode 100644
index 0000000..6e583a4
--- /dev/null
+++ b/src/modules/filters/osisplain.cpp
@@ -0,0 +1,261 @@
+/******************************************************************************
+ *
+ *  osisplain.cpp -	An SWFilter that provides stripping of OSIS tags
+ *
+ * $Id: osisplain.cpp 2984 2013-09-20 12:18:45Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisplain.h>
+#include <ctype.h>
+#include <versekey.h>
+#include <stringmgr.h>
+
+SWORD_NAMESPACE_START
+
+
+namespace {
+
+	class MyUserData : public BasicFilterUserData {
+	public:
+		SWBuf w;
+		XMLTag tag;
+		VerseKey *vk;
+		char testament;
+		SWBuf hiType;
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+	};
+}
+
+
+OSISPlain::OSISPlain() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+
+	addEscapeStringSubstitute("amp", "&");
+	addEscapeStringSubstitute("apos", "'");
+	addEscapeStringSubstitute("lt", "<");
+	addEscapeStringSubstitute("gt", ">");
+	addEscapeStringSubstitute("quot", "\"");
+
+	   setTokenCaseSensitive(true);
+	   addTokenSubstitute("title", "\n");
+	   addTokenSubstitute("/title", "\n");
+	   addTokenSubstitute("/l", "\n");
+	   addTokenSubstitute("lg", "\n");
+	   addTokenSubstitute("/lg", "\n");
+}
+
+BasicFilterUserData *OSISPlain::createUserData(const SWModule *module, const SWKey *key) {
+	MyUserData *u = new MyUserData(module, key);
+	u->vk = SWDYNAMIC_CAST(VerseKey, u->key);
+	u->testament = (u->vk) ? u->vk->getTestament() : 2;	// default to NT
+	return u;
+}
+
+
+bool OSISPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	   // manually process if it wasn't a simple substitution
+	if (!substituteToken(buf, token)) {
+		MyUserData *u = (MyUserData *)userData;
+		if (((*token == 'w') && (token[1] == ' ')) ||
+		    ((*token == '/') && (token[1] == 'w') && (!token[2]))) {
+				 u->tag = token;
+			
+			bool start = false;
+			if (*token == 'w') {
+				if (token[strlen(token)-1] != '/') {
+					u->w = token;
+					return true;
+				}
+				start = true;
+			}
+			u->tag = (start) ? token : u->w.c_str();
+			bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
+
+			SWBuf lastText = (start) ? "stuff" : u->lastTextNode.c_str();
+
+			const char *attrib;
+			const char *val;
+			if ((attrib = u->tag.getAttribute("xlit"))) {
+				val = strchr(attrib, ':');
+				val = (val) ? (val + 1) : attrib;
+				buf.append(" <");
+				buf.append(val);
+				buf.append('>');
+			}
+			if ((attrib = u->tag.getAttribute("gloss"))) {
+				val = strchr(attrib, ':');
+				val = (val) ? (val + 1) : attrib;
+				buf.append(" <");
+				buf.append(val);
+				buf.append('>');
+			}
+			if ((attrib = u->tag.getAttribute("lemma"))) {
+				int count = u->tag.getAttributePartCount("lemma", ' ');
+				int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+				do {
+					char gh;
+					attrib = u->tag.getAttribute("lemma", i, ' ');
+					if (i < 0) i = 0;	// to handle our -1 condition
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					if ((strchr("GH", *val)) && (isdigit(val[1]))) {
+						gh = *val;
+						val++;
+					}
+					else {
+						gh = (u->testament>1) ? 'G' : 'H';
+					}
+					if ((!strcmp(val, "3588")) && (lastText.length() < 1))
+						show = false;
+					else	{
+						buf.append(" <");
+						buf.append(gh);
+						buf.append(val);
+						buf.append(">");
+					}
+				} while (++i < count);
+			}
+			if ((attrib = u->tag.getAttribute("morph")) && (show)) {
+				int count = u->tag.getAttributePartCount("morph", ' ');
+				int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+				do {
+					attrib = u->tag.getAttribute("morph", i, ' ');
+					if (i < 0) i = 0;	// to handle our -1 condition
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
+						val+=2;
+					buf.append(" (");
+					buf.append(val);
+					buf.append(')');
+				} while (++i < count);
+			}
+			if ((attrib = u->tag.getAttribute("POS"))) {
+				val = strchr(attrib, ':');
+				val = (val) ? (val + 1) : attrib;
+				
+				buf.append(" <");
+				buf.append(val);
+				buf.append('>');
+			}
+		}
+
+		// <note> tag
+		else if (!strncmp(token, "note", 4)) {
+				if (!strstr(token, "strongsMarkup")) {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
+					buf.append(" [");
+				}
+				else	u->suspendTextPassThru = true;
+			}
+		else if (!strncmp(token, "/note", 5)) {
+			if (!u->suspendTextPassThru)
+				buf.append("] ");
+			else	u->suspendTextPassThru = false;
+		}
+
+		// <p> paragraph tag
+		else if (((*token == 'p') && ((token[1] == ' ') || (!token[1]))) ||
+			((*token == '/') && (token[1] == 'p') && (!token[2]))) {
+				userData->supressAdjacentWhitespace = true;
+				buf.append('\n');
+		}
+
+		// Milestoned paragraph, created by osis2mod
+		// <div type="paragraph"  sID... />
+		// <div type="paragraph"  eID... />
+		else if (!strcmp(u->tag.getName(), "div") && u->tag.getAttribute("type") && !strcmp(u->tag.getAttribute("type"), "paragraph") &&
+			(u->tag.isEmpty() && (u->tag.getAttribute("sID") || u->tag.getAttribute("eID")))) {
+				userData->supressAdjacentWhitespace = true;
+				buf.append('\n');
+		}
+
+                // <lb .../>
+                else if (!strncmp(token, "lb", 2)) {
+			userData->supressAdjacentWhitespace = true;
+			buf.append('\n');
+		}
+		else if (!strncmp(token, "l", 1) && strstr(token, "eID")) {
+			userData->supressAdjacentWhitespace = true;
+			buf.append('\n');
+		}
+		else if (!strncmp(token, "/divineName", 11)) {
+			// Get the end portion of the string, and upper case it
+			char* end = buf.getRawData();
+			end += buf.size() - u->lastTextNode.size();
+			toupperstr(end);
+		}
+		else if (!strncmp(token, "hi", 2)) {
+
+				// handle both OSIS 'type' and TEI 'rend' attributes
+				// there is no officially supported OSIS overline attribute,
+				// thus either TEI overline or OSIS x-overline would be best,
+				// but we have used "ol" in the past, as well.  Once a valid
+				// OSIS overline attribute is made available, these should all
+				// eventually be deprecated and never documented that they are supported.
+				if (strstr(token, "rend=\"ol\"") || strstr(token, "rend=\"x-overline\"") || strstr(token, "rend=\"overline\"")
+				   || strstr(token, "type=\"ol\"") || strstr(token, "type=\"x-overline\"") || strstr(token, "type=\"overline\"")) {
+					u->hiType = "overline";
+				}
+				else u->hiType = "";
+				u->suspendTextPassThru = true;
+			}
+		else if (!strncmp(token, "/hi", 3)) {
+			if (u->hiType == "overline") {
+				const unsigned char *b = (const unsigned char *)u->lastTextNode.c_str();
+				while (*b) {
+					const unsigned char *o = b;
+					if (getUniCharFromUTF8(&b)) {
+						while (o != b) buf.append(*(o++));
+						buf.append((unsigned char)0xCC);
+						buf.append((unsigned char)0x85);
+					}
+				}
+			}
+			else {
+				buf.append("*");
+				buf.append(u->lastTextNode);
+				buf.append("*");
+			}
+			u->suspendTextPassThru = false;
+		}
+
+                // <milestone type="line"/>
+                else if (!strncmp(token, "milestone", 9)) {
+			const char* type = strstr(token+10, "type=\"");
+			if (type && strncmp(type+6, "line", 4)) { //we check for type != line
+				userData->supressAdjacentWhitespace = true;
+        			buf.append('\n');
+			}
+                }
+
+		else {
+			return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisredletterwords.cpp b/src/modules/filters/osisredletterwords.cpp
new file mode 100644
index 0000000..e7c921c
--- /dev/null
+++ b/src/modules/filters/osisredletterwords.cpp
@@ -0,0 +1,107 @@
+/******************************************************************************
+ *
+ *  osisredletterwords.cpp -	SWFilter descendant to toggle red coloring for
+ *				words of Christ in an OSIS module
+ *
+ * $Id: osisredletterwords.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisredletterwords.h>
+#include <swmodule.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Words of Christ in Red";
+	static const char oTip[]  = "Toggles Red Coloring for Words of Christ On and Off if they are marked";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"On", "Off", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISRedLetterWords::OSISRedLetterWords() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISRedLetterWords::~OSISRedLetterWords() {
+}
+
+
+char OSISRedLetterWords::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (option) //leave in the red lettered words
+		return 0;
+	
+	SWBuf token;
+	bool intoken    = false;
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+
+	//taken out of the loop
+	const char* start = 0;
+	const char* end = 0;
+		
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+		else if (*from == '>') {	// process tokens
+			intoken = false;
+
+			if ((token[0] == 'q') && (token[1] == ' ')) { //q tag
+				start = strstr(token.c_str(), " who=\"Jesus\"");
+				if (start && (strlen(start) >= 12)) { //we found a quote of Jesus Christ
+					end = start+12; //marks the end of the who attribute value
+					
+					text.append('<');
+					text.append(token, start - (token.c_str())); //the text before the who attr
+					text.append(end, token.c_str() + token.length() - end);  //text after the who attr
+					text.append('>');
+					
+					continue;
+				}
+			}
+			
+			//token not processed, append it. We don't want to alter the text
+			text.append('<');
+			text.append(token);
+			text.append('>');
+			continue;
+		}
+		
+		if (intoken) { //copy token
+			token.append(*from);
+		}
+		else { //copy text which is not inside a token
+			text.append(*from);
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/osisreferencelinks.cpp b/src/modules/filters/osisreferencelinks.cpp
new file mode 100644
index 0000000..83308e4
--- /dev/null
+++ b/src/modules/filters/osisreferencelinks.cpp
@@ -0,0 +1,114 @@
+/******************************************************************************
+ *
+ *  osisreferencelinks.cpp -	SWFilter descendant to toggle OSIS reference
+ *				links with specified type/subType
+ *
+ * $Id: osisreferencelinks.cpp 2995 2013-12-28 06:32:26Z greg.hellings $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisreferencelinks.h>
+#include <utilxml.h>
+#include <swmodule.h>
+
+
+SWORD_NAMESPACE_START
+
+
+namespace {
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"On", "Off", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISReferenceLinks::OSISReferenceLinks(const char *optionName, const char *optionTip, const char *type, const char *subType, const char *defaultValue)
+		: SWOptionFilter(),
+		  optionName(optionName),
+		  optionTip(optionTip),
+		  type(type),
+		  subType(subType) {
+
+	optName   = this->optionName.c_str();
+	optTip    = this->optionTip.c_str();
+	optValues = oValues();
+	setOptionValue(defaultValue);
+}
+
+
+OSISReferenceLinks::~OSISReferenceLinks() {
+}
+
+
+char OSISReferenceLinks::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (option) return 0;
+       
+	SWBuf token;
+	bool intoken        = false;
+	bool stripThisToken = false;
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+
+	for (text = ""; *from; ++from) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+		else if (*from == '>') {	// process tokens
+			intoken = false;
+			if (strncmp(token, "reference", 9) && strncmp(token.c_str(), "/reference", 10)) {
+				text.append('<');
+				text.append(token);
+				text.append('>');
+			}
+			else {
+				XMLTag tag;
+				tag = token;
+				if (!tag.isEndTag() && type == tag.getAttribute("type") && (!subType.size() || subType == tag.getAttribute("subType"))) {
+					stripThisToken = true;
+					continue;
+				}
+				else if (tag.isEndTag() && stripThisToken) {
+					stripThisToken = false;
+					continue;
+				}
+				text.append('<');
+				text.append(token);
+				text.append('>');
+			}
+			continue;
+		}
+	       
+		if (intoken) { //copy token
+			token.append(*from);
+		}
+		else { //copy text which is not inside a token
+			text.append(*from);
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
+
+
diff --git a/src/modules/filters/osisrtf.cpp b/src/modules/filters/osisrtf.cpp
new file mode 100644
index 0000000..291aa08
--- /dev/null
+++ b/src/modules/filters/osisrtf.cpp
@@ -0,0 +1,558 @@
+/***************************************************************************
+ *
+ *  osisrtf.cpp -	OSIS to RTF filter
+ *
+ * $Id: osisrtf.cpp 3005 2014-01-09 04:06:11Z greg.hellings $ *
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <osisrtf.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+#include <swmodule.h>
+#include <stringmgr.h>
+#include <stack>
+
+SWORD_NAMESPACE_START
+
+namespace {
+	class MyUserData : public BasicFilterUserData {
+	public:
+		bool osisQToTick;
+		bool BiblicalText;
+		bool inXRefNote;
+		int suspendLevel;
+		std::stack<char *> quoteStack;
+		SWBuf w;
+		SWBuf version;
+		MyUserData(const SWModule *module, const SWKey *key);
+		~MyUserData();
+	};
+
+
+	MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+		inXRefNote    = false;
+		BiblicalText  = false;
+		suspendLevel  = 0;
+		if (module) {
+			version = module->getName();
+			BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+		}	
+		osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
+	}
+
+
+	MyUserData::~MyUserData() {
+		// Just in case the quotes are not well formed
+		while (!quoteStack.empty()) {
+			char *tagData = quoteStack.top();
+			quoteStack.pop();
+			delete [] tagData;
+		}
+	}
+
+	static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; }
+	static inline void outText(char t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; }
+
+}
+
+
+OSISRTF::OSISRTF() {
+	setTokenStart("<");
+	setTokenEnd(">");
+  
+	setEscapeStart("&");
+	setEscapeEnd(";");
+  
+	setEscapeStringCaseSensitive(true);
+
+	addEscapeStringSubstitute("amp", "&");
+	addEscapeStringSubstitute("apos", "'");
+	addEscapeStringSubstitute("lt", "<");
+	addEscapeStringSubstitute("gt", ">");
+	addEscapeStringSubstitute("quot", "\"");
+	//	addTokenSubstitute("lg", "{\\par}");
+	//	addTokenSubstitute("/lg", "{\\par}");
+
+	setTokenCaseSensitive(true);
+}
+
+
+BasicFilterUserData *OSISRTF::createUserData(const SWModule *module, const SWKey *key) {
+	return new MyUserData(module, key);
+}
+
+
+char OSISRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+
+	// preprocess text buffer to escape RTF control codes
+	const char *from;
+	SWBuf orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {  //loop to remove extra spaces
+		switch (*from) {
+		case '{':
+		case '}':
+		case '\\':
+			text += "\\";
+			text += *from;
+			break;
+		default:
+			text += *from;
+		}
+	}
+	text += (char)0;
+
+	SWBasicFilter::processText(text, key, module);  //handle tokens as usual
+
+	orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {  //loop to remove extra spaces
+		if ((strchr(" \t\n\r", *from))) {
+			while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
+				from++;
+			}
+			text += " ";
+		}
+		else {
+			text += *from;
+		}
+	}
+	text += (char)0;	// probably not needed, but don't want to remove without investigating (same as above)
+	return 0;
+}
+
+
+bool OSISRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+  // manually process if it wasn't a simple substitution
+	MyUserData *u = (MyUserData *)userData;
+	SWBuf scratch;
+	bool sub = (u->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+	if (!sub) {
+		XMLTag tag(token);
+
+		// <w> tag
+		if (!strcmp(tag.getName(), "w")) {
+
+			// start <w> tag
+			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
+				outText('{', buf, u);
+				u->w = token;
+			}
+
+			// end or empty <w> tag
+			else {
+				bool endTag = tag.isEndTag();
+				SWBuf lastText;
+				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
+
+				if (endTag) {
+					tag = u->w.c_str();
+					lastText = u->lastTextNode.c_str();
+				}
+				else lastText = "stuff";
+
+				const char *attrib;
+				const char *val;
+				if ((attrib = tag.getAttribute("xlit"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					scratch.setFormatted(" {\\fs15 <%s>}", val);
+					outText(scratch.c_str(), buf, u);
+				}
+				if ((attrib = tag.getAttribute("gloss"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					scratch.setFormatted(" {\\fs15 <%s>}", val);
+					outText(scratch.c_str(), buf, u);
+				}
+				if ((attrib = tag.getAttribute("lemma"))) {
+					int count = tag.getAttributePartCount("lemma", ' ');
+					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+					do {
+						attrib = tag.getAttribute("lemma", i, ' ');
+						if (i < 0) i = 0;	// to handle our -1 condition
+						val = strchr(attrib, ':');
+						val = (val) ? (val + 1) : attrib;
+						const char *val2 = val;
+						if ((strchr("GH", *val)) && (isdigit(val[1])))
+							val2++;
+						if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
+							show = false;
+						else	{
+							scratch.setFormatted(" {\\cf3 \\sub <%s>}", val2);
+							outText(scratch.c_str(), buf, u);
+						}
+					} while (++i < count);
+				}
+				if ((attrib = tag.getAttribute("morph")) && (show)) {
+					SWBuf savelemma = tag.getAttribute("savlm");
+					if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
+						show = false;
+					if (show) {
+						int count = tag.getAttributePartCount("morph", ' ');
+						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+						do {
+							attrib = tag.getAttribute("morph", i, ' ');
+							if (i < 0) i = 0;	// to handle our -1 condition
+							val = strchr(attrib, ':');
+							val = (val) ? (val + 1) : attrib;
+							const char *val2 = val;
+							if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
+								val2+=2;
+							scratch.setFormatted(" {\\cf4 \\sub (%s)}", val2);
+							outText(scratch.c_str(), buf, u);
+						} while (++i < count);
+					}
+				}
+				if ((attrib = tag.getAttribute("POS"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					scratch.setFormatted(" {\\fs15 <%s>}", val);
+					outText(scratch.c_str(), buf, u);
+				}               
+
+				if (endTag)
+					outText('}', buf, u);
+			}
+		}
+
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					SWBuf type = tag.getAttribute("type");
+
+					if ((type != "x-strongsMarkup")			// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
+							&& (type != "strongsMarkup")	// deprecated
+							) {
+						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+						VerseKey *vkey = NULL;
+						// see if we have a VerseKey * or descendant
+						SWTRY {
+							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+						}
+						SWCATCH ( ... ) {	}
+						if (vkey) {
+							char ch = ((!strcmp(type.c_str(), "crossReference")) || (!strcmp(type.c_str(), "x-cross-ref"))) ? 'x':'n';
+							scratch.setFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->getVerse(), footnoteNumber.c_str());
+							outText(scratch.c_str(), buf, u);
+							u->inXRefNote = (ch == 'x');
+						}
+					}
+					u->suspendTextPassThru = (++u->suspendLevel);
+				}
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = (--u->suspendLevel);
+				u->inXRefNote = false;
+			}
+		}
+
+		// <p> paragraph and <lg> linegroup tags
+		else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
+				outText("{\\fi200\\par}", buf, u);
+			}
+			else if (tag.isEndTag()) {	// end tag
+				outText("{\\par}", buf, u);
+				userData->supressAdjacentWhitespace = true;
+			}
+			else {					// empty paragraph break marker
+				outText("{\\pard\\par}", buf, u);
+				userData->supressAdjacentWhitespace = true;
+			}
+		}
+
+		// Milestoned paragraphs, created by osis2mod
+		// <div type="paragraph" sID.../>
+		// <div type="paragraph" eID.../>
+		else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) {
+			// <div type="paragraph"  sID... />
+			if (tag.getAttribute("sID")) {	// non-empty start tag
+				outText("{\\fi200\\par}", buf, u);
+			}
+			// <div type="paragraph"  eID... />
+			else if (tag.getAttribute("eID")) {
+				outText("{\\par}", buf, u);
+				userData->supressAdjacentWhitespace = true;
+			}
+		}
+
+		// <reference> tag
+		else if (!strcmp(tag.getName(), "reference")) {
+			if (!u->inXRefNote) {	// only show these if we're not in an xref note
+				if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+					outText("{<a href=\"\">", buf, u);
+				}
+				else if (tag.isEndTag()) {
+					outText("</a>}", buf, u);
+				}
+			}
+		}
+
+		// <l> poetry
+		else if (!strcmp(tag.getName(), "l")) {
+			// end line marker
+			if (tag.getAttribute("eID")) {
+				outText("{\\par}", buf, u);
+			}
+			// <l/> without eID or sID
+			// Note: this is improper osis. This should be <lb/>
+			else if (tag.isEmpty() && !tag.getAttribute("sID")) {
+				outText("{\\par}", buf, u);
+			}
+			// end of the line
+			else if (tag.isEndTag()) {
+				outText("{\\par}", buf, u);
+			}
+		}
+
+		// <milestone type="line"/> or <lb.../>
+		else if ((!strcmp(tag.getName(), "lb") && (!tag.getAttribute("type") || strcmp(tag.getAttribute("type"), "x-optional"))) || ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line")))) {
+			outText("{\\par}", buf, u);
+			userData->supressAdjacentWhitespace = true;
+		}
+
+		// <title>
+		else if (!strcmp(tag.getName(), "title")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("{\\par\\i1\\b1 ", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("\\par}", buf, u);
+			}
+		}
+		// <list>	 - how do we support these better in RTF?
+		else if (!strcmp(tag.getName(), "list")) {
+			if((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("\\par\\pard", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("\\par\\pard", buf, u);
+			}
+		}
+
+		// <item> - support better
+		else if (!strcmp(tag.getName(), "item")) {
+			if((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("* ", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("\\par", buf, u);
+			}
+		}
+
+		// <catchWord> & <rdg> tags (italicize)
+		else if (!strcmp(tag.getName(), "rdg") || !strcmp(tag.getName(), "catchWord")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("{\\i1 ", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText('}', buf, u);
+			}
+		}
+
+		// <hi>
+		else if (!strcmp(tag.getName(), "hi")) {
+			SWBuf type = tag.getAttribute("type");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				if (type == "bold" || type == "b" || type == "x-b")
+					outText("{\\b1 ", buf, u);
+				else	// all other types
+					outText("{\\i1 ", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText('}', buf, u);
+			}
+		}
+
+		// <q> quote
+		// Rules for a quote element:
+		// If the tag is empty with an sID or an eID then use whatever it specifies for quoting.
+		//    Note: empty elements without sID or eID are ignored.
+		// If the tag is <q> then use it's specifications and push it onto a stack for </q>
+		// If the tag is </q> then use the pushed <q> for specification
+		// If there is a marker attribute, possibly empty, this overrides osisQToTick.
+		// If osisQToTick, then output the marker, using level to determine the type of mark.
+		else if (!strcmp(tag.getName(), "q")) {
+			SWBuf type      = tag.getAttribute("type");
+			SWBuf who       = tag.getAttribute("who");
+			const char *tmp = tag.getAttribute("level");
+			int level       = (tmp) ? atoi(tmp) : 1;
+			tmp             = tag.getAttribute("marker");
+			bool hasMark    = tmp;
+			SWBuf mark      = tmp;
+
+			// open <q> or <q sID... />
+			if ((!tag.isEmpty() && !tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("sID"))) {
+				// if <q> then remember it for the </q>
+				if (!tag.isEmpty()) {
+					char *tagData = 0;
+					stdstr(&tagData, tag.toString());
+					u->quoteStack.push(tagData);
+				}
+
+				// Do this first so quote marks are included as WoC
+				if (who == "Jesus")
+					outText("\\cf6 ", buf, u);
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				//alternate " and '
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+			}
+			// close </q> or <q eID... />
+			else if ((tag.isEndTag()) || (tag.getAttribute("eID"))) {
+				// if it is </q> then pop the stack for the attributes
+				if (tag.isEndTag() && !u->quoteStack.empty()) {
+					char *tagData  = u->quoteStack.top();
+					u->quoteStack.pop();
+					XMLTag qTag(tagData);
+					delete [] tagData;
+
+					type    = qTag.getAttribute("type");
+					who     = qTag.getAttribute("who");
+					tmp     = qTag.getAttribute("level");
+					level   = (tmp) ? atoi(tmp) : 1;
+					tmp     = qTag.getAttribute("marker");
+					hasMark = tmp;
+					mark    = tmp;
+				}
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				// finally, alternate " and ', if config says we should supply a mark
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+
+				// Do this last so quote marks are included as WoC
+				if (who == "Jesus")
+					outText("\\cf0 ", buf, u);
+			}
+		}
+
+
+		// <milestone type="cQuote" marker="x"/>
+		else if (!strcmp(tag.getName(), "milestone") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "cQuote")) {
+			const char *tmp = tag.getAttribute("marker");
+			bool hasMark    = tmp;
+			SWBuf mark      = tmp;
+			tmp             = tag.getAttribute("level");
+			int level       = (tmp) ? atoi(tmp) : 1;
+
+			// first check to see if we've been given an explicit mark
+			if (hasMark)
+				outText(mark, buf, u);
+			// finally, alternate " and ', if config says we should supply a mark
+			else if (u->osisQToTick)
+				outText((level % 2) ? '\"' : '\'', buf, u);
+		}
+
+		// <transChange>
+		else if (!strcmp(tag.getName(), "transChange")) {
+			SWBuf type = tag.getAttribute("type");
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+
+// just do all transChange tags this way for now
+//				if (type == "supplied")
+					outText("{\\i1 ", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText('}', buf, u);
+			}
+		}
+
+		// <divineName>
+		else if (!strcmp(tag.getName(), "divineName")) {
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+ 				outText("{\\scaps ", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("}", buf, u);
+			}
+		}
+
+		// <div>
+		else if (!strcmp(tag.getName(), "div")) {
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("\\pard ", buf, u);
+			}
+			else if (tag.isEndTag()) {
+	                        outText("\\par ", buf, u);
+                        }
+		}
+
+		// image
+		else if (!strcmp(tag.getName(), "figure")) {
+			const char *src = tag.getAttribute("src");
+			if (!src)		// assert we have a src attribute
+				return false;
+
+			char* filepath = new char[strlen(u->module->getConfigEntry("AbsoluteDataPath")) + strlen(token)];
+			*filepath = 0;
+			strcpy(filepath, userData->module->getConfigEntry("AbsoluteDataPath"));
+			strcat(filepath, src);
+
+// we do this because BibleCS looks for this EXACT format for an image tag
+			outText("<img src=\"", buf, u);
+			outText(filepath, buf, u);
+			outText("\" />", buf, u);
+/*
+			char imgc;
+			for (c = filepath + strlen(filepath); c > filepath && *c != '.'; c--);
+			c++;
+			FILE* imgfile;
+				    if (stricmp(c, "jpg") || stricmp(c, "jpeg")) {
+						  imgfile = fopen(filepath, "r");
+						  if (imgfile != NULL) {
+								outText("{\\nonshppict {\\pict\\jpegblip ", buf, u);
+								while (feof(imgfile) != EOF) {
+									   scratch.setFormatted("%2x", fgetc(imgfile));
+							   		   outText(scratch.c_str(), buf, u);
+									   
+								}
+								fclose(imgfile);
+								outText("}}", buf, u);
+						  }
+				    }
+				    else if (stricmp(c, "png")) {
+						  outText("{\\*\\shppict {\\pict\\pngblip ", buf, u);
+
+						  outText("}}", buf, u);
+				    }
+*/
+			delete [] filepath;
+		}
+		else {
+			return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisscripref.cpp b/src/modules/filters/osisscripref.cpp
new file mode 100644
index 0000000..2bb7d15
--- /dev/null
+++ b/src/modules/filters/osisscripref.cpp
@@ -0,0 +1,123 @@
+/******************************************************************************
+ *
+ *  osisscripref.cpp -	SWFilter descendant to hide or show scripture
+ *			references in an OSIS module
+ *
+ * $Id: osisscripref.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisscripref.h>
+#include <swmodule.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Cross-references";
+	static const char oTip[]  = "Toggles Scripture Cross-references On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"On", "Off", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISScripref::OSISScripref() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISScripref::~OSISScripref() {
+}
+
+
+char OSISScripref::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken    = false;
+	bool hide       = false;
+	SWBuf tagText;
+	XMLTag startTag;
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+	
+	XMLTag tag;
+
+	for (text = ""; *from; ++from) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+			
+			tag = token;
+			
+			if (!strncmp(token.c_str(), "note", 4) || !strncmp(token.c_str(), "/note", 5)) {
+				if (!tag.isEndTag() && !tag.isEmpty()) {
+					startTag = tag;
+					if ((tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "crossReference"))) {
+						hide = true;
+						tagText = "";
+						if (option) {	// we want the tag in the text
+							text.append('<');
+							text.append(token);
+							text.append('>');
+						}
+						continue;
+					}
+				}
+				if (hide && tag.isEndTag()) {
+					hide = false;
+					if (option) {	// we want the tag in the text
+						text.append(tagText);  // end tag gets added further down
+					}
+					else	continue;	// don't let the end tag get added to the text
+				}
+			}
+
+			// if not a heading token, keep token in text
+			if (!hide) {
+				text.append('<');
+				text.append(token);
+				text.append('>');
+			}
+			else {
+				tagText.append('<');
+				tagText.append(token);
+				tagText.append('>');
+			}
+			continue;
+		}
+		if (intoken) { //copy token
+			token.append(*from);
+		}
+		else if (!hide) { //copy text which is not inside a token
+			text.append(*from);
+		}
+		else tagText.append(*from);
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisstrongs.cpp b/src/modules/filters/osisstrongs.cpp
new file mode 100644
index 0000000..b937883
--- /dev/null
+++ b/src/modules/filters/osisstrongs.cpp
@@ -0,0 +1,294 @@
+/******************************************************************************
+ *
+ *  osisstrongs.cpp -	SWFilter descendant to hide or show Strong's number
+ *			in a OSIS module
+ *
+ * $Id: osisstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <osisstrongs.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Strong's Numbers";
+	static const char oTip[]  = "Toggles Strong's Numbers On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISStrongs::OSISStrongs() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISStrongs::~OSISStrongs() {
+}
+
+
+char OSISStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken = false;
+	int wordNum = 1;
+	char wordstr[5];
+	const char *wordStart = 0;
+	SWBuf page = "";		// some modules include <seg> page info, so we add these to the words
+
+	const SWBuf orig = text;
+	const char * from = orig.c_str();
+
+	for (text = ""; *from; ++from) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+
+			// possible page seg --------------------------------
+			if (token.startsWith("seg ")) {
+				XMLTag stag(token);
+				SWBuf type = stag.getAttribute("type");
+				if (type == "page") {
+					SWBuf number = stag.getAttribute("subtype");
+					if (number.length()) {
+						page = number;
+					}
+				}
+			}
+			// ---------------------------------------------------
+
+			if (token.startsWith("w ")) {	// Word
+				XMLTag wtag(token);
+				if (module->isProcessEntryAttributes()) {
+					wordStart = from+1;
+					char gh = 0;
+					VerseKey *vkey = 0;
+					if (key) {
+						vkey = SWDYNAMIC_CAST(VerseKey, key);
+					}
+					SWBuf lemma      = "";
+					SWBuf morph      = "";
+					SWBuf src        = "";
+					SWBuf morphClass = "";
+					SWBuf lemmaClass = "";
+
+					const char *attrib;
+					sprintf(wordstr, "%03d", wordNum);
+
+					// why is morph entry attribute processing done in here?  Well, it's faster.  It makes more local sense to place this code in osismorph.
+					// easier to keep lemma and morph in same wordstr number too maybe.
+					if ((attrib = wtag.getAttribute("morph"))) {
+						int count = wtag.getAttributePartCount("morph", ' ');
+						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+						do {
+							SWBuf mClass = "";
+							SWBuf mp = "";
+							attrib = wtag.getAttribute("morph", i, ' ');
+							if (i < 0) i = 0;	// to handle our -1 condition
+
+							const char *m = strchr(attrib, ':');
+							if (m) {
+								int len = m-attrib;
+								mClass.append(attrib, len);
+								attrib += (len+1);
+							}
+							if ((mClass == "x-Robinsons") || (mClass == "x-Robinson") || (mClass == "Robinson")) {
+								mClass = "robinson";
+							}
+							if (i) { morphClass += " "; morph += " "; }
+							mp += attrib;
+							morphClass += mClass;
+							morph += mp;
+							if (count > 1) {
+								SWBuf tmp;
+								tmp.setFormatted("Morph.%d", i+1);
+								module->getEntryAttributes()["Word"][wordstr][tmp] = mp;
+								tmp.setFormatted("MorphClass.%d", i+1);
+								module->getEntryAttributes()["Word"][wordstr][tmp] = mClass;
+							}
+						} while (++i < count);
+					}
+
+					if ((attrib = wtag.getAttribute("lemma"))) {
+						int count = wtag.getAttributePartCount("lemma", ' ');
+						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+						do {
+							gh = 0;
+							SWBuf lClass = "";
+							SWBuf l = "";
+							attrib = wtag.getAttribute("lemma", i, ' ');
+							if (i < 0) i = 0;	// to handle our -1 condition
+
+							const char *m = strchr(attrib, ':');
+							if (m) {
+								int len = m-attrib;
+								lClass.append(attrib, len);
+								attrib += (len+1);
+							}
+							if ((lClass == "x-Strongs") || (lClass == "strong") || (lClass == "Strong")) {
+								if (isdigit(attrib[0])) {
+									if (vkey) {
+										gh = vkey->getTestament() ? 'H' : 'G';
+									}
+								}
+								else {
+									gh = *attrib;
+									attrib++;
+								}
+								lClass = "strong";
+							}
+							if (gh) l += gh;
+							l += attrib;
+							if (i) { lemmaClass += " "; lemma += " "; }
+							lemma += l;
+							lemmaClass += lClass;
+							if (count > 1) {
+								SWBuf tmp;
+								tmp.setFormatted("Lemma.%d", i+1);
+								module->getEntryAttributes()["Word"][wordstr][tmp] = l;
+								tmp.setFormatted("LemmaClass.%d", i+1);
+								module->getEntryAttributes()["Word"][wordstr][tmp] = lClass;
+							}
+						} while (++i < count);
+						module->getEntryAttributes()["Word"][wordstr]["PartCount"].setFormatted("%d", count);
+					}
+
+					if ((attrib = wtag.getAttribute("src"))) {
+						int count = wtag.getAttributePartCount("src", ' ');
+						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+						do {
+							SWBuf mp = "";
+							attrib = wtag.getAttribute("src", i, ' ');
+							if (i < 0) i = 0;	// to handle our -1 condition
+
+							if (i) src += " ";
+							mp += attrib;
+							src += mp;
+							if (count > 1) {
+								SWBuf tmp;
+								tmp.setFormatted("Src.%d", i+1);
+								module->getEntryAttributes()["Word"][wordstr][tmp] = mp;
+							}
+						} while (++i < count);
+					}
+
+
+					if (lemma.length())
+						module->getEntryAttributes()["Word"][wordstr]["Lemma"] = lemma;
+					if (lemmaClass.length())
+						module->getEntryAttributes()["Word"][wordstr]["LemmaClass"] = lemmaClass;
+					if (morph.length())
+						module->getEntryAttributes()["Word"][wordstr]["Morph"] = morph;
+					if (morphClass.length())
+						module->getEntryAttributes()["Word"][wordstr]["MorphClass"] = morphClass;
+					if (src.length())
+						module->getEntryAttributes()["Word"][wordstr]["Src"] = src;
+					if (page.length())
+						module->getEntryAttributes()["Word"][wordstr]["Page"] = page;
+
+					if (wtag.isEmpty()) {
+						int j;
+						for (j = token.length()-1; ((j>0) && (strchr(" /", token[j]))); j--);
+						token.size(j+1);
+					}
+					
+					token += " wn=\"";
+					token += wordstr;
+					token += "\"";
+
+					if (wtag.isEmpty()) {
+						token += "/";
+					}
+
+					wordNum++;
+				}
+
+				if (!option) {
+/*
+ * Code which handles multiple lemma types.  Kindof works but breaks at least WEBIF filters for strongs.
+ *
+					int count = wtag.getAttributePartCount("lemma", ' ');
+					for (int i = 0; i < count; i++) {
+						SWBuf a = wtag.getAttribute("lemma", i, ' ');
+						const char *prefix = a.stripPrefix(':');
+						if ((prefix) && (!strcmp(prefix, "x-Strongs") || !strcmp(prefix, "strong") || !strcmp(prefix, "Strong"))) {
+							// remove attribute part
+							wtag.setAttribute("lemma", 0, i, ' ');
+							i--;
+							count--;
+						}
+					}
+* Instead the codee below just removes the lemma attribute
+*****/
+					const char *l = wtag.getAttribute("lemma");
+					if (l) {
+						SWBuf savlm = l;
+						wtag.setAttribute("lemma", 0);
+						wtag.setAttribute("savlm", savlm);
+						token = wtag;
+						token.trim();
+						// drop <>
+						token << 1;
+						token--;
+					}
+				}
+			}
+			if (token.startsWith("/w")) {	// Word End
+				if (module->isProcessEntryAttributes()) {
+					if (wordStart) {
+						SWBuf tmp;
+						tmp.append(wordStart, (from-wordStart)-3);
+						sprintf(wordstr, "%03d", wordNum-1);
+						module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
+					}
+				}
+				wordStart = 0;
+			}
+			
+			// keep token in text
+			text.append('<');
+			text.append(token);
+			text.append('>');
+			
+			continue;
+		}
+		if (intoken) {
+			token += *from;
+		}
+		else	{
+			text.append(*from);
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisvariants.cpp b/src/modules/filters/osisvariants.cpp
new file mode 100644
index 0000000..6cd3eda
--- /dev/null
+++ b/src/modules/filters/osisvariants.cpp
@@ -0,0 +1,121 @@
+/******************************************************************************
+ *
+ *  osisvariants.cpp -	SWFilter descendant to hide or show textual variants
+ *			in an OSIS module
+ *
+ * $Id: osisvariants.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisvariants.h>
+#include <utilstr.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Textual Variants";
+	static const char oTip[]  = "Switch between Textual Variants modes";
+	static const char *choices[4] = { "Primary Reading", "Secondary Reading", "All Readings", "" };
+
+	static const StringList *oValues() {
+		static const StringList oVals(&choices[0], &choices[3]);
+		return &oVals;
+	}
+}
+
+
+OSISVariants::OSISVariants() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISVariants::~OSISVariants() {
+}
+
+
+char OSISVariants::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+
+	int option = 0;
+	if      (optionValue == choices[0]) option = 0;
+	else if (optionValue == choices[1]) option = 1;
+	else                                option = 2;
+
+	if (option == 0 || option == 1) { //we want primary or variant only
+		bool intoken = false;
+		bool hide = false;
+		bool invar = false;
+		
+		SWBuf token;
+		SWBuf orig = text;
+		const char *from = orig.c_str();
+		XMLTag tag;
+
+		//we use a fixed comparision string to make sure the loop is as fast as the original two blocks with almost the same code
+		const char* variantChoice = (option == 0) ? "x-2" : "x-1";
+		
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			else if (*from == '>') {	// process tokens
+				intoken = false;
+				
+				if (!strncmp(token.c_str(), "seg", 3)) {
+					tag = token;
+					
+					if (tag.getAttribute("type") && !strcmp("x-variant", tag.getAttribute("type")) && tag.getAttribute("subType") && !strcmp(variantChoice, tag.getAttribute("subType"))) {
+						invar = true;
+						hide = true;
+						continue;
+					}
+				}
+				if (!strncmp(token.c_str(), "/seg", 4)) {
+					hide = false;
+					if (invar) {
+						invar = false;
+						continue;
+					}
+				}
+				if (!hide) {
+					text += '<';
+					text.append(token);
+					text += '>';
+				}
+
+				continue;
+			}
+			if (intoken) {
+				token += *from;
+			}
+			else if (!hide) {
+				text += *from;
+			}
+		}
+
+	}
+
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osiswebif.cpp b/src/modules/filters/osiswebif.cpp
new file mode 100644
index 0000000..2cbca0b
--- /dev/null
+++ b/src/modules/filters/osiswebif.cpp
@@ -0,0 +1,172 @@
+/***************************************************************************
+ *
+ *  osiswebif.cpp -	OSIS to HTML filter with hrefs for strongs and
+ *			morph tags
+ * 
+ * $Id: osiswebif.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osiswebif.h>
+#include <utilxml.h>
+#include <url.h>
+#include <versekey.h>
+#include <swmodule.h>
+#include <ctype.h>
+
+
+SWORD_NAMESPACE_START
+
+
+OSISWEBIF::OSISWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp"), javascript(false) {
+}
+
+
+bool OSISWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	MyUserData *u = (MyUserData *)userData;
+	SWBuf scratch;
+	bool sub = (u->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+	if (!sub) {
+
+		// manually process if it wasn't a simple substitution
+		XMLTag tag(token);
+
+		// <w> tag
+		if (!strcmp(tag.getName(), "w")) {
+
+			// start <w> tag
+			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
+				u->w = token;
+			}
+
+			// end or empty <w> tag
+			else {
+				bool endTag = tag.isEndTag();
+				SWBuf lastText;
+				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
+
+				if (endTag) {
+					tag = u->w.c_str();
+					lastText = u->lastTextNode.c_str();
+				}
+				else lastText = "stuff";
+
+				const char *attrib;
+				const char *val;
+				if ((attrib = tag.getAttribute("xlit"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+//					buf.appendFormatted(" %s", val);
+				}
+				if ((attrib = tag.getAttribute("gloss"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					buf.appendFormatted(" %s", val);
+				}
+				if ((attrib = tag.getAttribute("lemma"))) {
+					int count = tag.getAttributePartCount("lemma", ' ');
+					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+					do {
+						attrib = tag.getAttribute("lemma", i, ' ');
+						if (i < 0) i = 0;	// to handle our -1 condition
+						val = strchr(attrib, ':');
+						val = (val) ? (val + 1) : attrib;
+						const char *val2 = val;
+						if ((strchr("GH", *val)) && (isdigit(val[1])))
+							val2++;
+						if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
+							show = false;
+						else	buf.appendFormatted(" <small><em>&lt;<a href=\"%s?showStrong=%s#cv\">%s</a>&gt;</em></small> ", passageStudyURL.c_str(), URL::encode(val2).c_str(), val2);
+					} while (++i < count);
+				}
+				if ((attrib = tag.getAttribute("morph")) && (show)) {
+					SWBuf savelemma = tag.getAttribute("savlm");
+					if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
+						show = false;
+					if (show) {
+						int count = tag.getAttributePartCount("morph", ' ');
+						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+						do {
+							attrib = tag.getAttribute("morph", i, ' ');
+							if (i < 0) i = 0;	// to handle our -1 condition
+							val = strchr(attrib, ':');
+							val = (val) ? (val + 1) : attrib;
+							const char *val2 = val;
+							if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
+								val2+=2;
+							buf.appendFormatted(" <small><em>(<a href=\"%s?showMorph=%s#cv\">%s</a>)</em></small> ", passageStudyURL.c_str(), URL::encode(val2).c_str(), val2);
+						} while (++i < count);
+					}
+				}
+				if ((attrib = tag.getAttribute("POS"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					buf.appendFormatted(" %s", val);
+				}
+
+				/*if (endTag)
+					buf += "}";*/
+			}
+		}
+
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+                                SWBuf type = tag.getAttribute("type");
+                                bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup");    // the latter is deprecated
+                                if (strongsMarkup) {
+                                        tag.setEmpty(false);    // handle bug in KJV2003 module where some note open tags were <note ... />
+                                }                       
+                                                        
+				if (!tag.isEmpty()) {
+					if (!strongsMarkup) {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
+						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+						SWBuf modName = (u->module) ? u->module->getName() : "";
+						VerseKey *vkey = NULL;
+						// see if we have a VerseKey * or descendant
+						SWTRY {
+							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+						}
+						SWCATCH ( ... ) {	}
+						if (vkey) {
+							char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+//							buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch);
+							buf.appendFormatted("<span class=\"fn\" onclick=\"f(\'%s\',\'%s\',\'%s\');\" >%c</span>", modName.c_str(), u->key->getText(), footnoteNumber.c_str(), ch);
+						}
+					}
+					u->suspendTextPassThru = (++u->suspendLevel);
+				}
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = (--u->suspendLevel);
+
+			}
+		}
+
+
+		// handled appropriately in base class
+		else {
+			return OSISXHTML::handleToken(buf, token, userData);
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/osiswordjs.cpp b/src/modules/filters/osiswordjs.cpp
new file mode 100644
index 0000000..75946a8
--- /dev/null
+++ b/src/modules/filters/osiswordjs.cpp
@@ -0,0 +1,200 @@
+/******************************************************************************
+ *
+ *  osiswordjs.cpp -	SWFilter descendant for ???
+ *
+ * $Id: osiswordjs.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <osiswordjs.h>
+#include <swmodule.h>
+#include <ctype.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+#include <stdio.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Word Javascript";
+	static const char oTip[]  = "Toggles Word Javascript data";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISWordJS::OSISWordJS() : SWOptionFilter(oName, oTip, oValues()) {
+
+     defaultGreekLex   = 0;
+     defaultHebLex     = 0;
+     defaultGreekParse = 0;
+     defaultHebParse   = 0;
+     mgr               = 0;
+}
+
+
+OSISWordJS::~OSISWordJS() {
+}
+
+
+char OSISWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (option) {
+		char token[2112]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		int wordNum = 1;
+		char wordstr[5];
+		SWBuf modName = (module)?module->getName():"";
+		// add TR to w src in KJV then remove this next line
+		SWBuf wordSrcPrefix = (modName == "KJV")?SWBuf("TR"):modName;
+
+		VerseKey *vkey = 0;
+		if (key) {
+			vkey = SWDYNAMIC_CAST(VerseKey, key);
+		}
+		
+		const SWBuf orig = text;
+		const char * from = orig.c_str();
+
+		for (text = ""; *from; ++from) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if ((*token == 'w') && (token[1] == ' ')) {	// Word
+					XMLTag wtag(token);
+					sprintf(wordstr, "%03d", wordNum);
+					SWBuf lemmaClass;
+					SWBuf lemma;
+					SWBuf morph;
+					SWBuf page;
+					SWBuf src;
+					char gh = 0;
+					page = module->getEntryAttributes()["Word"][wordstr]["Page"].c_str();
+					if (page.length()) page = (SWBuf)"p:" + page;
+					int count = atoi(module->getEntryAttributes()["Word"][wordstr]["PartCount"].c_str());
+					for (int i = 0; i < count; i++) {
+
+						// for now, lemma class can just be equal to last lemma class in multi part word
+						SWBuf tmp = "LemmaClass";
+						if (count > 1) tmp.appendFormatted(".%d", i+1);
+						lemmaClass = module->getEntryAttributes()["Word"][wordstr][tmp];
+
+						tmp = "Lemma";
+						if (count > 1) tmp.appendFormatted(".%d", i+1);
+						tmp = (module->getEntryAttributes()["Word"][wordstr][tmp].c_str());
+
+						// if we're strongs, 
+						if (lemmaClass == "strong") {
+							gh = tmp[0];
+							tmp << 1;
+						}
+						if (lemma.size()) lemma += "|";
+						lemma += tmp;
+
+						tmp = "Morph";
+						if (count > 1) tmp.appendFormatted(".%d", i+1);
+						tmp = (module->getEntryAttributes()["Word"][wordstr][tmp].c_str());
+						if (morph.size()) morph += "|";
+						morph += tmp;
+
+						tmp = "Src";
+						if (count > 1) tmp.appendFormatted(".%d", i+1);
+						tmp = (module->getEntryAttributes()["Word"][wordstr][tmp].c_str());
+						if (!tmp.length()) tmp.appendFormatted("%d", wordNum);
+						tmp.insert(0, wordSrcPrefix);
+						if (src.size()) src += "|";
+						src += tmp;
+					}
+
+					SWBuf lexName = "";
+					// we can pass the real lex name in, but we have some
+					// aliases in the javascript to optimize bandwidth
+					if ((gh == 'G') && (defaultGreekLex)) {
+						lexName = (!strcmp(defaultGreekLex->getName(), "StrongsGreek"))?"G":defaultGreekLex->getName();
+					}
+					else if ((gh == 'H') && (defaultHebLex)) {
+						lexName = (!strcmp(defaultHebLex->getName(), "StrongsHebrew"))?"H":defaultHebLex->getName();
+					}
+
+					SWBuf xlit = wtag.getAttribute("xlit");
+
+					if ((lemmaClass != "strong") && (xlit.startsWith("betacode:"))) {
+						lexName = "betacode";
+//						const char *m = strchr(xlit.c_str(), ':');
+//						strong = ++m;
+					}
+					SWBuf wordID;
+					if (vkey) {
+						// optimize for bandwidth and use only the verse as the unique entry id
+						wordID.appendFormatted("%d", vkey->getVerse());
+					}
+					else {
+						wordID = key->getText();
+					}
+					wordID.appendFormatted("_%s", src.c_str());
+					// clean up our word ID for XHTML
+					for (unsigned int i = 0; i < wordID.size(); i++) {
+						if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
+							wordID[i] = '_';
+						}
+					}
+					// 'p' = 'fillpop' to save bandwidth
+					text.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','%s','%s');\" >", lexName.c_str(), lemma.c_str(), wordID.c_str(), morph.c_str(), page.c_str(), modName.c_str());
+					wordNum++;
+				}
+				if ((*token == '/') && (token[1] == 'w') && option) {	// Word
+					text += "</w></span>";
+					continue;
+				}
+				
+				// if not a strongs token, keep token in text
+				text.append('<');
+				text.append(token);
+				text.append('>');
+				
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 2045)
+					token[tokpos++] = *from;
+					token[tokpos+2] = 0;
+			}
+			else	{
+				text.append(*from);
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisxhtml.cpp b/src/modules/filters/osisxhtml.cpp
new file mode 100644
index 0000000..b1040a9
--- /dev/null
+++ b/src/modules/filters/osisxhtml.cpp
@@ -0,0 +1,772 @@
+/******************************************************************************
+ *
+ *  osisxhtml.cpp -	Render filter for classed XHTML of an OSIS module
+ *
+ * $Id: osisxhtml.cpp 3005 2014-01-09 04:06:11Z greg.hellings $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <osisxhtml.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+#include <swmodule.h>
+#include <url.h>
+#include <stringmgr.h>
+#include <stack>
+
+SWORD_NAMESPACE_START
+
+const char *OSISXHTML::getHeader() const {
+	const static char *header = "\
+		.divineName { font-variant: small-caps; }\n\
+		.wordsOfJesus { color: red; }\n\
+		.transChangeSupplied { font-style: italic; }\n\
+		.small, .sub, .sup { font-size: .83em }\n\
+		.sub             { vertical-align: sub }\n\
+		.sup             { vertical-align: super }\n\
+		.indent1         { margin-left: 10px }\n\
+		.indent2         { margin-left: 20px }\n\
+		.indent3         { margin-left: 30px }\n\
+		.indent4         { margin-left: 40px }\n\
+	";
+	return header;
+}
+
+
+namespace {
+
+// though this might be slightly slower, possibly causing an extra bool check, this is a renderFilter
+// so speed isn't the absolute highest priority, and this is a very minor possible hit
+static inline void outText(const char *t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; }
+static inline void outText(char t, SWBuf &o, BasicFilterUserData *u) { if (!u->suspendTextPassThru) o += t; else u->lastSuspendSegment += t; }
+
+void processLemma(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) {
+	const char *attrib;
+	const char *val;
+	if ((attrib = tag.getAttribute("lemma"))) {
+		int count = tag.getAttributePartCount("lemma", ' ');
+		int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+		do {
+			attrib = tag.getAttribute("lemma", i, ' ');
+			if (i < 0) i = 0;	// to handle our -1 condition
+			val = strchr(attrib, ':');
+			val = (val) ? (val + 1) : attrib;
+			SWBuf gh;
+			if(*val == 'G')
+				gh = "Greek";
+			if(*val == 'H')
+				gh = "Hebrew";
+			const char *val2 = val;
+			if ((strchr("GH", *val)) && (isdigit(val[1])))
+				val2++;
+			//if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
+			//	show = false;
+			//else {
+				if (!suspendTextPassThru) {
+					buf.appendFormatted("<small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">%s</a>&gt;</em></small>",
+							(gh.length()) ? gh.c_str() : "", 
+							URL::encode(val2).c_str(),
+							val2);
+				}
+			//}
+			
+		} while (++i < count);
+	}
+}
+
+
+
+void processMorph(bool suspendTextPassThru, XMLTag &tag, SWBuf &buf) {
+	const char * attrib;
+	const char *val;
+	if ((attrib = tag.getAttribute("morph"))) { // && (show)) {
+		SWBuf savelemma = tag.getAttribute("savlm");
+		//if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
+		//	show = false;
+		//if (show) {
+			int count = tag.getAttributePartCount("morph", ' ');
+			int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+			do {
+				attrib = tag.getAttribute("morph", i, ' ');
+				if (i < 0) i = 0;	// to handle our -1 condition
+				val = strchr(attrib, ':');
+				val = (val) ? (val + 1) : attrib;
+				const char *val2 = val;
+				if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
+					val2+=2;
+				if (!suspendTextPassThru) {
+					buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=%s&value=%s\" class=\"morph\">%s</a>)</em></small>",
+							URL::encode(tag.getAttribute("morph")).c_str(),
+							URL::encode(val).c_str(), 
+							val2);
+				}
+			} while (++i < count);
+		//}
+	}
+}
+
+
+}	// end anonymous namespace
+
+BasicFilterUserData *OSISXHTML::createUserData(const SWModule *module, const SWKey *key) {
+	return new MyUserData(module, key);
+}
+
+
+OSISXHTML::OSISXHTML() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+	setPassThruNumericEscapeString(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("apos");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	setTokenCaseSensitive(true);
+	
+	//	addTokenSubstitute("lg",  "<br />");
+	//	addTokenSubstitute("/lg", "<br />");
+
+	morphFirst = false;
+	renderNoteNumbers = false;
+}
+
+class OSISXHTML::TagStack : public std::stack<SWBuf> {
+};
+
+OSISXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key), quoteStack(new TagStack()), hiStack(new TagStack()), titleStack(new TagStack()), lineStack(new TagStack()) {
+	inXRefNote    = false;
+	suspendLevel = 0;
+	wordsOfChristStart = "<span class=\"wordsOfJesus\"> ";
+	wordsOfChristEnd   = "</span> ";
+	if (module) {
+		osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+	}
+	else {
+		osisQToTick = true;	// default
+		version = "";
+	}
+	consecutiveNewlines = 0;
+}
+
+OSISXHTML::MyUserData::~MyUserData() {
+	delete quoteStack;
+	delete hiStack;
+	delete titleStack;
+	delete lineStack;
+}
+
+void OSISXHTML::MyUserData::outputNewline(SWBuf &buf) {
+	if (++consecutiveNewlines <= 2) {
+		outText("<br />\n", buf, this);
+		supressAdjacentWhitespace = true;
+	}
+}
+bool OSISXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	MyUserData *u = (MyUserData *)userData;
+	SWBuf scratch;
+	bool sub = (u->suspendTextPassThru) ? substituteToken(scratch, token) : substituteToken(buf, token);
+	if (!sub) {
+  // manually process if it wasn't a simple substitution
+		XMLTag tag(token);
+		
+		// <w> tag
+		if (!strcmp(tag.getName(), "w")) {
+ 
+			// start <w> tag
+			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
+				u->w = token;
+			}
+
+			// end or empty <w> tag
+			else {
+				bool endTag = tag.isEndTag();
+				SWBuf lastText;
+				//bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
+
+				if (endTag) {
+					tag = u->w.c_str();
+					lastText = u->lastTextNode.c_str();
+				}
+				else lastText = "stuff";
+
+				const char *attrib;
+				const char *val;
+				if ((attrib = tag.getAttribute("xlit"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					outText(" ", buf, u);
+					outText(val, buf, u);
+				}
+				if ((attrib = tag.getAttribute("gloss"))) {
+					// I'm sure this is not the cleanest way to do it, but it gets the job done
+					// for rendering ruby chars properly ^_^
+					buf -= lastText.length();
+					
+					outText("<ruby><rb>", buf, u);
+					outText(lastText, buf, u);
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					outText("</rb><rp>(</rp><rt>", buf, u);
+					outText(val, buf, u);
+					outText("</rt><rp>)</rp></ruby>", buf, u);
+				}
+				if (!morphFirst) {
+					processLemma(u->suspendTextPassThru, tag, buf);
+					processMorph(u->suspendTextPassThru, tag, buf);
+				}
+				else {
+					processMorph(u->suspendTextPassThru, tag, buf);
+					processLemma(u->suspendTextPassThru, tag, buf);
+				}
+				if ((attrib = tag.getAttribute("POS"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					outText(" ", buf, u);
+					outText(val, buf, u);
+				}
+
+				/*if (endTag)
+					buf += "}";*/
+			}
+		}
+
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				SWBuf type = tag.getAttribute("type");
+				bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup");	// the latter is deprecated
+				if (strongsMarkup) {
+					tag.setEmpty(false);	// handle bug in KJV2003 module where some note open tags were <note ... />
+				}
+
+				if (!tag.isEmpty()) {
+
+					if (!strongsMarkup) {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
+						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+						SWBuf noteName = tag.getAttribute("n");
+						VerseKey *vkey = NULL;
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+
+						u->inXRefNote = true; // Why this change? Ben Morgan: Any note can have references in, so we need to set this to true for all notes
+//						u->inXRefNote = (ch == 'x');
+
+						// see if we have a VerseKey * or descendant
+						SWTRY {
+							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+						}
+						SWCATCH ( ... ) {	}
+						if (vkey) {
+							//printf("URL = %s\n",URL::encode(vkey->getText()).c_str());
+							buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
+								ch, 
+								URL::encode(footnoteNumber.c_str()).c_str(), 
+								URL::encode(u->version.c_str()).c_str(), 
+								URL::encode(vkey->getText()).c_str(), 
+								ch,
+								ch, 
+								(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+						}
+						else {
+							buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
+								ch, 
+								URL::encode(footnoteNumber.c_str()).c_str(), 
+								URL::encode(u->version.c_str()).c_str(), 
+								URL::encode(u->key->getText()).c_str(),  
+								ch,
+								ch, 
+								(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+						}
+					}
+				}
+				u->suspendTextPassThru = (++u->suspendLevel);
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = (--u->suspendLevel);
+				u->inXRefNote = false;
+				u->lastSuspendSegment = ""; // fix/work-around for nasb devineName in note bug
+			}
+		}
+
+		// <p> paragraph and <lg> linegroup tags
+		else if (!strcmp(tag.getName(), "p") || !strcmp(tag.getName(), "lg")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
+				u->outputNewline(buf);
+			}
+			else if (tag.isEndTag()) {	// end tag
+				u->outputNewline(buf);
+			}
+			else {					// empty paragraph break marker
+				u->outputNewline(buf);
+			}
+		}
+
+		// Milestoned paragraphs, created by osis2mod
+		// <div type="paragraph" sID.../>
+		// <div type="paragraph" eID.../>
+		else if (tag.isEmpty() && !strcmp(tag.getName(), "div") && tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "paragraph")) {
+			// <div type="paragraph"  sID... />
+			if (tag.getAttribute("sID")) {	// non-empty start tag
+				u->outputNewline(buf);
+			}
+			// <div type="paragraph"  eID... />
+			else if (tag.getAttribute("eID")) {
+				u->outputNewline(buf);
+			}
+		}
+
+		// <reference> tag
+		else if (!strcmp(tag.getName(), "reference")) {	
+			if (!u->inXRefNote) {	// only show these if we're not in an xref note				
+				if (!tag.isEndTag()) {
+					SWBuf target;
+					SWBuf work;
+					SWBuf ref;
+					bool is_scripRef = false;
+
+					target = tag.getAttribute("osisRef");
+					const char* the_ref = strchr(target, ':');
+					
+					if(!the_ref) {
+						// No work
+						ref = target;
+						is_scripRef = true;
+					}
+					else {
+						// Compensate for starting :
+						ref = the_ref + 1;
+
+						int size = target.size() - ref.size() - 1;
+						work.setSize(size);
+						strncpy(work.getRawData(), target, size);
+
+						// For Bible:Gen.3.15 or Bible.vulgate:Gen.3.15
+						if(!strncmp(work, "Bible", 5))
+							is_scripRef = true;
+					}
+
+					if(is_scripRef)
+					{
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=\">",
+							URL::encode(ref.c_str()).c_str()
+//							(work.size()) ? URL::encode(work.c_str()).c_str() : "")
+							);
+					}
+					else
+					{
+						// Dictionary link, or something
+						buf.appendFormatted("<a href=\"sword://%s/%s\">",
+							URL::encode(work.c_str()).c_str(),
+							URL::encode(ref.c_str()).c_str()
+							);
+					}
+				}
+				else {
+					outText("</a>", buf, u);
+				}
+			}
+		}
+
+		// <l> poetry, etc
+		else if (!strcmp(tag.getName(), "l")) {
+			// start line marker
+			if (tag.getAttribute("sID") || (!tag.isEndTag() && !tag.isEmpty())) {
+				// nested lines plus if the line itself has an x-indent type attribute value
+				outText(SWBuf("<span class=\"line indent").appendFormatted("%d\">", u->lineStack->size() + (SWBuf("x-indent") == tag.getAttribute("type")?1:0)).c_str(), buf, u);
+				u->lineStack->push(tag.toString());
+			}
+			// end line marker
+			else if (tag.getAttribute("eID") || tag.isEndTag()) {
+				outText("</span>", buf, u);
+				u->outputNewline(buf);
+				if (u->lineStack->size()) u->lineStack->pop();
+			}
+			// <l/> without eID or sID
+			// Note: this is improper osis. This should be <lb/>
+			else if (tag.isEmpty() && !tag.getAttribute("sID")) {
+				u->outputNewline(buf);
+			}
+		}
+
+		// <lb.../>
+		else if (!strcmp(tag.getName(), "lb") && (!tag.getAttribute("type") || strcmp(tag.getAttribute("type"), "x-optional"))) {
+				u->outputNewline(buf);
+		}
+		// <milestone type="line"/>
+		// <milestone type="x-p"/>
+		// <milestone type="cQuote" marker="x"/>
+		else if ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type"))) {
+			if (!strcmp(tag.getAttribute("type"), "line")) {
+				u->outputNewline(buf);
+				if (tag.getAttribute("subType") && !strcmp(tag.getAttribute("subType"), "x-PM")) {
+					u->outputNewline(buf);
+				}
+			}
+			else if (!strcmp(tag.getAttribute("type"),"x-p"))  {
+				if (tag.getAttribute("marker"))
+					outText(tag.getAttribute("marker"), buf, u);
+				else outText("<!p>", buf, u);
+			}
+			else if (!strcmp(tag.getAttribute("type"), "cQuote")) {
+				const char *tmp = tag.getAttribute("marker");
+				bool hasMark    = tmp;
+				SWBuf mark      = tmp;
+				tmp             = tag.getAttribute("level");
+				int level       = (tmp) ? atoi(tmp) : 1;
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				// finally, alternate " and ', if config says we should supply a mark
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+			}
+		}
+
+		// <title>
+		else if (!strcmp(tag.getName(), "title")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+				if (vkey && !vkey->getVerse()) {
+					if (!vkey->getChapter()) {
+						if (!vkey->getBook()) {
+							if (!vkey->getTestament()) {
+								buf += "<h1 class=\"moduleHeader\">";
+								tag.setAttribute("pushed", "h1");
+							}
+							else {
+								buf += "<h1 class=\"testamentHeader\">";
+								tag.setAttribute("pushed", "h1");
+							}
+						}
+						else {
+							buf += "<h1 class=\"bookHeader\">";
+							tag.setAttribute("pushed", "h1");
+						}
+					}
+					else {
+						buf += "<h2 class=\"chapterHeader\">";
+						tag.setAttribute("pushed", "h2");
+					}
+				}
+				else {
+					buf += "<h3>";
+					tag.setAttribute("pushed", "h3");
+				}
+				u->titleStack->push(tag.toString());
+			}
+			else if (tag.isEndTag()) {
+				if (!u->titleStack->empty()) {
+					XMLTag tag(u->titleStack->top());
+					if (u->titleStack->size()) u->titleStack->pop();
+					SWBuf pushed = tag.getAttribute("pushed");
+					if (pushed.size()) {
+						buf += (SWBuf)"</" + pushed + ">\n\n";
+					}
+					else {
+						buf += "</h3>\n\n";
+					}
+					++u->consecutiveNewlines;
+					u->supressAdjacentWhitespace = true;
+				}
+			}
+		}
+		
+		// <list>
+		else if (!strcmp(tag.getName(), "list")) {
+			if((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("<ul>\n", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("</ul>\n", buf, u);
+				++u->consecutiveNewlines;
+				u->supressAdjacentWhitespace = true;
+			}
+		}
+
+		// <item>
+		else if (!strcmp(tag.getName(), "item")) {
+			if((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("\t<li>", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("</li>\n", buf, u);
+				++u->consecutiveNewlines;
+				u->supressAdjacentWhitespace = true;
+			}
+		}
+		// <catchWord> & <rdg> tags (italicize)
+		else if (!strcmp(tag.getName(), "rdg") || !strcmp(tag.getName(), "catchWord")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				outText("<i>", buf, u);
+			}
+			else if (tag.isEndTag()) {
+				outText("</i>", buf, u);
+			}
+		}
+
+		// divineName  
+		else if (!strcmp(tag.getName(), "divineName")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				u->suspendTextPassThru = (++u->suspendLevel);
+			}
+			else if (tag.isEndTag()) {
+				SWBuf lastText = u->lastSuspendSegment.c_str();
+				u->suspendTextPassThru = (--u->suspendLevel);
+				if (lastText.size()) {
+					scratch.setFormatted("<span class=\"divineName\">%s</span>", lastText.c_str());
+					outText(scratch.c_str(), buf, u);
+				}               
+			} 
+		}
+
+		// <hi> text highlighting
+		else if (!strcmp(tag.getName(), "hi")) {
+			SWBuf type = tag.getAttribute("type");
+
+			// handle tei rend attribute if type doesn't exist
+			if (!type.length()) type = tag.getAttribute("rend");
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				if (type == "bold" || type == "b" || type == "x-b") {
+					outText("<b>", buf, u);
+				}
+
+				// there is no officially supported OSIS overline attribute,
+				// thus either TEI overline or OSIS x-overline would be best,
+				// but we have used "ol" in the past, as well.  Once a valid
+				// OSIS overline attribute is made available, these should all
+				// eventually be deprecated and never documented that they are supported.
+				else if (type == "ol"  || type == "overline" || type == "x-overline") {
+					outText("<span style=\"text-decoration:overline\">", buf, u);
+				}
+
+				else if (type == "super") {
+					outText("<span class=\"sup\">", buf, u);
+				}
+				else if (type == "sub") {
+					outText("<span class=\"sub\">", buf, u);
+				}
+				else {	// all other types
+					outText("<i>", buf, u);
+				}
+				u->hiStack->push(tag.toString());
+			}
+			else if (tag.isEndTag()) {
+				SWBuf type = "";
+				if (!u->hiStack->empty()) {
+					XMLTag tag(u->hiStack->top());
+					if (u->hiStack->size()) u->hiStack->pop();
+					type = tag.getAttribute("type");
+					if (!type.length()) type = tag.getAttribute("rend");
+				}
+				if (type == "bold" || type == "b" || type == "x-b") {
+					outText("</b>", buf, u);
+				}
+				else if (  	   type == "ol"
+						|| type == "super"
+						|| type == "sub") {
+					outText("</span>", buf, u);
+				}
+				else outText("</i>", buf, u);
+			}
+		}
+
+		// <q> quote
+		// Rules for a quote element:
+		// If the tag is empty with an sID or an eID then use whatever it specifies for quoting.
+		//    Note: empty elements without sID or eID are ignored.
+		// If the tag is <q> then use it's specifications and push it onto a stack for </q>
+		// If the tag is </q> then use the pushed <q> for specification
+		// If there is a marker attribute, possibly empty, this overrides osisQToTick.
+		// If osisQToTick, then output the marker, using level to determine the type of mark.
+		else if (!strcmp(tag.getName(), "q")) {
+			SWBuf type      = tag.getAttribute("type");
+			SWBuf who       = tag.getAttribute("who");
+			const char *tmp = tag.getAttribute("level");
+			int level       = (tmp) ? atoi(tmp) : 1;
+			tmp             = tag.getAttribute("marker");
+			bool hasMark    = tmp;
+			SWBuf mark      = tmp;
+
+			// open <q> or <q sID... />
+			if ((!tag.isEmpty() && !tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("sID"))) {
+				// if <q> then remember it for the </q>
+				if (!tag.isEmpty()) {
+					u->quoteStack->push(tag.toString());
+				}
+
+				// Do this first so quote marks are included as WoC
+				if (who == "Jesus")
+					outText(u->wordsOfChristStart, buf, u);
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				//alternate " and '
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+			}
+			// close </q> or <q eID... />
+			else if ((tag.isEndTag()) || (tag.isEmpty() && tag.getAttribute("eID"))) {
+				// if it is </q> then pop the stack for the attributes
+				if (tag.isEndTag() && !u->quoteStack->empty()) {
+					XMLTag qTag(u->quoteStack->top());
+					if (u->quoteStack->size()) u->quoteStack->pop();
+
+					type    = qTag.getAttribute("type");
+					who     = qTag.getAttribute("who");
+					tmp     = qTag.getAttribute("level");
+					level   = (tmp) ? atoi(tmp) : 1;
+					tmp     = qTag.getAttribute("marker");
+					hasMark = tmp;
+					mark    = tmp;
+				}
+
+				// first check to see if we've been given an explicit mark
+				if (hasMark)
+					outText(mark, buf, u);
+				// finally, alternate " and ', if config says we should supply a mark
+				else if (u->osisQToTick)
+					outText((level % 2) ? '\"' : '\'', buf, u);
+
+				// Do this last so quote marks are included as WoC
+				if (who == "Jesus")
+					outText(u->wordsOfChristEnd, buf, u);
+			}
+		}
+
+		// <transChange>
+		else if (!strcmp(tag.getName(), "transChange")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf type = tag.getAttribute("type");
+				u->lastTransChange = type;
+
+				// just do all transChange tags this way for now
+				if ((type == "added") || (type == "supplied"))
+					outText("<span class=\"transChangeSupplied\">", buf, u);
+				else if (type == "tenseChange")
+					buf += "*";
+			}
+			else if (tag.isEndTag()) {
+				SWBuf type = u->lastTransChange;
+				if ((type == "added") || (type == "supplied"))
+					outText("</span>", buf, u);
+			}
+			else {	// empty transChange marker?
+			}
+		}
+
+		// image
+		else if (!strcmp(tag.getName(), "figure")) {
+			const char *src = tag.getAttribute("src");
+			if (src) {		// assert we have a src attribute 
+				SWBuf filepath;
+				if (userData->module) {
+					filepath = userData->module->getConfigEntry("AbsoluteDataPath");
+					if ((filepath.size()) && (filepath[filepath.size()-1] != '/') && (src[0] != '/'))
+						filepath += '/';
+				}
+				filepath += src;
+
+				// images become clickable, if the UI supports showImage.
+				outText("<a href=\"passagestudy.jsp?action=showImage&value=", buf, u);
+				outText(URL::encode(filepath.c_str()).c_str(), buf, u);
+				outText("&module=", buf, u);
+				outText(URL::encode(u->version.c_str()).c_str(), buf, u);
+				outText("\">", buf, u);
+
+				outText("<img src=\"file:", buf, u);
+				outText(filepath, buf, u);
+				outText("\" border=\"0\" />", buf, u);
+
+				outText("</a>", buf, u);
+			}
+		}
+
+		// ok to leave these in
+		else if (!strcmp(tag.getName(), "div")) {
+			SWBuf type = tag.getAttribute("type");
+			if (type == "bookGroup") {
+			}
+			else if (type == "book") {
+			}
+			else if (type == "section") {
+			}
+			else if (type == "majorSection") {
+			}
+			else {
+				buf += tag;
+			}
+		}
+		else if (!strcmp(tag.getName(), "span")) {
+			buf += tag;
+		}
+		else if (!strcmp(tag.getName(), "br")) {
+			buf += tag;
+		}
+		else if (!strcmp(tag.getName(), "table")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<table><tbody>\n";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</tbody></table>\n";
+				++u->consecutiveNewlines;
+				u->supressAdjacentWhitespace = true;
+			}
+			
+		}
+		else if (!strcmp(tag.getName(), "row")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "\t<tr>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</tr>\n";
+			}
+			
+		}
+		else if (!strcmp(tag.getName(), "cell")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<td>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</td>";
+			}
+		}
+		else {
+			if (!u->supressAdjacentWhitespace) u->consecutiveNewlines = 0;
+			return false;  // we still didn't handle token
+		}
+	}
+	if (!u->supressAdjacentWhitespace) u->consecutiveNewlines = 0;
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/osisxlit.cpp b/src/modules/filters/osisxlit.cpp
new file mode 100644
index 0000000..d5ccbe4
--- /dev/null
+++ b/src/modules/filters/osisxlit.cpp
@@ -0,0 +1,99 @@
+/******************************************************************************
+ *
+ *  osisxlit.cpp -	SWFilter descendant to hide or show xlit values
+ *			(encoded transliterations) in an OSIS module
+ *
+ * $Id: osisxlit.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <osisxlit.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Transliterated Forms";
+	static const char oTip[]  = "Toggles transliterated forms On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+OSISXlit::OSISXlit() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+OSISXlit::~OSISXlit() {
+}
+
+
+char OSISXlit::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken = false;
+
+	const SWBuf orig = text;
+	const char * from = orig.c_str();
+
+	if (!option) {
+		for (text = ""; *from; ++from) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (token.startsWith("w ")) {	// Word
+					XMLTag wtag(token);
+					const char *l = wtag.getAttribute("xlit");
+					if (l) {
+						wtag.setAttribute("xlit", 0);
+						token = wtag;
+						token.trim();
+						// drop <>
+						token << 1;
+						token--;
+					}
+				}
+				
+				// keep token in text
+				text.append('<');
+				text.append(token);
+				text.append('>');
+				
+				continue;
+			}
+			if (intoken) {
+				token += *from;
+			}
+			else	{
+				text.append(*from);
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/papyriplain.cpp b/src/modules/filters/papyriplain.cpp
new file mode 100644
index 0000000..bf6c9dd
--- /dev/null
+++ b/src/modules/filters/papyriplain.cpp
@@ -0,0 +1,88 @@
+/******************************************************************************
+ *
+ *  papyriplain.cpp -	SWFilter descendant to strip out all Papyri tags
+ *
+ * $Id: papyriplain.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <papyriplain.h>
+
+SWORD_NAMESPACE_START
+
+
+PapyriPlain::PapyriPlain() {
+}
+
+
+char PapyriPlain::processText (SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+	
+	for (text = ""; *from; ++from) {
+
+		// remove hyphen and whitespace if that is all that separates words
+		// also be sure we're not a double hyphen '--'
+		if ((*from == '-') && (text.length() > 0) && (text[text.length()-1] != '-')) {
+			char remove = 0;
+			const char *c;
+			for (c = from+1; *c; c++) {
+				if ((*c == 10) || (*c == 13)) {
+					remove = 1;
+				}
+				if (!strchr(" \t\n", *c)) {
+					if (remove) remove++;
+					break;
+				}
+			}
+			if (remove > 1) {
+				from = c-1;
+				continue;
+			}
+		}
+
+		// remove all newlines
+		if ((*from == 10) || (*from == 13)) {
+			if ((text.length()>1) && (text[text.length()-2] != ' ') && (*(from+1) != ' '))
+				text.append(' ');
+			continue;
+		}
+
+				
+		// strip odd characters
+		switch (*from) {
+		case '(':
+		case ')':
+		case '[':
+		case ']':
+		case '{':
+		case '}':
+		case '<':
+		case '>':
+			continue;
+		}
+
+		// if we've made it this far
+		text.append(*from);
+
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/rtfhtml.cpp b/src/modules/filters/rtfhtml.cpp
new file mode 100644
index 0000000..df02f38
--- /dev/null
+++ b/src/modules/filters/rtfhtml.cpp
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *
+ *  rtfhtml.cpp -	filter to convert RTF to HTML
+ *
+ * $Id: rtfhtml.cpp 2981 2013-09-15 00:05:26Z scribe $
+ *
+ * Copyright 1999 The team of Bibletime (info@bibletime.de)
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <rtfhtml.h>
+#include <swbuf.h>
+#include <utilstr.h>
+#include <ctype.h>
+#include <sysdata.h>
+
+SWORD_NAMESPACE_START
+
+RTFHTML::RTFHTML()
+{
+}
+
+
+char RTFHTML::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	bool center = false;
+
+	const char *from;
+	SWBuf orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++)
+	{
+		if (*from == '\\') // a RTF command
+		{
+			// \u12345?
+			if ( *(from+1) == 'u' && (*(from+2) == '-' || isdigit(*(from+2)))) {
+				from += 2;
+				const char *end = from;
+				while (isdigit(*++end));
+				SWBuf num;
+				num.append(from, end-from);
+				__s16 n = atoi(num.c_str());
+				__u32 u = (__u16)n;
+				text.append(getUTF8FromUniChar(u));
+				from += (end-from);
+				continue;
+			}
+			if ( !strncmp(from+1, "pard", 4) )
+				//(from[1] == 'p') && (from[2] == 'a') && (from[3] == 'r') && (from[4] == 'd'))
+			{ // switch all modifiers off
+				if (center)
+				{
+					text += "</center>";
+					center = false;
+				}
+				from += 4;
+				continue;
+			}
+			if ( !strncmp(from+1, "par", 3) )
+				//(from[1] == 'p') && (from[2] == 'a') && (from[3] == 'r'))
+			{
+				text += "<p/>\n";
+				from += 3;
+				continue;
+			}
+			if (from[1] == ' ')
+			{
+				from += 1;
+				continue;
+			}
+			if ( !strncmp(from+1, "qc", 2) )
+			//(from[1] == 'q') && (from[2] == 'c')) // center on
+			{
+				if (!center)
+				{
+					text += "<center>";
+					center = true;
+				}
+				from += 2;
+				continue;
+			}
+		}
+
+		text += *from;
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/scsuutf8.cpp b/src/modules/filters/scsuutf8.cpp
new file mode 100644
index 0000000..c68ea1f
--- /dev/null
+++ b/src/modules/filters/scsuutf8.cpp
@@ -0,0 +1,246 @@
+/******************************************************************************
+ *
+ *  scsuutf8.cpp -	SWFilter descendant to convert a SCSU character to
+ *			UTF-8
+ *
+ * $Id: scsuutf8.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/* This class is based on:
+ * http://czyborra.com/scsu/scsu.c written by Roman Czyborra@dds.nl
+ * on Andrea's balcony in North Amsterdam on 1998-08-04
+ * Thanks to Richard Verhoeven <rcb5@win.tue.nl> for his suggestion
+ * to correct the haphazard "if" after UQU to "else if" on 1998-10-01
+ * 
+ * This is a deflator to UTF-8 output for input compressed in SCSU,
+ * the (Reuters) Standard Compression Scheme for Unicode as described
+ * in http://www.unicode.org/unicode/reports/tr6.html
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <swmodule.h>
+
+#include <scsuutf8.h>
+
+
+SWORD_NAMESPACE_START
+
+
+SCSUUTF8::SCSUUTF8() {
+}
+
+
+unsigned char* SCSUUTF8::UTF8Output(unsigned long uchar, unsigned char* text)
+{
+  /* join UTF-16 surrogates without any pairing sanity checks */
+
+  static int d;
+  
+  if (uchar >= 0xd800 && uchar <= 0xdbff) { d = uchar & 0x3f; return text;  }
+  if (uchar >= 0xdc00 && uchar <= 0xdfff) { uchar = uchar + 0x2400 + d * 0x400; }
+  
+  /* output one character as UTF-8 multibyte sequence */
+  
+  if (uchar < 0x80) {
+    *text++ = c;
+  }
+  else if (uchar < 0x800) { 
+    *text++ = 0xc0 | uchar >> 6; 
+    *text++ = 0x80 | (uchar & 0x3f);
+  }
+  else if (uchar < 0x10000) {
+    *text++ = 0xe0 | uchar >> 12; 
+    *text++ = 0x80 | (uchar >> 6 & 0x3f);
+    *text++ = 0x80 | (uchar & 0x3f);
+  }
+  else if (uchar < 0x200000) {
+    *text++ = 0xf0 | uchar >> 18;
+    *text++ = 0x80 | (uchar >> 12 & 0x3f);
+    *text++ = 0x80 | (uchar >> 6 & 0x3f);
+    *text++ = 0x80 | (uchar & 0x3f);
+  }  
+  
+  return text;
+}
+
+
+char SCSUUTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+/*
+  unsigned char *to, *from;
+  unsigned long buflen = len * FILTERPAD;
+  char active = 0, mode = 0;
+	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return -1;
+
+  static unsigned short start[8] = {0x0000,0x0080,0x0100,0x0300,0x2000,0x2080,0x2100,0x3000};
+  static unsigned short slide[8] = {0x0080,0x00C0,0x0400,0x0600,0x0900,0x3040,0x30A0,0xFF00};
+  static unsigned short win[256]   = {
+    0x0000, 0x0080, 0x0100, 0x0180, 0x0200, 0x0280, 0x0300, 0x0380,
+    0x0400, 0x0480, 0x0500, 0x0580, 0x0600, 0x0680, 0x0700, 0x0780,
+    0x0800, 0x0880, 0x0900, 0x0980, 0x0A00, 0x0A80, 0x0B00, 0x0B80,
+    0x0C00, 0x0C80, 0x0D00, 0x0D80, 0x0E00, 0x0E80, 0x0F00, 0x0F80,
+    0x1000, 0x1080, 0x1100, 0x1180, 0x1200, 0x1280, 0x1300, 0x1380,
+    0x1400, 0x1480, 0x1500, 0x1580, 0x1600, 0x1680, 0x1700, 0x1780,
+    0x1800, 0x1880, 0x1900, 0x1980, 0x1A00, 0x1A80, 0x1B00, 0x1B80,
+    0x1C00, 0x1C80, 0x1D00, 0x1D80, 0x1E00, 0x1E80, 0x1F00, 0x1F80,
+    0x2000, 0x2080, 0x2100, 0x2180, 0x2200, 0x2280, 0x2300, 0x2380,
+    0x2400, 0x2480, 0x2500, 0x2580, 0x2600, 0x2680, 0x2700, 0x2780,
+    0x2800, 0x2880, 0x2900, 0x2980, 0x2A00, 0x2A80, 0x2B00, 0x2B80,
+    0x2C00, 0x2C80, 0x2D00, 0x2D80, 0x2E00, 0x2E80, 0x2F00, 0x2F80,
+    0x3000, 0x3080, 0x3100, 0x3180, 0x3200, 0x3280, 0x3300, 0x3800,
+    0xE000, 0xE080, 0xE100, 0xE180, 0xE200, 0xE280, 0xE300, 0xE380,
+    0xE400, 0xE480, 0xE500, 0xE580, 0xE600, 0xE680, 0xE700, 0xE780,
+    0xE800, 0xE880, 0xE900, 0xE980, 0xEA00, 0xEA80, 0xEB00, 0xEB80,
+    0xEC00, 0xEC80, 0xED00, 0xED80, 0xEE00, 0xEE80, 0xEF00, 0xEF80,
+    0xF000, 0xF080, 0xF100, 0xF180, 0xF200, 0xF280, 0xF300, 0xF380,
+    0xF400, 0xF480, 0xF500, 0xF580, 0xF600, 0xF680, 0xF700, 0xF780,
+    0xF800, 0xF880, 0xF900, 0xF980, 0xFA00, 0xFA80, 0xFB00, 0xFB80,
+    0xFC00, 0xFC80, 0xFD00, 0xFD80, 0xFE00, 0xFE80, 0xFF00, 0xFF80,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x00C0, 0x0250, 0x0370, 0x0530, 0x3040, 0x30A0, 0xFF60
+  };
+
+  if (!len)
+	   return 0;
+
+  memmove(&text[buflen - len], text, len);
+  from = (unsigned char*)&text[buflen - len];
+  to = (unsigned char *)text;
+
+  // -------------------------------
+
+  for (int i = 0; i < len;) {
+
+
+	 if (i >= len) break;
+	 c = from[i++];
+
+	 if (c >= 0x80)
+	{
+	  to = UTF8Output (c - 0x80 + slide[active], to);
+	}
+	 else if (c >= 0x20 && c <= 0x7F)
+	{
+	  to = UTF8Output (c, to);
+	}
+	 else if (c == 0x0 || c == 0x9 || c == 0xA || c == 0xC || c == 0xD)
+	{
+	  to = UTF8Output (c, to);
+	}
+	 else if (c >= 0x1 && c <= 0x8) // SQn
+	{
+		if (i >= len) break;
+	  d = from[i++]; // single quote
+
+	  to = UTF8Output (d < 0x80 ? d + start [c - 0x1] :
+		  d - 0x80 + slide [c - 0x1], to);
+	}
+	 else if (c >= 0x10 && c <= 0x17) // SCn
+	{
+	  active = c - 0x10; // change window
+	}
+	 else if (c >= 0x18 && c <= 0x1F) // SDn
+	{
+	  active = c - 0x18;  // define window
+		if (i >= len) break;
+	  slide [active] = win [from[i++]];
+	}
+	 else if (c == 0xB) // SDX
+	{
+		if (i >= len) break;
+		c = from[i++];
+
+		if (i >= len) break;
+		d = from[i++];
+
+	  slide [active = c>>5] = 0x10000 + (((c & 0x1F) << 8 | d) << 7);
+	}
+	 else if (c == 0xE) // SQU
+	{
+		if (i >= len) break;
+	  c = from[i++]; // SQU
+
+		if (i >= len) break;
+		to = UTF8Output (c << 8 | from[i++], to);
+		}
+	 else if (c == 0xF) // SCU
+	{
+	  mode = 1; // change to Unicode mode
+
+	  while (mode)
+	    {
+		    if (i >= len) break;
+		 c = from[i++];
+
+		 if (c <= 0xDF || c >= 0xF3)
+		{
+			   if (i >= len) break;
+		  to = UTF8Output (c << 8 | from[i++], to);
+		}
+		 else if (c == 0xF0) // UQU
+		{
+			   if (i >= len) break;
+		  c = from[i++];
+
+			   if (i >= len) break;
+			   to = UTF8Output (c << 8 | from[i++], to);
+		}
+		 else if (c >= 0xE0 && c <= 0xE7) // UCn
+		{
+		  active = c - 0xE0; mode = 0;
+		}
+		 else if (c >= 0xE8 && c <= 0xEF) // UDn
+		{
+			   if (i >= len) break;
+		  slide [active=c-0xE8] = win [from[i++]]; mode = 0;
+		}
+		 else if (c == 0xF1) // UDX
+		{
+			   if (i >= len) break;
+		  c = from[i++];
+
+			   if (i >= len) break;
+			   d = from[i++];
+
+		  slide [active = c>>5] =
+		    0x10000 + (((c & 0x1F) << 8 | d) << 7); mode = 0;
+		}
+	    }
+	}
+
+
+  }
+
+  *to++ = 0;
+  *to = 0;
+*/
+  return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/swbasicfilter.cpp b/src/modules/filters/swbasicfilter.cpp
new file mode 100644
index 0000000..e66017e
--- /dev/null
+++ b/src/modules/filters/swbasicfilter.cpp
@@ -0,0 +1,422 @@
+/******************************************************************************
+ *
+ *  swbasicfilter.cpp -	definition of class SWBasicFilter.  An SWFilter
+ *  			impl that provides some basic methods that
+ *  			many filters will need and can use as a starting
+ *  			point. 
+ *
+ * $Id: swbasicfilter.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <swbasicfilter.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <utilstr.h>
+#include <stringmgr.h>
+#include <map>
+#include <set>
+
+SWORD_NAMESPACE_START
+
+
+typedef std::map<SWBuf, SWBuf> DualStringMap;
+typedef std::set<SWBuf> StringSet;
+
+
+// I hate bridge patterns but this isolates std::map from a ton of filters
+class SWBasicFilter::Private {
+public:
+	DualStringMap tokenSubMap;
+	DualStringMap escSubMap;
+	StringSet escPassSet;
+};
+
+
+const char SWBasicFilter::INITIALIZE = 1;
+const char SWBasicFilter::PRECHAR    = 2;
+const char SWBasicFilter::POSTCHAR   = 4;
+const char SWBasicFilter::FINALIZE   = 8;
+
+
+SWBasicFilter::SWBasicFilter() {
+
+	p = new Private;
+
+	processStages = 0;
+	tokenStart    = 0;
+	tokenEnd      = 0;
+	escStart      = 0;
+	escEnd        = 0;
+
+	setTokenStart("<");
+	setTokenEnd(">");
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	escStringCaseSensitive = false;
+	tokenCaseSensitive     = false;
+	passThruUnknownToken   = false;
+	passThruUnknownEsc     = false;
+	passThruNumericEsc     = false;
+}
+
+
+SWBasicFilter::~SWBasicFilter() {
+	if (tokenStart)
+		delete [] tokenStart;
+
+	if (tokenEnd)
+		delete [] tokenEnd;
+
+	if (escStart)
+		delete [] escStart;
+
+	if (escEnd)
+		delete [] escEnd;
+
+	delete p;
+}
+
+
+void SWBasicFilter::setPassThruUnknownToken(bool val) {
+	passThruUnknownToken = val;
+}
+
+
+void SWBasicFilter::setPassThruUnknownEscapeString(bool val) {
+	passThruUnknownEsc = val;
+}
+
+
+void SWBasicFilter::setPassThruNumericEscapeString(bool val) {
+	passThruUnknownEsc = val;
+}
+
+
+void SWBasicFilter::setTokenCaseSensitive(bool val) {
+	tokenCaseSensitive = val;
+}
+
+
+void SWBasicFilter::setEscapeStringCaseSensitive(bool val) {
+	escStringCaseSensitive = val;
+}
+
+
+void SWBasicFilter::addTokenSubstitute(const char *findString, const char *replaceString) {
+	char *buf = 0;
+
+	if (!tokenCaseSensitive) {
+		stdstr(&buf, findString);
+		toupperstr(buf);
+		p->tokenSubMap[buf] = replaceString;
+		delete [] buf;
+	}
+	else p->tokenSubMap[findString] = replaceString;
+}
+
+
+void SWBasicFilter::removeTokenSubstitute(const char *findString) {
+	if (p->tokenSubMap.find(findString) != p->tokenSubMap.end()) {
+		p->tokenSubMap.erase( p->tokenSubMap.find(findString) );
+	}
+}
+
+
+void SWBasicFilter::addAllowedEscapeString(const char *findString) {
+	char *buf = 0;
+
+	if (!escStringCaseSensitive) {
+		stdstr(&buf, findString);
+		toupperstr(buf);
+		p->escPassSet.insert(StringSet::value_type(buf));
+		delete [] buf;
+	}
+	else p->escPassSet.insert(StringSet::value_type(findString));
+}
+
+
+void SWBasicFilter::removeAllowedEscapeString(const char *findString) {
+	if (p->escPassSet.find(findString) != p->escPassSet.end()) {
+		p->escPassSet.erase( p->escPassSet.find(findString) );
+	}
+}
+
+
+void SWBasicFilter::addEscapeStringSubstitute(const char *findString, const char *replaceString) {
+	char *buf = 0;
+
+	if (!escStringCaseSensitive) {
+		stdstr(&buf, findString);
+		toupperstr(buf);
+		p->escSubMap.insert(DualStringMap::value_type(buf, replaceString));
+		delete [] buf;
+	}
+	else p->escSubMap.insert(DualStringMap::value_type(findString, replaceString));
+}
+
+
+void SWBasicFilter::removeEscapeStringSubstitute(const char *findString) {
+	if (p->escSubMap.find(findString) != p->escSubMap.end()) {
+		p->escSubMap.erase( p->escSubMap.find(findString) );
+	}
+}
+
+
+bool SWBasicFilter::substituteToken(SWBuf &buf, const char *token) {
+	DualStringMap::iterator it;
+
+	if (!tokenCaseSensitive) {
+	        char *tmp = 0;
+		stdstr(&tmp, token);
+		toupperstr(tmp);
+		it = p->tokenSubMap.find(tmp);
+		delete [] tmp;
+	} else
+	it = p->tokenSubMap.find(token);
+
+	if (it != p->tokenSubMap.end()) {
+		buf += it->second.c_str();
+		return true;
+	}
+	return false;
+}
+
+
+void SWBasicFilter::appendEscapeString(SWBuf &buf, const char *escString) {
+	buf += escStart;
+	buf += escString;
+	buf += escEnd;
+}
+
+
+bool SWBasicFilter::passAllowedEscapeString(SWBuf &buf, const char *escString) {
+	StringSet::iterator it;
+
+	if (!escStringCaseSensitive) {
+	        char *tmp = 0;
+		stdstr(&tmp, escString);
+		toupperstr(tmp);
+		it = p->escPassSet.find(tmp);
+		delete [] tmp;
+	} else 
+		it = p->escPassSet.find(escString);
+
+	if (it != p->escPassSet.end()) {
+		appendEscapeString(buf, escString);
+		return true;
+	}
+
+	return false;
+}
+
+
+bool SWBasicFilter::handleNumericEscapeString(SWBuf &buf, const char *escString) {
+	if (passThruNumericEsc) {
+		appendEscapeString(buf, escString);
+		return true;
+	}
+	return false;
+}
+
+
+bool SWBasicFilter::substituteEscapeString(SWBuf &buf, const char *escString) {
+	DualStringMap::iterator it;
+
+	if (*escString == '#') {
+		return handleNumericEscapeString(buf, escString);
+	}
+
+	if (passAllowedEscapeString(buf, escString)) {
+		return true;
+	}
+
+	if (!escStringCaseSensitive) {
+	        char *tmp = 0;
+		stdstr(&tmp, escString);
+		toupperstr(tmp);
+		it = p->escSubMap.find(tmp);
+		delete [] tmp;
+	} else 
+	it = p->escSubMap.find(escString);
+
+	if (it != p->escSubMap.end()) {
+		buf += it->second.c_str();
+		return true;
+	}
+	return false;
+}
+
+
+bool SWBasicFilter::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	return substituteToken(buf, token);
+}
+
+
+bool SWBasicFilter::handleEscapeString(SWBuf &buf, const char *escString, BasicFilterUserData *userData) {
+	return substituteEscapeString(buf, escString);
+}
+
+
+void SWBasicFilter::setEscapeStart(const char *escStart) {
+	stdstr(&(this->escStart), escStart);
+	escStartLen = strlen(escStart);
+}
+
+
+void SWBasicFilter::setEscapeEnd(const char *escEnd) {
+	stdstr(&(this->escEnd), escEnd);
+	escEndLen   = strlen(escEnd);
+}
+
+
+void SWBasicFilter::setTokenStart(const char *tokenStart) {
+	stdstr(&(this->tokenStart), tokenStart);
+	tokenStartLen = strlen(tokenStart);
+}
+
+
+void SWBasicFilter::setTokenEnd(const char *tokenEnd) {
+	stdstr(&(this->tokenEnd), tokenEnd);
+	tokenEndLen   = strlen(tokenEnd);
+}
+
+
+char SWBasicFilter::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	char *from;
+	char token[4096];
+	int tokpos = 0;
+	bool intoken = false;
+	bool inEsc = false;
+	int escStartPos = 0, escEndPos = 0;
+	int tokenStartPos = 0, tokenEndPos = 0;
+	SWBuf lastTextNode;
+	BasicFilterUserData *userData = createUserData(module, key);
+
+	SWBuf orig = text;
+	from = orig.getRawData();
+	text = "";
+
+	if (processStages & INITIALIZE) {
+		if (processStage(INITIALIZE, text, from, userData)) {	// processStage handled it all
+			delete userData;
+			return 0;
+		}
+	}
+
+	for (;*from; from++) {
+
+		if (processStages & PRECHAR) {
+			if (processStage(PRECHAR, text, from, userData))	// processStage handled this char
+				continue;
+		}
+
+		if (*from == tokenStart[tokenStartPos]) {
+			if (tokenStartPos == (tokenStartLen - 1)) {
+				intoken = true;
+				tokpos = 0;
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				inEsc = false;
+			}
+			else tokenStartPos++;
+			continue;
+		}
+
+		if (*from == escStart[escStartPos]) {
+			if (escStartPos == (escStartLen - 1)) {
+				intoken = true;
+				tokpos = 0;
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				inEsc = true;
+			}
+			else escStartPos++;
+			continue;
+		}
+
+		if (inEsc) {
+			if (*from == escEnd[escEndPos]) {
+				if (escEndPos == (escEndLen - 1)) {
+					intoken = inEsc = false;
+					userData->lastTextNode = lastTextNode;
+					
+					if (!userData->suspendTextPassThru)  { //if text through is disabled no tokens should pass, too
+						if ((!handleEscapeString(text, token, userData)) && (passThruUnknownEsc)) {
+							appendEscapeString(text, token);
+						}
+					}
+					escEndPos = escStartPos = tokenEndPos = tokenStartPos = 0;
+					lastTextNode = "";
+					continue;
+				}
+			}
+		}
+
+		if (!inEsc) {
+			if (*from == tokenEnd[tokenEndPos]) {
+				if (tokenEndPos == (tokenEndLen - 1)) {
+					intoken = false;
+					userData->lastTextNode = lastTextNode;
+					if ((!handleToken(text, token, userData)) && (passThruUnknownToken)) {
+						text += tokenStart;
+						text += token;
+						text += tokenEnd;
+					}
+					escEndPos = escStartPos = tokenEndPos = tokenStartPos = 0;
+					lastTextNode = "";
+					continue;
+				}
+			}
+		}
+
+		if (intoken) {
+			if (tokpos < 4090) {
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+			}
+		}
+		else {
+ 			if ((!userData->supressAdjacentWhitespace) || (*from != ' ')) {
+				if (!userData->suspendTextPassThru) {
+					text.append(*from);
+					userData->lastSuspendSegment.size(0);
+				}
+				else	userData->lastSuspendSegment.append(*from);
+				lastTextNode.append(*from);
+ 			}
+			userData->supressAdjacentWhitespace = false;
+		}
+
+		if (processStages & POSTCHAR)
+			processStage(POSTCHAR, text, from, userData);
+
+	}
+
+	if (processStages & FINALIZE)
+		processStage(FINALIZE, text, from, userData);
+
+	delete userData;
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/swoptfilter.cpp b/src/modules/filters/swoptfilter.cpp
new file mode 100644
index 0000000..5c205f5
--- /dev/null
+++ b/src/modules/filters/swoptfilter.cpp
@@ -0,0 +1,67 @@
+/******************************************************************************
+ *
+ *  swoptfilter.cpp -	SWFilter descendant and base class for all option
+ * 			filters
+ *
+ * $Id: swoptfilter.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swoptfilter.h>
+#include <utilstr.h>
+
+SWORD_NAMESPACE_START
+
+
+SWOptionFilter::SWOptionFilter() {
+	static StringList empty;
+	static const char *empty2 = "";
+	optName   = empty2;
+	optTip    = empty2;
+	optValues = &empty;
+}
+
+
+SWOptionFilter::SWOptionFilter(const char *oName, const char *oTip, const StringList *oValues) {
+	optName   = oName;
+	optTip    = oTip;
+	optValues = oValues;
+	if (optValues->begin() != optValues->end()) setOptionValue(*(optValues->begin()));
+	isBooleanVal = optValues->size() == 2 && (optionValue == "On" || optionValue == "Off");
+}
+
+
+SWOptionFilter::~SWOptionFilter() {
+}
+
+
+void SWOptionFilter::setOptionValue(const char *ival) {
+	for (StringList::const_iterator loop = optValues->begin(); loop != optValues->end(); loop++) {
+		if (!stricmp(loop->c_str(), ival)) {
+			optionValue = *loop;
+			option = (!strnicmp(ival, "On", 2));	// convenience for boolean filters
+			break;
+		}
+	}
+}
+
+const char *SWOptionFilter::getOptionValue() {
+	return optionValue;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/teihtmlhref.cpp b/src/modules/filters/teihtmlhref.cpp
new file mode 100644
index 0000000..43fe584
--- /dev/null
+++ b/src/modules/filters/teihtmlhref.cpp
@@ -0,0 +1,286 @@
+/***************************************************************************
+ *
+ *  teihtmlhref.cpp -	TEI to HTML with hrefs filter
+ *
+ * $Id: teihtmlhref.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <teihtmlhref.h>
+#include <utilxml.h>
+#include <swmodule.h>
+#include <url.h>
+#include <iostream>
+
+
+SWORD_NAMESPACE_START
+
+
+TEIHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	BiblicalText = false;
+	if (module) {
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+	}
+}
+
+
+TEIHTMLHREF::TEIHTMLHREF() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("apos");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	setTokenCaseSensitive(true);
+
+	renderNoteNumbers = false;
+}
+
+bool TEIHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+  // manually process if it wasn't a simple substitution
+	if (!substituteToken(buf, token)) {
+		MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+
+		if (!strcmp(tag.getName(), "p")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
+				buf += "<!P><br />";
+			}
+			else if (tag.isEndTag()) {	// end tag
+				buf += "<!/P><br />";
+				//userData->supressAdjacentWhitespace = true;
+			}
+			else {					// empty paragraph break marker
+				buf += "<!P><br />";
+				//userData->supressAdjacentWhitespace = true;
+			}
+		}
+		
+		// <hi>
+		else if (!strcmp(tag.getName(), "hi")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf rend = tag.getAttribute("rend");
+				
+				u->lastHi = rend;
+				if (rend == "ital")
+					buf += "<i>";
+				else if (rend == "italic")
+					buf += "<i>";
+				else if (rend == "bold")
+					buf += "<b>";
+				else if (rend == "sup")
+					buf += "<small><sup>";
+
+			}
+			else if (tag.isEndTag()) {
+				SWBuf rend = u->lastHi;
+				if (rend == "ital")
+					buf += "</i>";
+				else if (rend == "italic")
+					buf += "</i>";
+				else if (rend == "bold")
+					buf += "</b>";
+				else if (rend == "sup")
+					buf += "</sup></small>";
+			}
+		}
+
+		// <entryFree>
+		else if (!strcmp(tag.getName(), "entryFree")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf n = tag.getAttribute("n");				
+				if (n != "") {
+					buf += "<b>";
+					buf += n;
+					buf += "</b>";
+				}
+			}
+		}
+
+		// <sense>
+		else if (!strcmp(tag.getName(), "sense")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf n = tag.getAttribute("n");
+				if (n != "") {
+					buf += "<br /><b>";
+					buf += n;
+					buf += "</b>";
+				}
+			}
+		}
+
+		// <div>
+		else if (!strcmp(tag.getName(), "div")) {
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<!P>";
+			}
+			else if (tag.isEndTag()) {
+			}
+		}
+
+		// <lb.../>
+		else if (!strcmp(tag.getName(), "lb")) {
+			buf += "<br />";
+		}
+
+		// <pos>, <gen>, <case>, <gram>, <number>, <mood>, <pron>, <def>
+		else if (!strcmp(tag.getName(), "pos") || 
+				 !strcmp(tag.getName(), "gen") || 
+				 !strcmp(tag.getName(), "case") || 
+				 !strcmp(tag.getName(), "gram") || 
+				 !strcmp(tag.getName(), "number") || 
+				 !strcmp(tag.getName(), "pron") /*||
+				 !strcmp(tag.getName(), "def")*/) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<i>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</i>";
+			}
+		}
+
+		// <tr>
+		else if (!strcmp(tag.getName(), "tr")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<i>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</i>";
+			}
+		}
+		
+		// orth
+		else if (!strcmp(tag.getName(), "orth")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<b>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</b>";
+			}
+		}
+
+		// <etym>, <usg>
+		else if (!strcmp(tag.getName(), "etym") || 
+				 !strcmp(tag.getName(), "usg")) {
+			// do nothing here
+		}
+		else if (!strcmp(tag.getName(), "ref")) {
+			if (!tag.isEndTag()) {
+				u->suspendTextPassThru = true;
+				SWBuf target;
+				SWBuf work;
+				SWBuf ref;
+
+				int was_osisref = false;
+				if(tag.getAttribute("osisRef"))
+				{
+					target += tag.getAttribute("osisRef");
+					was_osisref=true;
+				}
+				else if(tag.getAttribute("target"))
+					target += tag.getAttribute("target");
+
+				if(target.size())
+				{
+					const char* the_ref = strchr(target, ':');
+					
+					if(!the_ref) {
+						// No work
+						ref = target;
+					}
+					else {
+						// Compensate for starting :
+						ref = the_ref + 1;
+
+						int size = target.size() - ref.size() - 1;
+						work.setSize(size);
+						strncpy(work.getRawData(), target, size);
+					}
+
+					if(was_osisref)
+					{
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=%s\">",
+							(ref) ? URL::encode(ref.c_str()).c_str() : "", 
+							(work.size()) ? URL::encode(work.c_str()).c_str() : "");
+					}
+					else
+					{
+						// Dictionary link, or something
+						buf.appendFormatted("<a href=\"sword://%s/%s\">",
+							(work.size()) ? URL::encode(work.c_str()).c_str() : u->version.c_str(),
+							(ref) ? URL::encode(ref.c_str()).c_str() : ""							
+							);
+					}
+				}
+				else
+				{
+					//std::cout << "TARGET WASN'T\n";
+				}
+				
+			}
+			else {
+				buf += u->lastTextNode.c_str();
+				buf += "</a>";
+				
+				u->suspendTextPassThru = false;
+			}
+		}
+
+	   	// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+				SWBuf noteName = tag.getAttribute("n");
+				
+				buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a>",
+					URL::encode(footnoteNumber.c_str()).c_str(), 
+					URL::encode(u->version.c_str()).c_str(),
+					URL::encode(u->key->getText()).c_str(), 
+					(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+				
+				u->suspendTextPassThru = false;
+			}
+		}
+
+		else {
+			return false;  // we still didn't handle token
+		}
+
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/teiplain.cpp b/src/modules/filters/teiplain.cpp
new file mode 100644
index 0000000..954beb4
--- /dev/null
+++ b/src/modules/filters/teiplain.cpp
@@ -0,0 +1,122 @@
+/***************************************************************************
+ *
+ *  teiplain.cpp -	TEI to Plaintext filter
+ *
+ * $Id: teiplain.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <teiplain.h>
+#include <ctype.h>
+
+SWORD_NAMESPACE_START
+
+TEIPlain::TEIPlain() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+
+	addEscapeStringSubstitute("amp", "&");
+	addEscapeStringSubstitute("apos", "'");
+	addEscapeStringSubstitute("lt", "<");
+	addEscapeStringSubstitute("gt", ">");
+	addEscapeStringSubstitute("quot", "\"");
+
+	setTokenCaseSensitive(true);
+}
+
+
+bool TEIPlain::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+  // manually process if it wasn't a simple substitution
+	if (!substituteToken(buf, token)) {
+		//MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+
+		// <p> paragraph tag
+		if (!strcmp(tag.getName(), "p")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
+				buf += "\n";
+			}
+			else if (tag.isEndTag()) {	// end tag
+				buf += "\n";
+				userData->supressAdjacentWhitespace = true;
+			}
+			else {					// empty paragraph break marker
+				buf += "\n\n";
+				userData->supressAdjacentWhitespace = true;
+			}
+		}
+
+		// <entryFree>
+		else if (!strcmp(tag.getName(), "entryFree")) {
+			SWBuf n = tag.getAttribute("n");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+			        if (n != "") {
+					buf += n;
+					buf += ". ";
+				}
+			}
+		}
+
+		// <sense>
+		else if (!strcmp(tag.getName(), "sense")) {
+			SWBuf n = tag.getAttribute("n");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+			        if (n != "") {
+					buf += n;
+					buf += ". ";
+				}
+			}
+			else if (tag.isEndTag()) {
+			                buf += "\n";
+			}
+		}
+
+		// <div>
+		else if (!strcmp(tag.getName(), "div")) {
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf.append("\n\n\n");
+			}
+			else if (tag.isEndTag()) {
+			}
+		}
+
+		// <etym>
+		else if (!strcmp(tag.getName(), "etym")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "[";
+			}
+			else if (tag.isEndTag()) {
+			        buf += "]";
+			}
+		}
+
+		else {
+			return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/teirtf.cpp b/src/modules/filters/teirtf.cpp
new file mode 100644
index 0000000..979e4a6
--- /dev/null
+++ b/src/modules/filters/teirtf.cpp
@@ -0,0 +1,208 @@
+/***************************************************************************
+ *
+ *  teirtf.cpp -	TEI to RTF filter
+ *
+ * $Id: teirtf.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2006-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <teirtf.h>
+#include <utilxml.h>
+#include <swmodule.h>
+#include <versekey.h>
+
+SWORD_NAMESPACE_START
+
+
+TEIRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	BiblicalText = false;
+	inOsisRef = false;
+	if (module) {
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+	}
+}
+
+
+TEIRTF::TEIRTF() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+
+	addEscapeStringSubstitute("amp", "&");
+	addEscapeStringSubstitute("apos", "'");
+	addEscapeStringSubstitute("lt", "<");
+	addEscapeStringSubstitute("gt", ">");
+	addEscapeStringSubstitute("quot", "\"");
+
+	setTokenCaseSensitive(true);
+}
+
+
+bool TEIRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+  // manually process if it wasn't a simple substitution
+	if (!substituteToken(buf, token)) {
+		MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+
+		// <p> paragraph tag
+		if (!strcmp(tag.getName(), "p")) {
+			if (!tag.isEndTag()) {	// non-empty start tag
+				buf += "{\\sb100\\fi200\\par}";
+			}
+		}
+
+		// <hi>
+		else if (!strcmp(tag.getName(), "hi") || !strcmp(tag.getName(), "emph")) {
+			SWBuf rend = tag.getAttribute("rend");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				if (rend == "ital" || rend == "italic")
+					buf += "{\\i1 ";
+				else if (rend == "bold")
+					buf += "{\\b1 ";
+				else if (rend == "sup")
+				        buf += "{\\super ";
+
+			}
+			else if (tag.isEndTag()) {
+				buf += "}";
+			}
+		}
+
+		// <entryFree>
+		else if (!strcmp(tag.getName(), "entryFree")) {
+			SWBuf n = tag.getAttribute("n");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+			        if (n != "") {
+                                	buf += "{\\b1 ";
+					buf += n;
+					buf += ". }";				}
+			}
+		}
+
+		// <sense>
+		else if (!strcmp(tag.getName(), "sense")) {
+			SWBuf n = tag.getAttribute("n");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+			        if (n != "") {
+                                	buf += "{\\sb100\\par\\b1 ";
+					buf += n;
+					buf += ". }";
+				}
+			}
+		}
+
+		// <div>
+		else if (!strcmp(tag.getName(), "div")) {
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf.append("{\\pard\\sa300}");
+			}
+			else if (tag.isEndTag()) {
+			}
+		}
+
+		// <pos>, <gen>, <case>, <gram>, <number>, <mood>
+		else if (!strcmp(tag.getName(), "pos") || !strcmp(tag.getName(), "gen") || !strcmp(tag.getName(), "case") || !strcmp(tag.getName(), "gram") || !strcmp(tag.getName(), "number") || !strcmp(tag.getName(), "mood")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "{\\i1 ";
+			}
+			else if (tag.isEndTag()) {
+			        buf += "}";
+			}
+		}
+
+		// <tr>
+		else if (!strcmp(tag.getName(), "tr")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "{\\i1 ";
+			}
+			else if (tag.isEndTag()) {
+			        buf += "}";
+			}
+		}
+
+		// <etym>
+		else if (!strcmp(tag.getName(), "etym")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "[";
+			}
+			else if (tag.isEndTag()) {
+			        buf += "]";
+			}
+		}
+
+       		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					SWBuf type = tag.getAttribute("type");
+
+					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+					VerseKey *vkey = 0;
+					// see if we have a VerseKey * or descendant
+					SWTRY {
+						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+					}
+					SWCATCH ( ... ) {	}
+					if (vkey) {
+						buf.appendFormatted("{\\super <a href=\"\">*%s</a>} ", footnoteNumber.c_str());
+					}
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = false;
+			}
+		}
+
+		// <lb/> tag
+		else if (!strcmp(tag.getName(), "lb")) {
+			buf += "{\\par}";
+			userData->supressAdjacentWhitespace = true;
+		}
+
+		// <ref> tag
+		else if (!strcmp(tag.getName(), "ref")) {
+			if (!tag.isEndTag() && tag.getAttribute("osisRef")) {
+				buf += "{<a href=\"\">";
+				u->inOsisRef = true;
+			}
+			else if (tag.isEndTag() && u->inOsisRef) {
+				buf += "</a>}";
+				u->inOsisRef = false;
+			}
+		}
+
+
+		else {
+			return false;  // we still didn't handle token
+		}
+
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/teixhtml.cpp b/src/modules/filters/teixhtml.cpp
new file mode 100644
index 0000000..6a390a1
--- /dev/null
+++ b/src/modules/filters/teixhtml.cpp
@@ -0,0 +1,290 @@
+/***************************************************************************
+ *
+ *  teixhtml.cpp -	TEI to XHTML filter
+ *
+ * $Id: teixhtml.cpp 2984 2013-09-20 12:18:45Z scribe $
+ *
+ * Copyright 2012-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <ctype.h>
+#include <teixhtml.h>
+#include <utilxml.h>
+#include <swmodule.h>
+#include <url.h>
+#include <iostream>
+
+
+SWORD_NAMESPACE_START
+
+
+TEIXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	BiblicalText = false;
+	if (module) {
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+	}
+}
+
+
+TEIXHTML::TEIXHTML() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("apos");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	setTokenCaseSensitive(true);
+
+	renderNoteNumbers = false;
+}
+
+bool TEIXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+  // manually process if it wasn't a simple substitution
+	if (!substituteToken(buf, token)) {
+		MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+
+		if (!strcmp(tag.getName(), "p")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
+				buf += "<!P><br />";
+			}
+			else if (tag.isEndTag()) {	// end tag
+				buf += "<!/P><br />";
+				//userData->supressAdjacentWhitespace = true;
+			}
+			else {					// empty paragraph break marker
+				buf += "<!P><br />";
+				//userData->supressAdjacentWhitespace = true;
+			}
+		}
+		
+		// <hi>
+		else if (!strcmp(tag.getName(), "hi")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf rend = tag.getAttribute("rend");
+				
+				u->lastHi = rend;
+				if (rend == "ital")
+					buf += "<i>";
+				else if (rend == "italic")
+					buf += "<i>";
+				else if (rend == "bold")
+					buf += "<b>";
+				else if (rend == "sup")
+					buf += "<small><sup>";
+				else if (rend == "overline")
+					buf += "<span style=\"text-decoration:overline\">";
+
+			}
+			else if (tag.isEndTag()) {
+				SWBuf rend = u->lastHi;
+				if (rend == "ital")
+					buf += "</i>";
+				else if (rend == "italic")
+					buf += "</i>";
+				else if (rend == "bold")
+					buf += "</b>";
+				else if (rend == "sup")
+					buf += "</sup></small>";
+				else if (rend == "overline")
+					buf += "</span>";
+			}
+		}
+
+		// <entryFree>
+		else if (!strcmp(tag.getName(), "entryFree")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf n = tag.getAttribute("n");				
+				if (n != "") {
+					buf += "<b>";
+					buf += n;
+					buf += "</b>";
+				}
+			}
+		}
+
+		// <sense>
+		else if (!strcmp(tag.getName(), "sense")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				SWBuf n = tag.getAttribute("n");
+				if (n != "") {
+					buf += "<br /><b>";
+					buf += n;
+					buf += "</b>";
+				}
+			}
+		}
+
+		// <div>
+		else if (!strcmp(tag.getName(), "div")) {
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<!P>";
+			}
+			else if (tag.isEndTag()) {
+			}
+		}
+
+		// <lb.../>
+		else if (!strcmp(tag.getName(), "lb")) {
+			buf += "<br />";
+		}
+
+		// <pos>, <gen>, <case>, <gram>, <number>, <mood>, <pron>, <def>
+		else if (!strcmp(tag.getName(), "pos") || 
+				 !strcmp(tag.getName(), "gen") || 
+				 !strcmp(tag.getName(), "case") || 
+				 !strcmp(tag.getName(), "gram") || 
+				 !strcmp(tag.getName(), "number") || 
+				 !strcmp(tag.getName(), "pron") /*||
+				 !strcmp(tag.getName(), "def")*/) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<i>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</i>";
+			}
+		}
+
+		// <tr>
+		else if (!strcmp(tag.getName(), "tr")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<i>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</i>";
+			}
+		}
+		
+		// orth
+		else if (!strcmp(tag.getName(), "orth")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<b>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</b>";
+			}
+		}
+
+		// <etym>, <usg>
+		else if (!strcmp(tag.getName(), "etym") || 
+				 !strcmp(tag.getName(), "usg")) {
+			// do nothing here
+		}
+		else if (!strcmp(tag.getName(), "ref")) {
+			if (!tag.isEndTag()) {
+				u->suspendTextPassThru = true;
+				SWBuf target;
+				SWBuf work;
+				SWBuf ref;
+
+				int was_osisref = false;
+				if(tag.getAttribute("osisRef"))
+				{
+					target += tag.getAttribute("osisRef");
+					was_osisref=true;
+				}
+				else if(tag.getAttribute("target"))
+					target += tag.getAttribute("target");
+
+				if(target.size())
+				{
+					const char* the_ref = strchr(target, ':');
+					
+					if(!the_ref) {
+						// No work
+						ref = target;
+					}
+					else {
+						// Compensate for starting :
+						ref = the_ref + 1;
+
+						int size = target.size() - ref.size() - 1;
+						work.setSize(size);
+						strncpy(work.getRawData(), target, size);
+					}
+
+					if(was_osisref)
+					{
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=%s\">",
+							(ref) ? URL::encode(ref.c_str()).c_str() : "", 
+							(work.size()) ? URL::encode(work.c_str()).c_str() : "");
+					}
+					else
+					{
+						// Dictionary link, or something
+						buf.appendFormatted("<a href=\"sword://%s/%s\">",
+							(work.size()) ? URL::encode(work.c_str()).c_str() : u->version.c_str(),
+							(ref) ? URL::encode(ref.c_str()).c_str() : ""							
+							);
+					}
+				}
+				else
+				{
+					//std::cout << "TARGET WASN'T\n";
+				}
+				
+			}
+			else {
+				buf += u->lastTextNode.c_str();
+				buf += "</a>";
+				
+				u->suspendTextPassThru = false;
+			}
+		}
+
+	   	// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+				SWBuf noteName = tag.getAttribute("n");
+				
+				buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=n&value=%s&module=%s&passage=%s\"><small><sup class=\"n\">*n%s</sup></small></a>",
+					URL::encode(footnoteNumber.c_str()).c_str(), 
+					URL::encode(u->version.c_str()).c_str(),
+					URL::encode(u->key->getText()).c_str(), 
+					(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+				
+				u->suspendTextPassThru = false;
+			}
+		}
+
+		else {
+			return false;  // we still didn't handle token
+		}
+
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/thmlfootnotes.cpp b/src/modules/filters/thmlfootnotes.cpp
new file mode 100644
index 0000000..566551f
--- /dev/null
+++ b/src/modules/filters/thmlfootnotes.cpp
@@ -0,0 +1,156 @@
+/******************************************************************************
+ *
+ *  thmlfootnotes.cpp -	SWFilter descendant to hide or show footnotes
+ *			in a ThML module
+ *
+ * $Id: thmlfootnotes.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <thmlfootnotes.h>
+#include <swmodule.h>
+#include <swbuf.h>
+#include <versekey.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Footnotes";
+	static const char oTip[]  = "Toggles Footnotes On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+ThMLFootnotes::ThMLFootnotes() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+ThMLFootnotes::~ThMLFootnotes() {
+}
+
+
+char ThMLFootnotes::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken    = false;
+	bool hide       = false;
+	SWBuf tagText;
+	XMLTag startTag;
+	SWBuf refs = "";
+	int footnoteNum = 1;
+	char buf[254];
+	SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey();
+        VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
+        if (!parser) {
+        	delete p;
+                parser = new VerseKey();
+        }
+        *parser = key->getText();
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+
+			XMLTag tag(token);
+			if (!strcmp(tag.getName(), "note")) {
+				if (!tag.isEndTag()) {
+					if (!tag.isEmpty()) {
+						refs = "";
+						startTag = tag;
+						hide = true;
+						tagText = "";
+						continue;
+					}
+				}
+				if (hide && tag.isEndTag()) {
+					if (module->isProcessEntryAttributes()) {
+						SWBuf fc = module->getEntryAttributes()["Footnote"]["count"]["value"];
+						footnoteNum = (fc.length()) ? atoi(fc.c_str()) : 0;
+						sprintf(buf, "%i", ++footnoteNum);
+						module->getEntryAttributes()["Footnote"]["count"]["value"] = buf;
+						StringList attributes = startTag.getAttributeNames();
+						for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
+							module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
+						}
+						module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
+						startTag.setAttribute("swordFootnote", buf);
+						if ((startTag.getAttribute("type")) && (!strcmp(startTag.getAttribute("type"), "crossReference"))) {
+							if (!refs.length())
+								refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText();
+							module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
+						}
+					}
+					hide = false;
+					if ((option) || ((startTag.getAttribute("type") && (!strcmp(startTag.getAttribute("type"), "crossReference"))))) {	// we want the tag in the text; crossReferences are handled by another filter
+						text += startTag;
+						text.append(tagText);
+					}
+					else	continue;
+				}
+			}
+
+			// if not a note token, keep token in text
+			if ((!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
+				SWBuf osisRef = tag.getAttribute("passage");
+				if (refs.length())
+					refs += "; ";
+				refs += osisRef;
+			}
+			if (!hide) {
+				text += '<';
+				text.append(token);
+				text += '>';
+			}
+			else {
+				tagText += '<';
+				tagText.append(token);
+				tagText += '>';
+			}
+			continue;
+		}
+		if (intoken) { //copy token
+			token += *from;
+		}
+		else if (!hide) { //copy text which is not inside a token
+			text += *from;
+		}
+		else tagText += *from;
+	}
+        delete parser;
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlgbf.cpp b/src/modules/filters/thmlgbf.cpp
new file mode 100644
index 0000000..e85fdef
--- /dev/null
+++ b/src/modules/filters/thmlgbf.cpp
@@ -0,0 +1,297 @@
+/***************************************************************************
+ *
+ *  thmlgbf.cpp -	ThML to GBF filter
+ *
+ * $Id: thmlgbf.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlgbf.h>
+#include <utilstr.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+ThMLGBF::ThMLGBF()
+{
+}
+
+
+char ThMLGBF::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	const char *from;
+	char token[2048];
+	int tokpos = 0;
+	bool intoken 	= false;
+	bool ampersand = false;
+	bool sechead = false;
+	bool title = false;  
+
+	SWBuf orig = text;
+	from = orig.c_str();
+
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			ampersand = false;
+			continue;
+		}
+		else if (*from == '&') {
+			intoken = true;
+			tokpos = 0;
+			memset(token, 0, 2048);
+			ampersand = true;
+			continue;
+		}
+		if (*from == ';' && ampersand) {
+			intoken = false;
+	
+			if (!strncmp("nbsp", token, 4)) text += ' ';
+			else if (!strncmp("quot", token, 4)) text += '"';
+			else if (!strncmp("amp", token, 3)) text += '&';
+			else if (!strncmp("lt", token, 2)) text += '<';
+			else if (!strncmp("gt", token, 2)) text += '>';
+			else if (!strncmp("brvbar", token, 6)) text += '¦';
+			else if (!strncmp("sect", token, 4)) text += '§';
+			else if (!strncmp("copy", token, 4)) text += '©';
+			else if (!strncmp("laquo", token, 5)) text += '«';
+			else if (!strncmp("reg", token, 3)) text += '®';
+			else if (!strncmp("acute", token, 5)) text += '´';
+			else if (!strncmp("para", token, 4)) text += '¶';
+			else if (!strncmp("raquo", token, 5)) text += '»';
+			
+			else if (!strncmp("Aacute", token, 6)) text += 'Á';
+			else if (!strncmp("Agrave", token, 6)) text += 'À';
+			else if (!strncmp("Acirc", token, 5)) text += 'Â';
+			else if (!strncmp("Auml", token, 4)) text += 'Ä';
+			else if (!strncmp("Atilde", token, 6)) text += 'Ã';
+			else if (!strncmp("Aring", token, 5)) text += 'Å';
+			else if (!strncmp("aacute", token, 6)) text += 'á';
+			else if (!strncmp("agrave", token, 6)) text += 'à';
+			else if (!strncmp("acirc", token, 5)) text += 'â';
+			else if (!strncmp("auml", token, 4)) text += 'ä';
+			else if (!strncmp("atilde", token, 6)) text += 'ã';
+			else if (!strncmp("aring", token, 5)) text += 'å';
+			else if (!strncmp("Eacute", token, 6)) text += 'É';
+			else if (!strncmp("Egrave", token, 6)) text += 'È';
+			else if (!strncmp("Ecirc", token, 5)) text += 'Ê';
+			else if (!strncmp("Euml", token, 4)) text += 'Ë';
+			else if (!strncmp("eacute", token, 6)) text += 'é';
+			else if (!strncmp("egrave", token, 6)) text += 'è';
+			else if (!strncmp("ecirc", token, 5)) text += 'ê';
+			else if (!strncmp("euml", token, 4)) text += 'ë';
+			else if (!strncmp("Iacute", token, 6)) text += 'Í';
+			else if (!strncmp("Igrave", token, 6)) text += 'Ì';
+			else if (!strncmp("Icirc", token, 5)) text += 'Î';
+			else if (!strncmp("Iuml", token, 4)) text += 'Ï';
+			else if (!strncmp("iacute", token, 6)) text += 'í';
+			else if (!strncmp("igrave", token, 6)) text += 'ì';
+			else if (!strncmp("icirc", token, 5)) text += 'î';
+			else if (!strncmp("iuml", token, 4)) text += 'ï';
+			else if (!strncmp("Oacute", token, 6)) text += 'Ó';
+			else if (!strncmp("Ograve", token, 6)) text += 'Ò';
+			else if (!strncmp("Ocirc", token, 5)) text += 'Ô';
+			else if (!strncmp("Ouml", token, 4)) text += 'Ö';
+			else if (!strncmp("Otilde", token, 6)) text += 'Õ';
+			else if (!strncmp("oacute", token, 6)) text += 'ó';
+			else if (!strncmp("ograve", token, 6)) text += 'ò';
+			else if (!strncmp("ocirc", token, 5)) text += 'ô';
+			else if (!strncmp("ouml", token, 4)) text += 'ö';
+			else if (!strncmp("otilde", token, 6)) text += 'õ';
+			else if (!strncmp("Uacute", token, 6)) text += 'Ú';
+			else if (!strncmp("Ugrave", token, 6)) text += 'Ù';
+			else if (!strncmp("Ucirc", token, 5)) text += 'Û';
+			else if (!strncmp("Uuml", token, 4)) text += 'Ü';
+			else if (!strncmp("uacute", token, 6)) text += 'ú';
+			else if (!strncmp("ugrave", token, 6)) text += 'ù';
+			else if (!strncmp("ucirc", token, 5)) text += 'û';
+			else if (!strncmp("uuml", token, 4)) text += 'ü';
+			else if (!strncmp("Yacute", token, 6)) text += 'Ý';
+			else if (!strncmp("yacute", token, 6)) text += 'ý';
+			else if (!strncmp("yuml", token, 4)) text += 'ÿ';
+			
+			else if (!strncmp("deg", token, 3)) text += '°';
+			else if (!strncmp("plusmn", token, 6)) text += '±';
+			else if (!strncmp("sup2", token, 4)) text += '²';
+			else if (!strncmp("sup3", token, 4)) text += '³';
+			else if (!strncmp("sup1", token, 4)) text += '¹';
+			else if (!strncmp("nbsp", token, 4)) text += 'º';
+			else if (!strncmp("pound", token, 5)) text += '£';
+			else if (!strncmp("cent", token, 4)) text += '¢';
+			else if (!strncmp("frac14", token, 6)) text += '¼';
+			else if (!strncmp("frac12", token, 6)) text += '½';
+			else if (!strncmp("frac34", token, 6)) text += '¾';
+			else if (!strncmp("iquest", token, 6)) text += '¿';
+			else if (!strncmp("iexcl", token, 5)) text += '¡';
+			else if (!strncmp("ETH", token, 3)) text += 'Ð';
+			else if (!strncmp("eth", token, 3)) text += 'ð';
+			else if (!strncmp("THORN", token, 5)) text += 'Þ';
+			else if (!strncmp("thorn", token, 5)) text += 'þ';
+			else if (!strncmp("AElig", token, 5)) text += 'Æ';
+			else if (!strncmp("aelig", token, 5)) text += 'æ';
+			else if (!strncmp("Oslash", token, 6)) text += 'Ø';
+			else if (!strncmp("curren", token, 6)) text += '¤';
+			else if (!strncmp("Ccedil", token, 6)) text += 'Ç';
+			else if (!strncmp("ccedil", token, 6)) text += 'ç';
+			else if (!strncmp("szlig", token, 5)) text += 'ß';
+			else if (!strncmp("Ntilde", token, 6)) text += 'Ñ';
+			else if (!strncmp("ntilde", token, 6)) text += 'ñ';
+			else if (!strncmp("yen", token, 3)) text += '¥';
+			else if (!strncmp("not", token, 3)) text += '¬';
+			else if (!strncmp("ordf", token, 4)) text += 'ª';
+			else if (!strncmp("uml", token, 3)) text += '¨';
+			else if (!strncmp("shy", token, 3)) text += '­';
+			else if (!strncmp("macr", token, 4)) text += '¯';
+			else if (!strncmp("micro", token, 5)) text += "µ";
+			else if (!strncmp("middot", token, 6)) text +="·";
+			else if (!strncmp("cedil", token, 5)) text += "¸";
+			else if (!strncmp("ordm", token, 4)) text +=  "º";
+			else if (!strncmp("times", token, 5)) text += "×";
+			else if (!strncmp("divide", token, 6)) text +="÷";
+			else if (!strncmp("oslash", token, 6)) text +="ø";
+			continue;
+		
+		}
+		else if (*from == '>' && !ampersand) {
+			intoken = false;
+			// process desired tokens
+			if (!strncmp(token, "sync type=\"Strongs\" value=\"", 27)) {
+				text += "<W";
+				for (unsigned int i = 27; token[i] != '\"'; i++)
+					text += token[i];
+				text += '>';
+				continue;
+			}
+			if (!strncmp(token, "sync type=\"morph\" value=\"", 25)) {
+				text += "<WT";
+				for (unsigned int i = 25; token[i] != '\"'; i++)
+					text += token[i];
+				text += '>';
+				continue;
+			}
+			else if (!strncmp(token, "scripRef", 8)) {
+				text += "<RX>";
+				continue;
+			}
+ 			else if (!strncmp(token, "/scripRef", 9)) {
+				text += "<Rx>";
+				continue;
+			}
+			else if (!strncmp(token, "note", 4)) {
+				text += "<RF>";
+				continue;
+			}
+			else if (!strncmp(token, "/note", 5)) {
+				text += "<Rf>";
+				continue;
+			}
+			else if (!strncmp(token, "sup", 3)) {
+				text += "<FS>";
+			}
+			else if (!strncmp(token, "/sup", 4)) {
+				text += "<Fs>";
+			}
+			else if (!strnicmp(token, "font color=#ff0000", 18)) {
+				text += "<FR>";
+				continue;
+			}
+			else if (!strnicmp(token, "/font", 5)) {
+				text += "<Fr>";
+				continue;
+			}
+			else if (!strncmp(token, "div class=\"sechead\"", 19)) {
+				text += "<TS>";
+				sechead = true;
+				continue;
+			}
+			else if (sechead && !strncmp(token, "/div", 19)) {
+				text += "<Ts>";
+				sechead = false;
+				continue;
+			}
+			else if (!strncmp(token, "div class=\"title\"", 19)) {
+				text += "<TT>";
+				title = true;
+				continue;
+			}
+			else if (title && !strncmp(token, "/div", 19)) {
+				text += "<Tt>";
+				title = false;
+				continue;
+			}
+			else if (!strnicmp(token, "br", 2)) {
+				text += "<CL>";
+				continue;
+			}
+			else switch(*token) {
+			case 'I':			// font tags
+			case 'i':
+				text += "<FI>";
+				continue;
+			case 'B':		// bold start
+			case 'b':
+				text += "<FB>";
+				continue;
+			case '/':
+				switch(token[1]) {
+				case 'P':
+				case 'p':
+					text += "<CM>";
+					continue;
+				case 'I':
+				case 'i':		// italic end
+					text += "<Fi>";
+					continue;
+				case 'B':		// bold start
+				case 'b':
+					text += "<Fb>";
+					continue;
+				}
+			}
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else	text += *from;
+	}
+
+	orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {  //loop to remove extra spaces
+                if ((strchr(" \t\n\r", *from))) {
+                        while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
+                                from++;
+                        }
+                        text += " ";
+                }
+                else {
+                        text += *from;
+                }
+        }
+        text += (char)0;
+        
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlheadings.cpp b/src/modules/filters/thmlheadings.cpp
new file mode 100644
index 0000000..46498d0
--- /dev/null
+++ b/src/modules/filters/thmlheadings.cpp
@@ -0,0 +1,176 @@
+/******************************************************************************
+ *
+ *  thmlheadings.cpp -	SWFilter descendant to hide or show headings
+ *			in a ThML module
+ *
+ * $Id: thmlheadings.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <thmlheadings.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <swmodule.h>
+#include <stdio.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Headings";
+	static const char oTip[]  = "Toggles Headings On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+ThMLHeadings::ThMLHeadings() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+ThMLHeadings::~ThMLHeadings() {
+}
+
+
+char ThMLHeadings::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken    = false;
+	bool isheader   = false;
+	bool hide       = false;
+	bool preverse   = false;
+	bool withinDiv  = false;
+	SWBuf header;
+	int headerNum   = 0;
+	int pvHeaderNum = 0;
+	char buf[254];
+	XMLTag startTag;
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+	
+	XMLTag tag;
+
+	for (text = ""; *from; ++from) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+
+			if (!strnicmp(token.c_str(), "div", 3) || !strnicmp(token.c_str(), "/div", 4)) {
+				withinDiv =  (!strnicmp(token.c_str(), "div", 3));
+				tag = token;
+				if (hide && tag.isEndTag()) {
+					if (module->isProcessEntryAttributes() && (option || (!preverse))) {
+						if (preverse) {
+							sprintf(buf, "%i", pvHeaderNum++);
+							module->getEntryAttributes()["Heading"]["Preverse"][buf] = header;
+						}
+						else {
+							sprintf(buf, "%i", headerNum++);
+							module->getEntryAttributes()["Heading"]["Interverse"][buf] = header;
+							if (option) {	// we want the tag in the text
+								text.append(header);
+							}
+						}
+						
+						StringList attributes = startTag.getAttributeNames();
+						for (StringList::const_iterator it = attributes.begin(); it != attributes.end(); it++) {
+							module->getEntryAttributes()["Heading"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
+						}
+					}
+					
+					hide = false;
+					if (!option || preverse) {	// we don't want the tag in the text anymore
+						preverse = false;
+						continue;
+					}
+					preverse = false;
+				}
+				if (tag.getAttribute("class") && ((!stricmp(tag.getAttribute("class"), "sechead"))
+										 ||  (!stricmp(tag.getAttribute("class"), "title")))) {
+
+					isheader = true;
+					
+					if (!tag.isEndTag()) { //start tag
+						if (!tag.isEmpty()) {
+							startTag = tag;
+					
+/* how do we tell a ThML preverse title from one that should be in the text?  probably if any text is before the title...  just assuming all are preverse for now
+					}
+					if (tag.getAttribute("subtype") && !stricmp(tag.getAttribute("subtype"), "x-preverse")) {
+*/
+						hide = true;
+						preverse = true;
+						header = "";
+						continue;
+						}	// move back up under startTag = tag
+					}
+/* this is where non-preverse will go eventually
+					if (!tag.isEndTag()) { //start tag
+						hide = true;
+						header = "";
+						if (option) {	// we want the tag in the text
+							text.append('<');
+							text.append(token);
+							text.append('>');
+						}
+						continue;
+					}
+*/
+				}
+				else
+					isheader = false;
+			}
+
+			if (withinDiv && isheader) {
+				header.append('<');
+				header.append(token);
+				header.append('>');
+			} else {
+				// if not a heading token, keep token in text
+				if (!hide) {
+					text.append('<');
+					text.append(token);
+					text.append('>');
+				}
+			}
+			continue;
+		}
+		if (intoken) { //copy token
+			token.append(*from);
+		}
+		else if (!hide) { //copy text which is not inside a token
+			text.append(*from);
+		}
+		else header.append(*from);
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlhtml.cpp b/src/modules/filters/thmlhtml.cpp
new file mode 100644
index 0000000..b5f624e
--- /dev/null
+++ b/src/modules/filters/thmlhtml.cpp
@@ -0,0 +1,244 @@
+/***************************************************************************
+ *
+ *  thmlhtml.cpp -	ThML to HTML filter
+ *
+ * $Id: thmlhtml.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlhtml.h>
+#include <swmodule.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+
+ThMLHTML::ThMLHTML() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+	setPassThruNumericEscapeString(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	addAllowedEscapeString("nbsp");
+	addAllowedEscapeString("brvbar"); // "¦"
+	addAllowedEscapeString("sect");   // "§"
+	addAllowedEscapeString("copy");   // "©"
+	addAllowedEscapeString("laquo");  // "«"
+	addAllowedEscapeString("reg");    // "®"
+	addAllowedEscapeString("acute");  // "´"
+	addAllowedEscapeString("para");   // "¶"
+	addAllowedEscapeString("raquo");  // "»"
+
+	addAllowedEscapeString("Aacute"); // "Á"
+	addAllowedEscapeString("Agrave"); // "À"
+	addAllowedEscapeString("Acirc");  // "Â"
+	addAllowedEscapeString("Auml");   // "Ä"
+	addAllowedEscapeString("Atilde"); // "Ã"
+	addAllowedEscapeString("Aring");  // "Å"
+	addAllowedEscapeString("aacute"); // "á"
+	addAllowedEscapeString("agrave"); // "à"
+	addAllowedEscapeString("acirc");  // "â"
+	addAllowedEscapeString("auml");   // "ä"
+	addAllowedEscapeString("atilde"); // "ã"
+	addAllowedEscapeString("aring");  // "å"
+	addAllowedEscapeString("Eacute"); // "É"
+	addAllowedEscapeString("Egrave"); // "È"
+	addAllowedEscapeString("Ecirc");  // "Ê"
+	addAllowedEscapeString("Euml");   // "Ë"
+	addAllowedEscapeString("eacute"); // "é"
+	addAllowedEscapeString("egrave"); // "è"
+	addAllowedEscapeString("ecirc");  // "ê"
+	addAllowedEscapeString("euml");   // "ë"
+	addAllowedEscapeString("Iacute"); // "Í"
+	addAllowedEscapeString("Igrave"); // "Ì"
+	addAllowedEscapeString("Icirc");  // "Î"
+	addAllowedEscapeString("Iuml");   // "Ï"
+	addAllowedEscapeString("iacute"); // "í"
+	addAllowedEscapeString("igrave"); // "ì"
+	addAllowedEscapeString("icirc");  // "î"
+	addAllowedEscapeString("iuml");   // "ï"
+	addAllowedEscapeString("Oacute"); // "Ó"
+	addAllowedEscapeString("Ograve"); // "Ò"
+	addAllowedEscapeString("Ocirc");  // "Ô"
+	addAllowedEscapeString("Ouml");   // "Ö"
+	addAllowedEscapeString("Otilde"); // "Õ"
+	addAllowedEscapeString("oacute"); // "ó"
+	addAllowedEscapeString("ograve"); // "ò"
+	addAllowedEscapeString("ocirc");  // "ô"
+	addAllowedEscapeString("ouml");   // "ö"
+	addAllowedEscapeString("otilde"); // "õ"
+	addAllowedEscapeString("Uacute"); // "Ú"
+	addAllowedEscapeString("Ugrave"); // "Ù"
+	addAllowedEscapeString("Ucirc");  // "Û"
+	addAllowedEscapeString("Uuml");   // "Ü"
+	addAllowedEscapeString("uacute"); // "ú"
+	addAllowedEscapeString("ugrave"); // "ù"
+	addAllowedEscapeString("ucirc");  // "û"
+	addAllowedEscapeString("uuml");   // "ü"
+	addAllowedEscapeString("Yacute"); // "Ý"
+	addAllowedEscapeString("yacute"); // "ý"
+	addAllowedEscapeString("yuml");   // "ÿ"
+
+	addAllowedEscapeString("deg");    // "°"
+	addAllowedEscapeString("plusmn"); // "±"
+	addAllowedEscapeString("sup2");   // "²"
+	addAllowedEscapeString("sup3");   // "³"
+	addAllowedEscapeString("sup1");   // "¹"
+	addAllowedEscapeString("nbsp");   // "º"
+	addAllowedEscapeString("pound");  // "£"
+	addAllowedEscapeString("cent");   // "¢"
+	addAllowedEscapeString("frac14"); // "¼"
+	addAllowedEscapeString("frac12"); // "½"
+	addAllowedEscapeString("frac34"); // "¾"
+	addAllowedEscapeString("iquest"); // "¿"
+	addAllowedEscapeString("iexcl");  // "¡"
+	addAllowedEscapeString("ETH");    // "Ð"
+	addAllowedEscapeString("eth");    // "ð"
+	addAllowedEscapeString("THORN");  // "Þ"
+	addAllowedEscapeString("thorn");  // "þ"
+	addAllowedEscapeString("AElig");  // "Æ"
+	addAllowedEscapeString("aelig");  // "æ"
+	addAllowedEscapeString("Oslash"); // "Ø"
+	addAllowedEscapeString("curren"); // "¤"
+	addAllowedEscapeString("Ccedil"); // "Ç"
+	addAllowedEscapeString("ccedil"); // "ç"
+	addAllowedEscapeString("szlig");  // "ß"
+	addAllowedEscapeString("Ntilde"); // "Ñ"
+	addAllowedEscapeString("ntilde"); // "ñ"
+	addAllowedEscapeString("yen");    // "¥"
+	addAllowedEscapeString("not");    // "¬"
+	addAllowedEscapeString("ordf");   // "ª"
+	addAllowedEscapeString("uml");    // "¨"
+	addAllowedEscapeString("shy");    // "­"
+	addAllowedEscapeString("macr");   // "¯"
+
+	addAllowedEscapeString("micro");  // "µ"
+	addAllowedEscapeString("middot"); // "·"
+	addAllowedEscapeString("cedil");  // "¸"
+	addAllowedEscapeString("ordm");   // "º"
+	addAllowedEscapeString("times");  // "×"
+	addAllowedEscapeString("divide"); // "÷"
+	addAllowedEscapeString("oslash"); // "ø"
+
+	setTokenCaseSensitive(true);
+
+	addTokenSubstitute("note", " <font color=\"#800000\"><small>(");
+	addTokenSubstitute("/note", ")</small></font> ");
+}
+
+
+bool ThMLHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
+		MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+		if (!strcmp(tag.getName(), "sync")) {
+			if (tag.getAttribute("type") && tag.getAttribute("value") && !strcmp(tag.getAttribute("type"), "Strongs")) {
+				const char* value = tag.getAttribute("value");
+				if (*value == 'H' || *value == 'G' || *value == 'A') {
+					value++;
+					buf += "<small><em>";
+					buf += value;
+					buf += "</em></small>";
+				}
+				else if (*value == 'T') {
+					value += 2;
+
+					buf += "<small><i>";
+					buf += value;
+					buf += "</i></small>";
+				}
+			}
+			else if (tag.getAttribute("type") && tag.getAttribute("value") && !strcmp(tag.getAttribute("type"), "morph")) {
+				buf += "<small><em>";
+				buf += tag.getAttribute("value");
+				buf += "</em></small>";
+			}
+			else if (tag.getAttribute("type") && tag.getAttribute("value") && !strcmp(tag.getAttribute("type"), "lemma")) {
+				buf += "<small><em>(";
+				buf += tag.getAttribute("value");
+				buf += ")</em></small>";
+			}
+		}
+		else if (!strcmp(tag.getName(), "div")) {
+			if (tag.isEndTag() && (u->SecHead)) {
+				buf += "</i></b><br />";
+				u->SecHead = false;
+			}
+			else if (tag.getAttribute("class")) {
+				if (!strcmp(tag.getAttribute("class"), "sechead")) {
+					u->SecHead = true;
+					buf += "<br /><b><i>";
+				}
+				else if (!strcmp(tag.getAttribute("class"), "title")) {
+					u->SecHead = true;
+					buf += "<br /><b><i>";
+				}
+			}
+		}
+		else if (!strcmp(tag.getName(), "img")) {
+			const char *src = strstr(token, "src");
+			if (!src)		// assert we have a src attribute
+				return false;
+
+			buf += '<';
+			for (const char *c = token; *c; c++) {
+				if (c == src) {
+					for (;((*c) && (*c != '"')); c++)
+						buf += *c;
+
+					if (!*c) { c--; continue; }
+
+					buf += '"';
+					if (*(c+1) == '/') {
+						buf += "file:";
+						buf += userData->module->getConfigEntry("AbsoluteDataPath");
+						if (buf[buf.length()-2] == '/')
+							c++;		// skip '/'
+					}
+					continue;
+				}
+				buf += *c;
+			}
+			buf += '>';
+		}
+		else if (!strcmp(tag.getName(), "scripRef")) { //do nothing with scrip refs, we leave them out
+
+		}
+		else {
+			buf += '<';
+			buf += token;
+			buf += '>';
+
+//			return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlhtmlhref.cpp b/src/modules/filters/thmlhtmlhref.cpp
new file mode 100644
index 0000000..f72a93e
--- /dev/null
+++ b/src/modules/filters/thmlhtmlhref.cpp
@@ -0,0 +1,373 @@
+/***************************************************************************
+ *
+ *  thmlhtmlhref.cpp -	ThML to HTML filter with hrefs  
+ *
+ * $Id: thmlhtmlhref.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlhtmlhref.h>
+#include <swmodule.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+#include <url.h>
+
+
+SWORD_NAMESPACE_START
+ 
+
+ThMLHTMLHREF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	if (module) {
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+		SecHead = false;
+	}	
+}
+
+
+ThMLHTMLHREF::ThMLHTMLHREF() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+	setPassThruNumericEscapeString(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	addAllowedEscapeString("nbsp");
+	addAllowedEscapeString("brvbar"); // "Å "
+	addAllowedEscapeString("sect");   // "§"
+	addAllowedEscapeString("copy");   // "©"
+	addAllowedEscapeString("laquo");  // "«"
+	addAllowedEscapeString("reg");    // "®"
+	addAllowedEscapeString("acute");  // "Ž"
+	addAllowedEscapeString("para");   // "¶"
+	addAllowedEscapeString("raquo");  // "»"
+
+	addAllowedEscapeString("Aacute"); // "�"
+	addAllowedEscapeString("Agrave"); // "À"
+	addAllowedEscapeString("Acirc");  // "Â"
+	addAllowedEscapeString("Auml");   // "Ä"
+	addAllowedEscapeString("Atilde"); // "Ã"
+	addAllowedEscapeString("Aring");  // "Ã…"
+	addAllowedEscapeString("aacute"); // "á"
+	addAllowedEscapeString("agrave"); // "à"
+	addAllowedEscapeString("acirc");  // "â"
+	addAllowedEscapeString("auml");   // "ä"
+	addAllowedEscapeString("atilde"); // "ã"
+	addAllowedEscapeString("aring");  // "Ã¥"
+	addAllowedEscapeString("Eacute"); // "É"
+	addAllowedEscapeString("Egrave"); // "È"
+	addAllowedEscapeString("Ecirc");  // "Ê"
+	addAllowedEscapeString("Euml");   // "Ë"
+	addAllowedEscapeString("eacute"); // "é"
+	addAllowedEscapeString("egrave"); // "è"
+	addAllowedEscapeString("ecirc");  // "ê"
+	addAllowedEscapeString("euml");   // "ë"
+	addAllowedEscapeString("Iacute"); // "�"
+	addAllowedEscapeString("Igrave"); // "Ì"
+	addAllowedEscapeString("Icirc");  // "ÃŽ"
+	addAllowedEscapeString("Iuml");   // "�"
+	addAllowedEscapeString("iacute"); // "í"
+	addAllowedEscapeString("igrave"); // "ì"
+	addAllowedEscapeString("icirc");  // "î"
+	addAllowedEscapeString("iuml");   // "ï"
+	addAllowedEscapeString("Oacute"); // "Ó"
+	addAllowedEscapeString("Ograve"); // "Ã’"
+	addAllowedEscapeString("Ocirc");  // "Ô"
+	addAllowedEscapeString("Ouml");   // "Ö"
+	addAllowedEscapeString("Otilde"); // "Õ"
+	addAllowedEscapeString("oacute"); // "ó"
+	addAllowedEscapeString("ograve"); // "ò"
+	addAllowedEscapeString("ocirc");  // "ô"
+	addAllowedEscapeString("ouml");   // "ö"
+	addAllowedEscapeString("otilde"); // "õ"
+	addAllowedEscapeString("Uacute"); // "Ú"
+	addAllowedEscapeString("Ugrave"); // "Ù"
+	addAllowedEscapeString("Ucirc");  // "Û"
+	addAllowedEscapeString("Uuml");   // "Ü"
+	addAllowedEscapeString("uacute"); // "ú"
+	addAllowedEscapeString("ugrave"); // "ù"
+	addAllowedEscapeString("ucirc");  // "û"
+	addAllowedEscapeString("uuml");   // "ü"
+	addAllowedEscapeString("Yacute"); // "�"
+	addAllowedEscapeString("yacute"); // "ý"
+	addAllowedEscapeString("yuml");   // "ÿ"
+
+	addAllowedEscapeString("deg");    // "°"
+	addAllowedEscapeString("plusmn"); // "±"
+	addAllowedEscapeString("sup2");   // "²"
+	addAllowedEscapeString("sup3");   // "³"
+	addAllowedEscapeString("sup1");   // "¹"
+	addAllowedEscapeString("nbsp");   // "º"
+	addAllowedEscapeString("pound");  // "£"
+	addAllowedEscapeString("cent");   // "¢"
+	addAllowedEscapeString("frac14"); // "Å’"
+	addAllowedEscapeString("frac12"); // "Å“"
+	addAllowedEscapeString("frac34"); // "Ÿ"
+	addAllowedEscapeString("iquest"); // "¿"
+	addAllowedEscapeString("iexcl");  // "¡"
+	addAllowedEscapeString("ETH");    // "�"
+	addAllowedEscapeString("eth");    // "ð"
+	addAllowedEscapeString("THORN");  // "Þ"
+	addAllowedEscapeString("thorn");  // "þ"
+	addAllowedEscapeString("AElig");  // "Æ"
+	addAllowedEscapeString("aelig");  // "æ"
+	addAllowedEscapeString("Oslash"); // "Ø"
+	addAllowedEscapeString("curren"); // "€"
+	addAllowedEscapeString("Ccedil"); // "Ç"
+	addAllowedEscapeString("ccedil"); // "ç"
+	addAllowedEscapeString("szlig");  // "ß"
+	addAllowedEscapeString("Ntilde"); // "Ñ"
+	addAllowedEscapeString("ntilde"); // "ñ"
+	addAllowedEscapeString("yen");    // "Â¥"
+	addAllowedEscapeString("not");    // "¬"
+	addAllowedEscapeString("ordf");   // "ª"
+	addAllowedEscapeString("uml");    // "Å¡"
+	addAllowedEscapeString("shy");    // "­"
+	addAllowedEscapeString("macr");   // "¯"
+
+	addAllowedEscapeString("micro");  // "µ"
+	addAllowedEscapeString("middot"); // "·"
+	addAllowedEscapeString("cedil");  // "ž"
+	addAllowedEscapeString("ordm");   // "º"
+	addAllowedEscapeString("times");  // "×"
+	addAllowedEscapeString("divide"); // "÷"
+	addAllowedEscapeString("oslash"); // "ø"
+
+	setTokenCaseSensitive(true);
+//	addTokenSubstitute("scripture", "<i> ");
+	addTokenSubstitute("/scripture", "</i> ");
+
+	renderNoteNumbers = false;
+}
+
+
+bool ThMLHTMLHREF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
+		MyUserData *u = (MyUserData *)userData;		
+
+		XMLTag tag(token);
+		if ((!tag.isEndTag()) && (!tag.isEmpty()))
+			u->startTag = tag;
+
+		if (tag.getName() && !strcmp(tag.getName(), "sync")) {
+			SWBuf value = tag.getAttribute("value");
+			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //&gt;
+				if(value.length())
+					buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=Greek&value=%s\" class=\"morph\">%s</a>)</em></small>", 
+						URL::encode(value.c_str()).c_str(),
+						value.c_str());
+			}
+			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "lemma")) { //&gt;
+				if(value.length())
+					// empty "type=" is deliberate.
+					buf.appendFormatted("<small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=&value=%s\" class=\"strongs\">%s</a>&gt;</em></small>", 
+						URL::encode(value.c_str()).c_str(),
+						value.c_str());
+			}
+			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) {
+				char ch = *value;
+				value<<1;
+				buf.appendFormatted("<small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">",
+						    ((ch == 'H') ? "Hebrew" : "Greek"),
+						    URL::encode(value.c_str()).c_str());
+				buf += (value.length()) ? value.c_str() : "";
+				buf += "</a>&gt;</em></small>";
+			}
+			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) {
+				buf += (tag.isEndTag() ? "</b>" : "<b>");
+			}
+				
+		}
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					SWBuf type = tag.getAttribute("type");
+					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+					SWBuf noteName = tag.getAttribute("n");
+					VerseKey *vkey = NULL;
+					// see if we have a VerseKey * or descendant
+					SWTRY {
+						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+					}
+					SWCATCH ( ... ) {	}
+					if (vkey) {
+						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", 
+							ch, 
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(), 
+							URL::encode(vkey->getText()).c_str(), 
+							ch,
+							ch, 
+							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+					}
+					else {
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", 
+							ch, 
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(), 
+							URL::encode(u->key->getText()).c_str(),  
+							ch,
+							ch, 
+							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+					}
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = false;
+			}
+		}
+		else if (!strcmp(tag.getName(), "scripture")) {
+			buf += (tag.isEndTag() ? "</i>" : "<i>");
+		}
+		// <scripRef> tag
+		else if (!strcmp(tag.getName(), "scripRef")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {	//	</scripRef>
+				if (!u->BiblicalText) {
+					SWBuf refList = u->startTag.getAttribute("passage");
+					if (!refList.length())
+						refList = u->lastTextNode;
+					SWBuf version = tag.getAttribute("version");
+					
+					buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=%s\">",
+						(refList.length()) ? URL::encode(refList.c_str()).c_str() : "", 
+						(version.length()) ? URL::encode(version.c_str()).c_str() : "");
+					buf += u->lastTextNode.c_str();
+					buf += "</a>";
+				}
+				else {
+					SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
+					SWBuf noteName = tag.getAttribute("n");
+					VerseKey *vkey = NULL;
+					// see if we have a VerseKey * or descendant
+					SWTRY {
+						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+					}
+					SWCATCH ( ... ) {}
+					if (vkey) {
+						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+						//buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str());
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=x&value=%s&module=%s&passage=%s\"><small><sup class=\"x\">*x%s</sup></small></a>",
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(),
+							URL::encode(vkey->getText()).c_str(), 
+							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+					}
+				}
+
+				// let's let text resume to output again
+				u->suspendTextPassThru = false;
+			}
+		}
+		else if (tag.getName() && !strcmp(tag.getName(), "div")) {
+			if (tag.isEndTag() && u->SecHead) {
+				buf += "</i></b><br />";
+				u->SecHead = false;
+			}
+			else if (tag.getAttribute("class")) {
+				if (!stricmp(tag.getAttribute("class"), "sechead")) {
+					u->SecHead = true;
+					buf += "<br /><b><i>";
+				}
+				else if (!stricmp(tag.getAttribute("class"), "title")) {
+					u->SecHead = true;
+					buf += "<br /><b><i>";
+				}
+				else {
+					buf += tag;
+				}
+			}
+			else {
+				buf += tag;
+			}
+		}
+		else if (tag.getName() && (!strcmp(tag.getName(), "img") || !strcmp(tag.getName(), "image"))) {
+			const char *src = strstr(token, "src");
+			if (!src)		// assert we have a src attribute
+				return false;
+
+			const char *c, *d;
+			if (((c = strchr(src+3, '"')) == NULL) ||
+			    ((d = strchr( ++c , '"')) == NULL))	// identify endpoints.
+				return false;			// abandon hope.
+
+			SWBuf imagename = "file:";
+			if (*c == '/')				// as below, inside for loop.
+				imagename += userData->module->getConfigEntry("AbsoluteDataPath");
+			while (c != d)				// move bits into the name.
+			    imagename += *(c++);
+
+			// images become clickable, if the UI supports showImage.
+			buf.appendFormatted("<a href=\"passagestudy.jsp?action=showImage&value=%s&module=%s\"><",
+					    URL::encode(imagename.c_str()).c_str(),
+					    URL::encode(u->version.c_str()).c_str());
+
+			for (c = token; *c; c++) {
+				if ((*c == '/') && (*(c+1) == '\0'))
+					continue;
+				if (c == src) {
+					for (;((*c) && (*c != '"')); c++)
+						buf += *c;
+
+					if (!*c) { c--; continue; }
+
+					buf += '"';
+					if (*(c+1) == '/') {
+						buf += "file:";
+						buf += userData->module->getConfigEntry("AbsoluteDataPath");
+						if (buf[buf.length()-2] == '/')
+							c++;		// skip '/'
+					}
+					continue;
+				}
+				buf += *c;
+			}
+               buf += " border=0 /></a>";
+		}
+		else {
+			buf += '<';
+			/*for (const char *tok = token; *tok; tok++)
+				buf += *tok;*/
+			buf += token;
+			buf += '>';
+			//return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmllemma.cpp b/src/modules/filters/thmllemma.cpp
new file mode 100644
index 0000000..acc324f
--- /dev/null
+++ b/src/modules/filters/thmllemma.cpp
@@ -0,0 +1,88 @@
+/******************************************************************************
+ *
+ *  thmllemma.cpp -	SWFilter descendant to hide or show lemmas
+ *			in a ThML module
+ *
+ * $Id: thmllemma.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmllemma.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Lemmas";
+	static const char oTip[]  = "Toggles Lemmas On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+ThMLLemma::ThMLLemma() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+ThMLLemma::~ThMLLemma() {
+}
+
+
+char ThMLLemma::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (!option) {	// if we don't want lemmas
+		bool intoken = false;
+
+		SWBuf token;
+		SWBuf orig = text;
+		const char *from = orig.c_str();
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (!strncmp(token.c_str(), "sync ", 5) && strstr(token.c_str(), "type=\"lemma\"")) {	// Lemma
+				  continue;
+				}
+
+				// if not a lemma token, keep token in text
+				text += '<';
+				text += token;
+				text += '>';
+				continue;
+			}
+
+			if (intoken) {
+				token += *from;
+			}
+			else	{
+				text += *from;
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlmorph.cpp b/src/modules/filters/thmlmorph.cpp
new file mode 100644
index 0000000..3259acc
--- /dev/null
+++ b/src/modules/filters/thmlmorph.cpp
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
+ *  thmlmorph.cpp -	SWFilter descendant to hide or show morph tags
+ *			in a ThML module
+ *
+ * $Id: thmlmorph.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlmorph.h>
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Morphological Tags";
+	static const char oTip[]  = "Toggles Morphological Tags On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+ThMLMorph::ThMLMorph() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+ThMLMorph::~ThMLMorph() {
+}
+
+
+char ThMLMorph::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (!option) {	// if we don't want morph tags
+		bool intoken = false;
+
+		SWBuf token;
+		SWBuf orig = text;
+		const char *from = orig.c_str();
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (!strncmp(token.c_str(), "sync ", 5) && strstr(token.c_str(), "type=\"morph\"")) {	// Morph
+				  continue;
+				}
+
+				// if not a morph tag token, keep token in text
+				text += '<';
+				text += token;
+				text += '>';
+				continue;
+			}
+
+			if (intoken) {
+				token += *from;
+			}
+			else	{
+				text += *from;
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlosis.cpp b/src/modules/filters/thmlosis.cpp
new file mode 100644
index 0000000..3acd959
--- /dev/null
+++ b/src/modules/filters/thmlosis.cpp
@@ -0,0 +1,591 @@
+/******************************************************************************
+ *
+ *  thmlosis.cpp -	filter to convert ThML to OSIS
+ *
+ * $Id: thmlosis.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.h>
+#include <thmlosis.h>
+#include <swmodule.h>
+#include <swlog.h>
+#include <versekey.h>
+#include <utilstr.h>
+#include <utilxml.h>
+
+
+SWORD_NAMESPACE_START
+
+ThMLOSIS::ThMLOSIS() {
+}
+
+
+ThMLOSIS::~ThMLOSIS() {
+}
+
+
+char ThMLOSIS::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	char token[2048]; // cheese.  Fix.
+	int tokpos = 0;
+	bool intoken = false;
+	bool keepToken = false;
+	bool ampersand = false;
+
+//	static QuoteStack quoteStack;
+	
+	bool lastspace = false;
+	char val[128];
+	SWBuf buf;
+	char *valto;
+	char *ch;
+	
+	const char *wordStart = text.c_str();
+	const char *wordEnd = NULL;
+	
+	const char *textStart = NULL;
+	const char *textEnd = NULL;
+		
+	bool suspendTextPassThru = false;
+	bool handled = false;
+	bool newText = false;
+	bool newWord = false;
+	
+// 	SWBuf tmp;
+	SWBuf divEnd = "";
+
+	SWBuf orig = text;
+	const char* from = orig.c_str();
+
+	text = "";
+	for (from = orig.c_str(); *from; ++from) {
+
+		// handle silly <variant word> items in greek whnu, remove when module is fixed
+		if ((*from == '<') && (*(from+1) < 0)) {
+			text += "&lt;";
+			continue;
+		}
+
+		if (*from == '<') { //start of new token detected
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			ampersand = false;
+			textEnd = from-1;
+			wordEnd = text.c_str() + text.length();//not good, instead of wordEnd = to!
+
+// 			wordEnd = to;
+			continue;
+		}
+
+		if (*from == '&') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			ampersand = true;
+			continue;
+		}
+
+		if (*from == ';' && ampersand) {
+			intoken = false;
+			ampersand = false;
+
+			if (*token == '#') {
+				text += '&';
+				text += token;
+				text += ';';
+			}
+			else if (!strncmp("nbsp", token, 4)) text += ' ';
+			else if (!strncmp("quot", token, 4)) text += '"';
+			else if (!strncmp("amp", token, 3)) text += '&';
+			else if (!strncmp("lt", token, 2)) text += '<';
+			else if (!strncmp("gt", token, 2)) text += '>';
+			else if (!strncmp("brvbar", token, 6)) text += '¦';
+			else if (!strncmp("sect", token, 4)) text += '§';
+			else if (!strncmp("copy", token, 4)) text += '©';
+			else if (!strncmp("laquo", token, 5)) text += '«';
+			else if (!strncmp("reg", token, 3)) text += '®';
+			else if (!strncmp("acute", token, 5)) text += '´';
+			else if (!strncmp("para", token, 4)) text += '¶';
+			else if (!strncmp("raquo", token, 5)) text += '»';
+			else if (!strncmp("Aacute", token, 6)) text += 'Á';
+			else if (!strncmp("Agrave", token, 6)) text += 'À';
+			else if (!strncmp("Acirc", token, 5)) text += 'Â';
+			else if (!strncmp("Auml", token, 4)) text += 'Ä';
+			else if (!strncmp("Atilde", token, 6)) text += 'Ã';
+			else if (!strncmp("Aring", token, 5)) text += 'Å';
+			else if (!strncmp("aacute", token, 6)) text += 'á';
+			else if (!strncmp("agrave", token, 6)) text += 'à';
+			else if (!strncmp("acirc", token, 5)) text += 'â';
+			else if (!strncmp("auml", token, 4)) text += 'ä';
+			else if (!strncmp("atilde", token, 6)) text += 'ã';
+			else if (!strncmp("aring", token, 5)) text += 'å';
+			else if (!strncmp("Eacute", token, 6)) text += 'É';
+			else if (!strncmp("Egrave", token, 6)) text += 'È';
+			else if (!strncmp("Ecirc", token, 5)) text += 'Ê';
+			else if (!strncmp("Euml", token, 4)) text += 'Ë';
+			else if (!strncmp("eacute", token, 6)) text += 'é';
+			else if (!strncmp("egrave", token, 6)) text += 'è';
+			else if (!strncmp("ecirc", token, 5)) text += 'ê';
+			else if (!strncmp("euml", token, 4)) text += 'ë';
+			else if (!strncmp("Iacute", token, 6)) text += 'Í';
+			else if (!strncmp("Igrave", token, 6)) text += 'Ì';
+			else if (!strncmp("Icirc", token, 5)) text += 'Î';
+			else if (!strncmp("Iuml", token, 4)) text += 'Ï';
+			else if (!strncmp("iacute", token, 6)) text += 'í';
+			else if (!strncmp("igrave", token, 6)) text += 'ì';
+			else if (!strncmp("icirc", token, 5)) text += 'î';
+			else if (!strncmp("iuml", token, 4)) text += 'ï';
+			else if (!strncmp("Oacute", token, 6)) text += 'Ó';
+			else if (!strncmp("Ograve", token, 6)) text += 'Ò';
+			else if (!strncmp("Ocirc", token, 5)) text += 'Ô';
+			else if (!strncmp("Ouml", token, 4)) text += 'Ö';
+			else if (!strncmp("Otilde", token, 6)) text += 'Õ';
+			else if (!strncmp("oacute", token, 6)) text += 'ó';
+			else if (!strncmp("ograve", token, 6)) text += 'ò';
+			else if (!strncmp("ocirc", token, 5)) text += 'ô';
+			else if (!strncmp("ouml", token, 4)) text += 'ö';
+			else if (!strncmp("otilde", token, 6)) text += 'õ';
+			else if (!strncmp("Uacute", token, 6)) text += 'Ú';
+			else if (!strncmp("Ugrave", token, 6)) text += 'Ù';
+			else if (!strncmp("Ucirc", token, 5)) text += 'Û';
+			else if (!strncmp("Uuml", token, 4)) text += 'Ü';
+			else if (!strncmp("uacute", token, 6)) text += 'ú';
+			else if (!strncmp("ugrave", token, 6)) text += 'ù';
+			else if (!strncmp("ucirc", token, 5)) text += 'û';
+			else if (!strncmp("uuml", token, 4)) text += 'ü';
+			else if (!strncmp("Yacute", token, 6)) text += 'Ý';
+			else if (!strncmp("yacute", token, 6)) text += 'ý';
+			else if (!strncmp("yuml", token, 4)) text += 'ÿ';
+
+			else if (!strncmp("deg", token, 3)) text += '°';
+			else if (!strncmp("plusmn", token, 6)) text += '±';
+			else if (!strncmp("sup2", token, 4)) text += '²';
+			else if (!strncmp("sup3", token, 4)) text += '³';
+			else if (!strncmp("sup1", token, 4)) text += '¹';
+			else if (!strncmp("nbsp", token, 4)) text += 'º';
+			else if (!strncmp("pound", token, 5)) text += '£';
+			else if (!strncmp("cent", token, 4)) text += '¢';
+			else if (!strncmp("frac14", token, 6)) text += '¼';
+			else if (!strncmp("frac12", token, 6)) text += '½';
+			else if (!strncmp("frac34", token, 6)) text += '¾';
+			else if (!strncmp("iquest", token, 6)) text += '¿';
+			else if (!strncmp("iexcl", token, 5)) text += '¡';
+			else if (!strncmp("ETH", token, 3)) text += 'Ð';
+			else if (!strncmp("eth", token, 3)) text += 'ð';
+			else if (!strncmp("THORN", token, 5)) text += 'Þ';
+			else if (!strncmp("thorn", token, 5)) text += 'þ';
+			else if (!strncmp("AElig", token, 5)) text += 'Æ';
+			else if (!strncmp("aelig", token, 5)) text += 'æ';
+			else if (!strncmp("Oslash", token, 6)) text += 'Ø';
+			else if (!strncmp("curren", token, 6)) text += '¤';
+			else if (!strncmp("Ccedil", token, 6)) text += 'Ç';
+			else if (!strncmp("ccedil", token, 6)) text += 'ç';
+			else if (!strncmp("szlig", token, 5)) text += 'ß';
+			else if (!strncmp("Ntilde", token, 6)) text += 'Ñ';
+			else if (!strncmp("ntilde", token, 6)) text += 'ñ';
+			else if (!strncmp("yen", token, 3)) text += '¥';
+			else if (!strncmp("not", token, 3)) text += '¬';
+			else if (!strncmp("ordf", token, 4)) text += 'ª';
+			else if (!strncmp("uml", token, 3)) text += '¨';
+			else if (!strncmp("shy", token, 3)) text += '­';
+			else if (!strncmp("macr", token, 4)) text += '¯';
+			else if (!strncmp("micro", token, 5)) text += "µ";
+			else if (!strncmp("middot", token, 6)) text +="·";
+			else if (!strncmp("cedil", token, 5)) text += "¸";
+			else if (!strncmp("ordm", token, 4)) text +=  "º";
+			else if (!strncmp("times", token, 5)) text += "×";
+			else if (!strncmp("divide", token, 6)) text +="÷";
+			else if (!strncmp("oslash", token, 6)) text +="ø";
+			continue;
+		}
+
+		// handle silly <variant word> items in greek whnu, remove when module is fixed
+		if ((*from == '>') && (*(from-1) < 0)) {
+			text += "&gt;";
+			continue;
+		}
+
+		if (*from == '>') {	// process tokens
+			intoken = false;
+			keepToken = false;
+			suspendTextPassThru = false;
+			newWord = true;
+			handled = false;
+
+			while (wordStart < (text.c_str() + text.length())) { //hack
+				if (strchr(";,. :?!()'\"", *wordStart) && wordStart[0] && wordStart[1])
+					wordStart++;
+				else break;
+			}
+			while (wordEnd > wordStart) {
+				if (strchr(" ,;:.?!()'\"", *wordEnd))
+					wordEnd--;
+				else break;
+			}
+
+			// variants
+			if (!strncmp(token, "div type=\"variant\"", 18)) {
+				XMLTag tag = token;
+				text.append("<seg type=\"x-variant\"");
+				SWBuf cls = "x-class:";
+				cls += tag.getAttribute("class");
+				if (cls.length()>8)
+					text.appendFormatted(" subType=\"%s\"", cls.c_str());
+
+				text += ">";
+				divEnd = "</seg>";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			// section titles
+			if (!strcmp(token, "div class=\"sechead\"")) {
+// 				pushString(&to, "<title>");
+				text.append("<title>");
+				divEnd = "</title>";
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			else	if (!strcmp(token, "/div")) {
+				//pushString(&to, divEnd.c_str());
+				text.append(divEnd);
+				lastspace = false;
+				handled = true;
+			}
+			// Scripture Reference
+			if (!strncmp(token, "scripRef", 8)) {
+	//			pushString(buf, "<reference osisRef=\"");
+				suspendTextPassThru = true;
+				newText = true;
+				handled = true;
+			}
+			else	if (!strncmp(token, "/scripRef", 9)) {
+				SWBuf tmp;
+				tmp = "";
+				tmp.append(textStart, (int)(textEnd - textStart)+1);
+				//pushString(&to, convertToOSIS(tmp.c_str(), key));
+				text.append(VerseKey::convertToOSIS(tmp.c_str(), key));
+				suspendTextPassThru = false;
+				handled = true;
+			}
+//      Usage of italics to represent transChange isn't domaninant;
+//        solution: mark in OSIS instead, assume no semantics other than emphasis
+//                of italicized text
+//                        if (!strcmp(module->Type(), "Biblical Texts")) {
+//        			// Italics assume transchange for Biblical texts
+//	        		if (!stricmp(token, "i")) {
+//		        		pushString(&to, "<transChange type=\"added\">");
+//			        	newText = true;
+//				        lastspace = false;
+//        				handled = true;
+//	        		}
+//		        	else	if (!stricmp(token, "/i")) {
+//			        	pushString(&to, "</transChange>");
+//        				lastspace = false;
+//	        			handled = true;
+//		        	}
+//                        }
+//                        else {
+//                        	// otherwise, italics are just italics
+//-- end italics for transchange
+	        		if (!stricmp(token, "i")) {
+// 		        		pushString(&to, "<hi type=\"i\">");
+					text.append("<hi type=\"i\">");
+			        	newText = true;
+				     lastspace = false;
+        				handled = true;
+	        		}
+		        	else	if (!stricmp(token, "/i")) {
+// 			        	pushString(&to, "</hi>");
+					text.append("</hi>");
+        				lastspace = false;
+	        			handled = true;
+		        	}
+//                        }
+
+	        	if (!strcmp(token, "b")) {
+// 		        	pushString(&to, "<hi type=\"b\">");
+				text.append("<hi type=\"b\">");
+				newText = true;
+				lastspace = false;
+        			handled = true;
+	        	}
+			else if (!strcmp(token, "/b")) {
+// 			     pushString(&to, "</hi>");
+				text.append("</hi>");
+        			lastspace = false;
+	        		handled = true;
+			}
+
+			// Footnote
+			if (!strncmp(token, "note", 4)) {
+		        	//pushString(&to, "<note>");
+				text.append("<note>");
+				newText = true;
+				lastspace = false;
+				handled = true;
+			}
+			else	if (!strcmp(token, "/note")) {
+				// pushString(&to, "</note>");
+				text.append("</note>");
+				lastspace = false;
+				handled = true;
+			}
+
+			// Figure
+			else	if (!strncmp(token, "img ", 4)) {
+				const char *src = strstr(token, "src");
+				if (!src)		// assert we have a src attribute
+					continue;
+//					return false;
+
+				//pushString(&to, "<figure src=\"");
+				text.append("<figure src=\"");
+
+				const char* end = strchr(src+2, '"'); //start search behind src="
+				
+				if (end) { //append the path
+					text.append(src+2, end - (src+2));
+				}
+								
+// 				const char *c;
+// 				for (c = src;((*c) && (*c != '"')); c++);
+
+// uncomment for SWORD absolute path logic
+//				if (*(c+1) == '/') {
+//					pushString(buf, "file:");
+//					pushString(buf, module->getConfigEntry("AbsoluteDataPath"));
+//					if (*((*buf)-1) == '/')
+//						c++;		// skip '/'
+//				}
+//				end of uncomment for asolute path logic 
+
+// 				for (c++;((*c) && (*c != '"')); c++)
+// 					*to++ = *c;
+
+				//pushString(&to, "\" />");
+				text.append("\" />");
+				handled = true;
+			}
+
+			// Strongs numbers
+			else	if (!strnicmp(token, "sync type=\"Strongs\" ", 20)) {	// Strongs
+				valto = val;
+				for (unsigned int i = 27; token[i] != '\"' && i < 150; i++)
+					*valto++ = token[i];
+				*valto = 0;
+				if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+					// normal strongs number
+					strstrip(val);
+
+					if (!strncmp(wordStart, "<w ", 3)) {
+						const char *attStart = strstr(wordStart, "lemma");
+						if (attStart) { //existing morph attribute, append this one to it
+							attStart += 7;
+							buf = "";
+							buf.appendFormatted("strong:%s ", val);
+						}
+						else { // no lemma attribute
+							attStart = wordStart + 3;
+							buf = "";
+							buf.appendFormatted(buf, "lemma=\"strong:%s\" ", val);
+						}
+
+						text.insert(attStart - text.c_str(), buf);
+					}
+					else { //wordStart doesn't point to an existing <w> attribute!
+						buf = "";
+						buf.appendFormatted("<w lemma=\"strong:%s\">", val);
+						text.insert(wordStart - text.c_str(), buf);
+						text += "</w>";
+						lastspace = false;
+					}
+				}
+				// OLB verb morph, leave it out of OSIS tag
+				else {
+				}
+				handled = true;
+			}
+
+			// Morphology
+			else	if (!strncmp(token, "sync type=\"morph\"", 17)) {
+				SWBuf cls = "";
+				SWBuf morph = "";
+				for (ch = token+17; *ch; ch++) {
+					if (!strncmp(ch, "class=\"", 7)) {
+						valto = val;
+						for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
+							*valto++ = ch[i];
+						*valto = 0;
+						strstrip(val);
+						cls = val;
+					}
+					if (!strncmp(ch, "value=\"", 7)) {
+						valto = val;
+						for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
+							*valto++ = ch[i];
+						*valto = 0;
+						strstrip(val);
+						morph = val;
+					}
+				}
+				if (!strncmp(wordStart, "<w ", 3)) {
+					const char *attStart = strstr(wordStart, "morph");
+					if (attStart) { //existing morph attribute, append this one to it
+						attStart += 7;
+						buf = "";
+						buf.appendFormatted("%s:%s ", ((cls.length())?cls.c_str():"robinson"), morph.c_str());
+					}
+					else { // no lemma attribute
+						attStart = wordStart + 3;
+						buf = "";
+						buf.appendFormatted("morph=\"%s:%s\" ", ((cls.length())?cls.c_str():"robinson"), morph.c_str());
+					}
+					
+					text.insert(attStart - text.c_str(), buf); //hack, we have to
+				}
+				else { //no existing <w> attribute fond
+					buf = "";
+					buf.appendFormatted("<w morph=\"%s:%s\">", ((cls.length())?cls.c_str():"robinson"), morph.c_str());
+					text.insert(wordStart - text.c_str(), buf);
+					text += "</w>";
+					lastspace = false;
+
+				}
+				handled = true;
+			}
+
+			if (!keepToken) {
+				if (!handled) {
+					SWLog::getSystemLog()->logError("Unprocessed Token: <%s> in key %s", token, key ? (const char*)*key : "<unknown>");
+//					exit(-1);
+				}
+				if (from[1] && strchr(" ,;.:?!()'\"", from[1])) {
+					if (lastspace) {
+						text--;
+					}
+				}
+				if (newText) {
+					textStart = from+1; 
+					newText = false; 
+				}
+				continue;
+			}
+			
+			// if not a strongs token, keep token in text
+			text.appendFormatted("<%s>", token);
+			
+			if (newText) {
+				textStart = text.c_str() + text.length(); 
+				newWord = false; 
+			}
+			continue;
+		}
+		if (intoken) {
+			if ((tokpos < 2045) && ((*from != 10)&&(*from != 13))) {
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+			}
+		}
+		else	{
+			switch (*from) {
+			case '\'':
+			case '\"':
+			case '`':
+//				quoteStack.handleQuote(fromStart, from, &to);
+				text += *from;
+				//from++; //this line removes chars after an apostrophe! Needs fixing.
+				break;
+			default:
+				if (newWord && (*from != ' ')) {
+					wordStart = text.c_str() + text.length();
+					newWord = false;
+					
+					//fix this if required?
+					//memset(to, 0, 10); 
+					
+				}
+				
+				if (!suspendTextPassThru) {
+					text += (*from);
+					lastspace = (*from == ' ');
+				}
+			}
+		}
+	}
+
+	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+	if (vkey) {
+		SWBuf ref = "";
+		if (vkey->getVerse()) {
+			ref.appendFormatted("\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
+		}
+			
+		if (ref.length() > 0) {
+			
+			text = ref + text;
+			
+			if (vkey->getVerse()) {
+				VerseKey *tmp = (VerseKey *)vkey->clone();
+				*tmp = *vkey;
+				tmp->setAutoNormalize(false);
+				tmp->setIntros(true);
+
+				text += "</verse>";
+
+				*tmp = MAXVERSE;
+				if (*vkey == *tmp) {
+					tmp->setVerse(0);
+//					sprintf(ref, "\t</div>");
+//					pushString(&to, ref);
+					*tmp = MAXCHAPTER;
+					*tmp = MAXVERSE;
+					if (*vkey == *tmp) {
+						tmp->setChapter(0);
+						tmp->setVerse(0);
+//						sprintf(ref, "\t</div>");
+//						pushString(&to, ref);
+/*
+						if (!quoteStack.empty()) {
+							SWLog::getSystemLog()->logError("popping unclosed quote at end of book");
+							quoteStack.clear();
+						}
+*/
+					}
+				}
+                                delete tmp;
+			}
+//			else if (vkey->getChapter()) {
+//				sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
+//			}
+//			else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
+		}
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlplain.cpp b/src/modules/filters/thmlplain.cpp
new file mode 100644
index 0000000..b9b9839
--- /dev/null
+++ b/src/modules/filters/thmlplain.cpp
@@ -0,0 +1,235 @@
+/******************************************************************************
+ *
+ *  thmlplain.cpp -	SWFilter descendant to strip out all ThML tags or
+ *			convert to ASCII rendered symbols
+ *
+ * $Id: thmlplain.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlplain.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+ThMLPlain::ThMLPlain() {
+}
+
+char ThMLPlain::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	char token[2048];
+	int tokpos = 0;
+	bool intoken = false;
+	bool ampersand = false;
+
+	const char *from;
+	SWBuf orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++)
+	{
+		if (*from == 10 || *from == 13)
+			from++;
+		if (*from == '<') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			ampersand = false;
+			continue;
+		}
+		else if (*from == '&') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			ampersand = true;
+			continue;
+		}
+		if (*from == ';' && ampersand) {
+			intoken = false;
+			ampersand = false;
+
+			if (!strncmp("nbsp", token, 4)) text += ' ';
+			else if (!strncmp("quot", token, 4)) text += '"';
+			else if (!strncmp("amp", token, 3)) text += '&';
+			else if (!strncmp("lt", token, 2)) text += '<';
+			else if (!strncmp("gt", token, 2)) text += '>';
+			else if (!strncmp("brvbar", token, 6)) text += "¦";
+			else if (!strncmp("sect", token, 4)) text += "§";
+			else if (!strncmp("copy", token, 4)) text += "©";
+			else if (!strncmp("laquo", token, 5)) text += "«";
+			else if (!strncmp("reg", token, 3)) text += "®";
+			else if (!strncmp("acute", token, 5)) text += "´";
+			else if (!strncmp("para", token, 4)) text += "¶";
+			else if (!strncmp("raquo", token, 5)) text += "»";
+
+			else if (!strncmp("Aacute", token, 6)) text += "�";
+			else if (!strncmp("Agrave", token, 6)) text += "À";
+			else if (!strncmp("Acirc", token, 5)) text += "Â";
+			else if (!strncmp("Auml", token, 4)) text += "Ä";
+			else if (!strncmp("Atilde", token, 6)) text += "Ã";
+			else if (!strncmp("Aring", token, 5)) text += "Ã…";
+			else if (!strncmp("aacute", token, 6)) text += "á";
+			else if (!strncmp("agrave", token, 6)) text += "à";
+			else if (!strncmp("acirc", token, 5)) text += "â";
+			else if (!strncmp("auml", token, 4)) text += "ä";
+			else if (!strncmp("atilde", token, 6)) text += "ã";
+			else if (!strncmp("aring", token, 5)) text += "Ã¥";
+			else if (!strncmp("Eacute", token, 6)) text += "É";
+			else if (!strncmp("Egrave", token, 6)) text += "È";
+			else if (!strncmp("Ecirc", token, 5)) text += "Ê";
+			else if (!strncmp("Euml", token, 4)) text += "Ë";
+			else if (!strncmp("eacute", token, 6)) text += "é";
+			else if (!strncmp("egrave", token, 6)) text += "è";
+			else if (!strncmp("ecirc", token, 5)) text += "ê";
+			else if (!strncmp("euml", token, 4)) text += "ë";
+			else if (!strncmp("Iacute", token, 6)) text += "�";
+			else if (!strncmp("Igrave", token, 6)) text += "Ì";
+			else if (!strncmp("Icirc", token, 5)) text += "ÃŽ";
+			else if (!strncmp("Iuml", token, 4)) text += "�";
+			else if (!strncmp("iacute", token, 6)) text += "í";
+			else if (!strncmp("igrave", token, 6)) text += "ì";
+			else if (!strncmp("icirc", token, 5)) text += "î";
+			else if (!strncmp("iuml", token, 4)) text += "ï";
+			else if (!strncmp("Oacute", token, 6)) text += "Ó";
+			else if (!strncmp("Ograve", token, 6)) text += "Ã’";
+			else if (!strncmp("Ocirc", token, 5)) text += "Ô";
+			else if (!strncmp("Ouml", token, 4)) text += "Ö";
+			else if (!strncmp("Otilde", token, 6)) text += "Õ";
+			else if (!strncmp("oacute", token, 6)) text += "ó";
+			else if (!strncmp("ograve", token, 6)) text += "ò";
+			else if (!strncmp("ocirc", token, 5)) text += "ô";
+			else if (!strncmp("ouml", token, 4)) text += "ö";
+			else if (!strncmp("otilde", token, 6)) text += "õ";
+			else if (!strncmp("Uacute", token, 6)) text += "Ú";
+			else if (!strncmp("Ugrave", token, 6)) text += "Ù";
+			else if (!strncmp("Ucirc", token, 5)) text += "Û";
+			else if (!strncmp("Uuml", token, 4)) text += "Ü";
+			else if (!strncmp("uacute", token, 6)) text += "ú";
+			else if (!strncmp("ugrave", token, 6)) text += "ù";
+			else if (!strncmp("ucirc", token, 5)) text += "û";
+			else if (!strncmp("uuml", token, 4)) text += "ü";
+			else if (!strncmp("Yacute", token, 6)) text += "�";
+			else if (!strncmp("yacute", token, 6)) text += "ý";
+			else if (!strncmp("yuml", token, 4)) text += "ÿ";
+
+			else if (!strncmp("deg", token, 3)) text += "°";
+			else if (!strncmp("plusmn", token, 6)) text += "±";
+			else if (!strncmp("sup2", token, 4)) text += "²";
+			else if (!strncmp("sup3", token, 4)) text += "³";
+			else if (!strncmp("sup1", token, 4)) text += "¹";
+			else if (!strncmp("nbsp", token, 4)) text += "º";
+			else if (!strncmp("pound", token, 5)) text += "£";
+			else if (!strncmp("cent", token, 4)) text += "¢";
+			else if (!strncmp("frac14", token, 6)) text += "¼";
+			else if (!strncmp("frac12", token, 6)) text += "½";
+			else if (!strncmp("frac34", token, 6)) text += "¾";
+			else if (!strncmp("iquest", token, 6)) text += "¿";
+			else if (!strncmp("iexcl", token, 5)) text += "¡";
+			else if (!strncmp("ETH", token, 3)) text += "�";
+			else if (!strncmp("eth", token, 3)) text += "ð";
+			else if (!strncmp("THORN", token, 5)) text += "Þ";
+			else if (!strncmp("thorn", token, 5)) text += "þ";
+			else if (!strncmp("AElig", token, 5)) text += "Æ";
+			else if (!strncmp("aelig", token, 5)) text += "æ";
+			else if (!strncmp("Oslash", token, 6)) text += "Ø";
+			else if (!strncmp("curren", token, 6)) text += "¤";
+			else if (!strncmp("Ccedil", token, 6)) text += "Ç";
+			else if (!strncmp("ccedil", token, 6)) text += "ç";
+			else if (!strncmp("szlig", token, 5)) text += "ß";
+			else if (!strncmp("Ntilde", token, 6)) text += "Ñ";
+			else if (!strncmp("ntilde", token, 6)) text += "ñ";
+			else if (!strncmp("yen", token, 3)) text += "Â¥";
+			else if (!strncmp("not", token, 3)) text += "¬";
+			else if (!strncmp("ordf", token, 4)) text += "ª";
+			else if (!strncmp("uml", token, 3)) text += "¨";
+			else if (!strncmp("shy", token, 3)) text += "­";
+			else if (!strncmp("macr", token, 4)) text += "¯";
+			else if (!strncmp("micro", token, 5)) text += "µ";
+			else if (!strncmp("middot", token, 6)) text += "·";
+			else if (!strncmp("cedil", token, 5)) text += "¸";
+			else if (!strncmp("ordm", token, 4)) text += "º";
+			else if (!strncmp("times", token, 5)) text += "×";
+			else if (!strncmp("divide", token, 6)) text += "÷";
+			else if (!strncmp("oslash", token, 6)) text += "ø";
+			continue;
+
+		}
+		else if (*from == '>' && !ampersand) {
+			intoken = false;
+			// process desired tokens
+			if (!strncmp(token, "sync type=\"Strongs\" value=\"", 27)) {
+				text += ' ';
+				text += '<';
+				for (unsigned int i = 27; token[i] != '\"'; i++)
+					text += token[i];
+				text += '>';
+				continue;
+			}
+			if (!strncmp(token, "sync type=\"morph\" value=\"", 25)) {
+				text += ' ';
+				text += '(';
+				for (unsigned int i = 25; token[i] != '\"'; i++)
+					text += token[i];
+				text += ')';
+				continue;
+			}
+			if (!strncmp("note", token, 4)) {
+				text += ' ';
+				text += '[';
+			}
+			else if (!strncmp("br", token, 2))
+				text += '\n';
+			else if (!strncmp("/p", token, 2))
+				text += '\n';
+			else if (!strncmp("/note", token, 5)) {
+				text += ']';
+				text += ' ';
+			}
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else	text += *from;
+	}
+
+	orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {  //loop to remove extra spaces
+                if ((strchr(" \t\n\r", *from))) {
+                        while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
+                                from++;
+                        }
+                        text += " ";
+                }
+                else {
+                        text += *from;
+                }
+        }
+        text += (char)0;
+
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlrtf.cpp b/src/modules/filters/thmlrtf.cpp
new file mode 100644
index 0000000..dc50ae9
--- /dev/null
+++ b/src/modules/filters/thmlrtf.cpp
@@ -0,0 +1,352 @@
+/***************************************************************************
+ *
+ *  thmlrtf.cpp -	ThML to RTF filter
+ *
+ * $Id: thmlrtf.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlrtf.h>
+#include <swmodule.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+
+SWORD_NAMESPACE_START
+
+ThMLRTF::ThMLRTF() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+
+     addEscapeStringSubstitute("nbsp", "\302\240");
+	addEscapeStringSubstitute("apos", "'");
+	addEscapeStringSubstitute("quot", "\"");
+	addEscapeStringSubstitute("amp", "&");
+	addEscapeStringSubstitute("lt", "<");
+	addEscapeStringSubstitute("gt", ">");
+	addEscapeStringSubstitute("brvbar", "¦");
+	addEscapeStringSubstitute("sect", "§");
+	addEscapeStringSubstitute("copy", "©");
+	addEscapeStringSubstitute("laquo", "«");
+	addEscapeStringSubstitute("reg", "®");
+	addEscapeStringSubstitute("acute", "´");
+	addEscapeStringSubstitute("para", "¶");
+	addEscapeStringSubstitute("raquo", "»");
+
+	addEscapeStringSubstitute("Aacute", "Á");
+	addEscapeStringSubstitute("Agrave", "À");
+	addEscapeStringSubstitute("Acirc", "Â");
+	addEscapeStringSubstitute("Auml", "Ä");
+	addEscapeStringSubstitute("Atilde", "Ã");
+	addEscapeStringSubstitute("Aring", "Å");
+	addEscapeStringSubstitute("aacute", "á");
+	addEscapeStringSubstitute("agrave", "à");
+	addEscapeStringSubstitute("acirc", "â");
+	addEscapeStringSubstitute("auml", "ä");
+	addEscapeStringSubstitute("atilde", "ã");
+	addEscapeStringSubstitute("aring", "å");
+	addEscapeStringSubstitute("Eacute", "É");
+	addEscapeStringSubstitute("Egrave", "È");
+	addEscapeStringSubstitute("Ecirc", "Ê");
+	addEscapeStringSubstitute("Euml", "Ë");
+	addEscapeStringSubstitute("eacute", "é");
+	addEscapeStringSubstitute("egrave", "è");
+	addEscapeStringSubstitute("ecirc", "ê");
+	addEscapeStringSubstitute("euml", "ë");
+	addEscapeStringSubstitute("Iacute", "Í");
+	addEscapeStringSubstitute("Igrave", "Ì");
+	addEscapeStringSubstitute("Icirc", "Î");
+	addEscapeStringSubstitute("Iuml", "Ï");
+	addEscapeStringSubstitute("iacute", "í");
+	addEscapeStringSubstitute("igrave", "ì");
+	addEscapeStringSubstitute("icirc", "î");
+	addEscapeStringSubstitute("iuml", "ï");
+	addEscapeStringSubstitute("Oacute", "Ó");
+	addEscapeStringSubstitute("Ograve", "Ò");
+	addEscapeStringSubstitute("Ocirc", "Ô");
+	addEscapeStringSubstitute("Ouml", "Ö");
+	addEscapeStringSubstitute("Otilde", "Õ");
+	addEscapeStringSubstitute("oacute", "ó");
+	addEscapeStringSubstitute("ograve", "ò");
+	addEscapeStringSubstitute("ocirc", "ô");
+	addEscapeStringSubstitute("ouml", "ö");
+	addEscapeStringSubstitute("otilde", "õ");
+	addEscapeStringSubstitute("Uacute", "Ú");
+	addEscapeStringSubstitute("Ugrave", "Ù");
+	addEscapeStringSubstitute("Ucirc", "Û");
+	addEscapeStringSubstitute("Uuml", "Ü");
+	addEscapeStringSubstitute("uacute", "ú");
+	addEscapeStringSubstitute("ugrave", "ù");
+	addEscapeStringSubstitute("ucirc", "û");
+	addEscapeStringSubstitute("uuml", "ü");
+	addEscapeStringSubstitute("Yacute", "Ý");
+	addEscapeStringSubstitute("yacute", "ý");
+	addEscapeStringSubstitute("yuml", "ÿ");
+
+	addEscapeStringSubstitute("deg", "°");
+	addEscapeStringSubstitute("plusmn", "±");
+	addEscapeStringSubstitute("sup2", "²");
+	addEscapeStringSubstitute("sup3", "³");
+	addEscapeStringSubstitute("sup1", "¹");
+	addEscapeStringSubstitute("nbsp", "º");
+	addEscapeStringSubstitute("pound", "£");
+	addEscapeStringSubstitute("cent", "¢");
+	addEscapeStringSubstitute("frac14", "¼");
+	addEscapeStringSubstitute("frac12", "½");
+	addEscapeStringSubstitute("frac34", "¾");
+	addEscapeStringSubstitute("iquest", "¿");
+	addEscapeStringSubstitute("iexcl", "¡");
+	addEscapeStringSubstitute("ETH", "Ð");
+	addEscapeStringSubstitute("eth", "ð");
+	addEscapeStringSubstitute("THORN", "Þ");
+	addEscapeStringSubstitute("thorn", "þ");
+	addEscapeStringSubstitute("AElig", "Æ");
+	addEscapeStringSubstitute("aelig", "æ");
+	addEscapeStringSubstitute("Oslash", "Ø");
+	addEscapeStringSubstitute("curren", "¤");
+	addEscapeStringSubstitute("Ccedil", "Ç");
+	addEscapeStringSubstitute("ccedil", "ç");
+	addEscapeStringSubstitute("szlig", "ß");
+	addEscapeStringSubstitute("Ntilde", "Ñ");
+	addEscapeStringSubstitute("ntilde", "ñ");
+	addEscapeStringSubstitute("yen", "¥");
+	addEscapeStringSubstitute("not", "¬");
+	addEscapeStringSubstitute("ordf", "ª");
+	addEscapeStringSubstitute("uml", "¨");
+	addEscapeStringSubstitute("shy", "­");
+	addEscapeStringSubstitute("macr", "¯");
+
+	addEscapeStringSubstitute("micro",  "µ");
+	addEscapeStringSubstitute("middot", "·");
+	addEscapeStringSubstitute("cedil",  "¸");
+	addEscapeStringSubstitute("ordm",   "º");
+	addEscapeStringSubstitute("times",  "×");
+	addEscapeStringSubstitute("divide", "÷");
+	addEscapeStringSubstitute("oslash", "ø");
+
+	setTokenCaseSensitive(true);
+
+
+	addTokenSubstitute("br", "\\line ");
+	addTokenSubstitute("br /", "\\line ");
+	addTokenSubstitute("i", "{\\i1 ");
+	addTokenSubstitute("/i", "}");
+	addTokenSubstitute("b", "{\\b1 ");
+	addTokenSubstitute("/b", "}");
+	addTokenSubstitute("p", "{\\fi200\\par}");
+	addTokenSubstitute("p /", "\\pard\\par\\par ");
+
+	//we need uppercase forms for the moment to support a few early ThML modules that aren't XHTML compliant
+	addTokenSubstitute("BR", "\\line ");
+	addTokenSubstitute("I", "{\\i1 ");
+	addTokenSubstitute("/I", "}");
+	addTokenSubstitute("B", "{\\b1 ");
+	addTokenSubstitute("/B", "}");
+	addTokenSubstitute("P", "\\par ");
+	addTokenSubstitute("scripture", "{\\i1 ");
+	addTokenSubstitute("/scripture", "}");
+     addTokenSubstitute("center", "\\qc ");
+     addTokenSubstitute("/center", "\\pard ");
+}
+
+
+char ThMLRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+
+	// preprocess text buffer to escape RTF control codes
+	const char *from;
+	SWBuf orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {  //loop to remove extra spaces
+		switch (*from) {
+		case '{':
+		case '}':
+		case '\\':
+			text += "\\";
+			text += *from;
+			break;
+		default:
+			text += *from;
+		}
+	}
+	text += (char)0;
+
+	SWBasicFilter::processText(text, key, module);  //handle tokens as usual
+
+	orig = text;
+	from = orig.c_str();
+	for (text = ""; *from; from++) {  //loop to remove extra spaces
+		if ((strchr(" \t\n\r", *from))) {
+			while (*(from+1) && (strchr(" \t\n\r", *(from+1)))) {
+				from++;
+			}
+			text += " ";
+		}
+		else {
+			text += *from;
+		}
+	}
+	text += (char)0;	// probably not needed, but don't want to remove without investigating (same as above)
+	return 0;
+}
+
+
+ThMLRTF::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	this->SecHead = false;
+	XMLTag startTag = "";
+	if (module) {
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+	}	
+}
+
+
+bool ThMLRTF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
+		MyUserData *u = (MyUserData *)userData;		
+		XMLTag tag(token);
+		if ((!tag.isEndTag()) && (!tag.isEmpty()))
+			u->startTag = tag;
+		if (tag.getName() && !strcmp(tag.getName(), "sync")) {
+			SWBuf value = tag.getAttribute("value");
+			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //&gt;
+				buf.appendFormatted(" {\\cf4 \\sub (%s)}", value.c_str());
+			}
+			else if( tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) {
+				if (value[0] == 'H' || value[0] == 'G' || value[0] == 'A') {
+					value<<1;
+					buf.appendFormatted(" {\\cf3 \\sub <%s>}", value.c_str());
+				}
+				else if (value[0] == 'T') {
+					value<<1;
+					buf.appendFormatted(" {\\cf4 \\sub (%s)}", value.c_str());
+				}
+			}
+			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) {
+				if (!tag.isEndTag())
+					buf += "{\\b ";
+				else	buf += "}";
+			}
+		}
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					SWBuf type = tag.getAttribute("type");
+					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+					VerseKey *vkey = NULL;
+					// see if we have a VerseKey * or descendant
+					SWTRY {
+						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+					}
+					SWCATCH ( ... ) {	}
+					if (vkey) {
+						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+						buf.appendFormatted("{\\super <a href=\"\">*%c%i.%s</a>} ", ch, vkey->getVerse(), footnoteNumber.c_str());
+					}
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = false;
+			}
+		}
+
+
+		else if (!strcmp(tag.getName(), "scripRef")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {	//	</scripRef>
+				if (!u->BiblicalText) {
+					SWBuf refList = u->startTag.getAttribute("passage");
+					if (!refList.length())
+						refList = u->lastTextNode;
+					SWBuf version = tag.getAttribute("version");
+					buf += "<a href=\"\">";
+					buf += refList.c_str();
+//					buf += u->lastTextNode.c_str();
+					buf += "</a>";
+				}
+				else {
+					SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
+					VerseKey *vkey = NULL;
+					// see if we have a VerseKey * or descendant
+					SWTRY {
+						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+					}
+					SWCATCH ( ... ) {}
+					if (vkey) {
+						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+						buf.appendFormatted("{\\super <a href=\"\">*x%i.%s</a>} ", vkey->getVerse(), footnoteNumber.c_str());
+					}
+				}
+
+				// let's let text resume to output again
+				u->suspendTextPassThru = false;
+			}
+		}
+
+		else if (tag.getName() && !strcmp(tag.getName(), "div")) {
+			if (tag.isEndTag() && u->SecHead) {
+				buf += "\\par}";
+				u->SecHead = false;
+			}
+			else if (tag.getAttribute("class")) {
+				if (!stricmp(tag.getAttribute("class"), "sechead")) {
+					u->SecHead = true;
+					buf += "{\\par\\i1\\b1 ";
+				}
+				else if (!stricmp(tag.getAttribute("class"), "title")) {
+					u->SecHead = true;
+					buf += "{\\par\\i1\\b1 ";
+				}
+			}
+		}
+		else if (tag.getName() && (!strcmp(tag.getName(), "img") || !strcmp(tag.getName(), "image"))) {
+			const char *src = tag.getAttribute("src");
+			if (!src)		// assert we have a src attribute
+				return false;
+
+			char* filepath = new char[strlen(u->module->getConfigEntry("AbsoluteDataPath")) + strlen(token)];
+			*filepath = 0;
+			strcpy(filepath, userData->module->getConfigEntry("AbsoluteDataPath"));
+			strcat(filepath, src);
+
+// we do this because BibleCS looks for this EXACT format for an image tag
+			buf+="<img src=\"";
+			buf+=filepath;
+			buf+="\" />";
+			delete [] filepath;
+		}
+		else {
+			return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlscripref.cpp b/src/modules/filters/thmlscripref.cpp
new file mode 100644
index 0000000..1ea4a40
--- /dev/null
+++ b/src/modules/filters/thmlscripref.cpp
@@ -0,0 +1,153 @@
+/******************************************************************************
+ *
+ *  thmlscripref.cpp -	SWFilter descendant to hide or show scripture
+ *			referebces in a ThML module
+ *
+ * $Id: thmlscripref.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <thmlscripref.h>
+#include <utilxml.h>
+#include <versekey.h>
+#include <swmodule.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Cross-references";
+	static const char oTip[]  = "Toggles Scripture Cross-references On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"On", "Off", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+ThMLScripref::ThMLScripref() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+ThMLScripref::~ThMLScripref() {
+}
+
+
+char ThMLScripref::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	SWBuf token;
+	bool intoken    = false;
+	bool hide       = false;
+	SWBuf tagText;
+	XMLTag startTag;
+	SWBuf refs = "";
+	int footnoteNum = 1;
+	char buf[254];
+	SWKey *p = (module) ? module->createKey() : (key) ? key->clone() : new VerseKey();
+        VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
+        if (!parser) {
+        	delete p;
+                parser = new VerseKey();
+        }
+	*parser = key->getText();
+
+	SWBuf orig = text;
+	const char *from = orig.c_str();
+
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			token = "";
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+
+			XMLTag tag(token);
+			if (!strcmp(tag.getName(), "scripRef")) {
+				if (!tag.isEndTag()) {
+					if (!tag.isEmpty()) {
+						refs = "";
+						startTag = tag;
+						hide = true;
+						tagText = "";
+						continue;
+					}
+				}
+				if (hide && tag.isEndTag()) {
+					if (module->isProcessEntryAttributes()) {
+						SWBuf fc = module->getEntryAttributes()["Footnote"]["count"]["value"];
+						footnoteNum = (fc.length()) ? atoi(fc.c_str()) : 0;
+						sprintf(buf, "%i", ++footnoteNum);
+						module->getEntryAttributes()["Footnote"]["count"]["value"] = buf;
+						StringList attributes = startTag.getAttributeNames();
+						for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
+							module->getEntryAttributes()["Footnote"][buf][it->c_str()] = startTag.getAttribute(it->c_str());
+						}
+						module->getEntryAttributes()["Footnote"][buf]["body"] = tagText;
+						startTag.setAttribute("swordFootnote", buf);
+						SWBuf passage = startTag.getAttribute("passage");
+						if (passage.length())
+							refs = parser->parseVerseList(passage.c_str(), *parser, true).getRangeText();
+						else	refs = parser->parseVerseList(tagText.c_str(), *parser, true).getRangeText();
+						module->getEntryAttributes()["Footnote"][buf]["refList"] = refs.c_str();
+					}
+					hide = false;
+					if (option) {	// we want the tag in the text
+						text += startTag;
+						text.append(tagText);
+					}
+					else	continue;
+				}
+			}
+
+			// if not a scripRef token, keep token in text
+			if ((!strcmp(tag.getName(), "scripRef")) && (!tag.isEndTag())) {
+				SWBuf osisRef = tag.getAttribute("passage");
+				if (refs.length())
+					refs += "; ";
+				refs += osisRef;
+			}
+			if (!hide) {
+				text += '<';
+				text.append(token);
+				text += '>';
+			}
+			else {
+				tagText += '<';
+				tagText.append(token);
+				tagText += '>';
+			}
+			continue;
+		}
+		if (intoken) { //copy token
+			token += *from;
+		}
+		else if (!hide) { //copy text which is not inside a token
+			text += *from;
+		}
+		else tagText += *from;
+	}
+        delete parser;
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlstrongs.cpp b/src/modules/filters/thmlstrongs.cpp
new file mode 100644
index 0000000..09658a9
--- /dev/null
+++ b/src/modules/filters/thmlstrongs.cpp
@@ -0,0 +1,169 @@
+/******************************************************************************
+ *
+ *  thmlstrongs.cpp -	SWFilter descendant to hide or show Strong's number
+ *			in a ThML module
+ *
+ * $Id: thmlstrongs.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <thmlstrongs.h>
+#include <swmodule.h>
+#include <utilstr.h>
+#include <ctype.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Strong's Numbers";
+	static const char oTip[]  = "Toggles Strong's Numbers On and Off if they exist";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+ThMLStrongs::ThMLStrongs() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+ThMLStrongs::~ThMLStrongs() {
+}
+
+
+char ThMLStrongs::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	char token[2048]; // cheese.  Fix.
+	const char *from;
+	int tokpos = 0;
+	bool intoken = false;
+	bool lastspace = false;
+	int word = 1;
+	char val[128];
+	char wordstr[5];
+	char *valto;
+	char *ch;
+	unsigned int textStart = 0, textEnd = 0;
+	SWBuf tmp;
+	bool newText = false;
+
+	SWBuf orig = text;
+	from = orig.c_str();
+
+	for (text = ""; *from; from++) {
+		if (*from == '<') {
+			intoken = true;
+			tokpos = 0;
+			token[0] = 0;
+			token[1] = 0;
+			token[2] = 0;
+			textEnd = text.length();
+			continue;
+		}
+		if (*from == '>') {	// process tokens
+			intoken = false;
+			if (!strnicmp(token, "sync type=\"Strongs\" ", 20)) {	// Strongs
+				if (module->isProcessEntryAttributes()) {
+					valto = val;
+					for (unsigned int i = 27; token[i] != '\"' && i < 150; i++)
+						*valto++ = token[i];
+					*valto = 0;
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						// normal strongs number
+						sprintf(wordstr, "%03d", word);
+						module->getEntryAttributes()["Word"][wordstr]["PartCount"] = "1";
+						module->getEntryAttributes()["Word"][wordstr]["Lemma"] = val;
+						module->getEntryAttributes()["Word"][wordstr]["LemmaClass"] = "strong";
+						tmp = "";
+						tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
+						module->getEntryAttributes()["Word"][wordstr]["Text"] = tmp;
+						newText = true;
+					}
+					else {
+/*
+						// verb morph
+						sprintf(wordstr, "%03d", word);
+						module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+						module->getEntryAttributes()["Word"][wordstr]["MorphClass"] = "OLBMorph";
+*/
+						word--;	// for now, completely ignore this word attribute.
+					}
+					word++;
+				}
+
+				if (!option) {	// if we don't want strongs
+					if ((from[1] == ' ') || (from[1] == ',') || (from[1] == ';') || (from[1] == '.') || (from[1] == '?') || (from[1] == '!') || (from[1] == ')') || (from[1] == '\'') || (from[1] == '\"')) {
+						if (lastspace)
+							text--;
+					}
+					if (newText) {textStart = text.length(); newText = false; }
+					continue;
+				}
+			}
+			if (module->isProcessEntryAttributes()) {
+				if (!strncmp(token, "sync type=\"morph\"", 17)) {
+					for (ch = token+17; *ch; ch++) {
+						if (!strncmp(ch, "class=\"", 7)) {
+							valto = val;
+							for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
+								*valto++ = ch[i];
+							*valto = 0;
+							sprintf(wordstr, "%03d", word-1);
+							if ((!stricmp(val, "Robinsons")) || (!stricmp(val, "Robinson"))) {
+								strcpy(val, "robinson");
+							}
+							module->getEntryAttributes()["Word"][wordstr]["MorphClass"] = val;
+						}
+						if (!strncmp(ch, "value=\"", 7)) {
+							valto = val;
+							for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
+								*valto++ = ch[i];
+							*valto = 0;
+							sprintf(wordstr, "%03d", word-1);
+							module->getEntryAttributes()["Word"][wordstr]["Morph"] = val;
+						}
+					}
+					newText = true;
+				}
+			}
+			// if not a strongs token, keep token in text
+			text += '<';
+			text += token;
+			text += '>';
+			if (newText) {textStart = text.length(); newText = false; }
+			continue;
+		}
+		if (intoken) {
+			if (tokpos < 2045)
+				token[tokpos++] = *from;
+				token[tokpos+2] = 0;
+		}
+		else	{
+			text += *from;
+			lastspace = (*from == ' ');
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlvariants.cpp b/src/modules/filters/thmlvariants.cpp
new file mode 100644
index 0000000..1a57971
--- /dev/null
+++ b/src/modules/filters/thmlvariants.cpp
@@ -0,0 +1,120 @@
+/******************************************************************************
+ *
+ *  thmlvariants.cpp -	SWFilter descendant to hide or show textual variants
+ *			in a ThML module
+ *
+ * $Id: thmlvariants.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlvariants.h>
+#include <utilstr.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Textual Variants";
+	static const char oTip[]  = "Switch between Textual Variants modes";
+	static const char *choices[4] = { "Primary Reading", "Secondary Reading", "All Readings", "" };
+
+	static const StringList *oValues() {
+		static const StringList oVals(&choices[0], &choices[3]);
+		return &oVals;
+	}
+}
+
+
+ThMLVariants::ThMLVariants() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+ThMLVariants::~ThMLVariants() {
+}
+
+
+char ThMLVariants::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+
+	int option = 0;
+	if      (optionValue == choices[0]) option = 0;
+	else if (optionValue == choices[1]) option = 1;
+	else                                option = 2;
+
+	if (option == 0 || option == 1) { //we want primary or variant only
+		bool intoken = false;
+		bool hide = false;
+		bool invar = false;
+		
+		SWBuf token;
+		SWBuf orig = text;
+		const char *from = orig.c_str();
+
+		//we use a fixed comparision string to make sure the loop is as fast as the original two blocks with almost the same code
+		const char* variantCompareString = (option == 0) ? "div type=\"variant\" class=\"1\"" : "div type=\"variant\" class=\"2\"";
+		
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				token = "";
+				continue;
+			}
+			else if (*from == '>') {	// process tokens
+				intoken = false;
+				
+				if ( !strncmp(token.c_str(), variantCompareString, 28)) { //only one of the variants, length of the two strings is 28 in both cases 
+					invar = true;
+					hide = true;
+					continue;
+				}
+				if (!strncmp(token.c_str(), "div type=\"variant\"", 18)) {
+					invar = true;
+					continue;
+				}
+				if (!strncmp(token.c_str(), "/div", 4)) {
+					hide = false;
+					if (invar) {
+						invar = false;
+						continue;
+					}
+				}
+				if (!hide) {
+					text += '<';
+					text.append(token);
+					text += '>';
+				}
+
+				continue;
+			}
+			if (intoken) {
+				token += *from;
+			}
+			else if (!hide) {
+				text += *from;
+			}
+		}
+
+	}
+
+	return 0;
+}
+
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlwebif.cpp b/src/modules/filters/thmlwebif.cpp
new file mode 100644
index 0000000..29d9ef5
--- /dev/null
+++ b/src/modules/filters/thmlwebif.cpp
@@ -0,0 +1,110 @@
+/***************************************************************************
+ *
+ *  thmlwebif.cpp -	ThML to HTML filter with hrefs
+ *
+ * $Id: thmlwebif.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlwebif.h>
+#include <swmodule.h>
+#include <url.h>
+#include <utilxml.h>
+#include <ctype.h>
+
+SWORD_NAMESPACE_START
+
+
+ThMLWEBIF::ThMLWEBIF() : baseURL(""), passageStudyURL(baseURL + "passagestudy.jsp") {
+}
+
+
+bool ThMLWEBIF::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+
+	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
+		MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+		SWBuf url;
+		if (!strcmp(tag.getName(), "sync")) {
+			const char* value = tag.getAttribute("value");
+			url = value;
+			if ((url.length() > 1) && strchr("GH", url[0])) {
+				if (isdigit(url[1]))
+					url = url.c_str()+1;
+			}
+
+			if(tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")){
+				buf += "<small><em> (";
+				buf.appendFormatted("<a href=\"%s?showMorph=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str() );
+			}
+			else {
+				if (value) {
+					value++; //skip leading G, H or T
+					//url = value;
+				}
+
+				buf += "<small><em> &lt;";
+				buf.appendFormatted("<a href=\"%s?showStrong=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str() );
+			}
+
+			buf += value;
+			buf += "</a>";
+
+			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) {
+				buf += ") </em></small>";
+			}
+			else {
+				buf += "&gt; </em></small>";
+			}
+		}
+		else if (!strcmp(tag.getName(), "scripRef")) {
+			if (tag.isEndTag()) {
+				if (u->inscriptRef) { // like  "<scripRef passage="John 3:16">John 3:16</scripRef>"
+					u->inscriptRef = false;
+					buf += "</a>";
+				}
+				else { // end of scripRef like "<scripRef>John 3:16</scripRef>"
+					url = u->lastTextNode;
+					buf.appendFormatted("<a href=\"%s?key=%s#cv\">", passageStudyURL.c_str(), URL::encode(url).c_str());
+					buf += u->lastTextNode.c_str();
+					buf += "</a>";
+
+					// let's let text resume to output again
+					u->suspendTextPassThru = false;
+				}
+			}
+			else if (tag.getAttribute("passage")) { //passage given
+				u->inscriptRef = true;
+
+				buf.appendFormatted("<a href=\"%s?key=%s#cv\">", passageStudyURL.c_str(), URL::encode(tag.getAttribute("passage")).c_str());
+			}
+			else { //no passage given
+				u->inscriptRef = false;
+				// let's stop text from going to output
+				u->suspendTextPassThru = true;
+			}
+		}
+		else {
+			return ThMLXHTML::handleToken(buf, token, userData);
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlwordjs.cpp b/src/modules/filters/thmlwordjs.cpp
new file mode 100644
index 0000000..7d80a00
--- /dev/null
+++ b/src/modules/filters/thmlwordjs.cpp
@@ -0,0 +1,316 @@
+/******************************************************************************
+ *
+ *  thmlwordjs.cpp -	SWFilter descendant to ???
+ *
+ * $Id: thmlwordjs.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <thmlwordjs.h>
+#include <swmodule.h>
+#include <ctype.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Word Javascript";
+	static const char oTip[]  = "Toggles Word Javascript data";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+ThMLWordJS::ThMLWordJS() : SWOptionFilter(oName, oTip, oValues()) {
+
+     defaultGreekLex   = 0;
+     defaultHebLex     = 0;
+     defaultGreekParse = 0;
+     defaultHebParse   = 0;
+     mgr               = 0;
+}
+
+
+ThMLWordJS::~ThMLWordJS() {
+}
+
+
+char ThMLWordJS::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (option) {
+		char token[2112]; // cheese.  Fix.
+		int tokpos = 0;
+		bool intoken = false;
+		int word = 1;
+		char val[128];
+		char *valto;
+		char *ch;
+		char wordstr[5];
+		unsigned int textStart = 0, lastAppendLen = 0, textEnd = 0;
+		SWBuf tmp;
+		bool newText = false;
+		bool needWordOut = false;
+		AttributeValue *wordAttrs = 0;
+		SWBuf modName = (module)?module->getName():"";
+		SWBuf wordSrcPrefix = modName;
+		
+		const SWBuf orig = text;
+		const char * from = orig.c_str();
+		VerseKey *vkey = 0;
+		if (key) {
+			vkey = SWDYNAMIC_CAST(VerseKey, key);
+		}
+
+		for (text = ""; *from; from++) {
+			if (*from == '<') {
+				intoken = true;
+				tokpos = 0;
+				token[0] = 0;
+				token[1] = 0;
+				token[2] = 0;
+				textEnd = text.length();
+				continue;
+			}
+			if (*from == '>') {	// process tokens
+				intoken = false;
+				if (!strnicmp(token, "sync type=\"Strongs\" ", 20)) {	// Strongs
+					valto = val;
+					for (unsigned int i = 27; token[i] != '\"' && i < 150; i++)
+						*valto++ = token[i];
+					*valto = 0;
+					if (atoi((!isdigit(*val))?val+1:val) < 5627) {
+						// normal strongs number
+						sprintf(wordstr, "%03d", word++);
+						needWordOut = (word > 2);
+						wordAttrs = &(module->getEntryAttributes()["Word"][wordstr]);
+						(*wordAttrs)["Strongs"] = val;
+	//printf("Adding: [\"Word\"][%s][\"Strongs\"] = %s\n", wordstr, val);
+						tmp = "";
+						tmp.append(text.c_str()+textStart, (int)(textEnd - textStart));
+						(*wordAttrs)["Text"] = tmp;
+						text.append("</span>");
+						SWBuf ts;
+						ts.appendFormatted("%d", textStart);
+						(*wordAttrs)["TextStart"] = ts;
+	//printf("Adding: [\"Word\"][%s][\"Text\"] = %s\n", wordstr, tmp.c_str());
+						newText = true;
+					}
+					else {
+						// verb morph
+						(*wordAttrs)["Morph"] = val;
+	//printf("Adding: [\"Word\"][%s][\"Morph\"] = %s\n", wordstr, val);
+					}
+
+				}
+				if (!strncmp(token, "sync type=\"morph\"", 17)) {
+					for (ch = token+17; *ch; ch++) {
+						if (!strncmp(ch, "class=\"", 7)) {
+							valto = val;
+							for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
+								*valto++ = ch[i];
+							*valto = 0;
+							(*wordAttrs)["MorphClass"] = val;
+	//printf("Adding: [\"Word\"][%s][\"MorphClass\"] = %s\n", wordstr, val);
+						}
+						if (!strncmp(ch, "value=\"", 7)) {
+							valto = val;
+							for (unsigned int i = 7; ch[i] != '\"' && i < 127; i++)
+								*valto++ = ch[i];
+							*valto = 0;
+							(*wordAttrs)["Morph"] = val;
+	//printf("Adding: [\"Word\"][%s][\"Morph\"] = %s\n", wordstr, val);
+						}
+					}
+					newText = true;
+				}
+				// if not a strongs token, keep token in text
+				text += '<';
+				text += token;
+				text += '>';
+				if (needWordOut) {
+					char wstr[10];
+					sprintf(wstr, "%03d", word-2);
+					AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
+					needWordOut = false;
+					SWBuf strong = (*wAttrs)["Strongs"];
+					SWBuf morph = (*wAttrs)["Morph"];
+					SWBuf morphClass = (*wAttrs)["MorphClass"];
+					SWBuf wordText = (*wAttrs)["Text"];
+					SWBuf textSt = (*wAttrs)["TextStart"];
+					if (strong.size()) {
+						char gh = 0;
+						gh = isdigit(strong[0]) ? 0:strong[0];
+						if (!gh) {
+							if (vkey) {
+								gh = vkey->getTestament() ? 'H' : 'G';
+							}
+						}
+						else strong << 1;
+
+						SWModule *sLex = 0;
+						SWModule *sMorph = 0;
+						if (gh == 'G') {
+							sLex = defaultGreekLex;
+							sMorph = defaultGreekParse;
+						}
+						if (gh == 'H') {
+							sLex = defaultHebLex;
+							sMorph = defaultHebParse;
+						}
+						SWBuf lexName = "";
+						if (sLex) {
+							// we can pass the real lex name in, but we have some
+							// aliases in the javascript to optimize bandwidth
+							lexName = sLex->getName();
+							if (lexName == "StrongsGreek")
+								lexName = "G";
+							if (lexName == "StrongsHebrew")
+								lexName = "H";
+						}
+						SWBuf wordID;
+						if (vkey) {
+							// optimize for bandwidth and use only the verse as the unique entry id
+							wordID.appendFormatted("%d", vkey->getVerse());
+						}
+						else {
+							wordID = key->getText();
+						}
+						for (unsigned int i = 0; i < wordID.size(); i++) {
+							if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
+								wordID[i] = '_';
+							}
+						}
+						wordID.appendFormatted("_%s%d", wordSrcPrefix.c_str(), atoi(wstr));
+						if (textSt.size()) {
+							int textStr = atoi(textSt.c_str());
+							textStr += lastAppendLen;
+							SWBuf spanStart = "";
+
+
+
+							if (!sMorph) sMorph = 0;	// avoid unused warnings for now
+/*
+							if (sMorph) {
+								SWBuf popMorph = "<a onclick=\"";
+								popMorph.appendFormatted("p(\'%s\',\'%s\','%s','');\" >%s</a>", sMorph->getName(), morph.c_str(), wordID.c_str(), morph.c_str());
+								morph = popMorph;
+							}
+*/
+
+							// 'p' = 'fillpop' to save bandwidth
+							const char *m = strchr(morph.c_str(), ':');
+							if (m) m++;
+							else m = morph.c_str();
+							spanStart.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','','%s');\" >", lexName.c_str(), strong.c_str(), wordID.c_str(), m, modName.c_str());
+							text.insert(textStr, spanStart);
+							lastAppendLen = spanStart.length();
+						}
+					}
+
+				}
+				if (newText) {
+					textStart = text.length(); newText = false;
+				}
+				continue;
+			}
+			if (intoken) {
+				if (tokpos < 2045)
+					token[tokpos++] = *from;
+					token[tokpos+2] = 0;
+			}
+			else	{
+				text += *from;
+			}
+		}
+
+		char wstr[10];
+		sprintf(wstr, "%03d", word-1);
+		AttributeValue *wAttrs = &(module->getEntryAttributes()["Word"][wstr]);
+		needWordOut = false;
+		SWBuf strong = (*wAttrs)["Strongs"];
+		SWBuf morph = (*wAttrs)["Morph"];
+		SWBuf morphClass = (*wAttrs)["MorphClass"];
+		SWBuf wordText = (*wAttrs)["Text"];
+		SWBuf textSt = (*wAttrs)["TextStart"];
+		if (strong.size()) {
+			char gh = 0;
+			gh = isdigit(strong[0]) ? 0:strong[0];
+			if (!gh) {
+				if (vkey) {
+					gh = vkey->getTestament() ? 'H' : 'G';
+				}
+			}
+			else strong << 1;
+
+			SWModule *sLex = 0;
+			if (gh == 'G') {
+				sLex = defaultGreekLex;
+			}
+			if (gh == 'H') {
+				sLex = defaultHebLex;
+			}
+			SWBuf lexName = "";
+			if (sLex) {
+				// we can pass the real lex name in, but we have some
+				// aliases in the javascript to optimize bandwidth
+				lexName = sLex->getName();
+				if (lexName == "StrongsGreek")
+					lexName = "G";
+				if (lexName == "StrongsHebrew")
+					lexName = "H";
+			}
+			SWBuf wordID;
+			if (vkey) {
+				// optimize for bandwidth and use only the verse as the unique entry id
+				wordID.appendFormatted("%d", vkey->getVerse());
+			}
+			else {
+				wordID = key->getText();
+			}
+			for (unsigned int i = 0; i < wordID.size(); i++) {
+				if ((!isdigit(wordID[i])) && (!isalpha(wordID[i]))) {
+					wordID[i] = '_';
+				}
+			}
+			wordID.appendFormatted("_%s%d", wordSrcPrefix.c_str(), atoi(wstr));
+			if (textSt.size()) {
+				int textStr = atoi(textSt.c_str());
+				textStr += lastAppendLen;
+				SWBuf spanStart = "";
+				// 'p' = 'fillpop' to save bandwidth
+				const char *m = strchr(morph.c_str(), ':');
+				if (m) m++;
+				else m = morph.c_str();
+				spanStart.appendFormatted("<span class=\"clk\" onclick=\"p('%s','%s','%s','%s','','%s');\" >", lexName.c_str(), strong.c_str(), wordID.c_str(), m, modName.c_str());
+				text.insert(textStr, spanStart);
+			}
+		}
+	}
+
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/thmlxhtml.cpp b/src/modules/filters/thmlxhtml.cpp
new file mode 100644
index 0000000..b17eb50
--- /dev/null
+++ b/src/modules/filters/thmlxhtml.cpp
@@ -0,0 +1,378 @@
+/******************************************************************************
+ *
+ *  thmlxhtml.cpp -	ThML to classed XHTML
+ *
+ * $Id: thmlxhtml.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2011-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <thmlxhtml.h>
+#include <swmodule.h>
+#include <utilxml.h>
+#include <utilstr.h>
+#include <versekey.h>
+#include <url.h>
+
+SWORD_NAMESPACE_START
+ 
+
+const char *ThMLXHTML::getHeader() const {
+	return "\
+	";
+}
+
+
+ThMLXHTML::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	if (module) {
+		version = module->getName();
+		BiblicalText = (!strcmp(module->getType(), "Biblical Texts"));
+		SecHead = false;
+	}	
+}
+
+
+ThMLXHTML::ThMLXHTML() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+	setPassThruNumericEscapeString(true);
+
+	addAllowedEscapeString("quot");
+	addAllowedEscapeString("amp");
+	addAllowedEscapeString("lt");
+	addAllowedEscapeString("gt");
+
+	addAllowedEscapeString("nbsp");
+	addAllowedEscapeString("brvbar"); // "Å "
+	addAllowedEscapeString("sect");   // "§"
+	addAllowedEscapeString("copy");   // "©"
+	addAllowedEscapeString("laquo");  // "«"
+	addAllowedEscapeString("reg");    // "®"
+	addAllowedEscapeString("acute");  // "Ž"
+	addAllowedEscapeString("para");   // "¶"
+	addAllowedEscapeString("raquo");  // "»"
+
+	addAllowedEscapeString("Aacute"); // "�"
+	addAllowedEscapeString("Agrave"); // "À"
+	addAllowedEscapeString("Acirc");  // "Â"
+	addAllowedEscapeString("Auml");   // "Ä"
+	addAllowedEscapeString("Atilde"); // "Ã"
+	addAllowedEscapeString("Aring");  // "Ã…"
+	addAllowedEscapeString("aacute"); // "á"
+	addAllowedEscapeString("agrave"); // "à"
+	addAllowedEscapeString("acirc");  // "â"
+	addAllowedEscapeString("auml");   // "ä"
+	addAllowedEscapeString("atilde"); // "ã"
+	addAllowedEscapeString("aring");  // "Ã¥"
+	addAllowedEscapeString("Eacute"); // "É"
+	addAllowedEscapeString("Egrave"); // "È"
+	addAllowedEscapeString("Ecirc");  // "Ê"
+	addAllowedEscapeString("Euml");   // "Ë"
+	addAllowedEscapeString("eacute"); // "é"
+	addAllowedEscapeString("egrave"); // "è"
+	addAllowedEscapeString("ecirc");  // "ê"
+	addAllowedEscapeString("euml");   // "ë"
+	addAllowedEscapeString("Iacute"); // "�"
+	addAllowedEscapeString("Igrave"); // "Ì"
+	addAllowedEscapeString("Icirc");  // "ÃŽ"
+	addAllowedEscapeString("Iuml");   // "�"
+	addAllowedEscapeString("iacute"); // "í"
+	addAllowedEscapeString("igrave"); // "ì"
+	addAllowedEscapeString("icirc");  // "î"
+	addAllowedEscapeString("iuml");   // "ï"
+	addAllowedEscapeString("Oacute"); // "Ó"
+	addAllowedEscapeString("Ograve"); // "Ã’"
+	addAllowedEscapeString("Ocirc");  // "Ô"
+	addAllowedEscapeString("Ouml");   // "Ö"
+	addAllowedEscapeString("Otilde"); // "Õ"
+	addAllowedEscapeString("oacute"); // "ó"
+	addAllowedEscapeString("ograve"); // "ò"
+	addAllowedEscapeString("ocirc");  // "ô"
+	addAllowedEscapeString("ouml");   // "ö"
+	addAllowedEscapeString("otilde"); // "õ"
+	addAllowedEscapeString("Uacute"); // "Ú"
+	addAllowedEscapeString("Ugrave"); // "Ù"
+	addAllowedEscapeString("Ucirc");  // "Û"
+	addAllowedEscapeString("Uuml");   // "Ü"
+	addAllowedEscapeString("uacute"); // "ú"
+	addAllowedEscapeString("ugrave"); // "ù"
+	addAllowedEscapeString("ucirc");  // "û"
+	addAllowedEscapeString("uuml");   // "ü"
+	addAllowedEscapeString("Yacute"); // "�"
+	addAllowedEscapeString("yacute"); // "ý"
+	addAllowedEscapeString("yuml");   // "ÿ"
+
+	addAllowedEscapeString("deg");    // "°"
+	addAllowedEscapeString("plusmn"); // "±"
+	addAllowedEscapeString("sup2");   // "²"
+	addAllowedEscapeString("sup3");   // "³"
+	addAllowedEscapeString("sup1");   // "¹"
+	addAllowedEscapeString("nbsp");   // "º"
+	addAllowedEscapeString("pound");  // "£"
+	addAllowedEscapeString("cent");   // "¢"
+	addAllowedEscapeString("frac14"); // "Å’"
+	addAllowedEscapeString("frac12"); // "Å“"
+	addAllowedEscapeString("frac34"); // "Ÿ"
+	addAllowedEscapeString("iquest"); // "¿"
+	addAllowedEscapeString("iexcl");  // "¡"
+	addAllowedEscapeString("ETH");    // "�"
+	addAllowedEscapeString("eth");    // "ð"
+	addAllowedEscapeString("THORN");  // "Þ"
+	addAllowedEscapeString("thorn");  // "þ"
+	addAllowedEscapeString("AElig");  // "Æ"
+	addAllowedEscapeString("aelig");  // "æ"
+	addAllowedEscapeString("Oslash"); // "Ø"
+	addAllowedEscapeString("curren"); // "€"
+	addAllowedEscapeString("Ccedil"); // "Ç"
+	addAllowedEscapeString("ccedil"); // "ç"
+	addAllowedEscapeString("szlig");  // "ß"
+	addAllowedEscapeString("Ntilde"); // "Ñ"
+	addAllowedEscapeString("ntilde"); // "ñ"
+	addAllowedEscapeString("yen");    // "Â¥"
+	addAllowedEscapeString("not");    // "¬"
+	addAllowedEscapeString("ordf");   // "ª"
+	addAllowedEscapeString("uml");    // "Å¡"
+	addAllowedEscapeString("shy");    // "­"
+	addAllowedEscapeString("macr");   // "¯"
+
+	addAllowedEscapeString("micro");  // "µ"
+	addAllowedEscapeString("middot"); // "·"
+	addAllowedEscapeString("cedil");  // "ž"
+	addAllowedEscapeString("ordm");   // "º"
+	addAllowedEscapeString("times");  // "×"
+	addAllowedEscapeString("divide"); // "÷"
+	addAllowedEscapeString("oslash"); // "ø"
+
+	setTokenCaseSensitive(true);
+//	addTokenSubstitute("scripture", "<i> ");
+	addTokenSubstitute("/scripture", "</i> ");
+
+	renderNoteNumbers = false;
+}
+
+
+bool ThMLXHTML::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+	if (!substituteToken(buf, token)) { // manually process if it wasn't a simple substitution
+		MyUserData *u = (MyUserData *)userData;		
+
+		XMLTag tag(token);
+		if ((!tag.isEndTag()) && (!tag.isEmpty()))
+			u->startTag = tag;
+
+		if (tag.getName() && !strcmp(tag.getName(), "sync")) {
+			SWBuf value = tag.getAttribute("value");
+			if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "morph")) { //&gt;
+				if(value.length())
+					buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=Greek&value=%s\" class=\"morph\">%s</a>)</em></small>", 
+						URL::encode(value.c_str()).c_str(),
+						value.c_str());
+			}
+			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "lemma")) { //&gt;
+				if(value.length())
+					// empty "type=" is deliberate.
+					buf.appendFormatted("<small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=&value=%s\" class=\"strongs\">%s</a>&gt;</em></small>", 
+						URL::encode(value.c_str()).c_str(),
+						value.c_str());
+			}
+			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Strongs")) {
+				char ch = *value;
+				value<<1;
+				buf.appendFormatted("<small><em class=\"strongs\">&lt;<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">",
+						    ((ch == 'H') ? "Hebrew" : "Greek"),
+						    URL::encode(value.c_str()).c_str());
+				buf += (value.length()) ? value.c_str() : "";
+				buf += "</a>&gt;</em></small>";
+			}
+			else if (tag.getAttribute("type") && !strcmp(tag.getAttribute("type"), "Dict")) {
+				buf += (tag.isEndTag() ? "</b>" : "<b>");
+			}
+				
+		}
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					SWBuf type = tag.getAttribute("type");
+					SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+					SWBuf noteName = tag.getAttribute("n");
+					VerseKey *vkey = NULL;
+					// see if we have a VerseKey * or descendant
+					SWTRY {
+						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+					}
+					SWCATCH ( ... ) {	}
+					if (vkey) {
+						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", 
+							ch, 
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(), 
+							URL::encode(vkey->getText()).c_str(), 
+							ch,
+							ch, 
+							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+					}
+					else {
+						char ch = ((tag.getAttribute("type") && ((!strcmp(tag.getAttribute("type"), "crossReference")) || (!strcmp(tag.getAttribute("type"), "x-cross-ref")))) ? 'x':'n');
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>", 
+							ch, 
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(), 
+							URL::encode(u->key->getText()).c_str(),  
+							ch,
+							ch, 
+							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+					}
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = false;
+			}
+		}
+		else if (!strcmp(tag.getName(), "scripture")) {
+			buf += (tag.isEndTag() ? "</i>" : "<i>");
+		}
+		// <scripRef> tag
+		else if (!strcmp(tag.getName(), "scripRef")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {	//	</scripRef>
+				if (!u->BiblicalText) {
+					SWBuf refList = u->startTag.getAttribute("passage");
+					if (!refList.length())
+						refList = u->lastTextNode;
+					SWBuf version = tag.getAttribute("version");
+					
+					buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=%s\">",
+						(refList.length()) ? URL::encode(refList.c_str()).c_str() : "", 
+						(version.length()) ? URL::encode(version.c_str()).c_str() : "");
+					buf += u->lastTextNode.c_str();
+					buf += "</a>";
+				}
+				else {
+					SWBuf footnoteNumber = u->startTag.getAttribute("swordFootnote");
+					SWBuf noteName = tag.getAttribute("n");
+					VerseKey *vkey = NULL;
+					// see if we have a VerseKey * or descendant
+					SWTRY {
+						vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+					}
+					SWCATCH ( ... ) {}
+					if (vkey) {
+						// leave this special osis type in for crossReference notes types?  Might thml use this some day? Doesn't hurt.
+						//buf.appendFormatted("<a href=\"noteID=%s.x.%s\"><small><sup>*x</sup></small></a> ", vkey->getText(), footnoteNumber.c_str());
+						buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=x&value=%s&module=%s&passage=%s\"><small><sup class=\"x\">*x%s</sup></small></a>",
+							URL::encode(footnoteNumber.c_str()).c_str(), 
+							URL::encode(u->version.c_str()).c_str(),
+							URL::encode(vkey->getText()).c_str(), 
+							(renderNoteNumbers ? URL::encode(noteName.c_str()).c_str() : ""));
+					}
+				}
+
+				// let's let text resume to output again
+				u->suspendTextPassThru = false;
+			}
+		}
+		else if (tag.getName() && !strcmp(tag.getName(), "div")) {
+			if (tag.isEndTag() && u->SecHead) {
+				buf += "</i></b><br />";
+				u->SecHead = false;
+			}
+			else if (tag.getAttribute("class")) {
+				if (!stricmp(tag.getAttribute("class"), "sechead")) {
+					u->SecHead = true;
+					buf += "<br /><b><i>";
+				}
+				else if (!stricmp(tag.getAttribute("class"), "title")) {
+					u->SecHead = true;
+					buf += "<br /><b><i>";
+				}
+				else {
+					buf += tag;
+				}
+			}
+			else {
+				buf += tag;
+			}
+		}
+		else if (tag.getName() && (!strcmp(tag.getName(), "img") || !strcmp(tag.getName(), "image"))) {
+			const char *src = strstr(token, "src");
+			if (!src)		// assert we have a src attribute
+				return false;
+
+			const char *c, *d;
+			if (((c = strchr(src+3, '"')) == NULL) ||
+			    ((d = strchr( ++c , '"')) == NULL))	// identify endpoints.
+				return false;			// abandon hope.
+
+			SWBuf imagename = "file:";
+			if (*c == '/')				// as below, inside for loop.
+				imagename += userData->module->getConfigEntry("AbsoluteDataPath");
+			while (c != d)				// move bits into the name.
+			    imagename += *(c++);
+
+			// images become clickable, if the UI supports showImage.
+			buf.appendFormatted("<a href=\"passagestudy.jsp?action=showImage&value=%s&module=%s\"><",
+					    URL::encode(imagename.c_str()).c_str(),
+					    URL::encode(u->version.c_str()).c_str());
+
+			for (c = token; *c; c++) {
+				if ((*c == '/') && (*(c+1) == '\0'))
+					continue;
+				if (c == src) {
+					for (;((*c) && (*c != '"')); c++)
+						buf += *c;
+
+					if (!*c) { c--; continue; }
+
+					buf += '"';
+					if (*(c+1) == '/') {
+						buf += "file:";
+						buf += userData->module->getConfigEntry("AbsoluteDataPath");
+						if (buf[buf.length()-2] == '/')
+							c++;		// skip '/'
+					}
+					continue;
+				}
+				buf += *c;
+			}
+               buf += " border=0 /></a>";
+		}
+		else {
+			buf += '<';
+			/*for (const char *tok = token; *tok; tok++)
+				buf += *tok;*/
+			buf += token;
+			buf += '>';
+			//return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/unicodertf.cpp b/src/modules/filters/unicodertf.cpp
new file mode 100644
index 0000000..997597b
--- /dev/null
+++ b/src/modules/filters/unicodertf.cpp
@@ -0,0 +1,102 @@
+/******************************************************************************
+ *
+ *  unicodertf.cpp -	SWFilter descendant to convert UTF-8 to RTF tags
+ *
+ * $Id: unicodertf.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unicodertf.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+UnicodeRTF::UnicodeRTF() {
+}
+
+
+char UnicodeRTF::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	const unsigned char *from;
+	char digit[10];
+	unsigned long ch;
+        signed short utf16;
+	unsigned char from2[7];
+
+	SWBuf orig = text;
+
+	from = (const unsigned char *)orig.c_str();
+
+	// -------------------------------
+	for (text = ""; *from; from++) {
+		ch = 0;
+                //case: ANSI
+		if ((*from & 128) != 128) {
+			text += *from;
+			continue;
+		}
+                //case: Invalid UTF-8 (illegal continuing byte in initial position)
+		if ((*from & 128) && ((*from & 64) != 64)) {
+			continue;
+		}
+                //case: 2+ byte codepoint
+		from2[0] = *from;
+		from2[0] <<= 1;
+		int subsequent;
+		for (subsequent = 1; (from2[0] & 128) && (subsequent < 7); subsequent++) {
+			from2[0] <<= 1;
+			from2[subsequent] = from[subsequent];
+			from2[subsequent] &= 63;
+			ch <<= 6;
+			ch |= from2[subsequent];
+		}
+		subsequent--;
+		from2[0] <<= 1;
+		char significantFirstBits = 8 - (2+subsequent);
+		
+		ch |= (((short)from2[0]) << (((6*subsequent)+significantFirstBits)-8));
+		from += subsequent;
+                if (ch < 0x10000) {
+				utf16 = (signed short)ch;
+				text += '\\';
+				text += 'u';
+				sprintf(digit, "%d", utf16);
+				text += digit;
+				text += '?';
+			 }
+			else {
+				utf16 = (signed short)((ch - 0x10000) / 0x400 + 0xD800);
+				text += '\\';
+				text += 'u';
+				sprintf(digit, "%d", utf16);
+				text += digit;
+				text += '?';
+				utf16 = (signed short)((ch - 0x10000) % 0x400 + 0xDC00);
+				text += '\\';
+				text += 'u';
+				sprintf(digit, "%d", utf16);
+				text += digit;
+				text += '?';
+			}
+	}
+	   
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf16utf8.cpp b/src/modules/filters/utf16utf8.cpp
new file mode 100644
index 0000000..6356284
--- /dev/null
+++ b/src/modules/filters/utf16utf8.cpp
@@ -0,0 +1,107 @@
+/******************************************************************************
+ *
+ * utf16utf8.cpp -	SWFilter descendant to convert UTF-16 to UTF-8
+ *
+ * $Id: utf16utf8.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <utf16utf8.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+UTF16UTF8::UTF16UTF8() {
+}
+
+
+char UTF16UTF8::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+  unsigned short *from;
+
+  int len;
+  unsigned long uchar;
+  unsigned short schar;
+  len = 0;
+  from = (unsigned short*) text.c_str();
+  while (*from) {
+        len += 2;
+        from++;
+  }
+
+	SWBuf orig = text;
+	from = (unsigned short*)orig.c_str();
+
+
+  // -------------------------------
+
+  for (text = ""; *from; from++) {
+    uchar = 0;
+
+    if (*from < 0xD800 || *from > 0xDFFF) {
+      uchar = *from;
+    }
+    else if (*from >= 0xD800 && *from <= 0xDBFF) {
+      uchar = *from;
+      schar = *(from+1);
+      if (uchar < 0xDC00 || uchar > 0xDFFF) {
+	//error, do nothing
+	continue;
+      }
+      uchar &= 0x03ff;
+      schar &= 0x03ff;
+      uchar <<= 10;
+      uchar |= schar;
+      uchar += 0x10000;
+      from++;
+    }
+    else {
+      //error, do nothing
+      continue;
+    }
+    
+    if (uchar < 0x80) { 
+      text += uchar;
+    }
+    else if (uchar < 0x800) { 
+      text += 0xc0 | (uchar >> 6); 
+      text += 0x80 | (uchar & 0x3f);
+    }
+    else if (uchar < 0x10000) {
+      text += 0xe0 | (uchar >> 12);
+      text += 0x80 | ((uchar >> 6) & 0x3f);
+      text += 0x80 | (uchar & 0x3f);
+    }
+    else if (uchar < 0x200000) {
+      text += 0xF0 | (uchar >> 18);
+      text += 0x80 | ((uchar >> 12) & 0x3F);
+      text += 0x80 | ((uchar >> 6) & 0x3F);
+      text += 0x80 | (uchar & 0x3F);
+    }
+  }
+  
+  return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8arabicpoints.cpp b/src/modules/filters/utf8arabicpoints.cpp
new file mode 100644
index 0000000..42bfaa5
--- /dev/null
+++ b/src/modules/filters/utf8arabicpoints.cpp
@@ -0,0 +1,189 @@
+/******************************************************************************
+ *
+ *  utf8arabicpoints.cpp -	SWFilter descendant to remove UTF-8
+ *				Arabic vowel points
+ *
+ * $Id: utf8arabicpoints.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <utf8arabicpoints.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Arabic Vowel Points";
+	static const char oTip[]  = "Toggles Arabic Vowel Points";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"On", "Off", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+
+
+	static char *nextMark(const char* from, int* mark_size) {
+		// Arabic vowel points currently targeted for elimination:
+		// Table entries excerpted from
+		// http://www.utf8-chartable.de/unicode-utf8-table.pl.
+		// Code   UTF-8     Description
+		// point
+		// -----  --------- -----------
+		// U+064B d9 8b     ARABIC FATHATAN
+		// U+064C d9 8c     ARABIC DAMMATAN
+		// U+064D d9 8d     ARABIC KASRATAN
+		// U+064E d9 8e     ARABIC FATHA
+		// U+064F d9 8f     ARABIC DAMMA
+		// U+0650 d9 90     ARABIC KASRA
+		// U+0651 d9 91     ARABIC SHADDA
+		// U+0652 d9 92     ARABIC SUKUN
+		// U+0653 d9 93     ARABIC MADDAH ABOVE
+		// U+0654 d9 94     ARABIC HAMZA ABOVE
+		// U+0655 d9 95     ARABIC HAMZA BELOW
+		//
+		// U+FC5E ef b1 9e  ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
+		// U+FC5F ef b1 9f  ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
+		// U+FC60 ef b1 a0  ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
+		// U+FC61 ef b1 a1  ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
+		// U+FC62 ef b1 a2  ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
+		// U+FC63 ef b1 a3  ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
+		//
+		// U+FE70 ef b9 b0  ARABIC FATHATAN ISOLATED FORM
+		// U+FE71 ef b9 b1  ARABIC TATWEEL WITH FATHATAN ABOVE
+		// U+FE72 ef b9 b2  ARABIC DAMMATAN ISOLATED FORM
+		// U+FE73 ef b9 b3  ARABIC TAIL FRAGMENT
+		// U+FE74 ef b9 b4  ARABIC KASRATAN ISOLATED FORM
+		// U+FE75 ef b9 b5	 ???
+		// U+FE76 ef b9 b6  ARABIC FATHA ISOLATED FORM
+		// U+FE77 ef b9 b7  ARABIC FATHA MEDIAL FORM
+		// U+FE78 ef b9 b8  ARABIC DAMMA ISOLATED FORM
+		// U+FE79 ef b9 b9  ARABIC DAMMA MEDIAL FORM
+		// U+FE7A ef b9 ba  ARABIC KASRA ISOLATED FORM
+		// U+FE7B ef b9 bb  ARABIC KASRA MEDIAL FORM
+		// U+FE7C ef b9 bc  ARABIC SHADDA ISOLATED FORM
+		// U+FE7D ef b9 bd  ARABIC SHADDA MEDIAL FORM
+		// U+FE7E ef b9 be  ARABIC SUKUN ISOLATED FORM
+		// U+FE7F ef b9 bf  ARABIC SUKUN MEDIAL FORM
+
+		unsigned char* byte = (unsigned char*) from;
+		for (; *byte; ++byte) {
+			if (byte[0] == 0xD9) {
+				if (byte[1] >= 0x8B && byte[1] <= 0x95) {
+				  *mark_size = 2;
+				  break;
+				}
+			  continue;
+			}
+			if (byte[0] == 0xEF) {
+				if (byte[1] == 0xB1) {
+				 if (byte[2] >= 0x9E && byte[2] <= 0xA3) {
+					*mark_size = 3;
+					break;
+				 }
+				 continue;
+			  }
+				if (byte[1] == 0xB9) {
+				 if (byte[2] >= 0xB0 && byte[2] <= 0xBF) {
+					*mark_size = 3;
+					break;
+				 }
+				 continue;
+			  }
+			}
+		}
+		return (char*)byte;
+	}
+}
+
+
+UTF8ArabicPoints::UTF8ArabicPoints() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+UTF8ArabicPoints::~UTF8ArabicPoints(){};
+
+
+
+char UTF8ArabicPoints::processText(SWBuf &text, const SWKey *, const SWModule *) {
+    // A non-zero/true option setting means that setOptionValue("On")
+    // was called which apparently means that Arabic Vowel Marks are ENABLED,
+	// so the filter's actions are DISABLED.
+	if (option)
+		return 0;
+
+	// Eliminate Arabic vowel marks from the text.
+	// The recognized marks are determined by the "nextMark" function.
+
+	// If nextMark were polymorphic (a virtual function or a function
+	// pointer), this function could be generically used in any filter that
+	// only removed (vs. replaced) areas of text based on the arbitrary
+	// match criteria encapsulated in the specific nextMark
+	// implementation.
+	int mark_size = 0;
+	char* mark_pos = nextMark(text.c_str(), &mark_size);
+
+	// Here and at the end of the loop,
+	// test BOTH mark_pos AND *mark_pos for safety and to give nextMark
+	// the option of returning either NULL or a pointer to the null
+	// terminator when done.
+	if (!mark_pos || !*mark_pos)
+		return 0; // no marks found.
+	
+	// Purposely granting write access into SWBuf internal buffer via
+	// "end_of_output" avoids a needless temporary SWBuf copy.
+	// Everything before the first mark is already in its final position
+	// and can be safely ignored. So start appending at the current mark.
+	char* end_of_output = mark_pos;
+
+	// For consistency, input starts at (vs. after) the first mark as well
+	// -- not a problem since the mark itself gets skipped, anyway.
+	const char* start_of_input = mark_pos;
+	do {
+		// At this point, "mark_pos" and "mark_pos+mark_size" delimit
+		// the text to drop.
+		// "start_of_input" is either mark_pos or any text between the
+        	// end of any previous mark and the current mark_pos.
+		// This text is now ready to be moved into the output.
+		int ready_size = mark_pos - start_of_input;
+		if (ready_size > 0) {
+			// Append the input text before the current mark to the
+			// output.
+			// Must use bcopy vs. strncpy because the final
+			// end_of_output may overtake the original
+			// start_of_input.
+			memmove(end_of_output, start_of_input, ready_size);
+			// Keep appending to end_of_output.
+			end_of_output += ready_size;
+		}
+		// Ensure the mark never gets copied.
+		start_of_input = mark_pos + mark_size;
+		// Find the next mark.
+		mark_pos = nextMark(start_of_input, &mark_size);
+
+	} while (mark_pos && *mark_pos); // No more marks.
+
+	// Copy any trailing input text AND always the terminating null.
+	memmove(end_of_output, start_of_input, strlen(start_of_input)+1);
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8arshaping.cpp b/src/modules/filters/utf8arshaping.cpp
new file mode 100644
index 0000000..04dea2d
--- /dev/null
+++ b/src/modules/filters/utf8arshaping.cpp
@@ -0,0 +1,68 @@
+/******************************************************************************
+ *
+ *  utf8arshaping.cpp -	SWFilter descendant to perform Arabic shaping on
+ *			UTF-8 text
+ *
+ * $Id: utf8arshaping.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _ICU_
+
+#include <stdlib.h>
+
+#include <utilstr.h>
+
+#include <utf8arshaping.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+UTF8arShaping::UTF8arShaping() : err(U_ZERO_ERROR) {
+	conv = ucnv_open("UTF-8", &err);
+}
+
+UTF8arShaping::~UTF8arShaping() {
+        ucnv_close(conv);
+}
+
+char UTF8arShaping::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+        UChar *ustr, *ustr2;
+	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return -1;
+
+        int32_t len = text.length();
+        ustr = new UChar[len];
+        ustr2 = new UChar[len];
+
+	// Convert UTF-8 string to UTF-16 (UChars)
+        len = ucnv_toUChars(conv, ustr, len, text.c_str(), -1, &err);
+
+        len = u_shapeArabic(ustr, len, ustr2, len, U_SHAPE_LETTERS_SHAPE | U_SHAPE_DIGITS_EN2AN, &err);
+
+	   text.setSize(text.size()*2);
+	   len = ucnv_fromUChars(conv, text.getRawData(), text.size(), ustr2, len, &err);
+	   text.setSize(len);
+
+        delete [] ustr2;
+        delete [] ustr;
+	return 0;
+}
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/src/modules/filters/utf8bidireorder.cpp b/src/modules/filters/utf8bidireorder.cpp
new file mode 100644
index 0000000..b945a5b
--- /dev/null
+++ b/src/modules/filters/utf8bidireorder.cpp
@@ -0,0 +1,83 @@
+/******************************************************************************
+ *
+ *  utf8bidireorder.cpp -	SWFilter descendant to perform reordering of
+ *				UTF-8 text to visual order according to the
+ *				Unicode Bidirectional Algorithm (UBA)
+ *
+ * $Id: utf8bidireorder.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _ICU_
+
+#include <stdlib.h>
+
+#include <utilstr.h>
+
+#include <utf8bidireorder.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+UTF8BiDiReorder::UTF8BiDiReorder() : err(U_ZERO_ERROR) {
+
+        conv = ucnv_open("UTF-8", &err);
+
+}
+
+
+UTF8BiDiReorder::~UTF8BiDiReorder() {
+        ucnv_close(conv);
+}
+
+
+char UTF8BiDiReorder::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+        UChar *ustr, *ustr2;
+	if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return -1;
+        
+        int32_t len = text.length();
+        ustr = new UChar[len]; //each char could become a surrogate pair
+
+	// Convert UTF-8 string to UTF-16 (UChars)
+        len = ucnv_toUChars(conv, ustr, len, text.c_str(), -1, &err);
+        ustr2 = new UChar[len];
+
+        UBiDi* bidi = ubidi_openSized(len + 1, 0, &err);
+        ubidi_setPara(bidi, ustr, len, UBIDI_DEFAULT_RTL, NULL, &err);
+        len = ubidi_writeReordered(bidi, ustr2, len,
+                UBIDI_DO_MIRRORING | UBIDI_REMOVE_BIDI_CONTROLS, &err);
+        ubidi_close(bidi);
+
+//        len = ubidi_writeReverse(ustr, len, ustr2, len,
+//                UBIDI_DO_MIRRORING | UBIDI_REMOVE_BIDI_CONTROLS, &err);
+
+	   text.setSize(text.size()*2);
+	   len = ucnv_fromUChars(conv, text.getRawData(), text.size(), ustr2, len, &err);
+	   text.setSize(len);
+
+        delete [] ustr2;
+        delete [] ustr;
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/src/modules/filters/utf8cantillation.cpp b/src/modules/filters/utf8cantillation.cpp
new file mode 100644
index 0000000..91ca58a
--- /dev/null
+++ b/src/modules/filters/utf8cantillation.cpp
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
+ *  utf8cantillation.cpp -	SWFilter descendant to remove UTF-8 Hebrew
+ *				cantillation
+ *
+ * $Id: utf8cantillation.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <utf8cantillation.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Hebrew Cantillation";
+	static const char oTip[]  = "Toggles Hebrew Cantillation Marks";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"Off", "On", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+UTF8Cantillation::UTF8Cantillation() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+UTF8Cantillation::~UTF8Cantillation(){};
+
+
+char UTF8Cantillation::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (!option) {
+		//The UTF-8 range 0xD6 0x90 to 0xD6 0xAF and 0xD7 0x84 consist of Hebrew cantillation marks so block those out.
+		SWBuf orig = text;
+		const unsigned char* from = (unsigned char*)orig.c_str();
+		for (text = ""; *from; from++) {
+			if (*from != 0xD6) {
+				if (*from == 0xD7 && *(from + 1) == 0x84) {
+					from++;
+				}
+				else {
+					text += *from;
+				}
+			}
+			else if (*(from + 1) < 0x90 || *(from + 1) > 0xAF) {
+				text += *from;
+				from++;
+				text += *from;
+			}
+			else {
+				from++;
+			}
+		}
+	}
+	return 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8greekaccents.cpp b/src/modules/filters/utf8greekaccents.cpp
new file mode 100644
index 0000000..039f9a4
--- /dev/null
+++ b/src/modules/filters/utf8greekaccents.cpp
@@ -0,0 +1,285 @@
+/******************************************************************************
+ *
+ *  utf8greekaccents.cpp -	SWFilter descendant to remove UTF-8 Greek
+ *				accents
+ *
+ * $Id: utf8greekaccents.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <utf8greekaccents.h>
+
+
+#ifdef _ICU_
+#include <utf8nfkd.h>
+sword::UTF8NFKD decompose;
+#endif
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Greek Accents";
+	static const char oTip[]  = "Toggles Greek Accents";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"On", "Off", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+UTF8GreekAccents::UTF8GreekAccents() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+UTF8GreekAccents::~UTF8GreekAccents() {};
+
+
+char UTF8GreekAccents::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+
+	if (!option) { //we don't want greek accents
+    		//unsigned char *to, *from;
+		//to = (unsigned char*)text;
+		//for (from = (unsigned char*)text; *from; from++) {
+#ifdef _ICU_
+		decompose.processText(text, (SWKey *)2);  // note the hack of 2 to mimic a real key. TODO: remove all hacks
+#endif
+		
+		SWBuf orig = text;
+		const unsigned char* from = (unsigned char*)orig.c_str();
+		for (text = ""; *from; from++) {		
+			//first just remove combining characters
+			if (*from == 0xE2 && *(from + 1) == 0x80 && *(from + 2) == 0x99) {
+				from += 2;
+			}
+			else if (*from == 0xCC && *(from + 1)) {
+				if (*(from + 1) == 0x80 || *(from + 1) == 0x81 || *(from + 1) == 0x82 || *(from + 1) == 0x88 || *(from + 1) == 0x93 || *(from + 1) == 0x94) {
+					from++;
+				}
+			}
+			else if (*from == 0xCD && (*(from + 1) == 0xBA || *(from + 1) == 0x82)) {
+				from++;
+			}
+			//now converted pre-composed characters to their alphabetic bases, discarding the accents
+
+			//Greek
+			//capital alpha
+			else if ((*from == 0xCE && *(from + 1) == 0x86)) {
+				text += 0xCE;
+				text += 0x91;
+				from++;
+			}
+			//capital epsilon
+			else if ((*from == 0xCE && *(from + 1) == 0x88)) {
+				text += 0xCE;
+				text += 0x95;
+				from++;
+			}
+			//capital eta
+			else if ((*from == 0xCE && *(from + 1) == 0x89)) {
+				text += 0xCE;
+				text += 0x97;
+				from++;
+			}
+			//capital iota
+			else if ((*from == 0xCE && (*(from + 1) == 0x8A || *(from + 1) == 0xAA))) {
+				text += 0xCE;
+				text += 0x99;
+				from++;
+			}
+			//capital omicron
+			else if ((*from == 0xCE && *(from + 1) == 0x8C)) {
+				text += 0xCE;
+				text += 0x9F;
+				from++;
+			}
+			//capital upsilon
+			else if ((*from == 0xCE && (*(from + 1) == 0x8E || *(from + 1) == 0xAB))) {
+				text += 0xCE;
+				text += 0xA5;
+				from++;
+			}
+			//capital omega
+			else if ((*from == 0xCE && *(from + 1) == 0x8F)) {
+				text += 0xCE;
+				text += 0xA9;
+				from++;
+			}
+
+			//alpha
+			else if ((*from == 0xCE && *(from + 1) == 0xAC)) {
+				text += 0xCE;
+				text += 0xB1;
+				from++;
+			}
+			//epsilon
+			else if ((*from == 0xCE && *(from + 1) == 0xAD)) {
+				text += 0xCE;
+				text += 0xB5;
+				from++;
+			}
+			//eta
+			else if ((*from == 0xCE && *(from + 1) == 0xAE)) {
+				text += 0xCE;
+				text += 0xB7;
+				from++;
+			}
+			//iota
+			else if ((*from == 0xCE && *(from + 1) == 0xAF) || (*from == 0xCF && *(from + 1) == 0x8A)) {
+				text += 0xCE;
+				text += 0xB9;
+				from++;
+			}
+			//omicron
+			else if ((*from == 0xCF && *(from + 1) == 0x8C)) {
+				text += 0xCE;
+				text += 0xBF;
+				from++;
+			}
+			//upsilon
+			else if ((*from == 0xCE && *(from + 1) == 0x88) || (*from == 0xCF && (*(from + 1) == 0x8B || *(from + 1) == 0x8D))) {
+				text += 0xCF;
+				text += 0x85;
+				from++;
+			}
+			//omega
+			else if ((*from == 0xCF && *(from + 1) == 0x8E)) {
+				text += 0xCF;
+				text += 0x89;
+				from++;
+			}
+
+			//Extended Greek
+			//capital alpha
+			else if (*from == 0xE1 && (((*(from + 1) == 0xBC || *(from + 1) == 0xBE) && *(from + 2) >= 0x88 && *(from + 2) <= 0x8F) || (*(from + 1) == 0xBE && *(from + 2) >= 0xB8 && *(from + 2) <= 0xBC))) {
+				text += 0xCE;
+				text += 0x91;
+				from+=2;
+			}
+			//capital epsilon
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0x98 && *(from + 2) <= 0x9D) || (*(from + 1) == 0xBF && (*(from + 2) == 0x88 || *(from + 2) == 0x89)))) {
+				text += 0xCE;
+				text += 0x95;
+				from+=2;
+			}
+			//capital eta
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAF) || (*(from + 1) == 0xBE && *(from + 2) >= 0x98 && *(from + 2) <= 0x9F) || (*(from + 1) == 0xBF && *(from + 2) >= 0x8A && *(from + 2) <= 0x8C))) {
+				text += 0xCE;
+				text += 0x97;
+				from+=2;
+			}
+			//capital iota
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xB8 && *(from + 2) <= 0xBF) || (*(from + 1) == 0xBF && *(from + 2) >= 0x98 && *(from + 2) <= 0x9B))) {
+				text += 0xCE;
+				text += 0x99;
+				from+=2;
+			}
+			//capital omicron
+			else if (*from == 0xE1 && (((*(from + 1) == 0xBD && *(from + 2) >= 0x88 && *(from + 2) <= 0x8D)) || ((*(from + 1) == 0xBF && (*(from + 2) == 0xB8 || *(from + 2) == 0xB9))))) {
+				text += 0xCE;
+				text += 0x9F;
+				from+=2;
+			}
+			//capital upsilon
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBD && *(from + 2) >= 0x99 && *(from + 2) <= 0x9F) || (*(from + 1) == 0xBF && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAB))) {
+				text += 0xCE;
+				text += 0xA5;
+				from+=2;
+			}
+			//capital omega
+			else if (*from == 0xE1 && (((*(from + 1) == 0xBD || *(from + 1) == 0xBE) && *(from + 2) >= 0xA8 && *(from + 2) <= 0xAF) || (*(from + 1) == 0xBF && *(from + 2) >= 0xBA && *(from + 2) <= 0xBC))) {
+				text += 0xCE;
+				text += 0xA9;
+				from+=2;
+			}
+			//capital rho
+			else if (*from == 0xE1 && *(from + 1) == 0xBF && *(from + 2) == 0xAC) {
+				text += 0xCE;
+				text += 0xA1;
+				from+=2;
+			}
+
+			//alpha
+			else if (*from == 0xE1 && (
+                            ((*(from + 1) == 0xBC || *(from + 1) == 0xBE) && *(from + 2) >= 0x80 && *(from + 2) <= 0x87)
+                         || (*(from + 1) == 0xBD && (*(from + 2) == 0xB0 || *(from + 2) == 0xB1))
+                         || (*(from + 1) == 0xBE && *(from + 2) >= 0xB0 && *(from + 2) <= 0xB7))) {
+				text += 0xCE;
+				text += 0xB1;
+				from+=2;
+			}
+			//epsilon
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0x90 && *(from + 2) <= 0x95) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB2 || *(from + 2) == 0xB3)))) {
+				text += 0xCE;
+				text += 0xB5;
+				from+=2;
+			}
+			//eta
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBE && *(from + 2) >= 0x90 && *(from + 2) <= 0x97) || (*(from + 1) == 0xBC && *(from + 2) >= 0xA0 && *(from + 2) <= 0xA7) || (*(from + 1) == 0xBF && *(from + 2) >= 0x82 && *(from + 2) <= 0x87) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB4 || *(from + 2) == 0xB5)))) {
+				text += 0xCE;
+				text += 0xB7;
+				from+=2;
+			}
+			//iota
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBC && *(from + 2) >= 0xB0 && *(from + 2) <= 0xB7) || (*(from + 1) == 0xBD && (*(from + 2) == 0xB6 || *(from + 2) == 0xB7)) || (*(from + 1) == 0xBF && *(from + 2) >= 0x90 && *(from + 2) <= 0x97))) {
+				text += 0xCE;
+				text += 0xB9;
+				from+=2;
+			}
+			//omicron
+			else if (*from == 0xE1 && (*(from + 1) == 0xBD && ((*(from + 2) >= 0x80 && *(from + 2) <= 0x85) || (*(from + 2) == 0xB8 || *(from + 2) == 0xB9)))) {
+				text += 0xCE;
+				text += 0xBF;
+				from+=2;
+			}
+			//upsilon
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBD && ((*(from + 2) >= 0x90 && *(from + 2) <= 0x97) || *(from + 2) == 0xBA || *(from + 2) == 0xBB)) || (*(from + 1) == 0xBF && ((*(from + 2) >= 0xA0 && *(from + 2) <= 0xA3) || *(from + 2) == 0xA6 || *(from + 2) == 0xA7)))) {
+				text += 0xCF;
+				text += 0x85;
+				from+=2;
+			}
+			//omega
+			else if (*from == 0xE1 && ((*(from + 1) == 0xBD && ((*(from + 2) >= 0xA0 && *(from + 2) <= 0xA7) || (*(from + 2) == 0xBC || *(from + 2) == 0xBD))) || (*(from + 1) == 0xBE && (*(from + 2) >= 0xA0 && *(from + 2) <= 0xA7)) || (*(from + 1) == 0xBF && *(from + 2) >= 0xB2 && *(from + 2) <= 0xB7))) {
+				text += 0xCF;
+				text += 0x89;
+				from+=2;
+			}
+			//rho
+			else if (*from == 0xE1 && *(from + 1) == 0xBF && (*(from + 2) == 0xA4 && *(from + 2) == 0xA5)) {
+				text += 0xCF;
+				text += 0x81;
+				from+=2;
+			}
+			else { //no characters we filter
+				text += *from;
+			}
+		}
+	}
+	return 0;
+}
+
+
+
+
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8hebrewpoints.cpp b/src/modules/filters/utf8hebrewpoints.cpp
new file mode 100644
index 0000000..ff53e4f
--- /dev/null
+++ b/src/modules/filters/utf8hebrewpoints.cpp
@@ -0,0 +1,69 @@
+/******************************************************************************
+ *
+ *  utf8hebrewpoints.cpp -	SWFilter descendant to remove UTF-8 Hebrew
+ *				vowel points
+ *
+ * $Id: utf8hebrewpoints.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <utf8hebrewpoints.h>
+
+
+SWORD_NAMESPACE_START
+
+namespace {
+
+	static const char oName[] = "Hebrew Vowel Points";
+	static const char oTip[]  = "Toggles Hebrew Vowel Points";
+
+	static const StringList *oValues() {
+		static const SWBuf choices[3] = {"On", "Off", ""};
+		static const StringList oVals(&choices[0], &choices[2]);
+		return &oVals;
+	}
+}
+
+
+UTF8HebrewPoints::UTF8HebrewPoints() : SWOptionFilter(oName, oTip, oValues()) {
+}
+
+
+UTF8HebrewPoints::~UTF8HebrewPoints(){};
+
+
+char UTF8HebrewPoints::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	if (!option) {
+		//The UTF-8 range 0xD6 0xB0 to 0xD6 0xBF excluding 0xD6 0xBE consist of Hebrew cantillation marks so block those out.
+		SWBuf orig = text;
+		const unsigned char* from = (unsigned char*)orig.c_str();
+		for (text = ""; *from; from++) {
+			if ((*from == 0xD6) && (*(from + 1) >= 0xB0 && *(from + 1) <= 0xBF) && (*(from + 1) != 0xBE)) {
+				from++;
+			}
+			else {
+     			        text += *from;
+                        }
+		}
+     	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/filters/utf8html.cpp b/src/modules/filters/utf8html.cpp
new file mode 100644
index 0000000..1f05ac7
--- /dev/null
+++ b/src/modules/filters/utf8html.cpp
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
+ *  utf8html.cpp -	SWFilter descendant to convert a UTF-8 stream to
+ *			HTML escapes
+ *
+ * $Id: utf8html.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <utf8html.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+UTF8HTML::UTF8HTML() {
+}
+
+
+char UTF8HTML::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	unsigned char *from;
+        char digit[10];
+        unsigned long ch;
+	 if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return (char)-1;
+
+	SWBuf orig = text;
+  	from = (unsigned char *)orig.c_str();
+
+	// -------------------------------
+	for (text = ""; *from; from++) {
+	  ch = 0;
+          if ((*from & 128) != 128) {
+//          	if (*from != ' ')
+	       text += *from;
+               continue;
+          }
+          if ((*from & 128) && ((*from & 64) != 64)) {
+	    // error
+               *from = 'x';
+               continue;
+          }
+          *from <<= 1;
+          int subsequent;
+          for (subsequent = 1; (*from & 128); subsequent++) {
+          	*from <<= 1;
+               from[subsequent] &= 63;
+               ch <<= 6;
+               ch |= from[subsequent];
+          }
+          subsequent--;
+          *from <<=1;
+          char significantFirstBits = 8 - (2+subsequent);
+          
+          ch |= (((short)*from) << (((6*subsequent)+significantFirstBits)-8));
+          from += subsequent;
+          text += '&';
+          text += '#';
+	  sprintf(digit, "%ld", ch);
+		for (char *dig = digit; *dig; dig++)
+			text += *dig;
+		text += ';';
+	}
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/utf8latin1.cpp b/src/modules/filters/utf8latin1.cpp
new file mode 100644
index 0000000..1bf8d3b
--- /dev/null
+++ b/src/modules/filters/utf8latin1.cpp
@@ -0,0 +1,92 @@
+/******************************************************************************
+ *
+ *  utf8latin1.cpp -	SWFilter descendant to convert UTF-8 to Latin-1
+ *
+ * $Id: utf8latin1.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <utf8latin1.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+UTF8Latin1::UTF8Latin1(char rchar) : replacementChar(rchar) {
+}
+
+
+char UTF8Latin1::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+  unsigned char *from;
+
+  unsigned long uchar;
+  unsigned char significantFirstBits, subsequent;
+  
+  if ((unsigned long)key < 2) {// hack, we're en(1)/de(0)ciphering
+	return (char)-1;
+  }
+
+  SWBuf orig = text;
+  from = (unsigned char*)orig.c_str();
+
+  
+  // -------------------------------
+  
+  for (text = ""; *from; from++) {
+    uchar = 0;
+    if ((*from & 128) != 128) {
+      //          	if (*from != ' ')
+      uchar = *from;
+    }
+    else if ((*from & 128) && ((*from & 64) != 64)) {
+      // error, do nothing
+      continue;
+    }
+    else {
+      *from <<= 1;
+      for (subsequent = 1; (*from & 128); subsequent++) {
+	*from <<= 1;
+	from[subsequent] &= 63;
+	uchar <<= 6;
+	uchar |= from[subsequent];
+      }
+      subsequent--;
+      *from <<=1;
+      significantFirstBits = 8 - (2+subsequent);
+      
+      uchar |= (((short)*from) << (((6*subsequent)+significantFirstBits)-8));
+      from += subsequent;
+    }
+
+    if (uchar < 0xff) {
+        text += (unsigned char)uchar;
+    }
+    else {
+        text += replacementChar;
+    }
+  }
+  return 0;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/filters/utf8nfc.cpp b/src/modules/filters/utf8nfc.cpp
new file mode 100644
index 0000000..49f12bb
--- /dev/null
+++ b/src/modules/filters/utf8nfc.cpp
@@ -0,0 +1,67 @@
+/******************************************************************************
+ *
+ *  utf8nfc.cpp -	SWFilter descendant to perform NFC (canonical
+ *			composition normalization) on UTF-8 text
+ *
+ * $Id: utf8nfc.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _ICU_
+
+#include <stdlib.h>
+
+#include <utilstr.h>
+#include <unicode/unistr.h>
+#include <unicode/normlzr.h>
+#include <unicode/unorm.h>
+
+#include <utf8nfc.h>
+#include <swbuf.h>
+
+SWORD_NAMESPACE_START
+
+UTF8NFC::UTF8NFC() {
+        conv = ucnv_open("UTF-8", &err);
+}
+
+UTF8NFC::~UTF8NFC() {
+         ucnv_close(conv);
+}
+
+char UTF8NFC::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return -1;
+        
+	UErrorCode status = U_ZERO_ERROR;
+	UnicodeString source(text.getRawData(), text.length(), conv, status);
+	UnicodeString target;
+
+	status = U_ZERO_ERROR;
+	Normalizer::normalize(source, UNORM_NFC, 0, target, status);
+
+	status = U_ZERO_ERROR;
+	text.setSize(text.size()*2); // potentially, it can grow to 2x the original size
+	int32_t len = target.extract(text.getRawData(), text.size(), conv, status);
+	text.setSize(len);
+
+	return 0;
+}
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/src/modules/filters/utf8nfkd.cpp b/src/modules/filters/utf8nfkd.cpp
new file mode 100644
index 0000000..e4454d2
--- /dev/null
+++ b/src/modules/filters/utf8nfkd.cpp
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  utf8nfkd.cpp -	SWFilter descendant to perform NFKD (compatability
+ *			decomposition normalization) on UTF-8 text
+ *
+ * $Id: utf8nfkd.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _ICU_
+
+#include <stdlib.h>
+
+#include <utilstr.h>
+
+#include <utf8nfkd.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+UTF8NFKD::UTF8NFKD() {
+        conv = ucnv_open("UTF-8", &err);
+}
+
+
+UTF8NFKD::~UTF8NFKD() {
+         ucnv_close(conv);
+}
+
+
+char UTF8NFKD::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	if ((unsigned long)key < 2)	// hack, we're en(1)/de(0)ciphering
+		return -1;
+        
+	int32_t len =  5 + text.length() * 5;
+        source = new UChar[len + 1]; //each char could become a surrogate pair
+
+	// Convert UTF-8 string to UTF-16 (UChars)
+        int32_t ulen = ucnv_toUChars(conv, source, len, text.c_str(), -1, &err);
+        target = new UChar[len + 1];
+
+        //compatability decomposition
+        ulen = unorm_normalize(source, ulen, UNORM_NFKD, 0, target, len, &err);
+
+	   text.setSize(len);
+	   len = ucnv_fromUChars(conv, text.getRawData(), len, target, ulen, &err);
+	   text.setSize(len);
+
+	   delete [] source;
+	   delete [] target;
+
+	return 0;
+}
+
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/src/modules/filters/utf8transliterator.cpp b/src/modules/filters/utf8transliterator.cpp
new file mode 100644
index 0000000..b5b1902
--- /dev/null
+++ b/src/modules/filters/utf8transliterator.cpp
@@ -0,0 +1,927 @@
+/******************************************************************************
+ *
+ *  utf8transliterator.cpp -	SWFilter descendant to transliterate between
+ *				ICU-supported scripts
+ *
+ * $Id: utf8transliterator.cpp 2908 2013-07-17 22:44:29Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _ICU_
+
+#include <stdlib.h>
+
+#include <utilstr.h>
+
+#include <unicode/ucnv.h>
+#include <unicode/uchar.h>
+#include <utf8transliterator.h>
+#include <swmodule.h>
+
+#ifndef _ICUSWORD_
+#include "unicode/resbund.h"
+#endif
+#include <swlog.h>
+
+SWORD_NAMESPACE_START
+
+const char UTF8Transliterator::optionstring[NUMTARGETSCRIPTS][16] = {
+        "Off",
+        "Latin",
+        /*
+        "IPA",
+        "Basic Latin",
+        "SBL",
+        "TC",
+        "Beta",
+        "BGreek",
+        "SERA",
+        "Hugoye",
+        "UNGEGN",
+        "ISO",
+        "ALA-LC",
+        "BGN",
+        "Greek",
+        "Hebrew",
+        "Cyrillic",
+        "Arabic",
+        "Syriac",
+        "Katakana",
+        "Hiragana",
+        "Hangul",
+        "Devanagari",
+        "Tamil",
+        "Bengali",
+        "Gurmukhi",
+        "Gujarati",
+        "Oriya",
+        "Telugu",
+        "Kannada",
+        "Malayalam",
+        "Thai",
+        "Georgian",
+        "Armenian",
+        "Ethiopic",
+        "Gothic",
+        "Ugaritic",
+        "Coptic",
+        "Linear B",
+        "Cypriot",
+        "Runic",
+        "Ogham",
+        "Thaana",
+        "Glagolitic",
+        "Cherokee",
+        */
+};
+
+const char UTF8Transliterator::optName[] = "Transliteration";
+const char UTF8Transliterator::optTip[] = "Transliterates between scripts";
+
+#ifdef ICU_CUSTOM_RESOURCE_BUILDING
+SWTransMap UTF8Transliterator::transMap;
+
+#ifndef _ICUSWORD_
+
+const char UTF8Transliterator::SW_RB_RULE_BASED_IDS[] = "RuleBasedTransliteratorIDs";
+const char UTF8Transliterator::SW_RB_RULE[] = "Rule";
+#ifdef SWICU_DATA
+const char UTF8Transliterator::SW_RESDATA[] = SWICU_DATA;
+#else
+const char UTF8Transliterator::SW_RESDATA[] = "/usr/local/lib/sword/";
+#endif
+
+class SWCharString {
+ public:
+    inline SWCharString(const UnicodeString& str);
+    inline ~SWCharString();
+    inline operator const char*() { return ptr; }
+ private:
+    char buf[128];
+    char* ptr;
+};
+SWCharString::SWCharString(const UnicodeString& str) {
+    // TODO This isn't quite right -- we should probably do
+    // preflighting here to determine the real length.
+    if (str.length() >= (int32_t)sizeof(buf)) {
+        ptr = new char[str.length() + 8];
+    } else {
+        ptr = buf;
+    }
+    str.extract(0, 0x7FFFFFFF, ptr, "");
+}
+
+SWCharString::~SWCharString() {
+    if (ptr != buf) {
+        delete[] ptr;
+    }
+}
+
+#endif // _ICUSWORD_
+#endif // ICU_CUSTOM_RESOURCE_BUILDING
+
+UTF8Transliterator::UTF8Transliterator() {
+	option = 0;
+        unsigned long i;
+	for (i = 0; i < NUMTARGETSCRIPTS; i++) {
+		options.push_back(optionstring[i]);
+	}
+#ifdef ICU_CUSTOM_RESOURCE_BUILDING
+#ifndef _ICUSWORD_
+	utf8status = U_ZERO_ERROR;
+	Load(utf8status);
+#endif
+#endif
+}
+
+
+UTF8Transliterator::~UTF8Transliterator() {
+}
+
+#ifdef ICU_CUSTOM_RESOURCE_BUILDING
+void UTF8Transliterator::Load(UErrorCode &status)
+{
+#ifndef _ICUSWORD_
+	static const char translit_swordindex[] = "translit_swordindex";
+	
+	UResourceBundle *bundle = 0, *transIDs = 0, *colBund = 0;
+	bundle = ures_openDirect(SW_RESDATA, translit_swordindex, &status);
+	if (U_FAILURE(status)) {
+		SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: no resource index to load");
+		SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: status %s", u_errorName(status));
+		return;
+	}
+
+	transIDs = ures_getByKey(bundle, SW_RB_RULE_BASED_IDS, 0, &status);
+	//UParseError parseError;
+
+	int32_t row, maxRows;
+	if (U_SUCCESS(status)) {
+		maxRows = ures_getSize(transIDs);
+        	for (row = 0; row < maxRows; row++) {
+			colBund = ures_getByIndex(transIDs, row, 0, &status);
+
+			if (U_SUCCESS(status) && ures_getSize(colBund) == 4) {
+				UnicodeString id = ures_getUnicodeStringByIndex(colBund, 0, &status);
+                        	UChar type = ures_getUnicodeStringByIndex(colBund, 1, &status).charAt(0);
+				UnicodeString resString = ures_getUnicodeStringByIndex(colBund, 2, &status);
+                        	SWLog::getSystemLog()->logDebug("ok so far");
+
+				 if (U_SUCCESS(status)) {
+					switch (type) {
+					case 0x66: // 'f'
+					case 0x69: // 'i'
+						// 'file' or 'internal';
+						// row[2]=resource, row[3]=direction
+						{
+							//UBool visible = (type == 0x0066 /*f*/);
+							UTransDirection dir =
+								(ures_getUnicodeStringByIndex(colBund, 3, &status).charAt(0) ==
+								0x0046 /*F*/) ?
+								UTRANS_FORWARD : UTRANS_REVERSE;
+		                                        //registry->put(id, resString, dir, visible);
+							SWLog::getSystemLog()->logDebug("instantiating %s ...", resString.getBuffer());
+					    		registerTrans(id, resString, dir, status);
+							SWLog::getSystemLog()->logDebug("done.");
+	                                	}
+						break;
+					case 0x61: // 'a'
+                	                	// 'alias'; row[2]=createInstance argument
+                        	        	//registry->put(id, resString, TRUE);
+                                		break;
+					}
+        	                 }
+                	         else SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Failed to get resString");
+	                }
+			else SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Failed to get row");
+			ures_close(colBund);
+		}
+	}
+	else
+	{
+		SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: no resource index to load");
+		SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: status %s", u_errorName(status));
+	}
+
+	ures_close(transIDs);
+	ures_close(bundle);
+
+#endif // _ICUSWORD_
+}
+
+void  UTF8Transliterator::registerTrans(const UnicodeString& ID, const UnicodeString& resource,
+		UTransDirection dir, UErrorCode &status )
+{
+#ifndef _ICUSWORD_
+		SWLog::getSystemLog()->logDebug("registering ID locally %s", ID.getBuffer());
+		SWTransData swstuff;
+		swstuff.resource = resource;
+		swstuff.dir = dir;
+		SWTransPair swpair;
+		swpair.first = ID;
+		swpair.second = swstuff;
+		transMap.insert(swpair);
+#endif
+}
+
+bool UTF8Transliterator::checkTrans(const UnicodeString& ID, UErrorCode &status )
+{
+#ifndef _ICUSWORD_
+		Transliterator *trans = Transliterator::createInstance(ID, UTRANS_FORWARD, status);
+		if (!U_FAILURE(status))
+		{
+			// already have it, clean up and return true
+			SWLog::getSystemLog()->logDebug("already have it %s", ID.getBuffer());
+			delete trans;
+			return true;
+		}
+		status = U_ZERO_ERROR;
+	
+	SWTransMap::iterator swelement;
+	if ((swelement = transMap.find(ID)) != transMap.end())
+	{
+		SWLog::getSystemLog()->logDebug("found element in map");
+		SWTransData swstuff = (*swelement).second;
+		UParseError parseError;
+		//UErrorCode status;
+		//std::cout << "unregistering " << ID << std::endl;
+		//Transliterator::unregister(ID);
+		SWLog::getSystemLog()->logDebug("resource is %s", swstuff.resource.getBuffer());
+
+		// Get the rules
+		//std::cout << "importing: " << ID << ", " << resource << std::endl;
+		SWCharString ch(swstuff.resource);
+		UResourceBundle *bundle = ures_openDirect(SW_RESDATA, ch, &status);
+		const UnicodeString rules = ures_getUnicodeStringByKey(bundle, SW_RB_RULE, &status);
+		ures_close(bundle);
+		//parser.parse(rules, isReverse ? UTRANS_REVERSE : UTRANS_FORWARD,
+		//        parseError, status);
+		if (U_FAILURE(status)) {
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Failed to get rules");
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: status %s", u_errorName(status));
+			return false;
+		}
+
+		
+		Transliterator *trans = Transliterator::createFromRules(ID, rules, swstuff.dir,
+			parseError,status);
+		if (U_FAILURE(status)) {
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Failed to create transliterator");
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: status %s", u_errorName(status));
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Parse error: line %s", parseError.line);
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Parse error: offset %d", parseError.offset);
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Parse error: preContext %s", *parseError.preContext);
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: Parse error: postContext %s", *parseError.postContext);
+			SWLog::getSystemLog()->logError("UTF8Transliterator: ICU: rules were");
+//			SWLog::getSystemLog()->logError((const char *)rules);
+			return false;
+		}
+
+		Transliterator::registerInstance(trans);
+		return true;
+		
+		//Transliterator *trans = instantiateTrans(ID, swstuff.resource, swstuff.dir, parseError, status);
+		//return trans;
+	}
+	else
+	{
+		return false;
+	}
+#else
+return true;
+#endif // _ICUSWORD_
+}
+#endif // ICU_CUSTOM_RESOURCE_BUILDING
+
+bool UTF8Transliterator::addTrans(const char* newTrans, SWBuf* transList) {
+#ifdef ICU_CUSTOM_RESOURCE_BUILDING
+#ifdef _ICUSWORD_
+	UErrorCode status;
+	if (checkTrans(UnicodeString(newTrans), status)) {
+#endif
+#endif // ICU_CUSTOM_RESOURCE_BUILDING
+		*transList += newTrans;
+		*transList += ";";
+		return true;
+#ifdef ICU_CUSTOM_RESOURCE_BUILDING
+#ifdef _ICUSWORD_
+	}
+	else {
+    	return false;
+	}
+#endif
+#endif // ICU_CUSTOM_RESOURCE_BUILDING
+}
+
+
+Transliterator * UTF8Transliterator::createTrans(const UnicodeString& ID, UTransDirection dir, UErrorCode &status )
+{
+	Transliterator *trans = Transliterator::createInstance(ID,UTRANS_FORWARD,status);
+	if (U_FAILURE(status)) {
+		delete trans;
+		return NULL;
+	}
+	else {
+		return trans;
+	}
+}
+
+void UTF8Transliterator::setOptionValue(const char *ival)
+{
+	unsigned char i = option = NUMTARGETSCRIPTS;
+	while (i && stricmp(ival, optionstring[i])) {
+		i--;
+		option = i;
+	}
+}
+
+const char *UTF8Transliterator::getOptionValue()
+{
+	return (NUMTARGETSCRIPTS > option) ? optionstring[option] : 0;
+}
+
+char UTF8Transliterator::processText(SWBuf &text, const SWKey *key, const SWModule *module)
+{
+	if (option) {	// if we want transliteration
+		unsigned long i, j;
+                UErrorCode err = U_ZERO_ERROR;
+                UConverter * conv = NULL;
+                conv = ucnv_open("UTF-8", &err);
+                SWBuf ID;
+
+                bool compat = false;
+
+		// Convert UTF-8 string to UTF-16 (UChars)
+                j = strlen(text);
+                int32_t len = (j * 2) + 1;
+                UChar *source = new UChar[len];
+                err = U_ZERO_ERROR;
+                len = ucnv_toUChars(conv, source, len, text, j, &err);
+                source[len] = 0;
+
+		// Figure out which scripts are used in the string
+		unsigned char scripts[NUMSCRIPTS];
+
+                for (i = 0; i < NUMSCRIPTS; i++) {
+                        scripts[i] = false;
+                }
+
+                for (i = 0; i < (unsigned long)len; i++) {
+                        j = ublock_getCode(source[i]);
+			scripts[SE_LATIN] = true;
+			switch (j) {
+			//case UBLOCK_BASIC_LATIN: scripts[SE_LATIN] = true; break;
+			case UBLOCK_GREEK: scripts[SE_GREEK] = true; break;
+			case UBLOCK_HEBREW: scripts[SE_HEBREW] = true; break;
+			case UBLOCK_CYRILLIC: scripts[SE_CYRILLIC] = true; break;
+			case UBLOCK_ARABIC: scripts[SE_ARABIC] = true; break;
+			case UBLOCK_SYRIAC: scripts[SE_SYRIAC] = true; break;
+			case UBLOCK_KATAKANA: scripts[SE_KATAKANA] = true; break;
+			case UBLOCK_HIRAGANA: scripts[SE_HIRAGANA] = true; break;
+			case UBLOCK_HANGUL_SYLLABLES: scripts[SE_HANGUL] = true; break;
+			case UBLOCK_HANGUL_JAMO: scripts[SE_JAMO] = true; break;
+			case UBLOCK_DEVANAGARI: scripts[SE_DEVANAGARI] = true; break;
+			case UBLOCK_TAMIL: scripts[SE_TAMIL] = true; break;
+			case UBLOCK_BENGALI: scripts[SE_BENGALI] = true; break;
+			case UBLOCK_GURMUKHI: scripts[SE_GURMUKHI] = true; break;
+			case UBLOCK_GUJARATI: scripts[SE_GUJARATI] = true; break;
+			case UBLOCK_ORIYA: scripts[SE_ORIYA] = true; break;
+			case UBLOCK_TELUGU: scripts[SE_TELUGU] = true; break;
+			case UBLOCK_KANNADA: scripts[SE_KANNADA] = true; break;
+			case UBLOCK_MALAYALAM: scripts[SE_MALAYALAM] = true; break;
+			case UBLOCK_THAI: scripts[SE_THAI] = true; break;
+			case UBLOCK_GEORGIAN: scripts[SE_GEORGIAN] = true; break;
+			case UBLOCK_ARMENIAN: scripts[SE_ARMENIAN] = true; break;
+			case UBLOCK_ETHIOPIC: scripts[SE_ETHIOPIC] = true; break;
+			case UBLOCK_GOTHIC: scripts[SE_GOTHIC] = true; break;
+			case UBLOCK_UGARITIC: scripts[SE_UGARITIC] = true; break;
+//			case UBLOCK_MEROITIC: scripts[SE_MEROITIC] = true; break;
+			case UBLOCK_LINEAR_B_SYLLABARY: scripts[SE_LINEARB] = true; break;
+			case UBLOCK_CYPRIOT_SYLLABARY: scripts[SE_CYPRIOT] = true; break;
+			case UBLOCK_RUNIC: scripts[SE_RUNIC] = true; break;
+			case UBLOCK_OGHAM: scripts[SE_OGHAM] = true; break;
+			case UBLOCK_THAANA: scripts[SE_THAANA] = true; break;
+			case UBLOCK_GLAGOLITIC: scripts[SE_GLAGOLITIC] = true; break;
+                        case UBLOCK_CHEROKEE: scripts[SE_CHEROKEE] = true; break;
+//			case UBLOCK_TENGWAR: scripts[SE_TENGWAR] = true; break;
+//			case UBLOCK_CIRTH: scripts[SE_CIRTH] = true; break;
+			case UBLOCK_CJK_RADICALS_SUPPLEMENT:
+			case UBLOCK_KANGXI_RADICALS:
+			case UBLOCK_IDEOGRAPHIC_DESCRIPTION_CHARACTERS:
+			case UBLOCK_CJK_SYMBOLS_AND_PUNCTUATION:
+			case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A:
+			case UBLOCK_CJK_UNIFIED_IDEOGRAPHS:
+                                scripts[SE_HAN] = true;
+                                break;
+			case UBLOCK_CJK_COMPATIBILITY:
+			case UBLOCK_CJK_COMPATIBILITY_IDEOGRAPHS:
+			case UBLOCK_CJK_COMPATIBILITY_FORMS:
+                                scripts[SE_HAN] = true;
+                                compat = true;
+        			break;
+			case UBLOCK_HANGUL_COMPATIBILITY_JAMO:
+                                scripts[SE_HANGUL] = true;
+                                compat = true;
+                                break;
+
+                        //default: scripts[SE_LATIN] = true;
+			}
+		}
+		scripts[option] = false; //turn off the reflexive transliteration
+
+		//return if we have no transliteration to do for this text
+                j = 0;
+               	for (i = 0; !j && i < NUMSCRIPTS; i++) {
+	        	if (scripts[i]) j++;
+        	}
+	       	if (!j) {
+                        ucnv_close(conv);
+                        return 0;
+                }
+
+                if (compat) {
+                        addTrans("NFKD", &ID);
+                }
+                else {
+                        addTrans("NFD", &ID);
+                }
+
+		//Simple X to Latin transliterators
+		if (scripts[SE_GREEK]) {
+			if (strnicmp (((SWModule*)module)->getLanguage(), "cop", 3)) {
+				if (option == SE_SBL)
+					addTrans("Greek-Latin/SBL", &ID);
+				else if (option == SE_TC)
+					addTrans("Greek-Latin/TC", &ID);
+				else if (option == SE_BETA)
+					addTrans("Greek-Latin/Beta", &ID);
+				else if (option == SE_BGREEK)
+					addTrans("Greek-Latin/BGreek", &ID);
+	                        else if (option == SE_UNGEGN)
+        	                	addTrans("Greek-Latin/UNGEGN", &ID);
+				else if (option == SE_ISO)
+        	                	addTrans("Greek-Latin/ISO", &ID);
+                                else if (option == SE_ALALC)
+        	                	addTrans("Greek-Latin/ALALC", &ID);
+                                else if (option == SE_BGN)
+        	                	addTrans("Greek-Latin/BGN", &ID);
+                                else if (option == SE_IPA)
+        	                	addTrans("Greek-IPA/Ancient", &ID);
+                                else {
+        	                	addTrans("Greek-Latin", &ID);
+					scripts[SE_LATIN] = true;
+                                }
+			}
+			else {
+				if (option == SE_SBL)
+					addTrans("Coptic-Latin/SBL", &ID);
+				else if (option == SE_TC)
+					addTrans("Coptic-Latin/TC", &ID);
+				else if (option == SE_BETA)
+					addTrans("Coptic-Latin/Beta", &ID);
+                                else if (option == SE_IPA)
+        	                	addTrans("Coptic-IPA", &ID);
+                                else {
+        	                	addTrans("Coptic-Latin", &ID);
+					scripts[SE_LATIN] = true;
+                                }
+			}
+		}
+		if (scripts[SE_HEBREW]) {
+                        if (option == SE_SBL)
+                                addTrans("Hebrew-Latin/SBL", &ID);
+                        else if (option == SE_TC)
+                                addTrans("Hebrew-Latin/TC", &ID);
+			else if (option == SE_BETA)
+				addTrans("Hebrew-Latin/Beta", &ID);
+                        else if (option == SE_UNGEGN)
+                                addTrans("Hebrew-Latin/UNGEGN", &ID);
+                        else if (option == SE_ALALC)
+                                addTrans("Hebrew-Latin/ALALC", &ID);
+                        else if (option == SE_SYRIAC)
+                                addTrans("Hebrew-Syriac", &ID);
+			else {
+				addTrans("Hebrew-Latin", &ID);
+                                scripts[SE_LATIN] = true;
+			}
+		}
+		if (scripts[SE_CYRILLIC]) {
+                	if (option == SE_GLAGOLITIC)
+                        	addTrans("Cyrillic-Glagolitic", &ID);
+                	else {
+				addTrans("Cyrillic-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_ARABIC]) {
+			addTrans("Arabic-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_SYRIAC]) {
+                        if (option == SE_TC)
+                                addTrans("Syriac-Latin/TC", &ID);
+                        else if (option == SE_BETA)
+        			addTrans("Syriac-Latin/Beta", &ID);
+                        else if (option == SE_HUGOYE)
+        			addTrans("Syriac-Latin/Hugoye", &ID);
+                        else if (option == SE_HEBREW)
+                                addTrans("Syriac-Hebrew", &ID);
+                        else {
+        			addTrans("Syriac-Latin", &ID);
+        			scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_THAI]) {
+			addTrans("Thai-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_GEORGIAN]) {
+                        if (option == SE_ISO)
+        			addTrans("Georgian-Latin/ISO", &ID);
+                        else if (option == SE_ALALC)
+        			addTrans("Georgian-Latin/ALALC", &ID);
+                        else if (option == SE_BGN)
+        			addTrans("Georgian-Latin/BGN", &ID);
+                        else if (option == SE_IPA)
+        			addTrans("Georgian-IPA", &ID);
+                        else {
+				addTrans("Georgian-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_ARMENIAN]) {
+                        if (option == SE_ISO)
+        			addTrans("Armenian-Latin/ISO", &ID);
+                        else if (option == SE_ALALC)
+        			addTrans("Armenian-Latin/ALALC", &ID);
+                        else if (option == SE_BGN)
+        			addTrans("Armenian-Latin/BGN", &ID);
+                        else if (option == SE_IPA)
+        			addTrans("Armenian-IPA", &ID);
+                        else {
+				addTrans("Armenian-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                	}
+		}
+		if (scripts[SE_ETHIOPIC]) {
+                        if (option == SE_UNGEGN)
+        			addTrans("Ethiopic-Latin/UNGEGN", &ID);
+                        else if (option == SE_ISO)
+        			addTrans("Ethiopic-Latin/ISO", &ID);
+                        else if (option == SE_ALALC)
+        			addTrans("Ethiopic-Latin/ALALC", &ID);
+                        else if (option == SE_SERA)
+        			addTrans("Ethiopic-Latin/SERA", &ID);
+                	else {
+				addTrans("Ethiopic-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_GOTHIC]) {
+                        if (option == SE_BASICLATIN)
+        			addTrans("Gothic-Latin/Basic", &ID);
+                        else if (option == SE_IPA)
+        			addTrans("Gothic-IPA", &ID);
+                	else {
+				addTrans("Gothic-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_UGARITIC]) {
+                	if (option == SE_SBL)
+                        	addTrans("Ugaritic-Latin/SBL", &ID);
+                        else {
+				addTrans("Ugaritic-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_MEROITIC]) {
+			addTrans("Meroitic-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_LINEARB]) {
+			addTrans("LinearB-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_CYPRIOT]) {
+			addTrans("Cypriot-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_RUNIC]) {
+			addTrans("Runic-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_OGHAM]) {
+			addTrans("Ogham-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_THAANA]) {
+			if (option == SE_ALALC)
+                        	addTrans("Thaana-Latin/ALALC", &ID);
+			else if (option == SE_BGN)
+                        	addTrans("Thaana-Latin/BGN", &ID);
+			else {
+				addTrans("Thaana-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_GLAGOLITIC]) {
+			if (option == SE_ISO)
+                        	addTrans("Glagolitic-Latin/ISO", &ID);
+			else if (option == SE_ALALC)
+                        	addTrans("Glagolitic-Latin/ALALC", &ID);
+			else if (option == SE_ALALC)
+                        	addTrans("Glagolitic-Cyrillic", &ID);
+			else {
+				addTrans("Glagolitic-Latin", &ID);
+				scripts[SE_LATIN] = true;
+                        }
+		}
+		if (scripts[SE_CHEROKEE]) {
+			addTrans("Cherokee-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_THAI]) {
+			addTrans("Thai-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_THAI]) {
+			addTrans("Thai-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+
+		if (scripts[SE_HAN]) {
+	        	if (!strnicmp (((SWModule*)module)->getLanguage(), "ja", 2)) {
+     				addTrans("Kanji-Romaji", &ID);
+			}
+			else {
+       				addTrans("Han-Latin", &ID);
+			}
+			scripts[SE_LATIN] = true;
+		}
+
+       		// Inter-Kana and Kana to Latin transliterators
+		if (option == SE_HIRAGANA && scripts[SE_KATAKANA]) {
+			addTrans("Katakana-Hiragana", &ID);
+			scripts[SE_HIRAGANA] = true;
+		}
+		else if (option == SE_KATAKANA && scripts[SE_HIRAGANA]) {
+			addTrans("Hiragana-Katakana", &ID);
+			scripts[SE_KATAKANA] = true;
+		}
+		else {
+        		if (scripts[SE_KATAKANA]) {
+	        		addTrans("Katakana-Latin", &ID);
+		        	scripts[SE_LATIN] = true;
+        		}
+	        	if (scripts[SE_HIRAGANA]) {
+		        	addTrans("Hiragana-Latin", &ID);
+			        scripts[SE_LATIN] = true;
+        		}
+                }
+
+		// Korean to Latin transliterators
+		if (scripts[SE_HANGUL]) {
+			addTrans("Hangul-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+		if (scripts[SE_JAMO]) {
+			addTrans("Jamo-Latin", &ID);
+			scripts[SE_LATIN] = true;
+		}
+
+		// Indic-Latin
+		if (option < SE_DEVANAGARI || option > SE_MALAYALAM) {
+			// Indic to Latin
+			if (scripts[SE_TAMIL]) {
+				addTrans("Tamil-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+			if (scripts[SE_BENGALI]) {
+				addTrans("Bengali-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+			if (scripts[SE_GURMUKHI]) {
+				addTrans("Gurmukhi-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+			if (scripts[SE_GUJARATI]) {
+				addTrans("Gujarati-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+			if (scripts[SE_ORIYA]) {
+				addTrans("Oriya-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+			if (scripts[SE_TELUGU]) {
+				addTrans("Telugu-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+			if (scripts[SE_KANNADA]) {
+				addTrans("Kannada-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+			if (scripts[SE_MALAYALAM]) {
+				addTrans("Malayalam-Latin", &ID);
+				scripts[SE_LATIN] = true;
+			}
+		}
+		else {
+			if (scripts[SE_LATIN]) {
+				addTrans("Latin-InterIndic", &ID);
+			}
+			if (scripts[SE_DEVANAGARI]) {
+				addTrans("Devanagari-InterIndic", &ID);
+			}
+			if (scripts[SE_TAMIL]) {
+				addTrans("Tamil-InterIndic", &ID);
+			}
+			if (scripts[SE_BENGALI]) {
+				addTrans("Bengali-InterIndic", &ID);
+			}
+			if (scripts[SE_GURMUKHI]) {
+				addTrans("Gurmurkhi-InterIndic", &ID);
+			}
+			if (scripts[SE_GUJARATI]) {
+				addTrans("Gujarati-InterIndic", &ID);
+			}
+			if (scripts[SE_ORIYA]) {
+				addTrans("Oriya-InterIndic", &ID);
+			}
+			if (scripts[SE_TELUGU]) {
+				addTrans("Telugu-InterIndic", &ID);
+			}
+			if (scripts[SE_KANNADA]) {
+				addTrans("Kannada-InterIndic", &ID);
+			}
+			if (scripts[SE_MALAYALAM]) {
+				addTrans("Malayalam-InterIndic", &ID);
+			}
+
+			switch(option) {
+			case SE_DEVANAGARI:
+				addTrans("InterIndic-Devanagari", &ID);
+				break;
+			case SE_TAMIL:
+				addTrans("InterIndic-Tamil", &ID);
+				break;
+			case SE_BENGALI:
+				addTrans("InterIndic-Bengali", &ID);
+				break;
+			case SE_GURMUKHI:
+				addTrans("InterIndic-Gurmukhi", &ID);
+				break;
+			case SE_GUJARATI:
+				addTrans("InterIndic-Gujarati", &ID);
+				break;
+			case SE_ORIYA:
+				addTrans("InterIndic-Oriya", &ID);
+				break;
+			case SE_TELUGU:
+				addTrans("InterIndic-Telugu", &ID);
+				break;
+			case SE_KANNADA:
+				addTrans("InterIndic-Kannada", &ID);
+				break;
+			case SE_MALAYALAM:
+				addTrans("InterIndic-Malayalam", &ID);
+				break;
+			default:
+				addTrans("InterIndic-Latin", &ID);
+				scripts[SE_LATIN] = true;
+				break;
+			}
+		}
+
+//		if (scripts[SE_TENGWAR]) {
+//			addTrans("Tengwar-Latin", &ID);
+//			scripts[SE_LATIN] = true;
+//		}
+//		if (scripts[SE_CIRTH]) {
+//			addTrans("Cirth-Latin", &ID);
+//			scripts[SE_LATIN] = true;
+//		}
+
+		if (scripts[SE_LATIN]) {
+                switch (option) {
+                        case SE_GREEK:
+				addTrans("Latin-Greek", &ID);
+                                break;
+                        case SE_HEBREW:
+				addTrans("Latin-Hebrew", &ID);
+                                break;
+                        case SE_CYRILLIC:
+				addTrans("Latin-Cyrillic", &ID);
+                                break;
+                        case SE_ARABIC:
+				addTrans("Latin-Arabic", &ID);
+                                break;
+                        case SE_SYRIAC:
+				addTrans("Latin-Syriac", &ID);
+                                break;
+                        case SE_THAI:
+				addTrans("Latin-Thai", &ID);
+                                break;
+                        case SE_GEORGIAN:
+				addTrans("Latin-Georgian", &ID);
+                                break;
+                        case SE_ARMENIAN:
+				addTrans("Latin-Armenian", &ID);
+                                break;
+                        case SE_ETHIOPIC:
+				addTrans("Latin-Ethiopic", &ID);
+                                break;
+                        case SE_GOTHIC:
+				addTrans("Latin-Gothic", &ID);
+                                break;
+                        case SE_UGARITIC:
+				addTrans("Latin-Ugaritic", &ID);
+                                break;
+                        case SE_COPTIC:
+				addTrans("Latin-Coptic", &ID);
+                                break;
+                        case SE_KATAKANA:
+				addTrans("Latin-Katakana", &ID);
+                                break;
+                        case SE_HIRAGANA:
+				addTrans("Latin-Hiragana", &ID);
+                                break;
+                        case SE_JAMO:
+				addTrans("Latin-Jamo", &ID);
+                                break;
+                        case SE_HANGUL:
+				addTrans("Latin-Hangul", &ID);
+                                break;
+                        case SE_MEROITIC:
+				addTrans("Latin-Meroitic", &ID);
+                                break;
+                        case SE_LINEARB:
+				addTrans("Latin-LinearB", &ID);
+                                break;
+                        case SE_CYPRIOT:
+				addTrans("Latin-Cypriot", &ID);
+                                break;
+                        case SE_RUNIC:
+				addTrans("Latin-Runic", &ID);
+                                break;
+                        case SE_OGHAM:
+				addTrans("Latin-Ogham", &ID);
+                                break;
+                        case SE_THAANA:
+				addTrans("Latin-Thaana", &ID);
+                                break;
+                        case SE_GLAGOLITIC:
+				addTrans("Latin-Glagolitic", &ID);
+                                break;
+                        case SE_CHEROKEE:
+				addTrans("Latin-Cherokee", &ID);
+                                break;
+//                        case SE_TENGWAR:
+//				addTrans("Latin-Tengwar", &ID);
+//                                break;
+//                        case SE_CIRTH:
+//				addTrans("Latin-Cirth", &ID);
+//                                break;
+                        }
+                }
+
+                if (option == SE_BASICLATIN) {
+                        addTrans("Any-Latin1", &ID);
+                }
+
+                addTrans("NFC", &ID);
+
+                err = U_ZERO_ERROR;
+                Transliterator * trans = createTrans(UnicodeString(ID), UTRANS_FORWARD, err);
+                if (trans && !U_FAILURE(err)) {
+                        UnicodeString target = UnicodeString(source);
+			trans->transliterate(target);
+			text.setSize(text.size()*2);
+			len = ucnv_fromUChars(conv, text.getRawData(), text.size(), target.getBuffer(), target.length(), &err);
+			text.setSize(len);
+			delete trans;
+                }
+                ucnv_close(conv);
+        }
+	return 0;
+}
+
+SWORD_NAMESPACE_END
+#endif
+
+
+
diff --git a/src/modules/filters/utf8utf16.cpp b/src/modules/filters/utf8utf16.cpp
new file mode 100644
index 0000000..be8ad4b
--- /dev/null
+++ b/src/modules/filters/utf8utf16.cpp
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  utf8utf16.cpp -	SWFilter descendant to convert UTF-8 to UTF-16
+ *
+ * $Id: utf8utf16.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <sysdata.h>
+#include <utf8utf16.h>
+#include <utilstr.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+
+UTF8UTF16::UTF8UTF16() {
+}
+
+
+char UTF8UTF16::processText(SWBuf &text, const SWKey *key, const SWModule *module) {
+	const unsigned char *from;
+	SWBuf orig = text;
+
+	from = (const unsigned char *)orig.c_str();
+
+	// -------------------------------
+	text = "";
+	while (*from) {
+
+		__u32 ch = getUniCharFromUTF8(&from);
+
+		if (!ch) continue;	// invalid char
+
+		if (ch < 0x10000) {
+			text.setSize(text.size()+2);
+			*((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)ch;
+		}
+		else {
+			__u16 utf16;
+			utf16 = (__s16)((ch - 0x10000) / 0x400 + 0xD800);
+			text.setSize(text.size()+4);
+			*((__u16 *)(text.getRawData()+(text.size()-4))) = utf16;
+			utf16 = (__s16)((ch - 0x10000) % 0x400 + 0xDC00);
+			*((__u16 *)(text.getRawData()+(text.size()-2))) = utf16;
+		}
+	}
+	text.setSize(text.size()+2);
+	*((__u16 *)(text.getRawData()+(text.size()-2))) = (__u16)0;
+	text.setSize(text.size()-2);
+	   
+	return 0;
+
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/genbook/Makefile b/src/modules/genbook/Makefile
new file mode 100644
index 0000000..1a2d00d
--- /dev/null
+++ b/src/modules/genbook/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/genbook/Makefile.am b/src/modules/genbook/Makefile.am
new file mode 100644
index 0000000..02f6ab1
--- /dev/null
+++ b/src/modules/genbook/Makefile.am
@@ -0,0 +1,5 @@
+genbookdir = $(top_srcdir)/src/modules/genbook
+
+libsword_la_SOURCES += $(genbookdir)/swgenbook.cpp
+
+include ../src/modules/genbook/rawgenbook/Makefile.am
diff --git a/src/modules/genbook/rawgenbook/Makefile b/src/modules/genbook/rawgenbook/Makefile
new file mode 100644
index 0000000..aab8056
--- /dev/null
+++ b/src/modules/genbook/rawgenbook/Makefile
@@ -0,0 +1,4 @@
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/genbook/rawgenbook/Makefile.am b/src/modules/genbook/rawgenbook/Makefile.am
new file mode 100644
index 0000000..a176d75
--- /dev/null
+++ b/src/modules/genbook/rawgenbook/Makefile.am
@@ -0,0 +1,4 @@
+rawgenbookdir = $(top_srcdir)/src/modules/genbook/rawgenbook
+
+libsword_la_SOURCES += $(rawgenbookdir)/rawgenbook.cpp
+
diff --git a/src/modules/genbook/rawgenbook/rawgenbook.cpp b/src/modules/genbook/rawgenbook/rawgenbook.cpp
new file mode 100644
index 0000000..6101241
--- /dev/null
+++ b/src/modules/genbook/rawgenbook/rawgenbook.cpp
@@ -0,0 +1,226 @@
+/******************************************************************************
+ *
+ *  rawgenbook.cpp -	code for class 'RawGenBook'- a module that reads raw
+ *			text files: ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawgenbook.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#include <stdio.h>
+#include <fcntl.h>
+
+#include <rawgenbook.h>
+#include <rawstr.h>
+#include <utilstr.h>
+#include <filemgr.h>
+#include <sysdata.h>
+#include <treekeyidx.h>
+#include <versetreekey.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * RawGenBook Constructor - Initializes data for instance of RawGenBook
+ *
+ * ENT:	iname - Internal name for module
+ *	idesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+RawGenBook::RawGenBook(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, const char *keyType)
+		: SWGenBook(iname, idesc, idisp, enc, dir, mark, ilang) {
+
+	char *buf = new char [ strlen (ipath) + 20 ];
+
+	path = 0;
+	stdstr(&path, ipath);
+	verseKey = !strcmp("VerseKey", keyType);
+
+	if (verseKey) setType("Biblical Texts");
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	delete key;
+	key = createKey();
+
+
+	sprintf(buf, "%s.bdt", path);
+	bdtfd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::RDWR, true);
+
+	delete [] buf;
+
+}
+
+
+/******************************************************************************
+ * RawGenBook Destructor - Cleans up instance of RawGenBook
+ */
+
+RawGenBook::~RawGenBook() {
+
+	FileMgr::getSystemFileMgr()->close(bdtfd);
+
+	if (path)
+		delete [] path;
+
+}
+
+
+bool RawGenBook::isWritable() const {
+	return ((bdtfd->getFd() > 0) && ((bdtfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * RawGenBook::getRawEntry	- Returns the correct verse when char * cast
+ *					is requested
+ *
+ * RET: string buffer with verse
+ */
+
+SWBuf &RawGenBook::getRawEntryBuf() const {
+
+	__u32 offset = 0;
+	__u32 size = 0;
+
+	const TreeKey &key = getTreeKey();
+
+	int dsize;
+	key.getUserData(&dsize);
+	entryBuf = "";
+	if (dsize > 7) {
+		memcpy(&offset, key.getUserData(), 4);
+		offset = swordtoarch32(offset);
+
+		memcpy(&size, key.getUserData() + 4, 4);
+		size = swordtoarch32(size);
+
+		entrySize = size;        // support getEntrySize call
+
+		entryBuf.setFillByte(0);
+		entryBuf.setSize(size);
+		bdtfd->seek(offset, SEEK_SET);
+		bdtfd->read(entryBuf.getRawData(), size);
+
+		rawFilter(entryBuf, 0);	// hack, decipher
+		rawFilter(entryBuf, &key);
+
+//		   if (!isUnicode())
+			SWModule::prepText(entryBuf);
+	}
+
+	return entryBuf;
+}
+
+
+void RawGenBook::setEntry(const char *inbuf, long len) {
+
+	__u32 offset = archtosword32(bdtfd->seek(0, SEEK_END));
+	__u32 size = 0;
+	TreeKeyIdx *key = ((TreeKeyIdx *)&(getTreeKey()));
+
+	char userData[8];
+
+	if (len < 0)
+		len = strlen(inbuf);
+
+	bdtfd->write(inbuf, len);
+
+	size = archtosword32(len);
+	memcpy(userData, &offset, 4);
+	memcpy(userData+4, &size, 4);
+	key->setUserData(userData, 8);
+	key->save();
+}
+
+
+void RawGenBook::linkEntry(const SWKey *inkey) {
+	TreeKeyIdx *srckey = 0;
+	TreeKeyIdx *key = ((TreeKeyIdx *)&(getTreeKey()));
+	// see if we have a VerseKey * or decendant
+	SWTRY {
+		srckey = SWDYNAMIC_CAST(TreeKeyIdx, inkey);
+	}
+	SWCATCH ( ... ) {}
+	// if we don't have a VerseKey * decendant, create our own
+	if (!srckey) {
+		srckey = (TreeKeyIdx *)createKey();
+		(*srckey) = *inkey;
+	}
+
+	key->setUserData(srckey->getUserData(), 8);
+	key->save();
+
+	if (inkey != srckey) // free our key if we created a VerseKey
+		delete srckey;
+}
+
+
+/******************************************************************************
+ * RawGenBook::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawGenBook::deleteEntry() {
+	TreeKeyIdx *key = ((TreeKeyIdx *)&(getTreeKey()));
+	key->remove();
+}
+
+
+char RawGenBook::createModule(const char *ipath) {
+	char *path = 0;
+	char *buf = new char [ strlen (ipath) + 20 ];
+	FileDesc *fd;
+	signed char retval;
+
+	stdstr(&path, ipath);
+
+	if ((path[strlen(path)-1] == '/') || (path[strlen(path)-1] == '\\'))
+		path[strlen(path)-1] = 0;
+
+	sprintf(buf, "%s.bdt", path);
+	FileMgr::removeFile(buf);
+	fd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::CREAT|FileMgr::WRONLY, FileMgr::IREAD|FileMgr::IWRITE);
+	fd->getFd();
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	retval = TreeKeyIdx::create(path);
+	delete [] path;
+	return retval;	
+}
+
+
+SWKey *RawGenBook::createKey() const {
+	TreeKey *tKey = new TreeKeyIdx(path);
+	if (verseKey) { SWKey *vtKey = new VerseTreeKey(tKey); delete tKey; return vtKey; }
+	return tKey;
+}
+
+bool RawGenBook::hasEntry(const SWKey *k) const {
+	TreeKey &key = getTreeKey(k);
+
+	int dsize;
+	key.getUserData(&dsize);
+	return (dsize > 7) && key.popError() == '\x00';
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/genbook/swgenbook.cpp b/src/modules/genbook/swgenbook.cpp
new file mode 100644
index 0000000..fef41ad
--- /dev/null
+++ b/src/modules/genbook/swgenbook.cpp
@@ -0,0 +1,100 @@
+/******************************************************************************
+ *
+ *  swgenbook.cpp -	Implementation of SWGenBook class
+ *
+ * $Id: swgenbook.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <swgenbook.h>
+#include <versetreekey.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * SWGenBook Constructor - Initializes data for instance of SWGenBook
+ *
+ * ENT:	imodname - Internal name for module
+ *	imoddesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+SWGenBook::SWGenBook(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang) : SWModule(imodname, imoddesc, idisp, (char *)"Generic Books", enc, dir, mark, ilang) {
+	tmpTreeKey = 0;
+}
+
+
+/******************************************************************************
+ * SWGenBook Destructor - Cleans up instance of SWGenBook
+ */
+
+SWGenBook::~SWGenBook() {
+	delete tmpTreeKey;
+}
+
+
+TreeKey &SWGenBook::getTreeKey(const SWKey *k) const {
+	const SWKey* thiskey = k?k:this->key;
+
+	TreeKey *key = 0;
+
+	SWTRY {
+		key = SWDYNAMIC_CAST(TreeKey, (thiskey));
+	}
+	SWCATCH ( ... ) {}
+
+	if (!key) {
+		ListKey *lkTest = 0;
+		SWTRY {
+			lkTest = SWDYNAMIC_CAST(ListKey, thiskey);
+		}
+		SWCATCH ( ... ) {	}
+		if (lkTest) {
+			SWTRY {
+				key = SWDYNAMIC_CAST(TreeKey, lkTest->getElement());
+				if (!key) {
+					VerseTreeKey *tkey = 0;
+					SWTRY {
+						tkey = SWDYNAMIC_CAST(VerseTreeKey, lkTest->getElement());
+					}
+					SWCATCH ( ... ) {}
+					if (tkey) key = tkey->getTreeKey();
+				}
+			}
+			SWCATCH ( ... ) {	}
+		}
+	}
+	if (!key) {
+		VerseTreeKey *tkey = 0;
+		SWTRY {
+			tkey = SWDYNAMIC_CAST(VerseTreeKey, (thiskey));
+		}
+		SWCATCH ( ... ) {}
+		if (tkey) key = tkey->getTreeKey();
+	}
+
+	if (!key) {
+		delete tmpTreeKey;
+		tmpTreeKey = (TreeKey *)createKey();
+		(*tmpTreeKey) = *(thiskey);
+		return (*tmpTreeKey);
+	}
+	else	return *key;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/lexdict/Makefile b/src/modules/lexdict/Makefile
new file mode 100644
index 0000000..1a2d00d
--- /dev/null
+++ b/src/modules/lexdict/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/lexdict/Makefile.am b/src/modules/lexdict/Makefile.am
new file mode 100644
index 0000000..8cfe68b
--- /dev/null
+++ b/src/modules/lexdict/Makefile.am
@@ -0,0 +1,7 @@
+lexdictdir = $(top_srcdir)/src/modules/lexdict
+
+libsword_la_SOURCES += $(lexdictdir)/swld.cpp
+
+include ../src/modules/lexdict/rawld/Makefile.am
+include ../src/modules/lexdict/rawld4/Makefile.am
+include ../src/modules/lexdict/zld/Makefile.am
diff --git a/src/modules/lexdict/rawld/Makefile b/src/modules/lexdict/rawld/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/lexdict/rawld/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/lexdict/rawld/Makefile.am b/src/modules/lexdict/rawld/Makefile.am
new file mode 100644
index 0000000..2a2d996
--- /dev/null
+++ b/src/modules/lexdict/rawld/Makefile.am
@@ -0,0 +1,4 @@
+rawlddir = $(top_srcdir)/src/modules/lexdict/rawld
+
+libsword_la_SOURCES += $(rawlddir)/rawld.cpp
+
diff --git a/src/modules/lexdict/rawld/rawld.cpp b/src/modules/lexdict/rawld/rawld.cpp
new file mode 100644
index 0000000..7446c10
--- /dev/null
+++ b/src/modules/lexdict/rawld/rawld.cpp
@@ -0,0 +1,201 @@
+/******************************************************************************
+ *
+ *  rawld.cpp -	code for class 'RawLD'- a module that reads raw lexicon and
+ *		dictionary files: *.dat *.idx
+ *
+ * $Id: rawld.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <fcntl.h>
+
+#include <utilstr.h>
+#include <rawstr.h>
+#include <rawld.h>
+#include <filemgr.h>
+
+#include <stdio.h>
+
+
+SWORD_NAMESPACE_START
+
+
+ /******************************************************************************
+ * RawLD Constructor - Initializes data for instance of RawLD
+ *
+ * ENT:	ipath	- path and filename of files (no extension)
+ *		iname	- Internal name for module
+ *		idesc	- Name to display to user for module
+ *		idisp	- Display object to use for displaying
+ */
+
+RawLD::RawLD(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool caseSensitive, bool strongsPadding) : RawStr(ipath, -1, caseSensitive), SWLD(iname, idesc, idisp, enc, dir, mark, ilang, strongsPadding)
+{
+}
+
+
+/******************************************************************************
+ * RawLD Destructor - Cleans up instance of RawLD
+ */
+
+RawLD::~RawLD()
+{
+}
+
+
+bool RawLD::isWritable() const {
+	 return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * RawLD::getEntry	- Looks up entry from data file.  'Snaps' to closest
+ *				entry and sets 'entrybuf'.
+ *
+ * ENT: away - number of entries offset from key (default = 0)
+ *
+ * RET: error status
+ */
+
+char RawLD::getEntry(long away) const
+{
+	__u32 start = 0;
+	__u16 size = 0;
+	char *idxbuf = 0;
+	char retval = 0;
+
+	char *buf = new char [ strlen(*key) + 6 ];
+	strcpy(buf, *key);
+
+	if (strongsPadding) strongsPad(buf);
+
+	if (!(retval = findOffset(buf, &start, &size, away))) {
+		readText(start, &size, &idxbuf, entryBuf);
+		rawFilter(entryBuf, 0);	// hack, decipher
+		rawFilter(entryBuf, key);
+		entrySize = size;        // support getEntrySize call
+		if (!key->isPersist())			// If we have our own key
+			*key = idxbuf;				// reset it to entry index buffer
+
+		stdstr(&entkeytxt, idxbuf);	// set entry key text that module 'snapped' to.
+		delete [] idxbuf;
+	}
+	else {
+		entryBuf = "";
+	}
+		
+	delete [] buf;
+	return retval;
+}
+
+
+/******************************************************************************
+ * RawLD::getRawEntry	- Returns the correct entry when char * cast
+ *							is requested
+ *
+ * RET: string buffer with entry
+ */
+
+SWBuf &RawLD::getRawEntryBuf() const {
+
+	char ret = getEntry();
+	if (!ret) {
+//		if (!isUnicode())
+			prepText(entryBuf);
+	}
+	else error = ret;
+
+	return entryBuf;
+}
+
+
+/******************************************************************************
+ * RawLD::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void RawLD::increment(int steps) {
+	char tmperror;
+
+	if (key->isTraversable()) {
+		*key += steps;
+		error = key->popError();
+		steps = 0;
+	}
+	
+	tmperror = (getEntry(steps)) ? KEYERR_OUTOFBOUNDS : 0;
+	error = (error)?error:tmperror;
+	*key = entkeytxt;
+}
+
+
+void RawLD::setEntry(const char *inbuf, long len) {
+	doSetText(*key, inbuf, len);
+}
+
+
+void RawLD::linkEntry(const SWKey *inkey) {
+	doLinkEntry(*key, *inkey);
+}
+
+
+/******************************************************************************
+ * RawFiles::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawLD::deleteEntry() {
+	doSetText(*key, "");
+}
+
+
+long RawLD::getEntryCount() const {
+	if (idxfd < 0) return 0;
+	return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE;
+}
+
+
+long RawLD::getEntryForKey(const char *key) const {
+	__u32 start, offset;
+	__u16 size;
+	
+	char *buf = new char [ strlen(key) + 6 ];
+	strcpy(buf, key);
+
+	if (strongsPadding) strongsPad(buf);
+	
+	findOffset(buf, &start, &size, 0, &offset);
+
+	delete [] buf;
+
+	return offset / IDXENTRYSIZE;
+}
+
+
+char *RawLD::getKeyForEntry(long entry) const {
+	char *key = 0;
+	getIDXBuf(entry * IDXENTRYSIZE, &key);
+	return key;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/lexdict/rawld4/Makefile b/src/modules/lexdict/rawld4/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/lexdict/rawld4/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/lexdict/rawld4/Makefile.am b/src/modules/lexdict/rawld4/Makefile.am
new file mode 100644
index 0000000..697e2e5
--- /dev/null
+++ b/src/modules/lexdict/rawld4/Makefile.am
@@ -0,0 +1,4 @@
+rawld4dir = $(top_srcdir)/src/modules/lexdict/rawld4
+
+libsword_la_SOURCES += $(rawld4dir)/rawld4.cpp
+
diff --git a/src/modules/lexdict/rawld4/rawld4.cpp b/src/modules/lexdict/rawld4/rawld4.cpp
new file mode 100644
index 0000000..1f81d83
--- /dev/null
+++ b/src/modules/lexdict/rawld4/rawld4.cpp
@@ -0,0 +1,199 @@
+/******************************************************************************
+ *
+ *  rawld4.cpp -	code for class 'RawLD'- a module that reads raw
+ *			lexicon and dictionary files: *.dat *.idx
+ *
+ * $Id: rawld4.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <fcntl.h>
+
+#include <filemgr.h>
+#include <utilstr.h>
+#include <rawstr4.h>
+#include <rawld4.h>
+
+#include <stdio.h>
+
+
+SWORD_NAMESPACE_START
+
+
+ /******************************************************************************
+ * RawLD Constructor - Initializes data for instance of RawLD
+ *
+ * ENT:	ipath	- path and filename of files (no extension)
+ *		iname	- Internal name for module
+ *		idesc	- Name to display to user for module
+ *		idisp	- Display object to use for displaying
+ */
+
+RawLD4::RawLD4(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool caseSensitive, bool strongsPadding) : RawStr4(ipath, -1, caseSensitive), SWLD(iname, idesc, idisp, enc, dir, mark, ilang, strongsPadding)
+{
+}
+
+
+/******************************************************************************
+ * RawLD Destructor - Cleans up instance of RawLD
+ */
+
+RawLD4::~RawLD4()
+{
+}
+
+
+bool RawLD4::isWritable() const {
+	return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * RawLD4::getEntry	- Looks up entry from data file.  'Snaps' to closest
+ *				entry and sets 'entrybuf'.
+ *
+ * ENT: away - number of entries offset from key (default = 0)
+ *
+ * RET: error status
+ */
+
+char RawLD4::getEntry(long away) const
+{
+	__u32 start  = 0;
+	__u32 size   = 0;
+	char *idxbuf = 0;
+	char retval  = 0;
+
+	char *buf = new char [ strlen(*key) + 6 ];
+	strcpy(buf, *key);
+
+	strongsPad(buf);
+
+	entryBuf = "";
+	if (!(retval = findOffset(buf, &start, &size, away))) {
+		readText(start, &size, &idxbuf, entryBuf);
+		rawFilter(entryBuf, 0);	// hack, decipher
+		rawFilter(entryBuf, key);
+		entrySize = size;        // support getEntrySize call
+		if (!key->isPersist())			// If we have our own key
+			*key = idxbuf;				// reset it to entry index buffer
+
+		stdstr(&entkeytxt, idxbuf);	// set entry key text that module 'snapped' to.
+		delete [] idxbuf;
+	}
+		
+	delete [] buf;
+	return retval;
+}
+
+
+/******************************************************************************
+ * RawLD4::getRawEntry	- Returns the correct entry when char * cast
+ *							is requested
+ *
+ * RET: string buffer with entry
+ */
+
+SWBuf &RawLD4::getRawEntryBuf() const {
+
+	char ret = getEntry();
+	if (!ret) {
+//		if (!isUnicode())
+			prepText(entryBuf);
+	}
+	else error = ret;
+
+	return entryBuf;
+}
+
+
+/******************************************************************************
+ * RawLD4::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void RawLD4::increment(int steps) {
+	char tmperror;
+
+	if (key->isTraversable()) {
+		*key += steps;
+		error = key->popError();
+		steps = 0;
+	}
+	
+	tmperror = (getEntry(steps)) ? KEYERR_OUTOFBOUNDS : 0;
+	error = (error)?error:tmperror;
+	*key = entkeytxt;
+}
+
+
+void RawLD4::setEntry(const char *inbuf, long len) {
+	doSetText(*key, inbuf, len);
+}
+
+
+void RawLD4::linkEntry(const SWKey *inkey) {
+	doLinkEntry(*key, *inkey);
+}
+
+
+/******************************************************************************
+ * RawFiles::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawLD4::deleteEntry() {
+	doSetText(*key, "");
+}
+
+
+long RawLD4::getEntryCount() const {
+	if (idxfd < 0) return 0;
+	return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE;
+}
+
+
+long RawLD4::getEntryForKey(const char *key) const {
+	__u32 start, offset;
+	__u32 size;
+
+	char *buf = new char [ strlen(key) + 6 ];
+	strcpy(buf, key);
+
+	strongsPad(buf);
+	
+	findOffset(buf, &start, &size, 0, &offset);
+
+	delete [] buf;
+
+	return offset / IDXENTRYSIZE;
+}
+
+
+char *RawLD4::getKeyForEntry(long entry) const {
+	char *key = 0;
+	getIDXBuf(entry * IDXENTRYSIZE, &key);
+	return key;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/lexdict/swld.cpp b/src/modules/lexdict/swld.cpp
new file mode 100644
index 0000000..5e1909b
--- /dev/null
+++ b/src/modules/lexdict/swld.cpp
@@ -0,0 +1,169 @@
+/******************************************************************************
+ *
+ *  swld.cpp -	code for base class 'SWLD'.  SWLD is the basis for all
+ *		types of Lexicon and Dictionary modules (hence the 'LD').
+ *
+ * $Id: swld.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <swld.h>
+#include <strkey.h>
+#include <swkey.h>
+
+
+SWORD_NAMESPACE_START
+
+
+/******************************************************************************
+ * SWLD Constructor - Initializes data for instance of SWLD
+ *
+ * ENT:	imodname - Internal name for module
+ *	imoddesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+SWLD::SWLD(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool strongsPadding) : SWModule(imodname, imoddesc, idisp, (char *)"Lexicons / Dictionaries", enc, dir, mark, ilang), strongsPadding(strongsPadding)
+{
+	delete key;
+	key = createKey();
+	entkeytxt = new char [1];
+	*entkeytxt = 0;
+}
+
+
+/******************************************************************************
+ * SWLD Destructor - Cleans up instance of SWLD
+ */
+
+SWLD::~SWLD()
+{
+	if (entkeytxt)
+		delete [] entkeytxt;
+}
+
+
+SWKey *SWLD::createKey() const { return new StrKey(); }
+
+
+/******************************************************************************
+ * SWLD::KeyText - Sets/gets module KeyText, getting from saved text if key is
+ *				persistent
+ *
+ * ENT:	ikeytext - value which to set keytext
+ *		[0] - only get
+ *
+ * RET:	pointer to keytext
+ */
+
+const char *SWLD::getKeyText() const {
+	if (key->isPersist()) {
+		getRawEntryBuf();	// force module key to snap to entry
+	}
+	return entkeytxt;
+}
+
+
+/******************************************************************************
+ * SWLD::setPosition(SW_POSITION)	- Positions this key if applicable
+ */
+
+void SWLD::setPosition(SW_POSITION p) {
+	if (!key->isTraversable()) {
+		switch (p) {
+		case POS_TOP:
+			*key = "";
+			break;
+		case POS_BOTTOM:
+			*key = "zzzzzzzzz";
+			break;
+		} 
+	}
+	else	*key = p;
+	getRawEntryBuf();
+}
+
+
+bool SWLD::hasEntry(const SWKey *key) const {
+	const char *key_str = *key;
+	char *buf = new char [ strlen(key_str) + 6 ];
+	strcpy(buf, key_str);
+
+	if (strongsPadding) strongsPad(buf);
+	
+	bool retVal = !strcmp(buf, getKeyForEntry(getEntryForKey(buf)));
+	delete buf;
+
+	return retVal;
+}
+
+
+/******************************************************************************
+ * SWLD::strongsPad	- Pads a key if (it-1) is 100% digits to 5 places
+ *						allows for final to be alpha, e.g. '123B'
+ *
+ * ENT: buf -	buffer to check and pad
+ */
+
+void SWLD::strongsPad(char *buf)
+{
+	char *check;
+	int size = 0;
+	int len = strlen(buf);
+	char subLet = 0;
+	bool bang = false, prefix=false;
+	if ((len < 9) && (len > 0)) {
+		// Handle initial G or H
+		if (*buf == 'G' || *buf == 'H' || *buf == 'g' || *buf == 'h') {
+			buf += 1;
+			len -= 1;
+			prefix = true;
+		}
+
+		for (check = buf; *(check); check++) {
+			if (!isdigit(*check))
+				break;
+			else size++;
+		}
+
+		if (size && ((size == len) || (size == len - 1) || (size == (len-2)))) {
+			if (*check == '!') {
+				bang = true;
+				check++;
+			}
+			if (isalpha(*check)) {
+				subLet = toupper(*check);
+				*(check-(bang?1:0)) = 0;
+			}
+			sprintf(buf, prefix?"%.4d":"%.5d", atoi(buf));
+			if (subLet) {
+				check = buf+(strlen(buf));
+				if (bang) {
+					*check++ = '!';
+				}
+				*check++ = subLet;
+				*check = 0;
+			}
+		}
+	}
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/lexdict/zld/Makefile b/src/modules/lexdict/zld/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/lexdict/zld/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/lexdict/zld/Makefile.am b/src/modules/lexdict/zld/Makefile.am
new file mode 100644
index 0000000..81e4d7c
--- /dev/null
+++ b/src/modules/lexdict/zld/Makefile.am
@@ -0,0 +1,4 @@
+zlddir = $(top_srcdir)/src/modules/lexdict/zld
+
+libsword_la_SOURCES += $(zlddir)/zld.cpp
+
diff --git a/src/modules/lexdict/zld/zld.cpp b/src/modules/lexdict/zld/zld.cpp
new file mode 100644
index 0000000..71919d4
--- /dev/null
+++ b/src/modules/lexdict/zld/zld.cpp
@@ -0,0 +1,199 @@
+/******************************************************************************
+ *
+ *  zld.cpp -	code for class 'zLD'- a module that reads zlib compressed
+ *		lexicon and dictionary files
+ *
+ * $Id: zld.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <fcntl.h>
+
+#include <utilstr.h>
+#include <zstr.h>
+#include <zld.h>
+#include <filemgr.h>
+
+#include <stdio.h>
+
+
+SWORD_NAMESPACE_START
+
+
+ /******************************************************************************
+ * RawLD Constructor - Initializes data for instance of RawLD
+ *
+ * ENT:	ipath	- path and filename of files (no extension)
+ *		iname	- Internal name for module
+ *		idesc	- Name to display to user for module
+ *		idisp	- Display object to use for displaying
+ */
+
+zLD::zLD(const char *ipath, const char *iname, const char *idesc, long blockCount, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, bool caseSensitive, bool strongsPadding) : zStr(ipath, -1, blockCount, icomp, caseSensitive), SWLD(iname, idesc, idisp, enc, dir, mark, ilang, strongsPadding) {
+
+}
+
+
+/******************************************************************************
+ * RawLD Destructor - Cleans up instance of RawLD
+ */
+
+zLD::~zLD() {
+	flushCache();
+}
+
+
+bool zLD::isWritable() const {
+	return ((idxfd->getFd() > 0) && ((idxfd->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * zLD::getEntry	- Looks up entry from data file.  'Snaps' to closest
+ *				entry and sets 'entrybuf'.
+ *
+ * ENT: away - number of entries offset from key (default = 0)
+ *
+ * RET: error status
+ */
+
+char zLD::getEntry(long away) const {
+	char *idxbuf = 0;
+	char *ebuf = 0;
+	char retval = 0;
+	long index;
+	unsigned long size;
+	char *buf = new char [ strlen(*key) + 6 ];
+	strcpy(buf, *key);
+
+	if (strongsPadding) strongsPad(buf);
+
+	entryBuf = "";
+	if (!(retval = findKeyIndex(buf, &index, away))) {
+		getText(index, &idxbuf, &ebuf);
+		size = strlen(ebuf) + 1;
+		entryBuf = ebuf;
+
+		rawFilter(entryBuf, key);
+
+		entrySize = size;        // support getEntrySize call
+		if (!key->isPersist())			// If we have our own key
+			*key = idxbuf;				// reset it to entry index buffer
+
+		stdstr(&entkeytxt, idxbuf);	// set entry key text that module 'snapped' to.
+		free(idxbuf);
+		free(ebuf);
+	}
+		
+	delete [] buf;
+	return retval;
+}
+
+
+/******************************************************************************
+ * zLD::getRawEntry	- Returns the correct entry when char * cast
+ *							is requested
+ *
+ * RET: string buffer with entry
+ */
+
+SWBuf &zLD::getRawEntryBuf() const {
+	if (!getEntry() /*&& !isUnicode()*/) {
+		prepText(entryBuf);
+	}
+
+	return entryBuf;
+}
+
+
+/******************************************************************************
+ * zLD::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void zLD::increment(int steps) {
+	char tmperror;
+
+	if (key->isTraversable()) {
+		*key += steps;
+		error = key->popError();
+		steps = 0;
+	}
+	
+	tmperror = (getEntry(steps)) ? KEYERR_OUTOFBOUNDS : 0;
+	error = (error)?error:tmperror;
+	*key = entkeytxt;
+}
+
+
+void zLD::setEntry(const char *inbuf, long len) {
+	setText(*key, inbuf, len);
+}
+
+
+void zLD::linkEntry(const SWKey *inkey) {
+	zStr::linkEntry(*key, *inkey);
+}
+
+
+/******************************************************************************
+ * RawFiles::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void zLD::deleteEntry() {
+	setText(*key, "");
+}
+
+
+long zLD::getEntryCount() const
+{
+	if (idxfd < 0) return 0;
+	return idxfd->seek(0, SEEK_END) / IDXENTRYSIZE;
+}
+
+
+long zLD::getEntryForKey(const char* key) const
+{
+	long offset;
+	char *buf = new char [ strlen(key) + 6 ];
+	strcpy(buf, key);
+
+	if (strongsPadding) strongsPad(buf);
+	
+	findKeyIndex(buf, &offset);
+
+	delete [] buf;
+
+	return offset/IDXENTRYSIZE;
+}
+
+
+char *zLD::getKeyForEntry(long entry) const
+{
+	char *key = 0;
+	getKeyFromIdxOffset(entry * IDXENTRYSIZE, &key);
+	return key;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/modules/swmodule.cpp b/src/modules/swmodule.cpp
new file mode 100644
index 0000000..6944c4e
--- /dev/null
+++ b/src/modules/swmodule.cpp
@@ -0,0 +1,1507 @@
+/******************************************************************************
+ *
+ *  swmodule.cpp -	code for base class 'SWModule'. SWModule is the basis
+ *			for all types of modules (e.g. texts, commentaries,
+ *			maps, lexicons, etc.)
+ *
+ * $Id: swmodule.cpp 2976 2013-09-10 14:09:44Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <vector>
+
+#include <swlog.h>
+#include <sysdata.h>
+#include <swmodule.h>
+#include <utilstr.h>
+#include <swfilter.h>
+#include <versekey.h>	// KLUDGE for Search
+#include <treekeyidx.h>	// KLUDGE for Search
+#include <swoptfilter.h>
+#include <filemgr.h>
+#include <stringmgr.h>
+#ifndef _MSC_VER
+#include <iostream>
+#endif
+
+#ifdef USECXX11REGEX
+#include <regex>
+#ifndef REG_ICASE
+#define REG_ICASE std::regex::icase
+#endif
+#else
+#include <regex.h>	// GNU
+#endif
+
+#ifdef USELUCENE
+#include <CLucene.h>
+
+//Lucence includes
+//#include "CLucene.h"
+//#include "CLucene/util/Reader.h"
+//#include "CLucene/util/Misc.h"
+//#include "CLucene/util/dirent.h"
+
+using namespace lucene::index;
+using namespace lucene::analysis;
+using namespace lucene::util;
+using namespace lucene::store;
+using namespace lucene::document;
+using namespace lucene::queryParser;
+using namespace lucene::search;
+#endif
+
+using std::vector;
+
+SWORD_NAMESPACE_START
+
+SWModule::StdOutDisplay SWModule::rawdisp;
+
+typedef std::list<SWBuf> StringList;
+
+/******************************************************************************
+ * SWModule Constructor - Initializes data for instance of SWModule
+ *
+ * ENT:	imodname - Internal name for module
+ *	imoddesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ *	imodtype - Type of Module (All modules will be displayed with
+ *			others of same type under their modtype heading
+ *	unicode  - if this module is unicode
+ */
+
+SWModule::SWModule(const char *imodname, const char *imoddesc, SWDisplay *idisp, const char *imodtype, SWTextEncoding encoding, SWTextDirection direction, SWTextMarkup markup, const char *imodlang) {
+	key       = createKey();
+	entryBuf  = "";
+	config    = &ownConfig;
+	modname   = 0;
+	error     = 0;
+	moddesc   = 0;
+	modtype   = 0;
+	modlang   = 0;
+	this->encoding = encoding;
+	this->direction = direction;
+	this->markup  = markup;
+	entrySize= -1;
+	disp     = (idisp) ? idisp : &rawdisp;
+	stdstr(&modname, imodname);
+	stdstr(&moddesc, imoddesc);
+	stdstr(&modtype, imodtype);
+	stdstr(&modlang, imodlang);
+	stripFilters = new FilterList();
+	rawFilters = new FilterList();
+	renderFilters = new FilterList();
+	optionFilters = new OptionFilterList();
+	encodingFilters = new FilterList();
+	skipConsecutiveLinks = true;
+	procEntAttr = true;
+}
+
+
+/******************************************************************************
+ * SWModule Destructor - Cleans up instance of SWModule
+ */
+
+SWModule::~SWModule()
+{
+	if (modname)
+		delete [] modname;
+	if (moddesc)
+		delete [] moddesc;
+	if (modtype)
+		delete [] modtype;
+	if (modlang)
+		delete [] modlang;
+
+	if (key) {
+		if (!key->isPersist())
+			delete key;
+	}
+
+	stripFilters->clear();
+	rawFilters->clear();
+	renderFilters->clear();
+	optionFilters->clear();
+	encodingFilters->clear();
+	entryAttributes.clear();
+
+	delete stripFilters;
+	delete rawFilters;
+	delete renderFilters;
+	delete optionFilters;
+	delete encodingFilters;
+}
+
+
+/******************************************************************************
+ * SWModule::createKey - Allocates a key of specific type for module
+ *
+ * RET:	pointer to allocated key
+ */
+
+SWKey *SWModule::createKey() const
+{
+	return new SWKey();
+}
+
+
+/******************************************************************************
+ * SWModule::popError - Gets and clears error status
+ *
+ * RET:	error status
+ */
+
+char SWModule::popError()
+{
+	char retval = error;
+
+	error = 0;
+	return retval;
+}
+
+
+/******************************************************************************
+ * SWModule::Name - Sets/gets module name
+ *
+ * ENT:	imodname - value which to set modname
+ *		[0] - only get
+ *
+ * RET:	pointer to modname
+ */
+
+const char *SWModule::getName() const {
+	return modname;
+}
+
+
+/******************************************************************************
+ * SWModule::Description - Sets/gets module description
+ *
+ * ENT:	imoddesc - value which to set moddesc
+ *		[0] - only get
+ *
+ * RET:	pointer to moddesc
+ */
+
+const char *SWModule::getDescription() const {
+	return moddesc;
+}
+
+
+/******************************************************************************
+ * SWModule::Type - Sets/gets module type
+ *
+ * ENT:	imodtype - value which to set modtype
+ *		[0] - only get
+ *
+ * RET:	pointer to modtype
+ */
+
+const char *SWModule::getType() const {
+	return modtype;
+}
+
+/******************************************************************************
+ * SWModule::getDirection - Sets/gets module direction
+ *
+ * ENT:	newdir - value which to set direction
+ *		[-1] - only get
+ *
+ * RET:	char direction
+ */
+char SWModule::getDirection() const {
+	return direction;
+}
+
+
+/******************************************************************************
+ * SWModule::Disp - Sets/gets display driver
+ *
+ * ENT:	idisp - value which to set disp
+ *		[0] - only get
+ *
+ * RET:	pointer to disp
+ */
+
+SWDisplay *SWModule::getDisplay() const {
+	return disp;
+}
+
+void SWModule::setDisplay(SWDisplay *idisp) {
+	disp = idisp;
+}
+
+/******************************************************************************
+ *  * SWModule::Display - Calls this modules display object and passes itself
+ *   *
+ *    * RET:   error status
+ *     */
+
+char SWModule::display() {
+	disp->display(*this);
+	return 0;
+}
+
+/******************************************************************************
+ * SWModule::getKey - Gets the key from this module that points to the position
+ *			record
+ *
+ * RET:	key object
+ */
+
+SWKey *SWModule::getKey() const {
+	return key;
+}
+
+
+/******************************************************************************
+ * SWModule::setKey - Sets a key to this module for position to a particular
+ *			record
+ *
+ * ENT:	ikey - key with which to set this module
+ *
+ * RET:	error status
+ */
+
+char SWModule::setKey(const SWKey *ikey) {
+	SWKey *oldKey = 0;
+
+	if (key) {
+		if (!key->isPersist())	// if we have our own copy
+			oldKey = key;
+	}
+
+	if (!ikey->isPersist()) {		// if we are to keep our own copy
+		 key = createKey();
+		*key = *ikey;
+	}
+	else	 key = (SWKey *)ikey;		// if we are to just point to an external key
+
+	if (oldKey)
+		delete oldKey;
+
+	return 0;
+}
+
+
+/******************************************************************************
+ * SWModule::setPosition(SW_POSITION)	- Positions this modules to an entry
+ *
+ * ENT:	p	- position (e.g. TOP, BOTTOM)
+ *
+ * RET: *this
+ */
+
+void SWModule::setPosition(SW_POSITION p) {
+	*key = p;
+	char saveError = key->popError();
+
+	switch (p) {
+	case POS_TOP:
+		(*this)++;
+		(*this)--;
+		break;
+
+	case POS_BOTTOM:
+		(*this)--;
+		(*this)++;
+		break;
+	}
+
+	error = saveError;
+}
+
+
+/******************************************************************************
+ * SWModule::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void SWModule::increment(int steps) {
+	(*key) += steps;
+	error = key->popError();
+}
+
+
+/******************************************************************************
+ * SWModule::decrement	- Decrements module key a number of entries
+ *
+ * ENT:	decrement	- Number of entries to jump backward
+ *
+ * RET: *this
+ */
+
+void SWModule::decrement(int steps) {
+	(*key) -= steps;
+	error = key->popError();
+}
+
+
+/******************************************************************************
+ * SWModule::Search 	- Searches a module for a string
+ *
+ * ENT:	istr		- string for which to search
+ * 	searchType	- type of search to perform
+ *				>=0 - regex
+ *				-1  - phrase
+ *				-2  - multiword
+ *				-3  - entryAttrib (eg. Word//Lemma./G1234/)	 (Lemma with dot means check components (Lemma.[1-9]) also)
+ *				-4  - clucene
+ *				-5  - multilemma window; flags = window size
+ * 	flags		- options flags for search
+ *	justCheckIfSupported	- if set, don't search, only tell if this
+ *							function supports requested search.
+ *
+ * RET: ListKey set to verses that contain istr
+ */
+
+ListKey &SWModule::search(const char *istr, int searchType, int flags, SWKey *scope, bool *justCheckIfSupported, void (*percent)(char, void *), void *percentUserData) {
+
+	listKey.clear();
+	SWBuf term = istr;
+	bool includeComponents = false;	// for entryAttrib e.g., /Lemma.1/ 
+
+#ifdef USELUCENE
+	SWBuf target = getConfigEntry("AbsoluteDataPath");
+	if (!target.endsWith("/") && !target.endsWith("\\")) {
+		target.append('/');
+	}
+	target.append("lucene");
+#endif
+	if (justCheckIfSupported) {
+		*justCheckIfSupported = (searchType >= -3);
+#ifdef USELUCENE
+		if ((searchType == -4) && (IndexReader::indexExists(target.c_str()))) {
+			*justCheckIfSupported = true;
+		}
+#endif
+		return listKey;
+	}
+	
+	SWKey *saveKey   = 0;
+	SWKey *searchKey = 0;
+	SWKey *resultKey = createKey();
+	SWKey *lastKey   = createKey();
+	SWBuf lastBuf = "";
+
+#ifdef USECXX11REGEX
+	std::locale oldLocale;
+	std::locale::global(std::locale("en_US.UTF-8"));
+
+	std::regex preg;
+#else
+	regex_t preg;
+#endif
+
+	vector<SWBuf> words;
+	vector<SWBuf> window;
+	const char *sres;
+	terminateSearch = false;
+	char perc = 1;
+	bool savePEA = isProcessEntryAttributes();
+
+	// determine if we might be doing special strip searches.  useful for knowing if we can use shortcuts
+	bool specialStrips = (getConfigEntry("LocalStripFilter")
+			|| (getConfig().has("GlobalOptionFilter", "UTF8GreekAccents"))
+			|| (getConfig().has("GlobalOptionFilter", "UTF8HebrewPoints"))
+			|| (getConfig().has("GlobalOptionFilter", "UTF8ArabicPoints"))
+			|| (strchr(istr, '<')));
+
+	setProcessEntryAttributes(searchType == -3);
+	
+
+	if (!key->isPersist()) {
+		saveKey = createKey();
+		*saveKey = *key;
+	}
+	else	saveKey = key;
+
+	searchKey = (scope)?scope->clone():(key->isPersist())?key->clone():0;
+	if (searchKey) {
+		searchKey->setPersist(true);
+		setKey(*searchKey);
+	}
+
+	(*percent)(perc, percentUserData);
+
+	*this = BOTTOM;
+	long highIndex = key->getIndex();
+	if (!highIndex)
+		highIndex = 1;		// avoid division by zero errors.
+	*this = TOP;
+	if (searchType >= 0) {
+#ifdef USECXX11REGEX
+		preg = std::regex((SWBuf(".*")+istr+".*").c_str(), std::regex_constants::extended & flags);
+#else
+		flags |=searchType|REG_NOSUB|REG_EXTENDED;
+		regcomp(&preg, istr, flags);
+#endif
+	}
+
+	(*percent)(++perc, percentUserData);
+
+
+#ifdef USELUCENE
+	if (searchType == -4) {	// lucene
+		
+		lucene::index::IndexReader    *ir = 0;
+		lucene::search::IndexSearcher *is = 0;
+		Query                         *q  = 0;
+		Hits                          *h  = 0;
+		SWTRY {
+			ir = IndexReader::open(target);
+			is = new IndexSearcher(ir);
+			(*percent)(10, percentUserData);
+
+			const TCHAR *stopWords[] = { 0 };
+			standard::StandardAnalyzer analyzer(stopWords);
+			q = QueryParser::parse((wchar_t *)utf8ToWChar(istr).getRawData(), _T("content"), &analyzer);
+			(*percent)(20, percentUserData);
+			h = is->search(q);
+			(*percent)(80, percentUserData);
+
+			// iterate thru each good module position that meets the search
+			bool checkBounds = getKey()->isBoundSet();
+			for (unsigned long i = 0; i < (unsigned long)h->length(); i++) {
+				Document &doc = h->doc(i);
+
+				// set a temporary verse key to this module position
+				*resultKey = wcharToUTF8(doc.get(_T("key"))); //TODO Does a key always accept utf8?
+
+				// check to see if it sets ok (within our bounds) and if not, skip
+				if (checkBounds) {
+					*getKey() = *resultKey;
+					if (*getKey() != *resultKey) {
+						continue;
+					}
+				}
+				listKey << *resultKey;
+				listKey.getElement()->userData = (__u64)((__u32)(h->score(i)*100));
+			}
+			(*percent)(98, percentUserData);
+		}
+		SWCATCH (...) {
+			q = 0;
+			// invalid clucene query
+		}
+		delete h;
+		delete q;
+
+		delete is;
+		if (ir) {
+			ir->close();
+		}
+	}
+#endif
+
+	// some pre-loop processing
+	switch (searchType) {
+
+	// phrase
+	case -1:
+		// let's see if we're told to ignore case.  If so, then we'll touppstr our term
+		if ((flags & REG_ICASE) == REG_ICASE) toupperstr(term);
+		break;
+
+	// multi-word
+	case -2:
+	case -5:
+		// let's break the term down into our words vector
+		while (1) {
+			const char *word = term.stripPrefix(' ');
+			if (!word) {
+				words.push_back(term);
+				break;
+			}
+			words.push_back(word);
+		}
+		if ((flags & REG_ICASE) == REG_ICASE) {
+			for (unsigned int i = 0; i < words.size(); i++) {
+				toupperstr(words[i]);
+			}
+		}
+		break;
+
+	// entry attributes
+	case -3:
+		// let's break the attribute segs down.  We'll reuse our words vector for each segment
+		while (1) {
+			const char *word = term.stripPrefix('/');
+			if (!word) {
+				words.push_back(term);
+				break;
+			}
+			words.push_back(word);
+		}
+		if ((words.size()>2) && words[2].endsWith(".")) {
+			includeComponents = true;
+			words[2]--;
+		}
+		break;
+	}
+
+
+	// our main loop to iterate the module and find the stuff
+	perc = 5;
+	(*percent)(perc, percentUserData);
+
+	
+	while ((searchType != -4) && !popError() && !terminateSearch) {
+		long mindex = key->getIndex();
+		float per = (float)mindex / highIndex;
+		per *= 93;
+		per += 5;
+		char newperc = (char)per;
+		if (newperc > perc) {
+			perc = newperc;
+			(*percent)(perc, percentUserData);
+		}
+		else if (newperc < perc) {
+#ifndef _MSC_VER
+			std::cerr << "Serious error: new percentage complete is less than previous value\n";
+			std::cerr << "index: " << (key->getIndex()) << "\n";
+			std::cerr << "highIndex: " << highIndex << "\n";
+			std::cerr << "newperc ==" << (int)newperc << "%" << "is smaller than\n";
+			std::cerr << "perc == "  << (int )perc << "% \n";
+#endif
+		}
+		if (searchType >= 0) {
+			SWBuf textBuf = stripText();
+#ifdef USECXX11REGEX
+			if (std::regex_match(std::string(textBuf.c_str()), preg)) {
+#else
+			if (!regexec(&preg, textBuf, 0, 0, 0)) {
+#endif
+				*resultKey = *getKey();
+				resultKey->clearBound();
+				listKey << *resultKey;
+				lastBuf = "";
+			}
+#ifdef USECXX11REGEX
+			else if (std::regex_match(std::string((lastBuf + ' ' + textBuf).c_str()), preg)) {
+#else
+			else if (!regexec(&preg, lastBuf + ' ' + textBuf, 0, 0, 0)) {
+#endif
+				lastKey->clearBound();
+				listKey << *lastKey;
+				lastBuf = textBuf;
+			}
+			else {
+				lastBuf = textBuf;
+			}
+		}
+
+		// phrase
+		else {
+			SWBuf textBuf;
+			switch (searchType) {
+
+			// phrase
+			case -1:
+				textBuf = stripText();
+				if ((flags & REG_ICASE) == REG_ICASE) toupperstr(textBuf);
+				sres = strstr(textBuf.c_str(), term.c_str());
+				if (sres) { //it's also in the stripText(), so we have a valid search result item now
+					*resultKey = *getKey();
+					resultKey->clearBound();
+					listKey << *resultKey;
+				}
+				break;
+
+			// multiword
+			case -2: { // enclose our allocations
+				int loopCount = 0;
+				unsigned int foundWords = 0;
+				do {
+					textBuf = ((loopCount == 0)&&(!specialStrips)) ? getRawEntry() : stripText();
+					foundWords = 0;
+					
+					for (unsigned int i = 0; i < words.size(); i++) {
+						if ((flags & REG_ICASE) == REG_ICASE) toupperstr(textBuf);
+						sres = strstr(textBuf.c_str(), words[i].c_str());
+						if (!sres) {
+							break; //for loop
+						}
+						foundWords++;
+					}
+					
+					loopCount++;
+				} while ( (loopCount < 2) && (foundWords == words.size()));
+				
+				if ((loopCount == 2) && (foundWords == words.size())) { //we found the right words in both raw and stripped text, which means it's a valid result item
+					*resultKey = *getKey();
+					resultKey->clearBound();
+					listKey << *resultKey;
+				}
+				}
+				break;
+
+			// entry attributes
+			case -3: {
+				renderText();	// force parse
+				AttributeTypeList &entryAttribs = getEntryAttributes();
+				AttributeTypeList::iterator i1Start, i1End;
+				AttributeList::iterator i2Start, i2End;
+				AttributeValue::iterator i3Start, i3End;
+
+				if ((words.size()) && (words[0].length())) {
+// cout << "Word: " << words[0] << endl;
+				for (i1Start = entryAttribs.begin(); i1Start != entryAttribs.end(); ++i1Start) {
+// cout << "stuff: " << i1Start->first.c_str() << endl;
+				}
+					i1Start = entryAttribs.find(words[0]);
+					i1End = i1Start;
+					if (i1End != entryAttribs.end()) {
+						i1End++;
+					}
+				}
+				else {
+					i1Start = entryAttribs.begin();
+					i1End   = entryAttribs.end();
+				}
+				for (;i1Start != i1End; i1Start++) {
+					if ((words.size()>1) && (words[1].length())) {
+						i2Start = i1Start->second.find(words[1]);
+						i2End = i2Start;
+						if (i2End != i1Start->second.end())
+							i2End++;
+					}
+					else {
+						i2Start = i1Start->second.begin();
+						i2End   = i1Start->second.end();
+					}
+					for (;i2Start != i2End; i2Start++) {
+						if ((words.size()>2) && (words[2].length()) && (!includeComponents)) {
+							i3Start = i2Start->second.find(words[2]);
+							i3End = i3Start;
+							if (i3End != i2Start->second.end())
+								i3End++;
+						}
+						else {
+							i3Start = i2Start->second.begin();
+							i3End   = i2Start->second.end();
+						}
+						for (;i3Start != i3End; i3Start++) {
+							if ((words.size()>3) && (words[3].length())) {
+								if (includeComponents) {
+									SWBuf key = i3Start->first.c_str();
+									key = key.stripPrefix('.', true);
+									// we're iterating all 3 level keys, so be sure we match our
+									// prefix (e.g., Lemma, Lemma.1, Lemma.2, etc.)
+									if (key != words[2]) continue;
+								}
+								if (flags & SEARCHFLAG_MATCHWHOLEENTRY) {
+									bool found = !(((flags & REG_ICASE) == REG_ICASE) ? sword::stricmp(i3Start->second.c_str(), words[3]) : strcmp(i3Start->second.c_str(), words[3]));
+									sres = (found) ? i3Start->second.c_str() : 0;
+								}
+								else {
+									sres = ((flags & REG_ICASE) == REG_ICASE) ? stristr(i3Start->second.c_str(), words[3]) : strstr(i3Start->second.c_str(), words[3]);
+								}
+								if (sres) {
+									*resultKey = *getKey();
+									resultKey->clearBound();
+									listKey << *resultKey;
+									break;
+								}
+							}
+						}
+						if (i3Start != i3End)
+							break;
+					}
+					if (i2Start != i2End)
+						break;
+				}
+				break;
+			}
+			case -5:
+				AttributeList &words = getEntryAttributes()["Word"];
+				SWBuf kjvWord = "";
+				SWBuf bibWord = "";
+				for (AttributeList::iterator it = words.begin(); it != words.end(); it++) {
+					int parts = atoi(it->second["PartCount"]);
+					SWBuf lemma = "";
+					SWBuf morph = "";
+					for (int i = 1; i <= parts; i++) {
+						SWBuf key = "";
+						key = (parts == 1) ? "Lemma" : SWBuf().setFormatted("Lemma.%d", i).c_str();
+						AttributeValue::iterator li = it->second.find(key);
+						if (li != it->second.end()) {
+							if (i > 1) lemma += " ";
+							key = (parts == 1) ? "LemmaClass" : SWBuf().setFormatted("LemmaClass.%d", i).c_str();
+							AttributeValue::iterator lci = it->second.find(key);
+							if (lci != it->second.end()) {
+								lemma += lci->second + ":";
+							}
+							lemma += li->second;
+						}
+						key = (parts == 1) ? "Morph" : SWBuf().setFormatted("Morph.%d", i).c_str();
+						li = it->second.find(key);
+						// silly.  sometimes morph counts don't equal lemma counts
+						if (i == 1 && parts != 1 && li == it->second.end()) {
+							li = it->second.find("Morph");
+						}
+						if (li != it->second.end()) {
+							if (i > 1) morph += " ";
+							key = (parts == 1) ? "MorphClass" : SWBuf().setFormatted("MorphClass.%d", i).c_str();
+							AttributeValue::iterator lci = it->second.find(key);
+							// silly.  sometimes morph counts don't equal lemma counts
+							if (i == 1 && parts != 1 && lci == it->second.end()) {
+								lci = it->second.find("MorphClass");
+							}
+							if (lci != it->second.end()) {
+								morph += lci->second + ":";
+							}
+							morph += li->second;
+						}
+						// TODO: add src tags and maybe other attributes
+					}
+					while (window.size() < (unsigned)flags) {
+						
+					}
+				}
+				break;
+			} // end switch
+		}
+		*lastKey = *getKey();
+		(*this)++;
+	}
+	
+
+	// cleaup work
+	if (searchType >= 0) {
+#ifdef USECXX11REGEX
+		std::locale::global(oldLocale);
+#else
+		regfree(&preg);
+#endif
+	}
+
+	setKey(*saveKey);
+
+	if (!saveKey->isPersist())
+		delete saveKey;
+
+	if (searchKey)
+		delete searchKey;
+	delete resultKey;
+	delete lastKey;
+
+	listKey = TOP;
+	setProcessEntryAttributes(savePEA);
+
+
+	(*percent)(100, percentUserData);
+
+
+	return listKey;
+}
+
+
+/******************************************************************************
+ * SWModule::stripText() 	- calls all stripfilters on current text
+ *
+ * ENT:	buf	- buf to massage instead of this modules current text
+ * 	len	- max len of buf
+ *
+ * RET: this module's text at current key location massaged by Strip filters
+ */
+
+const char *SWModule::stripText(const char *buf, int len) {
+	static SWBuf local;
+	local = renderText(buf, len, false);
+	return local.c_str();
+}
+
+
+/** SWModule::getRenderHeader()	- Produces any header data which might be
+ *	useful which associated with the processing done with this filter.
+ *	A typical example is a suggested CSS style block for classed
+ *	containers.
+ */
+const char *SWModule::getRenderHeader() const {
+	FilterList::const_iterator first = getRenderFilters().begin();
+	if (first != getRenderFilters().end()) {
+		return (*first)->getHeader();
+	}
+	return "";
+}
+
+
+/******************************************************************************
+ * SWModule::renderText 	- calls all renderfilters on current text
+ *
+ * ENT:	buf	- buffer to Render instead of current module position
+ *
+ * RET: this module's text at current key location massaged by renderText filters
+ */
+
+ SWBuf SWModule::renderText(const char *buf, int len, bool render) {
+	bool savePEA = isProcessEntryAttributes();
+	if (!buf) {
+		entryAttributes.clear();
+	}
+	else {
+		setProcessEntryAttributes(false);
+	}
+
+	SWBuf local;
+	if (buf)
+		local = buf;
+
+	SWBuf &tmpbuf = (buf) ? local : getRawEntryBuf();
+	SWKey *key = 0;
+	static const char *null = "";
+
+	if (tmpbuf) {
+		unsigned long size = (len < 0) ? ((getEntrySize()<0) ? strlen(tmpbuf) : getEntrySize()) : len;
+		if (size > 0) {
+			key = (SWKey *)*this;
+
+			optionFilter(tmpbuf, key);
+	
+			if (render) {
+				renderFilter(tmpbuf, key);
+				encodingFilter(tmpbuf, key);
+			}
+			else	stripFilter(tmpbuf, key);
+		}
+	}
+	else {
+		tmpbuf = null;
+	}
+
+	setProcessEntryAttributes(savePEA);
+
+	return tmpbuf;
+}
+
+
+/******************************************************************************
+ * SWModule::renderText 	- calls all renderfilters on current text
+ *
+ * ENT:	tmpKey	- key to use to grab text
+ *
+ * RET: this module's text at current key location massaged by RenderFilers
+ */
+
+SWBuf SWModule::renderText(const SWKey *tmpKey) {
+	SWKey *saveKey;
+	const char *retVal;
+
+	if (!key->isPersist()) {
+		saveKey = createKey();
+		*saveKey = *key;
+	}
+	else	saveKey = key;
+
+	setKey(*tmpKey);
+
+	retVal = renderText();
+
+	setKey(*saveKey);
+
+	if (!saveKey->isPersist())
+		delete saveKey;
+
+	return retVal;
+}
+
+
+/******************************************************************************
+ * SWModule::stripText 	- calls all StripTextFilters on current text
+ *
+ * ENT:	tmpKey	- key to use to grab text
+ *
+ * RET: this module's text at specified key location massaged by Strip filters
+ */
+
+const char *SWModule::stripText(const SWKey *tmpKey) {
+	SWKey *saveKey;
+	const char *retVal;
+
+	if (!key->isPersist()) {
+		saveKey = createKey();
+		*saveKey = *key;
+	}
+	else	saveKey = key;
+
+	setKey(*tmpKey);
+
+	retVal = stripText();
+
+	setKey(*saveKey);
+
+	if (!saveKey->isPersist())
+		delete saveKey;
+
+	return retVal;
+}
+
+/******************************************************************************
+ * SWModule::getBibliography	-Returns bibliographic data for a module in the
+ *								requested format
+ *
+ * ENT: bibFormat format of the bibliographic data
+ *
+ * RET: bibliographic data in the requested format as a string (BibTeX by default)
+ */
+
+SWBuf SWModule::getBibliography(unsigned char bibFormat) const {
+	SWBuf s;
+	switch (bibFormat) {
+	case BIB_BIBTEX:
+		s.append("@Book {").append(modname).append(", Title = \"").append(moddesc).append("\", Publisher = \"CrossWire Bible Society\"}");
+		break;
+	}
+	return s;
+}
+
+const char *SWModule::getConfigEntry(const char *key) const {
+	ConfigEntMap::iterator it = config->find(key);
+	return (it != config->end()) ? it->second.c_str() : 0;
+}
+
+
+void SWModule::setConfig(ConfigEntMap *config) {
+	this->config = config;
+}
+
+
+bool SWModule::hasSearchFramework() {
+#ifdef USELUCENE
+	return true;
+#else
+	return SWSearchable::hasSearchFramework();
+#endif
+}
+
+void SWModule::deleteSearchFramework() {
+#ifdef USELUCENE
+	SWBuf target = getConfigEntry("AbsoluteDataPath");
+	if (!target.endsWith("/") && !target.endsWith("\\")) {
+		target.append('/');
+	}
+	target.append("lucene");
+
+	FileMgr::removeDir(target.c_str());
+#else
+	SWSearchable::deleteSearchFramework();
+#endif
+}
+
+
+signed char SWModule::createSearchFramework(void (*percent)(char, void *), void *percentUserData) {
+
+#ifdef USELUCENE
+	SWBuf target = getConfigEntry("AbsoluteDataPath");
+	if (!target.endsWith("/") && !target.endsWith("\\")) {
+		target.append('/');
+	}
+	target.append("lucene");
+	int status = FileMgr::createParent(target+"/dummy");
+	if (status) return -1;
+
+	SWKey *saveKey = 0;
+	SWKey *searchKey = 0;
+	SWKey textkey;
+	SWBuf c;
+
+	const int MAX_CONV_SIZE = 1024 * 1024;
+
+	// turn all filters to default values
+	StringList filterSettings;
+	for (OptionFilterList::iterator filter = optionFilters->begin(); filter != optionFilters->end(); filter++) {
+		filterSettings.push_back((*filter)->getOptionValue());
+		(*filter)->setOptionValue(*((*filter)->getOptionValues().begin()));
+
+		if ( (!strcmp("Greek Accents", (*filter)->getOptionName())) ||
+			(!strcmp("Hebrew Vowel Points", (*filter)->getOptionName())) ||
+			(!strcmp("Arabic Vowel Points", (*filter)->getOptionName()))
+		   ) {
+			(*filter)->setOptionValue("Off");
+		}
+	}
+
+
+	// be sure we give CLucene enough file handles
+	FileMgr::getSystemFileMgr()->flush();
+
+	// save key information so as not to disrupt original
+	// module position
+	if (!key->isPersist()) {
+		saveKey = createKey();
+		*saveKey = *key;
+	}
+	else	saveKey = key;
+
+	searchKey = (key->isPersist())?key->clone():0;
+	if (searchKey) {
+		searchKey->setPersist(1);
+		setKey(*searchKey);
+	}
+
+	RAMDirectory *ramDir = 0;
+	IndexWriter *coreWriter = 0;
+	IndexWriter *fsWriter = 0;
+	Directory *d = 0;
+
+	const TCHAR *stopWords[] = { 0 };
+	standard::StandardAnalyzer *an = new standard::StandardAnalyzer(stopWords);
+	bool includeKeyInSearch = getConfig().has("SearchOption", "IncludeKeyInSearch");
+
+	ramDir = new RAMDirectory();
+	coreWriter = new IndexWriter(ramDir, an, true);
+	coreWriter->setMaxFieldLength(MAX_CONV_SIZE);
+
+
+
+
+	char perc = 1;
+	VerseKey *vkcheck = 0;
+	vkcheck = SWDYNAMIC_CAST(VerseKey, key);
+	VerseKey *chapMax = 0;
+	if (vkcheck) chapMax = (VerseKey *)vkcheck->clone();
+
+	TreeKeyIdx *tkcheck = 0;
+	tkcheck = SWDYNAMIC_CAST(TreeKeyIdx, key);
+
+
+	*this = BOTTOM;
+	long highIndex = key->getIndex();
+	if (!highIndex)
+		highIndex = 1;		// avoid division by zero errors.
+
+	bool savePEA = isProcessEntryAttributes();
+	setProcessEntryAttributes(true);
+
+	// prox chapter blocks
+	// position module at the beginning
+	*this = TOP;
+
+	SWBuf proxBuf;
+	SWBuf proxLem;
+	SWBuf proxMorph;
+	SWBuf strong;
+	SWBuf morph;
+
+	char err = popError();
+	while (!err) {
+		long mindex = key->getIndex();
+
+		proxBuf = "";
+		proxLem = "";
+		proxMorph = "";
+
+		// computer percent complete so we can report to our progress callback
+		float per = (float)mindex / highIndex;
+		// between 5%-98%
+		per *= 93; per += 5;
+		char newperc = (char)per;
+		if (newperc > perc) {
+			perc = newperc;
+			(*percent)(perc, percentUserData);
+		}
+
+		// get "content" field
+		const char *content = stripText();
+
+		bool good = false;
+
+		// start out entry
+		Document *doc = new Document();
+		// get "key" field
+		SWBuf keyText = (vkcheck) ? vkcheck->getOSISRef() : getKeyText();
+		if (content && *content) {
+			good = true;
+
+
+			// build "strong" field
+			AttributeTypeList::iterator words;
+			AttributeList::iterator word;
+			AttributeValue::iterator strongVal;
+			AttributeValue::iterator morphVal;
+
+			strong="";
+			morph="";
+			words = getEntryAttributes().find("Word");
+			if (words != getEntryAttributes().end()) {
+				for (word = words->second.begin();word != words->second.end(); word++) {
+					int partCount = atoi(word->second["PartCount"]);
+					if (!partCount) partCount = 1;
+					for (int i = 0; i < partCount; i++) {
+						SWBuf tmp = "Lemma";
+						if (partCount > 1) tmp.appendFormatted(".%d", i+1);
+						strongVal = word->second.find(tmp);
+						if (strongVal != word->second.end()) {
+							// cheeze.  skip empty article tags that weren't assigned to any text
+							if (strongVal->second == "G3588") {
+								if (word->second.find("Text") == word->second.end())
+									continue;	// no text? let's skip
+							}
+							strong.append(strongVal->second);
+							morph.append(strongVal->second);
+							morph.append('@');
+							SWBuf tmp = "Morph";
+							if (partCount > 1) tmp.appendFormatted(".%d", i+1);
+							morphVal = word->second.find(tmp);
+							if (morphVal != word->second.end()) {
+								morph.append(morphVal->second);
+							}
+							strong.append(' ');
+							morph.append(' ');
+						}
+					}
+				}
+			}
+
+			doc->add(*_CLNEW Field(_T("key"), (wchar_t *)utf8ToWChar(keyText).getRawData(), Field::STORE_YES | Field::INDEX_UNTOKENIZED));
+
+			if (includeKeyInSearch) {
+				c = keyText;
+				c += " ";
+				c += content;
+				content = c.c_str();
+			}
+
+			doc->add(*_CLNEW Field(_T("content"), (wchar_t *)utf8ToWChar(content).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED));
+
+			if (strong.length() > 0) {
+				doc->add(*_CLNEW Field(_T("lemma"), (wchar_t *)utf8ToWChar(strong).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED));
+				doc->add(*_CLNEW Field(_T("morph"), (wchar_t *)utf8ToWChar(morph).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED));
+//printf("setting fields (%s).\ncontent: %s\nlemma: %s\n", (const char *)*key, content, strong.c_str());
+			}
+
+//printf("setting fields (%s).\n", (const char *)*key);
+//fflush(stdout);
+		}
+		// don't write yet, cuz we have to see if we're the first of a prox block (5:1 or chapter5/verse1
+
+		// for VerseKeys use chapter
+		if (vkcheck) {
+			*chapMax = *vkcheck;
+			// we're the first verse in a chapter
+			if (vkcheck->getVerse() == 1) {
+				*chapMax = MAXVERSE;
+				VerseKey saveKey = *vkcheck;
+				while ((!err) && (*vkcheck <= *chapMax)) {
+//printf("building proxBuf from (%s).\nproxBuf.c_str(): %s\n", (const char *)*key, proxBuf.c_str());
+//printf("building proxBuf from (%s).\n", (const char *)*key);
+
+					content = stripText();
+					if (content && *content) {
+						// build "strong" field
+						strong = "";
+						morph = "";
+						AttributeTypeList::iterator words;
+						AttributeList::iterator word;
+						AttributeValue::iterator strongVal;
+						AttributeValue::iterator morphVal;
+
+						words = getEntryAttributes().find("Word");
+						if (words != getEntryAttributes().end()) {
+							for (word = words->second.begin();word != words->second.end(); word++) {
+								int partCount = atoi(word->second["PartCount"]);
+								if (!partCount) partCount = 1;
+								for (int i = 0; i < partCount; i++) {
+									SWBuf tmp = "Lemma";
+									if (partCount > 1) tmp.appendFormatted(".%d", i+1);
+									strongVal = word->second.find(tmp);
+									if (strongVal != word->second.end()) {
+										// cheeze.  skip empty article tags that weren't assigned to any text
+										if (strongVal->second == "G3588") {
+											if (word->second.find("Text") == word->second.end())
+												continue;	// no text? let's skip
+										}
+										strong.append(strongVal->second);
+										morph.append(strongVal->second);
+										morph.append('@');
+										SWBuf tmp = "Morph";
+										if (partCount > 1) tmp.appendFormatted(".%d", i+1);
+										morphVal = word->second.find(tmp);
+										if (morphVal != word->second.end()) {
+											morph.append(morphVal->second);
+										}
+										strong.append(' ');
+										morph.append(' ');
+									}
+								}
+							}
+						}
+						proxBuf += content;
+						proxBuf.append(' ');
+						proxLem += strong;
+						proxMorph += morph;
+						if (proxLem.length()) {
+							proxLem.append("\n");
+							proxMorph.append("\n");
+						}
+					}
+					(*this)++;
+					err = popError();
+				}
+				err = 0;
+				*vkcheck = saveKey;
+			}
+		}
+
+		// for TreeKeys use siblings if we have no children
+		else if (tkcheck) {
+			if (!tkcheck->hasChildren()) {
+				if (!tkcheck->previousSibling()) {
+					do {
+//printf("building proxBuf from (%s).\n", (const char *)*key);
+//fflush(stdout);
+
+						content = stripText();
+						if (content && *content) {
+							// build "strong" field
+							strong = "";
+							morph = "";
+							AttributeTypeList::iterator words;
+							AttributeList::iterator word;
+							AttributeValue::iterator strongVal;
+							AttributeValue::iterator morphVal;
+
+							words = getEntryAttributes().find("Word");
+							if (words != getEntryAttributes().end()) {
+								for (word = words->second.begin();word != words->second.end(); word++) {
+									int partCount = atoi(word->second["PartCount"]);
+									if (!partCount) partCount = 1;
+									for (int i = 0; i < partCount; i++) {
+										SWBuf tmp = "Lemma";
+										if (partCount > 1) tmp.appendFormatted(".%d", i+1);
+										strongVal = word->second.find(tmp);
+										if (strongVal != word->second.end()) {
+											// cheeze.  skip empty article tags that weren't assigned to any text
+											if (strongVal->second == "G3588") {
+												if (word->second.find("Text") == word->second.end())
+													continue;	// no text? let's skip
+											}
+											strong.append(strongVal->second);
+											morph.append(strongVal->second);
+											morph.append('@');
+											SWBuf tmp = "Morph";
+											if (partCount > 1) tmp.appendFormatted(".%d", i+1);
+											morphVal = word->second.find(tmp);
+											if (morphVal != word->second.end()) {
+												morph.append(morphVal->second);
+											}
+											strong.append(' ');
+											morph.append(' ');
+										}
+									}
+								}
+							}
+
+							proxBuf += content;
+							proxBuf.append(' ');
+							proxLem += strong;
+							proxMorph += morph;
+							if (proxLem.length()) {
+								proxLem.append("\n");
+								proxMorph.append("\n");
+							}
+						}
+					} while (tkcheck->nextSibling());
+					tkcheck->parent();
+					tkcheck->firstChild();
+				}
+				else tkcheck->nextSibling();	// reposition from our previousSibling test
+			}
+		}
+
+		if (proxBuf.length() > 0) {
+
+			doc->add(*_CLNEW Field(_T("prox"), (wchar_t *)utf8ToWChar(proxBuf).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED));
+			good = true;
+		}
+		if (proxLem.length() > 0) {
+			doc->add(*_CLNEW Field(_T("proxlem"), (wchar_t *)utf8ToWChar(proxLem).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED) );
+			doc->add(*_CLNEW Field(_T("proxmorph"), (wchar_t *)utf8ToWChar(proxMorph).getRawData(), Field::STORE_NO | Field::INDEX_TOKENIZED) );
+			good = true;
+		}
+		if (good) {
+//printf("writing (%s).\n", (const char *)*key);
+//fflush(stdout);
+			coreWriter->addDocument(doc);
+		}
+		delete doc;
+
+		(*this)++;
+		err = popError();
+	}
+
+	// Optimizing automatically happens with the call to addIndexes
+	//coreWriter->optimize();
+	coreWriter->close();
+
+#ifdef CLUCENE2
+	d = FSDirectory::getDirectory(target.c_str());
+#endif
+	if (IndexReader::indexExists(target.c_str())) {
+#ifndef CLUCENE2
+		d = FSDirectory::getDirectory(target.c_str(), false);
+#endif
+		if (IndexReader::isLocked(d)) {
+			IndexReader::unlock(d);
+		}
+		fsWriter = new IndexWriter( d, an, false);
+	}
+	else {
+#ifndef CLUCENE2
+		d = FSDirectory::getDirectory(target.c_str(), true);
+#endif
+		fsWriter = new IndexWriter(d, an, true);
+	}
+
+	Directory *dirs[] = { ramDir, 0 };
+#ifdef CLUCENE2
+	lucene::util::ConstValueArray< lucene::store::Directory *>dirsa(dirs, 1);
+	fsWriter->addIndexes(dirsa);
+#else
+	fsWriter->addIndexes(dirs);
+#endif
+	fsWriter->close();
+
+	delete ramDir;
+	delete coreWriter;
+	delete fsWriter;
+	delete an;
+
+	// reposition module back to where it was before we were called
+	setKey(*saveKey);
+
+	if (!saveKey->isPersist())
+		delete saveKey;
+
+	if (searchKey)
+		delete searchKey;
+
+	delete chapMax;
+
+	setProcessEntryAttributes(savePEA);
+
+	// reset option filters back to original values
+	StringList::iterator origVal = filterSettings.begin();
+	for (OptionFilterList::iterator filter = optionFilters->begin(); filter != optionFilters->end(); filter++) {
+		(*filter)->setOptionValue(*origVal++);
+	}
+
+	return 0;
+#else
+	return SWSearchable::createSearchFramework(percent, percentUserData);
+#endif
+}
+
+/** OptionFilterBuffer a text buffer
+ * @param filters the FilterList of filters to iterate
+ * @param buf the buffer to filter
+ * @param key key location from where this buffer was extracted
+ */
+void SWModule::filterBuffer(OptionFilterList *filters, SWBuf &buf, const SWKey *key) const {
+	OptionFilterList::iterator it;
+	for (it = filters->begin(); it != filters->end(); it++) {
+		(*it)->processText(buf, key, this);
+	}
+}
+
+/** FilterBuffer a text buffer
+ * @param filters the FilterList of filters to iterate
+ * @param buf the buffer to filter
+ * @param key key location from where this buffer was extracted
+ */
+void SWModule::filterBuffer(FilterList *filters, SWBuf &buf, const SWKey *key) const {
+	FilterList::iterator it;
+	for (it = filters->begin(); it != filters->end(); it++) {
+		(*it)->processText(buf, key, this);
+	}
+}
+
+signed char SWModule::createModule(const char*) {
+	return -1;
+}
+
+void SWModule::setEntry(const char*, long) {
+}
+
+void SWModule::linkEntry(const SWKey*) {
+}
+
+
+/******************************************************************************
+ * SWModule::prepText	- Prepares the text before returning it to external
+ *					objects
+ *
+ * ENT:	buf	- buffer where text is stored and where to store the prep'd
+ *				text.
+ */
+
+void SWModule::prepText(SWBuf &buf) {
+	unsigned int to, from; 
+	char space = 0, cr = 0, realdata = 0, nlcnt = 0;
+	char *rawBuf = buf.getRawData();
+	for (to = from = 0; rawBuf[from]; from++) {
+		switch (rawBuf[from]) {
+		case 10:
+			if (!realdata)
+				continue;
+			space = (cr) ? 0 : 1;
+			cr = 0;
+			nlcnt++;
+			if (nlcnt > 1) {
+//				*to++ = nl;
+				rawBuf[to++] = 10;
+//				*to++ = nl[1];
+//				nlcnt = 0;
+			}
+			continue;
+		case 13:
+			if (!realdata)
+				continue;
+//			*to++ = nl[0];
+			rawBuf[to++] = 10;
+			space = 0;
+			cr = 1;
+			continue;
+		}
+		realdata = 1;
+		nlcnt = 0;
+		if (space) {
+			space = 0;
+			if (rawBuf[from] != ' ') {
+				rawBuf[to++] = ' ';
+				from--;
+				continue;
+			}
+		}
+		rawBuf[to++] = rawBuf[from];
+	}
+	buf.setSize(to);
+
+	while (to > 1) {			// remove trailing excess
+		to--;
+		if ((rawBuf[to] == 10) || (rawBuf[to] == ' '))
+			buf.setSize(to);
+		else break;
+	}
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/tests/Makefile b/src/modules/tests/Makefile
new file mode 100644
index 0000000..81f7721
--- /dev/null
+++ b/src/modules/tests/Makefile
@@ -0,0 +1,4 @@
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/tests/echomod.cpp b/src/modules/tests/echomod.cpp
new file mode 100644
index 0000000..4de772d
--- /dev/null
+++ b/src/modules/tests/echomod.cpp
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  echomod.cpp -	code for class 'EchoMod'- a dummy test text module
+ *			that just echos back the key
+ *
+ * $Id: echomod.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <echomod.h>
+
+
+SWORD_NAMESPACE_START
+
+EchoMod::EchoMod() : SWText("echomod", "Echos back key")
+{
+}
+
+
+EchoMod::~EchoMod() {
+}
+
+
+SWBuf &EchoMod::getRawEntryBuf() const
+{
+	static SWBuf retVal;
+	retVal = *key;
+	return retVal;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/texts/Makefile b/src/modules/texts/Makefile
new file mode 100644
index 0000000..1a2d00d
--- /dev/null
+++ b/src/modules/texts/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/texts/Makefile.am b/src/modules/texts/Makefile.am
new file mode 100644
index 0000000..f5d81b4
--- /dev/null
+++ b/src/modules/texts/Makefile.am
@@ -0,0 +1,7 @@
+textsdir = $(top_srcdir)/src/modules/texts
+
+libsword_la_SOURCES += $(textsdir)/swtext.cpp
+
+include ../src/modules/texts/rawtext/Makefile.am
+include ../src/modules/texts/rawtext4/Makefile.am
+include ../src/modules/texts/ztext/Makefile.am
diff --git a/src/modules/texts/rawtext/Makefile b/src/modules/texts/rawtext/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/texts/rawtext/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/texts/rawtext/Makefile.am b/src/modules/texts/rawtext/Makefile.am
new file mode 100644
index 0000000..5d77e44
--- /dev/null
+++ b/src/modules/texts/rawtext/Makefile.am
@@ -0,0 +1,2 @@
+rawtextdir = $(top_srcdir)/src/modules/texts/rawtext
+libsword_la_SOURCES += $(rawtextdir)/rawtext.cpp
diff --git a/src/modules/texts/rawtext/rawtext.cpp b/src/modules/texts/rawtext/rawtext.cpp
new file mode 100644
index 0000000..4fb716c
--- /dev/null
+++ b/src/modules/texts/rawtext/rawtext.cpp
@@ -0,0 +1,203 @@
+/******************************************************************************
+ *
+ *  rawtext.cpp -	code for class 'RawText'- a module that reads raw text
+ *			files:	ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawtext.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sysdata.h>
+
+#include <utilstr.h>
+#include <rawverse.h>
+#include <rawtext.h>
+#include <rawstr.h>
+#include <filemgr.h>
+#include <versekey.h>
+#include <stringmgr.h>
+
+#include <regex.h>	// GNU
+#include <map>
+#include <list>
+#include <algorithm>
+
+#ifndef USELUCENE
+using std::map;
+using std::list;
+using std::find;
+#endif
+
+SWORD_NAMESPACE_START
+
+#ifndef USELUCENE
+typedef  map < SWBuf, list<long> > strlist;
+typedef list<long> longlist;
+#endif
+
+/******************************************************************************
+ * RawText Constructor - Initializes data for instance of RawText
+ *
+ * ENT:	iname - Internal name for module
+ *	idesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+RawText::RawText(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, const char *versification)
+		: SWText(iname, idesc, idisp, enc, dir, mark, ilang, versification),
+		RawVerse(ipath) {
+}
+
+
+/******************************************************************************
+ * RawText Destructor - Cleans up instance of RawText
+ */
+
+RawText::~RawText() {
+}
+
+
+bool RawText::isWritable() const {
+	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * RawText::getRawEntry	- Returns the correct verse when char * cast
+ *					is requested
+ *
+ * RET: string buffer with verse
+ */
+
+SWBuf &RawText::getRawEntryBuf() const {
+	long  start = 0;
+	unsigned short size = 0;
+	VerseKey &key = getVerseKey();
+
+	findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size);
+	entrySize = size;        // support getEntrySize call
+
+	entryBuf = "";
+	readText(key.getTestament(), start, size, entryBuf);
+
+	rawFilter(entryBuf, 0);	// hack, decipher
+	rawFilter(entryBuf, &key);
+
+//	if (!isUnicode())
+		prepText(entryBuf);
+
+	return entryBuf;
+}
+
+
+void RawText::setEntry(const char *inbuf, long len) {
+	VerseKey &key = getVerseKey();
+	doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len);
+}
+
+
+void RawText::linkEntry(const SWKey *inkey) {
+	VerseKey &destkey = getVerseKey();
+	const VerseKey *srckey = &getVerseKey(inkey);
+	doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
+}
+
+
+/******************************************************************************
+ * RawText::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawText::deleteEntry() {
+	VerseKey &key = getVerseKey();
+	doSetText(key.getTestament(), key.getTestamentIndex(), "");
+}
+
+/******************************************************************************
+ * RawText::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void RawText::increment(int steps) {
+	long  start;
+	unsigned short size;
+	VerseKey *tmpkey = &getVerseKey();
+
+	findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
+
+	SWKey lastgood = *tmpkey;
+	while (steps) {
+		long laststart = start;
+		unsigned short lastsize = size;
+		SWKey lasttry = *tmpkey;
+		(steps > 0) ? ++(*key) : --(*key);
+		tmpkey = &getVerseKey();
+
+		if ((error = key->popError())) {
+			*key = lastgood;
+			break;
+		}
+		long index = tmpkey->getTestamentIndex();
+		findOffset(tmpkey->getTestament(), index, &start, &size);
+
+		if (
+			(
+				((laststart != start) || (lastsize != size))	// we're a different entry
+//				&& (start > 0)
+				&& (size)	// and we actually have a size
+			)
+			|| !skipConsecutiveLinks
+		) {	// or we don't want to skip consecutive links
+			steps += (steps < 0) ? 1 : -1;
+			lastgood = *tmpkey;
+		}
+	}
+	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
+}
+
+
+bool RawText::isLinked(const SWKey *k1, const SWKey *k2) const {
+	long start1, start2;
+	unsigned short size1, size2;
+	VerseKey *vk1 = &getVerseKey(k1);
+	VerseKey *vk2 = &getVerseKey(k2);
+	if (vk1->getTestament() != vk2->getTestament()) return false;
+
+	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
+	if (!size1 || !size2) return false;
+	return start1 == start2;
+}
+
+bool RawText::hasEntry(const SWKey *k) const {
+	long start;
+	unsigned short size;
+	VerseKey *vk = &getVerseKey(k);
+
+	findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
+	return size;
+}
+
+	
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/texts/rawtext4/Makefile b/src/modules/texts/rawtext4/Makefile
new file mode 100644
index 0000000..a08e07e
--- /dev/null
+++ b/src/modules/texts/rawtext4/Makefile
@@ -0,0 +1,5 @@
+

+root := ../../../..

+

+all:

+	make -C ${root}

diff --git a/src/modules/texts/rawtext4/Makefile.am b/src/modules/texts/rawtext4/Makefile.am
new file mode 100644
index 0000000..1f3791d
--- /dev/null
+++ b/src/modules/texts/rawtext4/Makefile.am
@@ -0,0 +1,2 @@
+rawtext4dir = $(top_srcdir)/src/modules/texts/rawtext4
+libsword_la_SOURCES += $(rawtext4dir)/rawtext4.cpp
diff --git a/src/modules/texts/rawtext4/rawtext4.cpp b/src/modules/texts/rawtext4/rawtext4.cpp
new file mode 100644
index 0000000..5980801
--- /dev/null
+++ b/src/modules/texts/rawtext4/rawtext4.cpp
@@ -0,0 +1,179 @@
+/******************************************************************************
+ *
+ *  rawtext4.cpp -	code for class 'RawText4'- a module that reads raw text
+ *			files: ot and nt using indexs ??.bks ??.cps ??.vss
+ *
+ * $Id: rawtext4.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sysdata.h>
+
+#include <utilstr.h>
+#include <rawverse4.h>
+#include <rawtext4.h>
+#include <rawstr4.h>
+#include <filemgr.h>
+#include <versekey.h>
+#include <stringmgr.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * RawText4 Constructor - Initializes data for instance of RawText4
+ *
+ * ENT:	iname - Internal name for module
+ *	idesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+RawText4::RawText4(const char *ipath, const char *iname, const char *idesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, const char *versification)
+		: SWText(iname, idesc, idisp, enc, dir, mark, ilang, versification),
+		RawVerse4(ipath) {
+}
+
+
+/******************************************************************************
+ * RawText4 Destructor - Cleans up instance of RawText4
+ */
+
+RawText4::~RawText4() {
+}
+
+
+bool RawText4::isWritable() const {
+	return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR));
+}
+
+
+/******************************************************************************
+ * RawText4::getRawEntry	- Returns the correct verse when char * cast
+ *					is requested
+ *
+ * RET: string buffer with verse
+ */
+
+SWBuf &RawText4::getRawEntryBuf() const {
+	long  start = 0;
+	unsigned long size = 0;
+	VerseKey &key = getVerseKey();
+
+	findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size);
+	entrySize = size;        // support getEntrySize call
+
+	entryBuf = "";
+	readText(key.getTestament(), start, size, entryBuf);
+
+	rawFilter(entryBuf, 0);	// hack, decipher
+	rawFilter(entryBuf, &key);
+
+//	if (!isUnicode())
+		prepText(entryBuf);
+
+	return entryBuf;
+}
+
+
+void RawText4::setEntry(const char *inbuf, long len) {
+	VerseKey &key = getVerseKey();
+	doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len);
+}
+
+
+void RawText4::linkEntry(const SWKey *inkey) {
+	VerseKey &destkey = getVerseKey();
+	const VerseKey *srckey = &getVerseKey(inkey);
+	doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
+}
+
+
+/******************************************************************************
+ * RawText4::deleteEntry	- deletes this entry
+ *
+ * RET: *this
+ */
+
+void RawText4::deleteEntry() {
+	VerseKey &key = getVerseKey();
+	doSetText(key.getTestament(), key.getTestamentIndex(), "");
+}
+
+/******************************************************************************
+ * RawText4::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ * RET: *this
+ */
+
+void RawText4::increment(int steps) {
+	long  start;
+	unsigned long size;
+	VerseKey *tmpkey = &getVerseKey();
+
+	findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size);
+
+	SWKey lastgood = *tmpkey;
+	while (steps) {
+		long laststart = start;
+		unsigned long lastsize = size;
+		SWKey lasttry = *tmpkey;
+		(steps > 0) ? ++(*key) : --(*key);
+		tmpkey = &getVerseKey();
+
+		if ((error = key->popError())) {
+			*key = lastgood;
+			break;
+		}
+		long index = tmpkey->getTestamentIndex();
+		findOffset(tmpkey->getTestament(), index, &start, &size);
+		if (
+			(((laststart != start) || (lastsize != size))	// we're a different entry
+//				&& (start > 0)
+				&& (size))	// and we actually have a size
+				||(!skipConsecutiveLinks)) {	// or we don't want to skip consecutive links
+			steps += (steps < 0) ? 1 : -1;
+			lastgood = *tmpkey;
+		}
+	}
+	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
+}
+
+bool RawText4::isLinked(const SWKey *k1, const SWKey *k2) const {
+	long start1, start2;
+	unsigned long size1, size2;
+	VerseKey *vk1 = &getVerseKey(k1);
+	VerseKey *vk2 = &getVerseKey(k2);
+	if (vk1->getTestament() != vk2->getTestament()) return false;
+
+	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1);
+	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2);
+	return start1 == start2;
+}
+
+bool RawText4::hasEntry(const SWKey *k) const {
+	long start;
+	unsigned long size;
+	VerseKey *vk = &getVerseKey(k);
+
+	findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size);
+	return size;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/texts/swtext.cpp b/src/modules/texts/swtext.cpp
new file mode 100644
index 0000000..9c3c02d
--- /dev/null
+++ b/src/modules/texts/swtext.cpp
@@ -0,0 +1,128 @@
+/******************************************************************************
+ *
+ *  swtext.cpp -	code for base class 'SWText'- The basis for all text
+ *			modules
+ *
+ * $Id: swtext.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <utilstr.h>
+#include <swtext.h>
+#include <listkey.h>
+#include <localemgr.h>
+#include <versekey.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * SWText Constructor - Initializes data for instance of SWText
+ *
+ * ENT:	imodname - Internal name for module
+ *	imoddesc - Name to display to user for module
+ *	idisp	 - Display object to use for displaying
+ */
+
+SWText::SWText(const char *imodname, const char *imoddesc, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char* ilang, const char *versification): SWModule(imodname, imoddesc, idisp, "Biblical Texts", enc, dir, mark, ilang) {
+	this->versification = 0;
+	stdstr(&(this->versification), versification);
+	delete key;
+	key = (VerseKey *)createKey();
+	tmpVK1 = (VerseKey *)createKey();
+	tmpVK2 = (VerseKey *)createKey();
+        tmpSecond = false;
+	skipConsecutiveLinks = false;
+}
+
+
+/******************************************************************************
+ * SWText Destructor - Cleans up instance of SWText
+ */
+
+SWText::~SWText() {
+	delete tmpVK1;
+	delete tmpVK2;
+	delete [] versification;
+}
+
+
+/******************************************************************************
+ * SWText createKey - Create the correct key (VerseKey) for use with SWText
+ */
+
+SWKey *SWText::createKey() const {
+	VerseKey *vk = new VerseKey();
+
+	vk->setVersificationSystem(versification);
+
+	return vk;
+}
+
+
+long SWText::getIndex() const {
+	VerseKey *key = &getVerseKey();
+	entryIndex = key->getIndex();
+
+	return entryIndex;
+}
+
+void SWText::setIndex(long iindex) {
+	VerseKey *key = &getVerseKey();
+
+	key->setTestament(1);
+	key->setIndex(iindex);
+
+	if (key != this->key) {
+		this->key->copyFrom(*key);
+	}
+}
+
+
+VerseKey &SWText::getVerseKey(const SWKey *keyToConvert) const {
+	const SWKey *thisKey = keyToConvert ? keyToConvert : this->key;
+
+	VerseKey *key = 0;
+	// see if we have a VerseKey * or decendant
+	SWTRY {
+		key = SWDYNAMIC_CAST(VerseKey, thisKey);
+	}
+	SWCATCH ( ... ) {	}
+	if (!key) {
+		ListKey *lkTest = 0;
+		SWTRY {
+			lkTest = SWDYNAMIC_CAST(ListKey, thisKey);
+		}
+		SWCATCH ( ... ) {	}
+		if (lkTest) {
+			SWTRY {
+				key = SWDYNAMIC_CAST(VerseKey, lkTest->getElement());
+			}
+			SWCATCH ( ... ) {	}
+		}
+	}
+	if (!key) {
+                VerseKey *retKey = (tmpSecond) ? tmpVK1 : tmpVK2;
+                tmpSecond = !tmpSecond;
+		retKey->setLocale(LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName());
+		(*retKey) = *(thisKey);
+		return (*retKey);
+	}
+	else	return *key;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/modules/texts/ztext/Makefile b/src/modules/texts/ztext/Makefile
new file mode 100644
index 0000000..35d6648
--- /dev/null
+++ b/src/modules/texts/ztext/Makefile
@@ -0,0 +1,5 @@
+
+root := ../../../..
+
+all:
+	make -C ${root}
diff --git a/src/modules/texts/ztext/Makefile.am b/src/modules/texts/ztext/Makefile.am
new file mode 100644
index 0000000..817107c
--- /dev/null
+++ b/src/modules/texts/ztext/Makefile.am
@@ -0,0 +1,3 @@
+ztextdir = $(top_srcdir)/src/modules/texts/ztext
+
+libsword_la_SOURCES += $(ztextdir)/ztext.cpp 
diff --git a/src/modules/texts/ztext/ztext.cpp b/src/modules/texts/ztext/ztext.cpp
new file mode 100644
index 0000000..f0afe6d
--- /dev/null
+++ b/src/modules/texts/ztext/ztext.cpp
@@ -0,0 +1,223 @@
+/******************************************************************************
+ *
+ *  ztext.cpp -	code for class 'zText'- a module that reads compressed text
+ *		files
+ *
+ * $Id: ztext.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sysdata.h>
+#include <versekey.h>
+#include <filemgr.h>
+
+#include <ztext.h>
+
+SWORD_NAMESPACE_START
+
+/******************************************************************************
+ * zText Constructor - Initializes data for instance of zText
+ *
+ * ENT:	ipath - path to data files
+ *		iname - Internal name for module
+ *		idesc - Name to display to user for module
+ *		iblockType - verse, chapter, book, etc. of index chunks
+ *		icomp - Compressor object
+ *		idisp - Display object to use for displaying
+ */
+
+zText::zText(const char *ipath, const char *iname, const char *idesc, int iblockType, SWCompress *icomp, SWDisplay *idisp, SWTextEncoding enc, SWTextDirection dir, SWTextMarkup mark, const char *ilang, const char *versification)
+		: zVerse(ipath, FileMgr::RDWR, iblockType, icomp), SWText(iname, idesc, idisp, enc, dir, mark, ilang, versification) {
+	blockType = iblockType;
+	lastWriteKey = 0;
+}
+
+
+/******************************************************************************
+ * zText Destructor - Cleans up instance of zText
+ */
+
+zText::~zText()
+{
+	flushCache();
+
+	if (lastWriteKey)
+		delete lastWriteKey;
+
+}
+
+
+bool zText::isWritable() const { return ((idxfp[0]->getFd() > 0) && ((idxfp[0]->mode & FileMgr::RDWR) == FileMgr::RDWR)); }
+
+
+/******************************************************************************
+ * zText::getRawEntry	- Returns the current verse buffer
+ *
+ * RET: buffer with verse
+ */
+
+SWBuf &zText::getRawEntryBuf() const {
+	long  start = 0;
+	unsigned short size = 0;
+	unsigned long buffnum = 0;
+	VerseKey &key = getVerseKey();
+
+	findOffset(key.getTestament(), key.getTestamentIndex(), &start, &size, &buffnum);
+	entrySize = size;        // support getEntrySize call
+			  
+	entryBuf = "";
+	
+	zReadText(key.getTestament(), start, size, buffnum, entryBuf);
+	rawFilter(entryBuf, &key);
+
+//	if (!isUnicode())
+		prepText(entryBuf);
+
+	return entryBuf;
+}
+
+
+bool zText::sameBlock(VerseKey *k1, VerseKey *k2) {
+	if (k1->getTestament() != k2->getTestament())
+		return false;
+
+	switch (blockType) {
+	case VERSEBLOCKS:
+		if (k1->getVerse() != k2->getVerse())
+			return false;
+	case CHAPTERBLOCKS:
+		if (k1->getChapter() != k2->getChapter())
+			return false;
+	case BOOKBLOCKS:
+		if (k1->getBook() != k2->getBook())
+			return false;
+	}
+	return true;
+}
+
+
+void zText::setEntry(const char *inbuf, long len) {
+	VerseKey &key = getVerseKey();
+
+	// see if we've jumped across blocks since last write
+	if (lastWriteKey) {
+		if (!sameBlock(lastWriteKey, &key)) {
+			flushCache();
+		}
+		delete lastWriteKey;
+	}
+
+	doSetText(key.getTestament(), key.getTestamentIndex(), inbuf, len);
+
+	lastWriteKey = (VerseKey *)key.clone();	// must delete
+}
+
+
+void zText::linkEntry(const SWKey *inkey) {
+	VerseKey &destkey = getVerseKey();
+	const VerseKey *srckey = &getVerseKey(inkey);
+	doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
+}
+
+
+/******************************************************************************
+ * zFiles::deleteEntry	- deletes this entry
+ *
+ */
+
+void zText::deleteEntry() {
+
+	VerseKey &key = getVerseKey();
+
+	doSetText(key.getTestament(), key.getTestamentIndex(), "");
+}
+
+
+/******************************************************************************
+ * zText::increment	- Increments module key a number of entries
+ *
+ * ENT:	increment	- Number of entries to jump forward
+ *
+ */
+
+void zText::increment(int steps) {
+	long start;
+	unsigned short size;
+	unsigned long buffnum;
+	VerseKey *tmpkey = &getVerseKey();
+
+	findOffset(tmpkey->getTestament(), tmpkey->getTestamentIndex(), &start, &size, &buffnum);
+
+	SWKey lastgood = *tmpkey;
+	while (steps) {
+		long laststart = start;
+		unsigned short lastsize = size;
+		SWKey lasttry = *tmpkey;
+		(steps > 0) ? ++(*key) : --(*key);
+		tmpkey = &getVerseKey();
+
+		if ((error = key->popError())) {
+			*key = lastgood;
+			break;
+		}
+		long index = tmpkey->getTestamentIndex();
+		findOffset(tmpkey->getTestament(), index, &start, &size, &buffnum);
+
+		if (
+			(
+				((laststart != start) || (lastsize != size))	// we're a different entry
+//				&& (start > 0)
+				&& (size)	// and we actually have a size
+			)
+			|| !skipConsecutiveLinks
+		) {	// or we don't want to skip consecutive links
+			steps += (steps < 0) ? 1 : -1;
+			lastgood = *tmpkey;
+		}
+	}
+	error = (error) ? KEYERR_OUTOFBOUNDS : 0;
+}
+
+
+bool zText::isLinked(const SWKey *k1, const SWKey *k2) const {
+	long start1, start2;
+	unsigned short size1, size2;
+	unsigned long buffnum1, buffnum2;
+	VerseKey *vk1 = &getVerseKey(k1);
+	VerseKey *vk2 = &getVerseKey(k2);
+	if (vk1->getTestament() != vk2->getTestament()) return false;
+
+	findOffset(vk1->getTestament(), vk1->getTestamentIndex(), &start1, &size1, &buffnum1);
+	findOffset(vk2->getTestament(), vk2->getTestamentIndex(), &start2, &size2, &buffnum2);
+	return start1 == start2 && buffnum1 == buffnum2;
+}
+
+bool zText::hasEntry(const SWKey *k) const {
+	long start;
+	unsigned short size;
+	unsigned long buffnum;
+	VerseKey *vk = &getVerseKey(k);
+
+	findOffset(vk->getTestament(), vk->getTestamentIndex(), &start, &size, &buffnum);
+	return size;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/utilfuns/Makefile b/src/utilfuns/Makefile
new file mode 100644
index 0000000..339f87a
--- /dev/null
+++ b/src/utilfuns/Makefile
@@ -0,0 +1,4 @@
+root := ../..
+
+all:
+	make -C ${root}
diff --git a/src/utilfuns/Makefile.am b/src/utilfuns/Makefile.am
new file mode 100644
index 0000000..f934eeb
--- /dev/null
+++ b/src/utilfuns/Makefile.am
@@ -0,0 +1,39 @@
+
+if HAVE_VSNPRINTF 
+else
+AM_CXXFLAGS += -DNO_VSNPRINTF
+endif
+
+utilfunsdir = $(top_srcdir)/src/utilfuns
+libsword_la_SOURCES += $(utilfunsdir)/swobject.cpp
+libsword_la_SOURCES += $(utilfunsdir)/utilstr.cpp
+libsword_la_SOURCES += $(utilfunsdir)/utilxml.cpp
+libsword_la_SOURCES += $(utilfunsdir)/swversion.cpp
+libsword_la_SOURCES += $(utilfunsdir)/swbuf.cpp
+libsword_la_SOURCES += $(utilfunsdir)/ftpparse.c
+libsword_la_SOURCES += $(utilfunsdir)/url.cpp
+
+if INTERNALFTPLIB
+ftpsrc = $(utilfunsdir)/ftplib.c
+else
+ftpsrc =
+endif
+
+if HAVE_LIBZ
+UNTGZ = $(utilfunsdir)/zlib/untgz.c
+else
+UNTGZ =
+endif
+
+libsword_la_SOURCES += $(UNTGZ) 
+libsword_la_SOURCES += $(ftpsrc)
+
+if USE_INTERNAL_REGEX
+SWREGEX = $(utilfunsdir)/regex.c
+else
+SWREGEX =
+endif
+libsword_la_SOURCES += $(SWREGEX)
+
+
+libsword_la_SOURCES += $(utilfunsdir)/roman.cpp
diff --git a/src/utilfuns/ftplib.c b/src/utilfuns/ftplib.c
new file mode 100644
index 0000000..a211973
--- /dev/null
+++ b/src/utilfuns/ftplib.c
@@ -0,0 +1,1417 @@
+/***************************************************************************/
+/* ftplib.c - callable ftp access routines                                 */
+/* Copyright (C) 1996-2000 Thomas Pfau, pfau@cnj.digex.net                 */
+/*  73 Catherine Street, South Bound Brook, NJ, 08880                      */
+/*                                                                         */
+/* This library is free software; you can redistribute it and/or           */
+/* modify it under the terms of the GNU Library 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       */
+/* Library General Public License for more details.                        */
+/*                                                                         */
+/* You should have received a copy of the GNU Library General Public       */
+/* License along with this progam; if not, write to the                    */
+/* Free Software Foundation, Inc., 59 Temple Place - Suite 330,            */
+/* Boston, MA 02111-1307, USA.                                             */
+/*                                                                         */
+/***************************************************************************/
+// changes made by Lorn Potter <llornkcor@handhelds.org>
+// 
+#if defined(__unix__) || defined(__VMS)
+#include <unistd.h>
+#endif
+#if defined(_WIN32)
+#include <windows.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+
+#if defined(__unix__)
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
+#elif defined(VMS)
+
+#include <types.h>
+#include <socket.h>
+#include <in.h>
+#include <netdb.h>
+#include <inet.h>
+
+#elif defined(_WIN32)
+
+#include <winsock.h>
+
+#endif
+
+#define BUILDING_LIBRARY
+#include "ftplib.h"
+
+#if defined(_WIN32)
+#define SETSOCKOPT_OPTVAL_TYPE (const char *)
+#else
+#define SETSOCKOPT_OPTVAL_TYPE (void *)
+#endif
+
+#define FTPLIB_BUFSIZ 8192
+#define ACCEPT_TIMEOUT 10
+
+#define FTPLIB_CONTROL 0
+#define FTPLIB_READ 1
+#define FTPLIB_WRITE 2
+
+#if !defined FTPLIB_DEFMODE
+#define FTPLIB_DEFMODE FTPLIB_PASSIVE
+#endif
+
+#ifdef ANDROID
+#include <android/log.h>
+#define perror(M) __android_log_write(ANDROID_LOG_DEBUG, "perror_ftplib", M)
+#define lllog(M) __android_log_write(ANDROID_LOG_DEBUG, "ftplib", M)
+#else
+#define lllog(M) fprintf(stderr, M);
+#endif
+void *mymemccpy(void *dst, const void *src, int c, size_t n)
+{
+    char*        q     = dst;
+    const char*  p     = src;
+    const char*  p_end = p + n;
+    char         ch    = ~(char)c;  /* ensure ch != c */
+
+    for (;;) {
+        if (ch == c || p >= p_end) break;
+        *q++ = ch = *p++;
+
+        if (ch == c || p >= p_end) break;
+        *q++ = ch = *p++;
+
+        if (ch == c || p >= p_end) break;
+        *q++ = ch = *p++;
+
+        if (ch == c || p >= p_end) break;
+        *q++ = ch = *p++;
+    }
+
+    if (p >= p_end && ch != c)
+        return NULL;
+
+    return q;
+}
+
+
+struct NetBuf {
+    char *cput,*cget;
+    int handle;
+    int cavail,cleft;
+    char *buf;
+    int dir;
+    netbuf *ctrl;
+    netbuf *data;    
+    int cmode;
+    struct timeval idletime;
+    FtpCallback idlecb;
+    FtpCallbackWriter writercb;
+    void *idlearg;
+    void *writerarg;
+    int xfered;
+    int cbbytes;
+    int xfered1;
+    char response[256];
+};
+
+#if 0
+static char *version =
+"ftplib Release 3.1-1 9/16/00, copyright 1996-2000 Thomas Pfau";
+#endif
+
+GLOBALDEF int ftplib_debug = 0;
+
+#if defined(__unix__) || defined(VMS)
+#define net_read read
+#define net_write write
+#define net_close close
+#elif defined(_WIN32)
+#define net_read(x,y,z) recv(x,y,z,0)
+#define net_write(x,y,z) send(x,y,z,0)
+#define net_close closesocket
+#endif
+
+#if defined(NEED_MEMCCPY)
+/*
+ * VAX C does not supply a memccpy routine so I provide my own
+ */
+void *memccpy(void *dest, const void *src, int c, size_t n)
+{
+    int i=0;
+    const unsigned char *ip=src;
+    unsigned char *op=dest;
+
+    while (i < n)
+      {
+          if ((*op++ = *ip++) == c)
+              break;
+          i++;
+      }
+    if (i == n)
+        return NULL;
+    return op;
+}
+#endif
+#if defined(NEED_STRDUP)
+/*
+ * strdup - return a malloc'ed copy of a string
+ */
+char *strdup(const char *src)
+{
+    int l = strlen(src) + 1;
+    char *dst = malloc(l);
+    if (dst)
+        strcpy(dst,src);
+    return dst;
+}
+#endif
+
+/*
+ * socket_wait - wait for socket to receive or flush data
+ *
+ * return 1 if no user callback, otherwise, return value returned by
+ * user callback
+ */
+static int socket_wait(netbuf *ctl)
+{
+    fd_set fd,*rfd = NULL,*wfd = NULL;
+    struct timeval tv;
+    int rv = 0;
+    if ((ctl->dir == FTPLIB_CONTROL) || (ctl->idlecb == NULL))
+        return 1;
+    if (ctl->dir == FTPLIB_WRITE)
+        wfd = &fd;
+    else
+        rfd = &fd;
+    FD_ZERO(&fd);
+    do
+      {
+          FD_SET(ctl->handle,&fd);
+          tv = ctl->idletime;
+          rv = select(ctl->handle+1, rfd, wfd, NULL, &tv);
+          if (rv == -1)
+            {
+                rv = 0;
+                strncpy(ctl->ctrl->response, strerror(errno),
+                        sizeof(ctl->ctrl->response));
+                break;
+            }
+          else if (rv > 0)
+            {
+                rv = 1;
+                break;
+            }
+      }
+    while ((rv = ctl->idlecb(ctl, ctl->xfered, ctl->idlearg)));
+    return rv;
+}
+
+/*
+ * read a line of text
+ *
+ * return -1 on error or bytecount
+ */
+static int readline(char *buf,int max,netbuf *ctl)
+{
+    int x,retval = 0;
+    char *end,*bp=buf;
+    int eof = 0;
+
+    if ((ctl->dir != FTPLIB_CONTROL) && (ctl->dir != FTPLIB_READ))
+        return -1;
+    if (max == 0)
+        return 0;
+    do
+      {
+          if (ctl->cavail > 0)
+            {
+                x = (max >= ctl->cavail) ? ctl->cavail : max-1;
+                end = mymemccpy(bp,ctl->cget,'\n',x);
+                if (end != NULL) {
+                    x = end - bp;
+			 }
+                retval += x;
+                bp += x;
+                *bp = '\0';
+                max -= x;
+                ctl->cget += x;
+                ctl->cavail -= x;
+                if (end != NULL)
+                  {
+                      bp -= 2;
+                      if (strcmp(bp,"\r\n") == 0)
+                        {
+                            *bp++ = '\n';
+                            *bp++ = '\0';
+                            --retval;
+                        }
+                      break;
+                  }
+            }
+          if (max == 1)
+            {
+                *buf = '\0';
+                break;
+            }
+          if (ctl->cput == ctl->cget)
+            {
+                ctl->cput = ctl->cget = ctl->buf;
+                ctl->cavail = 0;
+                ctl->cleft = FTPLIB_BUFSIZ;
+            }
+          if (eof)
+            {
+                if (retval == 0)
+                    retval = -1;
+                break;
+            }
+          if (!socket_wait(ctl))
+              return retval;
+          if ((x = net_read(ctl->handle,ctl->cput,ctl->cleft)) == -1)
+            {
+                perror("read");
+                retval = -1;
+                break;
+            }
+          if (x == 0) //< ctl->cleft)
+              eof = 1;
+          ctl->cleft -= x;
+          ctl->cavail += x;
+          ctl->cput += x;
+      }
+    while (1);
+    return retval;
+}
+
+/*
+ * write lines of text
+ *
+ * return -1 on error or bytecount
+ */
+static int writeline(char *buf, int len, netbuf *nData)
+{
+    int x, nb=0, w;
+    char *ubp = buf, *nbp;
+    char lc=0;
+
+    if (nData->dir != FTPLIB_WRITE)
+        return -1;
+    nbp = nData->buf;
+    for (x=0; x < len; x++)
+      {
+          if ((*ubp == '\n') && (lc != '\r'))
+            {
+                if (nb == FTPLIB_BUFSIZ)
+                  {
+                      if (!socket_wait(nData))
+                          return x;
+                      w = net_write(nData->handle, nbp, FTPLIB_BUFSIZ);
+                      if (w != FTPLIB_BUFSIZ)
+                        {
+                            if (ftplib_debug > 1)
+                                printf("net_write(1) returned %d, errno = %d\n", w, errno);
+                            return(-1);
+                        }
+                      nb = 0;
+                  }
+                nbp[nb++] = '\r';
+            }
+          if (nb == FTPLIB_BUFSIZ)
+            {
+                if (!socket_wait(nData))
+                    return x;
+                w = net_write(nData->handle, nbp, FTPLIB_BUFSIZ);
+                if (w != FTPLIB_BUFSIZ)
+                  {
+                        if (ftplib_debug > 1)
+                            printf("net_write(2) returned %d, errno = %d\n", w, errno);
+                      return(-1);
+                  }
+                nb = 0;
+            }
+          nbp[nb++] = lc = *ubp++;
+      }
+    if (nb)
+      {
+          if (!socket_wait(nData))
+              return x;
+          w = net_write(nData->handle, nbp, nb);
+          if (w != nb)
+            {
+                if (ftplib_debug > 1)
+                    printf("net_write(3) returned %d, errno = %d\n", w, errno);
+                return(-1);
+            }
+      }
+    return len;
+}
+
+/*
+ * read a response from the server
+ *
+ * return 0 if first char doesn't match
+ * return 1 if first char matches
+ */
+static int readresp(char c, netbuf *nControl)
+{
+    char match[5];
+    if (readline(nControl->response,256,nControl) == -1)
+      {
+          perror("Control socket read failed");
+          return 0;
+      }
+    if (ftplib_debug > 1)
+        fprintf(stderr,"%s",nControl->response);
+    if (nControl->response[3] == '-')
+      {
+          strncpy(match,nControl->response,3);
+          match[3] = ' ';
+          match[4] = '\0';
+          do
+            {
+                if (readline(nControl->response,256,nControl) == -1)
+                  {
+                      perror("Control socket read failed");
+                      return 0;
+                  }
+                if (ftplib_debug > 1)
+                    fprintf(stderr,"%s",nControl->response);
+            }
+          while (strncmp(nControl->response,match,4));
+      }
+    if (nControl->response[0] == c)
+        return 1;
+    return 0;
+}
+
+/*
+ * FtpInit for stupid operating systems that require it (Windows NT)
+ */
+GLOBALDEF void FtpInit(void)
+{
+#if defined(_WIN32)
+    WORD wVersionRequested;
+    WSADATA wsadata;
+    int err;
+    wVersionRequested = MAKEWORD(1,1);
+    if ((err = WSAStartup(wVersionRequested,&wsadata)) != 0)
+        if (ftplib_debug > 1)
+            fprintf(stderr,"Network failed to start: %d\n",err);
+#endif
+}
+
+/*
+ * FtpLastResponse - return a pointer to the last response received
+ */
+GLOBALDEF char *FtpLastResponse(netbuf *nControl)
+{
+    if ((nControl) && (nControl->dir == FTPLIB_CONTROL))
+        return nControl->response;
+    return NULL;
+}
+
+/*
+ * FtpConnect - connect to remote server
+ *
+ * return 1 if connected, 0 if not
+ */
+GLOBALDEF int FtpConnect(const char *host, netbuf **nControl)
+{
+    int sControl, stat, flags, oldflags;
+    struct sockaddr_in sin;
+    struct hostent *phe;
+    struct servent *pse;
+    int on=1;
+    netbuf *ctrl;
+    char *lhost;
+    char *pnum;
+    struct timeval tv;
+    fd_set wr;
+
+    memset(&sin,0,sizeof(sin));
+    sin.sin_family = AF_INET;
+    lhost = strdup(host);
+    pnum = strchr(lhost,':');
+    if (pnum == NULL)
+      {
+#if defined(VMS) || defined(ANDROID)
+          sin.sin_port = htons(21);
+#else
+          if ((pse = getservbyname("ftp","tcp")) == NULL)
+            {
+                perror("getservbyname");
+                return 0;
+            }
+          sin.sin_port = pse->s_port;
+#endif
+      }
+    else
+      {
+          *pnum++ = '\0';
+          if (isdigit(*pnum))
+              sin.sin_port = htons(atoi(pnum));
+          else
+            {
+                pse = getservbyname(pnum,"tcp");
+                sin.sin_port = pse->s_port;
+            }
+      }
+    if ((sin.sin_addr.s_addr = inet_addr(lhost)) == -1)
+      {
+          if ((phe = gethostbyname(lhost)) == NULL)
+            {
+                perror("gethostbyname");
+                return 0;
+            }
+
+          memcpy((char *)&sin.sin_addr, phe->h_addr, phe->h_length);
+
+      }
+    free(lhost);
+
+    sControl = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (sControl == -1)
+      {
+          perror("socket");
+          return 0;
+      }
+
+    if ( setsockopt(sControl,SOL_SOCKET,SO_REUSEADDR,
+                   SETSOCKOPT_OPTVAL_TYPE &on, sizeof(on)) == -1)
+      {
+          perror("setsockopt");
+          net_close(sControl);
+          return 0;
+      }
+
+#if defined(_WIN32)
+	if (connect(sControl, (struct sockaddr *)&sin, sizeof(sin)) == -1)
+	{
+		perror("connect");
+		net_close(sControl);
+		return 0;
+	}
+#else
+     //set nonblocking for connection timeout
+    flags = fcntl( sControl, F_GETFL,0);
+    oldflags=flags;
+    fcntl( sControl, F_SETFL, O_NONBLOCK|flags);
+
+    stat=connect( sControl, (struct sockaddr *)&sin, sizeof(sin));
+    if (stat < 0) 
+      { 
+          if (errno != EWOULDBLOCK && errno != EINPROGRESS) 
+            { 
+                perror("connect");
+                net_close(sControl);
+                return 0;
+            } 
+      } 
+
+    FD_ZERO(&wr); 
+    FD_SET( sControl, &wr); 
+
+    tv.tv_sec = ACCEPT_TIMEOUT;
+    tv.tv_usec = 0; 
+
+    stat = select(sControl+1, 0, &wr, 0, &tv);
+
+    if (stat < 1)
+      { 
+            // time out has expired, 
+            // or an error has ocurred
+          perror("timeout");
+          net_close(sControl);
+          return 0;
+      } 
+
+    if (ftplib_debug > 1)
+        printf("connected\n");
+
+      //set original flags
+    fcntl( sControl, F_SETFL, oldflags);
+#endif
+
+    ctrl = calloc(1,sizeof(netbuf));
+    if (ctrl == NULL)
+      {
+          perror("calloc");
+          net_close(sControl);
+          return 0;
+      }
+    ctrl->buf = malloc(FTPLIB_BUFSIZ);
+    if (ctrl->buf == NULL)
+      {
+          perror("calloc");
+          net_close(sControl);
+          free(ctrl);
+          return 0;
+      }
+    ctrl->handle = sControl;
+    ctrl->dir = FTPLIB_CONTROL;
+    ctrl->ctrl = NULL;
+    ctrl->cmode = FTPLIB_DEFMODE;
+    ctrl->idlecb = NULL;
+    ctrl->writercb = NULL;
+    ctrl->idletime.tv_sec = ctrl->idletime.tv_usec = 0;
+    ctrl->idlearg = NULL;
+    ctrl->writerarg = NULL;
+    ctrl->xfered = 0;
+    ctrl->xfered1 = 0;
+    ctrl->cbbytes = 0;
+    if (readresp('2', ctrl) == 0)
+      {
+          net_close(sControl);
+          free(ctrl->buf);
+          free(ctrl);
+          return 0;
+      }
+    *nControl = ctrl;
+    return 1;
+}
+
+/*
+ * FtpOptions - change connection options
+ *
+ * returns 1 if successful, 0 on error
+ */
+GLOBALDEF int FtpOptions(int opt, long val, netbuf *nControl)
+{
+    int v,rv=0;
+    switch (opt)
+      {
+        case FTPLIB_CONNMODE:
+            v = (int) val;
+            if ((v == FTPLIB_PASSIVE) || (v == FTPLIB_PORT))
+              {
+                  nControl->cmode = v;
+                  rv = 1;
+              }
+            break;
+        case FTPLIB_CALLBACK:
+            nControl->idlecb = (FtpCallback) val;
+            rv = 1;
+            break;
+        case FTPLIB_CALLBACK_WRITER:
+            nControl->writercb = (FtpCallbackWriter) val;
+            rv = 1;
+            break;
+        case FTPLIB_IDLETIME:
+            v = (int) val;
+            rv = 1;
+            nControl->idletime.tv_sec = v / 1000;
+            nControl->idletime.tv_usec = (v % 1000) * 1000;
+            break;
+        case FTPLIB_CALLBACKARG:
+            rv = 1;
+            nControl->idlearg = (void *) val;
+            break;
+        case FTPLIB_CALLBACK_WRITERARG:
+            rv = 1;
+            nControl->writerarg = (void *) val;
+            break;
+        case FTPLIB_CALLBACKBYTES:
+            rv = 1;
+            nControl->cbbytes = (int) val;
+            break;
+      }
+    return rv;
+}
+
+/*
+ * FtpSendCmd - send a command and wait for expected response
+ *
+ * return 1 if proper response received, 0 otherwise
+ */
+static int FtpSendCmd(const char *cmd, char expresp, netbuf *nControl)
+{
+    char buf[256];
+    if (nControl->dir != FTPLIB_CONTROL)
+        return 0;
+    if (ftplib_debug > 2)
+        fprintf(stderr,"%s\n",cmd);
+    if ((strlen(cmd) + 3) > sizeof(buf))
+        return 0;
+    sprintf(buf,"%s\r\n",cmd);
+    if (net_write(nControl->handle,buf,strlen(buf)) <= 0)
+      {
+          perror("write");
+          return 0;
+      }
+    return readresp(expresp, nControl);
+}
+
+/*
+ * FtpLogin - log in to remote server
+ *
+ * return 1 if logged in, 0 otherwise
+ */
+GLOBALDEF int FtpLogin(const char *user, const char *pass, netbuf *nControl)
+{
+    char tempbuf[64];
+
+    if (((strlen(user) + 7) > sizeof(tempbuf)) ||
+        ((strlen(pass) + 7) > sizeof(tempbuf)))
+        return 0;
+    sprintf(tempbuf,"USER %s",user);
+    if (!FtpSendCmd(tempbuf,'3',nControl))
+      {
+          if (nControl->response[0] == '2')
+              return 1;
+          return 0;
+      }
+    sprintf(tempbuf,"PASS %s",pass);
+    return FtpSendCmd(tempbuf,'2',nControl);
+}
+
+/*
+ * FtpOpenPort - set up data connection
+ *
+ * return 1 if successful, 0 otherwise
+ */
+static int FtpOpenPort(netbuf *nControl, netbuf **nData, int mode, int dir)
+{
+    int sData;
+    union {
+        struct sockaddr sa;
+        struct sockaddr_in in;
+    } sin;
+    struct linger lng = { 0, 0 };
+    unsigned int l;
+    int on=1;
+    netbuf *ctrl;
+    char *cp;
+    unsigned int v[6];
+    char buf[256];
+
+    if (nControl->dir != FTPLIB_CONTROL)
+        return -1;
+    if ((dir != FTPLIB_READ) && (dir != FTPLIB_WRITE))
+      {
+          sprintf(nControl->response, "Invalid direction %d\n", dir);
+          return -1;
+      }
+    if ((mode != FTPLIB_ASCII) && (mode != FTPLIB_IMAGE))
+      {
+          sprintf(nControl->response, "Invalid mode %c\n", mode);
+          return -1;
+      }
+    l = sizeof(sin);
+    if (nControl->cmode == FTPLIB_PASSIVE)
+      {
+          memset(&sin, 0, l);
+          sin.in.sin_family = AF_INET;
+          if (!FtpSendCmd("PASV",'2',nControl))
+              return -1;
+          cp = strchr(nControl->response,'(');
+          if (cp == NULL)
+              return -1;
+          cp++;
+          sscanf(cp,"%u,%u,%u,%u,%u,%u",&v[2],&v[3],&v[4],&v[5],&v[0],&v[1]);
+          sin.sa.sa_data[2] = v[2];
+          sin.sa.sa_data[3] = v[3];
+          sin.sa.sa_data[4] = v[4];
+          sin.sa.sa_data[5] = v[5];
+          sin.sa.sa_data[0] = v[0];
+          sin.sa.sa_data[1] = v[1];
+      }
+    else
+      {
+          if (getsockname(nControl->handle, &sin.sa, &l) < 0)
+            {
+                perror("getsockname");
+                return 0;
+            }
+      }
+    sData = socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+    if (sData == -1)
+      {
+          perror("socket");
+          return -1;
+      }
+    if (setsockopt(sData,SOL_SOCKET,SO_REUSEADDR,
+                   SETSOCKOPT_OPTVAL_TYPE &on,sizeof(on)) == -1)
+      {
+          perror("setsockopt");
+          net_close(sData);
+          return -1;
+      }
+    if (setsockopt(sData,SOL_SOCKET,SO_LINGER,
+                   SETSOCKOPT_OPTVAL_TYPE &lng,sizeof(lng)) == -1)
+      {
+          perror("setsockopt");
+          net_close(sData);
+          return -1;
+      }
+    if (nControl->cmode == FTPLIB_PASSIVE)
+      {
+          if (connect(sData, &sin.sa, sizeof(sin.sa)) == -1)
+            {
+                perror("connect");
+                net_close(sData);
+                return -1;
+            }
+      }
+    else
+      {
+          sin.in.sin_port = 0;
+          if (bind(sData, &sin.sa, sizeof(sin)) == -1)
+            {
+                perror("bind");
+                net_close(sData);
+                return 0;
+            }
+          if (listen(sData, 1) < 0)
+            {
+                perror("listen");
+                net_close(sData);
+                return 0;
+            }
+          if (getsockname(sData, &sin.sa, &l) < 0)
+              return 0;
+          sprintf(buf, "PORT %d,%d,%d,%d,%d,%d",
+                  (unsigned char) sin.sa.sa_data[2],
+                  (unsigned char) sin.sa.sa_data[3],
+                  (unsigned char) sin.sa.sa_data[4],
+                  (unsigned char) sin.sa.sa_data[5],
+                  (unsigned char) sin.sa.sa_data[0],
+                  (unsigned char) sin.sa.sa_data[1]);
+          if (!FtpSendCmd(buf,'2',nControl))
+            {
+                net_close(sData);
+                return 0;
+            }
+      }
+    ctrl = calloc(1,sizeof(netbuf));
+    if (ctrl == NULL)
+      {
+          perror("calloc");
+          net_close(sData);
+          return -1;
+      }
+    if ((mode == 'A') && ((ctrl->buf = malloc(FTPLIB_BUFSIZ)) == NULL))
+      {
+          perror("calloc");
+          net_close(sData);
+          free(ctrl);
+          return -1;
+      }
+    ctrl->handle = sData;
+    ctrl->dir = dir;
+    ctrl->idletime = nControl->idletime;
+    ctrl->idlearg = nControl->idlearg;
+    ctrl->writerarg = nControl->writerarg;
+    ctrl->xfered = 0;
+    ctrl->xfered1 = 0;
+    ctrl->cbbytes = nControl->cbbytes;
+    if (ctrl->idletime.tv_sec || ctrl->idletime.tv_usec || ctrl->cbbytes)
+        ctrl->idlecb = nControl->idlecb;
+    else
+        ctrl->idlecb = NULL;
+    ctrl->writercb = nControl->writercb;
+    *nData = ctrl;
+    return 1;
+}
+
+/*
+ * FtpAcceptConnection - accept connection from server
+ *
+ * return 1 if successful, 0 otherwise
+ */
+static int FtpAcceptConnection(netbuf *nData, netbuf *nControl)
+{
+    int sData;
+    struct sockaddr addr;
+    unsigned int l;
+    int i;
+    struct timeval tv;
+    fd_set mask;
+    int rv;
+
+    FD_ZERO(&mask);
+    FD_SET(nControl->handle, &mask);
+    FD_SET(nData->handle, &mask);
+    tv.tv_usec = 0;
+    tv.tv_sec = ACCEPT_TIMEOUT;
+    if (ftplib_debug > 1)
+        printf("<<<<<<<<<<<<<<<<%d\n",ACCEPT_TIMEOUT);
+    i = nControl->handle;
+    if (i < nData->handle)
+        i = nData->handle;
+    i = select(i+1, &mask, NULL, NULL, &tv);
+    if (i == -1)
+      {
+          strncpy(nControl->response, strerror(errno),
+                  sizeof(nControl->response));
+          net_close(nData->handle);
+          nData->handle = 0;
+          rv = 0;
+      }
+    else if (i == 0)
+      {
+          strcpy(nControl->response, "timed out waiting for connection");
+          net_close(nData->handle);
+          nData->handle = 0;
+          rv = 0;
+      }
+    else
+      {
+          if (FD_ISSET(nData->handle, &mask))
+            {
+                l = sizeof(addr);
+                sData = accept(nData->handle, &addr, &l);
+                i = errno;
+                net_close(nData->handle);
+                if (sData > 0)
+                  {
+                      rv = 1;
+                      nData->handle = sData;
+                  }
+                else
+                  {
+                      strncpy(nControl->response, strerror(i),
+                              sizeof(nControl->response));
+                      nData->handle = 0;
+                      rv = 0;
+                  }
+            }
+          else if (FD_ISSET(nControl->handle, &mask))
+            {
+                net_close(nData->handle);
+                nData->handle = 0;
+                readresp('2', nControl);
+                rv = 0;
+            }
+      }
+    return rv;  
+}
+
+/*
+ * FtpAccess - return a handle for a data stream
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpAccess(const char *path, int typ, int mode, netbuf *nControl,
+                        netbuf **nData)
+{
+    char buf[256];
+    int dir;
+    if ((path == NULL) &&
+        ((typ == FTPLIB_FILE_WRITE) || (typ == FTPLIB_FILE_READ)))
+      {
+          sprintf(nControl->response,
+                  "Missing path argument for file transfer\n");
+          return 0;
+      }
+    sprintf(buf, "TYPE %c", mode);
+    if (!FtpSendCmd(buf, '2', nControl))
+        return 0;
+    switch (typ)
+      {
+        case FTPLIB_DIR:
+            strcpy(buf,"NLST");
+            dir = FTPLIB_READ;
+            break;
+        case FTPLIB_DIR_VERBOSE:
+            strcpy(buf,"LIST");
+            dir = FTPLIB_READ;
+            break;
+        case FTPLIB_FILE_READ:
+            strcpy(buf,"RETR");
+            dir = FTPLIB_READ;
+            break;
+        case FTPLIB_FILE_WRITE:
+            strcpy(buf,"STOR");
+            dir = FTPLIB_WRITE;
+            break;
+        default:
+            sprintf(nControl->response, "Invalid open type %d\n", typ);
+            return 0;
+      }
+    if (path != NULL)
+      {
+          int i = strlen(buf);
+          buf[i++] = ' ';
+          if ((strlen(path) + i) >= sizeof(buf))
+              return 0;
+          strcpy(&buf[i],path);
+      }
+    if (FtpOpenPort(nControl, nData, mode, dir) == -1)
+        return 0;
+    if (!FtpSendCmd(buf, '1', nControl))
+      {
+          FtpClose(*nData);
+          *nData = NULL;
+          return 0;
+      }
+    (*nData)->ctrl = nControl;
+    nControl->data = *nData;
+    if (nControl->cmode == FTPLIB_PORT)
+      {
+          if (!FtpAcceptConnection(*nData,nControl))
+            {
+                FtpClose(*nData);
+                *nData = NULL;
+                nControl->data = NULL;
+                return 0;
+            }
+      }
+    return 1;
+}
+
+/*
+ * FtpRead - read from a data connection
+ */
+GLOBALDEF int FtpRead(void *buf, int max, netbuf *nData)
+{
+    int i;
+    if (nData->dir != FTPLIB_READ)
+        return 0;
+    if (nData->buf)
+        i = readline(buf, max, nData);
+    else
+      {
+          i = socket_wait(nData);
+          if (i != 1)
+              return 0;
+          i = net_read(nData->handle, buf, max);
+      }
+    if (i == -1)
+        return 0;
+    nData->xfered += i;
+    if (nData->idlecb && nData->cbbytes)
+      {
+          nData->xfered1 += i;
+          if (nData->xfered1 > nData->cbbytes)
+            {
+                if (nData->idlecb(nData, nData->xfered, nData->idlearg) == 0)
+                    return 0;
+                nData->xfered1 = 0;
+            }
+      }
+    return i;
+}
+
+/*
+ * FtpWrite - write to a data connection
+ */
+GLOBALDEF int FtpWrite(void *buf, int len, netbuf *nData)
+{
+    int i;
+    if (nData->dir != FTPLIB_WRITE)
+        return 0;
+    if (nData->buf)
+        i = writeline(buf, len, nData);
+    else
+      {
+          socket_wait(nData);
+          i = net_write(nData->handle, buf, len);
+      }
+    if (i == -1)
+        return 0;
+    nData->xfered += i;
+    if (nData->idlecb && nData->cbbytes)
+      {
+          nData->xfered1 += i;
+          if (nData->xfered1 > nData->cbbytes)
+            {
+                nData->idlecb(nData, nData->xfered, nData->idlearg);
+                nData->xfered1 = 0;
+            }
+      }
+    return i;
+}
+
+/*
+ * FtpClose - close a data connection
+ */
+GLOBALDEF int FtpClose(netbuf *nData)
+{
+    netbuf *ctrl;
+    switch (nData->dir)
+      {
+        case FTPLIB_WRITE:
+              /* potential problem - if buffer flush fails, how to notify user? */
+            if (nData->buf != NULL)
+                writeline(NULL, 0, nData);
+        case FTPLIB_READ:
+            if (nData->buf)
+                free(nData->buf);
+            shutdown(nData->handle,2);
+            net_close(nData->handle);
+            ctrl = nData->ctrl;
+            free(nData);
+            if (ctrl)
+              {
+                  ctrl->data = NULL;
+                  return(readresp('2', ctrl));
+              }
+            return 1;
+        case FTPLIB_CONTROL:
+            if (nData->data)
+              {
+                  nData->ctrl = NULL;
+                  FtpClose(nData);
+              }
+            net_close(nData->handle);
+            free(nData);
+            return 0;
+      }
+    return 1;
+}
+
+/*
+ * FtpSite - send a SITE command
+ *
+ * return 1 if command successful, 0 otherwise
+ */
+GLOBALDEF int FtpSite(const char *cmd, netbuf *nControl)
+{
+    char buf[256];
+    
+    if ((strlen(cmd) + 7) > sizeof(buf))
+        return 0;
+    sprintf(buf,"SITE %s",cmd);
+    if (!FtpSendCmd(buf,'2',nControl))
+        return 0;
+    return 1;
+}
+
+/*
+ * FtpSysType - send a SYST command
+ *
+ * Fills in the user buffer with the remote system type.  If more
+ * information from the response is required, the user can parse
+ * it out of the response buffer returned by FtpLastResponse().
+ *
+ * return 1 if command successful, 0 otherwise
+ */
+GLOBALDEF int FtpSysType(char *buf, int max, netbuf *nControl)
+{
+    int l = max;
+    char *b = buf;
+    char *s;
+    if (!FtpSendCmd("SYST",'2',nControl))
+        return 0;
+    s = &nControl->response[4];
+    while ((--l) && (*s != ' '))
+        *b++ = *s++;
+    *b++ = '\0';
+    return 1;
+}
+
+/*
+ * FtpMkdir - create a directory at server
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpMkdir(const char *path, netbuf *nControl)
+{
+    char buf[256];
+
+    if ((strlen(path) + 6) > sizeof(buf))
+        return 0;
+    sprintf(buf,"MKD %s",path);
+    if (!FtpSendCmd(buf,'2', nControl))
+        return 0;
+    return 1;
+}
+
+/*
+ * FtpChdir - change path at remote
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpChdir(const char *path, netbuf *nControl)
+{
+    char buf[256];
+
+    if ((strlen(path) + 6) > sizeof(buf))
+        return 0;
+    sprintf(buf,"CWD %s",path);
+    if (!FtpSendCmd(buf,'2',nControl))
+        return 0;
+    return 1;
+}
+
+/*
+ * FtpCDUp - move to parent directory at remote
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpCDUp(netbuf *nControl)
+{
+    if (!FtpSendCmd("CDUP",'2',nControl))
+        return 0;
+    return 1;
+}
+
+/*
+ * FtpRmdir - remove directory at remote
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpRmdir(const char *path, netbuf *nControl)
+{
+    char buf[256];
+
+    if ((strlen(path) + 6) > sizeof(buf))
+        return 0;
+    sprintf(buf,"RMD %s",path);
+    if (!FtpSendCmd(buf,'2',nControl))
+        return 0;
+    return 1;
+}
+
+/*
+ * FtpPwd - get working directory at remote
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpPwd(char *path, int max, netbuf *nControl)
+{
+    int l = max;
+    char *b = path;
+    char *s;
+    if (!FtpSendCmd("PWD",'2',nControl))
+        return 0;
+    s = strchr(nControl->response, '"');
+    if (s == NULL)
+        return 0;
+    s++;
+    while ((--l) && (*s) && (*s != '"'))
+        *b++ = *s++;
+    *b++ = '\0';
+    return 1;
+}
+
+/*
+ * FtpXfer - issue a command and transfer data
+ *
+ * return 1 if successful, 0 otherwise
+ */
+static int FtpXfer(const char *localfile, const char *path,
+                   netbuf *nControl, int typ, int mode)
+{
+    int l,c;
+    char *dbuf;
+    FILE *local = NULL;
+    netbuf *nData;
+    int rv=1;
+    int writeResult = 0;
+
+    if (localfile != NULL)
+      {
+          char ac[4] = "w";
+          if (typ == FTPLIB_FILE_WRITE)
+              ac[0] = 'r';
+          if (mode == FTPLIB_IMAGE)
+              ac[1] = 'b';
+          local = fopen(localfile, ac);
+          if (local == NULL)
+            {
+                strncpy(nControl->response, strerror(errno),
+                        sizeof(nControl->response));
+                return 0;
+            }
+      }
+    if (local == NULL)
+        local = (typ == FTPLIB_FILE_WRITE) ? stdin : stdout;
+    if (!FtpAccess(path, typ, mode, nControl, &nData))
+        return 0;
+    dbuf = malloc(FTPLIB_BUFSIZ);
+    if (typ == FTPLIB_FILE_WRITE)
+      {
+          while ((l = fread(dbuf, 1, FTPLIB_BUFSIZ, local)) > 0)
+              if ((c = FtpWrite(dbuf, l, nData)) < l)
+                {
+                    if (ftplib_debug > 1)
+                        printf("short write: passed %d, wrote %d\n", l, c);
+                    rv = 0;
+                    break;
+                }
+      }
+    else
+      {
+          while ((l = FtpRead(dbuf, FTPLIB_BUFSIZ, nData)) > 0) {
+              writeResult = (nData->writercb) ? nData->writercb(nData, dbuf, l, nData->writerarg) : fwrite(dbuf, 1, l, local);
+              if (writeResult <= 0)
+                {
+                    perror("localstore write");
+                    rv = 0;
+                    break;
+                }
+          }
+      }
+    free(dbuf);
+    fflush(local);
+    if (localfile != NULL)
+        fclose(local);
+    FtpClose(nData);
+    return rv;
+}
+
+/*
+ * FtpNlst - issue an NLST command and write response to output
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpNlst(const char *outputfile, const char *path,
+                      netbuf *nControl)
+{
+    return FtpXfer(outputfile, path, nControl, FTPLIB_DIR, FTPLIB_ASCII);
+}
+
+/*
+ * FtpDir - issue a LIST command and write response to output
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpDir(const char *outputfile, const char *path, netbuf *nControl)
+{
+    return FtpXfer(outputfile, path, nControl, FTPLIB_DIR_VERBOSE, FTPLIB_ASCII);
+}
+
+/*
+ * FtpSize - determine the size of a remote file
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpSize(const char *path, int *size, char mode, netbuf *nControl)
+{
+    char cmd[256];
+    int resp,sz,rv=1;
+
+    if ((strlen(path) + 7) > sizeof(cmd))
+        return 0;
+    sprintf(cmd, "TYPE %c", mode);
+    if (!FtpSendCmd(cmd, '2', nControl))
+        return 0;
+    sprintf(cmd,"SIZE %s",path);
+    if (!FtpSendCmd(cmd,'2',nControl))
+        rv = 0;
+    else
+      {
+          if (sscanf(nControl->response, "%d %d", &resp, &sz) == 2)
+              *size = sz;
+          else
+              rv = 0;
+      }   
+    return rv;
+}
+
+/*
+ * FtpModDate - determine the modification date of a remote file
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpModDate(const char *path, char *dt, int max, netbuf *nControl)
+{
+    char buf[256];
+    int rv = 1;
+
+    if ((strlen(path) + 7) > sizeof(buf))
+        return 0;
+    sprintf(buf,"MDTM %s",path);
+    if (!FtpSendCmd(buf,'2',nControl))
+        rv = 0;
+    else
+        strncpy(dt, &nControl->response[4], max);
+    return rv;
+}
+
+/*
+ * FtpGet - issue a GET command and write received data to output
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpGet(const char *outputfile, const char *path,
+                     char mode, netbuf *nControl)
+{
+    return FtpXfer(outputfile, path, nControl, FTPLIB_FILE_READ, mode);
+}
+
+/*
+ * FtpPut - issue a PUT command and send data from input
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpPut(const char *inputfile, const char *path, char mode,
+                     netbuf *nControl)
+{
+    return FtpXfer(inputfile, path, nControl, FTPLIB_FILE_WRITE, mode);
+}
+
+/*
+ * FtpRename - rename a file at remote
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpRename(const char *src, const char *dst, netbuf *nControl)
+{
+    char cmd[256];
+
+    if (((strlen(src) + 7) > sizeof(cmd)) ||
+        ((strlen(dst) + 7) > sizeof(cmd)))
+        return 0;
+    sprintf(cmd,"RNFR %s",src);
+    if (!FtpSendCmd(cmd,'3',nControl))
+        return 0;
+    sprintf(cmd,"RNTO %s",dst);
+    if (!FtpSendCmd(cmd,'2',nControl))
+        return 0;
+    return 1;
+}
+
+/*
+ * FtpDelete - delete a file at remote
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF int FtpDelete(const char *fnm, netbuf *nControl)
+{
+    char cmd[256];
+
+    if ((strlen(fnm) + 7) > sizeof(cmd))
+        return 0;
+    sprintf(cmd,"DELE %s",fnm);
+    if (!FtpSendCmd(cmd,'2', nControl))
+        return 0;
+    return 1;
+}
+
+/*
+ * FtpQuit - disconnect from remote
+ *
+ * return 1 if successful, 0 otherwise
+ */
+GLOBALDEF void FtpQuit(netbuf *nControl)
+{
+    if (nControl->dir != FTPLIB_CONTROL)
+        return;
+    FtpSendCmd("QUIT",'2',nControl);
+    net_close(nControl->handle);
+    free(nControl->buf);
+    free(nControl);
+}
diff --git a/src/utilfuns/ftpparse.c b/src/utilfuns/ftpparse.c
new file mode 100644
index 0000000..b9bafa1
--- /dev/null
+++ b/src/utilfuns/ftpparse.c
@@ -0,0 +1,447 @@
+/* ftpparse.c, ftpparse.h: library for parsing FTP LIST responses
+20001223
+D. J. Bernstein, djb@cr.yp.to
+http://cr.yp.to/ftpparse.html
+
+Commercial use is fine, if you let me know what programs you're using this in.
+
+Currently covered formats:
+EPLF.
+UNIX ls, with or without gid.
+Microsoft FTP Service.
+Windows NT FTP Server.
+VMS.
+WFTPD.
+NetPresenz (Mac).
+NetWare.
+MSDOS.
+
+Definitely not covered: 
+Long VMS filenames, with information split across two lines.
+NCSA Telnet FTP server. Has LIST = NLST (and bad NLST for directories).
+*/
+
+#include <ftpparse.h>
+
+static long totai(long year,long month,long mday)
+{
+  long result;
+  if (month >= 2) month -= 2;
+  else { month += 10; --year; }
+  result = (mday - 1) * 10 + 5 + 306 * month;
+  result /= 10;
+  if (result == 365) { year -= 3; result = 1460; }
+  else result += 365 * (year % 4);
+  year /= 4;
+  result += 1461 * (year % 25);
+  year /= 25;
+  if (result == 36524) { year -= 3; result = 146096; }
+  else { result += 36524 * (year % 4); }
+  year /= 4;
+  result += 146097 * (year - 5);
+  result += 11017;
+  return result * 86400;
+}
+
+static int flagneedbase = 1;
+static time_t base; /* time() value on this OS at the beginning of 1970 TAI */
+static long now; /* current time */
+static int flagneedcurrentyear = 1;
+static long currentyear; /* approximation to current year */
+
+static void initbase(void)
+{
+  struct tm *t;
+  if (!flagneedbase) return;
+
+  base = 0;
+  t = gmtime(&base);
+  base = -(totai(t->tm_year + 1900,t->tm_mon,t->tm_mday) + t->tm_hour * 3600 + t->tm_min * 60 + t->tm_sec);
+  /* assumes the right time_t, counting seconds. */
+  /* base may be slightly off if time_t counts non-leap seconds. */
+  flagneedbase = 0;
+}
+
+static void initnow(void)
+{
+  long day;
+  long year;
+
+  initbase();
+  now = time((time_t *) 0) - base;
+
+  if (flagneedcurrentyear) {
+    day = now / 86400;
+    if ((now % 86400) < 0) --day;
+    day -= 11017;
+    year = 5 + day / 146097;
+    day = day % 146097;
+    if (day < 0) { day += 146097; --year; }
+    year *= 4;
+    if (day == 146096) { year += 3; day = 36524; }
+    else { year += day / 36524; day %= 36524; }
+    year *= 25;
+    year += day / 1461;
+    day %= 1461;
+    year *= 4;
+    if (day == 1460) { year += 3; day = 365; }
+    else { year += day / 365; day %= 365; }
+    day *= 10;
+    if ((day + 5) / 306 >= 10) ++year;
+    currentyear = year;
+    flagneedcurrentyear = 0;
+  }
+}
+
+/* UNIX ls does not show the year for dates in the last six months. */
+/* So we have to guess the year. */
+/* Apparently NetWare uses ``twelve months'' instead of ``six months''; ugh. */
+/* Some versions of ls also fail to show the year for future dates. */
+static long guesstai(long month,long mday)
+{
+  long year;
+  long t;
+
+  initnow();
+
+  for (year = currentyear - 1;year < currentyear + 100;++year) {
+    t = totai(year,month,mday);
+    if (now - t < 350 * 86400)
+      return t;
+  }
+  return 0;
+}
+
+static int check(char *buf,char *monthname)
+{
+  if ((buf[0] != monthname[0]) && (buf[0] != monthname[0] - 32)) return 0;
+  if ((buf[1] != monthname[1]) && (buf[1] != monthname[1] - 32)) return 0;
+  if ((buf[2] != monthname[2]) && (buf[2] != monthname[2] - 32)) return 0;
+  return 1;
+}
+
+static char *months[12] = {
+  "jan","feb","mar","apr","may","jun","jul","aug","sep","oct","nov","dec"
+} ;
+
+static int getmonth(char *buf,int len)
+{
+  int i;
+  if (len == 3)
+    for (i = 0;i < 12;++i)
+      if (check(buf,months[i])) return i;
+  return -1;
+}
+
+static long getlong(char *buf,int len)
+{
+  long u = 0;
+  while (len-- > 0)
+    u = u * 10 + (*buf++ - '0');
+  return u;
+}
+
+int ftpparse(struct ftpparse *fp,char *buf,int len)
+{
+  int i;
+  int j;
+  int state;
+  long size = 0;
+  long year;
+  long month = 0;
+  long mday = 0;
+  long hour;
+  long minute;
+
+  fp->name = 0;
+  fp->namelen = 0;
+  fp->flagtrycwd = 0;
+  fp->flagtryretr = 0;
+  fp->sizetype = FTPPARSE_SIZE_UNKNOWN;
+  fp->size = 0;
+  fp->mtimetype = FTPPARSE_MTIME_UNKNOWN;
+  fp->mtime = 0;
+  fp->idtype = FTPPARSE_ID_UNKNOWN;
+  fp->id = 0;
+  fp->idlen = 0;
+
+  if (len < 2) /* an empty name in EPLF, with no info, could be 2 chars */
+    return 0;
+
+  switch(*buf) {
+    /* see http://pobox.com/~djb/proto/eplf.txt */
+    /* "+i8388621.29609,m824255902,/,\tdev" */
+    /* "+i8388621.44468,m839956783,r,s10376,\tRFCEPLF" */
+    case '+':
+      i = 1;
+      for (j = 1;j < len;++j) {
+        if (buf[j] == 9) {
+          fp->name = buf + j + 1;
+          fp->namelen = len - j - 1;
+          return 1;
+        }
+        if (buf[j] == ',') {
+          switch(buf[i]) {
+            case '/':
+              fp->flagtrycwd = 1;
+              break;
+            case 'r':
+              fp->flagtryretr = 1;
+              break;
+            case 's':
+              fp->sizetype = FTPPARSE_SIZE_BINARY;
+              fp->size = getlong(buf + i + 1,j - i - 1);
+              break;
+            case 'm':
+              fp->mtimetype = FTPPARSE_MTIME_LOCAL;
+              initbase();
+              fp->mtime = base + getlong(buf + i + 1,j - i - 1);
+              break;
+            case 'i':
+              fp->idtype = FTPPARSE_ID_FULL;
+              fp->id = buf + i + 1;
+              fp->idlen = j - i - 1;
+          }
+          i = j + 1;
+        }
+      }
+      return 0;
+    
+    /* UNIX-style listing, without inum and without blocks */
+    /* "-rw-r--r--   1 root     other        531 Jan 29 03:26 README" */
+    /* "dr-xr-xr-x   2 root     other        512 Apr  8  1994 etc" */
+    /* "dr-xr-xr-x   2 root     512 Apr  8  1994 etc" */
+    /* "lrwxrwxrwx   1 root     other          7 Jan 25 00:17 bin -> usr/bin" */
+    /* Also produced by Microsoft's FTP servers for Windows: */
+    /* "----------   1 owner    group         1803128 Jul 10 10:18 ls-lR.Z" */
+    /* "d---------   1 owner    group               0 May  9 19:45 Softlib" */
+    /* Also WFTPD for MSDOS: */
+    /* "-rwxrwxrwx   1 noone    nogroup      322 Aug 19  1996 message.ftp" */
+    /* Also NetWare: */
+    /* "d [R----F--] supervisor            512       Jan 16 18:53    login" */
+    /* "- [R----F--] rhesus             214059       Oct 20 15:27    cx.exe" */
+    /* Also NetPresenz for the Mac: */
+    /* "-------r--         326  1391972  1392298 Nov 22  1995 MegaPhone.sit" */
+    /* "drwxrwxr-x               folder        2 May 10  1996 network" */
+    case 'b':
+    case 'c':
+    case 'd':
+    case 'l':
+    case 'p':
+    case 's':
+    case '-':
+
+      if (*buf == 'd') fp->flagtrycwd = 1;
+      if (*buf == '-') fp->flagtryretr = 1;
+      if (*buf == 'l') fp->flagtrycwd = fp->flagtryretr = 1;
+
+      state = 1;
+      i = 0;
+      for (j = 1;j < len;++j)
+        if ((buf[j] == ' ') && (buf[j - 1] != ' ')) {
+          switch(state) {
+            case 1: /* skipping perm */
+              state = 2;
+              break;
+            case 2: /* skipping nlink */
+              state = 3;
+              if ((j - i == 6) && (buf[i] == 'f')) /* for NetPresenz */
+                state = 4;
+              break;
+            case 3: /* skipping uid */
+              state = 4;
+              break;
+            case 4: /* getting tentative size */
+              size = getlong(buf + i,j - i);
+              state = 5;
+              break;
+            case 5: /* searching for month, otherwise getting tentative size */
+              month = getmonth(buf + i,j - i);
+              if (month >= 0)
+                state = 6;
+              else
+                size = getlong(buf + i,j - i);
+              break;
+            case 6: /* have size and month */
+              mday = getlong(buf + i,j - i);
+              state = 7;
+              break;
+            case 7: /* have size, month, mday */
+              if ((j - i == 4) && (buf[i + 1] == ':')) {
+                hour = getlong(buf + i,1);
+                minute = getlong(buf + i + 2,2);
+                fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE;
+                initbase();
+                fp->mtime = base + guesstai(month,mday) + hour * 3600 + minute * 60;
+              } else if ((j - i == 5) && (buf[i + 2] == ':')) {
+                hour = getlong(buf + i,2);
+                minute = getlong(buf + i + 3,2);
+                fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE;
+                initbase();
+                fp->mtime = base + guesstai(month,mday) + hour * 3600 + minute * 60;
+              }
+              else if (j - i >= 4) {
+                year = getlong(buf + i,j - i);
+                fp->mtimetype = FTPPARSE_MTIME_REMOTEDAY;
+                initbase();
+                fp->mtime = base + totai(year,month,mday);
+              }
+              else
+                return 0;
+              fp->name = buf + j + 1;
+              fp->namelen = len - j - 1;
+              state = 8;
+              break;
+            case 8: /* twiddling thumbs */
+              break;
+          }
+          i = j + 1;
+          while ((i < len) && (buf[i] == ' ')) ++i;
+        }
+
+      if (state != 8)
+        return 0;
+
+      fp->size = size;
+      fp->sizetype = FTPPARSE_SIZE_BINARY;
+
+      if (*buf == 'l')
+        for (i = 0;i + 3 < fp->namelen;++i)
+          if (fp->name[i] == ' ')
+            if (fp->name[i + 1] == '-')
+              if (fp->name[i + 2] == '>')
+                if (fp->name[i + 3] == ' ') {
+                  fp->namelen = i;
+                  break;
+                }
+
+      /* eliminate extra NetWare spaces */
+      if ((buf[1] == ' ') || (buf[1] == '['))
+        if (fp->namelen > 3)
+          if (fp->name[0] == ' ')
+            if (fp->name[1] == ' ')
+              if (fp->name[2] == ' ') {
+                fp->name += 3;
+                fp->namelen -= 3;
+              }
+
+      return 1;
+  }
+
+  /* MultiNet (some spaces removed from examples) */
+  /* "00README.TXT;1      2 30-DEC-1996 17:44 [SYSTEM] (RWED,RWED,RE,RE)" */
+  /* "CORE.DIR;1          1  8-SEP-1996 16:09 [SYSTEM] (RWE,RWE,RE,RE)" */
+  /* and non-MutliNet VMS: */
+  /* "CII-MANUAL.TEX;1  213/216  29-JAN-1996 03:33:12  [ANONYMOU,ANONYMOUS]   (RWED,RWED,,)" */
+  for (i = 0;i < len;++i)
+    if (buf[i] == ';')
+      break;
+  if (i < len) {
+    fp->name = buf;
+    fp->namelen = i;
+    if (i > 4)
+      if (buf[i - 4] == '.')
+        if (buf[i - 3] == 'D')
+          if (buf[i - 2] == 'I')
+            if (buf[i - 1] == 'R') {
+              fp->namelen -= 4;
+              fp->flagtrycwd = 1;
+            }
+    if (!fp->flagtrycwd)
+      fp->flagtryretr = 1;
+    while (buf[i] != ' ') if (++i == len) return 0;
+    while (buf[i] == ' ') if (++i == len) return 0;
+    while (buf[i] != ' ') if (++i == len) return 0;
+    while (buf[i] == ' ') if (++i == len) return 0;
+    j = i;
+    while (buf[j] != '-') if (++j == len) return 0;
+    mday = getlong(buf + i,j - i);
+    while (buf[j] == '-') if (++j == len) return 0;
+    i = j;
+    while (buf[j] != '-') if (++j == len) return 0;
+    month = getmonth(buf + i,j - i);
+    if (month < 0) return 0;
+    while (buf[j] == '-') if (++j == len) return 0;
+    i = j;
+    while (buf[j] != ' ') if (++j == len) return 0;
+    year = getlong(buf + i,j - i);
+    while (buf[j] == ' ') if (++j == len) return 0;
+    i = j;
+    while (buf[j] != ':') if (++j == len) return 0;
+    hour = getlong(buf + i,j - i);
+    while (buf[j] == ':') if (++j == len) return 0;
+    i = j;
+    while ((buf[j] != ':') && (buf[j] != ' ')) if (++j == len) return 0;
+    minute = getlong(buf + i,j - i);
+
+    fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE;
+    initbase();
+    fp->mtime = base + totai(year,month,mday) + hour * 3600 + minute * 60;
+
+    return 1;
+  }
+
+  /* MSDOS format */
+  /* 04-27-00  09:09PM       <DIR>          licensed */
+  /* 07-18-00  10:16AM       <DIR>          pub */
+  /* 04-14-00  03:47PM                  589 readme.htm */
+  if ((*buf >= '0') && (*buf <= '9')) {
+    i = 0;
+    j = 0;
+    while (buf[j] != '-') if (++j == len) return 0;
+    month = getlong(buf + i,j - i) - 1;
+    while (buf[j] == '-') if (++j == len) return 0;
+    i = j;
+    while (buf[j] != '-') if (++j == len) return 0;
+    mday = getlong(buf + i,j - i);
+    while (buf[j] == '-') if (++j == len) return 0;
+    i = j;
+    while (buf[j] != ' ') if (++j == len) return 0;
+    year = getlong(buf + i,j - i);
+    if (year < 50) year += 2000;
+    if (year < 1000) year += 1900;
+    while (buf[j] == ' ') if (++j == len) return 0;
+    i = j;
+    while (buf[j] != ':') if (++j == len) return 0;
+    hour = getlong(buf + i,j - i);
+    while (buf[j] == ':') if (++j == len) return 0;
+    i = j;
+    while ((buf[j] != 'A') && (buf[j] != 'P')) if (++j == len) return 0;
+    minute = getlong(buf + i,j - i);
+    if (hour == 12) hour = 0;
+    if (buf[j] == 'A') if (++j == len) return 0;
+    if (buf[j] == 'P') { hour += 12; if (++j == len) return 0; }
+    if (buf[j] == 'M') if (++j == len) return 0;
+
+    while (buf[j] == ' ') if (++j == len) return 0;
+    if (buf[j] == '<') {
+      fp->flagtrycwd = 1;
+      while (buf[j] != ' ') if (++j == len) return 0;
+    }
+    else {
+      i = j;
+      while (buf[j] != ' ') if (++j == len) return 0;
+      fp->size = getlong(buf + i,j - i);
+      fp->sizetype = FTPPARSE_SIZE_BINARY;
+      fp->flagtryretr = 1;
+    }
+    while (buf[j] == ' ') if (++j == len) return 0;
+
+    fp->name = buf + j;
+    fp->namelen = len - j;
+
+    fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE;
+    initbase();
+    fp->mtime = base + totai(year,month,mday) + hour * 3600 + minute * 60;
+
+    return 1;
+  }
+
+  /* Some useless lines, safely ignored: */
+  /* "Total of 11 Files, 10966 Blocks." (VMS) */
+  /* "total 14786" (UNIX) */
+  /* "DISK$ANONFTP:[ANONYMOUS]" (VMS) */
+  /* "Directory DISK$PCSA:[ANONYM]" (VMS) */
+
+  return 0;
+}
diff --git a/src/utilfuns/roman.cpp b/src/utilfuns/roman.cpp
new file mode 100644
index 0000000..d436b19
--- /dev/null
+++ b/src/utilfuns/roman.cpp
@@ -0,0 +1,92 @@
+/******************************************************************************
+ *
+ *  roman.cpp -	
+ *
+ * $Id: roman.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <roman.h>
+
+
+SWORD_NAMESPACE_START
+
+
+char isroman (const char *str, int maxchars) {
+	char *ch = (char*)str;
+	for (; *ch && (!maxchars || (ch-str) <= maxchars); ch++)
+		if (!strchr("IVXLCDMivxlcdm ", *ch))
+			return 0;
+	return 1;
+}
+
+int from_rom(const char* str) {
+	int i, n = strlen(str);
+	short * num= (short *) calloc(n, sizeof(short));
+	for (i = 0; str[i]; i++) {
+		switch(str[i]) {
+		case 'i':
+		case 'I':
+			num[i] = 1;
+			break;
+		case 'v':
+		case 'V':
+			num[i] = 5;
+			break;
+		case 'x':
+		case 'X':
+			num[i] = 10;
+			break;
+		case 'l':
+		case 'L':
+			num[i] = 50;
+			break;
+		case 'c':
+		case 'C':
+			num[i] = 100;
+			break;
+		case 'd':
+		case 'D':
+			num[i] = 500;
+			break;
+		case 'm':
+		case 'M':
+			num[i] = 1000;
+			break;
+		default:
+			num[i] = 0;
+		}
+	}
+	for (i = 1; str[i]; i++) {
+		if (num[i] > num[i-1])  {
+			num[i] -= num[i-1];
+			num[i-1] = 0;
+		}
+	}
+	n = 0;
+	for (i = 0; str[i]; i++) {
+		n += num[i];
+	}
+     free(num);
+	return n;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/utilfuns/swbuf.cpp b/src/utilfuns/swbuf.cpp
new file mode 100644
index 0000000..9c4908b
--- /dev/null
+++ b/src/utilfuns/swbuf.cpp
@@ -0,0 +1,174 @@
+/******************************************************************************
+ *
+ *  swbuf.cpp -	used as a transport and utility for data buffers
+ *
+ * $Id: swbuf.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swbuf.h>
+
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+
+SWORD_NAMESPACE_START
+
+
+char *SWBuf::nullStr = (char *)"";
+
+/******************************************************************************
+* SWBuf Constructor - Creates an empty SWBuf object or an SWBuf initialized
+* 		to a value from a const char *
+*
+*/
+SWBuf::SWBuf(const char *initVal, unsigned long initSize) {
+	init(initSize);
+	if (initVal)
+		set(initVal);
+}
+
+/******************************************************************************
+* SWBuf Constructor - Creates an SWBuf initialized
+* 		to a value from another SWBuf
+*
+*/
+SWBuf::SWBuf(const SWBuf &other, unsigned long initSize) {
+	init(initSize);
+	set(other);
+}
+
+/******************************************************************************
+* SWBuf Constructor - Creates an SWBuf initialized
+* 		to a value from a char
+*
+*/
+SWBuf::SWBuf(char initVal, unsigned long initSize) {
+	init(initSize+1);
+	*buf = initVal;
+	end = buf+1;
+	*end = 0;
+}
+
+/*
+SWBuf::SWBuf(unsigned long initSize) {
+	init(initSize);
+	set((const char *)0);
+}
+*/
+
+
+/******************************************************************************
+* SWBuf::setFormatted - sets this buf to a formatted string
+* WARNING: This function can only write at most
+* JUNKBUFSIZE to the string per call.
+*/
+SWBuf &SWBuf::setFormatted(const char *format, ...) {
+	va_list argptr;
+
+	va_start(argptr, format);
+#ifdef NO_VSNPRINTF
+	static char junkBuf[JUNKBUFSIZE];
+	int len = vsprintf(junkBuf, format, argptr)+1;
+#else
+	int len = vsnprintf(0, 0, format, argptr)+1;
+#endif
+	va_end(argptr);
+	assureSize(len);
+	va_start(argptr, format);
+	end = vsprintf(buf, format, argptr) + buf;
+	va_end(argptr);
+	return *this;
+}
+
+/******************************************************************************
+* SWBuf::append - appends a value to the current value of this SWBuf
+* 
+*/
+SWBuf &SWBuf::append(const char *str, long max) {
+//	if (!str) //A null string was passed
+//		return;
+	if (max < 0)
+		max = strlen(str);
+	assureMore(max+1);
+	for (;((max)&&(*str));max--)
+		*end++ = *str++;
+	*end = 0;
+	return *this;
+}
+
+/******************************************************************************
+* SWBuf::setSize - Size this buffer to a specific length
+*/
+void SWBuf::setSize(unsigned long len) {
+	assureSize(len+1);
+	if ((unsigned)(end - buf) < len)
+		memset(end, fillByte, len - (end-buf));
+	end = buf + len;
+	*end = 0;
+}
+
+/******************************************************************************
+* SWBuf::appendFormatted - appends formatted strings to the current value of this SWBuf
+* WARNING: This function can only write at most
+* JUNKBUFSIZE to the string per call.
+*/
+SWBuf &SWBuf::appendFormatted(const char *format, ...) {
+	va_list argptr;
+
+	va_start(argptr, format);
+#ifdef NO_VSNPRINTF
+	static char junkBuf[JUNKBUFSIZE];
+	int len = vsprintf(junkBuf, format, argptr)+1;
+#else
+	int len = vsnprintf(0, 0, format, argptr)+1;
+#endif
+	va_end(argptr);
+	assureMore(len);
+	va_start(argptr, format);
+	end += vsprintf(end, format, argptr);
+	va_end(argptr);
+	return *this;
+}
+
+void SWBuf::insert(unsigned long pos, const char* str, unsigned long start, signed long max) {
+// 	if (!str) //A null string was passed
+// 		return;
+
+	str += start;
+	int len = (max > -1) ? max : strlen(str);
+
+	if (!len || (pos > length())) //nothing to do, return
+		return;
+	
+	// pos==length(), so we can call append in this case
+	if (pos == length()) { //append is more efficient
+		append(str, max);
+		return;
+	}
+	
+	assureMore( len );
+	
+	memmove(buf + pos + len, buf + pos, (end - buf) - pos); //make a gap of "len" bytes
+	memcpy(buf+pos, str, len);
+	
+	end += len;
+	*end = 0;
+}
+
+SWORD_NAMESPACE_END
diff --git a/src/utilfuns/swobject.cpp b/src/utilfuns/swobject.cpp
new file mode 100644
index 0000000..2316111
--- /dev/null
+++ b/src/utilfuns/swobject.cpp
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ *  swobject.cpp -	code for SWClass used as lowest base class for many
+ *			SWORD objects
+ *
+ * $Id: swobject.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swobject.h>
+
+// hack.  remove this when we figure out our link error
+#ifndef __CYGWIN__
+#include <utilstr.h>
+#else
+#include <string.h>
+#endif
+
+
+SWORD_NAMESPACE_START
+
+
+bool SWClass::isAssignableFrom(const char *className) const {
+	for (int i = 0; descends[i]; i++) {
+#ifndef __CYGWIN__
+		if (!sword::stricmp(descends[i], className))
+#else
+		if (!stricmp(descends[i], className))
+#endif
+			return true;
+	}
+	return false;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/utilfuns/swversion.cpp b/src/utilfuns/swversion.cpp
new file mode 100644
index 0000000..78a00ba
--- /dev/null
+++ b/src/utilfuns/swversion.cpp
@@ -0,0 +1,108 @@
+/******************************************************************************
+ *
+ *  swversion.cpp -	SWVersion: version number utility class
+ *
+ * $Id: swversion.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swversion.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+SWORD_NAMESPACE_START
+
+
+SWVersion SWVersion::currentVersion( SWORD_VERSION_STR );
+
+
+/******************************************************************************
+ * SWVersion c-tor - Constructs a new SWVersion
+ *
+ * ENT:	version	- const version string
+ */
+
+SWVersion::SWVersion(const char *version) {
+	char *buf = new char[ strlen(version) + 1 ];
+	char *tok;
+	major = minor = minor2 = minor3 = -1;
+		
+	strcpy(buf, version);
+	tok = strtok(buf, ".");
+	if (tok)
+		major = atoi(tok);
+	tok = strtok(0, ".");
+	if (tok)
+		minor = atoi(tok);
+	tok = strtok(0, ".");
+	if (tok)
+		minor2 = atoi(tok);
+	tok = strtok(0, ".");
+	if (tok)
+		minor3 = atoi(tok);
+	delete [] buf;
+}
+
+
+/******************************************************************************
+ * compare - compares this version to another version
+ *
+ * ENT:	vi	- other version with which to compare
+ *
+ * RET:	= 0 if equal;
+ * 		< 0 if this version is less than other version;
+ * 		> 0 if this version is greater than other version
+ */
+
+int SWVersion::compare(const SWVersion &vi) const {
+	if (major == vi.major)
+		if (minor == vi.minor)
+			if (minor2 == vi.minor2)
+				if (minor3 == vi.minor3)
+					return 0;
+				else return minor3 - vi.minor3;
+			else	return minor2 - vi.minor2;
+		else	return minor - vi.minor;
+	else	return major - vi.major;
+}
+
+
+const char *SWVersion::getText() const {
+
+	// 255 is safe because there is no way 4 integers (plus 3 '.'s) can have
+	// a string representation that will overrun this buffer
+	static char buf[255];
+
+	if (minor > -1) {
+		if (minor2 > -1) {
+			if (minor3 > -1) {
+				sprintf(buf, "%d.%d.%d.%d", major, minor, minor2, minor3);
+			}
+			else	sprintf(buf, "%d.%d.%d", major, minor, minor2);
+		}
+		else	sprintf(buf, "%d.%d", major, minor);
+	}
+	else	sprintf(buf, "%d", major);
+
+	return buf;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/utilfuns/url.cpp b/src/utilfuns/url.cpp
new file mode 100644
index 0000000..a909a04
--- /dev/null
+++ b/src/utilfuns/url.cpp
@@ -0,0 +1,289 @@
+/******************************************************************************
+ *
+ *  url.cpp -	code for an URL parser utility class
+ *
+ * $Id: url.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <url.h>
+#include <swlog.h>
+
+//system includes
+#include <ctype.h>
+#include <map>
+#include <stdio.h>
+#include <iostream>
+
+
+SWORD_NAMESPACE_START
+
+
+namespace {
+	typedef std::map<unsigned char, SWBuf> DataMap;
+    	DataMap m;
+	static class __init {
+		public:
+			__init() {
+				for (unsigned short int c = 32; c <= 255; ++c) { //first set all encoding chars
+					if ( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || strchr("-_.!~*'()", c)) {
+						continue; //we don't need an encoding for this char
+					}
+
+					SWBuf buf;
+					buf.setFormatted("%%%-.2X", c);
+					m[c] = buf;
+				}
+				//the special encodings for certain chars
+				m[' '] = '+';
+			}
+	} ___init;
+}
+
+
+/**
+ * Constructors/Destructors
+ */
+URL::URL(const char *url)  
+	: 	url(""),
+		protocol(""),
+		hostname(""),
+		path("")
+{
+	if (url && strlen(url)) {
+		this->url = url;
+		parse();
+	}
+}
+
+
+const char *URL::getProtocol() const {
+	return protocol.c_str();
+}
+
+
+const char *URL::getHostName () const {
+	return hostname.c_str();
+}
+
+
+const char *URL::getPath() const {
+	return path.c_str();
+}
+
+
+const URL::ParameterMap &URL::getParameters() const {
+	return parameterMap;
+}
+
+
+/**
+ * Returns the value of an URL parameter. For the URL "http://www.crosswire.org/index.jsp?page=test&amp;user=nobody" the value of the parameter "page" would be "test".
+ * If the parameter is not set an empty string is returned.
+ */
+const char *URL::getParameterValue(const char *name) const {
+	static SWBuf emptyStr("");
+
+	ParameterMap::const_iterator it = parameterMap.find(name);
+	static SWBuf retVal;
+
+	if (it != parameterMap.end())
+		retVal = it->second.c_str();
+    	else
+		retVal = emptyStr.c_str();
+
+	return retVal.c_str();
+}
+
+
+/** Parse the URL.
+ * Parse the URL into the protocol, the hostname, the path and the paramters with their values
+ * 
+ */
+void URL::parse() {
+	/* format example		protocol://hostname/path/path/path.pl?param1=value1&amp;param2=value2
+	* we include the script name in the path, so the path would be /path/path/path.pl in this example
+	*  &amp; could also be &
+	*/
+
+	//1. Init
+	const char *urlPtr = url.c_str();
+	 
+	protocol = "";
+	hostname = "";
+	path     = "";
+	parameterMap.clear();
+	 
+	 // 2. Get the protocol, which is from the begining to the first ://
+	const char *end = strchr( urlPtr, ':' );
+	if (end) { //protocol was found
+	 	protocol.append(urlPtr, end-urlPtr);
+	 	urlPtr = end + 1;
+	
+		//find the end of the protocol separator (e.g. "://")
+		for (; (*urlPtr == ':') || (*urlPtr == '/'); urlPtr++);
+	}
+
+ //3.Get the hostname part. This is the part from pos up to the first slash
+	bool checkPath   = true;
+	bool checkParams = true;
+	bool checkAnchor = true;
+
+	end = strchr(urlPtr, '/');
+	if (!end) {
+		checkPath = false;
+		end = strchr(urlPtr, '?');
+	}
+	if (!end) {
+		checkParams = false;
+		end = strchr(urlPtr, '#');
+	}
+	if (!end) {
+		checkAnchor = false;
+		end = urlPtr+strlen(urlPtr);
+	}
+	 
+	hostname.append(urlPtr, end-urlPtr);
+	 	
+	urlPtr = end + ((*end)? 1 : 0);
+
+	if (checkPath) { 
+		end = strchr(urlPtr, '?');
+		if (!end) {
+			checkParams = false;
+			end = strchr(urlPtr, '#');
+		}
+		if (!end) {
+			checkAnchor = false;
+			end = urlPtr+strlen(urlPtr);
+		}
+
+	 	path.append(urlPtr, end-urlPtr);
+		
+		urlPtr = end + ((*end)? 1 : 0);
+	 }
+
+	if (checkParams) {
+		//5. Fill the map with the parameters and their values
+		SWBuf paramName;
+		SWBuf paramValue;
+				
+		if (checkAnchor) checkAnchor = false;
+/*
+		end = strchr(urlPtr, '#');
+		if (!end) {
+			checkAnchor = false;
+			end = urlPtr+strlen(urlPtr);
+		}
+*/
+		//end = (start && strchr(start, '?')) ? strchr(start, '?')+1 :0;
+		end = urlPtr;
+		while (end) {
+			paramName = "";
+			paramValue = "";
+			
+			//search for the equal sign to find the value part
+			const char *valueStart = strchr(end, '=');		
+			if (valueStart) {
+				const char* valueEnd = strstr(valueStart, "&amp;") ? strstr(valueStart, "&amp;") : strstr(valueStart, "&"); //try to find a new paramter part
+				
+				if (valueEnd) {
+					paramName.append(end, valueStart-end);
+					paramValue.append(valueStart+1, valueEnd-(valueStart+1));
+				}
+				else { //this is the last paramter of the URL
+					paramName.append(end, valueStart-end);
+					paramValue.append(valueStart+1);
+				}
+				
+				if (paramName.length() && paramValue.length()) {//insert the param into the map if it's valid
+					paramName = decode(paramName.c_str());
+					paramValue = decode(paramValue.c_str());
+					
+					parameterMap[ paramName ] = paramValue;
+				}
+			}
+			else {
+				break; //no valid parameter in the url
+			}
+			
+			const char *start = end+1;
+			end = strstr(start, "&amp;") ? strstr(start, "&amp;")+5 : (strstr(start, "&") ? strstr(start, "&")+1 : 0); //try to find a new paramter part
+		}
+	}
+}
+
+
+const SWBuf URL::encode(const char *urlText) {
+	/*static*/ SWBuf url;
+	url = urlText;
+	
+	SWBuf buf;
+	const int length = url.length();
+	for (int i = 0; i < length; i++) { //fill "buf"
+		const char& c = url[i];
+		buf.append( ((m[c].length()) ? m[c] : SWBuf(c)) );
+	}
+
+	url = buf;
+	return url;
+}
+
+
+const SWBuf URL::decode(const char *encoded) {
+	/*static*/ SWBuf text;
+	text = encoded;	
+
+	SWBuf decoded;	
+	const int length = text.length();
+	int i = 0;
+	
+	while (i < length) {
+		char a = text[i];
+		
+		if ( a == '+' ) { //handle special cases
+			decoded.append(' ');
+		}		
+		else if ( (a == '%') && (i+2 < length)) { //decode the %ab  hex encoded char
+			const char b = toupper( text[i+1] );
+			const char c = toupper( text[i+2] );
+			
+			if (isxdigit(b) && isxdigit(c)) { //valid %ab part
+				unsigned int dec = 16 * ((b >= 'A' && b <= 'F') ? (b - 'A' + 10) : (b - '0')); //dec value of the most left digit (b)
+				dec += (c >= 'A' && c <= 'F') ? (c - 'A' + 10) : (c - '0'); //dec value of the right digit (c)
+				
+				decoded.append((char)dec); //append the decoded char
+				
+				i += 2; //we jump over the %ab part; we have to leave out three, but the while  loop adds one, too
+			}
+		}
+		else { //just append the char
+			decoded.append(a);
+		}
+		
+		i++;
+	}
+	
+	if (decoded.length()) {
+		text = decoded;
+	}
+	return text;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/utilfuns/utilstr.cpp b/src/utilfuns/utilstr.cpp
new file mode 100644
index 0000000..cabd455
--- /dev/null
+++ b/src/utilfuns/utilstr.cpp
@@ -0,0 +1,413 @@
+/******************************************************************************
+ *
+ *  utilstr.cpp -	String utility functions
+ *
+ * $Id: utilstr.cpp 2982 2013-09-15 13:33:03Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <utilstr.h>
+#include <ctype.h>
+#include <string.h>
+
+#include <sysdata.h>
+#include <swlog.h>
+#include <swbuf.h>
+
+
+SWORD_NAMESPACE_START
+
+const unsigned char SW_toupper_array[256] = {
+	0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+	0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+	0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+	0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+	0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+	0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+	0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
+	0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
+	0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
+	0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
+	0x58, 0x59, 0x5a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
+	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+	0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+	0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+	0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+	0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+	0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+	0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xf7,
+	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xff
+};
+
+
+/******************************************************************************
+ * stdstr - clones a string
+ *
+ * ENT:	ipstr	- pointer to a string pointer to set if necessary
+ *	istr	- string to set to *ipstr
+ *			0 - only get
+ *
+ * RET:	*ipstr
+ */
+
+char *stdstr(char **ipstr, const char *istr, unsigned int memPadFactor) {
+	if (*ipstr)
+		delete [] *ipstr;
+	if (istr) {
+		int len = strlen(istr) + 1;
+		*ipstr = new char [ len * memPadFactor ];
+		memcpy(*ipstr, istr, len);
+	}
+	else *ipstr = 0;
+	return *ipstr;
+}
+
+
+/******************************************************************************
+ * strstrip - Removes leading and trailing spaces from a string
+ *
+ * ENT:	istr	- string pointer to strip
+ *
+ * RET:	*istr
+ */
+
+char *strstrip(char *istr) {
+	char *tmp = istr;
+	char *rtmp;
+
+	int len = strlen(istr);
+	if (len < 1)
+		return istr;
+	rtmp = istr + (len - 1);
+	
+	while ((rtmp > istr)&&((*rtmp == ' ')||(*rtmp == '\t')||(*rtmp == 10)||(*rtmp == 13))) *(rtmp--) = 0;
+	while ((*tmp == ' ')||(*tmp == '\t')||(*tmp == 10)||(*tmp == 13)) tmp++;
+	memmove(istr, tmp, (rtmp - tmp) + 1);
+	istr[(rtmp - tmp) + 1] = 0;
+
+	return istr;
+}
+
+
+/******************************************************************************
+ * stristr - Scans a string for the occurrence of a given substring, no case
+ *
+ * ENT:	scans s1 for the first occurrence of the substring s2, ingnoring case
+ *
+ * RET:	a pointer to the element in s1, where s2 begins (points to s2 in s1).
+ *			If s2 does not occur in s1, returns null.
+ */
+
+const char *stristr(const char *s1, const char *s2) {
+	int tLen = strlen(s2);
+	int cLen = strlen(s1);
+	char *target = new char [ tLen + 1 ];
+	int i, j;
+	const char *retVal = 0;
+
+	strcpy(target, s2);
+	for (i = 0; i < tLen; i++)
+		target[i] = SW_toupper(target[i]);
+
+	for (i = 0; i < (cLen - tLen)+1; i++) {
+		if (SW_toupper(s1[i]) == (unsigned char)*target) {
+			for (j = 1; j < tLen; j++) {
+				if (SW_toupper(s1[i+j]) != (unsigned char)target[j])
+					break;
+			}
+			if (j == tLen) {
+				retVal = s1+i;
+				break;
+			}
+		}
+	}
+	delete [] target;
+	return retVal;
+}
+
+/******************************************************************************
+ * strnicmp - compares the first n bytes of 2 strings ignoring case
+ *
+ * ENT:	compares s1 to s2 comparing the first n byte ingnoring case
+ *
+ * RET:	same as strcmp
+ */
+
+int strnicmp(const char *s1, const char *s2, int len) {
+	int tLen = strlen(s2);
+	int cLen = strlen(s1);
+	char diff;
+	int i;
+	for (i = 0; ((i < len) && (i < tLen) && (i < cLen)); i++) {
+		if ((diff = SW_toupper(*s1) - SW_toupper(*s2)))
+			return diff;
+	s1++;
+	s2++;
+	}
+	return (i < len) ? cLen - tLen : 0;
+}
+
+int stricmp(const char *s1, const char *s2) {
+#if defined(__GNUC__)
+	return ::strcasecmp(s1, s2);
+#else
+ #if defined(_WIN32_WCE)
+	return ::_stricmp(s1, s2);
+ #else
+	return ::stricmp(s1, s2);
+ #endif
+#endif
+}
+
+
+/******************************************************************************
+ * getUniCharFromUTF8 - retrieves the next Unicode codepoint from a UTF8 string
+ * 					and increments buf to start of next codepoint
+ *
+ * ENT:	buf - address of a utf8 buffer
+ *
+ * RET:	buf - incremented past last byte used in computing the current codepoint
+ * 		unicode codepoint value (0 with buf incremented is invalid UTF8 byte
+ */
+
+__u32 getUniCharFromUTF8(const unsigned char **buf) {
+	__u32 ch = 0;
+	unsigned char multibuf[7];
+
+	//case: We're at the end
+	if (!(**buf)) {
+		return ch;
+	}
+
+	//case: ANSI
+	if (!(**buf & 128)) {
+		ch = **buf;
+		(*buf)++;
+		return ch;
+	}
+
+	//case: Invalid UTF-8 (illegal continuing byte in initial position)
+	if ((**buf & 128) && (!(**buf & 64))) {
+		(*buf)++;
+		return ch;
+	}
+
+	//case: 2+ byte codepoint
+	multibuf[0] = **buf;
+	multibuf[0] <<= 1;
+	int subsequent;
+	for (subsequent = 1; (multibuf[0] & 128) && (subsequent < 7); subsequent++) {
+		multibuf[0] <<= 1;
+		multibuf[subsequent] = (*buf)[subsequent];
+		multibuf[subsequent] &= 63;
+		// subsequent byte did not begin with 10XXXXXX
+		// move our buffer to here and error out
+		if (((*buf)[subsequent] - multibuf[subsequent]) != 128) {
+			*buf += subsequent;
+			return 0;
+		}
+		ch <<= 6;
+		ch |= multibuf[subsequent];
+	}
+	subsequent--;
+	multibuf[0] <<= 1;
+	char significantFirstBits = 8 - (2+subsequent);
+	
+	ch |= (((__s16)multibuf[0]) << (((6*subsequent)+significantFirstBits)-8));
+	*buf += (subsequent+1);
+	return ch;
+}
+
+
+SWBuf getUTF8FromUniChar(__u32 uchar) {
+	SWBuf retVal("", 7);
+	unsigned int i;
+
+	if (uchar < 0x80) {
+		retVal.append((unsigned char)uchar);
+		retVal.setSize(1);
+	}
+	else if (uchar < 0x800) {
+		retVal.setSize(2);
+		i = uchar & 0x3f;
+		retVal[1] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x1f;
+		retVal[0] = (unsigned char)(0xc0 | i);
+	}
+	else if (uchar < 0x10000) {
+		retVal.setSize(3);
+		i = uchar & 0x3f;
+		retVal[2] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[1] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x0f;
+		retVal[0] = (unsigned char)(0xe0 | i);
+	}
+	else if (uchar < 0x200000) {
+		retVal.setSize(4);
+		i = uchar & 0x3f;
+		retVal[3] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[2] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[1] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x07;
+		retVal[0] = (unsigned char)(0xf0 | i);
+	}
+	else if (uchar < 0x4000000) {
+		retVal.setSize(5);
+		i = uchar & 0x3f;
+		retVal[4] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[3] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[2] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[1] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x03;
+		retVal[0] = (unsigned char)(0xf8 | i);
+	}
+	else if (uchar < 0x80000000) {
+		retVal.setSize(6);
+		i = uchar & 0x3f;
+		retVal[5] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[4] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[3] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[2] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x3f;
+		retVal[1] = (unsigned char)(0x80 | i);
+		uchar >>= 6;
+
+		i = uchar & 0x01;
+		retVal[0] = (unsigned char)(0xfc | i);
+	}
+
+	return retVal;
+}
+
+
+SWBuf assureValidUTF8(const char *buf) {
+
+	SWBuf myCopy = buf;
+	const unsigned char *b = (const unsigned char *)myCopy.c_str();
+	const unsigned char *q = 0;
+	bool invalidChar = false;
+	while (*b) {
+		q = b;
+		if (!getUniCharFromUTF8(&b)) {
+			long len = b - q;
+			if (len) {
+				invalidChar = true;
+				for (long start = q - (const unsigned char *)myCopy.c_str(); len; len--) {
+					myCopy[start+len-1] = 0x1a;	// unicode replacement character
+				}
+				
+			}
+		}
+	}
+	if (invalidChar) {
+//		SWLog::getSystemLog()->logWarning("Changing invalid UTF-8 string (%s) to (%s)\n", buf, myCopy.c_str());
+	}
+	return myCopy;
+}
+
+
+/****
+ * This can be called to convert a UTF8 stream to an SWBuf which manages
+ *	a wchar_t[]
+ *	access buffer with (wchar_t *)SWBuf::getRawData();
+ * 
+ */
+SWBuf utf8ToWChar(const char *buf) {
+
+	const char *q = 0;
+	SWBuf wcharBuf;
+	while (*buf) {
+		q = buf;
+		wchar_t wc = getUniCharFromUTF8((const unsigned char **)&buf);
+		if (!wc) {
+			// if my buffer was advanced but nothing was converted, I had invalid data
+			if (buf - q) {
+				// invalid bytes in UTF8 stream
+				wcharBuf.append((wchar_t)0x1a);		// unicode replacement character
+			}
+		}
+		else wcharBuf.append(wc);
+	}
+	return wcharBuf;
+}
+
+
+/****
+ * This can be called to convert a wchar_t[] to a UTF-8 SWBuf
+ * 
+ */
+SWBuf wcharToUTF8(const wchar_t *buf) {
+
+	SWBuf utf8Buf;
+	while (*buf) {
+		utf8Buf.append(getUTF8FromUniChar(*buf++));
+	}
+	return utf8Buf;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/src/utilfuns/utilxml.cpp b/src/utilfuns/utilxml.cpp
new file mode 100644
index 0000000..1537499
--- /dev/null
+++ b/src/utilfuns/utilxml.cpp
@@ -0,0 +1,331 @@
+/******************************************************************************
+ *
+ *  utilxml.cpp -	Implementaion of utility classes to handle
+ *			XML processing
+ *
+ * $Id: utilxml.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <utilxml.h>
+#include <ctype.h>
+#include <utilstr.h>
+
+
+SWORD_NAMESPACE_START
+
+
+void XMLTag::parse() const {
+	int i;
+	int start;
+	char *name = 0;
+	char *value = 0;
+	attributes.clear();
+	
+	if (!buf)
+		return;
+	for (i = 0; ((buf[i]) && (!isalpha(buf[i]))); i++);
+	for (; buf[i]; i++) {
+		if (strchr("\t\r\n ", buf[i])) {
+                        // Convert newlines, carriage returns and tabs to spaces
+			buf[i] = ' ';
+
+			for (; ((buf[i]) && (!isalpha(buf[i]))); i++);
+			if (buf[i]) {		// we have an attribute name
+				start = i;
+				// Deprecated: check for following whitespacee
+				// Should be: for (; (buf[i] && buf[i] != '='; i++);
+				for (; ((buf[i]) && (!strchr(" =", buf[i]))); i++);
+
+				if (i-start) {
+					if (name)
+						delete [] name;
+					name = new char [ (i-start) + 1 ];
+					strncpy(name, buf+start, i-start);
+					name[i-start] = 0;
+				}
+
+				// The following does not allow for empty attributes
+				//for (; ((buf[i]) && (strchr(" =\"\'", buf[i]))); i++);
+
+				// skip space preceding the = sign
+				// Deprecated: this is not part of the xml spec
+				for (; buf[i] == ' '; i++) ;
+
+				// skip the = sign
+				if (buf[i])
+					i++;
+
+				// skip space following the = sign
+				// Deprecated: this is not part of the xml spec
+				for (; buf[i] == ' '; i++) ;
+
+				// remember and skip the quote sign
+				char quoteChar = buf[i];
+				if (quoteChar)
+					i++;
+
+				if (buf[i]) {	// we have attribute value
+					start = i;
+					// Skip until matching quote character
+					for (; ((buf[i]) && (buf[i] != quoteChar)); i++);
+
+					// Allow for empty quotes
+					//if (i-start) {
+						if (value)
+							delete [] value;
+						value = new char [ (i-start) + 1 ];
+						if (i-start) {
+							strncpy(value, buf+start, i-start);
+						}
+						value[i-start] = 0;
+						attributes[name] = value;
+					//}
+				}
+			}
+		}
+
+		// if there are no more characters left then quit
+		if (!buf[i])
+			break;
+
+	}
+	for (;i;i--) {
+		if (buf[i] == '/')
+			empty = true;
+		if (!strchr(" \t\r\n>\t", buf[i]))
+			break;
+	}
+		
+	parsed = true;
+	if (name) delete [] name;
+	if (value) delete [] value;
+}
+
+
+XMLTag::XMLTag(const char *tagString) {
+
+	name   = 0;
+	buf    = 0;
+	setText(tagString);
+}
+
+
+XMLTag::XMLTag(const XMLTag& t) : attributes(t.attributes)  {
+	parsed = t.parsed;
+	empty = t.empty;
+	endTag = t.endTag;
+	if (t.buf) {
+		int len = strlen(t.buf);
+		buf = new char[len + 1];
+		memcpy(buf, t.buf, len + 1);
+	}
+	if (t.name) {
+		int len = strlen(t.name);
+		name = new char[len + 1];
+		memcpy(name, t.name, len + 1);
+	}
+}
+
+
+void XMLTag::setText(const char *tagString) {
+	parsed = false;
+	empty  = false;
+	endTag = false;
+
+	if (buf) {
+		delete [] buf;
+		buf = 0;
+	}
+
+	if (!tagString)		// assert tagString before proceeding
+		return;
+
+	stdstr(&buf, tagString);
+
+	int start = 0;
+	int i;
+
+	// skip beginning silliness
+	for (i = 0; ((tagString[i]) && (!isalpha(tagString[i]))); i++) {
+		if (tagString[i] == '/')
+			endTag = true;
+	}
+	start = i;
+	for (; ((tagString[i]) && (!strchr("\t\r\n />", tagString[i]))); i++);
+	if (i-start) {
+		if (name)
+			delete [] name;
+		name = new char [ (i-start) + 1 ];
+		strncpy(name, tagString+start, i-start);
+		name[i-start] = 0;
+		if (tagString[i] == '/')
+			empty = true;
+	}
+}
+
+
+XMLTag::~XMLTag() {
+	if (buf)
+		delete [] buf;
+	if (name)
+		delete [] name;
+}
+
+
+const StringList XMLTag::getAttributeNames() const {
+	StringList retVal;
+
+	if (!parsed)
+		parse();
+
+	for (StringPairMap::const_iterator it = attributes.begin(); it != attributes.end(); it++)
+		retVal.push_back(it->first.c_str());
+
+	return retVal;
+}
+
+
+const char *XMLTag::getPart(const char *buf, int partNum, char partSplit) const {
+	for (; (buf && partNum); partNum--) {
+		buf = strchr(buf, partSplit);
+		if (buf)
+			buf++;
+	}
+	if (buf) {
+		const char *end = strchr(buf, partSplit);
+		junkBuf = buf;
+		if (end)
+			junkBuf.setSize(end - buf);
+		return junkBuf.c_str();
+	}
+	return 0;
+}
+
+
+int XMLTag::getAttributePartCount(const char *attribName, char partSplit) const {
+	int count;
+	const char *buf = getAttribute(attribName);
+	for (count = 0; buf; count++) {
+		buf = strchr(buf, partSplit);
+		if (buf)
+			buf++;
+	}
+	return count;
+}
+
+
+const char *XMLTag::getAttribute(const char *attribName, int partNum, char partSplit) const {
+
+	if (!parsed)
+		parse();
+
+	StringPairMap::const_iterator it = attributes.find(attribName);
+
+	const char *retVal = 0;
+	if (it != attributes.end()) 
+		retVal = it->second.c_str();		
+		
+	if ((retVal) && (partNum > -1))
+		retVal = getPart(retVal, partNum, partSplit);
+
+	return retVal;
+}
+
+
+const char *XMLTag::setAttribute(const char *attribName, const char *attribValue, int partNum, char partSplit) {
+	if (!parsed)
+		parse();
+
+	SWBuf newVal = "";
+	// set part of an attribute
+	if (partNum > -1) {
+		const char *wholeAttr = getAttribute(attribName);
+		int attrCount = getAttributePartCount(attribName, partSplit);
+		for (int i = 0; i < attrCount; i++) {
+			if (i == partNum) {
+				if (attribValue) {
+					newVal += attribValue;
+					newVal += partSplit;
+				}
+				else {
+					// discard this part per null attribValue
+				}
+			}
+			else {
+				newVal += getPart(wholeAttr, i, partSplit);
+				newVal += partSplit;
+			}
+		}
+		if (newVal.length()) newVal--;	// discard the last partSplit
+		attribValue = (!attribValue && !newVal.length()) ? 0 : newVal.c_str();
+	}
+
+	// perform the actual set
+	if (attribValue)
+		attributes[attribName] = attribValue;
+	else	attributes.erase(attribName);
+
+	return attribValue;
+}
+
+
+const char *XMLTag::toString() const {
+	SWBuf tag = "<";
+	if (!parsed)
+		parse();
+
+	if (isEndTag())
+		tag.append('/');
+
+	tag.append(getName());
+	for (StringPairMap::iterator it = attributes.begin(); it != attributes.end(); it++) {
+		//tag.appendFormatted(" %s=\"%s\"", it->first.c_str(), it->second.c_str());
+		tag.append(' ');
+		tag.append(it->first.c_str());
+		tag.append((strchr(it->second.c_str(), '\"')) ? "=\'" : "=\"");
+		tag.append(it->second.c_str());
+		tag.append((strchr(it->second.c_str(), '\"'))? '\'' : '\"');
+	}
+
+	if (isEmpty())
+		tag.append('/');
+
+	tag.append('>');
+
+
+	if (buf)
+		delete [] buf;
+	buf = new char [ tag.length() + 1 ];
+	strcpy(buf, tag.c_str());
+
+	return buf;
+}
+
+
+// if an eID is provided, then we check to be sure we have an attribute <tag eID="xxx"/> value xxx equiv to what is given us
+// otherwise, we return if we're a simple XML end </tag>.
+bool XMLTag::isEndTag(const char *eID) const {
+	if (eID) {
+		return (SWBuf(eID) == getAttribute("eID"));
+	}
+	return endTag;
+}
+
+
+SWORD_NAMESPACE_END
+
diff --git a/src/utilfuns/zlib/untgz.c b/src/utilfuns/zlib/untgz.c
new file mode 100644
index 0000000..6aba41c
--- /dev/null
+++ b/src/utilfuns/zlib/untgz.c
@@ -0,0 +1,421 @@
+/*
+ * untgz.c -- Display contents and/or extract file from
+ * a gzip'd TAR file
+ * written by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+ * adaptation to Unix by Jean-loup Gailly <jloup@gzip.org>
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <errno.h>
+#include <fcntl.h>
+#ifdef unix
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#else
+# include <direct.h>
+# include <io.h>
+#endif
+
+#include "zlib.h"
+
+#ifdef WIN32
+# include <windows.h>
+#  ifndef F_OK
+#    define F_OK (0)
+#  endif
+#  ifdef _MSC_VER
+#    define mkdir(dirname,mode) _mkdir(dirname)
+#    define strdup(str)         _strdup(str)
+#    define unlink(fn)          _unlink(fn)
+#    define access(path,mode)   _access(path,mode)
+#  else
+#    define mkdir(dirname,mode) _mkdir(dirname)
+#  endif
+#else
+#  include <utime.h>
+#endif
+
+
+/* Values used in typeflag field.  */
+
+#define REGTYPE	 '0'		/* regular file */
+#define AREGTYPE '\0'		/* regular file */
+#define LNKTYPE  '1'		/* link */
+#define SYMTYPE  '2'		/* reserved */
+#define CHRTYPE  '3'		/* character special */
+#define BLKTYPE  '4'		/* block special */
+#define DIRTYPE  '5'		/* directory */
+#define FIFOTYPE '6'		/* FIFO special */
+#define CONTTYPE '7'		/* reserved */
+
+#define BLOCKSIZE 512
+
+struct tar_header
+{				/* byte offset */
+  char name[100];		/*   0 */
+  char mode[8];			/* 100 */
+  char uid[8];			/* 108 */
+  char gid[8];			/* 116 */
+  char size[12];		/* 124 */
+  char mtime[12];		/* 136 */
+  char chksum[8];		/* 148 */
+  char typeflag;		/* 156 */
+  char linkname[100];		/* 157 */
+  char magic[6];		/* 257 */
+  char version[2];		/* 263 */
+  char uname[32];		/* 265 */
+  char gname[32];		/* 297 */
+  char devmajor[8];		/* 329 */
+  char devminor[8];		/* 337 */
+  char prefix[155];		/* 345 */
+				/* 500 */
+};
+
+union tar_buffer {
+  char               buffer[BLOCKSIZE];
+  struct tar_header  header;
+};
+
+enum { TGZ_EXTRACT = 0, TGZ_LIST };
+
+void TGZnotfound	OF((const char *));
+
+int getoct		OF((char *, int));
+char *strtime		OF((time_t *));
+int ExprMatch		OF((char *,char *));
+
+int makedir		OF((char *));
+int matchname		OF((int,int,char **,char *));
+
+void error		OF((const char *));
+int  tar		OF((gzFile, int, int, int, char **));
+
+void help		OF((int));
+int main		OF((int, char **));
+
+char *prog;
+
+/* This will give a benign warning */
+
+static char *TGZprefix[] = { "\0", ".tgz", ".tar.gz", ".tar", NULL };
+
+/* Return the real name of the TGZ archive */
+/* or NULL if it does not exist. */
+
+/* error message for the filename */
+
+void TGZnotfound OF((const char *fname))
+{
+  int i;
+
+  fprintf(stderr,"%s : couldn't find ",prog);
+  for (i=0;TGZprefix[i];i++)
+    fprintf(stderr,(TGZprefix[i+1]) ? "%s%s, " : "or %s%s\n",
+            fname,
+            TGZprefix[i]);
+  exit(1);
+}
+
+
+/* help functions */
+
+int getoct(char *p,int width)
+{
+  int result = 0;
+  char c;
+  
+  while (width --)
+    {
+      c = *p++;
+      if (c == ' ')
+	continue;
+      if (c == 0)
+	break;
+      result = result * 8 + (c - '0');
+    }
+  return result;
+}
+
+char *strtime (time_t *t)
+{
+  struct tm   *local;
+  static char result[32];
+
+  local = localtime(t);
+  sprintf(result,"%2d/%02d/%4d %02d:%02d:%02d",
+	  local->tm_mday, local->tm_mon+1, local->tm_year+1900,
+	  local->tm_hour, local->tm_min,   local->tm_sec);
+  return result;
+}
+
+
+/* regular expression matching */
+
+#define ISSPECIAL(c) (((c) == '*') || ((c) == '/'))
+
+int ExprMatch(char *string,char *expr)
+{
+  while (1)
+    {
+      if (ISSPECIAL(*expr))
+	{
+	  if (*expr == '/')
+	    {
+	      if (*string != '\\' && *string != '/')
+		return 0;
+	      string ++; expr++;
+	    }
+	  else if (*expr == '*')
+	    {
+	      if (*expr ++ == 0)
+		return 1;
+	      while (*++string != *expr)
+		if (*string == 0)
+		  return 0;
+	    }
+	}
+      else
+	{
+	  if (*string != *expr)
+	    return 0;
+	  if (*expr++ == 0)
+	    return 1;
+	  string++;
+	}
+    }
+}
+
+/* recursive make directory */
+/* abort if you get an ENOENT errno somewhere in the middle */
+/* e.g. ignore error "mkdir on existing directory" */
+/* */
+/* return 1 if OK */
+/*        0 on error */
+
+int makedir (char *newdir)
+{
+  char *buffer = strdup(newdir);
+  char *p;
+  int  len = strlen(buffer);
+  
+  if (len <= 0) {
+    free(buffer);
+    return 0;
+  }
+  if (buffer[len-1] == '/') {
+    buffer[len-1] = '\0';
+  }
+  if (mkdir(buffer, 0775) == 0)
+    {
+      free(buffer);
+      return 1;
+    }
+
+  p = buffer+1;
+  while (1)
+    {
+      char hold;
+      
+      while(*p && *p != '\\' && *p != '/')
+	p++;
+      hold = *p;
+      *p = 0;
+      if ((mkdir(buffer, 0775) == -1) && (errno == ENOENT))
+	{
+	  fprintf(stderr,"%s: couldn't create directory %s\n",prog,buffer);
+	  free(buffer);
+	  return 0;
+	}
+      if (hold == 0)
+	break;
+      *p++ = hold;
+    }
+  free(buffer);
+  return 1;
+}
+
+int matchname (int arg,int argc,char **argv,char *fname)
+{
+  if (arg == argc)		/* no arguments given (untgz tgzarchive) */
+    return 1;
+
+  while (arg < argc)
+    if (ExprMatch(fname,argv[arg++]))
+	 return 1;
+
+  return 0; /* ignore this for the moment being */
+}
+
+
+/* Tar file list or extract */
+
+int untar (gzFile in, const char *dest) {
+	union  tar_buffer buffer;
+	int    len;
+	int    err;
+	int    getheader = 1;
+	int    remaining = 0;
+	FILE   *outfile = NULL;
+	char   fname[BLOCKSIZE];
+	time_t tartime = 0;
+  
+	while (1) {
+		len = gzread(in, &buffer, BLOCKSIZE);
+		if (len < 0)
+			error (gzerror(in, &err));
+		/*
+		* Always expect complete blocks to process
+		* the tar information.
+		*/
+		if (len != BLOCKSIZE)
+			error("gzread: incomplete block read");
+	 
+		/*
+		* If we have to get a tar header
+		*/
+		if (getheader == 1) {
+			/*
+			* if we met the end of the tar
+			* or the end-of-tar block,
+			* we are done
+			*/
+			if ((len == 0)  || (buffer.header.name[0]== 0)) break;
+
+			tartime = (time_t)getoct(buffer.header.mtime,12);
+			strcpy(fname, dest);
+			if ((fname[strlen(fname)-1] != '/') && (fname[strlen(fname)-1] != '\\'))
+					strcat(fname, "/");
+			strcat(fname, buffer.header.name);
+	  
+			switch (buffer.header.typeflag) {
+			case DIRTYPE:
+				makedir(fname);
+				break;
+			case REGTYPE:
+			case AREGTYPE:
+				remaining = getoct(buffer.header.size,12);
+				if (remaining) {
+					outfile = fopen(fname,"wb");
+					if (outfile == NULL) {
+						// try creating directory
+						char *p = strrchr(fname, '/');
+						if (p != NULL) {
+							*p = '\0';
+							makedir(fname);
+							*p = '/';
+							outfile = fopen(fname,"wb");
+						}
+					}
+/*
+					fprintf(stderr,
+						"%s %s\n",
+						(outfile) ? "Extracting" : "Couldn't create",
+						fname);
+*/
+				}
+				else
+					outfile = NULL;
+				/*
+				* could have no contents
+				*/
+				getheader = (remaining) ? 0 : 1;
+				break;
+			default:
+				break;
+			}
+		}
+		else	{
+			unsigned int bytes = (remaining > BLOCKSIZE) ? BLOCKSIZE : remaining;
+
+			if (outfile != NULL) {
+				if (fwrite(&buffer,sizeof(char),bytes,outfile) != bytes) {
+					fprintf(stderr,"%s : error writing %s skipping...\n",prog,fname);
+					fclose(outfile);
+					unlink(fname);
+				}
+			}
+			remaining -= bytes;
+			if (remaining == 0) {
+				getheader = 1;
+				if (outfile != NULL) {
+#ifdef WIN32
+					HANDLE hFile;
+					FILETIME ftm,ftLocal;
+					SYSTEMTIME st;
+					struct tm localt;
+ 
+					fclose(outfile);
+
+					localt = *localtime(&tartime);
+
+					hFile = CreateFile(fname, GENERIC_READ | GENERIC_WRITE,
+					0, NULL, OPEN_EXISTING, 0, NULL);
+		  
+					st.wYear = (WORD)localt.tm_year+1900;
+					st.wMonth = (WORD)localt.tm_mon;
+					st.wDayOfWeek = (WORD)localt.tm_wday;
+					st.wDay = (WORD)localt.tm_mday;
+					st.wHour = (WORD)localt.tm_hour;
+					st.wMinute = (WORD)localt.tm_min;
+					st.wSecond = (WORD)localt.tm_sec;
+					st.wMilliseconds = 0;
+					SystemTimeToFileTime(&st,&ftLocal);
+					LocalFileTimeToFileTime(&ftLocal,&ftm);
+					SetFileTime(hFile,&ftm,NULL,&ftm);
+					CloseHandle(hFile);
+
+					outfile = NULL;
+#else
+					struct utimbuf settime;
+
+					settime.actime = settime.modtime = tartime;
+
+					fclose(outfile);
+					outfile = NULL;
+					utime(fname,&settime);
+#endif
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+
+/* =========================================================== */
+
+void help(int exitval)
+{
+  fprintf(stderr,
+	  "untgz v 0.1\n"
+	  " an sample application of zlib 1.0.4\n\n"
+		"Usage : untgz TGZfile            to extract all files\n"
+		"        untgz TGZfile fname ...  to extract selected files\n"
+		"        untgz -l TGZfile         to list archive contents\n"
+		"        untgz -h                 to display this help\n\n");
+  exit(exitval);
+}
+
+void error(const char *msg)
+{
+    fprintf(stderr, "%s: %s\n", prog, msg);
+//    exit(1); // don't exit on error
+}
+
+
+int untargz(int fd, const char *dest) {
+	gzFile	f;
+
+	f = gzdopen(fd, "rb");
+	if (f == NULL) {
+		fprintf(stderr,"%s: Couldn't gzopen file\n",	prog);
+		return 1;
+	}
+
+	return untar(f, dest);
+}
diff --git a/stamp-h.in b/stamp-h.in
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/stamp-h.in
diff --git a/sword.bmp b/sword.bmp
new file mode 100644
index 0000000..32c5606
--- /dev/null
+++ b/sword.bmp
diff --git a/sword.kdevprj b/sword.kdevprj
new file mode 100644
index 0000000..f2ae50a
--- /dev/null
+++ b/sword.kdevprj
@@ -0,0 +1,1989 @@
+[Config for BinMakefileAm]
+addcxxflags=
+bin_program=
+cxxflags=\s-O0 -g3 -Wall
+ldadd=
+ldflags=
+libtool_dir=
+path_to_bin_program=.
+
+[General]
+AMChanged=false
+author=The Sword team
+dir_where_make_will_be_called=./
+email=scribe@crosswire.org
+kdevprj_version=1.3
+lfv_open_groups=
+make_options=\s-j1
+makefiles=Makefile.am,sword/Makefile.am,sword/docs/Makefile.am,sword/docs/en/Makefile.am,po/Makefile.am,include/Makefile.am,src/mgr/Makefile.am,src/Makefile.am,src/keys/Makefile.am,src/frontend/Makefile.am,src/utilfuns/Makefile.am,src/utilfuns/zlib/Makefile.am,src/modules/Makefile.am,src/modules/comments/Makefile.am,src/modules/comments/hrefcom/Makefile.am,src/modules/comments/rawcom/Makefile.am,src/modules/comments/rawfiles/Makefile.am,src/modules/comments/zcom/Makefile.am,src/modules/common/Makefile.am,src/modules/lexdict/Makefile.am,src/modules/lexdict/rawld/Makefile.am,src/modules/lexdict/rawld4/Makefile.am,src/modules/texts/Makefile.am,src/modules/texts/rawtext/Makefile.am,src/modules/texts/ztext/Makefile.am,src/modules/filters/Makefile.am,src/frontend/im/Makefile.am,src/modules/genbook/Makefile.am,src/modules/genbook/rawgenbook/Makefile.am,src/modules/lexdict/zld/Makefile.am,tests/Makefile.am
+modifyMakefiles=false
+project_name=Sword
+project_type=normal_empty
+short_info=
+sub_dir=sword/
+version=1.5.2
+version_control=CVS
+workspace=1
+
+[LFV Groups]
+Andere=*
+Benutzerschnittstelle=*.kdevdlg,*.ui,*.rc
+Header=*.h,*.hh,*.hxx,*.hpp,*.H
+Quellen=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l
+groups=Header,Quellen,Benutzerschnittstelle,Andere
+
+[Makefile.am]
+files=sword.kdevprj,buildtest.cpp
+sub_dirs=sword,include,src,tests
+type=static_library
+
+[include/Greek2Greek.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/GreekChars.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/Makefile.am]
+files=include/canon.h,include/cipherfil.h,include/defs.h,include/echomod.h,include/entriesblk.h,include/femain.h,include/filemgr.h,include/gbffootnotes.h,include/gbfheadings.h,include/gbfhtml.h,include/swfilter.h,include/gbfhtmlhref.h,include/gbfmorph.h,include/gbfplain.h,include/gbfrtf.h,include/gbfstrongs.h,include/gbfthml.h,include/Greek2Greek.h,include/GreekChars.h,include/hrefcom.h,include/latin1utf16.h,include/latin1utf8.h,include/listkey.h,include/localemgr.h,include/lzsscomprs.h,include/plainfootnotes.h,include/plainhtml.h,include/rawcom.h,include/rawfiles.h,include/rawld.h,include/rawld4.h,include/rawstr.h,include/rawstr4.h,include/rawtext.h,include/rawverse.h,include/regex.h,include/roman.h,include/rtfhtml.h,include/rwphtml.h,include/rwprtf.h,include/sapphire.h,include/scsuutf8.h,include/strkey.h,include/swbasicfilter.h,include/swbyteswap.h,include/swcipher.h,include/swcom.h,include/swcomprs.h,include/swconfig.h,include/swdisp.h,include/swdisprtf.h,include/swdisprtfchap.h,include/swencodingmgr.h,include/swkey.h,include/swld.h,include/swlocale.h,include/swlog.h,include/swmacs.h,include/swmarkupmgr.h,include/swmgr.h,include/swmodule.h,include/swobject.h,include/swtext.h,include/swwinlog.h,include/tbdisp.h,include/thmlgbf.h,include/thmlhtml.h,include/thmlhtmlhref.h,include/thmlplain.h,include/thmlrtf.h,include/unicodertf.h,include/unixstr.h,include/untgz.h,include/utf16utf8.h,include/utf8cantillation.h,include/utf8greekaccents.h,include/utf8arabicpoints.h,include/utf8hebrewpoints.h,include/utf8html.h,include/utf8latin1.h,include/utf8transliterator.h,include/utf8utf16.h,include/utilconf.h,include/utilfuns.h,include/utilstr.h,include/versekey.h,include/zcom.h,include/zconf.h,include/zipcomprs.h,include/zlib.h,include/ztext.h,include/zverse.h,include/thmlfootnotes.h,include/thmlheadings.h,include/thmllemma.h,include/thmlmorph.h,include/thmlscripref.h,include/thmlstrongs.h,include/utf8cnormalizer.h,include/utf8arshaping.h,include/utf8bidireorder.h,include/utf8nfc.h,include/utf8nfkd.h,include/encfiltmgr.h,include/swversion.h,include/swfiltermgr.h,include/markupfiltmgr.h,include/rawgenbook.h,include/swgenbook.h,include/treekey.h,include/thmlvariants.h,include/treekeyidx.h,include/zld.h,include/zstr.h,include/swinputmeth.h,include/nullim.h,include/hebrewmcim.h,include/flatapi.h,include/cdsourcemgr.h,include/ftpparse.h,include/gbfosis.h,include/gbfredletterwords.h,include/greeklexattribs.h,include/installmgr.h,include/osismorph.h,include/osisstrongs.h,include/remotesourcemgr.h,include/multimapwdef.h,include/swcacher.h,include/swinstallmgr.h,include/swremotemgr.h,include/swsourcemgr.h,include/sysdata.h,include/thmlosis.h,include/swbuf.h,include/osisplain.h,include/osisrtf.h
+sub_dirs=
+type=normal
+
+[include/canon.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/cdsourcemgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/cipherfil.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/defs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/echomod.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/encfiltmgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/entriesblk.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/femain.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/filemgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/flatapi.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/ftpparse.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbffootnotes.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfheadings.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfhtml.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfhtmlhref.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfmorph.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfosis.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfplain.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfredletterwords.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfrtf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfstrongs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/gbfthml.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/greeklexattribs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/hebrewmcim.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/hrefcom.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/installmgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/latin1utf16.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/latin1utf8.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/listkey.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/localemgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/lzsscomprs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/markupfiltmgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/multimapwdef.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/nullim.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/osismorph.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/osisplain.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/osisrtf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/osisstrongs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/plainfootnotes.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/plainhtml.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawcom.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawfiles.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawgenbook.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawld.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawld4.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawstr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawstr4.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawtext.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rawverse.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/regex.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/remotesourcemgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/roman.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rtfhtml.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rwphtml.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/rwprtf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/sapphire.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/scsuutf8.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/strkey.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swbasicfilter.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swbuf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swbyteswap.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swcacher.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swcipher.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swcom.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swcomprs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swconfig.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swdisp.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swdisprtf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swdisprtfchap.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swencodingmgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swfilter.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swfiltermgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swgenbook.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swinputmeth.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swinstallmgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swkey.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swld.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swlocale.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swlog.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swmacs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swmarkupmgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swmgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swmodule.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swobject.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swremotemgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swsourcemgr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swtext.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swversion.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/swwinlog.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/sysdata.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/tbdisp.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlfootnotes.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlgbf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlheadings.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlhtml.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlhtmlhref.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmllemma.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlmorph.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlosis.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlplain.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlrtf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlscripref.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlstrongs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/thmlvariants.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/treekey.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/treekeyidx.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/unicodertf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/unixstr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/untgz.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf16utf8.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8arshaping.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8bidireorder.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8cantillation.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8cnormalizer.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8greekaccents.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8hebrewpoints.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8arabicpoints.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8html.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8latin1.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8nfc.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8nfkd.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8transliterator.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utf8utf16.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utilconf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utilfuns.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/utilstr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/versekey.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/zcom.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/zconf.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/zipcomprs.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/zld.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/zlib.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/zstr.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/ztext.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[include/zverse.h]
+dist=true
+install=false
+install_location=
+type=HEADER
+
+[po/Makefile.am]
+sub_dirs=
+type=po
+
+[src/Makefile.am]
+sub_dirs=mgr,keys,frontend,utilfuns,modules
+type=normal
+
+[src/frontend/Makefile.am]
+files=src/frontend/swdisp.cpp,src/frontend/swlog.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=frontend
+sub_dirs=im
+type=static_library
+
+[src/frontend/im/Makefile.am]
+files=src/frontend/im/swinputmeth.cpp,src/frontend/im/nullim.cpp,src/frontend/im/hebrewmcim.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=im
+sub_dirs=
+type=static_library
+
+[src/frontend/im/hebrewmcim.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/frontend/im/nullim.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/frontend/im/swinputmeth.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/frontend/swdisp.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/frontend/swlog.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/keys/Makefile.am]
+files=src/keys/genarray.c,src/keys/listkey.cpp,src/keys/strkey.cpp,src/keys/swkey.cpp,src/keys/versekey.cpp,src/keys/treekey.cpp,src/keys/treekeyidx.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=keys
+sub_dirs=
+type=static_library
+
+[src/keys/genarray.c]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/keys/listkey.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/keys/strkey.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/keys/swkey.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/keys/treekey.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/keys/treekeyidx.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/keys/versekey.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/Makefile.am]
+files=src/mgr/filemgr.cpp,src/mgr/localemgr.cpp,src/mgr/swconfig.cpp,src/mgr/swencodingmgr.cpp,src/mgr/swlocale.cpp,src/mgr/swmarkupmgr.cpp,src/mgr/swmgr.cpp,src/mgr/markupfiltmgr.cpp,src/mgr/encfiltmgr.cpp,src/mgr/swfiltermgr.cpp,src/mgr/swcacher.cpp,src/mgr/installmgr.cpp,src/mgr/swsourcemgr.cpp,src/mgr/swsearchable.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=mgr
+sub_dirs=
+type=static_library
+
+[src/mgr/encfiltmgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/filemgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/installmgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/localemgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/markupfiltmgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swcacher.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swconfig.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swencodingmgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swfiltermgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swlocale.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swmarkupmgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swmgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swsearchable.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/mgr/swsourcemgr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/Makefile.am]
+files=src/modules/swmodule.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=modules
+sub_dirs=comments,common,lexdict,texts,filters,genbook
+type=static_library
+
+[src/modules/comments/Makefile.am]
+files=src/modules/comments/swcom.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=comments
+sub_dirs=hrefcom,rawcom,rawfiles,zcom
+type=static_library
+
+[src/modules/comments/hrefcom/Makefile.am]
+files=src/modules/comments/hrefcom/hrefcom.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=hrefcom
+sub_dirs=
+type=static_library
+
+[src/modules/comments/hrefcom/hrefcom.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/comments/rawcom/Makefile.am]
+files=src/modules/comments/rawcom/rawcom.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=rawcom
+sub_dirs=
+type=static_library
+
+[src/modules/comments/rawcom/rawcom.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/comments/rawfiles/Makefile.am]
+files=src/modules/comments/rawfiles/rawfiles.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=rawfiles
+sub_dirs=
+type=static_library
+
+[src/modules/comments/rawfiles/rawfiles.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/comments/swcom.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/comments/zcom/Makefile.am]
+files=src/modules/comments/zcom/zcom.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=zcom
+sub_dirs=
+type=static_library
+
+[src/modules/comments/zcom/zcom.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/Makefile.am]
+files=src/modules/common/entriesblk.cpp,src/modules/common/compress.cpp,src/modules/common/lzsscomprs.cpp,src/modules/common/rawstr.cpp,src/modules/common/rawstr4.cpp,src/modules/common/rawverse.cpp,src/modules/common/sapphire.cpp,src/modules/common/swcipher.cpp,src/modules/common/swcomprs.cpp,src/modules/common/zipcomprs.cpp,src/modules/common/zverse.cpp,src/modules/common/zstr.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=common
+sub_dirs=
+type=static_library
+
+[src/modules/common/compress.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/entriesblk.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/lzsscomprs.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/rawstr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/rawstr4.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/rawverse.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/sapphire.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/swcipher.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/swcomprs.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/zipcomprs.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/zstr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/common/zverse.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/Makefile.am]
+files=src/modules/filters/cipherfil.cpp,src/modules/filters/gbffootnotes.cpp,src/modules/filters/gbfheadings.cpp,src/modules/filters/gbfhtml.cpp,src/modules/filters/gbfhtmlhref.cpp,src/modules/filters/gbfmorph.cpp,src/modules/filters/gbfplain.cpp,src/modules/filters/gbfrtf.cpp,src/modules/filters/gbfstrongs.cpp,src/modules/filters/gbfthml.cpp,src/modules/filters/latin1utf16.cpp,src/modules/filters/latin1utf8.cpp,src/modules/filters/plainfootnotes.cpp,src/modules/filters/plainhtml.cpp,src/modules/filters/rtfhtml.cpp,src/modules/filters/rwphtml.cpp,src/modules/filters/rwprtf.cpp,src/modules/filters/scsuutf8.cpp,src/modules/filters/swbasicfilter.cpp,src/modules/filters/thmlgbf.cpp,src/modules/filters/thmlhtml.cpp,src/modules/filters/thmlhtmlhref.cpp,src/modules/filters/thmlplain.cpp,src/modules/filters/thmlrtf.cpp,src/modules/filters/unicodertf.cpp,src/modules/filters/utf16utf8.cpp,src/modules/filters/utf8cantillation.cpp,src/modules/filters/utf8greekaccents.cpp,src/modules/filters/utf8hebrewpoints.cpp,src/modules/filters/utf8arabicpoints.cpp,src/modules/filters/utf8html.cpp,src/modules/filters/utf8latin1.cpp,src/modules/filters/utf8transliterator.cpp,src/modules/filters/utf8utf16.cpp,src/modules/filters/thmlfootnotes.cpp,src/modules/filters/thmlheadings.cpp,src/modules/filters/thmllemma.cpp,src/modules/filters/thmlmorph.cpp,src/modules/filters/thmlscripref.cpp,src/modules/filters/thmlstrongs.cpp,src/modules/filters/utf8nfc.cpp,src/modules/filters/utf8nfkd.cpp,src/modules/filters/utf8arshaping.cpp,src/modules/filters/utf8bidireorder.cpp,src/modules/filters/thmlvariants.cpp,src/modules/filters/gbfosis.cpp,src/modules/filters/gbfredletterwords.cpp,src/modules/filters/greeklexattribs.cpp,src/modules/filters/osismorph.cpp,src/modules/filters/osisstrongs.cpp,src/modules/filters/thmlosis.cpp,src/modules/filters/osisplain.cpp,src/modules/filters/osisrtf.cpp,src/modules/filters/gbfwebif.cpp,src/modules/filters/osisfootnotes.cpp,src/modules/filters/osisheadings.cpp,src/modules/filters/osishtmlhref.cpp,src/modules/filters/osislemma.cpp,src/modules/filters/osisredletterwords.cpp,src/modules/filters/osisscripref.cpp,src/modules/filters/osiswebif.cpp,src/modules/filters/swoptfilter.cpp,src/modules/filters/thmlwebif.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=filters
+sub_dirs=
+type=static_library
+
+[src/modules/filters/cipherfil.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbffootnotes.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfheadings.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfhtml.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfhtmlhref.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfmorph.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfosis.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfplain.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfredletterwords.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfrtf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfstrongs.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfthml.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/gbfwebif.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/greeklexattribs.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/latin1utf16.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/latin1utf8.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osisfootnotes.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osisheadings.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osishtmlhref.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osislemma.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osismorph.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osisplain.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osisredletterwords.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osisrtf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osisscripref.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osisstrongs.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/osiswebif.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/plainfootnotes.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/plainhtml.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/rtfhtml.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/rwphtml.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/rwprtf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/scsuutf8.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/swbasicfilter.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/swoptfilter.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlfootnotes.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlgbf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlheadings.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlhtml.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlhtmlhref.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmllemma.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlmorph.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlosis.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlplain.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlrtf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlscripref.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlstrongs.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlvariants.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/thmlwebif.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/unicodertf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf16utf8.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8arshaping.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8bidireorder.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8cantillation.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8greekaccents.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8hebrewpoints.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8arabicpoints.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8html.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8latin1.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8nfc.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8nfkd.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8transliterator.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/filters/utf8utf16.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/genbook/Makefile.am]
+files=src/modules/genbook/swgenbook.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=genbook
+sub_dirs=rawgenbook
+type=static_library
+
+[src/modules/genbook/rawgenbook/Makefile.am]
+files=src/modules/genbook/rawgenbook/rawgenbook.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=rawgenbook
+sub_dirs=
+type=static_library
+
+[src/modules/genbook/rawgenbook/rawgenbook.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/genbook/swgenbook.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/lexdict/Makefile.am]
+files=src/modules/lexdict/swld.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=lexdict
+sub_dirs=rawld,rawld4,zld
+type=static_library
+
+[src/modules/lexdict/rawld/Makefile.am]
+files=src/modules/lexdict/rawld/rawld.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=rawld
+sub_dirs=
+type=static_library
+
+[src/modules/lexdict/rawld/rawld.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/lexdict/rawld4/Makefile.am]
+files=src/modules/lexdict/rawld4/rawld4.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=rawld4
+sub_dirs=
+type=static_library
+
+[src/modules/lexdict/rawld4/rawld4.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/lexdict/swld.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/lexdict/zld/Makefile.am]
+files=src/modules/lexdict/zld/zld.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=zld
+sub_dirs=
+type=static_library
+
+[src/modules/lexdict/zld/zld.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/swmodule.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/texts/Makefile.am]
+files=src/modules/texts/swtext.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=texts
+sub_dirs=rawtext,ztext
+type=static_library
+
+[src/modules/texts/rawtext/Makefile.am]
+files=src/modules/texts/rawtext/rawtext.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=rawtext
+sub_dirs=
+type=static_library
+
+[src/modules/texts/rawtext/rawtext.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/texts/swtext.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/modules/texts/ztext/Makefile.am]
+files=src/modules/texts/ztext/ztext.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=ztext
+sub_dirs=
+type=static_library
+
+[src/modules/texts/ztext/ztext.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/Greek2Greek.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/Makefile.am]
+files=src/utilfuns/Greek2Greek.cpp,src/utilfuns/regex.c,src/utilfuns/roman.c,src/utilfuns/sub.c,src/utilfuns/unixstr.cpp,src/utilfuns/utilconf.cpp,src/utilfuns/utilstr.cpp,src/utilfuns/swversion.cpp,src/utilfuns/roman.cpp,src/utilfuns/ftpparse.c,src/utilfuns/swbuf.cpp,src/utilfuns/utilweb.cpp,src/utilfuns/utilxml.cpp
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=utilfuns
+sub_dirs=zlib
+type=static_library
+
+[src/utilfuns/ftpparse.c]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/regex.c]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/roman.c]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/roman.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/sub.c]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/swbuf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/swversion.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/unixstr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/utilconf.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/utilstr.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/utilweb.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/utilxml.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[src/utilfuns/zlib/Makefile.am]
+files=
+sharedlib_LDFLAGS=-version-info 0:0:1
+sharedlib_rootname=zlib
+sub_dirs=
+type=static_library
+
+[sword.kdevprj]
+dist=true
+install=false
+install_location=
+type=DATA
+
+[sword/Makefile.am]
+sub_dirs=
+type=prog_main
+
+[sword/docs/Makefile.am]
+sub_dirs=
+type=normal
+
+[sword/docs/en/Makefile.am]
+sub_dirs=
+type=normal
+
+[buildtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/Makefile.am]
+files=tests/casttest.cpp,tests/complzss.cpp,tests/compnone.cpp,tests/compzip.cpp,tests/configtest.cpp,tests/filtertest.cpp,tests/genbooktest.cpp,tests/icutest.cpp,tests/indextest.cpp,tests/introtest.cpp,tests/keycast.cpp,tests/keytest.cpp,tests/lextest.cpp,tests/listtest.cpp,tests/localetest.cpp,tests/mgrtest.cpp,tests/modtest.cpp,tests/parsekey.cpp,tests/rawldidxtest.cpp,tests/romantest.cpp,tests/swaptest.cpp,tests/testblocks.cpp,tests/tlitmgrtest.cpp,tests/translittest.cpp,tests/treeidxtest.cpp
+sharedlib_LDFLAGS=-version-info 0:0:0
+sharedlib_rootname=tests
+sub_dirs=
+type=static_library
+
+[tests/casttest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/complzss.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/compnone.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/compzip.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/configtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/filtertest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/genbooktest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/icutest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/indextest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/introtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/keycast.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/keytest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/lextest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/listtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/localetest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/mgrtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/modtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/parsekey.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/rawldidxtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/romantest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/swaptest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/testblocks.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/tlitmgrtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/translittest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
+
+[tests/treeidxtest.cpp]
+dist=true
+install=false
+install_location=
+type=SOURCE
diff --git a/sword.pc.in b/sword.pc.in
new file mode 100644
index 0000000..17c18f4
--- /dev/null
+++ b/sword.pc.in
@@ -0,0 +1,14 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+
+Name: SWORD
+Description: Biblical Text Research Engine
+Version: @VERSION@
+@SHAREDLIB_TRUE@Libs: -L${libdir} -lsword
+@SHAREDLIB_FALSE@Libs: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
+Libs.private: -L${libdir} -lsword -lz @CURL_LIBS@ @CLUCENE_LIBS@ @ICU_LIBS@ @ICU_IOLIBS@
+Cflags: -I${includedir}/sword 
+
diff --git a/sword.spec.in b/sword.spec.in
new file mode 100644
index 0000000..03a8521
--- /dev/null
+++ b/sword.spec.in
@@ -0,0 +1,90 @@
+Summary:	The SWORD Project framework for manipulating Bible texts
+Name:		sword
+%define version @VERSION@
+Version:	%{version}
+Release:	1
+#Icon:		sword.gif
+Copyright:	GPL
+Packager:	CrossWire Bible Society
+URL:		http://www.crosswire.org/sword
+Source:		http://www.crosswire.org/download/ftpmirror.tmp/pub/sword/source/v1.5/sword-%{version}.tar.gz
+Group:		System Environment/Libraries
+BuildRoot:	%{_tmppath}/sword-root
+Requires:	curl
+Requires:	zlib
+# Requires:	icu >= 2.6
+# Patch0:		sword-patch-curl.diff
+
+%description
+The SWORD Project is an effort to create an ever expanding software package for research and study of God and His Word.
+The SWORD Bible Framework allows easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.  Many frontends are build using this framework.
+An installed module set may be shared between any frontend using the framework.
+
+%package devel
+Summary: Include files and static libraries for developing sword applications.
+Group: Development/Libraries
+Requires:	sword = %{version}
+Requires:	curl-devel >= 7.10.5
+Requires:	zlib-devel
+
+%description devel
+Include files and static libraries for developing sword applications. This package is required to compile Sword frontends, too.
+
+%prep
+%setup -q
+# %patch0 -p1
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS='-s'
+ ./usrinst.sh --disable-dependency-tracking --prefix=/usr --sysconfdir=/etc --enable-utilities --with-curl --disable-debug --enable-shared --with-conf
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install-strip DESTDIR="$RPM_BUILD_ROOT"
+make install_config DESTDIR="$RPM_BUILD_ROOT"
+mkdir -p $RPM_BUILD_ROOT/usr/lib/sword
+exit 0
+
+%post devel -p /sbin/ldconfig
+
+%postun devel -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%config /etc/sword.conf
+%config /usr/share/sword/mods.d/globals.conf
+%config /usr/share/sword/locales.d/*.conf
+%doc README AUTHORS NEWS INSTALL
+/usr/lib/libsword*.so*
+#Available when ICU is used in Sword
+# /usr/lib/sword
+
+%files devel
+%defattr(-,root,root)
+%doc doc/*
+/usr/include/sword
+/usr/lib/libsword*.*a
+/usr/bin/*
+
+%changelog
+* Mon Dec 27 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
+- Version 1.5.7
+- Added a patch to make installmgr work on Curl version 7.10.5
+- We require libcurl now
+* Mon May 20 2002 Joachim Ansorg <junkmail@joachim.ansorgs.de>
+- Version 1.5.6
+* Mon May 20 2002 Stuart Gathman <stuart@bmsi.com>
+- Version 1.5.3
+* Wed Dec 19 2001 Stuart Gathman <stuart@bmsi.com>
+- add additional utilities, move to /usr/lib/sword
+* Thu Dec 13 2001 Stuart Gathman <stuart@bmsi.com>
+- add locales config
+* Sat Jan 20 2001 Stuart Gathman <stuart@bmsi.com>
+- mkfastmod and other utilities
+* Thu Nov 30 2000 Stuart Gathman <stuart@bmsi.com>
+- cheatah application
+* Fri Nov 17 2000 Stuart Gathman <stuart@bmsi.com>
+- initial release
diff --git a/test-driver b/test-driver
new file mode 100755
index 0000000..32bf39e
--- /dev/null
+++ b/test-driver
@@ -0,0 +1,127 @@
+#! /bin/sh
+# test-driver - basic testsuite driver script.
+
+scriptversion=2012-06-27.10; # UTC
+
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+#
+# 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, or (at your option)
+# any later version.
+#
+# 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 General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+# Make unconditional expansion of undefined variables an error.  This
+# helps a lot in preventing typo-related bugs.
+set -u
+
+usage_error ()
+{
+  echo "$0: $*" >&2
+  print_usage >&2
+  exit 2
+}
+
+print_usage ()
+{
+  cat <<END
+Usage:
+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
+END
+}
+
+# TODO: better error handling in option parsing (in particular, ensure
+# TODO: $log_file, $trs_file and $test_name are defined).
+test_name= # Used for reporting.
+log_file=  # Where to save the output of the test script.
+trs_file=  # Where to save the metadata of the test run.
+expect_failure=no
+color_tests=no
+enable_hard_errors=yes
+while test $# -gt 0; do
+  case $1 in
+  --help) print_usage; exit $?;;
+  --version) echo "test-driver $scriptversion"; exit $?;;
+  --test-name) test_name=$2; shift;;
+  --log-file) log_file=$2; shift;;
+  --trs-file) trs_file=$2; shift;;
+  --color-tests) color_tests=$2; shift;;
+  --expect-failure) expect_failure=$2; shift;;
+  --enable-hard-errors) enable_hard_errors=$2; shift;;
+  --) shift; break;;
+  -*) usage_error "invalid option: '$1'";;
+  esac
+  shift
+done
+
+if test $color_tests = yes; then
+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
+  red='' # Red.
+  grn='' # Green.
+  lgn='' # Light green.
+  blu='' # Blue.
+  mgn='' # Magenta.
+  std=''     # No color.
+else
+  red= grn= lgn= blu= mgn= std=
+fi
+
+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
+trap "st=129; $do_exit" 1
+trap "st=130; $do_exit" 2
+trap "st=141; $do_exit" 13
+trap "st=143; $do_exit" 15
+
+# Test script is run here.
+"$@" >$log_file 2>&1
+estatus=$?
+if test $enable_hard_errors = no && test $estatus -eq 99; then
+  estatus=1
+fi
+
+case $estatus:$expect_failure in
+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
+esac
+
+# Report outcome to console.
+echo "${col}${res}${std}: $test_name"
+
+# Register the test result, and other relevant metadata.
+echo ":test-result: $res" > $trs_file
+echo ":global-test-result: $res" >> $trs_file
+echo ":recheck: $recheck" >> $trs_file
+echo ":copy-in-global-log: $gcopy" >> $trs_file
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..130af8a
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,82 @@
+#########################################################################################
+# A test suite - that is awesome.
+#
+# I should probably learn the proper usage of such things as CTest for this, but for the
+# time being, I'll see what I can do.
+# 
+#
+# I need some help deciphering tests/cppunit/Makefile.am.  I'm not quite sure what it is
+# trying to do in there.
+# Also, the contents of the tests/testsuite directory are slightly beyond my knowledge
+# level.  It looks like I can do a very simple interface to this all, but I need to know
+# more about how these tests work.
+# 
+
+MESSAGE(STATUS "\n-- CONFIGURING LIBRARY TESTS")
+
+SET(test_PROGRAMS
+	bibliotest
+	casttest
+	ciphertest
+	complzss
+	compnone
+	configtest
+	filtertest
+	introtest
+	indextest
+	keycast
+	keytest
+	lextest
+	listtest
+	localetest
+	mgrtest
+	modtest
+	parsekey
+	rawldidxtest
+	romantest
+	striptest
+	swaptest
+	swbuftest
+	testblocks
+	utf8norm
+	versekeytest
+	vtreekeytest
+	versemgrtest
+	webiftest
+	xmltest
+)
+
+IF(WITH_ICU)
+	SET(test_PROGRAMS
+		${test_PROGRAMS}
+		icutest
+#		tlitmgrtest
+		translittest
+	)
+ENDIF(WITH_ICU)
+
+IF(WITH_ZLIB OR WITH_INTERNAL_ZLIB)
+	SET(test_PROGRAMS
+		${test_PROGRAMS}
+		compzip
+	)
+ENDIF(WITH_ZLIB OR WITH_INTERNAL_ZLIB)
+
+FOREACH(TEST ${test_PROGRAMS})
+	ADD_EXECUTABLE(${TEST} EXCLUDE_FROM_ALL	${TEST}.cpp)
+	IF(BUILDING_SHARED)
+		TARGET_LINK_LIBRARIES(${TEST}	sword)
+	ELSE(BUILDING_SHARED)
+		TARGET_LINK_LIBRARIES(${TEST} sword_static)
+	ENDIF(BUILDING_SHARED)
+ENDFOREACH(TEST ${test_PROGRAMS})
+
+########################################################################################
+# The following tests require extra libraries to run
+# 
+FOREACH(ICUTEST icutest translittest)
+	TARGET_LINK_LIBRARIES(${ICUTEST} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
+ENDFOREACH(ICUTEST icutest translittest)
+
+# Excluded until I know we have the tests working
+ADD_SUBDIRECTORY(testsuite)
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..ad09283
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,77 @@
+AUTOMAKE_OPTIONS = 1.6
+AM_CPPFLAGS = -I $(top_srcdir)/include
+if USE_INTERNAL_REGEX
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+endif
+LDADD = $(top_builddir)/lib/libsword.la
+
+SUBDIRS = cppunit
+
+noinst_PROGRAMS = utf8norm ciphertest keytest mgrtest parsekey versekeytest \
+			vtreekeytest versemgrtest listtest casttest modtest \
+			compnone complzss localetest introtest indextest \
+			configtest keycast romantest testblocks filtertest \
+			rawldidxtest lextest swaptest swbuftest xmltest \
+			webiftest striptest osistest bibliotest
+
+if HAVE_ICU
+ICUPROG = icutest translittest tlitmgrtest
+else
+ICUPROG =
+endif
+
+noinst_PROGRAMS += $(ICUPROG)
+
+if HAVE_ICU
+icutest_SOURCES = icutest.cpp
+translittest_SOURCES = translittest.cpp
+tlitmgrtest_SOURCES = tlitmgrtest.cpp
+endif
+
+if HAVE_LIBZ
+ZLIBPROG = compzip
+else
+ZLIBPROG =
+endif
+
+noinst_PROGRAMS += $(ZLIBPROG)
+
+if HAVE_LIBZ
+compzip_SOURCES = compzip.cpp
+endif
+
+keytest_SOURCES = keytest.cpp
+mgrtest_SOURCES = mgrtest.cpp
+ciphertest_SOURCES = ciphertest.cpp
+utf8norm_SOURCES = utf8norm.cpp
+parsekey_SOURCES = parsekey.cpp
+versekeytest_SOURCES = versekeytest.cpp
+vtreekeytest_SOURCES = vtreekeytest.cpp
+versemgrtest_SOURCES = versemgrtest.cpp
+listtest_SOURCES = listtest.cpp
+casttest_SOURCES = casttest.cpp
+modtest_SOURCES = modtest.cpp
+compnone_SOURCES = compnone.cpp
+complzss_SOURCES = complzss.cpp
+localetest_SOURCES = localetest.cpp
+keycast_SOURCES = keycast.cpp
+introtest_SOURCES = introtest.cpp
+indextest_SOURCES = indextest.cpp
+configtest_SOURCES = configtest.cpp
+romantest_SOURCES = romantest.cpp
+testblocks_SOURCES = testblocks.cpp
+filtertest_SOURCES = filtertest.cpp
+lextest_SOURCES = lextest.cpp
+rawldidxtest_SOURCES = rawldidxtest.cpp
+swaptest_SOURCES = swaptest.cpp
+swbuftest_SOURCES = swbuftest.cpp
+webiftest_SOURCES = webiftest.cpp
+striptest_SOURCES = striptest.cpp
+xmltest_SOURCES = xmltest.cpp
+osistest_SOURCES = osistest.cpp
+bibliotest_SOURCES = bibliotest.cpp
+
+EXTRA_DIST = 
+include bcppmake/Makefile.am
+include testsuite/Makefile.am
+include tmp/Makefile.am
diff --git a/tests/Makefile.in b/tests/Makefile.in
new file mode 100644
index 0000000..63fec25
--- /dev/null
+++ b/tests/Makefile.in
@@ -0,0 +1,1129 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex
+noinst_PROGRAMS = utf8norm$(EXEEXT) ciphertest$(EXEEXT) \
+	keytest$(EXEEXT) mgrtest$(EXEEXT) parsekey$(EXEEXT) \
+	versekeytest$(EXEEXT) vtreekeytest$(EXEEXT) \
+	versemgrtest$(EXEEXT) listtest$(EXEEXT) casttest$(EXEEXT) \
+	modtest$(EXEEXT) compnone$(EXEEXT) complzss$(EXEEXT) \
+	localetest$(EXEEXT) introtest$(EXEEXT) indextest$(EXEEXT) \
+	configtest$(EXEEXT) keycast$(EXEEXT) romantest$(EXEEXT) \
+	testblocks$(EXEEXT) filtertest$(EXEEXT) rawldidxtest$(EXEEXT) \
+	lextest$(EXEEXT) swaptest$(EXEEXT) swbuftest$(EXEEXT) \
+	xmltest$(EXEEXT) webiftest$(EXEEXT) striptest$(EXEEXT) \
+	osistest$(EXEEXT) bibliotest$(EXEEXT) $(am__EXEEXT_1) \
+	$(am__EXEEXT_2)
+DIST_COMMON = $(srcdir)/bcppmake/Makefile.am \
+	$(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+subdir = tests
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@HAVE_ICU_TRUE@am__EXEEXT_1 = icutest$(EXEEXT) translittest$(EXEEXT) \
+@HAVE_ICU_TRUE@	tlitmgrtest$(EXEEXT)
+@HAVE_LIBZ_TRUE@am__EXEEXT_2 = compzip$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
+am_bibliotest_OBJECTS = bibliotest.$(OBJEXT)
+bibliotest_OBJECTS = $(am_bibliotest_OBJECTS)
+bibliotest_LDADD = $(LDADD)
+bibliotest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_casttest_OBJECTS = casttest.$(OBJEXT)
+casttest_OBJECTS = $(am_casttest_OBJECTS)
+casttest_LDADD = $(LDADD)
+casttest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_ciphertest_OBJECTS = ciphertest.$(OBJEXT)
+ciphertest_OBJECTS = $(am_ciphertest_OBJECTS)
+ciphertest_LDADD = $(LDADD)
+ciphertest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_complzss_OBJECTS = complzss.$(OBJEXT)
+complzss_OBJECTS = $(am_complzss_OBJECTS)
+complzss_LDADD = $(LDADD)
+complzss_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_compnone_OBJECTS = compnone.$(OBJEXT)
+compnone_OBJECTS = $(am_compnone_OBJECTS)
+compnone_LDADD = $(LDADD)
+compnone_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am__compzip_SOURCES_DIST = compzip.cpp
+@HAVE_LIBZ_TRUE@am_compzip_OBJECTS = compzip.$(OBJEXT)
+compzip_OBJECTS = $(am_compzip_OBJECTS)
+compzip_LDADD = $(LDADD)
+compzip_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_configtest_OBJECTS = configtest.$(OBJEXT)
+configtest_OBJECTS = $(am_configtest_OBJECTS)
+configtest_LDADD = $(LDADD)
+configtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_filtertest_OBJECTS = filtertest.$(OBJEXT)
+filtertest_OBJECTS = $(am_filtertest_OBJECTS)
+filtertest_LDADD = $(LDADD)
+filtertest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am__icutest_SOURCES_DIST = icutest.cpp
+@HAVE_ICU_TRUE@am_icutest_OBJECTS = icutest.$(OBJEXT)
+icutest_OBJECTS = $(am_icutest_OBJECTS)
+icutest_LDADD = $(LDADD)
+icutest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_indextest_OBJECTS = indextest.$(OBJEXT)
+indextest_OBJECTS = $(am_indextest_OBJECTS)
+indextest_LDADD = $(LDADD)
+indextest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_introtest_OBJECTS = introtest.$(OBJEXT)
+introtest_OBJECTS = $(am_introtest_OBJECTS)
+introtest_LDADD = $(LDADD)
+introtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_keycast_OBJECTS = keycast.$(OBJEXT)
+keycast_OBJECTS = $(am_keycast_OBJECTS)
+keycast_LDADD = $(LDADD)
+keycast_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_keytest_OBJECTS = keytest.$(OBJEXT)
+keytest_OBJECTS = $(am_keytest_OBJECTS)
+keytest_LDADD = $(LDADD)
+keytest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_lextest_OBJECTS = lextest.$(OBJEXT)
+lextest_OBJECTS = $(am_lextest_OBJECTS)
+lextest_LDADD = $(LDADD)
+lextest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_listtest_OBJECTS = listtest.$(OBJEXT)
+listtest_OBJECTS = $(am_listtest_OBJECTS)
+listtest_LDADD = $(LDADD)
+listtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_localetest_OBJECTS = localetest.$(OBJEXT)
+localetest_OBJECTS = $(am_localetest_OBJECTS)
+localetest_LDADD = $(LDADD)
+localetest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_mgrtest_OBJECTS = mgrtest.$(OBJEXT)
+mgrtest_OBJECTS = $(am_mgrtest_OBJECTS)
+mgrtest_LDADD = $(LDADD)
+mgrtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_modtest_OBJECTS = modtest.$(OBJEXT)
+modtest_OBJECTS = $(am_modtest_OBJECTS)
+modtest_LDADD = $(LDADD)
+modtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_osistest_OBJECTS = osistest.$(OBJEXT)
+osistest_OBJECTS = $(am_osistest_OBJECTS)
+osistest_LDADD = $(LDADD)
+osistest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_parsekey_OBJECTS = parsekey.$(OBJEXT)
+parsekey_OBJECTS = $(am_parsekey_OBJECTS)
+parsekey_LDADD = $(LDADD)
+parsekey_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_rawldidxtest_OBJECTS = rawldidxtest.$(OBJEXT)
+rawldidxtest_OBJECTS = $(am_rawldidxtest_OBJECTS)
+rawldidxtest_LDADD = $(LDADD)
+rawldidxtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_romantest_OBJECTS = romantest.$(OBJEXT)
+romantest_OBJECTS = $(am_romantest_OBJECTS)
+romantest_LDADD = $(LDADD)
+romantest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_striptest_OBJECTS = striptest.$(OBJEXT)
+striptest_OBJECTS = $(am_striptest_OBJECTS)
+striptest_LDADD = $(LDADD)
+striptest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_swaptest_OBJECTS = swaptest.$(OBJEXT)
+swaptest_OBJECTS = $(am_swaptest_OBJECTS)
+swaptest_LDADD = $(LDADD)
+swaptest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_swbuftest_OBJECTS = swbuftest.$(OBJEXT)
+swbuftest_OBJECTS = $(am_swbuftest_OBJECTS)
+swbuftest_LDADD = $(LDADD)
+swbuftest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_testblocks_OBJECTS = testblocks.$(OBJEXT)
+testblocks_OBJECTS = $(am_testblocks_OBJECTS)
+testblocks_LDADD = $(LDADD)
+testblocks_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am__tlitmgrtest_SOURCES_DIST = tlitmgrtest.cpp
+@HAVE_ICU_TRUE@am_tlitmgrtest_OBJECTS = tlitmgrtest.$(OBJEXT)
+tlitmgrtest_OBJECTS = $(am_tlitmgrtest_OBJECTS)
+tlitmgrtest_LDADD = $(LDADD)
+tlitmgrtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am__translittest_SOURCES_DIST = translittest.cpp
+@HAVE_ICU_TRUE@am_translittest_OBJECTS = translittest.$(OBJEXT)
+translittest_OBJECTS = $(am_translittest_OBJECTS)
+translittest_LDADD = $(LDADD)
+translittest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_utf8norm_OBJECTS = utf8norm.$(OBJEXT)
+utf8norm_OBJECTS = $(am_utf8norm_OBJECTS)
+utf8norm_LDADD = $(LDADD)
+utf8norm_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_versekeytest_OBJECTS = versekeytest.$(OBJEXT)
+versekeytest_OBJECTS = $(am_versekeytest_OBJECTS)
+versekeytest_LDADD = $(LDADD)
+versekeytest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_versemgrtest_OBJECTS = versemgrtest.$(OBJEXT)
+versemgrtest_OBJECTS = $(am_versemgrtest_OBJECTS)
+versemgrtest_LDADD = $(LDADD)
+versemgrtest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_vtreekeytest_OBJECTS = vtreekeytest.$(OBJEXT)
+vtreekeytest_OBJECTS = $(am_vtreekeytest_OBJECTS)
+vtreekeytest_LDADD = $(LDADD)
+vtreekeytest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_webiftest_OBJECTS = webiftest.$(OBJEXT)
+webiftest_OBJECTS = $(am_webiftest_OBJECTS)
+webiftest_LDADD = $(LDADD)
+webiftest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_xmltest_OBJECTS = xmltest.$(OBJEXT)
+xmltest_OBJECTS = $(am_xmltest_OBJECTS)
+xmltest_LDADD = $(LDADD)
+xmltest_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \
+	$(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \
+	$(compzip_SOURCES) $(configtest_SOURCES) $(filtertest_SOURCES) \
+	$(icutest_SOURCES) $(indextest_SOURCES) $(introtest_SOURCES) \
+	$(keycast_SOURCES) $(keytest_SOURCES) $(lextest_SOURCES) \
+	$(listtest_SOURCES) $(localetest_SOURCES) $(mgrtest_SOURCES) \
+	$(modtest_SOURCES) $(osistest_SOURCES) $(parsekey_SOURCES) \
+	$(rawldidxtest_SOURCES) $(romantest_SOURCES) \
+	$(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \
+	$(testblocks_SOURCES) $(tlitmgrtest_SOURCES) \
+	$(translittest_SOURCES) $(utf8norm_SOURCES) \
+	$(versekeytest_SOURCES) $(versemgrtest_SOURCES) \
+	$(vtreekeytest_SOURCES) $(webiftest_SOURCES) \
+	$(xmltest_SOURCES)
+DIST_SOURCES = $(bibliotest_SOURCES) $(casttest_SOURCES) \
+	$(ciphertest_SOURCES) $(complzss_SOURCES) $(compnone_SOURCES) \
+	$(am__compzip_SOURCES_DIST) $(configtest_SOURCES) \
+	$(filtertest_SOURCES) $(am__icutest_SOURCES_DIST) \
+	$(indextest_SOURCES) $(introtest_SOURCES) $(keycast_SOURCES) \
+	$(keytest_SOURCES) $(lextest_SOURCES) $(listtest_SOURCES) \
+	$(localetest_SOURCES) $(mgrtest_SOURCES) $(modtest_SOURCES) \
+	$(osistest_SOURCES) $(parsekey_SOURCES) \
+	$(rawldidxtest_SOURCES) $(romantest_SOURCES) \
+	$(striptest_SOURCES) $(swaptest_SOURCES) $(swbuftest_SOURCES) \
+	$(testblocks_SOURCES) $(am__tlitmgrtest_SOURCES_DIST) \
+	$(am__translittest_SOURCES_DIST) $(utf8norm_SOURCES) \
+	$(versekeytest_SOURCES) $(versemgrtest_SOURCES) \
+	$(vtreekeytest_SOURCES) $(webiftest_SOURCES) \
+	$(xmltest_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+AUTOMAKE_OPTIONS = 1.6
+AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1)
+LDADD = $(top_builddir)/lib/libsword.la
+SUBDIRS = cppunit
+@HAVE_ICU_FALSE@ICUPROG = 
+@HAVE_ICU_TRUE@ICUPROG = icutest translittest tlitmgrtest
+@HAVE_ICU_TRUE@icutest_SOURCES = icutest.cpp
+@HAVE_ICU_TRUE@translittest_SOURCES = translittest.cpp
+@HAVE_ICU_TRUE@tlitmgrtest_SOURCES = tlitmgrtest.cpp
+@HAVE_LIBZ_FALSE@ZLIBPROG = 
+@HAVE_LIBZ_TRUE@ZLIBPROG = compzip
+@HAVE_LIBZ_TRUE@compzip_SOURCES = compzip.cpp
+keytest_SOURCES = keytest.cpp
+mgrtest_SOURCES = mgrtest.cpp
+ciphertest_SOURCES = ciphertest.cpp
+utf8norm_SOURCES = utf8norm.cpp
+parsekey_SOURCES = parsekey.cpp
+versekeytest_SOURCES = versekeytest.cpp
+vtreekeytest_SOURCES = vtreekeytest.cpp
+versemgrtest_SOURCES = versemgrtest.cpp
+listtest_SOURCES = listtest.cpp
+casttest_SOURCES = casttest.cpp
+modtest_SOURCES = modtest.cpp
+compnone_SOURCES = compnone.cpp
+complzss_SOURCES = complzss.cpp
+localetest_SOURCES = localetest.cpp
+keycast_SOURCES = keycast.cpp
+introtest_SOURCES = introtest.cpp
+indextest_SOURCES = indextest.cpp
+configtest_SOURCES = configtest.cpp
+romantest_SOURCES = romantest.cpp
+testblocks_SOURCES = testblocks.cpp
+filtertest_SOURCES = filtertest.cpp
+lextest_SOURCES = lextest.cpp
+rawldidxtest_SOURCES = rawldidxtest.cpp
+swaptest_SOURCES = swaptest.cpp
+swbuftest_SOURCES = swbuftest.cpp
+webiftest_SOURCES = webiftest.cpp
+striptest_SOURCES = striptest.cpp
+xmltest_SOURCES = xmltest.cpp
+osistest_SOURCES = osistest.cpp
+bibliotest_SOURCES = bibliotest.cpp
+EXTRA_DIST = $(swbcppdir)/filtertest.bpf $(swbcppdir)/filtertest.bpr \
+	$(swbcppdir)/libsword.bpf $(swbcppdir)/libsword.bpr \
+	$(swbcppdir)/mgrtest.bpf $(swbcppdir)/mgrtest.bpr \
+	$(swbcppdir)/parsekey.bpf $(swbcppdir)/parsekey.bpr \
+	$(swbcppdir)/tests.bpg $(swtspdir)/runall.sh \
+	$(swtspdir)/runtest.sh $(swtspdir)/verseparsing.good \
+	$(swtspdir)/verseparsing.sh $(swtesttmpdir)/README
+swbcppdir = $(top_srcdir)/tests/bcppmake
+swtspdir = $(top_srcdir)/tests/testsuite
+swtesttmpdir = $(top_srcdir)/tests/tmp
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign tests/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/bcppmake/Makefile.am $(srcdir)/testsuite/Makefile.am $(srcdir)/tmp/Makefile.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+bibliotest$(EXEEXT): $(bibliotest_OBJECTS) $(bibliotest_DEPENDENCIES) $(EXTRA_bibliotest_DEPENDENCIES) 
+	@rm -f bibliotest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(bibliotest_OBJECTS) $(bibliotest_LDADD) $(LIBS)
+
+casttest$(EXEEXT): $(casttest_OBJECTS) $(casttest_DEPENDENCIES) $(EXTRA_casttest_DEPENDENCIES) 
+	@rm -f casttest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(casttest_OBJECTS) $(casttest_LDADD) $(LIBS)
+
+ciphertest$(EXEEXT): $(ciphertest_OBJECTS) $(ciphertest_DEPENDENCIES) $(EXTRA_ciphertest_DEPENDENCIES) 
+	@rm -f ciphertest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(ciphertest_OBJECTS) $(ciphertest_LDADD) $(LIBS)
+
+complzss$(EXEEXT): $(complzss_OBJECTS) $(complzss_DEPENDENCIES) $(EXTRA_complzss_DEPENDENCIES) 
+	@rm -f complzss$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(complzss_OBJECTS) $(complzss_LDADD) $(LIBS)
+
+compnone$(EXEEXT): $(compnone_OBJECTS) $(compnone_DEPENDENCIES) $(EXTRA_compnone_DEPENDENCIES) 
+	@rm -f compnone$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(compnone_OBJECTS) $(compnone_LDADD) $(LIBS)
+
+compzip$(EXEEXT): $(compzip_OBJECTS) $(compzip_DEPENDENCIES) $(EXTRA_compzip_DEPENDENCIES) 
+	@rm -f compzip$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(compzip_OBJECTS) $(compzip_LDADD) $(LIBS)
+
+configtest$(EXEEXT): $(configtest_OBJECTS) $(configtest_DEPENDENCIES) $(EXTRA_configtest_DEPENDENCIES) 
+	@rm -f configtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(configtest_OBJECTS) $(configtest_LDADD) $(LIBS)
+
+filtertest$(EXEEXT): $(filtertest_OBJECTS) $(filtertest_DEPENDENCIES) $(EXTRA_filtertest_DEPENDENCIES) 
+	@rm -f filtertest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(filtertest_OBJECTS) $(filtertest_LDADD) $(LIBS)
+
+icutest$(EXEEXT): $(icutest_OBJECTS) $(icutest_DEPENDENCIES) $(EXTRA_icutest_DEPENDENCIES) 
+	@rm -f icutest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(icutest_OBJECTS) $(icutest_LDADD) $(LIBS)
+
+indextest$(EXEEXT): $(indextest_OBJECTS) $(indextest_DEPENDENCIES) $(EXTRA_indextest_DEPENDENCIES) 
+	@rm -f indextest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(indextest_OBJECTS) $(indextest_LDADD) $(LIBS)
+
+introtest$(EXEEXT): $(introtest_OBJECTS) $(introtest_DEPENDENCIES) $(EXTRA_introtest_DEPENDENCIES) 
+	@rm -f introtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(introtest_OBJECTS) $(introtest_LDADD) $(LIBS)
+
+keycast$(EXEEXT): $(keycast_OBJECTS) $(keycast_DEPENDENCIES) $(EXTRA_keycast_DEPENDENCIES) 
+	@rm -f keycast$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(keycast_OBJECTS) $(keycast_LDADD) $(LIBS)
+
+keytest$(EXEEXT): $(keytest_OBJECTS) $(keytest_DEPENDENCIES) $(EXTRA_keytest_DEPENDENCIES) 
+	@rm -f keytest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(keytest_OBJECTS) $(keytest_LDADD) $(LIBS)
+
+lextest$(EXEEXT): $(lextest_OBJECTS) $(lextest_DEPENDENCIES) $(EXTRA_lextest_DEPENDENCIES) 
+	@rm -f lextest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(lextest_OBJECTS) $(lextest_LDADD) $(LIBS)
+
+listtest$(EXEEXT): $(listtest_OBJECTS) $(listtest_DEPENDENCIES) $(EXTRA_listtest_DEPENDENCIES) 
+	@rm -f listtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(listtest_OBJECTS) $(listtest_LDADD) $(LIBS)
+
+localetest$(EXEEXT): $(localetest_OBJECTS) $(localetest_DEPENDENCIES) $(EXTRA_localetest_DEPENDENCIES) 
+	@rm -f localetest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(localetest_OBJECTS) $(localetest_LDADD) $(LIBS)
+
+mgrtest$(EXEEXT): $(mgrtest_OBJECTS) $(mgrtest_DEPENDENCIES) $(EXTRA_mgrtest_DEPENDENCIES) 
+	@rm -f mgrtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(mgrtest_OBJECTS) $(mgrtest_LDADD) $(LIBS)
+
+modtest$(EXEEXT): $(modtest_OBJECTS) $(modtest_DEPENDENCIES) $(EXTRA_modtest_DEPENDENCIES) 
+	@rm -f modtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(modtest_OBJECTS) $(modtest_LDADD) $(LIBS)
+
+osistest$(EXEEXT): $(osistest_OBJECTS) $(osistest_DEPENDENCIES) $(EXTRA_osistest_DEPENDENCIES) 
+	@rm -f osistest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(osistest_OBJECTS) $(osistest_LDADD) $(LIBS)
+
+parsekey$(EXEEXT): $(parsekey_OBJECTS) $(parsekey_DEPENDENCIES) $(EXTRA_parsekey_DEPENDENCIES) 
+	@rm -f parsekey$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(parsekey_OBJECTS) $(parsekey_LDADD) $(LIBS)
+
+rawldidxtest$(EXEEXT): $(rawldidxtest_OBJECTS) $(rawldidxtest_DEPENDENCIES) $(EXTRA_rawldidxtest_DEPENDENCIES) 
+	@rm -f rawldidxtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(rawldidxtest_OBJECTS) $(rawldidxtest_LDADD) $(LIBS)
+
+romantest$(EXEEXT): $(romantest_OBJECTS) $(romantest_DEPENDENCIES) $(EXTRA_romantest_DEPENDENCIES) 
+	@rm -f romantest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(romantest_OBJECTS) $(romantest_LDADD) $(LIBS)
+
+striptest$(EXEEXT): $(striptest_OBJECTS) $(striptest_DEPENDENCIES) $(EXTRA_striptest_DEPENDENCIES) 
+	@rm -f striptest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(striptest_OBJECTS) $(striptest_LDADD) $(LIBS)
+
+swaptest$(EXEEXT): $(swaptest_OBJECTS) $(swaptest_DEPENDENCIES) $(EXTRA_swaptest_DEPENDENCIES) 
+	@rm -f swaptest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(swaptest_OBJECTS) $(swaptest_LDADD) $(LIBS)
+
+swbuftest$(EXEEXT): $(swbuftest_OBJECTS) $(swbuftest_DEPENDENCIES) $(EXTRA_swbuftest_DEPENDENCIES) 
+	@rm -f swbuftest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(swbuftest_OBJECTS) $(swbuftest_LDADD) $(LIBS)
+
+testblocks$(EXEEXT): $(testblocks_OBJECTS) $(testblocks_DEPENDENCIES) $(EXTRA_testblocks_DEPENDENCIES) 
+	@rm -f testblocks$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(testblocks_OBJECTS) $(testblocks_LDADD) $(LIBS)
+
+tlitmgrtest$(EXEEXT): $(tlitmgrtest_OBJECTS) $(tlitmgrtest_DEPENDENCIES) $(EXTRA_tlitmgrtest_DEPENDENCIES) 
+	@rm -f tlitmgrtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(tlitmgrtest_OBJECTS) $(tlitmgrtest_LDADD) $(LIBS)
+
+translittest$(EXEEXT): $(translittest_OBJECTS) $(translittest_DEPENDENCIES) $(EXTRA_translittest_DEPENDENCIES) 
+	@rm -f translittest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(translittest_OBJECTS) $(translittest_LDADD) $(LIBS)
+
+utf8norm$(EXEEXT): $(utf8norm_OBJECTS) $(utf8norm_DEPENDENCIES) $(EXTRA_utf8norm_DEPENDENCIES) 
+	@rm -f utf8norm$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(utf8norm_OBJECTS) $(utf8norm_LDADD) $(LIBS)
+
+versekeytest$(EXEEXT): $(versekeytest_OBJECTS) $(versekeytest_DEPENDENCIES) $(EXTRA_versekeytest_DEPENDENCIES) 
+	@rm -f versekeytest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(versekeytest_OBJECTS) $(versekeytest_LDADD) $(LIBS)
+
+versemgrtest$(EXEEXT): $(versemgrtest_OBJECTS) $(versemgrtest_DEPENDENCIES) $(EXTRA_versemgrtest_DEPENDENCIES) 
+	@rm -f versemgrtest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(versemgrtest_OBJECTS) $(versemgrtest_LDADD) $(LIBS)
+
+vtreekeytest$(EXEEXT): $(vtreekeytest_OBJECTS) $(vtreekeytest_DEPENDENCIES) $(EXTRA_vtreekeytest_DEPENDENCIES) 
+	@rm -f vtreekeytest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(vtreekeytest_OBJECTS) $(vtreekeytest_LDADD) $(LIBS)
+
+webiftest$(EXEEXT): $(webiftest_OBJECTS) $(webiftest_DEPENDENCIES) $(EXTRA_webiftest_DEPENDENCIES) 
+	@rm -f webiftest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(webiftest_OBJECTS) $(webiftest_LDADD) $(LIBS)
+
+xmltest$(EXEEXT): $(xmltest_OBJECTS) $(xmltest_DEPENDENCIES) $(EXTRA_xmltest_DEPENDENCIES) 
+	@rm -f xmltest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(xmltest_OBJECTS) $(xmltest_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibliotest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/casttest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ciphertest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complzss.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compnone.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compzip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filtertest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icutest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indextest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/introtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keycast.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keytest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lextest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localetest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgrtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osistest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parsekey.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rawldidxtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/romantest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/striptest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swaptest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/swbuftest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testblocks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tlitmgrtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/translittest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8norm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versekeytest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/versemgrtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vtreekeytest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/webiftest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltest.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/tests/bcppmake/Makefile.am b/tests/bcppmake/Makefile.am
new file mode 100644
index 0000000..6a959e5
--- /dev/null
+++ b/tests/bcppmake/Makefile.am
@@ -0,0 +1,11 @@
+swbcppdir = $(top_srcdir)/tests/bcppmake
+
+EXTRA_DIST += $(swbcppdir)/filtertest.bpf  
+EXTRA_DIST += $(swbcppdir)/filtertest.bpr  
+EXTRA_DIST += $(swbcppdir)/libsword.bpf  
+EXTRA_DIST += $(swbcppdir)/libsword.bpr  
+EXTRA_DIST += $(swbcppdir)/mgrtest.bpf
+EXTRA_DIST += $(swbcppdir)/mgrtest.bpr
+EXTRA_DIST += $(swbcppdir)/parsekey.bpf
+EXTRA_DIST += $(swbcppdir)/parsekey.bpr
+EXTRA_DIST += $(swbcppdir)/tests.bpg
diff --git a/tests/bcppmake/filtertest.bpf b/tests/bcppmake/filtertest.bpf
new file mode 100644
index 0000000..5bef665
--- /dev/null
+++ b/tests/bcppmake/filtertest.bpf
@@ -0,0 +1,10 @@
+USEUNIT("..\filtertest.cpp");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/tests/bcppmake/filtertest.bpr b/tests/bcppmake/filtertest.bpr
new file mode 100644
index 0000000..5778bc4
--- /dev/null
+++ b/tests/bcppmake/filtertest.bpr
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="filtertest.exe"/>
+    <OBJFILES value="..\filtertest.obj"/>
+    <RESFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib 
+      ..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="filtertest.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC 
+      -tWM -c"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -Sc:0x20000 -ap -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=3
+Item0=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/tests/bcppmake/libsword.bpf b/tests/bcppmake/libsword.bpf
new file mode 100644
index 0000000..2ef1ac5
--- /dev/null
+++ b/tests/bcppmake/libsword.bpf
@@ -0,0 +1,117 @@
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+USEUNIT("..\..\src\keys\versekey.cpp");
+USEUNIT("..\..\src\keys\strkey.cpp");
+USEUNIT("..\..\src\keys\swkey.cpp");
+USEUNIT("..\..\src\keys\listkey.cpp");
+USEUNIT("..\..\src\mgr\swmgr.cpp");
+USEUNIT("..\..\src\mgr\localemgr.cpp");
+USEUNIT("..\..\src\mgr\swconfig.cpp");
+USEUNIT("..\..\src\mgr\swlocale.cpp");
+USEUNIT("..\..\src\mgr\filemgr.cpp");
+USEUNIT("..\..\src\utilfuns\utilstr.cpp");
+USEUNIT("..\..\src\utilfuns\utilconf.cpp");
+USEUNIT("..\..\src\utilfuns\Greek2Greek.cpp");
+USEUNIT("..\..\src\frontend\swlog.cpp");
+USEUNIT("..\..\src\frontend\swdisp.cpp");
+USEUNIT("..\..\src\modules\swmodule.cpp");
+USEUNIT("..\..\src\modules\comments\swcom.cpp");
+USEUNIT("..\..\src\modules\comments\hrefcom\hrefcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawcom\rawcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawfiles\rawfiles.cpp");
+USEUNIT("..\..\src\modules\common\lzsscomprs.cpp");
+USEUNIT("..\..\src\modules\common\rawstr.cpp");
+USEUNIT("..\..\src\modules\common\rawverse.cpp");
+USEUNIT("..\..\src\modules\common\sapphire.cpp");
+USEUNIT("..\..\src\modules\common\swcipher.cpp");
+USEUNIT("..\..\src\modules\common\swcomprs.cpp");
+USEUNIT("..\..\src\modules\filters\thmlrtf.cpp");
+USEUNIT("..\..\src\modules\filters\gbffootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\gbfplain.cpp");
+USEUNIT("..\..\src\modules\filters\gbfrtf.cpp");
+USEUNIT("..\..\src\modules\filters\gbfstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\gbfthml.cpp");
+USEUNIT("..\..\src\modules\filters\plainfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\plainhtml.cpp");
+USEUNIT("..\..\src\modules\filters\rtfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\rwphtml.cpp");
+USEUNIT("..\..\src\modules\filters\rwprtf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlgbf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtml.cpp");
+USEUNIT("..\..\src\modules\filters\thmlplain.cpp");
+USEUNIT("..\..\src\modules\filters\cipherfil.cpp");
+USEUNIT("..\..\src\modules\lexdict\swld.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld\rawld.cpp");
+USEUNIT("..\..\src\modules\texts\swtext.cpp");
+USEUNIT("..\..\src\modules\texts\rawtext\rawtext.cpp");
+USEUNIT("..\..\src\modules\texts\ztext\ztext.cpp");
+USEUNIT("..\..\src\modules\common\zverse.cpp");
+USEUNIT("..\..\src\keys\treekey.cpp");
+USEUNIT("..\..\src\keys\treekeyidx.cpp");
+USEUNIT("..\..\src\modules\common\rawstr4.cpp");
+USEUNIT("..\..\src\modules\common\zstr.cpp");
+USEUNIT("..\..\src\modules\genbook\swgenbook.cpp");
+USEUNIT("..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp");
+USEUNIT("..\..\src\mgr\swfiltermgr.cpp");
+USEUNIT("..\..\src\modules\filters\utf8utf16.cpp");
+USEUNIT("..\..\src\modules\filters\gbfheadings.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\gbfmorph.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf16.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf8.cpp");
+USEUNIT("..\..\src\modules\filters\scsuutf8.cpp");
+USEUNIT("..\..\src\modules\filters\swbasicfilter.cpp");
+USEUNIT("..\..\src\modules\filters\thmlfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\thmlheadings.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\thmllemma.cpp");
+USEUNIT("..\..\src\modules\filters\thmlmorph.cpp");
+USEUNIT("..\..\src\modules\filters\thmlscripref.cpp");
+USEUNIT("..\..\src\modules\filters\thmlstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\thmlvariants.cpp");
+USEUNIT("..\..\src\modules\filters\unicodertf.cpp");
+USEUNIT("..\..\src\modules\filters\utf16utf8.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arshaping.cpp");
+USEUNIT("..\..\src\modules\filters\utf8bidireorder.cpp");
+USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
+USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
+USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8html.cpp");
+USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfkd.cpp");
+USEUNIT("..\..\src\modules\filters\utf8transliterator.cpp");
+USEUNIT("..\..\src\utilfuns\roman.c");
+USEUNIT("..\..\src\modules\comments\zcom\zcom.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld4\rawld4.cpp");
+USEUNIT("..\..\src\modules\common\zipcomprs.cpp");
+USEUNIT("..\..\src\modules\lexdict\zld\zld.cpp");
+USEUNIT("..\..\src\modules\common\entriesblk.cpp");
+USEUNIT("..\..\src\utilfuns\zlib\zutil.c");
+USEUNIT("..\..\src\utilfuns\zlib\compress.c");
+USEUNIT("..\..\src\utilfuns\zlib\crc32.c");
+USEUNIT("..\..\src\utilfuns\zlib\deflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\gzio.c");
+USEUNIT("..\..\src\utilfuns\zlib\infblock.c");
+USEUNIT("..\..\src\utilfuns\zlib\infcodes.c");
+USEUNIT("..\..\src\utilfuns\zlib\inffast.c");
+USEUNIT("..\..\src\utilfuns\zlib\inflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\inftrees.c");
+USEUNIT("..\..\src\utilfuns\zlib\infutil.c");
+USEUNIT("..\..\src\utilfuns\zlib\trees.c");
+USEUNIT("..\..\src\utilfuns\zlib\uncompr.c");
+USEUNIT("..\..\src\utilfuns\zlib\untgz.c");
+USEUNIT("..\..\src\utilfuns\zlib\adler32.c");
+USEUNIT("..\..\src\modules\filters\thmlosis.cpp");
+USEUNIT("..\..\src\modules\filters\greeklexattribs.cpp");
+USEUNIT("..\..\src\mgr\swcacher.cpp");
+USEUNIT("..\..\src\modules\filters\gbfosis.cpp");
+//---------------------------------------------------------------------------
+#define Library
+
+// To add a file to the library use the Project menu 'Add to Project'.
+
diff --git a/tests/bcppmake/libsword.bpr b/tests/bcppmake/libsword.bpr
new file mode 100644
index 0000000..45b7ca1
--- /dev/null
+++ b/tests/bcppmake/libsword.bpr
@@ -0,0 +1,197 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="libsword.lib"/>
+    <OBJFILES value="..\..\src\keys\versekey.obj ..\..\src\keys\strkey.obj 
+      ..\..\src\keys\swkey.obj ..\..\src\keys\listkey.obj 
+      ..\..\src\mgr\swmgr.obj ..\..\src\mgr\localemgr.obj 
+      ..\..\src\mgr\swconfig.obj ..\..\src\mgr\swlocale.obj 
+      ..\..\src\mgr\filemgr.obj ..\..\src\utilfuns\utilstr.obj 
+      ..\..\src\utilfuns\utilconf.obj ..\..\src\utilfuns\Greek2Greek.obj 
+      ..\..\src\frontend\swlog.obj ..\..\src\frontend\swdisp.obj 
+      ..\..\src\modules\swmodule.obj ..\..\src\modules\comments\swcom.obj 
+      ..\..\src\modules\comments\hrefcom\hrefcom.obj 
+      ..\..\src\modules\comments\rawcom\rawcom.obj 
+      ..\..\src\modules\comments\rawfiles\rawfiles.obj 
+      ..\..\src\modules\common\lzsscomprs.obj 
+      ..\..\src\modules\common\rawstr.obj ..\..\src\modules\common\rawverse.obj 
+      ..\..\src\modules\common\sapphire.obj 
+      ..\..\src\modules\common\swcipher.obj ..\..\src\modules\common\swcomprs.obj 
+      ..\..\src\modules\filters\thmlrtf.obj 
+      ..\..\src\modules\filters\gbffootnotes.obj 
+      ..\..\src\modules\filters\gbfhtml.obj 
+      ..\..\src\modules\filters\gbfplain.obj 
+      ..\..\src\modules\filters\gbfrtf.obj ..\..\src\modules\filters\gbfstrongs.obj 
+      ..\..\src\modules\filters\gbfthml.obj 
+      ..\..\src\modules\filters\plainfootnotes.obj 
+      ..\..\src\modules\filters\plainhtml.obj 
+      ..\..\src\modules\filters\rtfhtml.obj 
+      ..\..\src\modules\filters\rwphtml.obj ..\..\src\modules\filters\rwprtf.obj 
+      ..\..\src\modules\filters\thmlgbf.obj 
+      ..\..\src\modules\filters\thmlhtml.obj 
+      ..\..\src\modules\filters\thmlplain.obj 
+      ..\..\src\modules\filters\cipherfil.obj ..\..\src\modules\lexdict\swld.obj 
+      ..\..\src\modules\lexdict\rawld\rawld.obj 
+      ..\..\src\modules\texts\swtext.obj 
+      ..\..\src\modules\texts\rawtext\rawtext.obj 
+      ..\..\src\modules\texts\ztext\ztext.obj 
+      ..\..\src\modules\common\zverse.obj ..\..\src\keys\treekey.obj 
+      ..\..\src\keys\treekeyidx.obj ..\..\src\modules\common\rawstr4.obj 
+      ..\..\src\modules\common\zstr.obj ..\..\src\modules\genbook\swgenbook.obj 
+      ..\..\src\modules\genbook\rawgenbook\rawgenbook.obj 
+      ..\..\src\mgr\swfiltermgr.obj ..\..\src\modules\filters\utf8utf16.obj 
+      ..\..\src\modules\filters\gbfheadings.obj 
+      ..\..\src\modules\filters\gbfhtmlhref.obj 
+      ..\..\src\modules\filters\gbfmorph.obj 
+      ..\..\src\modules\filters\latin1utf16.obj 
+      ..\..\src\modules\filters\latin1utf8.obj 
+      ..\..\src\modules\filters\scsuutf8.obj 
+      ..\..\src\modules\filters\swbasicfilter.obj 
+      ..\..\src\modules\filters\thmlfootnotes.obj 
+      ..\..\src\modules\filters\thmlheadings.obj 
+      ..\..\src\modules\filters\thmlhtmlhref.obj 
+      ..\..\src\modules\filters\thmllemma.obj 
+      ..\..\src\modules\filters\thmlmorph.obj 
+      ..\..\src\modules\filters\thmlscripref.obj 
+      ..\..\src\modules\filters\thmlstrongs.obj 
+      ..\..\src\modules\filters\thmlvariants.obj 
+      ..\..\src\modules\filters\unicodertf.obj 
+      ..\..\src\modules\filters\utf16utf8.obj 
+      ..\..\src\modules\filters\utf8arshaping.obj 
+      ..\..\src\modules\filters\utf8bidireorder.obj 
+      ..\..\src\modules\filters\utf8cantillation.obj 
+      ..\..\src\modules\filters\utf8greekaccents.obj 
+      ..\..\src\modules\filters\utf8hebrewpoints.obj 
+      ..\..\src\modules\filters\utf8arabicpoints.obj 
+      ..\..\src\modules\filters\utf8html.obj 
+      ..\..\src\modules\filters\utf8latin1.obj 
+      ..\..\src\modules\filters\utf8nfc.obj 
+      ..\..\src\modules\filters\utf8nfkd.obj 
+      ..\..\src\modules\filters\utf8transliterator.obj 
+      ..\..\src\utilfuns\roman.obj ..\..\src\modules\comments\zcom\zcom.obj 
+      ..\..\src\modules\lexdict\rawld4\rawld4.obj 
+      ..\..\src\modules\common\zipcomprs.obj 
+      ..\..\src\modules\lexdict\zld\zld.obj 
+      ..\..\src\modules\common\entriesblk.obj ..\..\src\utilfuns\zlib\zutil.obj 
+      ..\..\src\utilfuns\zlib\compress.obj ..\..\src\utilfuns\zlib\crc32.obj 
+      ..\..\src\utilfuns\zlib\deflate.obj ..\..\src\utilfuns\zlib\gzio.obj 
+      ..\..\src\utilfuns\zlib\infblock.obj ..\..\src\utilfuns\zlib\infcodes.obj 
+      ..\..\src\utilfuns\zlib\inffast.obj ..\..\src\utilfuns\zlib\inflate.obj 
+      ..\..\src\utilfuns\zlib\inftrees.obj ..\..\src\utilfuns\zlib\infutil.obj 
+      ..\..\src\utilfuns\zlib\trees.obj ..\..\src\utilfuns\zlib\uncompr.obj 
+      ..\..\src\utilfuns\zlib\untgz.obj ..\..\src\utilfuns\zlib\adler32.obj 
+      ..\..\src\modules\filters\thmlosis.obj 
+      ..\..\src\modules\filters\greeklexattribs.obj ..\..\src\mgr\swcacher.obj 
+      ..\..\src\modules\filters\gbfosis.obj"/>
+    <RESFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value=""/>
+    <LIBRARIES value=""/>
+    <PACKAGES value=""/>
+    <PATHCPP value=".;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\frontend;..\..\src\modules;..\..\src\modules\comments;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\lexdict;..\..\src\modules\lexdict\rawld;..\..\src\modules\texts;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\genbook;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\comments\zcom;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\utilfuns\zlib"/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <LINKER value="TLib"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="NO_STRICT"/>
+    <MAINSOURCE value="libsword.bpf"/>
+    <INCLUDEPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+    <LISTFILE value=""/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k 
+      -y -v -vi- -c -tW -tWM"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="/P512"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="$(OBJFILES)"/>
+    <ALLLIB value="cg32.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=5
+Item0=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\include;$(BCB)\include;$(BCB)\include\vcl
+Item4=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=4
+Item0=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[HistoryLists\hlTlibPageSize]
+Count=5
+Item0=0x0200
+Item1=0x0080
+Item2=0x0040
+Item3=0x0020
+Item4=0x0010
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/tests/bcppmake/mgrtest.bpf b/tests/bcppmake/mgrtest.bpf
new file mode 100644
index 0000000..580dad0
--- /dev/null
+++ b/tests/bcppmake/mgrtest.bpf
@@ -0,0 +1,10 @@
+USEUNIT("..\mgrtest.cpp");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/tests/bcppmake/mgrtest.bpr b/tests/bcppmake/mgrtest.bpr
new file mode 100644
index 0000000..7ac16de
--- /dev/null
+++ b/tests/bcppmake/mgrtest.bpr
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="mgrtest.exe"/>
+    <OBJFILES value="..\mgrtest.obj"/>
+    <RESFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib 
+      ..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="mgrtest.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC 
+      -tWM -c"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -Sc:0x20000 -ap -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=3
+Item0=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/tests/bcppmake/parsekey.bpf b/tests/bcppmake/parsekey.bpf
new file mode 100644
index 0000000..490b3c6
--- /dev/null
+++ b/tests/bcppmake/parsekey.bpf
@@ -0,0 +1,10 @@
+USEUNIT("..\parsekey.cpp");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/tests/bcppmake/parsekey.bpr b/tests/bcppmake/parsekey.bpr
new file mode 100644
index 0000000..167a8ad
--- /dev/null
+++ b/tests/bcppmake/parsekey.bpr
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="parsekey.exe"/>
+    <OBJFILES value="..\parsekey.obj"/>
+    <RESFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib 
+      ..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="parsekey.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC 
+      -tWM -c"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -Sc:0x20000 -ap -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=3
+Item0=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=&quot;jn1:2 -3:4&quot;
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/tests/bcppmake/tests.bpg b/tests/bcppmake/tests.bpg
new file mode 100644
index 0000000..d9b64c4
--- /dev/null
+++ b/tests/bcppmake/tests.bpg
@@ -0,0 +1,33 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = libsword.lib parsekey.exe filtertest.exe mgrtest.exe
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+parsekey.exe: parsekey.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+filtertest.exe: filtertest.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+mgrtest.exe: mgrtest.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+libsword.lib: ..\..\lib\bcppmake\libsword.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+
diff --git a/tests/bibliotest.cpp b/tests/bibliotest.cpp
new file mode 100644
index 0000000..821ee87
--- /dev/null
+++ b/tests/bibliotest.cpp
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ *  bibliotest.cpp -	
+ *
+ * $Id: bibliotest.cpp 2940 2013-08-03 06:53:35Z chrislit $
+ *
+ * Copyright 2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <swtext.h>
+#include <versekey.h>
+#include <iostream>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	SWMgr mymgr;
+	ModMap::iterator it;
+	if ( argc > 1 ) {
+		SWModule *module = mymgr.Modules[argv[1]];
+		std::cout << module->getBibliography() << "\n";
+		return 0;
+	}
+	else {
+		std::cout << "Usage: bibliography <ModuleName>"<< "\n";
+		return 1;
+	}
+}
diff --git a/tests/casttest.cpp b/tests/casttest.cpp
new file mode 100644
index 0000000..37388e9
--- /dev/null
+++ b/tests/casttest.cpp
@@ -0,0 +1,52 @@
+/******************************************************************************
+ *
+ *  casttest.cpp -	
+ *
+ * $Id: casttest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <versekey.h>
+#include <treekeyidx.h>
+#include <listkey.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+//	VerseKey x("jas");
+	TreeKeyIdx x("jas");
+//	ListKey x("jas");
+	SWKey *y = &x;
+	TreeKeyIdx *v = &x;
+//	VerseKey *v = &x;
+//	ListKey *v = &x;
+
+//	v = SWDYNAMIC_CAST(VerseKey, y);
+	v = SWDYNAMIC_CAST(TreeKeyIdx, y);
+//	v = SWDYNAMIC_CAST(ListKey, y);
+	std::cout << std::endl;
+	if (v)
+		std::cout << (const char *)(*v);
+	else
+		std::cout << "cast failed\n";
+
+	std::cout << std::endl;
+	std::cout << std::endl;
+	return 0;
+}
diff --git a/tests/ciphertest.cpp b/tests/ciphertest.cpp
new file mode 100644
index 0000000..5c5936a
--- /dev/null
+++ b/tests/ciphertest.cpp
@@ -0,0 +1,54 @@
+/******************************************************************************
+ *
+ *  ciphertest.cpp -	
+ *
+ * $Id: ciphertest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2005-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <cipherfil.h>
+#include <filemgr.h>
+#include <swbuf.h>
+#include <iostream>
+
+using namespace sword;
+
+int main(int argc, char **argv) {
+	
+	if (argc != 3) {
+		std::cerr << "usage: " << *argv << " <key> <0-encipher|1-decipher>\n";
+		return -1;
+	}
+
+	
+	long encipher = atoi(argv[2]);
+
+	SWFilter *filter = new CipherFilter(argv[1]);
+
+	SWBuf text;
+	char buf[4096];
+	std::cin >> buf;
+	text = buf;
+
+	filter->processText(text, (SWKey *)encipher);
+
+	std::cout << text;
+	
+
+	
+	return 0;
+}
diff --git a/tests/complzss.cpp b/tests/complzss.cpp
new file mode 100644
index 0000000..923354b
--- /dev/null
+++ b/tests/complzss.cpp
@@ -0,0 +1,132 @@
+/******************************************************************************
+ *
+ *  complzss.cpp -	
+ *
+ * $Id: complzss.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <lzsscomprs.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+class FileCompress: public LZSSCompress {
+	int ifd;
+	int ofd;
+	int ufd;
+	int zfd;
+public:
+	FileCompress(char *);
+	~FileCompress();
+	unsigned long GetChars(char *, unsigned long len);
+	unsigned long SendChars(char *, unsigned long len);
+	void Encode();
+	void Decode();
+};
+
+
+FileCompress::FileCompress(char *fname) 
+{
+	char buf[256];
+
+	ufd  = FileMgr::createPathAndFile(fname);
+
+	sprintf(buf, "%s.lzs", fname);
+	zfd = FileMgr::createPathAndFile(buf);
+}
+
+	
+FileCompress::~FileCompress() 
+{
+	close(ufd);
+	close(zfd);
+}
+
+
+unsigned long FileCompress::GetChars(char *buf, unsigned long len) 
+{
+	return read(ifd, buf, len);
+}
+
+
+unsigned long FileCompress::SendChars(char *buf, unsigned long len) 
+{
+	return write(ofd, buf, len);
+}
+
+
+void FileCompress::Encode() 
+{
+	ifd = ufd;
+	ofd = zfd;
+
+	LZSSCompress::Encode();
+}
+
+
+void FileCompress::Decode() 
+{
+	ifd = zfd;
+	ofd = ufd;
+
+	LZSSCompress::Decode();
+}
+
+
+int main(int argc, char **argv)
+{
+	int decomp = 0;
+	SWCompress *fobj;
+	
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <filename|filename.lzs>\n", argv[0]);
+		exit(1);
+	}
+
+	if (strlen(argv[1]) > 4) {
+		if (!strcmp(&argv[1][strlen(argv[1])-4], ".lzs")) {
+			argv[1][strlen(argv[1])-4] = 0;
+			decomp = 1;
+		}
+	}
+			
+	fobj = new FileCompress(argv[1]);
+	
+	if (decomp)
+		fobj->Decode();
+	else fobj->Encode();
+
+	delete fobj;
+}
diff --git a/tests/compnone.cpp b/tests/compnone.cpp
new file mode 100644
index 0000000..b8e982d
--- /dev/null
+++ b/tests/compnone.cpp
@@ -0,0 +1,132 @@
+/******************************************************************************
+ *
+ *  compnone.cpp -	
+ *
+ * $Id: compnone.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <swcomprs.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+class FileCompress: public SWCompress {
+	int ifd;
+	int ofd;
+	int ufd;
+	int zfd;
+public:
+	FileCompress(char *);
+	~FileCompress();
+	unsigned long GetChars(char *, unsigned long len);
+	unsigned long SendChars(char *, unsigned long len);
+	void Encode();
+	void Decode();
+};
+
+
+FileCompress::FileCompress(char *fname) 
+{
+	char buf[256];
+
+	ufd  = FileMgr::createPathAndFile(fname);
+
+	sprintf(buf, "%s.zzz", fname);
+	zfd = FileMgr::createPathAndFile(buf);
+}
+
+	
+FileCompress::~FileCompress() 
+{
+	close(ufd);
+	close(zfd);
+}
+
+
+unsigned long FileCompress::GetChars(char *buf, unsigned long len) 
+{
+	return read(ifd, buf, len);
+}
+
+
+unsigned long FileCompress::SendChars(char *buf, unsigned long len) 
+{
+	return write(ofd, buf, len);
+}
+
+
+void FileCompress::Encode() 
+{
+	ifd = ufd;
+	ofd = zfd;
+
+	SWCompress::Encode();
+}
+
+
+void FileCompress::Decode() 
+{
+	ifd = zfd;
+	ofd = ufd;
+
+	SWCompress::Decode();
+}
+
+
+int main(int argc, char **argv)
+{
+	int decomp = 0;
+	SWCompress *fobj;
+	
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <filename|filename.zzz>\n", argv[0]);
+		exit(1);
+	}
+
+	if (strlen(argv[1]) > 4) {
+		if (!strcmp(&argv[1][strlen(argv[1])-4], ".zzz")) {
+			argv[1][strlen(argv[1])-4] = 0;
+			decomp = 1;
+		}
+	}
+			
+	fobj = new FileCompress(argv[1]);
+	
+	if (decomp)
+		fobj->Decode();
+	else fobj->Encode();
+
+	delete fobj;
+}
diff --git a/tests/compzip.cpp b/tests/compzip.cpp
new file mode 100644
index 0000000..7dd0cf2
--- /dev/null
+++ b/tests/compzip.cpp
@@ -0,0 +1,131 @@
+/******************************************************************************
+ *
+ *  compzip.cpp -	
+ *
+ * $Id: compzip.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <zipcomprs.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+class FileCompress: public ZipCompress {
+	int ifd;
+	int ofd;
+	int ufd;
+	int zfd;
+public:
+	FileCompress(char *);
+	~FileCompress();
+	unsigned long GetChars(char *, unsigned long len);
+	unsigned long SendChars(char *, unsigned long len);
+	void Encode();
+	void Decode();
+};
+
+
+FileCompress::FileCompress(char *fname) 
+{
+	char buf[256];
+
+	ufd  = FileMgr::createPathAndFile(fname);
+
+	sprintf(buf, "%s.zip", fname);
+	zfd = FileMgr::createPathAndFile(buf);
+}
+
+	
+FileCompress::~FileCompress() 
+{
+	close(ufd);
+	close(zfd);
+}
+
+
+unsigned long FileCompress::GetChars(char *buf, unsigned long len) 
+{
+	return read(ifd, buf, len);
+}
+
+
+unsigned long FileCompress::SendChars(char *buf, unsigned long len) 
+{
+	return write(ofd, buf, len);
+}
+
+
+void FileCompress::Encode() 
+{
+	ifd = ufd;
+	ofd = zfd;
+
+	ZipCompress::Encode();
+}
+
+
+void FileCompress::Decode() 
+{
+	ifd = zfd;
+	ofd = ufd;
+
+	ZipCompress::Decode();
+}
+
+
+int main(int argc, char **argv)
+{
+	int decomp = 0;
+	SWCompress *fobj;
+	
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <filename|filename.zip>\n", argv[0]);
+		exit(1);
+	}
+
+	if (strlen(argv[1]) > 4) {
+		if (!strcmp(&argv[1][strlen(argv[1])-4], ".zip")) {
+			argv[1][strlen(argv[1])-4] = 0;
+			decomp = 1;
+		}
+	}
+			
+	fobj = new FileCompress(argv[1]);
+	
+	if (decomp)
+		fobj->Decode();
+	else fobj->Encode();
+
+	delete fobj;
+	return 0;
+}
diff --git a/tests/configtest.cpp b/tests/configtest.cpp
new file mode 100644
index 0000000..d196f07
--- /dev/null
+++ b/tests/configtest.cpp
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ *  configtest.cpp -	
+ *
+ * $Id: configtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <swconfig.h>
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWConfig;
+#endif
+
+int main(int argc, char **argv) {
+    SWConfig config("./test1.conf");
+    config["Section1"]["Entry1"] = "Value1";
+    config["Section1"]["Entry2"] = "oops";
+    config["Section1"]["Entry2"] = "Value2";
+    config.Save();
+    SWConfig config2("./test1.conf");
+    std::cout << "Should be Value2: " << config2["Section1"]["Entry2"] << std::endl;
+    return 0;
+}
diff --git a/tests/cppunit/Makefile.am b/tests/cppunit/Makefile.am
new file mode 100644
index 0000000..2443be2
--- /dev/null
+++ b/tests/cppunit/Makefile.am
@@ -0,0 +1,16 @@
+LDADD = $(top_builddir)/lib/libsword.la
+
+# Rules for the test code (use `make check` to execute)
+if HAVE_CPPUNIT
+TESTS = LibSword
+else
+TESTS =
+endif
+check_PROGRAMS = $(TESTS)
+LibSword_SOURCES = main.cpp stringmgr_test.cpp swbuf_test.cpp url_test.cpp versekey_test.cpp 
+LibSword_CXXFLAGS = $(CPPUNIT_CFLAGS) -I$(top_srcdir)/include
+LibSword_LDFLAGS = $(CPPUNIT_LIBS)
+
+swcppunitpdir = $(top_srcdir)/tests/cppunit
+
+#all: check
diff --git a/tests/cppunit/Makefile.in b/tests/cppunit/Makefile.in
new file mode 100644
index 0000000..e6d5aa9
--- /dev/null
+++ b/tests/cppunit/Makefile.in
@@ -0,0 +1,1074 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@HAVE_CPPUNIT_TRUE@TESTS = LibSword$(EXEEXT)
+check_PROGRAMS = $(am__EXEEXT_1)
+subdir = tests/cppunit
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp $(top_srcdir)/test-driver
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@HAVE_CPPUNIT_TRUE@am__EXEEXT_1 = LibSword$(EXEEXT)
+am_LibSword_OBJECTS = LibSword-main.$(OBJEXT) \
+	LibSword-stringmgr_test.$(OBJEXT) \
+	LibSword-swbuf_test.$(OBJEXT) LibSword-url_test.$(OBJEXT) \
+	LibSword-versekey_test.$(OBJEXT)
+LibSword_OBJECTS = $(am_LibSword_OBJECTS)
+LibSword_LDADD = $(LDADD)
+LibSword_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+LibSword_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(LibSword_CXXFLAGS) \
+	$(CXXFLAGS) $(LibSword_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(LibSword_SOURCES)
+DIST_SOURCES = $(LibSword_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+LDADD = $(top_builddir)/lib/libsword.la
+LibSword_SOURCES = main.cpp stringmgr_test.cpp swbuf_test.cpp url_test.cpp versekey_test.cpp 
+LibSword_CXXFLAGS = $(CPPUNIT_CFLAGS) -I$(top_srcdir)/include
+LibSword_LDFLAGS = $(CPPUNIT_LIBS)
+swcppunitpdir = $(top_srcdir)/tests/cppunit
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/cppunit/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign tests/cppunit/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-checkPROGRAMS:
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+LibSword$(EXEEXT): $(LibSword_OBJECTS) $(LibSword_DEPENDENCIES) $(EXTRA_LibSword_DEPENDENCIES) 
+	@rm -f LibSword$(EXEEXT)
+	$(AM_V_CXXLD)$(LibSword_LINK) $(LibSword_OBJECTS) $(LibSword_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibSword-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibSword-stringmgr_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibSword-swbuf_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibSword-url_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/LibSword-versekey_test.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+LibSword-main.o: main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.o -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='main.cpp' object='LibSword-main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
+
+LibSword-main.obj: main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-main.obj -MD -MP -MF $(DEPDIR)/LibSword-main.Tpo -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-main.Tpo $(DEPDIR)/LibSword-main.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='main.cpp' object='LibSword-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
+
+LibSword-stringmgr_test.o: stringmgr_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.o -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='stringmgr_test.cpp' object='LibSword-stringmgr_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.o `test -f 'stringmgr_test.cpp' || echo '$(srcdir)/'`stringmgr_test.cpp
+
+LibSword-stringmgr_test.obj: stringmgr_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-stringmgr_test.obj -MD -MP -MF $(DEPDIR)/LibSword-stringmgr_test.Tpo -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-stringmgr_test.Tpo $(DEPDIR)/LibSword-stringmgr_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='stringmgr_test.cpp' object='LibSword-stringmgr_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-stringmgr_test.obj `if test -f 'stringmgr_test.cpp'; then $(CYGPATH_W) 'stringmgr_test.cpp'; else $(CYGPATH_W) '$(srcdir)/stringmgr_test.cpp'; fi`
+
+LibSword-swbuf_test.o: swbuf_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.o -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='swbuf_test.cpp' object='LibSword-swbuf_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.o `test -f 'swbuf_test.cpp' || echo '$(srcdir)/'`swbuf_test.cpp
+
+LibSword-swbuf_test.obj: swbuf_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-swbuf_test.obj -MD -MP -MF $(DEPDIR)/LibSword-swbuf_test.Tpo -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-swbuf_test.Tpo $(DEPDIR)/LibSword-swbuf_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='swbuf_test.cpp' object='LibSword-swbuf_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-swbuf_test.obj `if test -f 'swbuf_test.cpp'; then $(CYGPATH_W) 'swbuf_test.cpp'; else $(CYGPATH_W) '$(srcdir)/swbuf_test.cpp'; fi`
+
+LibSword-url_test.o: url_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.o -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='url_test.cpp' object='LibSword-url_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.o `test -f 'url_test.cpp' || echo '$(srcdir)/'`url_test.cpp
+
+LibSword-url_test.obj: url_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-url_test.obj -MD -MP -MF $(DEPDIR)/LibSword-url_test.Tpo -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-url_test.Tpo $(DEPDIR)/LibSword-url_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='url_test.cpp' object='LibSword-url_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-url_test.obj `if test -f 'url_test.cpp'; then $(CYGPATH_W) 'url_test.cpp'; else $(CYGPATH_W) '$(srcdir)/url_test.cpp'; fi`
+
+LibSword-versekey_test.o: versekey_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.o -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='versekey_test.cpp' object='LibSword-versekey_test.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.o `test -f 'versekey_test.cpp' || echo '$(srcdir)/'`versekey_test.cpp
+
+LibSword-versekey_test.obj: versekey_test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -MT LibSword-versekey_test.obj -MD -MP -MF $(DEPDIR)/LibSword-versekey_test.Tpo -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LibSword-versekey_test.Tpo $(DEPDIR)/LibSword-versekey_test.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='versekey_test.cpp' object='LibSword-versekey_test.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(LibSword_CXXFLAGS) $(CXXFLAGS) -c -o LibSword-versekey_test.obj `if test -f 'versekey_test.cpp'; then $(CYGPATH_W) 'versekey_test.cpp'; else $(CYGPATH_W) '$(srcdir)/versekey_test.cpp'; fi`
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+	  fi; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	else \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
+	    else \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+	    fi; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
+	    else \
+	      color_start= color_end=; \
+	    fi; \
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
+
+check-TESTS:
+	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
+	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+LibSword.log: LibSword$(EXEEXT)
+	@p='LibSword$(EXEEXT)'; \
+	b='LibSword'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
+
+
+#all: check
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/tests/cppunit/main.cpp b/tests/cppunit/main.cpp
new file mode 100644
index 0000000..9c740d5
--- /dev/null
+++ b/tests/cppunit/main.cpp
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  main.cpp -	LibSword tests
+ *
+ * $Id: main.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//CppUnit includes
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/CompilerOutputter.h>
+
+#include <iostream>
+
+int main( int argc, char* argv[] ) {
+	CppUnit::TextUi::TestRunner runner;
+	CppUnit::TestFactoryRegistry &registry = CppUnit::TestFactoryRegistry::getRegistry();
+	runner.addTest( registry.makeTest() );
+
+ // Change the default outputter to a compiler error format outputter 
+   // uncomment the following line if you need a compiler outputter.
+      runner.setOutputter(new CppUnit::CompilerOutputter( &runner.result(), std::cout ) );
+
+   //runner.setOutputter( new CppUnit::XmlOutputter( &runner.result(),
+   //                                                    std::cerr ) );
+		
+  	bool success = runner.run();	
+	return success ? 0 : -1;
+ }
diff --git a/tests/cppunit/stringmgr_test.cpp b/tests/cppunit/stringmgr_test.cpp
new file mode 100644
index 0000000..3383b52
--- /dev/null
+++ b/tests/cppunit/stringmgr_test.cpp
@@ -0,0 +1,65 @@
+/******************************************************************************
+ *
+ *  stringmgr_test.cpp -	
+ *
+ * $Id: stringmgr_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <iostream>
+
+#include "stringmgr.h"
+
+using namespace sword;
+using namespace std;
+
+class StringMgrTest : public CppUnit::TestFixture  {
+CPPUNIT_TEST_SUITE( StringMgrTest );
+CPPUNIT_TEST( testUpperLatin1 );
+CPPUNIT_TEST( testUpperUTF8 );
+CPPUNIT_TEST_SUITE_END();
+
+public:
+	void setUp() {
+	}	
+	void tearDown()  {
+	}
+	
+	void testUpperLatin1() {	
+		StringMgr* mgr = StringMgr::getSystemStringMgr();
+		
+		CPPUNIT_ASSERT( !strcmp(mgr->upperLatin1(""), "") );
+		
+		char t[10] = "Test!";
+		const char* ret = mgr->upperLatin1(t);
+		cout << ret << endl;
+		CPPUNIT_ASSERT( ret && !strcmp(ret, "TEST!") );
+	}
+	
+	void testUpperUTF8() {
+		StringMgr* mgr = StringMgr::getSystemStringMgr();
+		if (mgr->hasUTF8Support()) {
+			char t[10] = "hi";
+			char* ret = mgr->upperUTF8(t);
+			CPPUNIT_ASSERT( ret && !strcmp(ret, "HI") );
+		}	
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(StringMgrTest);
diff --git a/tests/cppunit/swbuf_test.cpp b/tests/cppunit/swbuf_test.cpp
new file mode 100644
index 0000000..9e6df3d
--- /dev/null
+++ b/tests/cppunit/swbuf_test.cpp
@@ -0,0 +1,135 @@
+/******************************************************************************
+ *
+ *  swbuf_test.cpp -	
+ *
+ * $Id: swbuf_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <iostream>
+
+#include "swbuf.h"
+using namespace sword;
+using namespace std;
+
+class SWBufTest : public CppUnit::TestFixture  {
+CPPUNIT_TEST_SUITE( SWBufTest );
+CPPUNIT_TEST( testEquality );
+CPPUNIT_TEST( testAppendString );
+CPPUNIT_TEST( testAppendChar );
+CPPUNIT_TEST( testInsertString );
+CPPUNIT_TEST( testInsertChar );
+CPPUNIT_TEST_SUITE_END();
+
+public:
+	void setUp() {
+	}	
+	void tearDown()  {
+	}
+
+	void testEquality() {
+		SWBuf s1("Hi, this is a test!");
+		SWBuf s2("Hi, this is a test!");
+		
+		CPPUNIT_ASSERT( s1 == s2 );
+		CPPUNIT_ASSERT( s1 == "Hi, this is a test!" );
+		CPPUNIT_ASSERT( !(s1 == "Hi, this is a wrong test!") );
+	}
+	void testAppendString() {
+		SWBuf t;
+		
+		for (int i = 0; i < 5000; ++i) {
+			t.append("a");
+			t.append("b");
+			t.append("ccccc",1);
+		}		
+		CPPUNIT_ASSERT( t.length() == 3*5000 );
+		
+		char c = 'a';
+		for (int i = 0; i < 5000; ++i) { //check whether the append calls worked right
+			CPPUNIT_ASSERT( t[i] == c );
+			
+			c = (c=='a') ? 'b' : ((c=='b') ? 'c' : 'a');
+		}
+	}
+	void testAppendChar() {
+		SWBuf t;
+		
+		for (int i = 0; i < 5000; ++i) {
+			t.append('a');
+			t.append('b');
+			t.append('c');
+		}		
+		CPPUNIT_ASSERT( t.length() == 3*5000 );
+		
+		char c = 'a';
+		for (int i = 0; i < 5000; ++i) { //check whether the append calls worked right
+			CPPUNIT_ASSERT( t[i] == c );
+			
+			c = (c=='a') ? 'b' : ((c=='b') ? 'c' : 'a');
+		}
+	}
+	
+	void testInsertString() {
+		SWBuf t = "end";
+		
+		for (int i = 0; i < 5000; ++i) {
+			t.insert(0, "a");
+			t.insert(1, "b");
+			t.insert(2, "ccccccc", 0, 1); //only one c
+		}		
+		CPPUNIT_ASSERT( t.length() == 3*5000+3 );
+		
+		char c = 'a';
+		for (int i = 0; i < 5000; ++i) { //check whether the append calls worked right
+			CPPUNIT_ASSERT( t[i] == c );
+			
+			c = (c=='a') ? 'b' : ((c=='b') ? 'c' : 'a');
+		}
+		//check if end is at the end
+		CPPUNIT_ASSERT( t[3*5000+0] == 'e');
+		CPPUNIT_ASSERT( t[3*5000+1] == 'n');
+		CPPUNIT_ASSERT( t[3*5000+2] == 'd');
+	}
+	
+	void testInsertChar() {
+		SWBuf t = "end";
+		
+		for (int i = 0; i < 5000; ++i) {
+			t.insert(0, 'a');
+			t.insert(1, 'b');
+			t.insert(2, 'c');
+		}		
+		CPPUNIT_ASSERT( t.length() == 3*5000+3 );
+		
+		char c = 'a';
+		for (int i = 0; i < 5000; ++i) { //check whether the insert calls worked right
+			CPPUNIT_ASSERT( t[i] == c );
+			
+			c = (c=='a') ? 'b' : ((c=='b') ? 'c' : 'a');
+		}
+		//check if end is at the end
+		CPPUNIT_ASSERT( t[3*5000+0] == 'e');
+		CPPUNIT_ASSERT( t[3*5000+1] == 'n');
+		CPPUNIT_ASSERT( t[3*5000+2] == 'd');
+	}	
+	
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(SWBufTest);
diff --git a/tests/cppunit/url_test.cpp b/tests/cppunit/url_test.cpp
new file mode 100644
index 0000000..18cf6a8
--- /dev/null
+++ b/tests/cppunit/url_test.cpp
@@ -0,0 +1,130 @@
+/******************************************************************************
+ *
+ *  url_test.cpp -	
+ *
+ * $Id: url_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <iostream>
+
+#include "url.h"
+
+using namespace sword;
+using namespace std;
+
+class URLTest : public CppUnit::TestFixture  {
+CPPUNIT_TEST_SUITE( URLTest );
+CPPUNIT_TEST( testProtocol );
+CPPUNIT_TEST( testHostName );
+CPPUNIT_TEST( testPath );
+CPPUNIT_TEST( testParametersMap );
+CPPUNIT_TEST( testParameterValue );
+CPPUNIT_TEST( testEncode );
+CPPUNIT_TEST( testDecode );
+CPPUNIT_TEST_SUITE_END();
+
+private:
+	sword::URL* m_url1;
+	sword::URL* m_url2;
+	sword::URL* m_url3;
+	
+public:
+	void setUp() {
+		m_url1 = new sword::URL("http://www.crosswire.org/index.jsp?page=help&user=foo&name=bar");
+		m_url2 = new sword::URL("ftp://ftp.crosswire.org/sword/wiki/index.jsp?page=help&amp;user=foo&amp;name=foo%20bar");
+		m_url3 = new sword::URL("crosswire.org/index.jsp");
+	}	
+	void tearDown()  {
+		delete m_url1;
+		delete m_url2;
+		delete m_url3;
+	}
+	
+	void testProtocol()
+	{
+		CPPUNIT_ASSERT( !strcmp(m_url1->getProtocol(), "http") );
+		CPPUNIT_ASSERT( !strcmp(m_url2->getProtocol(), "ftp") );
+		CPPUNIT_ASSERT( m_url3->getProtocol() && strlen( m_url3->getProtocol() ) == 0 );
+	}
+	
+	void testHostName()
+	{
+		CPPUNIT_ASSERT( !strcmp(m_url1->getHostName(), "www.crosswire.org") );
+		CPPUNIT_ASSERT( !strcmp(m_url2->getHostName(), "ftp.crosswire.org") );
+		CPPUNIT_ASSERT( !strcmp(m_url3->getHostName(), "crosswire.org") );
+	}
+
+	void testPath()
+	{
+		CPPUNIT_ASSERT( !strcmp(m_url1->getPath(), "/index.jsp") );
+		CPPUNIT_ASSERT( !strcmp(m_url2->getPath(), "/sword/wiki/index.jsp") );
+		CPPUNIT_ASSERT( !strcmp(m_url3->getPath(), "/index.jsp") );
+	}
+
+	void testParametersMap()
+	{	
+ 		std::map< sword::SWBuf, sword::SWBuf > params = m_url1->getParameters();
+		CPPUNIT_ASSERT( !strcmp(params[sword::SWBuf("page")].c_str(), "help") );
+		CPPUNIT_ASSERT( !strcmp(params[sword::SWBuf("user")].c_str(),  "foo") );
+		CPPUNIT_ASSERT( !strcmp(params[sword::SWBuf("name")].c_str(), "bar") );
+	
+ 		params = m_url2->getParameters(); //test url2 params
+		CPPUNIT_ASSERT( !strcmp(params[sword::SWBuf("page")].c_str(), "help") );
+		CPPUNIT_ASSERT( !strcmp(params[sword::SWBuf("user")].c_str(),  "foo") );
+		CPPUNIT_ASSERT( !strcmp(params[sword::SWBuf("name")].c_str(), "foo bar") );
+	
+ 		params = m_url3->getParameters(); //test url3 params
+		CPPUNIT_ASSERT( params.size() == 0 );
+	}
+	
+	void testParameterValue()
+	{	
+ 		CPPUNIT_ASSERT( !strcmp(m_url1->getParameterValue("page"), "help") );
+		CPPUNIT_ASSERT( !strcmp(m_url1->getParameterValue("user"), "foo") );
+		CPPUNIT_ASSERT( !strcmp(m_url1->getParameterValue("name"), "bar") );
+		
+		CPPUNIT_ASSERT( !strcmp(m_url2->getParameterValue("page"), "help") );
+		CPPUNIT_ASSERT( !strcmp(m_url2->getParameterValue("user"), "foo") );
+		CPPUNIT_ASSERT( !strcmp(m_url2->getParameterValue("name"), "foo bar") );
+		
+		CPPUNIT_ASSERT( m_url3->getParameterValue("page") && strlen(m_url3->getParameterValue("page")) == 0 );
+	}	
+
+	void testEncode() {	
+		cout << URL::encode("this is a test") << endl;
+		
+		SWBuf encoded = URL::encode("this is a test");
+		CPPUNIT_ASSERT( !strcmp(encoded.c_str(), "this%20is%20a%20test") || !strcmp(encoded.c_str(), "this+is+a+test") );
+
+		CPPUNIT_ASSERT( !strcmp(URL::encode("this-is-a-test").c_str(), "this-is-a-test") );
+		CPPUNIT_ASSERT( !strcmp(URL::encode("").c_str(), "") );
+	}
+	
+	void testDecode() {
+		CPPUNIT_ASSERT( !strcmp(URL::decode("this%3Eis%3Ea%3Etest").c_str(), "this>is>a>test") );
+		CPPUNIT_ASSERT( !strcmp(URL::decode("this%3Eis%3Ea%3Etest%3E").c_str(), "this>is>a>test>") );
+		CPPUNIT_ASSERT( !strcmp(URL::decode("%3E%3E%3E%3E%3E%3E%3E%3E%3E%3E%20%20%20%20%20").c_str(), ">>>>>>>>>>     ") );
+		CPPUNIT_ASSERT( !strcmp(URL::decode("nothing%20").c_str(), "nothing ") );
+		CPPUNIT_ASSERT( !strcmp(URL::decode("nothing").c_str(), "nothing") );
+		CPPUNIT_ASSERT( !strcmp(URL::decode("").c_str(), "") );
+	}
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(URLTest);
diff --git a/tests/cppunit/versekey_test.cpp b/tests/cppunit/versekey_test.cpp
new file mode 100644
index 0000000..1c204b7
--- /dev/null
+++ b/tests/cppunit/versekey_test.cpp
@@ -0,0 +1,302 @@
+/******************************************************************************
+ *
+ *  versekey_test.cpp -	
+ *
+ * $Id: versekey_test.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <cppunit/extensions/HelperMacros.h>
+
+#include <iostream>
+
+#include "localemgr.h"
+#include "swbuf.h"
+#include "versekey.h"
+
+using namespace sword;
+using namespace std;
+
+class VerseKeyTest : public CppUnit::TestFixture  {
+CPPUNIT_TEST_SUITE( VerseKeyTest );
+
+CPPUNIT_TEST( testSingleKeyParsing );
+CPPUNIT_TEST( testRangeKeyParsing );
+CPPUNIT_TEST( testListKeyParsing );
+
+CPPUNIT_TEST( testLessThan );
+CPPUNIT_TEST( testLessEqualThan );
+CPPUNIT_TEST( testEquality );
+CPPUNIT_TEST( testGreaterEqualThan );
+CPPUNIT_TEST( testGreaterThan );
+
+CPPUNIT_TEST( testDecrement );
+CPPUNIT_TEST( testIncrement );
+
+CPPUNIT_TEST_SUITE_END();
+
+protected:
+	SWBuf parseKey(const char* keyValue, const char* locale) {
+		sword::VerseKey vk;
+		vk.setLocale(locale);
+		vk.setText(keyValue);
+				
+		SWBuf ret( vk.getText() );
+		//std::cout << ret.c_str();
+		return ret;
+	};
+
+	SWBuf parseRangeKey(const char* keyValue, const char* locale) {
+		const char* oldLocale = LocaleMgr::getSystemLocaleMgr()->getDefaultLocaleName();
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale);
+
+		SWBuf ret;
+		
+		VerseKey DefaultVSKey;
+        	DefaultVSKey = "jas3:1";
+
+        	ListKey verses = DefaultVSKey.ParseVerseList(keyValue, DefaultVSKey, true);
+
+		for (int i = 0; i < verses.Count(); i++) {
+			VerseKey *element = dynamic_cast<VerseKey *>(verses.GetElement(i));
+			if (element) {
+				if (ret.length()) {
+					ret.append(" ");
+				}
+				
+				ret.appendFormatted( "%s - %s;", (const char*)element->LowerBound(), (const char*)element->UpperBound() );
+			}
+			else {
+				if (ret.length()) {
+					ret.append(" ");
+				}
+				
+				ret.appendFormatted("%s;", (const char *)*verses.GetElement(i));
+			}
+		}
+		
+// 		cout << ret.c_str() << endl;
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(oldLocale);
+		return ret;
+	};
+		
+public:
+	void setUp() {
+/*		m_vk1 = new sword::VerseKey();
+		m_vk2 = new sword::VerseKey();
+		m_vk3 = new sword::VerseKey();
+		
+		setLocaleToAll("en");*/
+	}	
+	void tearDown()  {
+/*		delete m_vk1;
+		delete m_vk2;
+		delete m_vk3;*/
+	}
+	
+	void testSingleKeyParsing() {
+		//testing with I John 2:3 and locale en
+		CPPUNIT_ASSERT( parseKey("1jn.2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1 jn.2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("Ijn.2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I jn.2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "1jn 2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "1 jn 2.3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "Ijn 2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "I jn 2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "1jn.2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "1 jn.2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "Ijn.2:3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "I jn.2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "1jn 2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "1 jn 2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey( "Ijn 2:3", "en") 		== "I John 2:3");
+		
+		CPPUNIT_ASSERT( parseKey("1.jn.2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn.2.3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn.2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn.2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1.jn 2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn 2.3", "en")		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn 2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn 2.3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1.jn.2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn.2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn.2:3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn.2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1.jn 2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn 2:3", "en") 	== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn 2:3", "en") 		== "I John 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn 2:3", "en") 	== "I John 2:3");
+		
+	
+		//testing the same with german locale
+		CPPUNIT_ASSERT( parseKey("1jn.2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1 jn.2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("Ijn.2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I jn.2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "1jn 2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "1 jn 2.3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "Ijn 2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "I jn 2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "1jn.2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "1 jn.2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "Ijn.2:3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "I jn.2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "1jn 2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "1 jn 2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey( "Ijn 2:3", "de") 		== "1. Johannes 2:3");
+		
+		CPPUNIT_ASSERT( parseKey("1.jn.2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn.2.3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn.2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn.2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1.jn 2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn 2.3", "de")		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn 2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn 2.3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1.jn.2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn.2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn.2:3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn.2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1.jn 2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("1. jn 2:3", "de") 	== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I.jn 2:3", "de") 		== "1. Johannes 2:3");
+		CPPUNIT_ASSERT( parseKey("I. jn 2:3", "de") 	== "1. Johannes 2:3");	
+	}
+
+	void testRangeKeyParsing() {
+		//some range tests with the english locale
+		CPPUNIT_ASSERT( parseRangeKey("I. jn 1:1 - 3:10", "en") 	== "I John 1:1 - I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 - 3:10", "en") 		== "I John 1:1 - I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 -3:10", "en") 		== "I John 1:1 - I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1- 3:10", "en") 		== "I John 1:1 - I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1- 3:10", "en") 		== "I John 1:1 - I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1 -3:10", "en") 		== "I John 1:1 - I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 -3:10; 1Jn 3:11", "en") 		== "I John 1:1 - I John 3:10; I John 3:11;");
+
+		//some range tests with german locale
+		CPPUNIT_ASSERT( parseRangeKey("I. jn 1:1 - 3:10", "de") 			== "1. Johannes 1:1 - 1. Johannes 3:10;");	
+		CPPUNIT_ASSERT( parseRangeKey("1. Joh 1:1 - 3:10", "de") 			== "1. Johannes 1:1 - 1. Johannes 3:10;");	
+		CPPUNIT_ASSERT( parseRangeKey("1. Johannes 1:1- 3:10", "de") 	== "1. Johannes 1:1 - 1. Johannes 3:10;");	
+		CPPUNIT_ASSERT( parseRangeKey("1. Joh 1:1- 3:10", "de") 			== "1. Johannes 1:1 - 1. Johannes 3:10;");	
+		CPPUNIT_ASSERT( parseRangeKey("1. Johannes 1:1 -3:10", "de") 	== "1. Johannes 1:1 - 1. Johannes 3:10;");	
+		CPPUNIT_ASSERT( parseRangeKey("1. Joh 1:1 -3:10", "de") 			== "1. Johannes 1:1 - 1. Johannes 3:10;");
+	}
+
+	void testListKeyParsing() {
+		//some range tests with the english locale
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 3:10", "en") 	== "I John 1:1; I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1  3:10", "en") 	== "I John 1:1; I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1,3:10", "en") 	== "I John 1:1; I John 3:10;"); 
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1, 3:10", "en") 	== "I John 1:1; I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 ,3:10", "en") 	== "I John 1:1; I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 , 3:10", "en") 	== "I John 1:1; I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1;3:10", "en") 	== "I John 1:1; I John 3:10;");  
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1; 3:10", "en") 	== "I John 1:1; I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 ;3:10", "en") 	== "I John 1:1; I John 3:10;");
+		CPPUNIT_ASSERT( parseRangeKey("1Jn 1:1 ; 3:10", "en") 	== "I John 1:1; I John 3:10;");
+	}
+	
+	void testLessThan() {
+		VerseKey vk1("Luke 1:1");
+		VerseKey vk2("Luke 1:1");
+		VerseKey vk3("Luke 1:2");
+		
+		CPPUNIT_ASSERT( !(vk1 < vk2) );
+		CPPUNIT_ASSERT( vk1 < vk3 );
+
+		for (int n = 0; n < 30; n++) {//some more stress :)
+			vk1 = "Luke 1:1";
+			vk3 = vk1;
+			
+			for (int j = 0; j < 30; ++j) {
+				vk1--;
+				CPPUNIT_ASSERT( vk1 < vk3 );
+				CPPUNIT_ASSERT( vk1 < VerseKey("Revelation") );
+				CPPUNIT_ASSERT( !(vk1 < VerseKey("Gen")) );
+			}
+		}
+	}
+	void testLessEqualThan() {
+		VerseKey vk1("Luke 1:1");
+		VerseKey vk2("Luke 1:1");
+		VerseKey vk3("Luke 1:2");
+		
+		CPPUNIT_ASSERT( vk1 <= vk2 );
+		CPPUNIT_ASSERT( vk1 <= vk3 );
+	
+		for (int n = 0; n < 30; n++) { //some more stress
+			vk1 = "Luke 1:1";
+			vk3 = vk1;
+			
+			for (int j = 0; j < 30; ++j) {
+				CPPUNIT_ASSERT( vk1 <= vk3 );
+				CPPUNIT_ASSERT( vk1 <= VerseKey("Revelation") );
+				CPPUNIT_ASSERT( !(vk1 <= VerseKey("Gen")) );
+				
+				vk1--;
+			}
+		}
+	}
+	void testEquality() {
+		VerseKey vk1("Luke 1:1");
+		VerseKey vk2("Luke 1:1");
+		VerseKey vk3("Luke 1:2");
+		
+		CPPUNIT_ASSERT( vk1 == vk2 );
+		CPPUNIT_ASSERT( !(vk1 == vk3) );
+	}
+	void testGreaterEqualThan() {
+		VerseKey vk1("Luke 1:3");
+		VerseKey vk2("Luke 1:3");
+		VerseKey vk3("Luke 1:1");
+		
+		CPPUNIT_ASSERT( vk1 >= vk2 );
+		CPPUNIT_ASSERT( vk1 >= vk3 );
+	}
+	void testGreaterThan() {
+		VerseKey vk1("Luke 1:3");
+		VerseKey vk2("Luke 1:1");
+		VerseKey vk3("Luke 1:2");
+		
+		CPPUNIT_ASSERT( vk1 > vk2 );
+		CPPUNIT_ASSERT( vk1 > vk3 );
+	}
+
+	void testDecrement() {
+		VerseKey vk("Matthew 1:1");
+		const int delta = 10;
+		
+		for (int i =0; i < delta; ++i) {
+			vk--;
+		}
+		CPPUNIT_ASSERT( vk == VerseKey("Mal 3:15") );
+	}
+	void testIncrement() {
+		VerseKey vk("Mal 3:15");
+		const int delta = 10;
+		
+		for (int i =0; i < delta; ++i) {
+			vk++;
+		}
+		CPPUNIT_ASSERT( vk == VerseKey("Matthew 1:1") );
+	}
+
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(VerseKeyTest);
diff --git a/tests/filtertest.cpp b/tests/filtertest.cpp
new file mode 100644
index 0000000..c6cfd4e
--- /dev/null
+++ b/tests/filtertest.cpp
@@ -0,0 +1,89 @@
+/******************************************************************************
+ *
+ *  filtertest.cpp -	
+ *
+ * $Id: filtertest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <swbuf.h>
+#include <filemgr.h>
+#include <papyriplain.h>
+#include <utf8utf16.h>
+#include <rtfhtml.h>
+#include <sysdata.h>
+//#include <swmgr.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+using namespace std;
+
+
+int main(int argc, char **argv) {
+//	UTF8UTF16 filter;
+	RTFHTML filter;
+//	PapyriPlain filter;
+//
+	FileDesc *fd = (argc > 1) ? FileMgr::getSystemFileMgr()->open(argv[1], FileMgr::RDONLY) : 0;
+
+	SWBuf lineBuffer = "T\\u12345?his is t<e>xt which has papy-\nri markings in it.\n  L[et's be] sure it gets--\n cleaned up well for s(earching)";
+
+	if (argc > 1 && !strcmp(argv[1], "-v")) {
+		std::cout << "Original:\n\n";
+
+		while (!fd || FileMgr::getLine(fd, lineBuffer)) {
+			cout << lineBuffer << "\n";
+			if (!fd) break;
+		}
+
+		cout << "\n\n-------\n\n";
+	}
+
+	if (fd) {
+		FileMgr::getSystemFileMgr()->close(fd);
+		fd = FileMgr::getSystemFileMgr()->open(argv[1], FileMgr::RDONLY);
+	}
+
+//	cout << "\xff\xfe";	// UTF16LE file signature
+
+	while (!fd || FileMgr::getLine(fd, lineBuffer)) {
+		lineBuffer += "\n";
+		filter.processText(lineBuffer);
+
+//	Simply way to output byte stream
+		for (unsigned int i = 0; i < lineBuffer.size(); ++i) {
+			std::cout << lineBuffer[i];
+		}
+/*
+//	Example showing safe to cast to u16 stream
+		unsigned int size = lineBuffer.size() / 2;
+		__u16 *wcharBuf = (__u16 *)lineBuffer.getRawData();
+		for (unsigned int i = 0; i < size; ++i) {
+			std::wcout << (wchar_t)wcharBuf[i];	// must cast for correct output and because wchar_t is different size on linux we couldn't declare out wcharBuf a wchar_t *
+		}
+*/
+		if (!fd) break;
+	}
+
+	if (fd) {
+		FileMgr::getSystemFileMgr()->close(fd);
+	}
+
+	return 0;
+}
+
diff --git a/tests/icutest.cpp b/tests/icutest.cpp
new file mode 100644
index 0000000..e1f6038
--- /dev/null
+++ b/tests/icutest.cpp
@@ -0,0 +1,59 @@
+/******************************************************************************
+ *
+ *   icutest.cpp -	
+ *
+ * $Id: icutest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <string.h>
+
+#include "unicode/utypes.h"   /* Basic ICU data types */
+#include "unicode/ucnv.h"     /* C   Converter API    */
+#include "unicode/ustring.h"  /* some more string fcns*/
+
+#include "unicode/translit.h"
+
+using namespace std;
+
+int main() {
+
+  UChar * uBuf;
+  UChar * target;
+  UConverter *conv;
+  UErrorCode status = U_ZERO_ERROR;
+  int32_t uBufSize = 0, uLength = 0;
+  
+  const char * samplestring = "If this compiles and runs without errors, apparently ICU is working.";
+
+  uLength = strlen(samplestring);
+  conv = ucnv_open("utf-8", &status);		
+  uBufSize = (uLength/ucnv_getMinCharSize(conv));
+  uBuf = new UChar[uBufSize];
+  
+  target = uBuf;
+  
+  ucnv_toUChars(conv, target, uLength, 
+		samplestring, uLength, &status);
+
+  cout << samplestring << endl;
+
+  delete [] uBuf;
+
+  return 0;
+}
diff --git a/tests/indextest.cpp b/tests/indextest.cpp
new file mode 100644
index 0000000..6d0a670
--- /dev/null
+++ b/tests/indextest.cpp
@@ -0,0 +1,45 @@
+/******************************************************************************
+ *
+ *  indextest.cpp -	
+ *
+ * $Id: indextest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <iostream>
+#include <versekey.h>
+#include <swmodule.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	SWMgr mymgr;
+
+	SWModule *bbe = mymgr.Modules["BBE"];
+
+	if (bbe) {
+		VerseKey vk;
+		vk.setPersist(true);
+		bbe->setKey(vk);
+		for (; !bbe->popError(); (*bbe)++ ) {
+			std::cout << vk.getIndex() << std::endl; 
+		}
+	}
+	return 0;
+}
diff --git a/tests/installmgrtest.cpp b/tests/installmgrtest.cpp
new file mode 100644
index 0000000..aa3acfd
--- /dev/null
+++ b/tests/installmgrtest.cpp
@@ -0,0 +1,33 @@
+/******************************************************************************
+ *
+ *  installmgrtest.cpp -	
+ *
+ * $Id: installmgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swinstallmgr.h>
+#include <iostream>
+
+using namespace std;
+using namespace sword;
+
+int main(int argc, char **argv) {
+	InstallMgr inst("ftp://ftp.crosswire.org/pub/sword/raw");
+	inst.Refresh();
+
+}
diff --git a/tests/introtest.cpp b/tests/introtest.cpp
new file mode 100644
index 0000000..462b1c6
--- /dev/null
+++ b/tests/introtest.cpp
@@ -0,0 +1,132 @@
+/******************************************************************************
+ *
+ *  introtest.cpp -	
+ *
+ * $Id: introtest.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <iostream>
+#include <versekey.h>
+#include <rawtext.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	SWMgr mymgr;
+
+	RawText::createModule(".");
+	RawText mod(".");
+
+	VerseKey vk;
+	vk.setIntros(true);
+	vk.setAutoNormalize(false);
+	vk.setPersist(true);
+	mod.setKey(vk);
+
+	vk.setVerse(0);
+	vk.setChapter(0);
+	vk.setBook(0);
+	vk.setTestament(0);
+
+	mod << "Module heading text";
+
+	vk.setVerse(0);
+	vk.setChapter(0);
+	vk.setBook(0);
+	vk.setTestament(1);
+
+	mod << "OT heading text";
+
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(0);
+	vk.setVerse(0);
+
+	mod << "Gen heading text";
+
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(0);
+
+	mod << "Gen 1 heading text";
+
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(1);
+
+	mod << "Gen 1:1 text";
+
+	
+	vk.setTestament(0);
+	vk.setBook(0);
+	vk.setChapter(0);
+	vk.setVerse(0);
+
+	std::cout << "Module heading text ?= " << mod.renderText() << std::endl;
+
+	vk.setTestament(1);
+	vk.setBook(0);
+	vk.setChapter(0);
+	vk.setVerse(0);
+
+	std::cout << "OT heading text ?= " << mod.renderText() << std::endl;
+
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(0);
+	vk.setVerse(0);
+
+	std::cout << "Gen heading text ?= " << mod.renderText() << std::endl;
+
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(0);
+
+	std::cout << "Gen 1 heading text ?= " << mod.renderText() << std::endl;
+
+	vk.setTestament(1);
+	vk.setBook(1);
+	vk.setChapter(1);
+	vk.setVerse(1);
+
+	std::cout << "Gen 1:1 text ?= " << mod.renderText() << std::endl;
+
+	  /* old introtest
+	SWModule *mhc = mymgr.Modules["MHC"];
+
+	if (mhc) {
+		VerseKey vk;
+		vk.setIntros(true);
+		vk.setAutoNormalize(false);
+		vk.setPersist(true);
+		vk = "jas 0:0";
+		std::cout << vk << ":\n";
+		mhc->setKey(vk);
+		std::cout << (const char *) mhc->Key() << ":\n";
+		std::cout << (const char *) *mhc << "\n";
+	}
+	  */
+	return 0;
+}
+
+
diff --git a/tests/keycast.cpp b/tests/keycast.cpp
new file mode 100644
index 0000000..2da50c9
--- /dev/null
+++ b/tests/keycast.cpp
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  keycast.cpp -	
+ *
+ * $Id: keycast.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <iostream>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main (int argc, char* argv[]) {
+        SWMgr mgr;
+
+//the commented out code works
+/* 
+        StringList globalOptions = mgr.getGlobalOptions();
+        for (StringList::iterator it = globalOptions.begin(); it != globalOptions.end(); it++) {
+                std::cout << *it << std::endl;
+
+                StringList values = mgr.getGlobalOptionValues((*it).c_str());
+                for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
+                        std::cout << "\t"<< *it2 << std::endl;
+                }
+        }
+*/
+
+//crashes
+	StringList values = mgr.getGlobalOptionValues("Footnotes");
+        for (StringList::iterator it2 = values.begin(); it2 != values.end(); it2++) {
+              std::cout << "\t"<< *it2 << std::endl;
+        }    
+};
+
+
+
+
+
diff --git a/tests/keytest.cpp b/tests/keytest.cpp
new file mode 100644
index 0000000..9fbc841
--- /dev/null
+++ b/tests/keytest.cpp
@@ -0,0 +1,214 @@
+/******************************************************************************
+ *
+ *  keytest.cpp -	
+ *
+ * $Id: keytest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <iostream>
+#include <versekey.h>
+#include <rawtext.h>
+#include <rawcom.h>
+#include <echomod.h>
+#include <stdlib.h>
+
+#include <localemgr.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv)
+{
+	int loop;
+	int max;
+
+	VerseKey yo("Gen.1.1", "Gen.1.2");
+	std::cout << yo.getRangeText();
+	if (argc > 1)
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(argv[1]);
+
+	VerseKey	bla;
+	long index;
+
+
+	if (argc < 2) 
+		bla = "James    1:19";
+	else	bla = argv[2];
+
+	std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
+	std::cout << " (.Index(Index()+1))\n";
+
+	max = (argc < 4) ? 10 : atoi(argv[3]);
+
+	for (loop = 0; loop < max; loop++) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")";
+		bla.setIndex(index+1);
+		std::cout << "-> " << (const char *)bla << "\n";
+	}
+
+	std::cout << "-----------------\n";
+	std::cout << "\n (.Index(Index()-1))\n";
+	if (argc < 2) 
+		bla = "James    1:19";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")";
+		bla.setIndex(index-1);
+		std::cout << "-> " << (const char *)bla << "\n";
+	}
+
+	std::cout << "-----------------\n";
+	bla.setIntros(true);
+	std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
+	std::cout << " key++\n";
+
+	if (argc < 2) 
+		bla = "Matthew  1:5";
+	else	bla = argv[2];
+
+	for (loop = 0; loop < max && !bla.popError(); loop++,bla++) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "-----------------\n";
+	bla.setIntros(true);
+	std::cout << "\n Headings: " << (bool)bla.isIntros() << "\n";
+	std::cout << " key--\n";
+
+	if (argc < 2) 
+		bla = "Matthew  1:5";
+	else	bla = argv[2];
+
+	for (loop = max; loop && !bla.popError(); loop--, bla--) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "-----------------\n";
+
+	if (argc < 2) 
+		bla = "Genesis  1:5";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--, bla--) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "-----------------\n";
+
+	if (argc < 2) 
+		bla = "Malachi  4:2";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--, bla++) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "-----------------\n";
+
+	if (argc < 2) 
+		bla = "Revelation of John  22:17";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--, bla++) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+
+	std::cout << "-----------------\n";
+	std::cout << "-------- Headings ---------\n";
+
+	bla.setIntros(true);
+
+	if (argc < 2) 
+		bla = "Matthew  1:5";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--, bla--) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "-----------------\n";
+
+	if (argc < 2) 
+		bla = "Genesis  1:5";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--, bla--) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "-----------------\n";
+
+	if (argc < 2) 
+		bla = "Malachi  4:2";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--, bla++) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "-----------------\n";
+
+	if (argc < 2) 
+		bla = "Revelation of John  22:17";
+	else	bla = argv[2];
+
+	for (loop = max; loop; loop--, bla++) {
+		index = bla.getIndex();
+		std::cout << (const char *)bla << "(" << index << ")\n";
+	}
+
+	std::cout << "\n\n";
+
+	std::cout << "-------- Error Check ------------\n\n";
+	bla = "Revelation of John 23:19";
+	std::cout << "bla = \"Revelation of John 23:19\"\n";
+	std::cout << "(const char *)bla = " << (const char *)bla << "\n";
+	std::cout << "bla.popError() = " << (int)bla.popError() << " \n";
+	std::cout << "bla++ \n";
+	bla++;
+	std::cout << "bla.popError() = " << (int)bla.popError() << " \n";
+
+	bla.setIntros(false);
+	for (bla = BOTTOM; !bla.popError(); bla.setBook(bla.getBook()-1))
+		std::cout << (const char *)bla << "\n";
+	bla.setTestament(1);
+	bla = BOTTOM;
+	std::cout << bla.getTestamentIndex() << "\n";
+	std::cout << bla.getIndex() << "\n";
+	std::cout << bla << "\n";
+	bla.setTestament(2);
+	bla = BOTTOM;
+	std::cout << bla.getTestamentIndex() << "\n";
+	std::cout << bla.getIndex() << "\n";
+	std::cout << bla << "\n";
+	return 0;
+}
diff --git a/tests/lextest.cpp b/tests/lextest.cpp
new file mode 100644
index 0000000..8cf1535
--- /dev/null
+++ b/tests/lextest.cpp
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  lextest.cpp -	
+ *
+ * $Id: lextest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <rawld.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+using std::cout;
+using std::endl;
+
+int main(int argc, char **argv)
+{
+	RawLD::createModule("tmp/lextest");
+	RawLD lex("tmp/lextest");
+
+	lex.setKey("b");
+	lex << "entry for b";
+
+	lex.setKey("a");
+	lex << "entry for a";
+
+	lex = TOP;
+	cout << lex.getKeyText() << endl;
+	lex++;
+	cout << lex.getKeyText() << endl;
+
+	lex.setKey("a");
+	lex.deleteEntry();
+
+//	lex.setKey("a");
+//	lex << "y";
+
+	lex = BOTTOM;
+	return 0;
+}
diff --git a/tests/listtest.cpp b/tests/listtest.cpp
new file mode 100644
index 0000000..50df61e
--- /dev/null
+++ b/tests/listtest.cpp
@@ -0,0 +1,119 @@
+/******************************************************************************
+ *
+ *  listtest.cpp -	
+ *
+ * $Id: listtest.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <iostream>
+#include <stdlib.h>
+#include <listkey.h>
+#include <versekey.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+using namespace std;
+#endif
+
+int main(int argc, char **argv)
+{
+	// simple bounds check on verse first before we try this with listkey
+	SWKey text;
+	VerseKey vk("jn 1:1", "jn 1:12");
+	vk = "jas 1:19";
+	cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set");
+	text = (const char *)vk;
+	cout << "\nshould be jn 1.12: " << text << "\n";
+	vk = "mat 1:19";
+	cout << "\nError should be set: " << ((vk.popError()) ? "set":"not set");
+	text = (const char *)vk;
+	cout << "\nshould be jn 1.1: " << text << "\n";
+	vk = "jn 1:7";
+	cout << "\nError should not be set: " << ((vk.popError()) ? "set":"not set");
+	text = (const char *)vk;
+	cout << "\nshould be jn 1.7: " << text << "\n";
+
+	// complex listkey in listkey text
+	ListKey lk, lk2;
+
+	// c-tor bound setting
+	VerseKey vk2("jude", "jude");
+
+	lk << text;
+	lk << text;
+	lk << text;
+	lk << "James 1:19";
+	lk << "yoyo";
+	lk << vk;
+	lk2 << "test1";
+	lk2 << lk;
+	lk2 << vk2;
+	lk2 << "test2";
+	for (lk2 = TOP; !lk2.popError(); lk2++) {
+		cout << (const char *) lk2 << "\n";
+	}
+
+	cout << "\n\n---------\n";
+
+	lk2 = VerseKey().parseVerseList("1jn-2jn;mk1.9", 0, true);
+
+	// c-tor not bound setting, just parsing to jn.1.1
+	VerseKey yoyo("john");
+	yoyo = MAXCHAPTER;
+	cout << "should be jn.21.1: " << yoyo << "\n";
+
+	lk2 << yoyo;
+/*
+
+	for (int i = 0; i < 2; i++) {
+	VerseKey x, y;
+	ListKey lk3;
+	x = "rev";
+	y = x;
+	x = "mat";
+	VerseKey newElement;
+	newElement.LowerBound(x);
+	newElement.UpperBound(y);
+	lk3 << newElement;
+
+	lk2 << lk3;
+	}
+
+*/
+
+	for (lk2 = TOP; !lk2.popError(); lk2++)
+		cout << (const char *) lk2 << "\n";
+
+	lk.clear();
+	lk << "john 3:16";
+	cout << "\nCount should be 1: " << lk.getCount();
+
+	lk = vk.parseVerseList("mat;mark;luke", vk, true);
+	lk = (VerseKey)"mark 3:16";
+	cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set");
+	lk = (VerseKey)"john 3:16";
+	cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set");
+	lk = vk.parseVerseList("mk 3:16", vk, true);
+	lk = (VerseKey)"john 3:16";
+	cout << "\nError should be set: " << ((lk.popError()) ? "set":"not set");
+	lk = (VerseKey)"mark 3:16";
+	cout << "\nError should not be set: " << ((lk.popError()) ? "set":"not set");
+
+	cout << "\n\n";
+	return 0;
+}
diff --git a/tests/localetest.cpp b/tests/localetest.cpp
new file mode 100644
index 0000000..26f6b28
--- /dev/null
+++ b/tests/localetest.cpp
@@ -0,0 +1,57 @@
+/******************************************************************************
+ *
+ *  localetest.cpp -	
+ *
+ * $Id: localetest.cpp 3005 2014-01-09 04:06:11Z greg.hellings $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <localemgr.h>
+#include <versekey.h>
+#include <iostream>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	if (argc != 3) {
+		std::cerr <<  "usage: " << *argv << " <locale_name> <text>\n";
+		exit(-1);
+	}
+
+	LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr();
+
+	std::cout << lm->translate(argv[2], argv[1]) << "\n";
+
+/*
+	VerseKey bla;
+	bla = "James 1:19";
+
+	bla.setLocale("de");
+	std::cout << bla << std::endl;
+	bla = "Johannes 1:1";
+	std::cout << bla << std::endl;
+
+	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName("de");
+	VerseKey key2;
+	key2.setLocale("en");
+	ListKey list = key2.ParseVerseList("Luke 3:23-28",key2, true);
+	std::cout << list << std::endl;
+*/
+
+
+}
diff --git a/tests/mgrtest.cpp b/tests/mgrtest.cpp
new file mode 100644
index 0000000..dbc9f14
--- /dev/null
+++ b/tests/mgrtest.cpp
@@ -0,0 +1,70 @@
+/******************************************************************************
+ *
+ *  mgrtest.cpp -	
+ *
+ * $Id: mgrtest.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 1997-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <swlog.h>
+#include <iostream>
+#include <versekey.h>
+#include <swmodule.h>
+#include <swconfig.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	std::cerr << "\n";
+	SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
+	SWConfig *sysConf = 0;
+	if (argc > 1) {
+		sysConf = new SWConfig(argv[1]);
+	}
+	SWMgr mymgr(0, sysConf);
+	std::cerr << "\n\nprefixPath: " << mymgr.prefixPath;
+	std::cerr << "\nconfigPath: " << mymgr.configPath << "\n\n";
+
+
+
+	ModMap::iterator it;
+
+	for (it = mymgr.Modules.begin(); it != mymgr.Modules.end(); it++) {
+		std::cout << "[" << (*it).second->getName() << "] (Writable: " << (it->second->isWritable()?"Yes":"No") << ") [" << (*it).second->getDescription() << "]\n";
+		std::cout << "AbsoluteDataPath = " << it->second->getConfigEntry("AbsoluteDataPath") << "\n";
+		std::cout << "Has Feature HebrewDef = " << it->second->getConfig().has("Feature", "HebrewDef") << "\n";
+		if ((!strcmp((*it).second->getType(), "Biblical Texts")) || (!strcmp((*it).second->getType(), "Commentaries"))) {
+			it->second->setKey("James 1:19");
+			std::cout << (*it).second->renderText() << "\n\n";
+		}
+	}
+
+	SWModule *mhc = mymgr.Modules["MHC"];
+
+	if (mhc) {
+		std::cout << "MHC, Lang = " << mhc->getLanguage() << "\n\n";
+		for (mhc->setKey("Gen 1:1"); *mhc->getKey() < (VerseKey) "Gen 1:10"; (*mhc)++)
+			std::cout << mhc->renderText() << "\n";
+	}
+
+	if (sysConf)
+		delete sysConf;
+
+	return 0;
+}
diff --git a/tests/modtest.cpp b/tests/modtest.cpp
new file mode 100644
index 0000000..8f03f0e
--- /dev/null
+++ b/tests/modtest.cpp
@@ -0,0 +1,43 @@
+/******************************************************************************
+ *
+ *  modtest.cpp -	
+ *
+ * $Id: modtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <swtext.h>
+#include <versekey.h>
+#include <iostream>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	SWMgr mymgr;
+	ModMap::iterator it;
+	SWModule *module = mymgr.Modules["KJV"];
+	VerseKey parser;
+	ListKey lk = parser.parseVerseList("mal4:6-rev", parser, true);
+	lk.setPersist(true);
+	module->setKey(lk);
+
+	(*module) = TOP;
+	std::cout << module->getKeyText() << "\n";
+	return 0;
+}
diff --git a/tests/osistest.cpp b/tests/osistest.cpp
new file mode 100644
index 0000000..210f749
--- /dev/null
+++ b/tests/osistest.cpp
@@ -0,0 +1,111 @@
+/******************************************************************************
+ *
+ *  osistest.cpp -	
+ *
+ * $Id: osistest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 20122013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+
+#include <swmgr.h>
+#include <markupfiltmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+
+using namespace std;
+using namespace sword;
+
+
+void outputCurrentVerse(SWModule *module) {
+
+	module->renderText();
+
+	cout << "Key:\n";
+	cout << module->getKeyText() << "\n";
+	cout << "-------\n";
+
+	cout << "Preverse Header 0:\nRaw:\n";
+	SWBuf header = module->getEntryAttributes()["Heading"]["Preverse"]["0"];
+	cout << header << endl;
+	cout << "-------\n";
+	cout << "Rendered Header:\n";
+	cout << module->renderText(header) << endl;
+	cout << "-------\n";
+	cout << "CSS:\n";
+	cout << module->getRenderHeader() << endl;
+	cout << "-------\n";
+	cout << "RenderText:\n";
+	cout << module->renderText() << endl;
+	cout << "-------\n";
+	cout << "-------\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc != 2) {
+		cerr << "\nusage: " << *argv << " <modName>\n" << endl;
+		exit(-1);
+	}
+
+	SWMgr library(new MarkupFilterMgr(FMT_XHTML));
+	library.setGlobalOption("Headings", "On");
+
+	SWModule *module = library.getModule(argv[1]);
+
+	if (!module) {
+		cerr << "\nCouldn't file modules: " << argv[1] << "\n" << endl;
+		exit(-2);
+	}
+
+	module->setKey("Ps.3.1");
+	outputCurrentVerse(module);
+
+	module->setKey("Mark.1.14");
+	outputCurrentVerse(module);
+
+
+	cout << "\nWhitespace tests around headings:\n";
+	((VerseKey *)module->getKey())->setIntros(true);
+	*module = TOP;
+	// module heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// testament heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// book heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// chapter heading
+	cout << module->renderText() << "\n";
+	(*module)++;
+	// verse body
+	module->renderText();
+	SWBuf header = module->getEntryAttributes()["Heading"]["Preverse"]["0"];
+	cout << module->renderText(header) << endl;
+	cout << "[ " << module->getKeyText() << " ] " << module->renderText() << "\n";
+	(*module)++;
+	// verse body
+	module->renderText();
+	header = module->getEntryAttributes()["Heading"]["Preverse"]["0"];
+	cout << module->renderText(header) << endl;
+	cout << "[ " << module->getKeyText() << " ] " << module->renderText() << "\n";
+
+	return 0;
+}
diff --git a/tests/outputcps.cpp b/tests/outputcps.cpp
new file mode 100644
index 0000000..5fe74fe
--- /dev/null
+++ b/tests/outputcps.cpp
@@ -0,0 +1,81 @@
+/******************************************************************************
+ *
+ *  outputcps.cpp -	
+ *
+ * $Id: outputcps.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <versekey.h>
+
+/*
+This program requires versekey.h to be changed locally so that
+otbks, otcps, ntbks and ntcps are public
+*/
+
+using namespace sword;
+
+int
+main(int argc, char *argv[])
+{
+	int i;
+	long offset1, offset2, otoffset;
+	int *vmaxarray;
+	int vmax;
+	sword::VerseKey *tk = new sword::VerseKey("Genesis 0:0");
+	
+	//tk->Testament(1);
+	//tk->Book(1);
+	//tk->Chapter(0);
+	//tk->Verse(0);
+	//printf("bcv %d %d:%d\n", tk->Book(), tk->Chapter(), tk->Verse());
+	printf("{0, 0}, // Module Header\n");
+	printf("{1, 0}, // OT Header\n");
+	while (tk->Testament() == 1)
+	{
+		offset1 = tk->otbks[tk->Book()];
+		if (tk->Chapter() == 1) {
+			offset2 = tk->otcps[(int)offset1];
+			printf("{%d, 0}, // %s:0\n", offset2, tk->getBookName());
+		}
+		offset2 = tk->otcps[(int)offset1 + tk->Chapter()];
+		vmaxarray = tk->builtin_books[tk->Testament()-1][tk->Book()-1].versemax;
+		vmax = vmaxarray[tk->Chapter()-1];
+
+		printf("{%d, %d}, // %s:%d\n", offset2, vmax, tk->getBookName(), tk->Chapter());
+		tk->Chapter(tk->Chapter()+1);
+		otoffset = offset2+vmax+1;
+	}
+	printf("{%d, 0}, // NT Header\n", otoffset);
+	while (!tk->Error())
+	{
+		offset1 = tk->ntbks[tk->Book()];
+		if (tk->Chapter() == 1) {
+			offset2 = tk->ntcps[(int)offset1]+otoffset;
+			printf("{%d, 0}, // %s:0\n", offset2-1, tk->getBookName());
+		}
+		offset2 = tk->ntcps[(int)offset1 + tk->Chapter()] + otoffset;
+		vmaxarray = tk->builtin_books[tk->Testament()-1][tk->Book()-1].versemax;
+		vmax = vmaxarray[tk->Chapter()-1];
+
+		printf("{%d, %d}, // %s:%d\n", offset2-1, vmax, tk->getBookName(), tk->Chapter());
+		tk->Chapter(tk->Chapter()+1);
+	}
+	delete tk;
+  return 0;
+}
diff --git a/tests/parsekey.cpp b/tests/parsekey.cpp
new file mode 100644
index 0000000..03802fc
--- /dev/null
+++ b/tests/parsekey.cpp
@@ -0,0 +1,83 @@
+/******************************************************************************
+ *
+ *  parsekey.cpp -	
+ *
+ * $Id: parsekey.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+
+#include <versekey.h>
+#include <localemgr.h>
+#include <swlog.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	if ((argc < 2) || (argc > 8)) {
+		std::cerr << "usage: " << *argv << " <\"string to parse\"> [locale_name] [v11n] [context] [echo params 1|0] [test-in-set-verse 1|0] [intros 1|0]\n";
+		exit(-1);
+	}
+
+	if (argc > 2)
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(argv[2]);
+
+	VerseKey DefaultVSKey;
+//	DefaultVSKey.AutoNormalize(0);
+
+	if (argc > 3)
+		DefaultVSKey.setVersificationSystem(argv[3]);
+
+	const char *context = (argc > 4) ? argv[4] : "gen.1.1";
+
+	bool echo = (argc > 5) ? !strcmp(argv[5], "1") : false;
+	bool inSetTest = (argc > 6) ? !strcmp(argv[6], "1") : false;
+	bool intros = (argc > 7) ? !strcmp(argv[7], "1") : false;
+
+	DefaultVSKey.setIntros(intros);
+
+	SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
+	DefaultVSKey.validateCurrentLocale();
+
+	DefaultVSKey = context;
+
+	ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true);
+
+	if (echo) {
+		for (int i = 1; i < argc; i++) {
+			if (i > 1) std::cout << " ";
+			std::cout << argv[i];
+		}
+		std::cout << ": ";
+	}
+	std::cout << verses.getRangeText() << "\n";
+/*
+	for (int i = 0; i < verses.Count(); i++) {
+		std::cout << verses.GetElement(i)->getRangeText() << "\n";
+	}
+*/
+
+	if (inSetTest) {
+		verses.setText(context);
+		std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n";
+	}
+	
+	return 0;
+}
diff --git a/tests/rawldidxtest.cpp b/tests/rawldidxtest.cpp
new file mode 100644
index 0000000..bd47f0e
--- /dev/null
+++ b/tests/rawldidxtest.cpp
@@ -0,0 +1,71 @@
+/******************************************************************************
+ *
+ *  rawldidxtest.cpp -	
+ *
+ * $Id: rawldidxtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <rawstr.h>
+#include <swmgr.h>
+#include <filemgr.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv)
+{
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <lex path>\n\n", *argv);
+		exit(-1);
+	}
+	
+	RawStr mod(argv[1]);
+     char buf[127];
+
+	sprintf(buf, "%s.idx", argv[1]);
+	FileDesc *idxfd = FileMgr::getSystemFileMgr()->open(buf, FileMgr::RDONLY, true);
+	long maxoff = idxfd->seek(0, SEEK_END) - 6;
+	FileMgr::getSystemFileMgr()->close(idxfd);
+
+	SWBuf last = "";
+	bool first = true;
+	char *trybuf = 0;
+	for (long index = 0; index < maxoff; index+=6) {
+		mod.getIDXBuf(index, &trybuf);
+		if (!first) {
+			if (strcmp(trybuf, last.c_str()) < 0) {
+				printf("entry %ld(offset: %ld) (%s) is less than previous entry (%s)\n\n", index/6, index, trybuf, last.c_str());
+				exit(-3);
+			}
+		}
+		else first = false;
+		last = trybuf;
+	}
+	if (trybuf)
+		delete [] trybuf;
+
+	return 0;
+}
diff --git a/tests/refsystest.cpp b/tests/refsystest.cpp
new file mode 100644
index 0000000..e41acf9
--- /dev/null
+++ b/tests/refsystest.cpp
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ *  refsystest.cpp -	
+ *
+ * $Id: refsystest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2004-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <iostream>
+#include <versekey2.h>
+#include <stdlib.h>
+
+#include <refsysmgr.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+using std::cout;
+using std::endl;
+
+int main(int argc, char **argv)
+{
+	cout << "Default refsys: " << 
+		RefSysMgr::getSystemRefSysMgr()->getDefaultRefSysName() << endl;
+	StringList tlist = RefSysMgr::getSystemRefSysMgr()->getAvailableRefSys();
+	for (StringList::const_iterator it = tlist.begin(); it != tlist.end(); it++) {
+		cout << (*it).c_str() << endl;
+	}
+	VerseKey2 *testkey;
+	testkey = RefSysMgr::getSystemRefSysMgr()->getVerseKey("WEB", "Judith 1:1");
+	//testkey = RefSysMgr::getSystemRefSysMgr()->getVerseKey("KJV", "John 3:16");
+	if (testkey)
+		cout << testkey->getText() << endl;
+	else
+		cout << "Failed to get key" << endl;
+}
diff --git a/tests/romantest.cpp b/tests/romantest.cpp
new file mode 100644
index 0000000..cb0e026
--- /dev/null
+++ b/tests/romantest.cpp
@@ -0,0 +1,48 @@
+/******************************************************************************
+ *
+ *  romantest.cpp -	
+ *
+ * $Id: romantest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <roman.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::from_rom;
+#endif
+
+int main(int argc, char **argv) {
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <roman_numeral>\n", *argv);
+		exit(-1);
+	}
+	/* I don't think we need to_rom, do we? anyway, it isn't written
+	char buf[127];
+	if (isdigit(argv[1][0])) {
+		to_rom(atoi(argv[1]), buf);
+		std::cout << buf << std::endl;
+	}
+	*/
+	else std::cout << from_rom(argv[1]) << std::endl;
+	return 0;
+}
+
diff --git a/tests/striptest.cpp b/tests/striptest.cpp
new file mode 100644
index 0000000..8013481
--- /dev/null
+++ b/tests/striptest.cpp
@@ -0,0 +1,54 @@
+/******************************************************************************
+ *
+ *  striptest.cpp -	
+ *
+ * $Id: striptest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <iostream>
+
+using namespace sword;
+
+using std::cout;
+using std::endl;
+
+int main(int argc, char **argv) {
+
+	SWBuf modName = (argc > 1) ? argv[2] : "WLC";
+	SWBuf keyText = (argc > 2) ? argv[3] : "Gen.1.9";
+	SWBuf searchText = (argc > 3) ? argv[4] : "מתחת";
+	SWMgr library;
+	SWModule *book = library.getModule(modName);
+	StringList filters = library.getGlobalOptions();
+	for (StringList::iterator it = filters.begin(); it != filters.end(); ++it) {
+	    // blindly turn off all filters.  Some filters don't support "Off", but that's ok, we should just silently fail on those.
+	    library.setGlobalOption(*it, "Off");
+	}
+	book->setKey(keyText.c_str());
+	SWBuf entryStripped = book->stripText();
+	cout << "Module: " << book->getDescription() << "\t Key: " << book->getKeyText() << "\n";
+	cout << "RawEntry:\n" << book->getRawEntry() << "\n";
+	cout << "StripText:\n" << entryStripped << "\n";
+	cout << "Search Target: " << searchText << "\n";
+	cout << "Search Target StripText: " << book->stripText(searchText) << "\n";
+	cout << "Found: " << ((strstr(entryStripped.c_str(), book->stripText(searchText))) ? "true":"false") << endl; 
+
+	return 0;
+}
diff --git a/tests/swaptest.cpp b/tests/swaptest.cpp
new file mode 100644
index 0000000..f3713d0
--- /dev/null
+++ b/tests/swaptest.cpp
@@ -0,0 +1,31 @@
+/******************************************************************************
+ *
+ *  swaptest.cpp -	
+ *
+ * $Id: swaptest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <sysdata.h>
+#include <stdio.h>
+
+int main(int argc, char **argv) {
+	printf("0x%.4x 0x%.4x\n", 255, swordtoarch16(255));
+	printf("0x%.8x 0x%.8x\n", 255, swordtoarch32(255));
+//	printf("0x%.16x 0x%.16llx\n", 255, __swap64(255));
+	return 0;
+}
diff --git a/tests/swbuftest.cpp b/tests/swbuftest.cpp
new file mode 100644
index 0000000..2703efd
--- /dev/null
+++ b/tests/swbuftest.cpp
@@ -0,0 +1,192 @@
+/******************************************************************************
+ *
+ *  swbuftest.cpp -	
+ *
+ * $Id: swbuftest.cpp 2982 2013-09-15 13:33:03Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <time.h>
+#include <iostream>
+
+#define BASEI 102400000L
+
+#include <swbuf.h>
+#include <utilstr.h>
+
+typedef sword::SWBuf StringType;
+
+//#include <string>
+//typedef std::string StringType;
+
+using std::cout;
+using std::cerr;
+using sword::utf8ToWChar;
+using sword::wcharToUTF8;
+
+void markTime() {
+	static clock_t start = clock();
+	static clock_t last = start;
+	clock_t current = clock();
+	cerr << ((float)(current - last)/CLOCKS_PER_SEC) << " / " << ((float)(current - start)/CLOCKS_PER_SEC) << " (Seconds Delta / Seconds Total)\n";
+	cerr.flush();
+	last = current;
+}
+
+void appendChTest() {
+	cerr << "\nSTART: append ch test -------\n";
+	cerr.flush();
+	StringType s;
+	for (unsigned long i = 0; i < BASEI+14; i++) {
+		s += (char) (i%125)+1;
+	}
+	cerr << "\nEND: append ch test -------\n";
+	cerr.flush();
+}
+
+
+void appendStringTest() {
+	cerr << "\nSTART: append string test -------\n";
+	cerr.flush();
+	StringType s;
+	unsigned long iterations = BASEI/2L;
+	for (unsigned long i = 0; i < iterations; i++) {
+		s.append("this is a test", 3);
+		if (!(i%3))s.append("test");
+	}
+	cerr << "\nEND: append string test -------\n";
+	cerr.flush();
+}
+
+
+void subscriptTest() {
+	cerr << "\nSTART: subscript access test -------\n";
+	cerr.flush();
+	StringType s;
+	for (int j = 0; j < 100; j++) {
+		s += "0123456789";
+	}
+	for (int j = 0; j < BASEI/200; j++) {
+		for (unsigned long i = s.length()-1; i; i--) {
+			s[i] = (char) (i%40)+65;
+		}
+	}
+	cerr << "\nEND: subscript access test -------\n";
+	cerr.flush();
+}
+
+void ctorAssignTest() {
+	cerr << "\nSTART: constructor and assign test -------\n";
+	cerr.flush();
+	StringType s;
+	for (int j = 0; j < 100; j++) {
+		s += "0123456789";
+	}
+	for (unsigned long i = (BASEI/8); i; i--) {
+		StringType s2;
+		s2 = s;
+		s2[0] = '0';	// keep defeat copy on write optimizations
+	}
+	cerr << "\nEND: constructor and assign test -------\n";
+	cerr.flush();
+}
+
+void compareTest() {
+	cerr << "\nSTART: compare test -------\n";
+	cerr.flush();
+	StringType first =  "firsttestAfirst";
+	StringType second = "firsttestBsecond";
+	for (unsigned long i = (unsigned long)(BASEI/1.5); i; i--) {
+		if (first != second) {
+			if (first <= second) {
+				if (first > second) {;}
+				else if (!(BASEI%10000)) {
+					first[0] = 'f';	// keep us from being optimized out
+				}
+			}
+		}
+	}
+	cerr << "\nEND: compare test -------\n";
+	cerr.flush();
+}
+
+
+void insertStringTest() {
+	cerr << "\nSTART: insert string test -------\n";
+	cerr.flush();
+	StringType s;
+	StringType sub = "text ->this part should not appear :)";
+	for (int j = 0; j < BASEI/7000; j++) {
+		s = "Start    end";
+		for (int i = 0; i < 1000; i++) {
+			s.insert(s.length()/2, sub, 0, 5);
+		}
+	}
+	cerr << "\nEND: insert string test -------\n";
+	cerr.flush();
+}
+
+int main(int argc, char **argv) {
+
+	bool showTimings = !(argc > 1 && !strcmp(argv[1], "--no-timings"));
+	StringType x;
+	cout << "x should be (): (" << x << ")\n";
+	cout << "size should be 0: " << x.size() << "\n";
+	x = "hello";
+	cout << "x should be (hello): (" << x << ")\n";
+	x += " world";
+	cout << "x should be (hello world): (" << x << ")\n";
+	cout << "size should be 11: " << x.size() << "\n";
+	cout << "x[7] should be 'o': '" << x[7] << "'\n";
+	x[7] = 'u';
+	cout << "x[7] should be 'u': '" << x[7] << "'\n";
+	cout << "x should be (hello wurld): (" << x << ")\n";
+	StringType y = x + " " + x;
+	cout << "should be (hello wurld hello wurld): (" << y << ")\n";
+
+	sword::SWBuf prefixTest = "prefix:value";
+	cout << "Prefix test: " << prefixTest << "\n";
+	cout << "Prefix should be (prefix): " << prefixTest.stripPrefix(':') << "\n";
+	cout << "Value should be (value): " << prefixTest << "\n";
+
+	x = utf8ToWChar("ⲉⲛⲧ�ⲡⲛⲟⲩⲧⲉ");
+	cout << (wchar_t *)x.getRawData() << "\n";
+	x = wcharToUTF8((wchar_t *)x.getRawData());
+	cout << x << "\n";
+
+//	y.appendFormatted(" from %d %s running %02.05f miles", 4, "dogs", 1.9f);
+//	cout << "should be (hello wurld hello wurld from 4 dogs running 1.90000 miles): (" << y << ")\n";
+//	y += '!';
+//	cout << "should be (hello wurld hello wurld from 4 dogs running 1.90000 miles!): (" << y << ")\n";
+//	y.append(y.c_str(),5);
+//	cout << "should be (hello wurld hello wurld from 4 dogs running 1.90000 miles!hello): (" << y << ")\n";
+
+	if (showTimings) markTime();
+	appendChTest();
+	if (showTimings) markTime();
+	appendStringTest();
+	if (showTimings) markTime();
+	subscriptTest();
+	if (showTimings) markTime();
+	ctorAssignTest();
+	if (showTimings) markTime();
+	compareTest();
+	if (showTimings) markTime();
+	insertStringTest();
+	if (showTimings) markTime();
+}
+
diff --git a/tests/testblocks.cpp b/tests/testblocks.cpp
new file mode 100644
index 0000000..49cd996
--- /dev/null
+++ b/tests/testblocks.cpp
@@ -0,0 +1,119 @@
+/******************************************************************************
+ *
+ *  testblocks.cpp -	
+ *
+ * $Id: testblocks.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <entriesblk.h>
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <stdlib.h>
+
+using namespace std;
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+void addEntry(EntriesBlock *eb) {
+	string input;
+	string body;
+	char line[1024], *c;
+	std::cout << "\nEnter new Entry's text. '.' on an empty line to finish:\n";
+	do {
+		std::cout << "> ";
+		c = fgets(line, 1000, stdin);
+		if (c == NULL) {
+			std::cerr << "ERROR: fgets failed during addEntry\n";
+		} else {
+			input = line;
+			if (input.compare("."))
+				body.append(input);
+		}
+	}
+	while (input.compare("."));
+	std::cout << "Adding new entry.  Index is: " << eb->addEntry(body.c_str()) << "\n\n";
+}
+
+
+void printEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Contents of entry [" << index << "]:\n";
+		std::cout << eb->getEntry(index) << "\n";
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+void printSize(EntriesBlock *eb) {
+	unsigned long size;
+	eb->getRawData(&size);
+	std::cout << "Size of raw data: " << size << "\n\n";
+}
+
+
+void removeEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Removing entry [" << index << "]\n";
+		eb->removeEntry(index);
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	EntriesBlock *eb = new EntriesBlock();
+	string input;
+	char line[1024], *c;
+
+	std::cout << "Initial entry count should be 0: " << eb->getCount() << "\n";
+
+	do {
+		std::cout << "[" << eb->getCount() << "] > ";
+		c = fgets(line, 1000, stdin);
+		if (c == NULL) {
+			std::cerr << "ERROR: fgets failed in main\n";
+		} else {
+			input = line;
+			if (input.length() > 0) {
+				switch (input[0]) {
+					case 'a': addEntry(eb); break;
+					case 'p':	printEntry(eb, atoi(input.c_str()+1)); break;
+					case 'r':	removeEntry(eb, atoi(input.c_str()+1)); break;
+					case 's': printSize(eb); break;
+					case 'q': break;
+					case '?':
+					default:
+						std::cout << "\n a - add a new entry\n";
+						std::cout << " p <entry_index> - print entry\n";
+						std::cout << " r <entry_index> - remove entry\n";
+						std::cout << " s - print size of raw data\n";
+						std::cout << " q - quit\n\n";
+						break;
+				}
+			}
+		}
+	}
+	while (input.compare("q"));
+
+	delete eb;
+
+	return 0;
+}
diff --git a/tests/testsuite/CMakeLists.txt b/tests/testsuite/CMakeLists.txt
new file mode 100644
index 0000000..48dc01a
--- /dev/null
+++ b/tests/testsuite/CMakeLists.txt
@@ -0,0 +1,25 @@
+#############################################################################
+# This file will actually be responsible for running the tests
+# 
+
+ADD_CUSTOM_TARGET(
+	tests_configure
+	COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_BINARY_DIR}
+	COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.good ${CMAKE_CURRENT_BINARY_DIR}
+	COMMAND echo \"[Install]\\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../\" > ${CMAKE_CURRENT_BINARY_DIR}/sword.conf
+	DEPENDS ${test_PROGRAMS}
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+ADD_CUSTOM_TARGET(
+	tests
+	COMMAND ./runall.sh
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+ADD_DEPENDENCIES(
+	tests
+	tests_configure
+)
+
+MESSAGE(STATUS "Testing configured.")
diff --git a/tests/testsuite/Makefile.am b/tests/testsuite/Makefile.am
new file mode 100644
index 0000000..db26c79
--- /dev/null
+++ b/tests/testsuite/Makefile.am
@@ -0,0 +1,6 @@
+swtspdir = $(top_srcdir)/tests/testsuite
+
+EXTRA_DIST += $(swtspdir)/runall.sh
+EXTRA_DIST += $(swtspdir)/runtest.sh
+EXTRA_DIST += $(swtspdir)/verseparsing.good
+EXTRA_DIST += $(swtspdir)/verseparsing.sh
diff --git a/tests/testsuite/listtest.good b/tests/testsuite/listtest.good
new file mode 100644
index 0000000..5cbf62a
--- /dev/null
+++ b/tests/testsuite/listtest.good
@@ -0,0 +1,184 @@
+
+Error should be set: set
+should be jn 1.12: John 1:12
+
+Error should be set: set
+should be jn 1.1: John 1:1
+
+Error should not be set: not set
+should be jn 1.7: John 1:7
+test1
+John 1:7
+John 1:7
+John 1:7
+James 1:19
+yoyo
+John 1:1
+John 1:2
+John 1:3
+John 1:4
+John 1:5
+John 1:6
+John 1:7
+John 1:8
+John 1:9
+John 1:10
+John 1:11
+John 1:12
+Jude 1:1
+Jude 1:2
+Jude 1:3
+Jude 1:4
+Jude 1:5
+Jude 1:6
+Jude 1:7
+Jude 1:8
+Jude 1:9
+Jude 1:10
+Jude 1:11
+Jude 1:12
+Jude 1:13
+Jude 1:14
+Jude 1:15
+Jude 1:16
+Jude 1:17
+Jude 1:18
+Jude 1:19
+Jude 1:20
+Jude 1:21
+Jude 1:22
+Jude 1:23
+Jude 1:24
+Jude 1:25
+test2
+
+
+---------
+should be jn.21.1: John 21:1
+I John 1:1
+I John 1:2
+I John 1:3
+I John 1:4
+I John 1:5
+I John 1:6
+I John 1:7
+I John 1:8
+I John 1:9
+I John 1:10
+I John 2:1
+I John 2:2
+I John 2:3
+I John 2:4
+I John 2:5
+I John 2:6
+I John 2:7
+I John 2:8
+I John 2:9
+I John 2:10
+I John 2:11
+I John 2:12
+I John 2:13
+I John 2:14
+I John 2:15
+I John 2:16
+I John 2:17
+I John 2:18
+I John 2:19
+I John 2:20
+I John 2:21
+I John 2:22
+I John 2:23
+I John 2:24
+I John 2:25
+I John 2:26
+I John 2:27
+I John 2:28
+I John 2:29
+I John 3:1
+I John 3:2
+I John 3:3
+I John 3:4
+I John 3:5
+I John 3:6
+I John 3:7
+I John 3:8
+I John 3:9
+I John 3:10
+I John 3:11
+I John 3:12
+I John 3:13
+I John 3:14
+I John 3:15
+I John 3:16
+I John 3:17
+I John 3:18
+I John 3:19
+I John 3:20
+I John 3:21
+I John 3:22
+I John 3:23
+I John 3:24
+I John 4:1
+I John 4:2
+I John 4:3
+I John 4:4
+I John 4:5
+I John 4:6
+I John 4:7
+I John 4:8
+I John 4:9
+I John 4:10
+I John 4:11
+I John 4:12
+I John 4:13
+I John 4:14
+I John 4:15
+I John 4:16
+I John 4:17
+I John 4:18
+I John 4:19
+I John 4:20
+I John 4:21
+I John 5:1
+I John 5:2
+I John 5:3
+I John 5:4
+I John 5:5
+I John 5:6
+I John 5:7
+I John 5:8
+I John 5:9
+I John 5:10
+I John 5:11
+I John 5:12
+I John 5:13
+I John 5:14
+I John 5:15
+I John 5:16
+I John 5:17
+I John 5:18
+I John 5:19
+I John 5:20
+I John 5:21
+II John 1:1
+II John 1:2
+II John 1:3
+II John 1:4
+II John 1:5
+II John 1:6
+II John 1:7
+II John 1:8
+II John 1:9
+II John 1:10
+II John 1:11
+II John 1:12
+II John 1:13
+Mark 1:9
+John 21:1
+
+Count should be 1: 1
+Error should not be set: not set
+Error should be set: set
+Error should be set: set
+Error should not be set: not set
+
diff --git a/tests/testsuite/listtest.sh b/tests/testsuite/listtest.sh
new file mode 100755
index 0000000..855d161
--- /dev/null
+++ b/tests/testsuite/listtest.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+../listtest
diff --git a/tests/testsuite/osis.good b/tests/testsuite/osis.good
new file mode 100644
index 0000000..87c58c3
--- /dev/null
+++ b/tests/testsuite/osis.good
@@ -0,0 +1,106 @@
+SUCCESS: ../../utilities/osis2mod: has finished its work and will now rest
+Key:
+Psalms 3:1
+-------
+Preverse Header 0:
+Raw:
+<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="paragraph"/> <lg sID="gen14"/> 
+-------
+Rendered Header:
+ <h3>A Psalm of David, when he fled from Absalom his son.</h3>
+
+<br />
+ 
+-------
+CSS:
+		.divineName { font-variant: small-caps; }
+		.wordsOfJesus { color: red; }
+		.transChangeSupplied { font-style: italic; }
+		.small, .sub, .sup { font-size: .83em }
+		.sub             { vertical-align: sub }
+		.sup             { vertical-align: super }
+		.indent1         { margin-left: 10px }
+		.indent2         { margin-left: 20px }
+		.indent3         { margin-left: 30px }
+		.indent4         { margin-left: 40px }
+	
+-------
+RenderText:
+ <span class="line indent0"><span class="divineName">Lord</span>, how are they increased that trouble me!</span><br />
+<span class="line indent0">many <span class="transChangeSupplied">are</span> they that rise up against me.</span><br />
+
+-------
+-------
+
+Key:
+Mark 1:14
+-------
+Preverse Header 0:
+Raw:
+<div sID="gen22" type="section"/> <title>The Beginning of the Ministry of Jesus</title> <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>) </title> <div sID="gen23" type="paragraph"/> 
+-------
+Rendered Header:
+ <h3>The Beginning of the Ministry of Jesus</h3>
+
+<h3>(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
+
+<br />
+
+-------
+CSS:
+		.divineName { font-variant: small-caps; }
+		.wordsOfJesus { color: red; }
+		.transChangeSupplied { font-style: italic; }
+		.small, .sub, .sup { font-size: .83em }
+		.sub             { vertical-align: sub }
+		.sup             { vertical-align: super }
+		.indent1         { margin-left: 10px }
+		.indent2         { margin-left: 20px }
+		.indent3         { margin-left: 30px }
+		.indent4         { margin-left: 40px }
+	
+-------
+RenderText:
+ Now after that John was put in prison, Jesus came into Galilee, preaching the gospel of the kingdom of God, 
+-------
+-------
+
+
+Whitespace tests around headings:
+
+
+ <h1 class="bookHeader">Old Testament</h1>
+
+ <h1 class="bookHeader">THE FIRST BOOK OF MOSES CALLED GENESIS</h1>
+
+ <h1 class="bookHeader">Introduction and Outline</h1>
+
+<br />
+This is the <b>Book of Genesis</b>, the <i>first</i> book in the Bible. It may be outlined as follows: <br />
+<br />
+<ul>
+ 	<li><span class="sup">1</span>Creation of Heaven and Earth, 1:1-2:4a</li>
+	<li><span class="sup">2</span>Creation of Man and Woman, 2:4b-25</li>
+	<li><span class="sub">3</span>Fall, 3:1-24</li>
+	<li>...</li>
+</ul>
+ <br />
+Tables work like this: <table><tbody>
+ 	<tr> <td><b>Column 1 Label</b></td> <td><b>Column 2 Label</b></td> </tr>
+ 	<tr> <td>Column 1, Row 1</td> <td>Column 2, Row 1</td> </tr>
+ 	<tr> <td>Column 1, Row 2</td> <td>Column 2, Row 2</td> </tr>
+ </tbody></table>
+<br />
+
+  <h2 class="chapterHeader">From Creation to Abraham (1:1–11:9)</h2>
+
+
+ <h3>Creation of the Heavens and the Earth</h3>
+
+<br />
+
+[ Genesis 1:1 ]  In the beginning God created the heaven and the earth.  <br />
+
+<br />
+
+[ Genesis 1:2 ] Text of verse 2.
diff --git a/tests/testsuite/osis.sh b/tests/testsuite/osis.sh
new file mode 100755
index 0000000..689e64d
--- /dev/null
+++ b/tests/testsuite/osis.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+rm -rf osis/
+mkdir -p osis/mods.d
+mkdir -p osis/modules
+
+cat > osis/mods.d/osisreference.conf <<!
+[OSISReference]
+DataPath=./modules/
+ModDrv=zText
+Encoding=UTF-8
+BlockType=BOOK
+CompressType=ZIP
+SourceType=OSIS
+Lang=en
+GlobalOptionFilter=OSISStrongs
+GlobalOptionFilter=OSISMorph
+GlobalOptionFilter=OSISFootnotes
+GlobalOptionFilter=OSISHeadings
+GlobalOptionFilter=OSISRedLetterWords
+Feature=StrongsNumbers
+!
+
+../../utilities/osis2mod osis/modules/ osisReference.xml -z 2>&1 | grep -v \$Rev
+
+cd osis && ../../osistest OSISReference
diff --git a/tests/testsuite/osisReference.xml b/tests/testsuite/osisReference.xml
new file mode 100644
index 0000000..d07f774
--- /dev/null
+++ b/tests/testsuite/osisReference.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<osis
+  xmlns="http://www.bibletechnologies.net/2003/OSIS/namespace"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.bibletechnologies.net/2003/OSIS/namespace
+  http://www.bibletechnologies.net/osisCore.2.1.1.xsd">
+
+<osisText osisIDWork="KJV" osisRefWork="defaultReferenceScheme" xml:lang="en">
+
+<header>
+  <work osisWork="KJV">
+    <title>King James Version (1769) with Strongs Numbers and Morphology</title>
+    <identifier type="OSIS">Bible.KJV</identifier>
+    <scope>Gen-Rev</scope>
+    <refSystem>Bible.KJV</refSystem>
+  </work>
+  <work osisWork="defaultReferenceScheme">
+    <refSystem>Bible.KJV</refSystem>
+  </work>
+  <work osisWork="strong">
+    <refSystem>Dict.Strongs</refSystem>
+  </work>
+  <work osisWork="robinson">
+    <refSystem>Dict.Robinsons</refSystem>
+  </work>
+  <work osisWork="osmorph">
+    <refSystem>Dict.osmorph</refSystem>
+  </work>
+  <work osisWork="oslemma">
+    <refSystem>Dict.oslemma</refSystem>
+  </work>
+</header>
+<div type="bookGroup">
+ <title>Old Testament</title>
+ <div type="book" osisID="Gen">
+  <title type="main">THE FIRST BOOK OF MOSES CALLED GENESIS</title>
+  <div type="section">
+   <title>Introduction and Outline</title>
+    <p>
+     This is the <hi type="bold">Book of Genesis</hi>, the <hi type="italic">first</hi> book in the Bible. It may be outlined as follows:
+    </p>
+    <p>
+     <list>
+      <item><hi type="super">1</hi>Creation of Heaven and Earth, 1:1-2:4a</item>
+      <item><hi type="super">2</hi>Creation of Man and Woman, 2:4b-25</item>
+      <item><hi type="sub">3</hi>Fall, 3:1-24</item>
+      <item>...</item>
+     </list>
+    </p>
+    <p>
+     Tables work like this:
+     <table>
+      <row>
+       <cell><hi type="bold">Column 1 Label</hi></cell>
+       <cell><hi type="bold">Column 2 Label</hi></cell>
+      </row>
+      <row>
+       <cell>Column 1, Row 1</cell>
+       <cell>Column 2, Row 1</cell>
+      </row>
+      <row>
+       <cell>Column 1, Row 2</cell>
+       <cell>Column 2, Row 2</cell>
+      </row>
+     </table>
+    </p>
+  </div>
+  <chapter sID="Gen.1" osisID="Gen.1"/>
+   <div type="majorSection">
+    <title>From Creation to Abraham (1:1–11:9)</title>
+    <div type="section">
+     <title>Creation of the Heavens and the Earth</title>
+     <p>
+      <verse sID="Gen.1.1" osisID="Gen.1.1"/>
+       <w lemma="strong:H07225">In the beginning</w> 
+       <w lemma="strong:H0430">God</w> 
+       <w lemma="strong:H0853 strong:H01254">created</w> 
+       <w lemma="strong:H8064">the heaven</w> 
+       <w lemma="strong:H0853">and</w> 
+       <w lemma="strong:H0776">the earth</w>.
+      <verse eID="Gen.1.1"/>
+     </p>
+     <p>
+      <verse sID="Gen.1.2" osisID="Gen.1.2"/>Text of verse 2.<verse eID="Gen.1.2"/>
+      <verse sID="Gen.1.3" osisID="Gen.1.3"/>
+       Text of verse 3.
+       <note type="crossReference" n="a" osisID="Gen.1.3!crossReference.a" osisRef="Gen.1.3">
+       <reference osisRef="2Cor.4.6">2 Cor 4:6</reference>
+       </note>
+      <verse eID="Gen.1.3"/>
+      <verse sID="Gen.1.4" osisID="Gen.1.4"/>
+       And God saw the light, that 
+       <transChange type="added">it was</transChange> good: 
+       and God divided the light from the darkness.
+       <note type="study">the light from…: Heb. between the light and between the darkness</note>
+      <verse eID="Gen.1.4"/>
+      <verse sID="Gen.1.5" osisID="Gen.1.5"/>
+       <w lemma="oslemma:וְ oslemma:קר�" morph="osmorph:Cv osmorph:Vqi3ms" src="1 2">וַיִּקְרָ֨�</w>
+       <w lemma="oslemma:�ֱלֹהִי�" morph="osmorph:Ncmp">�ֱלֹהִ֤י�</w>
+       <w lemma="oslemma:לְ oslemma:הַ oslemma:�ֹור" morph="osmorph:R osmorph:Td osmorph:Ncms" src="1 2 3">לָ�ֹור֙</w>
+       <w lemma="oslemma:יֹו�" morph="osmorph:Ncms">יֹ֔ו�</w>
+       <w lemma="oslemma:וְ oslemma:לְ oslemma:הַ oslemma:חֹשֶ�כְ" morph="osmorph:Cc osmorph:R osmorph:Td osmorph:Ncms" src="1 2 3 4">וְלַחֹ֖שֶ�ךְ</w>
+       <w lemma="oslemma:קר�" morph="osmorph:Vqp3ms">קָ֣רָ�</w>
+       <w lemma="oslemma:לַיְלָה" morph="osmorph:Ncms">לָ֑יְלָה</w>
+       <w lemma="oslemma:וְ oslemma:היה" morph="osmorph:Cv osmorph:Vqi3ms" src="1 2">וַֽיְהִי־</w><w lemma="oslemma:עֶרֶב" morph="osmorph:Ncms">עֶ֥רֶב</w>
+       <w lemma="oslemma:וְ oslemma:היה" morph="osmorph:Cv osmorph:Vqi3ms" src="1 2">וַֽיְהִי־</w><w lemma="oslemma:בֹּקֶר" morph="osmorph:Ncms">בֹ֖קֶר</w>
+       <w lemma="oslemma:יֹו�" morph="osmorph:Ncms">יֹ֥ו�</w>
+       <w lemma="oslemma:�ֶחָד" morph="osmorph:Acms">�ֶחָֽד</w>׃
+       <w lemma="oslemma:פ" morph="osmorph:M">פ</w>
+      <verse eID="Gen.1.5"/>
+     </p>
+  <chapter eID="Gen.1"/>
+    </div>
+   </div>
+ </div>
+ <div type="book" osisID="Ps">
+  <title type="main">THE BOOK OF PSALMS</title>
+  <chapter sID="Ps.3" osisID="Ps.3"/>
+   <title type="chapter">PSALM 3.</title>
+   <div type="section">
+   <title type="psalm" canonical="true">A Psalm of David, when he fled from Absalom his son.</title>
+    <p>
+     <lg>
+      <verse sID="Ps.3.1" osisID="Ps.3.1"/>
+       <l level="1"><seg><divineName>Lord</divineName></seg>, how are they increased that trouble me!</l>
+       <l level="1">many <transChange type="added">are</transChange> they that rise up against me.</l>
+      <verse eID="Ps.3.1"/>
+      <verse sID="Ps.3.2" osisID="Ps.3.2"/>
+       <l level="1">Many <transChange type="added">there be</transChange> which say of my soul,</l>
+       <l level="1"><transChange type="added">There is</transChange> no help for him in God.</l>
+       <l type="selah">Selah.</l> 
+      <verse eID="Ps.3.2"/>
+      <verse sID="Ps.3.3" osisID="Ps.3.3"/>
+       
+      <verse eID="Ps.3.3"/>
+     </lg>
+    </p>
+   </div>
+  <chapter eID="Ps.3"/>
+ </div>
+</div>
+<div type="bookGroup">
+ <title>New Testament</title>
+ <div type="book" osisID="Mark">
+  <title type="main">THE GOSPEL ACCORDING TO <abbr expansion="Saint">ST.</abbr> MARK</title>
+  <chapter sID="Mark.1" osisID="Mark.1"/>
+   <verse sID="Mark.1.13" osisID="Mark.1.13"/>
+And He was in the wilderness forty days being tempted by Satan; and He was with the wild beasts, and the angels were ministering to Him.
+   <verse eID="Mark.1.13"/>
+   <div type="section">
+    <title>The Beginning of the Ministry of Jesus</title>
+    <title type="parallel">(<reference osisRef="Matt.4.12-Matt.4.22">Matt 4:12–22</reference>; 
+     <reference osisRef="Luke.4.14">Luke 4:14</reference>, <reference osisRef="Luke.4.15">15</reference>; 
+     <reference osisRef="Luke.5.1-Luke.5.11">5:1-11</reference>)
+    </title>
+    <p>
+     <verse sID="Mark.1.14" osisID="Mark.1.14"/>
+      <w src="2" lemma="strong:G1161" morph="robinson:CONJ">Now</w> 
+      <w src="1" lemma="strong:G3326" morph="robinson:PREP">after</w> that 
+      <w src="5 6" lemma="strong:G3588 strong:G2491" morph="robinson:T-ASM robinson:N-ASM">John</w> 
+      <w src="4" lemma="strong:G3860" morph="robinson:V-APN">was put in prison</w>, 
+      <w src="8 9" lemma="strong:G3588 strong:G2424" morph="robinson:T-NSM robinson:N-NSM">Jesus</w> 
+      <w src="7" lemma="strong:G2064" morph="robinson:V-2AAI-3S">came</w> 
+      <w src="10" lemma="strong:G1519" morph="robinson:PREP">into</w> 
+      <w src="11 12" lemma="strong:G3588 strong:G1056" morph="robinson:T-ASF robinson:N-ASF">Galilee</w>, 
+      <w src="13" lemma="strong:G2784" morph="robinson:V-PAP-NSM">preaching</w> 
+      <w src="14 15" lemma="strong:G3588 strong:G2098" morph="robinson:T-ASN robinson:N-ASN">the gospel</w> 
+      <w src="16 17" lemma="strong:G3588 strong:G932" morph="robinson:T-GSF robinson:N-GSF">of the kingdom</w> 
+      <w src="18 19" lemma="strong:G3588 strong:G2316" morph="robinson:T-GSM robinson:N-GSM">of God</w>,
+      <w src="3" lemma="strong:G3588" morph="robinson:T-ASN"></w>
+     <verse eID="Mark.1.14"/>
+     <verse sID="Mark.1.15" osisID="Mark.1.15"/>
+      And saying, 
+      <q who="Jesus">The time is fulfilled, and the kingdom of God is at hand: repent ye, and believe the <seg type="x-variant" subType="x-1">gospel</seg>
+<seg type="x-variant" subType="x-2">good news</seg>.</q>
+     <verse eID="Mark.1.15"/>
+    </p>
+   </div>
+  <chapter eID="Mark.1"/>
+ </div>
+</div>
+</osisText>
+</osis>
diff --git a/tests/testsuite/runall.sh b/tests/testsuite/runall.sh
new file mode 100755
index 0000000..75eb221
--- /dev/null
+++ b/tests/testsuite/runall.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+#******************************************************************************
+#
+# Runs entire test suite
+#
+# $Id: runall.sh 2327 2009-04-22 11:42:33Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+TESTSUITE=`for i in *.good; do basename $i .good; done`
+
+for i in $TESTSUITE; do
+	echo -n "$i: "
+	./runtest.sh $i -q
+	if [ $? -ne 0 ]; then
+		echo FAILED
+		echo ""
+		echo To see problems, try running:
+		echo ./runtest.sh $i
+		echo ""
+		exit 1
+	else
+		echo PASSED.
+	fi
+done
+echo "ALL PASSED!"
+exit 0
+fi
diff --git a/tests/testsuite/runtest.sh b/tests/testsuite/runtest.sh
new file mode 100755
index 0000000..4ef57f7
--- /dev/null
+++ b/tests/testsuite/runtest.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+#******************************************************************************
+#
+# Runs a single test
+#
+# $Id: runtest.sh 2364 2009-04-29 08:10:02Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+if [ "$1" = "" ]; then
+	echo usage: $0 "<test_to_run (no .sh)>"
+	exit 1
+fi
+
+./$1.sh > $1.try
+BAD=`diff -uBb $1.try $1.good`
+if [ "$BAD" = "" ]; then
+	if [ "$2" = "-q" ]; then
+		exit 0
+	else
+		echo PASSED!
+	fi
+	exit 0
+else
+	if [ "$2" = "-q" ]; then
+		exit 1
+	else
+		echo "Script failed at: (- bad output; + should have been)"
+		diff -u $1.try $1.good
+	fi
+	exit 1
+fi
diff --git a/tests/testsuite/sword.conf b/tests/testsuite/sword.conf
new file mode 100644
index 0000000..a8ae13b
--- /dev/null
+++ b/tests/testsuite/sword.conf
@@ -0,0 +1,2 @@
+[Install]
+LocalePath=../..
diff --git a/tests/testsuite/versekeytest.good b/tests/testsuite/versekeytest.good
new file mode 100644
index 0000000..5540c6a
--- /dev/null
+++ b/tests/testsuite/versekeytest.good
@@ -0,0 +1,66 @@
+Should be: [ Testament 1 Heading ]
+[ Testament 1 Heading ]
+
+Should be: [ Testament 1 Heading ]
+[ Testament 1 Heading ]
+
+single
+multiple
+x: Amos 1:5
+Amos 1:5
+Amos 1:5
+Error: 1: Luke 1:1
+Error: 1: Luke 1:1
+Error: 0: Acts 5:1
+Error: 1: Acts 28:31
+
+Normalization on; headings on ====
+
+jn.3.50: John 4:13
+++: John 4:14
+--: John 4:13
+MAXVERSE: John 4:54
+MAXCHAPTER: John 21:1
+TOP: [ Module Heading ]
+BOTTOM: Revelation of John 22:21
+
+Normalization off; headings on ====
+
+jn.3.50: John 3:50
+++: John 3:51
+--: John 3:50
+MAXVERSE: John 3:36
+MAXCHAPTER: John 21:1
+TOP: [ Module Heading ]
+BOTTOM: Revelation of John 22:21
+
+Normalization on; headings off ====
+
+jn.3.50: John 4:14
+++: John 4:15
+--: John 4:14
+MAXVERSE: John 4:54
+MAXCHAPTER: John 21:1
+TOP: Genesis 1:1
+BOTTOM: Revelation of John 22:21
+
+Normalization off; headings off ====
+
+jn.3.50: John 3:50
+++: John 3:51
+--: John 3:50
+MAXVERSE: John 3:36
+MAXCHAPTER: John 21:1
+TOP: Genesis 1:1
+BOTTOM: Revelation of John 22:21
+John 3:16: 0
+I Samuel 1:1: getChapter() - 1: Ruth 4:1
+
+Book math
+
+Mark.1.1-- = Matthew 28:20
+++ = Mark 1:1
+.setChapter(.getChapter() - 1) = Matthew 28:1
+Matthew.1.1-- = Malachi 4:6
+++ = Matthew 1:1
+.setBook(.getBook() - 1) = Malachi 1:1
diff --git a/tests/testsuite/versekeytest.sh b/tests/testsuite/versekeytest.sh
new file mode 100755
index 0000000..c2238c1
--- /dev/null
+++ b/tests/testsuite/versekeytest.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+../versekeytest
diff --git a/tests/testsuite/versemgrtest.good b/tests/testsuite/versemgrtest.good
new file mode 100644
index 0000000..8029075
--- /dev/null
+++ b/tests/testsuite/versemgrtest.good
@@ -0,0 +1,32369 @@
+Versification System: KJV
+Book Count: 66
+Last Book: Revelation of John (Rev)
+  Chapter Max: 22
+    Verse Max: 21
+       Offset: 32359
+
+Offset, Book, Chapter, Verse
+0: -1, 0, 0
+1: 0, -1, 0
+2: 1, 0, 0
+3: 1, 1, 0
+4: 1, 1, 1
+5: 1, 1, 2
+6: 1, 1, 3
+7: 1, 1, 4
+8: 1, 1, 5
+9: 1, 1, 6
+10: 1, 1, 7
+11: 1, 1, 8
+12: 1, 1, 9
+13: 1, 1, 10
+14: 1, 1, 11
+15: 1, 1, 12
+16: 1, 1, 13
+17: 1, 1, 14
+18: 1, 1, 15
+19: 1, 1, 16
+20: 1, 1, 17
+21: 1, 1, 18
+22: 1, 1, 19
+23: 1, 1, 20
+24: 1, 1, 21
+25: 1, 1, 22
+26: 1, 1, 23
+27: 1, 1, 24
+28: 1, 1, 25
+29: 1, 1, 26
+30: 1, 1, 27
+31: 1, 1, 28
+32: 1, 1, 29
+33: 1, 1, 30
+34: 1, 1, 31
+35: 1, 2, 0
+36: 1, 2, 1
+37: 1, 2, 2
+38: 1, 2, 3
+39: 1, 2, 4
+40: 1, 2, 5
+41: 1, 2, 6
+42: 1, 2, 7
+43: 1, 2, 8
+44: 1, 2, 9
+45: 1, 2, 10
+46: 1, 2, 11
+47: 1, 2, 12
+48: 1, 2, 13
+49: 1, 2, 14
+50: 1, 2, 15
+51: 1, 2, 16
+52: 1, 2, 17
+53: 1, 2, 18
+54: 1, 2, 19
+55: 1, 2, 20
+56: 1, 2, 21
+57: 1, 2, 22
+58: 1, 2, 23
+59: 1, 2, 24
+60: 1, 2, 25
+61: 1, 3, 0
+62: 1, 3, 1
+63: 1, 3, 2
+64: 1, 3, 3
+65: 1, 3, 4
+66: 1, 3, 5
+67: 1, 3, 6
+68: 1, 3, 7
+69: 1, 3, 8
+70: 1, 3, 9
+71: 1, 3, 10
+72: 1, 3, 11
+73: 1, 3, 12
+74: 1, 3, 13
+75: 1, 3, 14
+76: 1, 3, 15
+77: 1, 3, 16
+78: 1, 3, 17
+79: 1, 3, 18
+80: 1, 3, 19
+81: 1, 3, 20
+82: 1, 3, 21
+83: 1, 3, 22
+84: 1, 3, 23
+85: 1, 3, 24
+86: 1, 4, 0
+87: 1, 4, 1
+88: 1, 4, 2
+89: 1, 4, 3
+90: 1, 4, 4
+91: 1, 4, 5
+92: 1, 4, 6
+93: 1, 4, 7
+94: 1, 4, 8
+95: 1, 4, 9
+96: 1, 4, 10
+97: 1, 4, 11
+98: 1, 4, 12
+99: 1, 4, 13
+100: 1, 4, 14
+101: 1, 4, 15
+102: 1, 4, 16
+103: 1, 4, 17
+104: 1, 4, 18
+105: 1, 4, 19
+106: 1, 4, 20
+107: 1, 4, 21
+108: 1, 4, 22
+109: 1, 4, 23
+110: 1, 4, 24
+111: 1, 4, 25
+112: 1, 4, 26
+113: 1, 5, 0
+114: 1, 5, 1
+115: 1, 5, 2
+116: 1, 5, 3
+117: 1, 5, 4
+118: 1, 5, 5
+119: 1, 5, 6
+120: 1, 5, 7
+121: 1, 5, 8
+122: 1, 5, 9
+123: 1, 5, 10
+124: 1, 5, 11
+125: 1, 5, 12
+126: 1, 5, 13
+127: 1, 5, 14
+128: 1, 5, 15
+129: 1, 5, 16
+130: 1, 5, 17
+131: 1, 5, 18
+132: 1, 5, 19
+133: 1, 5, 20
+134: 1, 5, 21
+135: 1, 5, 22
+136: 1, 5, 23
+137: 1, 5, 24
+138: 1, 5, 25
+139: 1, 5, 26
+140: 1, 5, 27
+141: 1, 5, 28
+142: 1, 5, 29
+143: 1, 5, 30
+144: 1, 5, 31
+145: 1, 5, 32
+146: 1, 6, 0
+147: 1, 6, 1
+148: 1, 6, 2
+149: 1, 6, 3
+150: 1, 6, 4
+151: 1, 6, 5
+152: 1, 6, 6
+153: 1, 6, 7
+154: 1, 6, 8
+155: 1, 6, 9
+156: 1, 6, 10
+157: 1, 6, 11
+158: 1, 6, 12
+159: 1, 6, 13
+160: 1, 6, 14
+161: 1, 6, 15
+162: 1, 6, 16
+163: 1, 6, 17
+164: 1, 6, 18
+165: 1, 6, 19
+166: 1, 6, 20
+167: 1, 6, 21
+168: 1, 6, 22
+169: 1, 7, 0
+170: 1, 7, 1
+171: 1, 7, 2
+172: 1, 7, 3
+173: 1, 7, 4
+174: 1, 7, 5
+175: 1, 7, 6
+176: 1, 7, 7
+177: 1, 7, 8
+178: 1, 7, 9
+179: 1, 7, 10
+180: 1, 7, 11
+181: 1, 7, 12
+182: 1, 7, 13
+183: 1, 7, 14
+184: 1, 7, 15
+185: 1, 7, 16
+186: 1, 7, 17
+187: 1, 7, 18
+188: 1, 7, 19
+189: 1, 7, 20
+190: 1, 7, 21
+191: 1, 7, 22
+192: 1, 7, 23
+193: 1, 7, 24
+194: 1, 8, 0
+195: 1, 8, 1
+196: 1, 8, 2
+197: 1, 8, 3
+198: 1, 8, 4
+199: 1, 8, 5
+200: 1, 8, 6
+201: 1, 8, 7
+202: 1, 8, 8
+203: 1, 8, 9
+204: 1, 8, 10
+205: 1, 8, 11
+206: 1, 8, 12
+207: 1, 8, 13
+208: 1, 8, 14
+209: 1, 8, 15
+210: 1, 8, 16
+211: 1, 8, 17
+212: 1, 8, 18
+213: 1, 8, 19
+214: 1, 8, 20
+215: 1, 8, 21
+216: 1, 8, 22
+217: 1, 9, 0
+218: 1, 9, 1
+219: 1, 9, 2
+220: 1, 9, 3
+221: 1, 9, 4
+222: 1, 9, 5
+223: 1, 9, 6
+224: 1, 9, 7
+225: 1, 9, 8
+226: 1, 9, 9
+227: 1, 9, 10
+228: 1, 9, 11
+229: 1, 9, 12
+230: 1, 9, 13
+231: 1, 9, 14
+232: 1, 9, 15
+233: 1, 9, 16
+234: 1, 9, 17
+235: 1, 9, 18
+236: 1, 9, 19
+237: 1, 9, 20
+238: 1, 9, 21
+239: 1, 9, 22
+240: 1, 9, 23
+241: 1, 9, 24
+242: 1, 9, 25
+243: 1, 9, 26
+244: 1, 9, 27
+245: 1, 9, 28
+246: 1, 9, 29
+247: 1, 10, 0
+248: 1, 10, 1
+249: 1, 10, 2
+250: 1, 10, 3
+251: 1, 10, 4
+252: 1, 10, 5
+253: 1, 10, 6
+254: 1, 10, 7
+255: 1, 10, 8
+256: 1, 10, 9
+257: 1, 10, 10
+258: 1, 10, 11
+259: 1, 10, 12
+260: 1, 10, 13
+261: 1, 10, 14
+262: 1, 10, 15
+263: 1, 10, 16
+264: 1, 10, 17
+265: 1, 10, 18
+266: 1, 10, 19
+267: 1, 10, 20
+268: 1, 10, 21
+269: 1, 10, 22
+270: 1, 10, 23
+271: 1, 10, 24
+272: 1, 10, 25
+273: 1, 10, 26
+274: 1, 10, 27
+275: 1, 10, 28
+276: 1, 10, 29
+277: 1, 10, 30
+278: 1, 10, 31
+279: 1, 10, 32
+280: 1, 11, 0
+281: 1, 11, 1
+282: 1, 11, 2
+283: 1, 11, 3
+284: 1, 11, 4
+285: 1, 11, 5
+286: 1, 11, 6
+287: 1, 11, 7
+288: 1, 11, 8
+289: 1, 11, 9
+290: 1, 11, 10
+291: 1, 11, 11
+292: 1, 11, 12
+293: 1, 11, 13
+294: 1, 11, 14
+295: 1, 11, 15
+296: 1, 11, 16
+297: 1, 11, 17
+298: 1, 11, 18
+299: 1, 11, 19
+300: 1, 11, 20
+301: 1, 11, 21
+302: 1, 11, 22
+303: 1, 11, 23
+304: 1, 11, 24
+305: 1, 11, 25
+306: 1, 11, 26
+307: 1, 11, 27
+308: 1, 11, 28
+309: 1, 11, 29
+310: 1, 11, 30
+311: 1, 11, 31
+312: 1, 11, 32
+313: 1, 12, 0
+314: 1, 12, 1
+315: 1, 12, 2
+316: 1, 12, 3
+317: 1, 12, 4
+318: 1, 12, 5
+319: 1, 12, 6
+320: 1, 12, 7
+321: 1, 12, 8
+322: 1, 12, 9
+323: 1, 12, 10
+324: 1, 12, 11
+325: 1, 12, 12
+326: 1, 12, 13
+327: 1, 12, 14
+328: 1, 12, 15
+329: 1, 12, 16
+330: 1, 12, 17
+331: 1, 12, 18
+332: 1, 12, 19
+333: 1, 12, 20
+334: 1, 13, 0
+335: 1, 13, 1
+336: 1, 13, 2
+337: 1, 13, 3
+338: 1, 13, 4
+339: 1, 13, 5
+340: 1, 13, 6
+341: 1, 13, 7
+342: 1, 13, 8
+343: 1, 13, 9
+344: 1, 13, 10
+345: 1, 13, 11
+346: 1, 13, 12
+347: 1, 13, 13
+348: 1, 13, 14
+349: 1, 13, 15
+350: 1, 13, 16
+351: 1, 13, 17
+352: 1, 13, 18
+353: 1, 14, 0
+354: 1, 14, 1
+355: 1, 14, 2
+356: 1, 14, 3
+357: 1, 14, 4
+358: 1, 14, 5
+359: 1, 14, 6
+360: 1, 14, 7
+361: 1, 14, 8
+362: 1, 14, 9
+363: 1, 14, 10
+364: 1, 14, 11
+365: 1, 14, 12
+366: 1, 14, 13
+367: 1, 14, 14
+368: 1, 14, 15
+369: 1, 14, 16
+370: 1, 14, 17
+371: 1, 14, 18
+372: 1, 14, 19
+373: 1, 14, 20
+374: 1, 14, 21
+375: 1, 14, 22
+376: 1, 14, 23
+377: 1, 14, 24
+378: 1, 15, 0
+379: 1, 15, 1
+380: 1, 15, 2
+381: 1, 15, 3
+382: 1, 15, 4
+383: 1, 15, 5
+384: 1, 15, 6
+385: 1, 15, 7
+386: 1, 15, 8
+387: 1, 15, 9
+388: 1, 15, 10
+389: 1, 15, 11
+390: 1, 15, 12
+391: 1, 15, 13
+392: 1, 15, 14
+393: 1, 15, 15
+394: 1, 15, 16
+395: 1, 15, 17
+396: 1, 15, 18
+397: 1, 15, 19
+398: 1, 15, 20
+399: 1, 15, 21
+400: 1, 16, 0
+401: 1, 16, 1
+402: 1, 16, 2
+403: 1, 16, 3
+404: 1, 16, 4
+405: 1, 16, 5
+406: 1, 16, 6
+407: 1, 16, 7
+408: 1, 16, 8
+409: 1, 16, 9
+410: 1, 16, 10
+411: 1, 16, 11
+412: 1, 16, 12
+413: 1, 16, 13
+414: 1, 16, 14
+415: 1, 16, 15
+416: 1, 16, 16
+417: 1, 17, 0
+418: 1, 17, 1
+419: 1, 17, 2
+420: 1, 17, 3
+421: 1, 17, 4
+422: 1, 17, 5
+423: 1, 17, 6
+424: 1, 17, 7
+425: 1, 17, 8
+426: 1, 17, 9
+427: 1, 17, 10
+428: 1, 17, 11
+429: 1, 17, 12
+430: 1, 17, 13
+431: 1, 17, 14
+432: 1, 17, 15
+433: 1, 17, 16
+434: 1, 17, 17
+435: 1, 17, 18
+436: 1, 17, 19
+437: 1, 17, 20
+438: 1, 17, 21
+439: 1, 17, 22
+440: 1, 17, 23
+441: 1, 17, 24
+442: 1, 17, 25
+443: 1, 17, 26
+444: 1, 17, 27
+445: 1, 18, 0
+446: 1, 18, 1
+447: 1, 18, 2
+448: 1, 18, 3
+449: 1, 18, 4
+450: 1, 18, 5
+451: 1, 18, 6
+452: 1, 18, 7
+453: 1, 18, 8
+454: 1, 18, 9
+455: 1, 18, 10
+456: 1, 18, 11
+457: 1, 18, 12
+458: 1, 18, 13
+459: 1, 18, 14
+460: 1, 18, 15
+461: 1, 18, 16
+462: 1, 18, 17
+463: 1, 18, 18
+464: 1, 18, 19
+465: 1, 18, 20
+466: 1, 18, 21
+467: 1, 18, 22
+468: 1, 18, 23
+469: 1, 18, 24
+470: 1, 18, 25
+471: 1, 18, 26
+472: 1, 18, 27
+473: 1, 18, 28
+474: 1, 18, 29
+475: 1, 18, 30
+476: 1, 18, 31
+477: 1, 18, 32
+478: 1, 18, 33
+479: 1, 19, 0
+480: 1, 19, 1
+481: 1, 19, 2
+482: 1, 19, 3
+483: 1, 19, 4
+484: 1, 19, 5
+485: 1, 19, 6
+486: 1, 19, 7
+487: 1, 19, 8
+488: 1, 19, 9
+489: 1, 19, 10
+490: 1, 19, 11
+491: 1, 19, 12
+492: 1, 19, 13
+493: 1, 19, 14
+494: 1, 19, 15
+495: 1, 19, 16
+496: 1, 19, 17
+497: 1, 19, 18
+498: 1, 19, 19
+499: 1, 19, 20
+500: 1, 19, 21
+501: 1, 19, 22
+502: 1, 19, 23
+503: 1, 19, 24
+504: 1, 19, 25
+505: 1, 19, 26
+506: 1, 19, 27
+507: 1, 19, 28
+508: 1, 19, 29
+509: 1, 19, 30
+510: 1, 19, 31
+511: 1, 19, 32
+512: 1, 19, 33
+513: 1, 19, 34
+514: 1, 19, 35
+515: 1, 19, 36
+516: 1, 19, 37
+517: 1, 19, 38
+518: 1, 20, 0
+519: 1, 20, 1
+520: 1, 20, 2
+521: 1, 20, 3
+522: 1, 20, 4
+523: 1, 20, 5
+524: 1, 20, 6
+525: 1, 20, 7
+526: 1, 20, 8
+527: 1, 20, 9
+528: 1, 20, 10
+529: 1, 20, 11
+530: 1, 20, 12
+531: 1, 20, 13
+532: 1, 20, 14
+533: 1, 20, 15
+534: 1, 20, 16
+535: 1, 20, 17
+536: 1, 20, 18
+537: 1, 21, 0
+538: 1, 21, 1
+539: 1, 21, 2
+540: 1, 21, 3
+541: 1, 21, 4
+542: 1, 21, 5
+543: 1, 21, 6
+544: 1, 21, 7
+545: 1, 21, 8
+546: 1, 21, 9
+547: 1, 21, 10
+548: 1, 21, 11
+549: 1, 21, 12
+550: 1, 21, 13
+551: 1, 21, 14
+552: 1, 21, 15
+553: 1, 21, 16
+554: 1, 21, 17
+555: 1, 21, 18
+556: 1, 21, 19
+557: 1, 21, 20
+558: 1, 21, 21
+559: 1, 21, 22
+560: 1, 21, 23
+561: 1, 21, 24
+562: 1, 21, 25
+563: 1, 21, 26
+564: 1, 21, 27
+565: 1, 21, 28
+566: 1, 21, 29
+567: 1, 21, 30
+568: 1, 21, 31
+569: 1, 21, 32
+570: 1, 21, 33
+571: 1, 21, 34
+572: 1, 22, 0
+573: 1, 22, 1
+574: 1, 22, 2
+575: 1, 22, 3
+576: 1, 22, 4
+577: 1, 22, 5
+578: 1, 22, 6
+579: 1, 22, 7
+580: 1, 22, 8
+581: 1, 22, 9
+582: 1, 22, 10
+583: 1, 22, 11
+584: 1, 22, 12
+585: 1, 22, 13
+586: 1, 22, 14
+587: 1, 22, 15
+588: 1, 22, 16
+589: 1, 22, 17
+590: 1, 22, 18
+591: 1, 22, 19
+592: 1, 22, 20
+593: 1, 22, 21
+594: 1, 22, 22
+595: 1, 22, 23
+596: 1, 22, 24
+597: 1, 23, 0
+598: 1, 23, 1
+599: 1, 23, 2
+600: 1, 23, 3
+601: 1, 23, 4
+602: 1, 23, 5
+603: 1, 23, 6
+604: 1, 23, 7
+605: 1, 23, 8
+606: 1, 23, 9
+607: 1, 23, 10
+608: 1, 23, 11
+609: 1, 23, 12
+610: 1, 23, 13
+611: 1, 23, 14
+612: 1, 23, 15
+613: 1, 23, 16
+614: 1, 23, 17
+615: 1, 23, 18
+616: 1, 23, 19
+617: 1, 23, 20
+618: 1, 24, 0
+619: 1, 24, 1
+620: 1, 24, 2
+621: 1, 24, 3
+622: 1, 24, 4
+623: 1, 24, 5
+624: 1, 24, 6
+625: 1, 24, 7
+626: 1, 24, 8
+627: 1, 24, 9
+628: 1, 24, 10
+629: 1, 24, 11
+630: 1, 24, 12
+631: 1, 24, 13
+632: 1, 24, 14
+633: 1, 24, 15
+634: 1, 24, 16
+635: 1, 24, 17
+636: 1, 24, 18
+637: 1, 24, 19
+638: 1, 24, 20
+639: 1, 24, 21
+640: 1, 24, 22
+641: 1, 24, 23
+642: 1, 24, 24
+643: 1, 24, 25
+644: 1, 24, 26
+645: 1, 24, 27
+646: 1, 24, 28
+647: 1, 24, 29
+648: 1, 24, 30
+649: 1, 24, 31
+650: 1, 24, 32
+651: 1, 24, 33
+652: 1, 24, 34
+653: 1, 24, 35
+654: 1, 24, 36
+655: 1, 24, 37
+656: 1, 24, 38
+657: 1, 24, 39
+658: 1, 24, 40
+659: 1, 24, 41
+660: 1, 24, 42
+661: 1, 24, 43
+662: 1, 24, 44
+663: 1, 24, 45
+664: 1, 24, 46
+665: 1, 24, 47
+666: 1, 24, 48
+667: 1, 24, 49
+668: 1, 24, 50
+669: 1, 24, 51
+670: 1, 24, 52
+671: 1, 24, 53
+672: 1, 24, 54
+673: 1, 24, 55
+674: 1, 24, 56
+675: 1, 24, 57
+676: 1, 24, 58
+677: 1, 24, 59
+678: 1, 24, 60
+679: 1, 24, 61
+680: 1, 24, 62
+681: 1, 24, 63
+682: 1, 24, 64
+683: 1, 24, 65
+684: 1, 24, 66
+685: 1, 24, 67
+686: 1, 25, 0
+687: 1, 25, 1
+688: 1, 25, 2
+689: 1, 25, 3
+690: 1, 25, 4
+691: 1, 25, 5
+692: 1, 25, 6
+693: 1, 25, 7
+694: 1, 25, 8
+695: 1, 25, 9
+696: 1, 25, 10
+697: 1, 25, 11
+698: 1, 25, 12
+699: 1, 25, 13
+700: 1, 25, 14
+701: 1, 25, 15
+702: 1, 25, 16
+703: 1, 25, 17
+704: 1, 25, 18
+705: 1, 25, 19
+706: 1, 25, 20
+707: 1, 25, 21
+708: 1, 25, 22
+709: 1, 25, 23
+710: 1, 25, 24
+711: 1, 25, 25
+712: 1, 25, 26
+713: 1, 25, 27
+714: 1, 25, 28
+715: 1, 25, 29
+716: 1, 25, 30
+717: 1, 25, 31
+718: 1, 25, 32
+719: 1, 25, 33
+720: 1, 25, 34
+721: 1, 26, 0
+722: 1, 26, 1
+723: 1, 26, 2
+724: 1, 26, 3
+725: 1, 26, 4
+726: 1, 26, 5
+727: 1, 26, 6
+728: 1, 26, 7
+729: 1, 26, 8
+730: 1, 26, 9
+731: 1, 26, 10
+732: 1, 26, 11
+733: 1, 26, 12
+734: 1, 26, 13
+735: 1, 26, 14
+736: 1, 26, 15
+737: 1, 26, 16
+738: 1, 26, 17
+739: 1, 26, 18
+740: 1, 26, 19
+741: 1, 26, 20
+742: 1, 26, 21
+743: 1, 26, 22
+744: 1, 26, 23
+745: 1, 26, 24
+746: 1, 26, 25
+747: 1, 26, 26
+748: 1, 26, 27
+749: 1, 26, 28
+750: 1, 26, 29
+751: 1, 26, 30
+752: 1, 26, 31
+753: 1, 26, 32
+754: 1, 26, 33
+755: 1, 26, 34
+756: 1, 26, 35
+757: 1, 27, 0
+758: 1, 27, 1
+759: 1, 27, 2
+760: 1, 27, 3
+761: 1, 27, 4
+762: 1, 27, 5
+763: 1, 27, 6
+764: 1, 27, 7
+765: 1, 27, 8
+766: 1, 27, 9
+767: 1, 27, 10
+768: 1, 27, 11
+769: 1, 27, 12
+770: 1, 27, 13
+771: 1, 27, 14
+772: 1, 27, 15
+773: 1, 27, 16
+774: 1, 27, 17
+775: 1, 27, 18
+776: 1, 27, 19
+777: 1, 27, 20
+778: 1, 27, 21
+779: 1, 27, 22
+780: 1, 27, 23
+781: 1, 27, 24
+782: 1, 27, 25
+783: 1, 27, 26
+784: 1, 27, 27
+785: 1, 27, 28
+786: 1, 27, 29
+787: 1, 27, 30
+788: 1, 27, 31
+789: 1, 27, 32
+790: 1, 27, 33
+791: 1, 27, 34
+792: 1, 27, 35
+793: 1, 27, 36
+794: 1, 27, 37
+795: 1, 27, 38
+796: 1, 27, 39
+797: 1, 27, 40
+798: 1, 27, 41
+799: 1, 27, 42
+800: 1, 27, 43
+801: 1, 27, 44
+802: 1, 27, 45
+803: 1, 27, 46
+804: 1, 28, 0
+805: 1, 28, 1
+806: 1, 28, 2
+807: 1, 28, 3
+808: 1, 28, 4
+809: 1, 28, 5
+810: 1, 28, 6
+811: 1, 28, 7
+812: 1, 28, 8
+813: 1, 28, 9
+814: 1, 28, 10
+815: 1, 28, 11
+816: 1, 28, 12
+817: 1, 28, 13
+818: 1, 28, 14
+819: 1, 28, 15
+820: 1, 28, 16
+821: 1, 28, 17
+822: 1, 28, 18
+823: 1, 28, 19
+824: 1, 28, 20
+825: 1, 28, 21
+826: 1, 28, 22
+827: 1, 29, 0
+828: 1, 29, 1
+829: 1, 29, 2
+830: 1, 29, 3
+831: 1, 29, 4
+832: 1, 29, 5
+833: 1, 29, 6
+834: 1, 29, 7
+835: 1, 29, 8
+836: 1, 29, 9
+837: 1, 29, 10
+838: 1, 29, 11
+839: 1, 29, 12
+840: 1, 29, 13
+841: 1, 29, 14
+842: 1, 29, 15
+843: 1, 29, 16
+844: 1, 29, 17
+845: 1, 29, 18
+846: 1, 29, 19
+847: 1, 29, 20
+848: 1, 29, 21
+849: 1, 29, 22
+850: 1, 29, 23
+851: 1, 29, 24
+852: 1, 29, 25
+853: 1, 29, 26
+854: 1, 29, 27
+855: 1, 29, 28
+856: 1, 29, 29
+857: 1, 29, 30
+858: 1, 29, 31
+859: 1, 29, 32
+860: 1, 29, 33
+861: 1, 29, 34
+862: 1, 29, 35
+863: 1, 30, 0
+864: 1, 30, 1
+865: 1, 30, 2
+866: 1, 30, 3
+867: 1, 30, 4
+868: 1, 30, 5
+869: 1, 30, 6
+870: 1, 30, 7
+871: 1, 30, 8
+872: 1, 30, 9
+873: 1, 30, 10
+874: 1, 30, 11
+875: 1, 30, 12
+876: 1, 30, 13
+877: 1, 30, 14
+878: 1, 30, 15
+879: 1, 30, 16
+880: 1, 30, 17
+881: 1, 30, 18
+882: 1, 30, 19
+883: 1, 30, 20
+884: 1, 30, 21
+885: 1, 30, 22
+886: 1, 30, 23
+887: 1, 30, 24
+888: 1, 30, 25
+889: 1, 30, 26
+890: 1, 30, 27
+891: 1, 30, 28
+892: 1, 30, 29
+893: 1, 30, 30
+894: 1, 30, 31
+895: 1, 30, 32
+896: 1, 30, 33
+897: 1, 30, 34
+898: 1, 30, 35
+899: 1, 30, 36
+900: 1, 30, 37
+901: 1, 30, 38
+902: 1, 30, 39
+903: 1, 30, 40
+904: 1, 30, 41
+905: 1, 30, 42
+906: 1, 30, 43
+907: 1, 31, 0
+908: 1, 31, 1
+909: 1, 31, 2
+910: 1, 31, 3
+911: 1, 31, 4
+912: 1, 31, 5
+913: 1, 31, 6
+914: 1, 31, 7
+915: 1, 31, 8
+916: 1, 31, 9
+917: 1, 31, 10
+918: 1, 31, 11
+919: 1, 31, 12
+920: 1, 31, 13
+921: 1, 31, 14
+922: 1, 31, 15
+923: 1, 31, 16
+924: 1, 31, 17
+925: 1, 31, 18
+926: 1, 31, 19
+927: 1, 31, 20
+928: 1, 31, 21
+929: 1, 31, 22
+930: 1, 31, 23
+931: 1, 31, 24
+932: 1, 31, 25
+933: 1, 31, 26
+934: 1, 31, 27
+935: 1, 31, 28
+936: 1, 31, 29
+937: 1, 31, 30
+938: 1, 31, 31
+939: 1, 31, 32
+940: 1, 31, 33
+941: 1, 31, 34
+942: 1, 31, 35
+943: 1, 31, 36
+944: 1, 31, 37
+945: 1, 31, 38
+946: 1, 31, 39
+947: 1, 31, 40
+948: 1, 31, 41
+949: 1, 31, 42
+950: 1, 31, 43
+951: 1, 31, 44
+952: 1, 31, 45
+953: 1, 31, 46
+954: 1, 31, 47
+955: 1, 31, 48
+956: 1, 31, 49
+957: 1, 31, 50
+958: 1, 31, 51
+959: 1, 31, 52
+960: 1, 31, 53
+961: 1, 31, 54
+962: 1, 31, 55
+963: 1, 32, 0
+964: 1, 32, 1
+965: 1, 32, 2
+966: 1, 32, 3
+967: 1, 32, 4
+968: 1, 32, 5
+969: 1, 32, 6
+970: 1, 32, 7
+971: 1, 32, 8
+972: 1, 32, 9
+973: 1, 32, 10
+974: 1, 32, 11
+975: 1, 32, 12
+976: 1, 32, 13
+977: 1, 32, 14
+978: 1, 32, 15
+979: 1, 32, 16
+980: 1, 32, 17
+981: 1, 32, 18
+982: 1, 32, 19
+983: 1, 32, 20
+984: 1, 32, 21
+985: 1, 32, 22
+986: 1, 32, 23
+987: 1, 32, 24
+988: 1, 32, 25
+989: 1, 32, 26
+990: 1, 32, 27
+991: 1, 32, 28
+992: 1, 32, 29
+993: 1, 32, 30
+994: 1, 32, 31
+995: 1, 32, 32
+996: 1, 33, 0
+997: 1, 33, 1
+998: 1, 33, 2
+999: 1, 33, 3
+1000: 1, 33, 4
+1001: 1, 33, 5
+1002: 1, 33, 6
+1003: 1, 33, 7
+1004: 1, 33, 8
+1005: 1, 33, 9
+1006: 1, 33, 10
+1007: 1, 33, 11
+1008: 1, 33, 12
+1009: 1, 33, 13
+1010: 1, 33, 14
+1011: 1, 33, 15
+1012: 1, 33, 16
+1013: 1, 33, 17
+1014: 1, 33, 18
+1015: 1, 33, 19
+1016: 1, 33, 20
+1017: 1, 34, 0
+1018: 1, 34, 1
+1019: 1, 34, 2
+1020: 1, 34, 3
+1021: 1, 34, 4
+1022: 1, 34, 5
+1023: 1, 34, 6
+1024: 1, 34, 7
+1025: 1, 34, 8
+1026: 1, 34, 9
+1027: 1, 34, 10
+1028: 1, 34, 11
+1029: 1, 34, 12
+1030: 1, 34, 13
+1031: 1, 34, 14
+1032: 1, 34, 15
+1033: 1, 34, 16
+1034: 1, 34, 17
+1035: 1, 34, 18
+1036: 1, 34, 19
+1037: 1, 34, 20
+1038: 1, 34, 21
+1039: 1, 34, 22
+1040: 1, 34, 23
+1041: 1, 34, 24
+1042: 1, 34, 25
+1043: 1, 34, 26
+1044: 1, 34, 27
+1045: 1, 34, 28
+1046: 1, 34, 29
+1047: 1, 34, 30
+1048: 1, 34, 31
+1049: 1, 35, 0
+1050: 1, 35, 1
+1051: 1, 35, 2
+1052: 1, 35, 3
+1053: 1, 35, 4
+1054: 1, 35, 5
+1055: 1, 35, 6
+1056: 1, 35, 7
+1057: 1, 35, 8
+1058: 1, 35, 9
+1059: 1, 35, 10
+1060: 1, 35, 11
+1061: 1, 35, 12
+1062: 1, 35, 13
+1063: 1, 35, 14
+1064: 1, 35, 15
+1065: 1, 35, 16
+1066: 1, 35, 17
+1067: 1, 35, 18
+1068: 1, 35, 19
+1069: 1, 35, 20
+1070: 1, 35, 21
+1071: 1, 35, 22
+1072: 1, 35, 23
+1073: 1, 35, 24
+1074: 1, 35, 25
+1075: 1, 35, 26
+1076: 1, 35, 27
+1077: 1, 35, 28
+1078: 1, 35, 29
+1079: 1, 36, 0
+1080: 1, 36, 1
+1081: 1, 36, 2
+1082: 1, 36, 3
+1083: 1, 36, 4
+1084: 1, 36, 5
+1085: 1, 36, 6
+1086: 1, 36, 7
+1087: 1, 36, 8
+1088: 1, 36, 9
+1089: 1, 36, 10
+1090: 1, 36, 11
+1091: 1, 36, 12
+1092: 1, 36, 13
+1093: 1, 36, 14
+1094: 1, 36, 15
+1095: 1, 36, 16
+1096: 1, 36, 17
+1097: 1, 36, 18
+1098: 1, 36, 19
+1099: 1, 36, 20
+1100: 1, 36, 21
+1101: 1, 36, 22
+1102: 1, 36, 23
+1103: 1, 36, 24
+1104: 1, 36, 25
+1105: 1, 36, 26
+1106: 1, 36, 27
+1107: 1, 36, 28
+1108: 1, 36, 29
+1109: 1, 36, 30
+1110: 1, 36, 31
+1111: 1, 36, 32
+1112: 1, 36, 33
+1113: 1, 36, 34
+1114: 1, 36, 35
+1115: 1, 36, 36
+1116: 1, 36, 37
+1117: 1, 36, 38
+1118: 1, 36, 39
+1119: 1, 36, 40
+1120: 1, 36, 41
+1121: 1, 36, 42
+1122: 1, 36, 43
+1123: 1, 37, 0
+1124: 1, 37, 1
+1125: 1, 37, 2
+1126: 1, 37, 3
+1127: 1, 37, 4
+1128: 1, 37, 5
+1129: 1, 37, 6
+1130: 1, 37, 7
+1131: 1, 37, 8
+1132: 1, 37, 9
+1133: 1, 37, 10
+1134: 1, 37, 11
+1135: 1, 37, 12
+1136: 1, 37, 13
+1137: 1, 37, 14
+1138: 1, 37, 15
+1139: 1, 37, 16
+1140: 1, 37, 17
+1141: 1, 37, 18
+1142: 1, 37, 19
+1143: 1, 37, 20
+1144: 1, 37, 21
+1145: 1, 37, 22
+1146: 1, 37, 23
+1147: 1, 37, 24
+1148: 1, 37, 25
+1149: 1, 37, 26
+1150: 1, 37, 27
+1151: 1, 37, 28
+1152: 1, 37, 29
+1153: 1, 37, 30
+1154: 1, 37, 31
+1155: 1, 37, 32
+1156: 1, 37, 33
+1157: 1, 37, 34
+1158: 1, 37, 35
+1159: 1, 37, 36
+1160: 1, 38, 0
+1161: 1, 38, 1
+1162: 1, 38, 2
+1163: 1, 38, 3
+1164: 1, 38, 4
+1165: 1, 38, 5
+1166: 1, 38, 6
+1167: 1, 38, 7
+1168: 1, 38, 8
+1169: 1, 38, 9
+1170: 1, 38, 10
+1171: 1, 38, 11
+1172: 1, 38, 12
+1173: 1, 38, 13
+1174: 1, 38, 14
+1175: 1, 38, 15
+1176: 1, 38, 16
+1177: 1, 38, 17
+1178: 1, 38, 18
+1179: 1, 38, 19
+1180: 1, 38, 20
+1181: 1, 38, 21
+1182: 1, 38, 22
+1183: 1, 38, 23
+1184: 1, 38, 24
+1185: 1, 38, 25
+1186: 1, 38, 26
+1187: 1, 38, 27
+1188: 1, 38, 28
+1189: 1, 38, 29
+1190: 1, 38, 30
+1191: 1, 39, 0
+1192: 1, 39, 1
+1193: 1, 39, 2
+1194: 1, 39, 3
+1195: 1, 39, 4
+1196: 1, 39, 5
+1197: 1, 39, 6
+1198: 1, 39, 7
+1199: 1, 39, 8
+1200: 1, 39, 9
+1201: 1, 39, 10
+1202: 1, 39, 11
+1203: 1, 39, 12
+1204: 1, 39, 13
+1205: 1, 39, 14
+1206: 1, 39, 15
+1207: 1, 39, 16
+1208: 1, 39, 17
+1209: 1, 39, 18
+1210: 1, 39, 19
+1211: 1, 39, 20
+1212: 1, 39, 21
+1213: 1, 39, 22
+1214: 1, 39, 23
+1215: 1, 40, 0
+1216: 1, 40, 1
+1217: 1, 40, 2
+1218: 1, 40, 3
+1219: 1, 40, 4
+1220: 1, 40, 5
+1221: 1, 40, 6
+1222: 1, 40, 7
+1223: 1, 40, 8
+1224: 1, 40, 9
+1225: 1, 40, 10
+1226: 1, 40, 11
+1227: 1, 40, 12
+1228: 1, 40, 13
+1229: 1, 40, 14
+1230: 1, 40, 15
+1231: 1, 40, 16
+1232: 1, 40, 17
+1233: 1, 40, 18
+1234: 1, 40, 19
+1235: 1, 40, 20
+1236: 1, 40, 21
+1237: 1, 40, 22
+1238: 1, 40, 23
+1239: 1, 41, 0
+1240: 1, 41, 1
+1241: 1, 41, 2
+1242: 1, 41, 3
+1243: 1, 41, 4
+1244: 1, 41, 5
+1245: 1, 41, 6
+1246: 1, 41, 7
+1247: 1, 41, 8
+1248: 1, 41, 9
+1249: 1, 41, 10
+1250: 1, 41, 11
+1251: 1, 41, 12
+1252: 1, 41, 13
+1253: 1, 41, 14
+1254: 1, 41, 15
+1255: 1, 41, 16
+1256: 1, 41, 17
+1257: 1, 41, 18
+1258: 1, 41, 19
+1259: 1, 41, 20
+1260: 1, 41, 21
+1261: 1, 41, 22
+1262: 1, 41, 23
+1263: 1, 41, 24
+1264: 1, 41, 25
+1265: 1, 41, 26
+1266: 1, 41, 27
+1267: 1, 41, 28
+1268: 1, 41, 29
+1269: 1, 41, 30
+1270: 1, 41, 31
+1271: 1, 41, 32
+1272: 1, 41, 33
+1273: 1, 41, 34
+1274: 1, 41, 35
+1275: 1, 41, 36
+1276: 1, 41, 37
+1277: 1, 41, 38
+1278: 1, 41, 39
+1279: 1, 41, 40
+1280: 1, 41, 41
+1281: 1, 41, 42
+1282: 1, 41, 43
+1283: 1, 41, 44
+1284: 1, 41, 45
+1285: 1, 41, 46
+1286: 1, 41, 47
+1287: 1, 41, 48
+1288: 1, 41, 49
+1289: 1, 41, 50
+1290: 1, 41, 51
+1291: 1, 41, 52
+1292: 1, 41, 53
+1293: 1, 41, 54
+1294: 1, 41, 55
+1295: 1, 41, 56
+1296: 1, 41, 57
+1297: 1, 42, 0
+1298: 1, 42, 1
+1299: 1, 42, 2
+1300: 1, 42, 3
+1301: 1, 42, 4
+1302: 1, 42, 5
+1303: 1, 42, 6
+1304: 1, 42, 7
+1305: 1, 42, 8
+1306: 1, 42, 9
+1307: 1, 42, 10
+1308: 1, 42, 11
+1309: 1, 42, 12
+1310: 1, 42, 13
+1311: 1, 42, 14
+1312: 1, 42, 15
+1313: 1, 42, 16
+1314: 1, 42, 17
+1315: 1, 42, 18
+1316: 1, 42, 19
+1317: 1, 42, 20
+1318: 1, 42, 21
+1319: 1, 42, 22
+1320: 1, 42, 23
+1321: 1, 42, 24
+1322: 1, 42, 25
+1323: 1, 42, 26
+1324: 1, 42, 27
+1325: 1, 42, 28
+1326: 1, 42, 29
+1327: 1, 42, 30
+1328: 1, 42, 31
+1329: 1, 42, 32
+1330: 1, 42, 33
+1331: 1, 42, 34
+1332: 1, 42, 35
+1333: 1, 42, 36
+1334: 1, 42, 37
+1335: 1, 42, 38
+1336: 1, 43, 0
+1337: 1, 43, 1
+1338: 1, 43, 2
+1339: 1, 43, 3
+1340: 1, 43, 4
+1341: 1, 43, 5
+1342: 1, 43, 6
+1343: 1, 43, 7
+1344: 1, 43, 8
+1345: 1, 43, 9
+1346: 1, 43, 10
+1347: 1, 43, 11
+1348: 1, 43, 12
+1349: 1, 43, 13
+1350: 1, 43, 14
+1351: 1, 43, 15
+1352: 1, 43, 16
+1353: 1, 43, 17
+1354: 1, 43, 18
+1355: 1, 43, 19
+1356: 1, 43, 20
+1357: 1, 43, 21
+1358: 1, 43, 22
+1359: 1, 43, 23
+1360: 1, 43, 24
+1361: 1, 43, 25
+1362: 1, 43, 26
+1363: 1, 43, 27
+1364: 1, 43, 28
+1365: 1, 43, 29
+1366: 1, 43, 30
+1367: 1, 43, 31
+1368: 1, 43, 32
+1369: 1, 43, 33
+1370: 1, 43, 34
+1371: 1, 44, 0
+1372: 1, 44, 1
+1373: 1, 44, 2
+1374: 1, 44, 3
+1375: 1, 44, 4
+1376: 1, 44, 5
+1377: 1, 44, 6
+1378: 1, 44, 7
+1379: 1, 44, 8
+1380: 1, 44, 9
+1381: 1, 44, 10
+1382: 1, 44, 11
+1383: 1, 44, 12
+1384: 1, 44, 13
+1385: 1, 44, 14
+1386: 1, 44, 15
+1387: 1, 44, 16
+1388: 1, 44, 17
+1389: 1, 44, 18
+1390: 1, 44, 19
+1391: 1, 44, 20
+1392: 1, 44, 21
+1393: 1, 44, 22
+1394: 1, 44, 23
+1395: 1, 44, 24
+1396: 1, 44, 25
+1397: 1, 44, 26
+1398: 1, 44, 27
+1399: 1, 44, 28
+1400: 1, 44, 29
+1401: 1, 44, 30
+1402: 1, 44, 31
+1403: 1, 44, 32
+1404: 1, 44, 33
+1405: 1, 44, 34
+1406: 1, 45, 0
+1407: 1, 45, 1
+1408: 1, 45, 2
+1409: 1, 45, 3
+1410: 1, 45, 4
+1411: 1, 45, 5
+1412: 1, 45, 6
+1413: 1, 45, 7
+1414: 1, 45, 8
+1415: 1, 45, 9
+1416: 1, 45, 10
+1417: 1, 45, 11
+1418: 1, 45, 12
+1419: 1, 45, 13
+1420: 1, 45, 14
+1421: 1, 45, 15
+1422: 1, 45, 16
+1423: 1, 45, 17
+1424: 1, 45, 18
+1425: 1, 45, 19
+1426: 1, 45, 20
+1427: 1, 45, 21
+1428: 1, 45, 22
+1429: 1, 45, 23
+1430: 1, 45, 24
+1431: 1, 45, 25
+1432: 1, 45, 26
+1433: 1, 45, 27
+1434: 1, 45, 28
+1435: 1, 46, 0
+1436: 1, 46, 1
+1437: 1, 46, 2
+1438: 1, 46, 3
+1439: 1, 46, 4
+1440: 1, 46, 5
+1441: 1, 46, 6
+1442: 1, 46, 7
+1443: 1, 46, 8
+1444: 1, 46, 9
+1445: 1, 46, 10
+1446: 1, 46, 11
+1447: 1, 46, 12
+1448: 1, 46, 13
+1449: 1, 46, 14
+1450: 1, 46, 15
+1451: 1, 46, 16
+1452: 1, 46, 17
+1453: 1, 46, 18
+1454: 1, 46, 19
+1455: 1, 46, 20
+1456: 1, 46, 21
+1457: 1, 46, 22
+1458: 1, 46, 23
+1459: 1, 46, 24
+1460: 1, 46, 25
+1461: 1, 46, 26
+1462: 1, 46, 27
+1463: 1, 46, 28
+1464: 1, 46, 29
+1465: 1, 46, 30
+1466: 1, 46, 31
+1467: 1, 46, 32
+1468: 1, 46, 33
+1469: 1, 46, 34
+1470: 1, 47, 0
+1471: 1, 47, 1
+1472: 1, 47, 2
+1473: 1, 47, 3
+1474: 1, 47, 4
+1475: 1, 47, 5
+1476: 1, 47, 6
+1477: 1, 47, 7
+1478: 1, 47, 8
+1479: 1, 47, 9
+1480: 1, 47, 10
+1481: 1, 47, 11
+1482: 1, 47, 12
+1483: 1, 47, 13
+1484: 1, 47, 14
+1485: 1, 47, 15
+1486: 1, 47, 16
+1487: 1, 47, 17
+1488: 1, 47, 18
+1489: 1, 47, 19
+1490: 1, 47, 20
+1491: 1, 47, 21
+1492: 1, 47, 22
+1493: 1, 47, 23
+1494: 1, 47, 24
+1495: 1, 47, 25
+1496: 1, 47, 26
+1497: 1, 47, 27
+1498: 1, 47, 28
+1499: 1, 47, 29
+1500: 1, 47, 30
+1501: 1, 47, 31
+1502: 1, 48, 0
+1503: 1, 48, 1
+1504: 1, 48, 2
+1505: 1, 48, 3
+1506: 1, 48, 4
+1507: 1, 48, 5
+1508: 1, 48, 6
+1509: 1, 48, 7
+1510: 1, 48, 8
+1511: 1, 48, 9
+1512: 1, 48, 10
+1513: 1, 48, 11
+1514: 1, 48, 12
+1515: 1, 48, 13
+1516: 1, 48, 14
+1517: 1, 48, 15
+1518: 1, 48, 16
+1519: 1, 48, 17
+1520: 1, 48, 18
+1521: 1, 48, 19
+1522: 1, 48, 20
+1523: 1, 48, 21
+1524: 1, 48, 22
+1525: 1, 49, 0
+1526: 1, 49, 1
+1527: 1, 49, 2
+1528: 1, 49, 3
+1529: 1, 49, 4
+1530: 1, 49, 5
+1531: 1, 49, 6
+1532: 1, 49, 7
+1533: 1, 49, 8
+1534: 1, 49, 9
+1535: 1, 49, 10
+1536: 1, 49, 11
+1537: 1, 49, 12
+1538: 1, 49, 13
+1539: 1, 49, 14
+1540: 1, 49, 15
+1541: 1, 49, 16
+1542: 1, 49, 17
+1543: 1, 49, 18
+1544: 1, 49, 19
+1545: 1, 49, 20
+1546: 1, 49, 21
+1547: 1, 49, 22
+1548: 1, 49, 23
+1549: 1, 49, 24
+1550: 1, 49, 25
+1551: 1, 49, 26
+1552: 1, 49, 27
+1553: 1, 49, 28
+1554: 1, 49, 29
+1555: 1, 49, 30
+1556: 1, 49, 31
+1557: 1, 49, 32
+1558: 1, 49, 33
+1559: 1, 50, 0
+1560: 1, 50, 1
+1561: 1, 50, 2
+1562: 1, 50, 3
+1563: 1, 50, 4
+1564: 1, 50, 5
+1565: 1, 50, 6
+1566: 1, 50, 7
+1567: 1, 50, 8
+1568: 1, 50, 9
+1569: 1, 50, 10
+1570: 1, 50, 11
+1571: 1, 50, 12
+1572: 1, 50, 13
+1573: 1, 50, 14
+1574: 1, 50, 15
+1575: 1, 50, 16
+1576: 1, 50, 17
+1577: 1, 50, 18
+1578: 1, 50, 19
+1579: 1, 50, 20
+1580: 1, 50, 21
+1581: 1, 50, 22
+1582: 1, 50, 23
+1583: 1, 50, 24
+1584: 1, 50, 25
+1585: 1, 50, 26
+1586: 2, 0, 0
+1587: 2, 1, 0
+1588: 2, 1, 1
+1589: 2, 1, 2
+1590: 2, 1, 3
+1591: 2, 1, 4
+1592: 2, 1, 5
+1593: 2, 1, 6
+1594: 2, 1, 7
+1595: 2, 1, 8
+1596: 2, 1, 9
+1597: 2, 1, 10
+1598: 2, 1, 11
+1599: 2, 1, 12
+1600: 2, 1, 13
+1601: 2, 1, 14
+1602: 2, 1, 15
+1603: 2, 1, 16
+1604: 2, 1, 17
+1605: 2, 1, 18
+1606: 2, 1, 19
+1607: 2, 1, 20
+1608: 2, 1, 21
+1609: 2, 1, 22
+1610: 2, 2, 0
+1611: 2, 2, 1
+1612: 2, 2, 2
+1613: 2, 2, 3
+1614: 2, 2, 4
+1615: 2, 2, 5
+1616: 2, 2, 6
+1617: 2, 2, 7
+1618: 2, 2, 8
+1619: 2, 2, 9
+1620: 2, 2, 10
+1621: 2, 2, 11
+1622: 2, 2, 12
+1623: 2, 2, 13
+1624: 2, 2, 14
+1625: 2, 2, 15
+1626: 2, 2, 16
+1627: 2, 2, 17
+1628: 2, 2, 18
+1629: 2, 2, 19
+1630: 2, 2, 20
+1631: 2, 2, 21
+1632: 2, 2, 22
+1633: 2, 2, 23
+1634: 2, 2, 24
+1635: 2, 2, 25
+1636: 2, 3, 0
+1637: 2, 3, 1
+1638: 2, 3, 2
+1639: 2, 3, 3
+1640: 2, 3, 4
+1641: 2, 3, 5
+1642: 2, 3, 6
+1643: 2, 3, 7
+1644: 2, 3, 8
+1645: 2, 3, 9
+1646: 2, 3, 10
+1647: 2, 3, 11
+1648: 2, 3, 12
+1649: 2, 3, 13
+1650: 2, 3, 14
+1651: 2, 3, 15
+1652: 2, 3, 16
+1653: 2, 3, 17
+1654: 2, 3, 18
+1655: 2, 3, 19
+1656: 2, 3, 20
+1657: 2, 3, 21
+1658: 2, 3, 22
+1659: 2, 4, 0
+1660: 2, 4, 1
+1661: 2, 4, 2
+1662: 2, 4, 3
+1663: 2, 4, 4
+1664: 2, 4, 5
+1665: 2, 4, 6
+1666: 2, 4, 7
+1667: 2, 4, 8
+1668: 2, 4, 9
+1669: 2, 4, 10
+1670: 2, 4, 11
+1671: 2, 4, 12
+1672: 2, 4, 13
+1673: 2, 4, 14
+1674: 2, 4, 15
+1675: 2, 4, 16
+1676: 2, 4, 17
+1677: 2, 4, 18
+1678: 2, 4, 19
+1679: 2, 4, 20
+1680: 2, 4, 21
+1681: 2, 4, 22
+1682: 2, 4, 23
+1683: 2, 4, 24
+1684: 2, 4, 25
+1685: 2, 4, 26
+1686: 2, 4, 27
+1687: 2, 4, 28
+1688: 2, 4, 29
+1689: 2, 4, 30
+1690: 2, 4, 31
+1691: 2, 5, 0
+1692: 2, 5, 1
+1693: 2, 5, 2
+1694: 2, 5, 3
+1695: 2, 5, 4
+1696: 2, 5, 5
+1697: 2, 5, 6
+1698: 2, 5, 7
+1699: 2, 5, 8
+1700: 2, 5, 9
+1701: 2, 5, 10
+1702: 2, 5, 11
+1703: 2, 5, 12
+1704: 2, 5, 13
+1705: 2, 5, 14
+1706: 2, 5, 15
+1707: 2, 5, 16
+1708: 2, 5, 17
+1709: 2, 5, 18
+1710: 2, 5, 19
+1711: 2, 5, 20
+1712: 2, 5, 21
+1713: 2, 5, 22
+1714: 2, 5, 23
+1715: 2, 6, 0
+1716: 2, 6, 1
+1717: 2, 6, 2
+1718: 2, 6, 3
+1719: 2, 6, 4
+1720: 2, 6, 5
+1721: 2, 6, 6
+1722: 2, 6, 7
+1723: 2, 6, 8
+1724: 2, 6, 9
+1725: 2, 6, 10
+1726: 2, 6, 11
+1727: 2, 6, 12
+1728: 2, 6, 13
+1729: 2, 6, 14
+1730: 2, 6, 15
+1731: 2, 6, 16
+1732: 2, 6, 17
+1733: 2, 6, 18
+1734: 2, 6, 19
+1735: 2, 6, 20
+1736: 2, 6, 21
+1737: 2, 6, 22
+1738: 2, 6, 23
+1739: 2, 6, 24
+1740: 2, 6, 25
+1741: 2, 6, 26
+1742: 2, 6, 27
+1743: 2, 6, 28
+1744: 2, 6, 29
+1745: 2, 6, 30
+1746: 2, 7, 0
+1747: 2, 7, 1
+1748: 2, 7, 2
+1749: 2, 7, 3
+1750: 2, 7, 4
+1751: 2, 7, 5
+1752: 2, 7, 6
+1753: 2, 7, 7
+1754: 2, 7, 8
+1755: 2, 7, 9
+1756: 2, 7, 10
+1757: 2, 7, 11
+1758: 2, 7, 12
+1759: 2, 7, 13
+1760: 2, 7, 14
+1761: 2, 7, 15
+1762: 2, 7, 16
+1763: 2, 7, 17
+1764: 2, 7, 18
+1765: 2, 7, 19
+1766: 2, 7, 20
+1767: 2, 7, 21
+1768: 2, 7, 22
+1769: 2, 7, 23
+1770: 2, 7, 24
+1771: 2, 7, 25
+1772: 2, 8, 0
+1773: 2, 8, 1
+1774: 2, 8, 2
+1775: 2, 8, 3
+1776: 2, 8, 4
+1777: 2, 8, 5
+1778: 2, 8, 6
+1779: 2, 8, 7
+1780: 2, 8, 8
+1781: 2, 8, 9
+1782: 2, 8, 10
+1783: 2, 8, 11
+1784: 2, 8, 12
+1785: 2, 8, 13
+1786: 2, 8, 14
+1787: 2, 8, 15
+1788: 2, 8, 16
+1789: 2, 8, 17
+1790: 2, 8, 18
+1791: 2, 8, 19
+1792: 2, 8, 20
+1793: 2, 8, 21
+1794: 2, 8, 22
+1795: 2, 8, 23
+1796: 2, 8, 24
+1797: 2, 8, 25
+1798: 2, 8, 26
+1799: 2, 8, 27
+1800: 2, 8, 28
+1801: 2, 8, 29
+1802: 2, 8, 30
+1803: 2, 8, 31
+1804: 2, 8, 32
+1805: 2, 9, 0
+1806: 2, 9, 1
+1807: 2, 9, 2
+1808: 2, 9, 3
+1809: 2, 9, 4
+1810: 2, 9, 5
+1811: 2, 9, 6
+1812: 2, 9, 7
+1813: 2, 9, 8
+1814: 2, 9, 9
+1815: 2, 9, 10
+1816: 2, 9, 11
+1817: 2, 9, 12
+1818: 2, 9, 13
+1819: 2, 9, 14
+1820: 2, 9, 15
+1821: 2, 9, 16
+1822: 2, 9, 17
+1823: 2, 9, 18
+1824: 2, 9, 19
+1825: 2, 9, 20
+1826: 2, 9, 21
+1827: 2, 9, 22
+1828: 2, 9, 23
+1829: 2, 9, 24
+1830: 2, 9, 25
+1831: 2, 9, 26
+1832: 2, 9, 27
+1833: 2, 9, 28
+1834: 2, 9, 29
+1835: 2, 9, 30
+1836: 2, 9, 31
+1837: 2, 9, 32
+1838: 2, 9, 33
+1839: 2, 9, 34
+1840: 2, 9, 35
+1841: 2, 10, 0
+1842: 2, 10, 1
+1843: 2, 10, 2
+1844: 2, 10, 3
+1845: 2, 10, 4
+1846: 2, 10, 5
+1847: 2, 10, 6
+1848: 2, 10, 7
+1849: 2, 10, 8
+1850: 2, 10, 9
+1851: 2, 10, 10
+1852: 2, 10, 11
+1853: 2, 10, 12
+1854: 2, 10, 13
+1855: 2, 10, 14
+1856: 2, 10, 15
+1857: 2, 10, 16
+1858: 2, 10, 17
+1859: 2, 10, 18
+1860: 2, 10, 19
+1861: 2, 10, 20
+1862: 2, 10, 21
+1863: 2, 10, 22
+1864: 2, 10, 23
+1865: 2, 10, 24
+1866: 2, 10, 25
+1867: 2, 10, 26
+1868: 2, 10, 27
+1869: 2, 10, 28
+1870: 2, 10, 29
+1871: 2, 11, 0
+1872: 2, 11, 1
+1873: 2, 11, 2
+1874: 2, 11, 3
+1875: 2, 11, 4
+1876: 2, 11, 5
+1877: 2, 11, 6
+1878: 2, 11, 7
+1879: 2, 11, 8
+1880: 2, 11, 9
+1881: 2, 11, 10
+1882: 2, 12, 0
+1883: 2, 12, 1
+1884: 2, 12, 2
+1885: 2, 12, 3
+1886: 2, 12, 4
+1887: 2, 12, 5
+1888: 2, 12, 6
+1889: 2, 12, 7
+1890: 2, 12, 8
+1891: 2, 12, 9
+1892: 2, 12, 10
+1893: 2, 12, 11
+1894: 2, 12, 12
+1895: 2, 12, 13
+1896: 2, 12, 14
+1897: 2, 12, 15
+1898: 2, 12, 16
+1899: 2, 12, 17
+1900: 2, 12, 18
+1901: 2, 12, 19
+1902: 2, 12, 20
+1903: 2, 12, 21
+1904: 2, 12, 22
+1905: 2, 12, 23
+1906: 2, 12, 24
+1907: 2, 12, 25
+1908: 2, 12, 26
+1909: 2, 12, 27
+1910: 2, 12, 28
+1911: 2, 12, 29
+1912: 2, 12, 30
+1913: 2, 12, 31
+1914: 2, 12, 32
+1915: 2, 12, 33
+1916: 2, 12, 34
+1917: 2, 12, 35
+1918: 2, 12, 36
+1919: 2, 12, 37
+1920: 2, 12, 38
+1921: 2, 12, 39
+1922: 2, 12, 40
+1923: 2, 12, 41
+1924: 2, 12, 42
+1925: 2, 12, 43
+1926: 2, 12, 44
+1927: 2, 12, 45
+1928: 2, 12, 46
+1929: 2, 12, 47
+1930: 2, 12, 48
+1931: 2, 12, 49
+1932: 2, 12, 50
+1933: 2, 12, 51
+1934: 2, 13, 0
+1935: 2, 13, 1
+1936: 2, 13, 2
+1937: 2, 13, 3
+1938: 2, 13, 4
+1939: 2, 13, 5
+1940: 2, 13, 6
+1941: 2, 13, 7
+1942: 2, 13, 8
+1943: 2, 13, 9
+1944: 2, 13, 10
+1945: 2, 13, 11
+1946: 2, 13, 12
+1947: 2, 13, 13
+1948: 2, 13, 14
+1949: 2, 13, 15
+1950: 2, 13, 16
+1951: 2, 13, 17
+1952: 2, 13, 18
+1953: 2, 13, 19
+1954: 2, 13, 20
+1955: 2, 13, 21
+1956: 2, 13, 22
+1957: 2, 14, 0
+1958: 2, 14, 1
+1959: 2, 14, 2
+1960: 2, 14, 3
+1961: 2, 14, 4
+1962: 2, 14, 5
+1963: 2, 14, 6
+1964: 2, 14, 7
+1965: 2, 14, 8
+1966: 2, 14, 9
+1967: 2, 14, 10
+1968: 2, 14, 11
+1969: 2, 14, 12
+1970: 2, 14, 13
+1971: 2, 14, 14
+1972: 2, 14, 15
+1973: 2, 14, 16
+1974: 2, 14, 17
+1975: 2, 14, 18
+1976: 2, 14, 19
+1977: 2, 14, 20
+1978: 2, 14, 21
+1979: 2, 14, 22
+1980: 2, 14, 23
+1981: 2, 14, 24
+1982: 2, 14, 25
+1983: 2, 14, 26
+1984: 2, 14, 27
+1985: 2, 14, 28
+1986: 2, 14, 29
+1987: 2, 14, 30
+1988: 2, 14, 31
+1989: 2, 15, 0
+1990: 2, 15, 1
+1991: 2, 15, 2
+1992: 2, 15, 3
+1993: 2, 15, 4
+1994: 2, 15, 5
+1995: 2, 15, 6
+1996: 2, 15, 7
+1997: 2, 15, 8
+1998: 2, 15, 9
+1999: 2, 15, 10
+2000: 2, 15, 11
+2001: 2, 15, 12
+2002: 2, 15, 13
+2003: 2, 15, 14
+2004: 2, 15, 15
+2005: 2, 15, 16
+2006: 2, 15, 17
+2007: 2, 15, 18
+2008: 2, 15, 19
+2009: 2, 15, 20
+2010: 2, 15, 21
+2011: 2, 15, 22
+2012: 2, 15, 23
+2013: 2, 15, 24
+2014: 2, 15, 25
+2015: 2, 15, 26
+2016: 2, 15, 27
+2017: 2, 16, 0
+2018: 2, 16, 1
+2019: 2, 16, 2
+2020: 2, 16, 3
+2021: 2, 16, 4
+2022: 2, 16, 5
+2023: 2, 16, 6
+2024: 2, 16, 7
+2025: 2, 16, 8
+2026: 2, 16, 9
+2027: 2, 16, 10
+2028: 2, 16, 11
+2029: 2, 16, 12
+2030: 2, 16, 13
+2031: 2, 16, 14
+2032: 2, 16, 15
+2033: 2, 16, 16
+2034: 2, 16, 17
+2035: 2, 16, 18
+2036: 2, 16, 19
+2037: 2, 16, 20
+2038: 2, 16, 21
+2039: 2, 16, 22
+2040: 2, 16, 23
+2041: 2, 16, 24
+2042: 2, 16, 25
+2043: 2, 16, 26
+2044: 2, 16, 27
+2045: 2, 16, 28
+2046: 2, 16, 29
+2047: 2, 16, 30
+2048: 2, 16, 31
+2049: 2, 16, 32
+2050: 2, 16, 33
+2051: 2, 16, 34
+2052: 2, 16, 35
+2053: 2, 16, 36
+2054: 2, 17, 0
+2055: 2, 17, 1
+2056: 2, 17, 2
+2057: 2, 17, 3
+2058: 2, 17, 4
+2059: 2, 17, 5
+2060: 2, 17, 6
+2061: 2, 17, 7
+2062: 2, 17, 8
+2063: 2, 17, 9
+2064: 2, 17, 10
+2065: 2, 17, 11
+2066: 2, 17, 12
+2067: 2, 17, 13
+2068: 2, 17, 14
+2069: 2, 17, 15
+2070: 2, 17, 16
+2071: 2, 18, 0
+2072: 2, 18, 1
+2073: 2, 18, 2
+2074: 2, 18, 3
+2075: 2, 18, 4
+2076: 2, 18, 5
+2077: 2, 18, 6
+2078: 2, 18, 7
+2079: 2, 18, 8
+2080: 2, 18, 9
+2081: 2, 18, 10
+2082: 2, 18, 11
+2083: 2, 18, 12
+2084: 2, 18, 13
+2085: 2, 18, 14
+2086: 2, 18, 15
+2087: 2, 18, 16
+2088: 2, 18, 17
+2089: 2, 18, 18
+2090: 2, 18, 19
+2091: 2, 18, 20
+2092: 2, 18, 21
+2093: 2, 18, 22
+2094: 2, 18, 23
+2095: 2, 18, 24
+2096: 2, 18, 25
+2097: 2, 18, 26
+2098: 2, 18, 27
+2099: 2, 19, 0
+2100: 2, 19, 1
+2101: 2, 19, 2
+2102: 2, 19, 3
+2103: 2, 19, 4
+2104: 2, 19, 5
+2105: 2, 19, 6
+2106: 2, 19, 7
+2107: 2, 19, 8
+2108: 2, 19, 9
+2109: 2, 19, 10
+2110: 2, 19, 11
+2111: 2, 19, 12
+2112: 2, 19, 13
+2113: 2, 19, 14
+2114: 2, 19, 15
+2115: 2, 19, 16
+2116: 2, 19, 17
+2117: 2, 19, 18
+2118: 2, 19, 19
+2119: 2, 19, 20
+2120: 2, 19, 21
+2121: 2, 19, 22
+2122: 2, 19, 23
+2123: 2, 19, 24
+2124: 2, 19, 25
+2125: 2, 20, 0
+2126: 2, 20, 1
+2127: 2, 20, 2
+2128: 2, 20, 3
+2129: 2, 20, 4
+2130: 2, 20, 5
+2131: 2, 20, 6
+2132: 2, 20, 7
+2133: 2, 20, 8
+2134: 2, 20, 9
+2135: 2, 20, 10
+2136: 2, 20, 11
+2137: 2, 20, 12
+2138: 2, 20, 13
+2139: 2, 20, 14
+2140: 2, 20, 15
+2141: 2, 20, 16
+2142: 2, 20, 17
+2143: 2, 20, 18
+2144: 2, 20, 19
+2145: 2, 20, 20
+2146: 2, 20, 21
+2147: 2, 20, 22
+2148: 2, 20, 23
+2149: 2, 20, 24
+2150: 2, 20, 25
+2151: 2, 20, 26
+2152: 2, 21, 0
+2153: 2, 21, 1
+2154: 2, 21, 2
+2155: 2, 21, 3
+2156: 2, 21, 4
+2157: 2, 21, 5
+2158: 2, 21, 6
+2159: 2, 21, 7
+2160: 2, 21, 8
+2161: 2, 21, 9
+2162: 2, 21, 10
+2163: 2, 21, 11
+2164: 2, 21, 12
+2165: 2, 21, 13
+2166: 2, 21, 14
+2167: 2, 21, 15
+2168: 2, 21, 16
+2169: 2, 21, 17
+2170: 2, 21, 18
+2171: 2, 21, 19
+2172: 2, 21, 20
+2173: 2, 21, 21
+2174: 2, 21, 22
+2175: 2, 21, 23
+2176: 2, 21, 24
+2177: 2, 21, 25
+2178: 2, 21, 26
+2179: 2, 21, 27
+2180: 2, 21, 28
+2181: 2, 21, 29
+2182: 2, 21, 30
+2183: 2, 21, 31
+2184: 2, 21, 32
+2185: 2, 21, 33
+2186: 2, 21, 34
+2187: 2, 21, 35
+2188: 2, 21, 36
+2189: 2, 22, 0
+2190: 2, 22, 1
+2191: 2, 22, 2
+2192: 2, 22, 3
+2193: 2, 22, 4
+2194: 2, 22, 5
+2195: 2, 22, 6
+2196: 2, 22, 7
+2197: 2, 22, 8
+2198: 2, 22, 9
+2199: 2, 22, 10
+2200: 2, 22, 11
+2201: 2, 22, 12
+2202: 2, 22, 13
+2203: 2, 22, 14
+2204: 2, 22, 15
+2205: 2, 22, 16
+2206: 2, 22, 17
+2207: 2, 22, 18
+2208: 2, 22, 19
+2209: 2, 22, 20
+2210: 2, 22, 21
+2211: 2, 22, 22
+2212: 2, 22, 23
+2213: 2, 22, 24
+2214: 2, 22, 25
+2215: 2, 22, 26
+2216: 2, 22, 27
+2217: 2, 22, 28
+2218: 2, 22, 29
+2219: 2, 22, 30
+2220: 2, 22, 31
+2221: 2, 23, 0
+2222: 2, 23, 1
+2223: 2, 23, 2
+2224: 2, 23, 3
+2225: 2, 23, 4
+2226: 2, 23, 5
+2227: 2, 23, 6
+2228: 2, 23, 7
+2229: 2, 23, 8
+2230: 2, 23, 9
+2231: 2, 23, 10
+2232: 2, 23, 11
+2233: 2, 23, 12
+2234: 2, 23, 13
+2235: 2, 23, 14
+2236: 2, 23, 15
+2237: 2, 23, 16
+2238: 2, 23, 17
+2239: 2, 23, 18
+2240: 2, 23, 19
+2241: 2, 23, 20
+2242: 2, 23, 21
+2243: 2, 23, 22
+2244: 2, 23, 23
+2245: 2, 23, 24
+2246: 2, 23, 25
+2247: 2, 23, 26
+2248: 2, 23, 27
+2249: 2, 23, 28
+2250: 2, 23, 29
+2251: 2, 23, 30
+2252: 2, 23, 31
+2253: 2, 23, 32
+2254: 2, 23, 33
+2255: 2, 24, 0
+2256: 2, 24, 1
+2257: 2, 24, 2
+2258: 2, 24, 3
+2259: 2, 24, 4
+2260: 2, 24, 5
+2261: 2, 24, 6
+2262: 2, 24, 7
+2263: 2, 24, 8
+2264: 2, 24, 9
+2265: 2, 24, 10
+2266: 2, 24, 11
+2267: 2, 24, 12
+2268: 2, 24, 13
+2269: 2, 24, 14
+2270: 2, 24, 15
+2271: 2, 24, 16
+2272: 2, 24, 17
+2273: 2, 24, 18
+2274: 2, 25, 0
+2275: 2, 25, 1
+2276: 2, 25, 2
+2277: 2, 25, 3
+2278: 2, 25, 4
+2279: 2, 25, 5
+2280: 2, 25, 6
+2281: 2, 25, 7
+2282: 2, 25, 8
+2283: 2, 25, 9
+2284: 2, 25, 10
+2285: 2, 25, 11
+2286: 2, 25, 12
+2287: 2, 25, 13
+2288: 2, 25, 14
+2289: 2, 25, 15
+2290: 2, 25, 16
+2291: 2, 25, 17
+2292: 2, 25, 18
+2293: 2, 25, 19
+2294: 2, 25, 20
+2295: 2, 25, 21
+2296: 2, 25, 22
+2297: 2, 25, 23
+2298: 2, 25, 24
+2299: 2, 25, 25
+2300: 2, 25, 26
+2301: 2, 25, 27
+2302: 2, 25, 28
+2303: 2, 25, 29
+2304: 2, 25, 30
+2305: 2, 25, 31
+2306: 2, 25, 32
+2307: 2, 25, 33
+2308: 2, 25, 34
+2309: 2, 25, 35
+2310: 2, 25, 36
+2311: 2, 25, 37
+2312: 2, 25, 38
+2313: 2, 25, 39
+2314: 2, 25, 40
+2315: 2, 26, 0
+2316: 2, 26, 1
+2317: 2, 26, 2
+2318: 2, 26, 3
+2319: 2, 26, 4
+2320: 2, 26, 5
+2321: 2, 26, 6
+2322: 2, 26, 7
+2323: 2, 26, 8
+2324: 2, 26, 9
+2325: 2, 26, 10
+2326: 2, 26, 11
+2327: 2, 26, 12
+2328: 2, 26, 13
+2329: 2, 26, 14
+2330: 2, 26, 15
+2331: 2, 26, 16
+2332: 2, 26, 17
+2333: 2, 26, 18
+2334: 2, 26, 19
+2335: 2, 26, 20
+2336: 2, 26, 21
+2337: 2, 26, 22
+2338: 2, 26, 23
+2339: 2, 26, 24
+2340: 2, 26, 25
+2341: 2, 26, 26
+2342: 2, 26, 27
+2343: 2, 26, 28
+2344: 2, 26, 29
+2345: 2, 26, 30
+2346: 2, 26, 31
+2347: 2, 26, 32
+2348: 2, 26, 33
+2349: 2, 26, 34
+2350: 2, 26, 35
+2351: 2, 26, 36
+2352: 2, 26, 37
+2353: 2, 27, 0
+2354: 2, 27, 1
+2355: 2, 27, 2
+2356: 2, 27, 3
+2357: 2, 27, 4
+2358: 2, 27, 5
+2359: 2, 27, 6
+2360: 2, 27, 7
+2361: 2, 27, 8
+2362: 2, 27, 9
+2363: 2, 27, 10
+2364: 2, 27, 11
+2365: 2, 27, 12
+2366: 2, 27, 13
+2367: 2, 27, 14
+2368: 2, 27, 15
+2369: 2, 27, 16
+2370: 2, 27, 17
+2371: 2, 27, 18
+2372: 2, 27, 19
+2373: 2, 27, 20
+2374: 2, 27, 21
+2375: 2, 28, 0
+2376: 2, 28, 1
+2377: 2, 28, 2
+2378: 2, 28, 3
+2379: 2, 28, 4
+2380: 2, 28, 5
+2381: 2, 28, 6
+2382: 2, 28, 7
+2383: 2, 28, 8
+2384: 2, 28, 9
+2385: 2, 28, 10
+2386: 2, 28, 11
+2387: 2, 28, 12
+2388: 2, 28, 13
+2389: 2, 28, 14
+2390: 2, 28, 15
+2391: 2, 28, 16
+2392: 2, 28, 17
+2393: 2, 28, 18
+2394: 2, 28, 19
+2395: 2, 28, 20
+2396: 2, 28, 21
+2397: 2, 28, 22
+2398: 2, 28, 23
+2399: 2, 28, 24
+2400: 2, 28, 25
+2401: 2, 28, 26
+2402: 2, 28, 27
+2403: 2, 28, 28
+2404: 2, 28, 29
+2405: 2, 28, 30
+2406: 2, 28, 31
+2407: 2, 28, 32
+2408: 2, 28, 33
+2409: 2, 28, 34
+2410: 2, 28, 35
+2411: 2, 28, 36
+2412: 2, 28, 37
+2413: 2, 28, 38
+2414: 2, 28, 39
+2415: 2, 28, 40
+2416: 2, 28, 41
+2417: 2, 28, 42
+2418: 2, 28, 43
+2419: 2, 29, 0
+2420: 2, 29, 1
+2421: 2, 29, 2
+2422: 2, 29, 3
+2423: 2, 29, 4
+2424: 2, 29, 5
+2425: 2, 29, 6
+2426: 2, 29, 7
+2427: 2, 29, 8
+2428: 2, 29, 9
+2429: 2, 29, 10
+2430: 2, 29, 11
+2431: 2, 29, 12
+2432: 2, 29, 13
+2433: 2, 29, 14
+2434: 2, 29, 15
+2435: 2, 29, 16
+2436: 2, 29, 17
+2437: 2, 29, 18
+2438: 2, 29, 19
+2439: 2, 29, 20
+2440: 2, 29, 21
+2441: 2, 29, 22
+2442: 2, 29, 23
+2443: 2, 29, 24
+2444: 2, 29, 25
+2445: 2, 29, 26
+2446: 2, 29, 27
+2447: 2, 29, 28
+2448: 2, 29, 29
+2449: 2, 29, 30
+2450: 2, 29, 31
+2451: 2, 29, 32
+2452: 2, 29, 33
+2453: 2, 29, 34
+2454: 2, 29, 35
+2455: 2, 29, 36
+2456: 2, 29, 37
+2457: 2, 29, 38
+2458: 2, 29, 39
+2459: 2, 29, 40
+2460: 2, 29, 41
+2461: 2, 29, 42
+2462: 2, 29, 43
+2463: 2, 29, 44
+2464: 2, 29, 45
+2465: 2, 29, 46
+2466: 2, 30, 0
+2467: 2, 30, 1
+2468: 2, 30, 2
+2469: 2, 30, 3
+2470: 2, 30, 4
+2471: 2, 30, 5
+2472: 2, 30, 6
+2473: 2, 30, 7
+2474: 2, 30, 8
+2475: 2, 30, 9
+2476: 2, 30, 10
+2477: 2, 30, 11
+2478: 2, 30, 12
+2479: 2, 30, 13
+2480: 2, 30, 14
+2481: 2, 30, 15
+2482: 2, 30, 16
+2483: 2, 30, 17
+2484: 2, 30, 18
+2485: 2, 30, 19
+2486: 2, 30, 20
+2487: 2, 30, 21
+2488: 2, 30, 22
+2489: 2, 30, 23
+2490: 2, 30, 24
+2491: 2, 30, 25
+2492: 2, 30, 26
+2493: 2, 30, 27
+2494: 2, 30, 28
+2495: 2, 30, 29
+2496: 2, 30, 30
+2497: 2, 30, 31
+2498: 2, 30, 32
+2499: 2, 30, 33
+2500: 2, 30, 34
+2501: 2, 30, 35
+2502: 2, 30, 36
+2503: 2, 30, 37
+2504: 2, 30, 38
+2505: 2, 31, 0
+2506: 2, 31, 1
+2507: 2, 31, 2
+2508: 2, 31, 3
+2509: 2, 31, 4
+2510: 2, 31, 5
+2511: 2, 31, 6
+2512: 2, 31, 7
+2513: 2, 31, 8
+2514: 2, 31, 9
+2515: 2, 31, 10
+2516: 2, 31, 11
+2517: 2, 31, 12
+2518: 2, 31, 13
+2519: 2, 31, 14
+2520: 2, 31, 15
+2521: 2, 31, 16
+2522: 2, 31, 17
+2523: 2, 31, 18
+2524: 2, 32, 0
+2525: 2, 32, 1
+2526: 2, 32, 2
+2527: 2, 32, 3
+2528: 2, 32, 4
+2529: 2, 32, 5
+2530: 2, 32, 6
+2531: 2, 32, 7
+2532: 2, 32, 8
+2533: 2, 32, 9
+2534: 2, 32, 10
+2535: 2, 32, 11
+2536: 2, 32, 12
+2537: 2, 32, 13
+2538: 2, 32, 14
+2539: 2, 32, 15
+2540: 2, 32, 16
+2541: 2, 32, 17
+2542: 2, 32, 18
+2543: 2, 32, 19
+2544: 2, 32, 20
+2545: 2, 32, 21
+2546: 2, 32, 22
+2547: 2, 32, 23
+2548: 2, 32, 24
+2549: 2, 32, 25
+2550: 2, 32, 26
+2551: 2, 32, 27
+2552: 2, 32, 28
+2553: 2, 32, 29
+2554: 2, 32, 30
+2555: 2, 32, 31
+2556: 2, 32, 32
+2557: 2, 32, 33
+2558: 2, 32, 34
+2559: 2, 32, 35
+2560: 2, 33, 0
+2561: 2, 33, 1
+2562: 2, 33, 2
+2563: 2, 33, 3
+2564: 2, 33, 4
+2565: 2, 33, 5
+2566: 2, 33, 6
+2567: 2, 33, 7
+2568: 2, 33, 8
+2569: 2, 33, 9
+2570: 2, 33, 10
+2571: 2, 33, 11
+2572: 2, 33, 12
+2573: 2, 33, 13
+2574: 2, 33, 14
+2575: 2, 33, 15
+2576: 2, 33, 16
+2577: 2, 33, 17
+2578: 2, 33, 18
+2579: 2, 33, 19
+2580: 2, 33, 20
+2581: 2, 33, 21
+2582: 2, 33, 22
+2583: 2, 33, 23
+2584: 2, 34, 0
+2585: 2, 34, 1
+2586: 2, 34, 2
+2587: 2, 34, 3
+2588: 2, 34, 4
+2589: 2, 34, 5
+2590: 2, 34, 6
+2591: 2, 34, 7
+2592: 2, 34, 8
+2593: 2, 34, 9
+2594: 2, 34, 10
+2595: 2, 34, 11
+2596: 2, 34, 12
+2597: 2, 34, 13
+2598: 2, 34, 14
+2599: 2, 34, 15
+2600: 2, 34, 16
+2601: 2, 34, 17
+2602: 2, 34, 18
+2603: 2, 34, 19
+2604: 2, 34, 20
+2605: 2, 34, 21
+2606: 2, 34, 22
+2607: 2, 34, 23
+2608: 2, 34, 24
+2609: 2, 34, 25
+2610: 2, 34, 26
+2611: 2, 34, 27
+2612: 2, 34, 28
+2613: 2, 34, 29
+2614: 2, 34, 30
+2615: 2, 34, 31
+2616: 2, 34, 32
+2617: 2, 34, 33
+2618: 2, 34, 34
+2619: 2, 34, 35
+2620: 2, 35, 0
+2621: 2, 35, 1
+2622: 2, 35, 2
+2623: 2, 35, 3
+2624: 2, 35, 4
+2625: 2, 35, 5
+2626: 2, 35, 6
+2627: 2, 35, 7
+2628: 2, 35, 8
+2629: 2, 35, 9
+2630: 2, 35, 10
+2631: 2, 35, 11
+2632: 2, 35, 12
+2633: 2, 35, 13
+2634: 2, 35, 14
+2635: 2, 35, 15
+2636: 2, 35, 16
+2637: 2, 35, 17
+2638: 2, 35, 18
+2639: 2, 35, 19
+2640: 2, 35, 20
+2641: 2, 35, 21
+2642: 2, 35, 22
+2643: 2, 35, 23
+2644: 2, 35, 24
+2645: 2, 35, 25
+2646: 2, 35, 26
+2647: 2, 35, 27
+2648: 2, 35, 28
+2649: 2, 35, 29
+2650: 2, 35, 30
+2651: 2, 35, 31
+2652: 2, 35, 32
+2653: 2, 35, 33
+2654: 2, 35, 34
+2655: 2, 35, 35
+2656: 2, 36, 0
+2657: 2, 36, 1
+2658: 2, 36, 2
+2659: 2, 36, 3
+2660: 2, 36, 4
+2661: 2, 36, 5
+2662: 2, 36, 6
+2663: 2, 36, 7
+2664: 2, 36, 8
+2665: 2, 36, 9
+2666: 2, 36, 10
+2667: 2, 36, 11
+2668: 2, 36, 12
+2669: 2, 36, 13
+2670: 2, 36, 14
+2671: 2, 36, 15
+2672: 2, 36, 16
+2673: 2, 36, 17
+2674: 2, 36, 18
+2675: 2, 36, 19
+2676: 2, 36, 20
+2677: 2, 36, 21
+2678: 2, 36, 22
+2679: 2, 36, 23
+2680: 2, 36, 24
+2681: 2, 36, 25
+2682: 2, 36, 26
+2683: 2, 36, 27
+2684: 2, 36, 28
+2685: 2, 36, 29
+2686: 2, 36, 30
+2687: 2, 36, 31
+2688: 2, 36, 32
+2689: 2, 36, 33
+2690: 2, 36, 34
+2691: 2, 36, 35
+2692: 2, 36, 36
+2693: 2, 36, 37
+2694: 2, 36, 38
+2695: 2, 37, 0
+2696: 2, 37, 1
+2697: 2, 37, 2
+2698: 2, 37, 3
+2699: 2, 37, 4
+2700: 2, 37, 5
+2701: 2, 37, 6
+2702: 2, 37, 7
+2703: 2, 37, 8
+2704: 2, 37, 9
+2705: 2, 37, 10
+2706: 2, 37, 11
+2707: 2, 37, 12
+2708: 2, 37, 13
+2709: 2, 37, 14
+2710: 2, 37, 15
+2711: 2, 37, 16
+2712: 2, 37, 17
+2713: 2, 37, 18
+2714: 2, 37, 19
+2715: 2, 37, 20
+2716: 2, 37, 21
+2717: 2, 37, 22
+2718: 2, 37, 23
+2719: 2, 37, 24
+2720: 2, 37, 25
+2721: 2, 37, 26
+2722: 2, 37, 27
+2723: 2, 37, 28
+2724: 2, 37, 29
+2725: 2, 38, 0
+2726: 2, 38, 1
+2727: 2, 38, 2
+2728: 2, 38, 3
+2729: 2, 38, 4
+2730: 2, 38, 5
+2731: 2, 38, 6
+2732: 2, 38, 7
+2733: 2, 38, 8
+2734: 2, 38, 9
+2735: 2, 38, 10
+2736: 2, 38, 11
+2737: 2, 38, 12
+2738: 2, 38, 13
+2739: 2, 38, 14
+2740: 2, 38, 15
+2741: 2, 38, 16
+2742: 2, 38, 17
+2743: 2, 38, 18
+2744: 2, 38, 19
+2745: 2, 38, 20
+2746: 2, 38, 21
+2747: 2, 38, 22
+2748: 2, 38, 23
+2749: 2, 38, 24
+2750: 2, 38, 25
+2751: 2, 38, 26
+2752: 2, 38, 27
+2753: 2, 38, 28
+2754: 2, 38, 29
+2755: 2, 38, 30
+2756: 2, 38, 31
+2757: 2, 39, 0
+2758: 2, 39, 1
+2759: 2, 39, 2
+2760: 2, 39, 3
+2761: 2, 39, 4
+2762: 2, 39, 5
+2763: 2, 39, 6
+2764: 2, 39, 7
+2765: 2, 39, 8
+2766: 2, 39, 9
+2767: 2, 39, 10
+2768: 2, 39, 11
+2769: 2, 39, 12
+2770: 2, 39, 13
+2771: 2, 39, 14
+2772: 2, 39, 15
+2773: 2, 39, 16
+2774: 2, 39, 17
+2775: 2, 39, 18
+2776: 2, 39, 19
+2777: 2, 39, 20
+2778: 2, 39, 21
+2779: 2, 39, 22
+2780: 2, 39, 23
+2781: 2, 39, 24
+2782: 2, 39, 25
+2783: 2, 39, 26
+2784: 2, 39, 27
+2785: 2, 39, 28
+2786: 2, 39, 29
+2787: 2, 39, 30
+2788: 2, 39, 31
+2789: 2, 39, 32
+2790: 2, 39, 33
+2791: 2, 39, 34
+2792: 2, 39, 35
+2793: 2, 39, 36
+2794: 2, 39, 37
+2795: 2, 39, 38
+2796: 2, 39, 39
+2797: 2, 39, 40
+2798: 2, 39, 41
+2799: 2, 39, 42
+2800: 2, 39, 43
+2801: 2, 40, 0
+2802: 2, 40, 1
+2803: 2, 40, 2
+2804: 2, 40, 3
+2805: 2, 40, 4
+2806: 2, 40, 5
+2807: 2, 40, 6
+2808: 2, 40, 7
+2809: 2, 40, 8
+2810: 2, 40, 9
+2811: 2, 40, 10
+2812: 2, 40, 11
+2813: 2, 40, 12
+2814: 2, 40, 13
+2815: 2, 40, 14
+2816: 2, 40, 15
+2817: 2, 40, 16
+2818: 2, 40, 17
+2819: 2, 40, 18
+2820: 2, 40, 19
+2821: 2, 40, 20
+2822: 2, 40, 21
+2823: 2, 40, 22
+2824: 2, 40, 23
+2825: 2, 40, 24
+2826: 2, 40, 25
+2827: 2, 40, 26
+2828: 2, 40, 27
+2829: 2, 40, 28
+2830: 2, 40, 29
+2831: 2, 40, 30
+2832: 2, 40, 31
+2833: 2, 40, 32
+2834: 2, 40, 33
+2835: 2, 40, 34
+2836: 2, 40, 35
+2837: 2, 40, 36
+2838: 2, 40, 37
+2839: 2, 40, 38
+2840: 3, 0, 0
+2841: 3, 1, 0
+2842: 3, 1, 1
+2843: 3, 1, 2
+2844: 3, 1, 3
+2845: 3, 1, 4
+2846: 3, 1, 5
+2847: 3, 1, 6
+2848: 3, 1, 7
+2849: 3, 1, 8
+2850: 3, 1, 9
+2851: 3, 1, 10
+2852: 3, 1, 11
+2853: 3, 1, 12
+2854: 3, 1, 13
+2855: 3, 1, 14
+2856: 3, 1, 15
+2857: 3, 1, 16
+2858: 3, 1, 17
+2859: 3, 2, 0
+2860: 3, 2, 1
+2861: 3, 2, 2
+2862: 3, 2, 3
+2863: 3, 2, 4
+2864: 3, 2, 5
+2865: 3, 2, 6
+2866: 3, 2, 7
+2867: 3, 2, 8
+2868: 3, 2, 9
+2869: 3, 2, 10
+2870: 3, 2, 11
+2871: 3, 2, 12
+2872: 3, 2, 13
+2873: 3, 2, 14
+2874: 3, 2, 15
+2875: 3, 2, 16
+2876: 3, 3, 0
+2877: 3, 3, 1
+2878: 3, 3, 2
+2879: 3, 3, 3
+2880: 3, 3, 4
+2881: 3, 3, 5
+2882: 3, 3, 6
+2883: 3, 3, 7
+2884: 3, 3, 8
+2885: 3, 3, 9
+2886: 3, 3, 10
+2887: 3, 3, 11
+2888: 3, 3, 12
+2889: 3, 3, 13
+2890: 3, 3, 14
+2891: 3, 3, 15
+2892: 3, 3, 16
+2893: 3, 3, 17
+2894: 3, 4, 0
+2895: 3, 4, 1
+2896: 3, 4, 2
+2897: 3, 4, 3
+2898: 3, 4, 4
+2899: 3, 4, 5
+2900: 3, 4, 6
+2901: 3, 4, 7
+2902: 3, 4, 8
+2903: 3, 4, 9
+2904: 3, 4, 10
+2905: 3, 4, 11
+2906: 3, 4, 12
+2907: 3, 4, 13
+2908: 3, 4, 14
+2909: 3, 4, 15
+2910: 3, 4, 16
+2911: 3, 4, 17
+2912: 3, 4, 18
+2913: 3, 4, 19
+2914: 3, 4, 20
+2915: 3, 4, 21
+2916: 3, 4, 22
+2917: 3, 4, 23
+2918: 3, 4, 24
+2919: 3, 4, 25
+2920: 3, 4, 26
+2921: 3, 4, 27
+2922: 3, 4, 28
+2923: 3, 4, 29
+2924: 3, 4, 30
+2925: 3, 4, 31
+2926: 3, 4, 32
+2927: 3, 4, 33
+2928: 3, 4, 34
+2929: 3, 4, 35
+2930: 3, 5, 0
+2931: 3, 5, 1
+2932: 3, 5, 2
+2933: 3, 5, 3
+2934: 3, 5, 4
+2935: 3, 5, 5
+2936: 3, 5, 6
+2937: 3, 5, 7
+2938: 3, 5, 8
+2939: 3, 5, 9
+2940: 3, 5, 10
+2941: 3, 5, 11
+2942: 3, 5, 12
+2943: 3, 5, 13
+2944: 3, 5, 14
+2945: 3, 5, 15
+2946: 3, 5, 16
+2947: 3, 5, 17
+2948: 3, 5, 18
+2949: 3, 5, 19
+2950: 3, 6, 0
+2951: 3, 6, 1
+2952: 3, 6, 2
+2953: 3, 6, 3
+2954: 3, 6, 4
+2955: 3, 6, 5
+2956: 3, 6, 6
+2957: 3, 6, 7
+2958: 3, 6, 8
+2959: 3, 6, 9
+2960: 3, 6, 10
+2961: 3, 6, 11
+2962: 3, 6, 12
+2963: 3, 6, 13
+2964: 3, 6, 14
+2965: 3, 6, 15
+2966: 3, 6, 16
+2967: 3, 6, 17
+2968: 3, 6, 18
+2969: 3, 6, 19
+2970: 3, 6, 20
+2971: 3, 6, 21
+2972: 3, 6, 22
+2973: 3, 6, 23
+2974: 3, 6, 24
+2975: 3, 6, 25
+2976: 3, 6, 26
+2977: 3, 6, 27
+2978: 3, 6, 28
+2979: 3, 6, 29
+2980: 3, 6, 30
+2981: 3, 7, 0
+2982: 3, 7, 1
+2983: 3, 7, 2
+2984: 3, 7, 3
+2985: 3, 7, 4
+2986: 3, 7, 5
+2987: 3, 7, 6
+2988: 3, 7, 7
+2989: 3, 7, 8
+2990: 3, 7, 9
+2991: 3, 7, 10
+2992: 3, 7, 11
+2993: 3, 7, 12
+2994: 3, 7, 13
+2995: 3, 7, 14
+2996: 3, 7, 15
+2997: 3, 7, 16
+2998: 3, 7, 17
+2999: 3, 7, 18
+3000: 3, 7, 19
+3001: 3, 7, 20
+3002: 3, 7, 21
+3003: 3, 7, 22
+3004: 3, 7, 23
+3005: 3, 7, 24
+3006: 3, 7, 25
+3007: 3, 7, 26
+3008: 3, 7, 27
+3009: 3, 7, 28
+3010: 3, 7, 29
+3011: 3, 7, 30
+3012: 3, 7, 31
+3013: 3, 7, 32
+3014: 3, 7, 33
+3015: 3, 7, 34
+3016: 3, 7, 35
+3017: 3, 7, 36
+3018: 3, 7, 37
+3019: 3, 7, 38
+3020: 3, 8, 0
+3021: 3, 8, 1
+3022: 3, 8, 2
+3023: 3, 8, 3
+3024: 3, 8, 4
+3025: 3, 8, 5
+3026: 3, 8, 6
+3027: 3, 8, 7
+3028: 3, 8, 8
+3029: 3, 8, 9
+3030: 3, 8, 10
+3031: 3, 8, 11
+3032: 3, 8, 12
+3033: 3, 8, 13
+3034: 3, 8, 14
+3035: 3, 8, 15
+3036: 3, 8, 16
+3037: 3, 8, 17
+3038: 3, 8, 18
+3039: 3, 8, 19
+3040: 3, 8, 20
+3041: 3, 8, 21
+3042: 3, 8, 22
+3043: 3, 8, 23
+3044: 3, 8, 24
+3045: 3, 8, 25
+3046: 3, 8, 26
+3047: 3, 8, 27
+3048: 3, 8, 28
+3049: 3, 8, 29
+3050: 3, 8, 30
+3051: 3, 8, 31
+3052: 3, 8, 32
+3053: 3, 8, 33
+3054: 3, 8, 34
+3055: 3, 8, 35
+3056: 3, 8, 36
+3057: 3, 9, 0
+3058: 3, 9, 1
+3059: 3, 9, 2
+3060: 3, 9, 3
+3061: 3, 9, 4
+3062: 3, 9, 5
+3063: 3, 9, 6
+3064: 3, 9, 7
+3065: 3, 9, 8
+3066: 3, 9, 9
+3067: 3, 9, 10
+3068: 3, 9, 11
+3069: 3, 9, 12
+3070: 3, 9, 13
+3071: 3, 9, 14
+3072: 3, 9, 15
+3073: 3, 9, 16
+3074: 3, 9, 17
+3075: 3, 9, 18
+3076: 3, 9, 19
+3077: 3, 9, 20
+3078: 3, 9, 21
+3079: 3, 9, 22
+3080: 3, 9, 23
+3081: 3, 9, 24
+3082: 3, 10, 0
+3083: 3, 10, 1
+3084: 3, 10, 2
+3085: 3, 10, 3
+3086: 3, 10, 4
+3087: 3, 10, 5
+3088: 3, 10, 6
+3089: 3, 10, 7
+3090: 3, 10, 8
+3091: 3, 10, 9
+3092: 3, 10, 10
+3093: 3, 10, 11
+3094: 3, 10, 12
+3095: 3, 10, 13
+3096: 3, 10, 14
+3097: 3, 10, 15
+3098: 3, 10, 16
+3099: 3, 10, 17
+3100: 3, 10, 18
+3101: 3, 10, 19
+3102: 3, 10, 20
+3103: 3, 11, 0
+3104: 3, 11, 1
+3105: 3, 11, 2
+3106: 3, 11, 3
+3107: 3, 11, 4
+3108: 3, 11, 5
+3109: 3, 11, 6
+3110: 3, 11, 7
+3111: 3, 11, 8
+3112: 3, 11, 9
+3113: 3, 11, 10
+3114: 3, 11, 11
+3115: 3, 11, 12
+3116: 3, 11, 13
+3117: 3, 11, 14
+3118: 3, 11, 15
+3119: 3, 11, 16
+3120: 3, 11, 17
+3121: 3, 11, 18
+3122: 3, 11, 19
+3123: 3, 11, 20
+3124: 3, 11, 21
+3125: 3, 11, 22
+3126: 3, 11, 23
+3127: 3, 11, 24
+3128: 3, 11, 25
+3129: 3, 11, 26
+3130: 3, 11, 27
+3131: 3, 11, 28
+3132: 3, 11, 29
+3133: 3, 11, 30
+3134: 3, 11, 31
+3135: 3, 11, 32
+3136: 3, 11, 33
+3137: 3, 11, 34
+3138: 3, 11, 35
+3139: 3, 11, 36
+3140: 3, 11, 37
+3141: 3, 11, 38
+3142: 3, 11, 39
+3143: 3, 11, 40
+3144: 3, 11, 41
+3145: 3, 11, 42
+3146: 3, 11, 43
+3147: 3, 11, 44
+3148: 3, 11, 45
+3149: 3, 11, 46
+3150: 3, 11, 47
+3151: 3, 12, 0
+3152: 3, 12, 1
+3153: 3, 12, 2
+3154: 3, 12, 3
+3155: 3, 12, 4
+3156: 3, 12, 5
+3157: 3, 12, 6
+3158: 3, 12, 7
+3159: 3, 12, 8
+3160: 3, 13, 0
+3161: 3, 13, 1
+3162: 3, 13, 2
+3163: 3, 13, 3
+3164: 3, 13, 4
+3165: 3, 13, 5
+3166: 3, 13, 6
+3167: 3, 13, 7
+3168: 3, 13, 8
+3169: 3, 13, 9
+3170: 3, 13, 10
+3171: 3, 13, 11
+3172: 3, 13, 12
+3173: 3, 13, 13
+3174: 3, 13, 14
+3175: 3, 13, 15
+3176: 3, 13, 16
+3177: 3, 13, 17
+3178: 3, 13, 18
+3179: 3, 13, 19
+3180: 3, 13, 20
+3181: 3, 13, 21
+3182: 3, 13, 22
+3183: 3, 13, 23
+3184: 3, 13, 24
+3185: 3, 13, 25
+3186: 3, 13, 26
+3187: 3, 13, 27
+3188: 3, 13, 28
+3189: 3, 13, 29
+3190: 3, 13, 30
+3191: 3, 13, 31
+3192: 3, 13, 32
+3193: 3, 13, 33
+3194: 3, 13, 34
+3195: 3, 13, 35
+3196: 3, 13, 36
+3197: 3, 13, 37
+3198: 3, 13, 38
+3199: 3, 13, 39
+3200: 3, 13, 40
+3201: 3, 13, 41
+3202: 3, 13, 42
+3203: 3, 13, 43
+3204: 3, 13, 44
+3205: 3, 13, 45
+3206: 3, 13, 46
+3207: 3, 13, 47
+3208: 3, 13, 48
+3209: 3, 13, 49
+3210: 3, 13, 50
+3211: 3, 13, 51
+3212: 3, 13, 52
+3213: 3, 13, 53
+3214: 3, 13, 54
+3215: 3, 13, 55
+3216: 3, 13, 56
+3217: 3, 13, 57
+3218: 3, 13, 58
+3219: 3, 13, 59
+3220: 3, 14, 0
+3221: 3, 14, 1
+3222: 3, 14, 2
+3223: 3, 14, 3
+3224: 3, 14, 4
+3225: 3, 14, 5
+3226: 3, 14, 6
+3227: 3, 14, 7
+3228: 3, 14, 8
+3229: 3, 14, 9
+3230: 3, 14, 10
+3231: 3, 14, 11
+3232: 3, 14, 12
+3233: 3, 14, 13
+3234: 3, 14, 14
+3235: 3, 14, 15
+3236: 3, 14, 16
+3237: 3, 14, 17
+3238: 3, 14, 18
+3239: 3, 14, 19
+3240: 3, 14, 20
+3241: 3, 14, 21
+3242: 3, 14, 22
+3243: 3, 14, 23
+3244: 3, 14, 24
+3245: 3, 14, 25
+3246: 3, 14, 26
+3247: 3, 14, 27
+3248: 3, 14, 28
+3249: 3, 14, 29
+3250: 3, 14, 30
+3251: 3, 14, 31
+3252: 3, 14, 32
+3253: 3, 14, 33
+3254: 3, 14, 34
+3255: 3, 14, 35
+3256: 3, 14, 36
+3257: 3, 14, 37
+3258: 3, 14, 38
+3259: 3, 14, 39
+3260: 3, 14, 40
+3261: 3, 14, 41
+3262: 3, 14, 42
+3263: 3, 14, 43
+3264: 3, 14, 44
+3265: 3, 14, 45
+3266: 3, 14, 46
+3267: 3, 14, 47
+3268: 3, 14, 48
+3269: 3, 14, 49
+3270: 3, 14, 50
+3271: 3, 14, 51
+3272: 3, 14, 52
+3273: 3, 14, 53
+3274: 3, 14, 54
+3275: 3, 14, 55
+3276: 3, 14, 56
+3277: 3, 14, 57
+3278: 3, 15, 0
+3279: 3, 15, 1
+3280: 3, 15, 2
+3281: 3, 15, 3
+3282: 3, 15, 4
+3283: 3, 15, 5
+3284: 3, 15, 6
+3285: 3, 15, 7
+3286: 3, 15, 8
+3287: 3, 15, 9
+3288: 3, 15, 10
+3289: 3, 15, 11
+3290: 3, 15, 12
+3291: 3, 15, 13
+3292: 3, 15, 14
+3293: 3, 15, 15
+3294: 3, 15, 16
+3295: 3, 15, 17
+3296: 3, 15, 18
+3297: 3, 15, 19
+3298: 3, 15, 20
+3299: 3, 15, 21
+3300: 3, 15, 22
+3301: 3, 15, 23
+3302: 3, 15, 24
+3303: 3, 15, 25
+3304: 3, 15, 26
+3305: 3, 15, 27
+3306: 3, 15, 28
+3307: 3, 15, 29
+3308: 3, 15, 30
+3309: 3, 15, 31
+3310: 3, 15, 32
+3311: 3, 15, 33
+3312: 3, 16, 0
+3313: 3, 16, 1
+3314: 3, 16, 2
+3315: 3, 16, 3
+3316: 3, 16, 4
+3317: 3, 16, 5
+3318: 3, 16, 6
+3319: 3, 16, 7
+3320: 3, 16, 8
+3321: 3, 16, 9
+3322: 3, 16, 10
+3323: 3, 16, 11
+3324: 3, 16, 12
+3325: 3, 16, 13
+3326: 3, 16, 14
+3327: 3, 16, 15
+3328: 3, 16, 16
+3329: 3, 16, 17
+3330: 3, 16, 18
+3331: 3, 16, 19
+3332: 3, 16, 20
+3333: 3, 16, 21
+3334: 3, 16, 22
+3335: 3, 16, 23
+3336: 3, 16, 24
+3337: 3, 16, 25
+3338: 3, 16, 26
+3339: 3, 16, 27
+3340: 3, 16, 28
+3341: 3, 16, 29
+3342: 3, 16, 30
+3343: 3, 16, 31
+3344: 3, 16, 32
+3345: 3, 16, 33
+3346: 3, 16, 34
+3347: 3, 17, 0
+3348: 3, 17, 1
+3349: 3, 17, 2
+3350: 3, 17, 3
+3351: 3, 17, 4
+3352: 3, 17, 5
+3353: 3, 17, 6
+3354: 3, 17, 7
+3355: 3, 17, 8
+3356: 3, 17, 9
+3357: 3, 17, 10
+3358: 3, 17, 11
+3359: 3, 17, 12
+3360: 3, 17, 13
+3361: 3, 17, 14
+3362: 3, 17, 15
+3363: 3, 17, 16
+3364: 3, 18, 0
+3365: 3, 18, 1
+3366: 3, 18, 2
+3367: 3, 18, 3
+3368: 3, 18, 4
+3369: 3, 18, 5
+3370: 3, 18, 6
+3371: 3, 18, 7
+3372: 3, 18, 8
+3373: 3, 18, 9
+3374: 3, 18, 10
+3375: 3, 18, 11
+3376: 3, 18, 12
+3377: 3, 18, 13
+3378: 3, 18, 14
+3379: 3, 18, 15
+3380: 3, 18, 16
+3381: 3, 18, 17
+3382: 3, 18, 18
+3383: 3, 18, 19
+3384: 3, 18, 20
+3385: 3, 18, 21
+3386: 3, 18, 22
+3387: 3, 18, 23
+3388: 3, 18, 24
+3389: 3, 18, 25
+3390: 3, 18, 26
+3391: 3, 18, 27
+3392: 3, 18, 28
+3393: 3, 18, 29
+3394: 3, 18, 30
+3395: 3, 19, 0
+3396: 3, 19, 1
+3397: 3, 19, 2
+3398: 3, 19, 3
+3399: 3, 19, 4
+3400: 3, 19, 5
+3401: 3, 19, 6
+3402: 3, 19, 7
+3403: 3, 19, 8
+3404: 3, 19, 9
+3405: 3, 19, 10
+3406: 3, 19, 11
+3407: 3, 19, 12
+3408: 3, 19, 13
+3409: 3, 19, 14
+3410: 3, 19, 15
+3411: 3, 19, 16
+3412: 3, 19, 17
+3413: 3, 19, 18
+3414: 3, 19, 19
+3415: 3, 19, 20
+3416: 3, 19, 21
+3417: 3, 19, 22
+3418: 3, 19, 23
+3419: 3, 19, 24
+3420: 3, 19, 25
+3421: 3, 19, 26
+3422: 3, 19, 27
+3423: 3, 19, 28
+3424: 3, 19, 29
+3425: 3, 19, 30
+3426: 3, 19, 31
+3427: 3, 19, 32
+3428: 3, 19, 33
+3429: 3, 19, 34
+3430: 3, 19, 35
+3431: 3, 19, 36
+3432: 3, 19, 37
+3433: 3, 20, 0
+3434: 3, 20, 1
+3435: 3, 20, 2
+3436: 3, 20, 3
+3437: 3, 20, 4
+3438: 3, 20, 5
+3439: 3, 20, 6
+3440: 3, 20, 7
+3441: 3, 20, 8
+3442: 3, 20, 9
+3443: 3, 20, 10
+3444: 3, 20, 11
+3445: 3, 20, 12
+3446: 3, 20, 13
+3447: 3, 20, 14
+3448: 3, 20, 15
+3449: 3, 20, 16
+3450: 3, 20, 17
+3451: 3, 20, 18
+3452: 3, 20, 19
+3453: 3, 20, 20
+3454: 3, 20, 21
+3455: 3, 20, 22
+3456: 3, 20, 23
+3457: 3, 20, 24
+3458: 3, 20, 25
+3459: 3, 20, 26
+3460: 3, 20, 27
+3461: 3, 21, 0
+3462: 3, 21, 1
+3463: 3, 21, 2
+3464: 3, 21, 3
+3465: 3, 21, 4
+3466: 3, 21, 5
+3467: 3, 21, 6
+3468: 3, 21, 7
+3469: 3, 21, 8
+3470: 3, 21, 9
+3471: 3, 21, 10
+3472: 3, 21, 11
+3473: 3, 21, 12
+3474: 3, 21, 13
+3475: 3, 21, 14
+3476: 3, 21, 15
+3477: 3, 21, 16
+3478: 3, 21, 17
+3479: 3, 21, 18
+3480: 3, 21, 19
+3481: 3, 21, 20
+3482: 3, 21, 21
+3483: 3, 21, 22
+3484: 3, 21, 23
+3485: 3, 21, 24
+3486: 3, 22, 0
+3487: 3, 22, 1
+3488: 3, 22, 2
+3489: 3, 22, 3
+3490: 3, 22, 4
+3491: 3, 22, 5
+3492: 3, 22, 6
+3493: 3, 22, 7
+3494: 3, 22, 8
+3495: 3, 22, 9
+3496: 3, 22, 10
+3497: 3, 22, 11
+3498: 3, 22, 12
+3499: 3, 22, 13
+3500: 3, 22, 14
+3501: 3, 22, 15
+3502: 3, 22, 16
+3503: 3, 22, 17
+3504: 3, 22, 18
+3505: 3, 22, 19
+3506: 3, 22, 20
+3507: 3, 22, 21
+3508: 3, 22, 22
+3509: 3, 22, 23
+3510: 3, 22, 24
+3511: 3, 22, 25
+3512: 3, 22, 26
+3513: 3, 22, 27
+3514: 3, 22, 28
+3515: 3, 22, 29
+3516: 3, 22, 30
+3517: 3, 22, 31
+3518: 3, 22, 32
+3519: 3, 22, 33
+3520: 3, 23, 0
+3521: 3, 23, 1
+3522: 3, 23, 2
+3523: 3, 23, 3
+3524: 3, 23, 4
+3525: 3, 23, 5
+3526: 3, 23, 6
+3527: 3, 23, 7
+3528: 3, 23, 8
+3529: 3, 23, 9
+3530: 3, 23, 10
+3531: 3, 23, 11
+3532: 3, 23, 12
+3533: 3, 23, 13
+3534: 3, 23, 14
+3535: 3, 23, 15
+3536: 3, 23, 16
+3537: 3, 23, 17
+3538: 3, 23, 18
+3539: 3, 23, 19
+3540: 3, 23, 20
+3541: 3, 23, 21
+3542: 3, 23, 22
+3543: 3, 23, 23
+3544: 3, 23, 24
+3545: 3, 23, 25
+3546: 3, 23, 26
+3547: 3, 23, 27
+3548: 3, 23, 28
+3549: 3, 23, 29
+3550: 3, 23, 30
+3551: 3, 23, 31
+3552: 3, 23, 32
+3553: 3, 23, 33
+3554: 3, 23, 34
+3555: 3, 23, 35
+3556: 3, 23, 36
+3557: 3, 23, 37
+3558: 3, 23, 38
+3559: 3, 23, 39
+3560: 3, 23, 40
+3561: 3, 23, 41
+3562: 3, 23, 42
+3563: 3, 23, 43
+3564: 3, 23, 44
+3565: 3, 24, 0
+3566: 3, 24, 1
+3567: 3, 24, 2
+3568: 3, 24, 3
+3569: 3, 24, 4
+3570: 3, 24, 5
+3571: 3, 24, 6
+3572: 3, 24, 7
+3573: 3, 24, 8
+3574: 3, 24, 9
+3575: 3, 24, 10
+3576: 3, 24, 11
+3577: 3, 24, 12
+3578: 3, 24, 13
+3579: 3, 24, 14
+3580: 3, 24, 15
+3581: 3, 24, 16
+3582: 3, 24, 17
+3583: 3, 24, 18
+3584: 3, 24, 19
+3585: 3, 24, 20
+3586: 3, 24, 21
+3587: 3, 24, 22
+3588: 3, 24, 23
+3589: 3, 25, 0
+3590: 3, 25, 1
+3591: 3, 25, 2
+3592: 3, 25, 3
+3593: 3, 25, 4
+3594: 3, 25, 5
+3595: 3, 25, 6
+3596: 3, 25, 7
+3597: 3, 25, 8
+3598: 3, 25, 9
+3599: 3, 25, 10
+3600: 3, 25, 11
+3601: 3, 25, 12
+3602: 3, 25, 13
+3603: 3, 25, 14
+3604: 3, 25, 15
+3605: 3, 25, 16
+3606: 3, 25, 17
+3607: 3, 25, 18
+3608: 3, 25, 19
+3609: 3, 25, 20
+3610: 3, 25, 21
+3611: 3, 25, 22
+3612: 3, 25, 23
+3613: 3, 25, 24
+3614: 3, 25, 25
+3615: 3, 25, 26
+3616: 3, 25, 27
+3617: 3, 25, 28
+3618: 3, 25, 29
+3619: 3, 25, 30
+3620: 3, 25, 31
+3621: 3, 25, 32
+3622: 3, 25, 33
+3623: 3, 25, 34
+3624: 3, 25, 35
+3625: 3, 25, 36
+3626: 3, 25, 37
+3627: 3, 25, 38
+3628: 3, 25, 39
+3629: 3, 25, 40
+3630: 3, 25, 41
+3631: 3, 25, 42
+3632: 3, 25, 43
+3633: 3, 25, 44
+3634: 3, 25, 45
+3635: 3, 25, 46
+3636: 3, 25, 47
+3637: 3, 25, 48
+3638: 3, 25, 49
+3639: 3, 25, 50
+3640: 3, 25, 51
+3641: 3, 25, 52
+3642: 3, 25, 53
+3643: 3, 25, 54
+3644: 3, 25, 55
+3645: 3, 26, 0
+3646: 3, 26, 1
+3647: 3, 26, 2
+3648: 3, 26, 3
+3649: 3, 26, 4
+3650: 3, 26, 5
+3651: 3, 26, 6
+3652: 3, 26, 7
+3653: 3, 26, 8
+3654: 3, 26, 9
+3655: 3, 26, 10
+3656: 3, 26, 11
+3657: 3, 26, 12
+3658: 3, 26, 13
+3659: 3, 26, 14
+3660: 3, 26, 15
+3661: 3, 26, 16
+3662: 3, 26, 17
+3663: 3, 26, 18
+3664: 3, 26, 19
+3665: 3, 26, 20
+3666: 3, 26, 21
+3667: 3, 26, 22
+3668: 3, 26, 23
+3669: 3, 26, 24
+3670: 3, 26, 25
+3671: 3, 26, 26
+3672: 3, 26, 27
+3673: 3, 26, 28
+3674: 3, 26, 29
+3675: 3, 26, 30
+3676: 3, 26, 31
+3677: 3, 26, 32
+3678: 3, 26, 33
+3679: 3, 26, 34
+3680: 3, 26, 35
+3681: 3, 26, 36
+3682: 3, 26, 37
+3683: 3, 26, 38
+3684: 3, 26, 39
+3685: 3, 26, 40
+3686: 3, 26, 41
+3687: 3, 26, 42
+3688: 3, 26, 43
+3689: 3, 26, 44
+3690: 3, 26, 45
+3691: 3, 26, 46
+3692: 3, 27, 0
+3693: 3, 27, 1
+3694: 3, 27, 2
+3695: 3, 27, 3
+3696: 3, 27, 4
+3697: 3, 27, 5
+3698: 3, 27, 6
+3699: 3, 27, 7
+3700: 3, 27, 8
+3701: 3, 27, 9
+3702: 3, 27, 10
+3703: 3, 27, 11
+3704: 3, 27, 12
+3705: 3, 27, 13
+3706: 3, 27, 14
+3707: 3, 27, 15
+3708: 3, 27, 16
+3709: 3, 27, 17
+3710: 3, 27, 18
+3711: 3, 27, 19
+3712: 3, 27, 20
+3713: 3, 27, 21
+3714: 3, 27, 22
+3715: 3, 27, 23
+3716: 3, 27, 24
+3717: 3, 27, 25
+3718: 3, 27, 26
+3719: 3, 27, 27
+3720: 3, 27, 28
+3721: 3, 27, 29
+3722: 3, 27, 30
+3723: 3, 27, 31
+3724: 3, 27, 32
+3725: 3, 27, 33
+3726: 3, 27, 34
+3727: 4, 0, 0
+3728: 4, 1, 0
+3729: 4, 1, 1
+3730: 4, 1, 2
+3731: 4, 1, 3
+3732: 4, 1, 4
+3733: 4, 1, 5
+3734: 4, 1, 6
+3735: 4, 1, 7
+3736: 4, 1, 8
+3737: 4, 1, 9
+3738: 4, 1, 10
+3739: 4, 1, 11
+3740: 4, 1, 12
+3741: 4, 1, 13
+3742: 4, 1, 14
+3743: 4, 1, 15
+3744: 4, 1, 16
+3745: 4, 1, 17
+3746: 4, 1, 18
+3747: 4, 1, 19
+3748: 4, 1, 20
+3749: 4, 1, 21
+3750: 4, 1, 22
+3751: 4, 1, 23
+3752: 4, 1, 24
+3753: 4, 1, 25
+3754: 4, 1, 26
+3755: 4, 1, 27
+3756: 4, 1, 28
+3757: 4, 1, 29
+3758: 4, 1, 30
+3759: 4, 1, 31
+3760: 4, 1, 32
+3761: 4, 1, 33
+3762: 4, 1, 34
+3763: 4, 1, 35
+3764: 4, 1, 36
+3765: 4, 1, 37
+3766: 4, 1, 38
+3767: 4, 1, 39
+3768: 4, 1, 40
+3769: 4, 1, 41
+3770: 4, 1, 42
+3771: 4, 1, 43
+3772: 4, 1, 44
+3773: 4, 1, 45
+3774: 4, 1, 46
+3775: 4, 1, 47
+3776: 4, 1, 48
+3777: 4, 1, 49
+3778: 4, 1, 50
+3779: 4, 1, 51
+3780: 4, 1, 52
+3781: 4, 1, 53
+3782: 4, 1, 54
+3783: 4, 2, 0
+3784: 4, 2, 1
+3785: 4, 2, 2
+3786: 4, 2, 3
+3787: 4, 2, 4
+3788: 4, 2, 5
+3789: 4, 2, 6
+3790: 4, 2, 7
+3791: 4, 2, 8
+3792: 4, 2, 9
+3793: 4, 2, 10
+3794: 4, 2, 11
+3795: 4, 2, 12
+3796: 4, 2, 13
+3797: 4, 2, 14
+3798: 4, 2, 15
+3799: 4, 2, 16
+3800: 4, 2, 17
+3801: 4, 2, 18
+3802: 4, 2, 19
+3803: 4, 2, 20
+3804: 4, 2, 21
+3805: 4, 2, 22
+3806: 4, 2, 23
+3807: 4, 2, 24
+3808: 4, 2, 25
+3809: 4, 2, 26
+3810: 4, 2, 27
+3811: 4, 2, 28
+3812: 4, 2, 29
+3813: 4, 2, 30
+3814: 4, 2, 31
+3815: 4, 2, 32
+3816: 4, 2, 33
+3817: 4, 2, 34
+3818: 4, 3, 0
+3819: 4, 3, 1
+3820: 4, 3, 2
+3821: 4, 3, 3
+3822: 4, 3, 4
+3823: 4, 3, 5
+3824: 4, 3, 6
+3825: 4, 3, 7
+3826: 4, 3, 8
+3827: 4, 3, 9
+3828: 4, 3, 10
+3829: 4, 3, 11
+3830: 4, 3, 12
+3831: 4, 3, 13
+3832: 4, 3, 14
+3833: 4, 3, 15
+3834: 4, 3, 16
+3835: 4, 3, 17
+3836: 4, 3, 18
+3837: 4, 3, 19
+3838: 4, 3, 20
+3839: 4, 3, 21
+3840: 4, 3, 22
+3841: 4, 3, 23
+3842: 4, 3, 24
+3843: 4, 3, 25
+3844: 4, 3, 26
+3845: 4, 3, 27
+3846: 4, 3, 28
+3847: 4, 3, 29
+3848: 4, 3, 30
+3849: 4, 3, 31
+3850: 4, 3, 32
+3851: 4, 3, 33
+3852: 4, 3, 34
+3853: 4, 3, 35
+3854: 4, 3, 36
+3855: 4, 3, 37
+3856: 4, 3, 38
+3857: 4, 3, 39
+3858: 4, 3, 40
+3859: 4, 3, 41
+3860: 4, 3, 42
+3861: 4, 3, 43
+3862: 4, 3, 44
+3863: 4, 3, 45
+3864: 4, 3, 46
+3865: 4, 3, 47
+3866: 4, 3, 48
+3867: 4, 3, 49
+3868: 4, 3, 50
+3869: 4, 3, 51
+3870: 4, 4, 0
+3871: 4, 4, 1
+3872: 4, 4, 2
+3873: 4, 4, 3
+3874: 4, 4, 4
+3875: 4, 4, 5
+3876: 4, 4, 6
+3877: 4, 4, 7
+3878: 4, 4, 8
+3879: 4, 4, 9
+3880: 4, 4, 10
+3881: 4, 4, 11
+3882: 4, 4, 12
+3883: 4, 4, 13
+3884: 4, 4, 14
+3885: 4, 4, 15
+3886: 4, 4, 16
+3887: 4, 4, 17
+3888: 4, 4, 18
+3889: 4, 4, 19
+3890: 4, 4, 20
+3891: 4, 4, 21
+3892: 4, 4, 22
+3893: 4, 4, 23
+3894: 4, 4, 24
+3895: 4, 4, 25
+3896: 4, 4, 26
+3897: 4, 4, 27
+3898: 4, 4, 28
+3899: 4, 4, 29
+3900: 4, 4, 30
+3901: 4, 4, 31
+3902: 4, 4, 32
+3903: 4, 4, 33
+3904: 4, 4, 34
+3905: 4, 4, 35
+3906: 4, 4, 36
+3907: 4, 4, 37
+3908: 4, 4, 38
+3909: 4, 4, 39
+3910: 4, 4, 40
+3911: 4, 4, 41
+3912: 4, 4, 42
+3913: 4, 4, 43
+3914: 4, 4, 44
+3915: 4, 4, 45
+3916: 4, 4, 46
+3917: 4, 4, 47
+3918: 4, 4, 48
+3919: 4, 4, 49
+3920: 4, 5, 0
+3921: 4, 5, 1
+3922: 4, 5, 2
+3923: 4, 5, 3
+3924: 4, 5, 4
+3925: 4, 5, 5
+3926: 4, 5, 6
+3927: 4, 5, 7
+3928: 4, 5, 8
+3929: 4, 5, 9
+3930: 4, 5, 10
+3931: 4, 5, 11
+3932: 4, 5, 12
+3933: 4, 5, 13
+3934: 4, 5, 14
+3935: 4, 5, 15
+3936: 4, 5, 16
+3937: 4, 5, 17
+3938: 4, 5, 18
+3939: 4, 5, 19
+3940: 4, 5, 20
+3941: 4, 5, 21
+3942: 4, 5, 22
+3943: 4, 5, 23
+3944: 4, 5, 24
+3945: 4, 5, 25
+3946: 4, 5, 26
+3947: 4, 5, 27
+3948: 4, 5, 28
+3949: 4, 5, 29
+3950: 4, 5, 30
+3951: 4, 5, 31
+3952: 4, 6, 0
+3953: 4, 6, 1
+3954: 4, 6, 2
+3955: 4, 6, 3
+3956: 4, 6, 4
+3957: 4, 6, 5
+3958: 4, 6, 6
+3959: 4, 6, 7
+3960: 4, 6, 8
+3961: 4, 6, 9
+3962: 4, 6, 10
+3963: 4, 6, 11
+3964: 4, 6, 12
+3965: 4, 6, 13
+3966: 4, 6, 14
+3967: 4, 6, 15
+3968: 4, 6, 16
+3969: 4, 6, 17
+3970: 4, 6, 18
+3971: 4, 6, 19
+3972: 4, 6, 20
+3973: 4, 6, 21
+3974: 4, 6, 22
+3975: 4, 6, 23
+3976: 4, 6, 24
+3977: 4, 6, 25
+3978: 4, 6, 26
+3979: 4, 6, 27
+3980: 4, 7, 0
+3981: 4, 7, 1
+3982: 4, 7, 2
+3983: 4, 7, 3
+3984: 4, 7, 4
+3985: 4, 7, 5
+3986: 4, 7, 6
+3987: 4, 7, 7
+3988: 4, 7, 8
+3989: 4, 7, 9
+3990: 4, 7, 10
+3991: 4, 7, 11
+3992: 4, 7, 12
+3993: 4, 7, 13
+3994: 4, 7, 14
+3995: 4, 7, 15
+3996: 4, 7, 16
+3997: 4, 7, 17
+3998: 4, 7, 18
+3999: 4, 7, 19
+4000: 4, 7, 20
+4001: 4, 7, 21
+4002: 4, 7, 22
+4003: 4, 7, 23
+4004: 4, 7, 24
+4005: 4, 7, 25
+4006: 4, 7, 26
+4007: 4, 7, 27
+4008: 4, 7, 28
+4009: 4, 7, 29
+4010: 4, 7, 30
+4011: 4, 7, 31
+4012: 4, 7, 32
+4013: 4, 7, 33
+4014: 4, 7, 34
+4015: 4, 7, 35
+4016: 4, 7, 36
+4017: 4, 7, 37
+4018: 4, 7, 38
+4019: 4, 7, 39
+4020: 4, 7, 40
+4021: 4, 7, 41
+4022: 4, 7, 42
+4023: 4, 7, 43
+4024: 4, 7, 44
+4025: 4, 7, 45
+4026: 4, 7, 46
+4027: 4, 7, 47
+4028: 4, 7, 48
+4029: 4, 7, 49
+4030: 4, 7, 50
+4031: 4, 7, 51
+4032: 4, 7, 52
+4033: 4, 7, 53
+4034: 4, 7, 54
+4035: 4, 7, 55
+4036: 4, 7, 56
+4037: 4, 7, 57
+4038: 4, 7, 58
+4039: 4, 7, 59
+4040: 4, 7, 60
+4041: 4, 7, 61
+4042: 4, 7, 62
+4043: 4, 7, 63
+4044: 4, 7, 64
+4045: 4, 7, 65
+4046: 4, 7, 66
+4047: 4, 7, 67
+4048: 4, 7, 68
+4049: 4, 7, 69
+4050: 4, 7, 70
+4051: 4, 7, 71
+4052: 4, 7, 72
+4053: 4, 7, 73
+4054: 4, 7, 74
+4055: 4, 7, 75
+4056: 4, 7, 76
+4057: 4, 7, 77
+4058: 4, 7, 78
+4059: 4, 7, 79
+4060: 4, 7, 80
+4061: 4, 7, 81
+4062: 4, 7, 82
+4063: 4, 7, 83
+4064: 4, 7, 84
+4065: 4, 7, 85
+4066: 4, 7, 86
+4067: 4, 7, 87
+4068: 4, 7, 88
+4069: 4, 7, 89
+4070: 4, 8, 0
+4071: 4, 8, 1
+4072: 4, 8, 2
+4073: 4, 8, 3
+4074: 4, 8, 4
+4075: 4, 8, 5
+4076: 4, 8, 6
+4077: 4, 8, 7
+4078: 4, 8, 8
+4079: 4, 8, 9
+4080: 4, 8, 10
+4081: 4, 8, 11
+4082: 4, 8, 12
+4083: 4, 8, 13
+4084: 4, 8, 14
+4085: 4, 8, 15
+4086: 4, 8, 16
+4087: 4, 8, 17
+4088: 4, 8, 18
+4089: 4, 8, 19
+4090: 4, 8, 20
+4091: 4, 8, 21
+4092: 4, 8, 22
+4093: 4, 8, 23
+4094: 4, 8, 24
+4095: 4, 8, 25
+4096: 4, 8, 26
+4097: 4, 9, 0
+4098: 4, 9, 1
+4099: 4, 9, 2
+4100: 4, 9, 3
+4101: 4, 9, 4
+4102: 4, 9, 5
+4103: 4, 9, 6
+4104: 4, 9, 7
+4105: 4, 9, 8
+4106: 4, 9, 9
+4107: 4, 9, 10
+4108: 4, 9, 11
+4109: 4, 9, 12
+4110: 4, 9, 13
+4111: 4, 9, 14
+4112: 4, 9, 15
+4113: 4, 9, 16
+4114: 4, 9, 17
+4115: 4, 9, 18
+4116: 4, 9, 19
+4117: 4, 9, 20
+4118: 4, 9, 21
+4119: 4, 9, 22
+4120: 4, 9, 23
+4121: 4, 10, 0
+4122: 4, 10, 1
+4123: 4, 10, 2
+4124: 4, 10, 3
+4125: 4, 10, 4
+4126: 4, 10, 5
+4127: 4, 10, 6
+4128: 4, 10, 7
+4129: 4, 10, 8
+4130: 4, 10, 9
+4131: 4, 10, 10
+4132: 4, 10, 11
+4133: 4, 10, 12
+4134: 4, 10, 13
+4135: 4, 10, 14
+4136: 4, 10, 15
+4137: 4, 10, 16
+4138: 4, 10, 17
+4139: 4, 10, 18
+4140: 4, 10, 19
+4141: 4, 10, 20
+4142: 4, 10, 21
+4143: 4, 10, 22
+4144: 4, 10, 23
+4145: 4, 10, 24
+4146: 4, 10, 25
+4147: 4, 10, 26
+4148: 4, 10, 27
+4149: 4, 10, 28
+4150: 4, 10, 29
+4151: 4, 10, 30
+4152: 4, 10, 31
+4153: 4, 10, 32
+4154: 4, 10, 33
+4155: 4, 10, 34
+4156: 4, 10, 35
+4157: 4, 10, 36
+4158: 4, 11, 0
+4159: 4, 11, 1
+4160: 4, 11, 2
+4161: 4, 11, 3
+4162: 4, 11, 4
+4163: 4, 11, 5
+4164: 4, 11, 6
+4165: 4, 11, 7
+4166: 4, 11, 8
+4167: 4, 11, 9
+4168: 4, 11, 10
+4169: 4, 11, 11
+4170: 4, 11, 12
+4171: 4, 11, 13
+4172: 4, 11, 14
+4173: 4, 11, 15
+4174: 4, 11, 16
+4175: 4, 11, 17
+4176: 4, 11, 18
+4177: 4, 11, 19
+4178: 4, 11, 20
+4179: 4, 11, 21
+4180: 4, 11, 22
+4181: 4, 11, 23
+4182: 4, 11, 24
+4183: 4, 11, 25
+4184: 4, 11, 26
+4185: 4, 11, 27
+4186: 4, 11, 28
+4187: 4, 11, 29
+4188: 4, 11, 30
+4189: 4, 11, 31
+4190: 4, 11, 32
+4191: 4, 11, 33
+4192: 4, 11, 34
+4193: 4, 11, 35
+4194: 4, 12, 0
+4195: 4, 12, 1
+4196: 4, 12, 2
+4197: 4, 12, 3
+4198: 4, 12, 4
+4199: 4, 12, 5
+4200: 4, 12, 6
+4201: 4, 12, 7
+4202: 4, 12, 8
+4203: 4, 12, 9
+4204: 4, 12, 10
+4205: 4, 12, 11
+4206: 4, 12, 12
+4207: 4, 12, 13
+4208: 4, 12, 14
+4209: 4, 12, 15
+4210: 4, 12, 16
+4211: 4, 13, 0
+4212: 4, 13, 1
+4213: 4, 13, 2
+4214: 4, 13, 3
+4215: 4, 13, 4
+4216: 4, 13, 5
+4217: 4, 13, 6
+4218: 4, 13, 7
+4219: 4, 13, 8
+4220: 4, 13, 9
+4221: 4, 13, 10
+4222: 4, 13, 11
+4223: 4, 13, 12
+4224: 4, 13, 13
+4225: 4, 13, 14
+4226: 4, 13, 15
+4227: 4, 13, 16
+4228: 4, 13, 17
+4229: 4, 13, 18
+4230: 4, 13, 19
+4231: 4, 13, 20
+4232: 4, 13, 21
+4233: 4, 13, 22
+4234: 4, 13, 23
+4235: 4, 13, 24
+4236: 4, 13, 25
+4237: 4, 13, 26
+4238: 4, 13, 27
+4239: 4, 13, 28
+4240: 4, 13, 29
+4241: 4, 13, 30
+4242: 4, 13, 31
+4243: 4, 13, 32
+4244: 4, 13, 33
+4245: 4, 14, 0
+4246: 4, 14, 1
+4247: 4, 14, 2
+4248: 4, 14, 3
+4249: 4, 14, 4
+4250: 4, 14, 5
+4251: 4, 14, 6
+4252: 4, 14, 7
+4253: 4, 14, 8
+4254: 4, 14, 9
+4255: 4, 14, 10
+4256: 4, 14, 11
+4257: 4, 14, 12
+4258: 4, 14, 13
+4259: 4, 14, 14
+4260: 4, 14, 15
+4261: 4, 14, 16
+4262: 4, 14, 17
+4263: 4, 14, 18
+4264: 4, 14, 19
+4265: 4, 14, 20
+4266: 4, 14, 21
+4267: 4, 14, 22
+4268: 4, 14, 23
+4269: 4, 14, 24
+4270: 4, 14, 25
+4271: 4, 14, 26
+4272: 4, 14, 27
+4273: 4, 14, 28
+4274: 4, 14, 29
+4275: 4, 14, 30
+4276: 4, 14, 31
+4277: 4, 14, 32
+4278: 4, 14, 33
+4279: 4, 14, 34
+4280: 4, 14, 35
+4281: 4, 14, 36
+4282: 4, 14, 37
+4283: 4, 14, 38
+4284: 4, 14, 39
+4285: 4, 14, 40
+4286: 4, 14, 41
+4287: 4, 14, 42
+4288: 4, 14, 43
+4289: 4, 14, 44
+4290: 4, 14, 45
+4291: 4, 15, 0
+4292: 4, 15, 1
+4293: 4, 15, 2
+4294: 4, 15, 3
+4295: 4, 15, 4
+4296: 4, 15, 5
+4297: 4, 15, 6
+4298: 4, 15, 7
+4299: 4, 15, 8
+4300: 4, 15, 9
+4301: 4, 15, 10
+4302: 4, 15, 11
+4303: 4, 15, 12
+4304: 4, 15, 13
+4305: 4, 15, 14
+4306: 4, 15, 15
+4307: 4, 15, 16
+4308: 4, 15, 17
+4309: 4, 15, 18
+4310: 4, 15, 19
+4311: 4, 15, 20
+4312: 4, 15, 21
+4313: 4, 15, 22
+4314: 4, 15, 23
+4315: 4, 15, 24
+4316: 4, 15, 25
+4317: 4, 15, 26
+4318: 4, 15, 27
+4319: 4, 15, 28
+4320: 4, 15, 29
+4321: 4, 15, 30
+4322: 4, 15, 31
+4323: 4, 15, 32
+4324: 4, 15, 33
+4325: 4, 15, 34
+4326: 4, 15, 35
+4327: 4, 15, 36
+4328: 4, 15, 37
+4329: 4, 15, 38
+4330: 4, 15, 39
+4331: 4, 15, 40
+4332: 4, 15, 41
+4333: 4, 16, 0
+4334: 4, 16, 1
+4335: 4, 16, 2
+4336: 4, 16, 3
+4337: 4, 16, 4
+4338: 4, 16, 5
+4339: 4, 16, 6
+4340: 4, 16, 7
+4341: 4, 16, 8
+4342: 4, 16, 9
+4343: 4, 16, 10
+4344: 4, 16, 11
+4345: 4, 16, 12
+4346: 4, 16, 13
+4347: 4, 16, 14
+4348: 4, 16, 15
+4349: 4, 16, 16
+4350: 4, 16, 17
+4351: 4, 16, 18
+4352: 4, 16, 19
+4353: 4, 16, 20
+4354: 4, 16, 21
+4355: 4, 16, 22
+4356: 4, 16, 23
+4357: 4, 16, 24
+4358: 4, 16, 25
+4359: 4, 16, 26
+4360: 4, 16, 27
+4361: 4, 16, 28
+4362: 4, 16, 29
+4363: 4, 16, 30
+4364: 4, 16, 31
+4365: 4, 16, 32
+4366: 4, 16, 33
+4367: 4, 16, 34
+4368: 4, 16, 35
+4369: 4, 16, 36
+4370: 4, 16, 37
+4371: 4, 16, 38
+4372: 4, 16, 39
+4373: 4, 16, 40
+4374: 4, 16, 41
+4375: 4, 16, 42
+4376: 4, 16, 43
+4377: 4, 16, 44
+4378: 4, 16, 45
+4379: 4, 16, 46
+4380: 4, 16, 47
+4381: 4, 16, 48
+4382: 4, 16, 49
+4383: 4, 16, 50
+4384: 4, 17, 0
+4385: 4, 17, 1
+4386: 4, 17, 2
+4387: 4, 17, 3
+4388: 4, 17, 4
+4389: 4, 17, 5
+4390: 4, 17, 6
+4391: 4, 17, 7
+4392: 4, 17, 8
+4393: 4, 17, 9
+4394: 4, 17, 10
+4395: 4, 17, 11
+4396: 4, 17, 12
+4397: 4, 17, 13
+4398: 4, 18, 0
+4399: 4, 18, 1
+4400: 4, 18, 2
+4401: 4, 18, 3
+4402: 4, 18, 4
+4403: 4, 18, 5
+4404: 4, 18, 6
+4405: 4, 18, 7
+4406: 4, 18, 8
+4407: 4, 18, 9
+4408: 4, 18, 10
+4409: 4, 18, 11
+4410: 4, 18, 12
+4411: 4, 18, 13
+4412: 4, 18, 14
+4413: 4, 18, 15
+4414: 4, 18, 16
+4415: 4, 18, 17
+4416: 4, 18, 18
+4417: 4, 18, 19
+4418: 4, 18, 20
+4419: 4, 18, 21
+4420: 4, 18, 22
+4421: 4, 18, 23
+4422: 4, 18, 24
+4423: 4, 18, 25
+4424: 4, 18, 26
+4425: 4, 18, 27
+4426: 4, 18, 28
+4427: 4, 18, 29
+4428: 4, 18, 30
+4429: 4, 18, 31
+4430: 4, 18, 32
+4431: 4, 19, 0
+4432: 4, 19, 1
+4433: 4, 19, 2
+4434: 4, 19, 3
+4435: 4, 19, 4
+4436: 4, 19, 5
+4437: 4, 19, 6
+4438: 4, 19, 7
+4439: 4, 19, 8
+4440: 4, 19, 9
+4441: 4, 19, 10
+4442: 4, 19, 11
+4443: 4, 19, 12
+4444: 4, 19, 13
+4445: 4, 19, 14
+4446: 4, 19, 15
+4447: 4, 19, 16
+4448: 4, 19, 17
+4449: 4, 19, 18
+4450: 4, 19, 19
+4451: 4, 19, 20
+4452: 4, 19, 21
+4453: 4, 19, 22
+4454: 4, 20, 0
+4455: 4, 20, 1
+4456: 4, 20, 2
+4457: 4, 20, 3
+4458: 4, 20, 4
+4459: 4, 20, 5
+4460: 4, 20, 6
+4461: 4, 20, 7
+4462: 4, 20, 8
+4463: 4, 20, 9
+4464: 4, 20, 10
+4465: 4, 20, 11
+4466: 4, 20, 12
+4467: 4, 20, 13
+4468: 4, 20, 14
+4469: 4, 20, 15
+4470: 4, 20, 16
+4471: 4, 20, 17
+4472: 4, 20, 18
+4473: 4, 20, 19
+4474: 4, 20, 20
+4475: 4, 20, 21
+4476: 4, 20, 22
+4477: 4, 20, 23
+4478: 4, 20, 24
+4479: 4, 20, 25
+4480: 4, 20, 26
+4481: 4, 20, 27
+4482: 4, 20, 28
+4483: 4, 20, 29
+4484: 4, 21, 0
+4485: 4, 21, 1
+4486: 4, 21, 2
+4487: 4, 21, 3
+4488: 4, 21, 4
+4489: 4, 21, 5
+4490: 4, 21, 6
+4491: 4, 21, 7
+4492: 4, 21, 8
+4493: 4, 21, 9
+4494: 4, 21, 10
+4495: 4, 21, 11
+4496: 4, 21, 12
+4497: 4, 21, 13
+4498: 4, 21, 14
+4499: 4, 21, 15
+4500: 4, 21, 16
+4501: 4, 21, 17
+4502: 4, 21, 18
+4503: 4, 21, 19
+4504: 4, 21, 20
+4505: 4, 21, 21
+4506: 4, 21, 22
+4507: 4, 21, 23
+4508: 4, 21, 24
+4509: 4, 21, 25
+4510: 4, 21, 26
+4511: 4, 21, 27
+4512: 4, 21, 28
+4513: 4, 21, 29
+4514: 4, 21, 30
+4515: 4, 21, 31
+4516: 4, 21, 32
+4517: 4, 21, 33
+4518: 4, 21, 34
+4519: 4, 21, 35
+4520: 4, 22, 0
+4521: 4, 22, 1
+4522: 4, 22, 2
+4523: 4, 22, 3
+4524: 4, 22, 4
+4525: 4, 22, 5
+4526: 4, 22, 6
+4527: 4, 22, 7
+4528: 4, 22, 8
+4529: 4, 22, 9
+4530: 4, 22, 10
+4531: 4, 22, 11
+4532: 4, 22, 12
+4533: 4, 22, 13
+4534: 4, 22, 14
+4535: 4, 22, 15
+4536: 4, 22, 16
+4537: 4, 22, 17
+4538: 4, 22, 18
+4539: 4, 22, 19
+4540: 4, 22, 20
+4541: 4, 22, 21
+4542: 4, 22, 22
+4543: 4, 22, 23
+4544: 4, 22, 24
+4545: 4, 22, 25
+4546: 4, 22, 26
+4547: 4, 22, 27
+4548: 4, 22, 28
+4549: 4, 22, 29
+4550: 4, 22, 30
+4551: 4, 22, 31
+4552: 4, 22, 32
+4553: 4, 22, 33
+4554: 4, 22, 34
+4555: 4, 22, 35
+4556: 4, 22, 36
+4557: 4, 22, 37
+4558: 4, 22, 38
+4559: 4, 22, 39
+4560: 4, 22, 40
+4561: 4, 22, 41
+4562: 4, 23, 0
+4563: 4, 23, 1
+4564: 4, 23, 2
+4565: 4, 23, 3
+4566: 4, 23, 4
+4567: 4, 23, 5
+4568: 4, 23, 6
+4569: 4, 23, 7
+4570: 4, 23, 8
+4571: 4, 23, 9
+4572: 4, 23, 10
+4573: 4, 23, 11
+4574: 4, 23, 12
+4575: 4, 23, 13
+4576: 4, 23, 14
+4577: 4, 23, 15
+4578: 4, 23, 16
+4579: 4, 23, 17
+4580: 4, 23, 18
+4581: 4, 23, 19
+4582: 4, 23, 20
+4583: 4, 23, 21
+4584: 4, 23, 22
+4585: 4, 23, 23
+4586: 4, 23, 24
+4587: 4, 23, 25
+4588: 4, 23, 26
+4589: 4, 23, 27
+4590: 4, 23, 28
+4591: 4, 23, 29
+4592: 4, 23, 30
+4593: 4, 24, 0
+4594: 4, 24, 1
+4595: 4, 24, 2
+4596: 4, 24, 3
+4597: 4, 24, 4
+4598: 4, 24, 5
+4599: 4, 24, 6
+4600: 4, 24, 7
+4601: 4, 24, 8
+4602: 4, 24, 9
+4603: 4, 24, 10
+4604: 4, 24, 11
+4605: 4, 24, 12
+4606: 4, 24, 13
+4607: 4, 24, 14
+4608: 4, 24, 15
+4609: 4, 24, 16
+4610: 4, 24, 17
+4611: 4, 24, 18
+4612: 4, 24, 19
+4613: 4, 24, 20
+4614: 4, 24, 21
+4615: 4, 24, 22
+4616: 4, 24, 23
+4617: 4, 24, 24
+4618: 4, 24, 25
+4619: 4, 25, 0
+4620: 4, 25, 1
+4621: 4, 25, 2
+4622: 4, 25, 3
+4623: 4, 25, 4
+4624: 4, 25, 5
+4625: 4, 25, 6
+4626: 4, 25, 7
+4627: 4, 25, 8
+4628: 4, 25, 9
+4629: 4, 25, 10
+4630: 4, 25, 11
+4631: 4, 25, 12
+4632: 4, 25, 13
+4633: 4, 25, 14
+4634: 4, 25, 15
+4635: 4, 25, 16
+4636: 4, 25, 17
+4637: 4, 25, 18
+4638: 4, 26, 0
+4639: 4, 26, 1
+4640: 4, 26, 2
+4641: 4, 26, 3
+4642: 4, 26, 4
+4643: 4, 26, 5
+4644: 4, 26, 6
+4645: 4, 26, 7
+4646: 4, 26, 8
+4647: 4, 26, 9
+4648: 4, 26, 10
+4649: 4, 26, 11
+4650: 4, 26, 12
+4651: 4, 26, 13
+4652: 4, 26, 14
+4653: 4, 26, 15
+4654: 4, 26, 16
+4655: 4, 26, 17
+4656: 4, 26, 18
+4657: 4, 26, 19
+4658: 4, 26, 20
+4659: 4, 26, 21
+4660: 4, 26, 22
+4661: 4, 26, 23
+4662: 4, 26, 24
+4663: 4, 26, 25
+4664: 4, 26, 26
+4665: 4, 26, 27
+4666: 4, 26, 28
+4667: 4, 26, 29
+4668: 4, 26, 30
+4669: 4, 26, 31
+4670: 4, 26, 32
+4671: 4, 26, 33
+4672: 4, 26, 34
+4673: 4, 26, 35
+4674: 4, 26, 36
+4675: 4, 26, 37
+4676: 4, 26, 38
+4677: 4, 26, 39
+4678: 4, 26, 40
+4679: 4, 26, 41
+4680: 4, 26, 42
+4681: 4, 26, 43
+4682: 4, 26, 44
+4683: 4, 26, 45
+4684: 4, 26, 46
+4685: 4, 26, 47
+4686: 4, 26, 48
+4687: 4, 26, 49
+4688: 4, 26, 50
+4689: 4, 26, 51
+4690: 4, 26, 52
+4691: 4, 26, 53
+4692: 4, 26, 54
+4693: 4, 26, 55
+4694: 4, 26, 56
+4695: 4, 26, 57
+4696: 4, 26, 58
+4697: 4, 26, 59
+4698: 4, 26, 60
+4699: 4, 26, 61
+4700: 4, 26, 62
+4701: 4, 26, 63
+4702: 4, 26, 64
+4703: 4, 26, 65
+4704: 4, 27, 0
+4705: 4, 27, 1
+4706: 4, 27, 2
+4707: 4, 27, 3
+4708: 4, 27, 4
+4709: 4, 27, 5
+4710: 4, 27, 6
+4711: 4, 27, 7
+4712: 4, 27, 8
+4713: 4, 27, 9
+4714: 4, 27, 10
+4715: 4, 27, 11
+4716: 4, 27, 12
+4717: 4, 27, 13
+4718: 4, 27, 14
+4719: 4, 27, 15
+4720: 4, 27, 16
+4721: 4, 27, 17
+4722: 4, 27, 18
+4723: 4, 27, 19
+4724: 4, 27, 20
+4725: 4, 27, 21
+4726: 4, 27, 22
+4727: 4, 27, 23
+4728: 4, 28, 0
+4729: 4, 28, 1
+4730: 4, 28, 2
+4731: 4, 28, 3
+4732: 4, 28, 4
+4733: 4, 28, 5
+4734: 4, 28, 6
+4735: 4, 28, 7
+4736: 4, 28, 8
+4737: 4, 28, 9
+4738: 4, 28, 10
+4739: 4, 28, 11
+4740: 4, 28, 12
+4741: 4, 28, 13
+4742: 4, 28, 14
+4743: 4, 28, 15
+4744: 4, 28, 16
+4745: 4, 28, 17
+4746: 4, 28, 18
+4747: 4, 28, 19
+4748: 4, 28, 20
+4749: 4, 28, 21
+4750: 4, 28, 22
+4751: 4, 28, 23
+4752: 4, 28, 24
+4753: 4, 28, 25
+4754: 4, 28, 26
+4755: 4, 28, 27
+4756: 4, 28, 28
+4757: 4, 28, 29
+4758: 4, 28, 30
+4759: 4, 28, 31
+4760: 4, 29, 0
+4761: 4, 29, 1
+4762: 4, 29, 2
+4763: 4, 29, 3
+4764: 4, 29, 4
+4765: 4, 29, 5
+4766: 4, 29, 6
+4767: 4, 29, 7
+4768: 4, 29, 8
+4769: 4, 29, 9
+4770: 4, 29, 10
+4771: 4, 29, 11
+4772: 4, 29, 12
+4773: 4, 29, 13
+4774: 4, 29, 14
+4775: 4, 29, 15
+4776: 4, 29, 16
+4777: 4, 29, 17
+4778: 4, 29, 18
+4779: 4, 29, 19
+4780: 4, 29, 20
+4781: 4, 29, 21
+4782: 4, 29, 22
+4783: 4, 29, 23
+4784: 4, 29, 24
+4785: 4, 29, 25
+4786: 4, 29, 26
+4787: 4, 29, 27
+4788: 4, 29, 28
+4789: 4, 29, 29
+4790: 4, 29, 30
+4791: 4, 29, 31
+4792: 4, 29, 32
+4793: 4, 29, 33
+4794: 4, 29, 34
+4795: 4, 29, 35
+4796: 4, 29, 36
+4797: 4, 29, 37
+4798: 4, 29, 38
+4799: 4, 29, 39
+4800: 4, 29, 40
+4801: 4, 30, 0
+4802: 4, 30, 1
+4803: 4, 30, 2
+4804: 4, 30, 3
+4805: 4, 30, 4
+4806: 4, 30, 5
+4807: 4, 30, 6
+4808: 4, 30, 7
+4809: 4, 30, 8
+4810: 4, 30, 9
+4811: 4, 30, 10
+4812: 4, 30, 11
+4813: 4, 30, 12
+4814: 4, 30, 13
+4815: 4, 30, 14
+4816: 4, 30, 15
+4817: 4, 30, 16
+4818: 4, 31, 0
+4819: 4, 31, 1
+4820: 4, 31, 2
+4821: 4, 31, 3
+4822: 4, 31, 4
+4823: 4, 31, 5
+4824: 4, 31, 6
+4825: 4, 31, 7
+4826: 4, 31, 8
+4827: 4, 31, 9
+4828: 4, 31, 10
+4829: 4, 31, 11
+4830: 4, 31, 12
+4831: 4, 31, 13
+4832: 4, 31, 14
+4833: 4, 31, 15
+4834: 4, 31, 16
+4835: 4, 31, 17
+4836: 4, 31, 18
+4837: 4, 31, 19
+4838: 4, 31, 20
+4839: 4, 31, 21
+4840: 4, 31, 22
+4841: 4, 31, 23
+4842: 4, 31, 24
+4843: 4, 31, 25
+4844: 4, 31, 26
+4845: 4, 31, 27
+4846: 4, 31, 28
+4847: 4, 31, 29
+4848: 4, 31, 30
+4849: 4, 31, 31
+4850: 4, 31, 32
+4851: 4, 31, 33
+4852: 4, 31, 34
+4853: 4, 31, 35
+4854: 4, 31, 36
+4855: 4, 31, 37
+4856: 4, 31, 38
+4857: 4, 31, 39
+4858: 4, 31, 40
+4859: 4, 31, 41
+4860: 4, 31, 42
+4861: 4, 31, 43
+4862: 4, 31, 44
+4863: 4, 31, 45
+4864: 4, 31, 46
+4865: 4, 31, 47
+4866: 4, 31, 48
+4867: 4, 31, 49
+4868: 4, 31, 50
+4869: 4, 31, 51
+4870: 4, 31, 52
+4871: 4, 31, 53
+4872: 4, 31, 54
+4873: 4, 32, 0
+4874: 4, 32, 1
+4875: 4, 32, 2
+4876: 4, 32, 3
+4877: 4, 32, 4
+4878: 4, 32, 5
+4879: 4, 32, 6
+4880: 4, 32, 7
+4881: 4, 32, 8
+4882: 4, 32, 9
+4883: 4, 32, 10
+4884: 4, 32, 11
+4885: 4, 32, 12
+4886: 4, 32, 13
+4887: 4, 32, 14
+4888: 4, 32, 15
+4889: 4, 32, 16
+4890: 4, 32, 17
+4891: 4, 32, 18
+4892: 4, 32, 19
+4893: 4, 32, 20
+4894: 4, 32, 21
+4895: 4, 32, 22
+4896: 4, 32, 23
+4897: 4, 32, 24
+4898: 4, 32, 25
+4899: 4, 32, 26
+4900: 4, 32, 27
+4901: 4, 32, 28
+4902: 4, 32, 29
+4903: 4, 32, 30
+4904: 4, 32, 31
+4905: 4, 32, 32
+4906: 4, 32, 33
+4907: 4, 32, 34
+4908: 4, 32, 35
+4909: 4, 32, 36
+4910: 4, 32, 37
+4911: 4, 32, 38
+4912: 4, 32, 39
+4913: 4, 32, 40
+4914: 4, 32, 41
+4915: 4, 32, 42
+4916: 4, 33, 0
+4917: 4, 33, 1
+4918: 4, 33, 2
+4919: 4, 33, 3
+4920: 4, 33, 4
+4921: 4, 33, 5
+4922: 4, 33, 6
+4923: 4, 33, 7
+4924: 4, 33, 8
+4925: 4, 33, 9
+4926: 4, 33, 10
+4927: 4, 33, 11
+4928: 4, 33, 12
+4929: 4, 33, 13
+4930: 4, 33, 14
+4931: 4, 33, 15
+4932: 4, 33, 16
+4933: 4, 33, 17
+4934: 4, 33, 18
+4935: 4, 33, 19
+4936: 4, 33, 20
+4937: 4, 33, 21
+4938: 4, 33, 22
+4939: 4, 33, 23
+4940: 4, 33, 24
+4941: 4, 33, 25
+4942: 4, 33, 26
+4943: 4, 33, 27
+4944: 4, 33, 28
+4945: 4, 33, 29
+4946: 4, 33, 30
+4947: 4, 33, 31
+4948: 4, 33, 32
+4949: 4, 33, 33
+4950: 4, 33, 34
+4951: 4, 33, 35
+4952: 4, 33, 36
+4953: 4, 33, 37
+4954: 4, 33, 38
+4955: 4, 33, 39
+4956: 4, 33, 40
+4957: 4, 33, 41
+4958: 4, 33, 42
+4959: 4, 33, 43
+4960: 4, 33, 44
+4961: 4, 33, 45
+4962: 4, 33, 46
+4963: 4, 33, 47
+4964: 4, 33, 48
+4965: 4, 33, 49
+4966: 4, 33, 50
+4967: 4, 33, 51
+4968: 4, 33, 52
+4969: 4, 33, 53
+4970: 4, 33, 54
+4971: 4, 33, 55
+4972: 4, 33, 56
+4973: 4, 34, 0
+4974: 4, 34, 1
+4975: 4, 34, 2
+4976: 4, 34, 3
+4977: 4, 34, 4
+4978: 4, 34, 5
+4979: 4, 34, 6
+4980: 4, 34, 7
+4981: 4, 34, 8
+4982: 4, 34, 9
+4983: 4, 34, 10
+4984: 4, 34, 11
+4985: 4, 34, 12
+4986: 4, 34, 13
+4987: 4, 34, 14
+4988: 4, 34, 15
+4989: 4, 34, 16
+4990: 4, 34, 17
+4991: 4, 34, 18
+4992: 4, 34, 19
+4993: 4, 34, 20
+4994: 4, 34, 21
+4995: 4, 34, 22
+4996: 4, 34, 23
+4997: 4, 34, 24
+4998: 4, 34, 25
+4999: 4, 34, 26
+5000: 4, 34, 27
+5001: 4, 34, 28
+5002: 4, 34, 29
+5003: 4, 35, 0
+5004: 4, 35, 1
+5005: 4, 35, 2
+5006: 4, 35, 3
+5007: 4, 35, 4
+5008: 4, 35, 5
+5009: 4, 35, 6
+5010: 4, 35, 7
+5011: 4, 35, 8
+5012: 4, 35, 9
+5013: 4, 35, 10
+5014: 4, 35, 11
+5015: 4, 35, 12
+5016: 4, 35, 13
+5017: 4, 35, 14
+5018: 4, 35, 15
+5019: 4, 35, 16
+5020: 4, 35, 17
+5021: 4, 35, 18
+5022: 4, 35, 19
+5023: 4, 35, 20
+5024: 4, 35, 21
+5025: 4, 35, 22
+5026: 4, 35, 23
+5027: 4, 35, 24
+5028: 4, 35, 25
+5029: 4, 35, 26
+5030: 4, 35, 27
+5031: 4, 35, 28
+5032: 4, 35, 29
+5033: 4, 35, 30
+5034: 4, 35, 31
+5035: 4, 35, 32
+5036: 4, 35, 33
+5037: 4, 35, 34
+5038: 4, 36, 0
+5039: 4, 36, 1
+5040: 4, 36, 2
+5041: 4, 36, 3
+5042: 4, 36, 4
+5043: 4, 36, 5
+5044: 4, 36, 6
+5045: 4, 36, 7
+5046: 4, 36, 8
+5047: 4, 36, 9
+5048: 4, 36, 10
+5049: 4, 36, 11
+5050: 4, 36, 12
+5051: 4, 36, 13
+5052: 5, 0, 0
+5053: 5, 1, 0
+5054: 5, 1, 1
+5055: 5, 1, 2
+5056: 5, 1, 3
+5057: 5, 1, 4
+5058: 5, 1, 5
+5059: 5, 1, 6
+5060: 5, 1, 7
+5061: 5, 1, 8
+5062: 5, 1, 9
+5063: 5, 1, 10
+5064: 5, 1, 11
+5065: 5, 1, 12
+5066: 5, 1, 13
+5067: 5, 1, 14
+5068: 5, 1, 15
+5069: 5, 1, 16
+5070: 5, 1, 17
+5071: 5, 1, 18
+5072: 5, 1, 19
+5073: 5, 1, 20
+5074: 5, 1, 21
+5075: 5, 1, 22
+5076: 5, 1, 23
+5077: 5, 1, 24
+5078: 5, 1, 25
+5079: 5, 1, 26
+5080: 5, 1, 27
+5081: 5, 1, 28
+5082: 5, 1, 29
+5083: 5, 1, 30
+5084: 5, 1, 31
+5085: 5, 1, 32
+5086: 5, 1, 33
+5087: 5, 1, 34
+5088: 5, 1, 35
+5089: 5, 1, 36
+5090: 5, 1, 37
+5091: 5, 1, 38
+5092: 5, 1, 39
+5093: 5, 1, 40
+5094: 5, 1, 41
+5095: 5, 1, 42
+5096: 5, 1, 43
+5097: 5, 1, 44
+5098: 5, 1, 45
+5099: 5, 1, 46
+5100: 5, 2, 0
+5101: 5, 2, 1
+5102: 5, 2, 2
+5103: 5, 2, 3
+5104: 5, 2, 4
+5105: 5, 2, 5
+5106: 5, 2, 6
+5107: 5, 2, 7
+5108: 5, 2, 8
+5109: 5, 2, 9
+5110: 5, 2, 10
+5111: 5, 2, 11
+5112: 5, 2, 12
+5113: 5, 2, 13
+5114: 5, 2, 14
+5115: 5, 2, 15
+5116: 5, 2, 16
+5117: 5, 2, 17
+5118: 5, 2, 18
+5119: 5, 2, 19
+5120: 5, 2, 20
+5121: 5, 2, 21
+5122: 5, 2, 22
+5123: 5, 2, 23
+5124: 5, 2, 24
+5125: 5, 2, 25
+5126: 5, 2, 26
+5127: 5, 2, 27
+5128: 5, 2, 28
+5129: 5, 2, 29
+5130: 5, 2, 30
+5131: 5, 2, 31
+5132: 5, 2, 32
+5133: 5, 2, 33
+5134: 5, 2, 34
+5135: 5, 2, 35
+5136: 5, 2, 36
+5137: 5, 2, 37
+5138: 5, 3, 0
+5139: 5, 3, 1
+5140: 5, 3, 2
+5141: 5, 3, 3
+5142: 5, 3, 4
+5143: 5, 3, 5
+5144: 5, 3, 6
+5145: 5, 3, 7
+5146: 5, 3, 8
+5147: 5, 3, 9
+5148: 5, 3, 10
+5149: 5, 3, 11
+5150: 5, 3, 12
+5151: 5, 3, 13
+5152: 5, 3, 14
+5153: 5, 3, 15
+5154: 5, 3, 16
+5155: 5, 3, 17
+5156: 5, 3, 18
+5157: 5, 3, 19
+5158: 5, 3, 20
+5159: 5, 3, 21
+5160: 5, 3, 22
+5161: 5, 3, 23
+5162: 5, 3, 24
+5163: 5, 3, 25
+5164: 5, 3, 26
+5165: 5, 3, 27
+5166: 5, 3, 28
+5167: 5, 3, 29
+5168: 5, 4, 0
+5169: 5, 4, 1
+5170: 5, 4, 2
+5171: 5, 4, 3
+5172: 5, 4, 4
+5173: 5, 4, 5
+5174: 5, 4, 6
+5175: 5, 4, 7
+5176: 5, 4, 8
+5177: 5, 4, 9
+5178: 5, 4, 10
+5179: 5, 4, 11
+5180: 5, 4, 12
+5181: 5, 4, 13
+5182: 5, 4, 14
+5183: 5, 4, 15
+5184: 5, 4, 16
+5185: 5, 4, 17
+5186: 5, 4, 18
+5187: 5, 4, 19
+5188: 5, 4, 20
+5189: 5, 4, 21
+5190: 5, 4, 22
+5191: 5, 4, 23
+5192: 5, 4, 24
+5193: 5, 4, 25
+5194: 5, 4, 26
+5195: 5, 4, 27
+5196: 5, 4, 28
+5197: 5, 4, 29
+5198: 5, 4, 30
+5199: 5, 4, 31
+5200: 5, 4, 32
+5201: 5, 4, 33
+5202: 5, 4, 34
+5203: 5, 4, 35
+5204: 5, 4, 36
+5205: 5, 4, 37
+5206: 5, 4, 38
+5207: 5, 4, 39
+5208: 5, 4, 40
+5209: 5, 4, 41
+5210: 5, 4, 42
+5211: 5, 4, 43
+5212: 5, 4, 44
+5213: 5, 4, 45
+5214: 5, 4, 46
+5215: 5, 4, 47
+5216: 5, 4, 48
+5217: 5, 4, 49
+5218: 5, 5, 0
+5219: 5, 5, 1
+5220: 5, 5, 2
+5221: 5, 5, 3
+5222: 5, 5, 4
+5223: 5, 5, 5
+5224: 5, 5, 6
+5225: 5, 5, 7
+5226: 5, 5, 8
+5227: 5, 5, 9
+5228: 5, 5, 10
+5229: 5, 5, 11
+5230: 5, 5, 12
+5231: 5, 5, 13
+5232: 5, 5, 14
+5233: 5, 5, 15
+5234: 5, 5, 16
+5235: 5, 5, 17
+5236: 5, 5, 18
+5237: 5, 5, 19
+5238: 5, 5, 20
+5239: 5, 5, 21
+5240: 5, 5, 22
+5241: 5, 5, 23
+5242: 5, 5, 24
+5243: 5, 5, 25
+5244: 5, 5, 26
+5245: 5, 5, 27
+5246: 5, 5, 28
+5247: 5, 5, 29
+5248: 5, 5, 30
+5249: 5, 5, 31
+5250: 5, 5, 32
+5251: 5, 5, 33
+5252: 5, 6, 0
+5253: 5, 6, 1
+5254: 5, 6, 2
+5255: 5, 6, 3
+5256: 5, 6, 4
+5257: 5, 6, 5
+5258: 5, 6, 6
+5259: 5, 6, 7
+5260: 5, 6, 8
+5261: 5, 6, 9
+5262: 5, 6, 10
+5263: 5, 6, 11
+5264: 5, 6, 12
+5265: 5, 6, 13
+5266: 5, 6, 14
+5267: 5, 6, 15
+5268: 5, 6, 16
+5269: 5, 6, 17
+5270: 5, 6, 18
+5271: 5, 6, 19
+5272: 5, 6, 20
+5273: 5, 6, 21
+5274: 5, 6, 22
+5275: 5, 6, 23
+5276: 5, 6, 24
+5277: 5, 6, 25
+5278: 5, 7, 0
+5279: 5, 7, 1
+5280: 5, 7, 2
+5281: 5, 7, 3
+5282: 5, 7, 4
+5283: 5, 7, 5
+5284: 5, 7, 6
+5285: 5, 7, 7
+5286: 5, 7, 8
+5287: 5, 7, 9
+5288: 5, 7, 10
+5289: 5, 7, 11
+5290: 5, 7, 12
+5291: 5, 7, 13
+5292: 5, 7, 14
+5293: 5, 7, 15
+5294: 5, 7, 16
+5295: 5, 7, 17
+5296: 5, 7, 18
+5297: 5, 7, 19
+5298: 5, 7, 20
+5299: 5, 7, 21
+5300: 5, 7, 22
+5301: 5, 7, 23
+5302: 5, 7, 24
+5303: 5, 7, 25
+5304: 5, 7, 26
+5305: 5, 8, 0
+5306: 5, 8, 1
+5307: 5, 8, 2
+5308: 5, 8, 3
+5309: 5, 8, 4
+5310: 5, 8, 5
+5311: 5, 8, 6
+5312: 5, 8, 7
+5313: 5, 8, 8
+5314: 5, 8, 9
+5315: 5, 8, 10
+5316: 5, 8, 11
+5317: 5, 8, 12
+5318: 5, 8, 13
+5319: 5, 8, 14
+5320: 5, 8, 15
+5321: 5, 8, 16
+5322: 5, 8, 17
+5323: 5, 8, 18
+5324: 5, 8, 19
+5325: 5, 8, 20
+5326: 5, 9, 0
+5327: 5, 9, 1
+5328: 5, 9, 2
+5329: 5, 9, 3
+5330: 5, 9, 4
+5331: 5, 9, 5
+5332: 5, 9, 6
+5333: 5, 9, 7
+5334: 5, 9, 8
+5335: 5, 9, 9
+5336: 5, 9, 10
+5337: 5, 9, 11
+5338: 5, 9, 12
+5339: 5, 9, 13
+5340: 5, 9, 14
+5341: 5, 9, 15
+5342: 5, 9, 16
+5343: 5, 9, 17
+5344: 5, 9, 18
+5345: 5, 9, 19
+5346: 5, 9, 20
+5347: 5, 9, 21
+5348: 5, 9, 22
+5349: 5, 9, 23
+5350: 5, 9, 24
+5351: 5, 9, 25
+5352: 5, 9, 26
+5353: 5, 9, 27
+5354: 5, 9, 28
+5355: 5, 9, 29
+5356: 5, 10, 0
+5357: 5, 10, 1
+5358: 5, 10, 2
+5359: 5, 10, 3
+5360: 5, 10, 4
+5361: 5, 10, 5
+5362: 5, 10, 6
+5363: 5, 10, 7
+5364: 5, 10, 8
+5365: 5, 10, 9
+5366: 5, 10, 10
+5367: 5, 10, 11
+5368: 5, 10, 12
+5369: 5, 10, 13
+5370: 5, 10, 14
+5371: 5, 10, 15
+5372: 5, 10, 16
+5373: 5, 10, 17
+5374: 5, 10, 18
+5375: 5, 10, 19
+5376: 5, 10, 20
+5377: 5, 10, 21
+5378: 5, 10, 22
+5379: 5, 11, 0
+5380: 5, 11, 1
+5381: 5, 11, 2
+5382: 5, 11, 3
+5383: 5, 11, 4
+5384: 5, 11, 5
+5385: 5, 11, 6
+5386: 5, 11, 7
+5387: 5, 11, 8
+5388: 5, 11, 9
+5389: 5, 11, 10
+5390: 5, 11, 11
+5391: 5, 11, 12
+5392: 5, 11, 13
+5393: 5, 11, 14
+5394: 5, 11, 15
+5395: 5, 11, 16
+5396: 5, 11, 17
+5397: 5, 11, 18
+5398: 5, 11, 19
+5399: 5, 11, 20
+5400: 5, 11, 21
+5401: 5, 11, 22
+5402: 5, 11, 23
+5403: 5, 11, 24
+5404: 5, 11, 25
+5405: 5, 11, 26
+5406: 5, 11, 27
+5407: 5, 11, 28
+5408: 5, 11, 29
+5409: 5, 11, 30
+5410: 5, 11, 31
+5411: 5, 11, 32
+5412: 5, 12, 0
+5413: 5, 12, 1
+5414: 5, 12, 2
+5415: 5, 12, 3
+5416: 5, 12, 4
+5417: 5, 12, 5
+5418: 5, 12, 6
+5419: 5, 12, 7
+5420: 5, 12, 8
+5421: 5, 12, 9
+5422: 5, 12, 10
+5423: 5, 12, 11
+5424: 5, 12, 12
+5425: 5, 12, 13
+5426: 5, 12, 14
+5427: 5, 12, 15
+5428: 5, 12, 16
+5429: 5, 12, 17
+5430: 5, 12, 18
+5431: 5, 12, 19
+5432: 5, 12, 20
+5433: 5, 12, 21
+5434: 5, 12, 22
+5435: 5, 12, 23
+5436: 5, 12, 24
+5437: 5, 12, 25
+5438: 5, 12, 26
+5439: 5, 12, 27
+5440: 5, 12, 28
+5441: 5, 12, 29
+5442: 5, 12, 30
+5443: 5, 12, 31
+5444: 5, 12, 32
+5445: 5, 13, 0
+5446: 5, 13, 1
+5447: 5, 13, 2
+5448: 5, 13, 3
+5449: 5, 13, 4
+5450: 5, 13, 5
+5451: 5, 13, 6
+5452: 5, 13, 7
+5453: 5, 13, 8
+5454: 5, 13, 9
+5455: 5, 13, 10
+5456: 5, 13, 11
+5457: 5, 13, 12
+5458: 5, 13, 13
+5459: 5, 13, 14
+5460: 5, 13, 15
+5461: 5, 13, 16
+5462: 5, 13, 17
+5463: 5, 13, 18
+5464: 5, 14, 0
+5465: 5, 14, 1
+5466: 5, 14, 2
+5467: 5, 14, 3
+5468: 5, 14, 4
+5469: 5, 14, 5
+5470: 5, 14, 6
+5471: 5, 14, 7
+5472: 5, 14, 8
+5473: 5, 14, 9
+5474: 5, 14, 10
+5475: 5, 14, 11
+5476: 5, 14, 12
+5477: 5, 14, 13
+5478: 5, 14, 14
+5479: 5, 14, 15
+5480: 5, 14, 16
+5481: 5, 14, 17
+5482: 5, 14, 18
+5483: 5, 14, 19
+5484: 5, 14, 20
+5485: 5, 14, 21
+5486: 5, 14, 22
+5487: 5, 14, 23
+5488: 5, 14, 24
+5489: 5, 14, 25
+5490: 5, 14, 26
+5491: 5, 14, 27
+5492: 5, 14, 28
+5493: 5, 14, 29
+5494: 5, 15, 0
+5495: 5, 15, 1
+5496: 5, 15, 2
+5497: 5, 15, 3
+5498: 5, 15, 4
+5499: 5, 15, 5
+5500: 5, 15, 6
+5501: 5, 15, 7
+5502: 5, 15, 8
+5503: 5, 15, 9
+5504: 5, 15, 10
+5505: 5, 15, 11
+5506: 5, 15, 12
+5507: 5, 15, 13
+5508: 5, 15, 14
+5509: 5, 15, 15
+5510: 5, 15, 16
+5511: 5, 15, 17
+5512: 5, 15, 18
+5513: 5, 15, 19
+5514: 5, 15, 20
+5515: 5, 15, 21
+5516: 5, 15, 22
+5517: 5, 15, 23
+5518: 5, 16, 0
+5519: 5, 16, 1
+5520: 5, 16, 2
+5521: 5, 16, 3
+5522: 5, 16, 4
+5523: 5, 16, 5
+5524: 5, 16, 6
+5525: 5, 16, 7
+5526: 5, 16, 8
+5527: 5, 16, 9
+5528: 5, 16, 10
+5529: 5, 16, 11
+5530: 5, 16, 12
+5531: 5, 16, 13
+5532: 5, 16, 14
+5533: 5, 16, 15
+5534: 5, 16, 16
+5535: 5, 16, 17
+5536: 5, 16, 18
+5537: 5, 16, 19
+5538: 5, 16, 20
+5539: 5, 16, 21
+5540: 5, 16, 22
+5541: 5, 17, 0
+5542: 5, 17, 1
+5543: 5, 17, 2
+5544: 5, 17, 3
+5545: 5, 17, 4
+5546: 5, 17, 5
+5547: 5, 17, 6
+5548: 5, 17, 7
+5549: 5, 17, 8
+5550: 5, 17, 9
+5551: 5, 17, 10
+5552: 5, 17, 11
+5553: 5, 17, 12
+5554: 5, 17, 13
+5555: 5, 17, 14
+5556: 5, 17, 15
+5557: 5, 17, 16
+5558: 5, 17, 17
+5559: 5, 17, 18
+5560: 5, 17, 19
+5561: 5, 17, 20
+5562: 5, 18, 0
+5563: 5, 18, 1
+5564: 5, 18, 2
+5565: 5, 18, 3
+5566: 5, 18, 4
+5567: 5, 18, 5
+5568: 5, 18, 6
+5569: 5, 18, 7
+5570: 5, 18, 8
+5571: 5, 18, 9
+5572: 5, 18, 10
+5573: 5, 18, 11
+5574: 5, 18, 12
+5575: 5, 18, 13
+5576: 5, 18, 14
+5577: 5, 18, 15
+5578: 5, 18, 16
+5579: 5, 18, 17
+5580: 5, 18, 18
+5581: 5, 18, 19
+5582: 5, 18, 20
+5583: 5, 18, 21
+5584: 5, 18, 22
+5585: 5, 19, 0
+5586: 5, 19, 1
+5587: 5, 19, 2
+5588: 5, 19, 3
+5589: 5, 19, 4
+5590: 5, 19, 5
+5591: 5, 19, 6
+5592: 5, 19, 7
+5593: 5, 19, 8
+5594: 5, 19, 9
+5595: 5, 19, 10
+5596: 5, 19, 11
+5597: 5, 19, 12
+5598: 5, 19, 13
+5599: 5, 19, 14
+5600: 5, 19, 15
+5601: 5, 19, 16
+5602: 5, 19, 17
+5603: 5, 19, 18
+5604: 5, 19, 19
+5605: 5, 19, 20
+5606: 5, 19, 21
+5607: 5, 20, 0
+5608: 5, 20, 1
+5609: 5, 20, 2
+5610: 5, 20, 3
+5611: 5, 20, 4
+5612: 5, 20, 5
+5613: 5, 20, 6
+5614: 5, 20, 7
+5615: 5, 20, 8
+5616: 5, 20, 9
+5617: 5, 20, 10
+5618: 5, 20, 11
+5619: 5, 20, 12
+5620: 5, 20, 13
+5621: 5, 20, 14
+5622: 5, 20, 15
+5623: 5, 20, 16
+5624: 5, 20, 17
+5625: 5, 20, 18
+5626: 5, 20, 19
+5627: 5, 20, 20
+5628: 5, 21, 0
+5629: 5, 21, 1
+5630: 5, 21, 2
+5631: 5, 21, 3
+5632: 5, 21, 4
+5633: 5, 21, 5
+5634: 5, 21, 6
+5635: 5, 21, 7
+5636: 5, 21, 8
+5637: 5, 21, 9
+5638: 5, 21, 10
+5639: 5, 21, 11
+5640: 5, 21, 12
+5641: 5, 21, 13
+5642: 5, 21, 14
+5643: 5, 21, 15
+5644: 5, 21, 16
+5645: 5, 21, 17
+5646: 5, 21, 18
+5647: 5, 21, 19
+5648: 5, 21, 20
+5649: 5, 21, 21
+5650: 5, 21, 22
+5651: 5, 21, 23
+5652: 5, 22, 0
+5653: 5, 22, 1
+5654: 5, 22, 2
+5655: 5, 22, 3
+5656: 5, 22, 4
+5657: 5, 22, 5
+5658: 5, 22, 6
+5659: 5, 22, 7
+5660: 5, 22, 8
+5661: 5, 22, 9
+5662: 5, 22, 10
+5663: 5, 22, 11
+5664: 5, 22, 12
+5665: 5, 22, 13
+5666: 5, 22, 14
+5667: 5, 22, 15
+5668: 5, 22, 16
+5669: 5, 22, 17
+5670: 5, 22, 18
+5671: 5, 22, 19
+5672: 5, 22, 20
+5673: 5, 22, 21
+5674: 5, 22, 22
+5675: 5, 22, 23
+5676: 5, 22, 24
+5677: 5, 22, 25
+5678: 5, 22, 26
+5679: 5, 22, 27
+5680: 5, 22, 28
+5681: 5, 22, 29
+5682: 5, 22, 30
+5683: 5, 23, 0
+5684: 5, 23, 1
+5685: 5, 23, 2
+5686: 5, 23, 3
+5687: 5, 23, 4
+5688: 5, 23, 5
+5689: 5, 23, 6
+5690: 5, 23, 7
+5691: 5, 23, 8
+5692: 5, 23, 9
+5693: 5, 23, 10
+5694: 5, 23, 11
+5695: 5, 23, 12
+5696: 5, 23, 13
+5697: 5, 23, 14
+5698: 5, 23, 15
+5699: 5, 23, 16
+5700: 5, 23, 17
+5701: 5, 23, 18
+5702: 5, 23, 19
+5703: 5, 23, 20
+5704: 5, 23, 21
+5705: 5, 23, 22
+5706: 5, 23, 23
+5707: 5, 23, 24
+5708: 5, 23, 25
+5709: 5, 24, 0
+5710: 5, 24, 1
+5711: 5, 24, 2
+5712: 5, 24, 3
+5713: 5, 24, 4
+5714: 5, 24, 5
+5715: 5, 24, 6
+5716: 5, 24, 7
+5717: 5, 24, 8
+5718: 5, 24, 9
+5719: 5, 24, 10
+5720: 5, 24, 11
+5721: 5, 24, 12
+5722: 5, 24, 13
+5723: 5, 24, 14
+5724: 5, 24, 15
+5725: 5, 24, 16
+5726: 5, 24, 17
+5727: 5, 24, 18
+5728: 5, 24, 19
+5729: 5, 24, 20
+5730: 5, 24, 21
+5731: 5, 24, 22
+5732: 5, 25, 0
+5733: 5, 25, 1
+5734: 5, 25, 2
+5735: 5, 25, 3
+5736: 5, 25, 4
+5737: 5, 25, 5
+5738: 5, 25, 6
+5739: 5, 25, 7
+5740: 5, 25, 8
+5741: 5, 25, 9
+5742: 5, 25, 10
+5743: 5, 25, 11
+5744: 5, 25, 12
+5745: 5, 25, 13
+5746: 5, 25, 14
+5747: 5, 25, 15
+5748: 5, 25, 16
+5749: 5, 25, 17
+5750: 5, 25, 18
+5751: 5, 25, 19
+5752: 5, 26, 0
+5753: 5, 26, 1
+5754: 5, 26, 2
+5755: 5, 26, 3
+5756: 5, 26, 4
+5757: 5, 26, 5
+5758: 5, 26, 6
+5759: 5, 26, 7
+5760: 5, 26, 8
+5761: 5, 26, 9
+5762: 5, 26, 10
+5763: 5, 26, 11
+5764: 5, 26, 12
+5765: 5, 26, 13
+5766: 5, 26, 14
+5767: 5, 26, 15
+5768: 5, 26, 16
+5769: 5, 26, 17
+5770: 5, 26, 18
+5771: 5, 26, 19
+5772: 5, 27, 0
+5773: 5, 27, 1
+5774: 5, 27, 2
+5775: 5, 27, 3
+5776: 5, 27, 4
+5777: 5, 27, 5
+5778: 5, 27, 6
+5779: 5, 27, 7
+5780: 5, 27, 8
+5781: 5, 27, 9
+5782: 5, 27, 10
+5783: 5, 27, 11
+5784: 5, 27, 12
+5785: 5, 27, 13
+5786: 5, 27, 14
+5787: 5, 27, 15
+5788: 5, 27, 16
+5789: 5, 27, 17
+5790: 5, 27, 18
+5791: 5, 27, 19
+5792: 5, 27, 20
+5793: 5, 27, 21
+5794: 5, 27, 22
+5795: 5, 27, 23
+5796: 5, 27, 24
+5797: 5, 27, 25
+5798: 5, 27, 26
+5799: 5, 28, 0
+5800: 5, 28, 1
+5801: 5, 28, 2
+5802: 5, 28, 3
+5803: 5, 28, 4
+5804: 5, 28, 5
+5805: 5, 28, 6
+5806: 5, 28, 7
+5807: 5, 28, 8
+5808: 5, 28, 9
+5809: 5, 28, 10
+5810: 5, 28, 11
+5811: 5, 28, 12
+5812: 5, 28, 13
+5813: 5, 28, 14
+5814: 5, 28, 15
+5815: 5, 28, 16
+5816: 5, 28, 17
+5817: 5, 28, 18
+5818: 5, 28, 19
+5819: 5, 28, 20
+5820: 5, 28, 21
+5821: 5, 28, 22
+5822: 5, 28, 23
+5823: 5, 28, 24
+5824: 5, 28, 25
+5825: 5, 28, 26
+5826: 5, 28, 27
+5827: 5, 28, 28
+5828: 5, 28, 29
+5829: 5, 28, 30
+5830: 5, 28, 31
+5831: 5, 28, 32
+5832: 5, 28, 33
+5833: 5, 28, 34
+5834: 5, 28, 35
+5835: 5, 28, 36
+5836: 5, 28, 37
+5837: 5, 28, 38
+5838: 5, 28, 39
+5839: 5, 28, 40
+5840: 5, 28, 41
+5841: 5, 28, 42
+5842: 5, 28, 43
+5843: 5, 28, 44
+5844: 5, 28, 45
+5845: 5, 28, 46
+5846: 5, 28, 47
+5847: 5, 28, 48
+5848: 5, 28, 49
+5849: 5, 28, 50
+5850: 5, 28, 51
+5851: 5, 28, 52
+5852: 5, 28, 53
+5853: 5, 28, 54
+5854: 5, 28, 55
+5855: 5, 28, 56
+5856: 5, 28, 57
+5857: 5, 28, 58
+5858: 5, 28, 59
+5859: 5, 28, 60
+5860: 5, 28, 61
+5861: 5, 28, 62
+5862: 5, 28, 63
+5863: 5, 28, 64
+5864: 5, 28, 65
+5865: 5, 28, 66
+5866: 5, 28, 67
+5867: 5, 28, 68
+5868: 5, 29, 0
+5869: 5, 29, 1
+5870: 5, 29, 2
+5871: 5, 29, 3
+5872: 5, 29, 4
+5873: 5, 29, 5
+5874: 5, 29, 6
+5875: 5, 29, 7
+5876: 5, 29, 8
+5877: 5, 29, 9
+5878: 5, 29, 10
+5879: 5, 29, 11
+5880: 5, 29, 12
+5881: 5, 29, 13
+5882: 5, 29, 14
+5883: 5, 29, 15
+5884: 5, 29, 16
+5885: 5, 29, 17
+5886: 5, 29, 18
+5887: 5, 29, 19
+5888: 5, 29, 20
+5889: 5, 29, 21
+5890: 5, 29, 22
+5891: 5, 29, 23
+5892: 5, 29, 24
+5893: 5, 29, 25
+5894: 5, 29, 26
+5895: 5, 29, 27
+5896: 5, 29, 28
+5897: 5, 29, 29
+5898: 5, 30, 0
+5899: 5, 30, 1
+5900: 5, 30, 2
+5901: 5, 30, 3
+5902: 5, 30, 4
+5903: 5, 30, 5
+5904: 5, 30, 6
+5905: 5, 30, 7
+5906: 5, 30, 8
+5907: 5, 30, 9
+5908: 5, 30, 10
+5909: 5, 30, 11
+5910: 5, 30, 12
+5911: 5, 30, 13
+5912: 5, 30, 14
+5913: 5, 30, 15
+5914: 5, 30, 16
+5915: 5, 30, 17
+5916: 5, 30, 18
+5917: 5, 30, 19
+5918: 5, 30, 20
+5919: 5, 31, 0
+5920: 5, 31, 1
+5921: 5, 31, 2
+5922: 5, 31, 3
+5923: 5, 31, 4
+5924: 5, 31, 5
+5925: 5, 31, 6
+5926: 5, 31, 7
+5927: 5, 31, 8
+5928: 5, 31, 9
+5929: 5, 31, 10
+5930: 5, 31, 11
+5931: 5, 31, 12
+5932: 5, 31, 13
+5933: 5, 31, 14
+5934: 5, 31, 15
+5935: 5, 31, 16
+5936: 5, 31, 17
+5937: 5, 31, 18
+5938: 5, 31, 19
+5939: 5, 31, 20
+5940: 5, 31, 21
+5941: 5, 31, 22
+5942: 5, 31, 23
+5943: 5, 31, 24
+5944: 5, 31, 25
+5945: 5, 31, 26
+5946: 5, 31, 27
+5947: 5, 31, 28
+5948: 5, 31, 29
+5949: 5, 31, 30
+5950: 5, 32, 0
+5951: 5, 32, 1
+5952: 5, 32, 2
+5953: 5, 32, 3
+5954: 5, 32, 4
+5955: 5, 32, 5
+5956: 5, 32, 6
+5957: 5, 32, 7
+5958: 5, 32, 8
+5959: 5, 32, 9
+5960: 5, 32, 10
+5961: 5, 32, 11
+5962: 5, 32, 12
+5963: 5, 32, 13
+5964: 5, 32, 14
+5965: 5, 32, 15
+5966: 5, 32, 16
+5967: 5, 32, 17
+5968: 5, 32, 18
+5969: 5, 32, 19
+5970: 5, 32, 20
+5971: 5, 32, 21
+5972: 5, 32, 22
+5973: 5, 32, 23
+5974: 5, 32, 24
+5975: 5, 32, 25
+5976: 5, 32, 26
+5977: 5, 32, 27
+5978: 5, 32, 28
+5979: 5, 32, 29
+5980: 5, 32, 30
+5981: 5, 32, 31
+5982: 5, 32, 32
+5983: 5, 32, 33
+5984: 5, 32, 34
+5985: 5, 32, 35
+5986: 5, 32, 36
+5987: 5, 32, 37
+5988: 5, 32, 38
+5989: 5, 32, 39
+5990: 5, 32, 40
+5991: 5, 32, 41
+5992: 5, 32, 42
+5993: 5, 32, 43
+5994: 5, 32, 44
+5995: 5, 32, 45
+5996: 5, 32, 46
+5997: 5, 32, 47
+5998: 5, 32, 48
+5999: 5, 32, 49
+6000: 5, 32, 50
+6001: 5, 32, 51
+6002: 5, 32, 52
+6003: 5, 33, 0
+6004: 5, 33, 1
+6005: 5, 33, 2
+6006: 5, 33, 3
+6007: 5, 33, 4
+6008: 5, 33, 5
+6009: 5, 33, 6
+6010: 5, 33, 7
+6011: 5, 33, 8
+6012: 5, 33, 9
+6013: 5, 33, 10
+6014: 5, 33, 11
+6015: 5, 33, 12
+6016: 5, 33, 13
+6017: 5, 33, 14
+6018: 5, 33, 15
+6019: 5, 33, 16
+6020: 5, 33, 17
+6021: 5, 33, 18
+6022: 5, 33, 19
+6023: 5, 33, 20
+6024: 5, 33, 21
+6025: 5, 33, 22
+6026: 5, 33, 23
+6027: 5, 33, 24
+6028: 5, 33, 25
+6029: 5, 33, 26
+6030: 5, 33, 27
+6031: 5, 33, 28
+6032: 5, 33, 29
+6033: 5, 34, 0
+6034: 5, 34, 1
+6035: 5, 34, 2
+6036: 5, 34, 3
+6037: 5, 34, 4
+6038: 5, 34, 5
+6039: 5, 34, 6
+6040: 5, 34, 7
+6041: 5, 34, 8
+6042: 5, 34, 9
+6043: 5, 34, 10
+6044: 5, 34, 11
+6045: 5, 34, 12
+6046: 6, 0, 0
+6047: 6, 1, 0
+6048: 6, 1, 1
+6049: 6, 1, 2
+6050: 6, 1, 3
+6051: 6, 1, 4
+6052: 6, 1, 5
+6053: 6, 1, 6
+6054: 6, 1, 7
+6055: 6, 1, 8
+6056: 6, 1, 9
+6057: 6, 1, 10
+6058: 6, 1, 11
+6059: 6, 1, 12
+6060: 6, 1, 13
+6061: 6, 1, 14
+6062: 6, 1, 15
+6063: 6, 1, 16
+6064: 6, 1, 17
+6065: 6, 1, 18
+6066: 6, 2, 0
+6067: 6, 2, 1
+6068: 6, 2, 2
+6069: 6, 2, 3
+6070: 6, 2, 4
+6071: 6, 2, 5
+6072: 6, 2, 6
+6073: 6, 2, 7
+6074: 6, 2, 8
+6075: 6, 2, 9
+6076: 6, 2, 10
+6077: 6, 2, 11
+6078: 6, 2, 12
+6079: 6, 2, 13
+6080: 6, 2, 14
+6081: 6, 2, 15
+6082: 6, 2, 16
+6083: 6, 2, 17
+6084: 6, 2, 18
+6085: 6, 2, 19
+6086: 6, 2, 20
+6087: 6, 2, 21
+6088: 6, 2, 22
+6089: 6, 2, 23
+6090: 6, 2, 24
+6091: 6, 3, 0
+6092: 6, 3, 1
+6093: 6, 3, 2
+6094: 6, 3, 3
+6095: 6, 3, 4
+6096: 6, 3, 5
+6097: 6, 3, 6
+6098: 6, 3, 7
+6099: 6, 3, 8
+6100: 6, 3, 9
+6101: 6, 3, 10
+6102: 6, 3, 11
+6103: 6, 3, 12
+6104: 6, 3, 13
+6105: 6, 3, 14
+6106: 6, 3, 15
+6107: 6, 3, 16
+6108: 6, 3, 17
+6109: 6, 4, 0
+6110: 6, 4, 1
+6111: 6, 4, 2
+6112: 6, 4, 3
+6113: 6, 4, 4
+6114: 6, 4, 5
+6115: 6, 4, 6
+6116: 6, 4, 7
+6117: 6, 4, 8
+6118: 6, 4, 9
+6119: 6, 4, 10
+6120: 6, 4, 11
+6121: 6, 4, 12
+6122: 6, 4, 13
+6123: 6, 4, 14
+6124: 6, 4, 15
+6125: 6, 4, 16
+6126: 6, 4, 17
+6127: 6, 4, 18
+6128: 6, 4, 19
+6129: 6, 4, 20
+6130: 6, 4, 21
+6131: 6, 4, 22
+6132: 6, 4, 23
+6133: 6, 4, 24
+6134: 6, 5, 0
+6135: 6, 5, 1
+6136: 6, 5, 2
+6137: 6, 5, 3
+6138: 6, 5, 4
+6139: 6, 5, 5
+6140: 6, 5, 6
+6141: 6, 5, 7
+6142: 6, 5, 8
+6143: 6, 5, 9
+6144: 6, 5, 10
+6145: 6, 5, 11
+6146: 6, 5, 12
+6147: 6, 5, 13
+6148: 6, 5, 14
+6149: 6, 5, 15
+6150: 6, 6, 0
+6151: 6, 6, 1
+6152: 6, 6, 2
+6153: 6, 6, 3
+6154: 6, 6, 4
+6155: 6, 6, 5
+6156: 6, 6, 6
+6157: 6, 6, 7
+6158: 6, 6, 8
+6159: 6, 6, 9
+6160: 6, 6, 10
+6161: 6, 6, 11
+6162: 6, 6, 12
+6163: 6, 6, 13
+6164: 6, 6, 14
+6165: 6, 6, 15
+6166: 6, 6, 16
+6167: 6, 6, 17
+6168: 6, 6, 18
+6169: 6, 6, 19
+6170: 6, 6, 20
+6171: 6, 6, 21
+6172: 6, 6, 22
+6173: 6, 6, 23
+6174: 6, 6, 24
+6175: 6, 6, 25
+6176: 6, 6, 26
+6177: 6, 6, 27
+6178: 6, 7, 0
+6179: 6, 7, 1
+6180: 6, 7, 2
+6181: 6, 7, 3
+6182: 6, 7, 4
+6183: 6, 7, 5
+6184: 6, 7, 6
+6185: 6, 7, 7
+6186: 6, 7, 8
+6187: 6, 7, 9
+6188: 6, 7, 10
+6189: 6, 7, 11
+6190: 6, 7, 12
+6191: 6, 7, 13
+6192: 6, 7, 14
+6193: 6, 7, 15
+6194: 6, 7, 16
+6195: 6, 7, 17
+6196: 6, 7, 18
+6197: 6, 7, 19
+6198: 6, 7, 20
+6199: 6, 7, 21
+6200: 6, 7, 22
+6201: 6, 7, 23
+6202: 6, 7, 24
+6203: 6, 7, 25
+6204: 6, 7, 26
+6205: 6, 8, 0
+6206: 6, 8, 1
+6207: 6, 8, 2
+6208: 6, 8, 3
+6209: 6, 8, 4
+6210: 6, 8, 5
+6211: 6, 8, 6
+6212: 6, 8, 7
+6213: 6, 8, 8
+6214: 6, 8, 9
+6215: 6, 8, 10
+6216: 6, 8, 11
+6217: 6, 8, 12
+6218: 6, 8, 13
+6219: 6, 8, 14
+6220: 6, 8, 15
+6221: 6, 8, 16
+6222: 6, 8, 17
+6223: 6, 8, 18
+6224: 6, 8, 19
+6225: 6, 8, 20
+6226: 6, 8, 21
+6227: 6, 8, 22
+6228: 6, 8, 23
+6229: 6, 8, 24
+6230: 6, 8, 25
+6231: 6, 8, 26
+6232: 6, 8, 27
+6233: 6, 8, 28
+6234: 6, 8, 29
+6235: 6, 8, 30
+6236: 6, 8, 31
+6237: 6, 8, 32
+6238: 6, 8, 33
+6239: 6, 8, 34
+6240: 6, 8, 35
+6241: 6, 9, 0
+6242: 6, 9, 1
+6243: 6, 9, 2
+6244: 6, 9, 3
+6245: 6, 9, 4
+6246: 6, 9, 5
+6247: 6, 9, 6
+6248: 6, 9, 7
+6249: 6, 9, 8
+6250: 6, 9, 9
+6251: 6, 9, 10
+6252: 6, 9, 11
+6253: 6, 9, 12
+6254: 6, 9, 13
+6255: 6, 9, 14
+6256: 6, 9, 15
+6257: 6, 9, 16
+6258: 6, 9, 17
+6259: 6, 9, 18
+6260: 6, 9, 19
+6261: 6, 9, 20
+6262: 6, 9, 21
+6263: 6, 9, 22
+6264: 6, 9, 23
+6265: 6, 9, 24
+6266: 6, 9, 25
+6267: 6, 9, 26
+6268: 6, 9, 27
+6269: 6, 10, 0
+6270: 6, 10, 1
+6271: 6, 10, 2
+6272: 6, 10, 3
+6273: 6, 10, 4
+6274: 6, 10, 5
+6275: 6, 10, 6
+6276: 6, 10, 7
+6277: 6, 10, 8
+6278: 6, 10, 9
+6279: 6, 10, 10
+6280: 6, 10, 11
+6281: 6, 10, 12
+6282: 6, 10, 13
+6283: 6, 10, 14
+6284: 6, 10, 15
+6285: 6, 10, 16
+6286: 6, 10, 17
+6287: 6, 10, 18
+6288: 6, 10, 19
+6289: 6, 10, 20
+6290: 6, 10, 21
+6291: 6, 10, 22
+6292: 6, 10, 23
+6293: 6, 10, 24
+6294: 6, 10, 25
+6295: 6, 10, 26
+6296: 6, 10, 27
+6297: 6, 10, 28
+6298: 6, 10, 29
+6299: 6, 10, 30
+6300: 6, 10, 31
+6301: 6, 10, 32
+6302: 6, 10, 33
+6303: 6, 10, 34
+6304: 6, 10, 35
+6305: 6, 10, 36
+6306: 6, 10, 37
+6307: 6, 10, 38
+6308: 6, 10, 39
+6309: 6, 10, 40
+6310: 6, 10, 41
+6311: 6, 10, 42
+6312: 6, 10, 43
+6313: 6, 11, 0
+6314: 6, 11, 1
+6315: 6, 11, 2
+6316: 6, 11, 3
+6317: 6, 11, 4
+6318: 6, 11, 5
+6319: 6, 11, 6
+6320: 6, 11, 7
+6321: 6, 11, 8
+6322: 6, 11, 9
+6323: 6, 11, 10
+6324: 6, 11, 11
+6325: 6, 11, 12
+6326: 6, 11, 13
+6327: 6, 11, 14
+6328: 6, 11, 15
+6329: 6, 11, 16
+6330: 6, 11, 17
+6331: 6, 11, 18
+6332: 6, 11, 19
+6333: 6, 11, 20
+6334: 6, 11, 21
+6335: 6, 11, 22
+6336: 6, 11, 23
+6337: 6, 12, 0
+6338: 6, 12, 1
+6339: 6, 12, 2
+6340: 6, 12, 3
+6341: 6, 12, 4
+6342: 6, 12, 5
+6343: 6, 12, 6
+6344: 6, 12, 7
+6345: 6, 12, 8
+6346: 6, 12, 9
+6347: 6, 12, 10
+6348: 6, 12, 11
+6349: 6, 12, 12
+6350: 6, 12, 13
+6351: 6, 12, 14
+6352: 6, 12, 15
+6353: 6, 12, 16
+6354: 6, 12, 17
+6355: 6, 12, 18
+6356: 6, 12, 19
+6357: 6, 12, 20
+6358: 6, 12, 21
+6359: 6, 12, 22
+6360: 6, 12, 23
+6361: 6, 12, 24
+6362: 6, 13, 0
+6363: 6, 13, 1
+6364: 6, 13, 2
+6365: 6, 13, 3
+6366: 6, 13, 4
+6367: 6, 13, 5
+6368: 6, 13, 6
+6369: 6, 13, 7
+6370: 6, 13, 8
+6371: 6, 13, 9
+6372: 6, 13, 10
+6373: 6, 13, 11
+6374: 6, 13, 12
+6375: 6, 13, 13
+6376: 6, 13, 14
+6377: 6, 13, 15
+6378: 6, 13, 16
+6379: 6, 13, 17
+6380: 6, 13, 18
+6381: 6, 13, 19
+6382: 6, 13, 20
+6383: 6, 13, 21
+6384: 6, 13, 22
+6385: 6, 13, 23
+6386: 6, 13, 24
+6387: 6, 13, 25
+6388: 6, 13, 26
+6389: 6, 13, 27
+6390: 6, 13, 28
+6391: 6, 13, 29
+6392: 6, 13, 30
+6393: 6, 13, 31
+6394: 6, 13, 32
+6395: 6, 13, 33
+6396: 6, 14, 0
+6397: 6, 14, 1
+6398: 6, 14, 2
+6399: 6, 14, 3
+6400: 6, 14, 4
+6401: 6, 14, 5
+6402: 6, 14, 6
+6403: 6, 14, 7
+6404: 6, 14, 8
+6405: 6, 14, 9
+6406: 6, 14, 10
+6407: 6, 14, 11
+6408: 6, 14, 12
+6409: 6, 14, 13
+6410: 6, 14, 14
+6411: 6, 14, 15
+6412: 6, 15, 0
+6413: 6, 15, 1
+6414: 6, 15, 2
+6415: 6, 15, 3
+6416: 6, 15, 4
+6417: 6, 15, 5
+6418: 6, 15, 6
+6419: 6, 15, 7
+6420: 6, 15, 8
+6421: 6, 15, 9
+6422: 6, 15, 10
+6423: 6, 15, 11
+6424: 6, 15, 12
+6425: 6, 15, 13
+6426: 6, 15, 14
+6427: 6, 15, 15
+6428: 6, 15, 16
+6429: 6, 15, 17
+6430: 6, 15, 18
+6431: 6, 15, 19
+6432: 6, 15, 20
+6433: 6, 15, 21
+6434: 6, 15, 22
+6435: 6, 15, 23
+6436: 6, 15, 24
+6437: 6, 15, 25
+6438: 6, 15, 26
+6439: 6, 15, 27
+6440: 6, 15, 28
+6441: 6, 15, 29
+6442: 6, 15, 30
+6443: 6, 15, 31
+6444: 6, 15, 32
+6445: 6, 15, 33
+6446: 6, 15, 34
+6447: 6, 15, 35
+6448: 6, 15, 36
+6449: 6, 15, 37
+6450: 6, 15, 38
+6451: 6, 15, 39
+6452: 6, 15, 40
+6453: 6, 15, 41
+6454: 6, 15, 42
+6455: 6, 15, 43
+6456: 6, 15, 44
+6457: 6, 15, 45
+6458: 6, 15, 46
+6459: 6, 15, 47
+6460: 6, 15, 48
+6461: 6, 15, 49
+6462: 6, 15, 50
+6463: 6, 15, 51
+6464: 6, 15, 52
+6465: 6, 15, 53
+6466: 6, 15, 54
+6467: 6, 15, 55
+6468: 6, 15, 56
+6469: 6, 15, 57
+6470: 6, 15, 58
+6471: 6, 15, 59
+6472: 6, 15, 60
+6473: 6, 15, 61
+6474: 6, 15, 62
+6475: 6, 15, 63
+6476: 6, 16, 0
+6477: 6, 16, 1
+6478: 6, 16, 2
+6479: 6, 16, 3
+6480: 6, 16, 4
+6481: 6, 16, 5
+6482: 6, 16, 6
+6483: 6, 16, 7
+6484: 6, 16, 8
+6485: 6, 16, 9
+6486: 6, 16, 10
+6487: 6, 17, 0
+6488: 6, 17, 1
+6489: 6, 17, 2
+6490: 6, 17, 3
+6491: 6, 17, 4
+6492: 6, 17, 5
+6493: 6, 17, 6
+6494: 6, 17, 7
+6495: 6, 17, 8
+6496: 6, 17, 9
+6497: 6, 17, 10
+6498: 6, 17, 11
+6499: 6, 17, 12
+6500: 6, 17, 13
+6501: 6, 17, 14
+6502: 6, 17, 15
+6503: 6, 17, 16
+6504: 6, 17, 17
+6505: 6, 17, 18
+6506: 6, 18, 0
+6507: 6, 18, 1
+6508: 6, 18, 2
+6509: 6, 18, 3
+6510: 6, 18, 4
+6511: 6, 18, 5
+6512: 6, 18, 6
+6513: 6, 18, 7
+6514: 6, 18, 8
+6515: 6, 18, 9
+6516: 6, 18, 10
+6517: 6, 18, 11
+6518: 6, 18, 12
+6519: 6, 18, 13
+6520: 6, 18, 14
+6521: 6, 18, 15
+6522: 6, 18, 16
+6523: 6, 18, 17
+6524: 6, 18, 18
+6525: 6, 18, 19
+6526: 6, 18, 20
+6527: 6, 18, 21
+6528: 6, 18, 22
+6529: 6, 18, 23
+6530: 6, 18, 24
+6531: 6, 18, 25
+6532: 6, 18, 26
+6533: 6, 18, 27
+6534: 6, 18, 28
+6535: 6, 19, 0
+6536: 6, 19, 1
+6537: 6, 19, 2
+6538: 6, 19, 3
+6539: 6, 19, 4
+6540: 6, 19, 5
+6541: 6, 19, 6
+6542: 6, 19, 7
+6543: 6, 19, 8
+6544: 6, 19, 9
+6545: 6, 19, 10
+6546: 6, 19, 11
+6547: 6, 19, 12
+6548: 6, 19, 13
+6549: 6, 19, 14
+6550: 6, 19, 15
+6551: 6, 19, 16
+6552: 6, 19, 17
+6553: 6, 19, 18
+6554: 6, 19, 19
+6555: 6, 19, 20
+6556: 6, 19, 21
+6557: 6, 19, 22
+6558: 6, 19, 23
+6559: 6, 19, 24
+6560: 6, 19, 25
+6561: 6, 19, 26
+6562: 6, 19, 27
+6563: 6, 19, 28
+6564: 6, 19, 29
+6565: 6, 19, 30
+6566: 6, 19, 31
+6567: 6, 19, 32
+6568: 6, 19, 33
+6569: 6, 19, 34
+6570: 6, 19, 35
+6571: 6, 19, 36
+6572: 6, 19, 37
+6573: 6, 19, 38
+6574: 6, 19, 39
+6575: 6, 19, 40
+6576: 6, 19, 41
+6577: 6, 19, 42
+6578: 6, 19, 43
+6579: 6, 19, 44
+6580: 6, 19, 45
+6581: 6, 19, 46
+6582: 6, 19, 47
+6583: 6, 19, 48
+6584: 6, 19, 49
+6585: 6, 19, 50
+6586: 6, 19, 51
+6587: 6, 20, 0
+6588: 6, 20, 1
+6589: 6, 20, 2
+6590: 6, 20, 3
+6591: 6, 20, 4
+6592: 6, 20, 5
+6593: 6, 20, 6
+6594: 6, 20, 7
+6595: 6, 20, 8
+6596: 6, 20, 9
+6597: 6, 21, 0
+6598: 6, 21, 1
+6599: 6, 21, 2
+6600: 6, 21, 3
+6601: 6, 21, 4
+6602: 6, 21, 5
+6603: 6, 21, 6
+6604: 6, 21, 7
+6605: 6, 21, 8
+6606: 6, 21, 9
+6607: 6, 21, 10
+6608: 6, 21, 11
+6609: 6, 21, 12
+6610: 6, 21, 13
+6611: 6, 21, 14
+6612: 6, 21, 15
+6613: 6, 21, 16
+6614: 6, 21, 17
+6615: 6, 21, 18
+6616: 6, 21, 19
+6617: 6, 21, 20
+6618: 6, 21, 21
+6619: 6, 21, 22
+6620: 6, 21, 23
+6621: 6, 21, 24
+6622: 6, 21, 25
+6623: 6, 21, 26
+6624: 6, 21, 27
+6625: 6, 21, 28
+6626: 6, 21, 29
+6627: 6, 21, 30
+6628: 6, 21, 31
+6629: 6, 21, 32
+6630: 6, 21, 33
+6631: 6, 21, 34
+6632: 6, 21, 35
+6633: 6, 21, 36
+6634: 6, 21, 37
+6635: 6, 21, 38
+6636: 6, 21, 39
+6637: 6, 21, 40
+6638: 6, 21, 41
+6639: 6, 21, 42
+6640: 6, 21, 43
+6641: 6, 21, 44
+6642: 6, 21, 45
+6643: 6, 22, 0
+6644: 6, 22, 1
+6645: 6, 22, 2
+6646: 6, 22, 3
+6647: 6, 22, 4
+6648: 6, 22, 5
+6649: 6, 22, 6
+6650: 6, 22, 7
+6651: 6, 22, 8
+6652: 6, 22, 9
+6653: 6, 22, 10
+6654: 6, 22, 11
+6655: 6, 22, 12
+6656: 6, 22, 13
+6657: 6, 22, 14
+6658: 6, 22, 15
+6659: 6, 22, 16
+6660: 6, 22, 17
+6661: 6, 22, 18
+6662: 6, 22, 19
+6663: 6, 22, 20
+6664: 6, 22, 21
+6665: 6, 22, 22
+6666: 6, 22, 23
+6667: 6, 22, 24
+6668: 6, 22, 25
+6669: 6, 22, 26
+6670: 6, 22, 27
+6671: 6, 22, 28
+6672: 6, 22, 29
+6673: 6, 22, 30
+6674: 6, 22, 31
+6675: 6, 22, 32
+6676: 6, 22, 33
+6677: 6, 22, 34
+6678: 6, 23, 0
+6679: 6, 23, 1
+6680: 6, 23, 2
+6681: 6, 23, 3
+6682: 6, 23, 4
+6683: 6, 23, 5
+6684: 6, 23, 6
+6685: 6, 23, 7
+6686: 6, 23, 8
+6687: 6, 23, 9
+6688: 6, 23, 10
+6689: 6, 23, 11
+6690: 6, 23, 12
+6691: 6, 23, 13
+6692: 6, 23, 14
+6693: 6, 23, 15
+6694: 6, 23, 16
+6695: 6, 24, 0
+6696: 6, 24, 1
+6697: 6, 24, 2
+6698: 6, 24, 3
+6699: 6, 24, 4
+6700: 6, 24, 5
+6701: 6, 24, 6
+6702: 6, 24, 7
+6703: 6, 24, 8
+6704: 6, 24, 9
+6705: 6, 24, 10
+6706: 6, 24, 11
+6707: 6, 24, 12
+6708: 6, 24, 13
+6709: 6, 24, 14
+6710: 6, 24, 15
+6711: 6, 24, 16
+6712: 6, 24, 17
+6713: 6, 24, 18
+6714: 6, 24, 19
+6715: 6, 24, 20
+6716: 6, 24, 21
+6717: 6, 24, 22
+6718: 6, 24, 23
+6719: 6, 24, 24
+6720: 6, 24, 25
+6721: 6, 24, 26
+6722: 6, 24, 27
+6723: 6, 24, 28
+6724: 6, 24, 29
+6725: 6, 24, 30
+6726: 6, 24, 31
+6727: 6, 24, 32
+6728: 6, 24, 33
+6729: 7, 0, 0
+6730: 7, 1, 0
+6731: 7, 1, 1
+6732: 7, 1, 2
+6733: 7, 1, 3
+6734: 7, 1, 4
+6735: 7, 1, 5
+6736: 7, 1, 6
+6737: 7, 1, 7
+6738: 7, 1, 8
+6739: 7, 1, 9
+6740: 7, 1, 10
+6741: 7, 1, 11
+6742: 7, 1, 12
+6743: 7, 1, 13
+6744: 7, 1, 14
+6745: 7, 1, 15
+6746: 7, 1, 16
+6747: 7, 1, 17
+6748: 7, 1, 18
+6749: 7, 1, 19
+6750: 7, 1, 20
+6751: 7, 1, 21
+6752: 7, 1, 22
+6753: 7, 1, 23
+6754: 7, 1, 24
+6755: 7, 1, 25
+6756: 7, 1, 26
+6757: 7, 1, 27
+6758: 7, 1, 28
+6759: 7, 1, 29
+6760: 7, 1, 30
+6761: 7, 1, 31
+6762: 7, 1, 32
+6763: 7, 1, 33
+6764: 7, 1, 34
+6765: 7, 1, 35
+6766: 7, 1, 36
+6767: 7, 2, 0
+6768: 7, 2, 1
+6769: 7, 2, 2
+6770: 7, 2, 3
+6771: 7, 2, 4
+6772: 7, 2, 5
+6773: 7, 2, 6
+6774: 7, 2, 7
+6775: 7, 2, 8
+6776: 7, 2, 9
+6777: 7, 2, 10
+6778: 7, 2, 11
+6779: 7, 2, 12
+6780: 7, 2, 13
+6781: 7, 2, 14
+6782: 7, 2, 15
+6783: 7, 2, 16
+6784: 7, 2, 17
+6785: 7, 2, 18
+6786: 7, 2, 19
+6787: 7, 2, 20
+6788: 7, 2, 21
+6789: 7, 2, 22
+6790: 7, 2, 23
+6791: 7, 3, 0
+6792: 7, 3, 1
+6793: 7, 3, 2
+6794: 7, 3, 3
+6795: 7, 3, 4
+6796: 7, 3, 5
+6797: 7, 3, 6
+6798: 7, 3, 7
+6799: 7, 3, 8
+6800: 7, 3, 9
+6801: 7, 3, 10
+6802: 7, 3, 11
+6803: 7, 3, 12
+6804: 7, 3, 13
+6805: 7, 3, 14
+6806: 7, 3, 15
+6807: 7, 3, 16
+6808: 7, 3, 17
+6809: 7, 3, 18
+6810: 7, 3, 19
+6811: 7, 3, 20
+6812: 7, 3, 21
+6813: 7, 3, 22
+6814: 7, 3, 23
+6815: 7, 3, 24
+6816: 7, 3, 25
+6817: 7, 3, 26
+6818: 7, 3, 27
+6819: 7, 3, 28
+6820: 7, 3, 29
+6821: 7, 3, 30
+6822: 7, 3, 31
+6823: 7, 4, 0
+6824: 7, 4, 1
+6825: 7, 4, 2
+6826: 7, 4, 3
+6827: 7, 4, 4
+6828: 7, 4, 5
+6829: 7, 4, 6
+6830: 7, 4, 7
+6831: 7, 4, 8
+6832: 7, 4, 9
+6833: 7, 4, 10
+6834: 7, 4, 11
+6835: 7, 4, 12
+6836: 7, 4, 13
+6837: 7, 4, 14
+6838: 7, 4, 15
+6839: 7, 4, 16
+6840: 7, 4, 17
+6841: 7, 4, 18
+6842: 7, 4, 19
+6843: 7, 4, 20
+6844: 7, 4, 21
+6845: 7, 4, 22
+6846: 7, 4, 23
+6847: 7, 4, 24
+6848: 7, 5, 0
+6849: 7, 5, 1
+6850: 7, 5, 2
+6851: 7, 5, 3
+6852: 7, 5, 4
+6853: 7, 5, 5
+6854: 7, 5, 6
+6855: 7, 5, 7
+6856: 7, 5, 8
+6857: 7, 5, 9
+6858: 7, 5, 10
+6859: 7, 5, 11
+6860: 7, 5, 12
+6861: 7, 5, 13
+6862: 7, 5, 14
+6863: 7, 5, 15
+6864: 7, 5, 16
+6865: 7, 5, 17
+6866: 7, 5, 18
+6867: 7, 5, 19
+6868: 7, 5, 20
+6869: 7, 5, 21
+6870: 7, 5, 22
+6871: 7, 5, 23
+6872: 7, 5, 24
+6873: 7, 5, 25
+6874: 7, 5, 26
+6875: 7, 5, 27
+6876: 7, 5, 28
+6877: 7, 5, 29
+6878: 7, 5, 30
+6879: 7, 5, 31
+6880: 7, 6, 0
+6881: 7, 6, 1
+6882: 7, 6, 2
+6883: 7, 6, 3
+6884: 7, 6, 4
+6885: 7, 6, 5
+6886: 7, 6, 6
+6887: 7, 6, 7
+6888: 7, 6, 8
+6889: 7, 6, 9
+6890: 7, 6, 10
+6891: 7, 6, 11
+6892: 7, 6, 12
+6893: 7, 6, 13
+6894: 7, 6, 14
+6895: 7, 6, 15
+6896: 7, 6, 16
+6897: 7, 6, 17
+6898: 7, 6, 18
+6899: 7, 6, 19
+6900: 7, 6, 20
+6901: 7, 6, 21
+6902: 7, 6, 22
+6903: 7, 6, 23
+6904: 7, 6, 24
+6905: 7, 6, 25
+6906: 7, 6, 26
+6907: 7, 6, 27
+6908: 7, 6, 28
+6909: 7, 6, 29
+6910: 7, 6, 30
+6911: 7, 6, 31
+6912: 7, 6, 32
+6913: 7, 6, 33
+6914: 7, 6, 34
+6915: 7, 6, 35
+6916: 7, 6, 36
+6917: 7, 6, 37
+6918: 7, 6, 38
+6919: 7, 6, 39
+6920: 7, 6, 40
+6921: 7, 7, 0
+6922: 7, 7, 1
+6923: 7, 7, 2
+6924: 7, 7, 3
+6925: 7, 7, 4
+6926: 7, 7, 5
+6927: 7, 7, 6
+6928: 7, 7, 7
+6929: 7, 7, 8
+6930: 7, 7, 9
+6931: 7, 7, 10
+6932: 7, 7, 11
+6933: 7, 7, 12
+6934: 7, 7, 13
+6935: 7, 7, 14
+6936: 7, 7, 15
+6937: 7, 7, 16
+6938: 7, 7, 17
+6939: 7, 7, 18
+6940: 7, 7, 19
+6941: 7, 7, 20
+6942: 7, 7, 21
+6943: 7, 7, 22
+6944: 7, 7, 23
+6945: 7, 7, 24
+6946: 7, 7, 25
+6947: 7, 8, 0
+6948: 7, 8, 1
+6949: 7, 8, 2
+6950: 7, 8, 3
+6951: 7, 8, 4
+6952: 7, 8, 5
+6953: 7, 8, 6
+6954: 7, 8, 7
+6955: 7, 8, 8
+6956: 7, 8, 9
+6957: 7, 8, 10
+6958: 7, 8, 11
+6959: 7, 8, 12
+6960: 7, 8, 13
+6961: 7, 8, 14
+6962: 7, 8, 15
+6963: 7, 8, 16
+6964: 7, 8, 17
+6965: 7, 8, 18
+6966: 7, 8, 19
+6967: 7, 8, 20
+6968: 7, 8, 21
+6969: 7, 8, 22
+6970: 7, 8, 23
+6971: 7, 8, 24
+6972: 7, 8, 25
+6973: 7, 8, 26
+6974: 7, 8, 27
+6975: 7, 8, 28
+6976: 7, 8, 29
+6977: 7, 8, 30
+6978: 7, 8, 31
+6979: 7, 8, 32
+6980: 7, 8, 33
+6981: 7, 8, 34
+6982: 7, 8, 35
+6983: 7, 9, 0
+6984: 7, 9, 1
+6985: 7, 9, 2
+6986: 7, 9, 3
+6987: 7, 9, 4
+6988: 7, 9, 5
+6989: 7, 9, 6
+6990: 7, 9, 7
+6991: 7, 9, 8
+6992: 7, 9, 9
+6993: 7, 9, 10
+6994: 7, 9, 11
+6995: 7, 9, 12
+6996: 7, 9, 13
+6997: 7, 9, 14
+6998: 7, 9, 15
+6999: 7, 9, 16
+7000: 7, 9, 17
+7001: 7, 9, 18
+7002: 7, 9, 19
+7003: 7, 9, 20
+7004: 7, 9, 21
+7005: 7, 9, 22
+7006: 7, 9, 23
+7007: 7, 9, 24
+7008: 7, 9, 25
+7009: 7, 9, 26
+7010: 7, 9, 27
+7011: 7, 9, 28
+7012: 7, 9, 29
+7013: 7, 9, 30
+7014: 7, 9, 31
+7015: 7, 9, 32
+7016: 7, 9, 33
+7017: 7, 9, 34
+7018: 7, 9, 35
+7019: 7, 9, 36
+7020: 7, 9, 37
+7021: 7, 9, 38
+7022: 7, 9, 39
+7023: 7, 9, 40
+7024: 7, 9, 41
+7025: 7, 9, 42
+7026: 7, 9, 43
+7027: 7, 9, 44
+7028: 7, 9, 45
+7029: 7, 9, 46
+7030: 7, 9, 47
+7031: 7, 9, 48
+7032: 7, 9, 49
+7033: 7, 9, 50
+7034: 7, 9, 51
+7035: 7, 9, 52
+7036: 7, 9, 53
+7037: 7, 9, 54
+7038: 7, 9, 55
+7039: 7, 9, 56
+7040: 7, 9, 57
+7041: 7, 10, 0
+7042: 7, 10, 1
+7043: 7, 10, 2
+7044: 7, 10, 3
+7045: 7, 10, 4
+7046: 7, 10, 5
+7047: 7, 10, 6
+7048: 7, 10, 7
+7049: 7, 10, 8
+7050: 7, 10, 9
+7051: 7, 10, 10
+7052: 7, 10, 11
+7053: 7, 10, 12
+7054: 7, 10, 13
+7055: 7, 10, 14
+7056: 7, 10, 15
+7057: 7, 10, 16
+7058: 7, 10, 17
+7059: 7, 10, 18
+7060: 7, 11, 0
+7061: 7, 11, 1
+7062: 7, 11, 2
+7063: 7, 11, 3
+7064: 7, 11, 4
+7065: 7, 11, 5
+7066: 7, 11, 6
+7067: 7, 11, 7
+7068: 7, 11, 8
+7069: 7, 11, 9
+7070: 7, 11, 10
+7071: 7, 11, 11
+7072: 7, 11, 12
+7073: 7, 11, 13
+7074: 7, 11, 14
+7075: 7, 11, 15
+7076: 7, 11, 16
+7077: 7, 11, 17
+7078: 7, 11, 18
+7079: 7, 11, 19
+7080: 7, 11, 20
+7081: 7, 11, 21
+7082: 7, 11, 22
+7083: 7, 11, 23
+7084: 7, 11, 24
+7085: 7, 11, 25
+7086: 7, 11, 26
+7087: 7, 11, 27
+7088: 7, 11, 28
+7089: 7, 11, 29
+7090: 7, 11, 30
+7091: 7, 11, 31
+7092: 7, 11, 32
+7093: 7, 11, 33
+7094: 7, 11, 34
+7095: 7, 11, 35
+7096: 7, 11, 36
+7097: 7, 11, 37
+7098: 7, 11, 38
+7099: 7, 11, 39
+7100: 7, 11, 40
+7101: 7, 12, 0
+7102: 7, 12, 1
+7103: 7, 12, 2
+7104: 7, 12, 3
+7105: 7, 12, 4
+7106: 7, 12, 5
+7107: 7, 12, 6
+7108: 7, 12, 7
+7109: 7, 12, 8
+7110: 7, 12, 9
+7111: 7, 12, 10
+7112: 7, 12, 11
+7113: 7, 12, 12
+7114: 7, 12, 13
+7115: 7, 12, 14
+7116: 7, 12, 15
+7117: 7, 13, 0
+7118: 7, 13, 1
+7119: 7, 13, 2
+7120: 7, 13, 3
+7121: 7, 13, 4
+7122: 7, 13, 5
+7123: 7, 13, 6
+7124: 7, 13, 7
+7125: 7, 13, 8
+7126: 7, 13, 9
+7127: 7, 13, 10
+7128: 7, 13, 11
+7129: 7, 13, 12
+7130: 7, 13, 13
+7131: 7, 13, 14
+7132: 7, 13, 15
+7133: 7, 13, 16
+7134: 7, 13, 17
+7135: 7, 13, 18
+7136: 7, 13, 19
+7137: 7, 13, 20
+7138: 7, 13, 21
+7139: 7, 13, 22
+7140: 7, 13, 23
+7141: 7, 13, 24
+7142: 7, 13, 25
+7143: 7, 14, 0
+7144: 7, 14, 1
+7145: 7, 14, 2
+7146: 7, 14, 3
+7147: 7, 14, 4
+7148: 7, 14, 5
+7149: 7, 14, 6
+7150: 7, 14, 7
+7151: 7, 14, 8
+7152: 7, 14, 9
+7153: 7, 14, 10
+7154: 7, 14, 11
+7155: 7, 14, 12
+7156: 7, 14, 13
+7157: 7, 14, 14
+7158: 7, 14, 15
+7159: 7, 14, 16
+7160: 7, 14, 17
+7161: 7, 14, 18
+7162: 7, 14, 19
+7163: 7, 14, 20
+7164: 7, 15, 0
+7165: 7, 15, 1
+7166: 7, 15, 2
+7167: 7, 15, 3
+7168: 7, 15, 4
+7169: 7, 15, 5
+7170: 7, 15, 6
+7171: 7, 15, 7
+7172: 7, 15, 8
+7173: 7, 15, 9
+7174: 7, 15, 10
+7175: 7, 15, 11
+7176: 7, 15, 12
+7177: 7, 15, 13
+7178: 7, 15, 14
+7179: 7, 15, 15
+7180: 7, 15, 16
+7181: 7, 15, 17
+7182: 7, 15, 18
+7183: 7, 15, 19
+7184: 7, 15, 20
+7185: 7, 16, 0
+7186: 7, 16, 1
+7187: 7, 16, 2
+7188: 7, 16, 3
+7189: 7, 16, 4
+7190: 7, 16, 5
+7191: 7, 16, 6
+7192: 7, 16, 7
+7193: 7, 16, 8
+7194: 7, 16, 9
+7195: 7, 16, 10
+7196: 7, 16, 11
+7197: 7, 16, 12
+7198: 7, 16, 13
+7199: 7, 16, 14
+7200: 7, 16, 15
+7201: 7, 16, 16
+7202: 7, 16, 17
+7203: 7, 16, 18
+7204: 7, 16, 19
+7205: 7, 16, 20
+7206: 7, 16, 21
+7207: 7, 16, 22
+7208: 7, 16, 23
+7209: 7, 16, 24
+7210: 7, 16, 25
+7211: 7, 16, 26
+7212: 7, 16, 27
+7213: 7, 16, 28
+7214: 7, 16, 29
+7215: 7, 16, 30
+7216: 7, 16, 31
+7217: 7, 17, 0
+7218: 7, 17, 1
+7219: 7, 17, 2
+7220: 7, 17, 3
+7221: 7, 17, 4
+7222: 7, 17, 5
+7223: 7, 17, 6
+7224: 7, 17, 7
+7225: 7, 17, 8
+7226: 7, 17, 9
+7227: 7, 17, 10
+7228: 7, 17, 11
+7229: 7, 17, 12
+7230: 7, 17, 13
+7231: 7, 18, 0
+7232: 7, 18, 1
+7233: 7, 18, 2
+7234: 7, 18, 3
+7235: 7, 18, 4
+7236: 7, 18, 5
+7237: 7, 18, 6
+7238: 7, 18, 7
+7239: 7, 18, 8
+7240: 7, 18, 9
+7241: 7, 18, 10
+7242: 7, 18, 11
+7243: 7, 18, 12
+7244: 7, 18, 13
+7245: 7, 18, 14
+7246: 7, 18, 15
+7247: 7, 18, 16
+7248: 7, 18, 17
+7249: 7, 18, 18
+7250: 7, 18, 19
+7251: 7, 18, 20
+7252: 7, 18, 21
+7253: 7, 18, 22
+7254: 7, 18, 23
+7255: 7, 18, 24
+7256: 7, 18, 25
+7257: 7, 18, 26
+7258: 7, 18, 27
+7259: 7, 18, 28
+7260: 7, 18, 29
+7261: 7, 18, 30
+7262: 7, 18, 31
+7263: 7, 19, 0
+7264: 7, 19, 1
+7265: 7, 19, 2
+7266: 7, 19, 3
+7267: 7, 19, 4
+7268: 7, 19, 5
+7269: 7, 19, 6
+7270: 7, 19, 7
+7271: 7, 19, 8
+7272: 7, 19, 9
+7273: 7, 19, 10
+7274: 7, 19, 11
+7275: 7, 19, 12
+7276: 7, 19, 13
+7277: 7, 19, 14
+7278: 7, 19, 15
+7279: 7, 19, 16
+7280: 7, 19, 17
+7281: 7, 19, 18
+7282: 7, 19, 19
+7283: 7, 19, 20
+7284: 7, 19, 21
+7285: 7, 19, 22
+7286: 7, 19, 23
+7287: 7, 19, 24
+7288: 7, 19, 25
+7289: 7, 19, 26
+7290: 7, 19, 27
+7291: 7, 19, 28
+7292: 7, 19, 29
+7293: 7, 19, 30
+7294: 7, 20, 0
+7295: 7, 20, 1
+7296: 7, 20, 2
+7297: 7, 20, 3
+7298: 7, 20, 4
+7299: 7, 20, 5
+7300: 7, 20, 6
+7301: 7, 20, 7
+7302: 7, 20, 8
+7303: 7, 20, 9
+7304: 7, 20, 10
+7305: 7, 20, 11
+7306: 7, 20, 12
+7307: 7, 20, 13
+7308: 7, 20, 14
+7309: 7, 20, 15
+7310: 7, 20, 16
+7311: 7, 20, 17
+7312: 7, 20, 18
+7313: 7, 20, 19
+7314: 7, 20, 20
+7315: 7, 20, 21
+7316: 7, 20, 22
+7317: 7, 20, 23
+7318: 7, 20, 24
+7319: 7, 20, 25
+7320: 7, 20, 26
+7321: 7, 20, 27
+7322: 7, 20, 28
+7323: 7, 20, 29
+7324: 7, 20, 30
+7325: 7, 20, 31
+7326: 7, 20, 32
+7327: 7, 20, 33
+7328: 7, 20, 34
+7329: 7, 20, 35
+7330: 7, 20, 36
+7331: 7, 20, 37
+7332: 7, 20, 38
+7333: 7, 20, 39
+7334: 7, 20, 40
+7335: 7, 20, 41
+7336: 7, 20, 42
+7337: 7, 20, 43
+7338: 7, 20, 44
+7339: 7, 20, 45
+7340: 7, 20, 46
+7341: 7, 20, 47
+7342: 7, 20, 48
+7343: 7, 21, 0
+7344: 7, 21, 1
+7345: 7, 21, 2
+7346: 7, 21, 3
+7347: 7, 21, 4
+7348: 7, 21, 5
+7349: 7, 21, 6
+7350: 7, 21, 7
+7351: 7, 21, 8
+7352: 7, 21, 9
+7353: 7, 21, 10
+7354: 7, 21, 11
+7355: 7, 21, 12
+7356: 7, 21, 13
+7357: 7, 21, 14
+7358: 7, 21, 15
+7359: 7, 21, 16
+7360: 7, 21, 17
+7361: 7, 21, 18
+7362: 7, 21, 19
+7363: 7, 21, 20
+7364: 7, 21, 21
+7365: 7, 21, 22
+7366: 7, 21, 23
+7367: 7, 21, 24
+7368: 7, 21, 25
+7369: 8, 0, 0
+7370: 8, 1, 0
+7371: 8, 1, 1
+7372: 8, 1, 2
+7373: 8, 1, 3
+7374: 8, 1, 4
+7375: 8, 1, 5
+7376: 8, 1, 6
+7377: 8, 1, 7
+7378: 8, 1, 8
+7379: 8, 1, 9
+7380: 8, 1, 10
+7381: 8, 1, 11
+7382: 8, 1, 12
+7383: 8, 1, 13
+7384: 8, 1, 14
+7385: 8, 1, 15
+7386: 8, 1, 16
+7387: 8, 1, 17
+7388: 8, 1, 18
+7389: 8, 1, 19
+7390: 8, 1, 20
+7391: 8, 1, 21
+7392: 8, 1, 22
+7393: 8, 2, 0
+7394: 8, 2, 1
+7395: 8, 2, 2
+7396: 8, 2, 3
+7397: 8, 2, 4
+7398: 8, 2, 5
+7399: 8, 2, 6
+7400: 8, 2, 7
+7401: 8, 2, 8
+7402: 8, 2, 9
+7403: 8, 2, 10
+7404: 8, 2, 11
+7405: 8, 2, 12
+7406: 8, 2, 13
+7407: 8, 2, 14
+7408: 8, 2, 15
+7409: 8, 2, 16
+7410: 8, 2, 17
+7411: 8, 2, 18
+7412: 8, 2, 19
+7413: 8, 2, 20
+7414: 8, 2, 21
+7415: 8, 2, 22
+7416: 8, 2, 23
+7417: 8, 3, 0
+7418: 8, 3, 1
+7419: 8, 3, 2
+7420: 8, 3, 3
+7421: 8, 3, 4
+7422: 8, 3, 5
+7423: 8, 3, 6
+7424: 8, 3, 7
+7425: 8, 3, 8
+7426: 8, 3, 9
+7427: 8, 3, 10
+7428: 8, 3, 11
+7429: 8, 3, 12
+7430: 8, 3, 13
+7431: 8, 3, 14
+7432: 8, 3, 15
+7433: 8, 3, 16
+7434: 8, 3, 17
+7435: 8, 3, 18
+7436: 8, 4, 0
+7437: 8, 4, 1
+7438: 8, 4, 2
+7439: 8, 4, 3
+7440: 8, 4, 4
+7441: 8, 4, 5
+7442: 8, 4, 6
+7443: 8, 4, 7
+7444: 8, 4, 8
+7445: 8, 4, 9
+7446: 8, 4, 10
+7447: 8, 4, 11
+7448: 8, 4, 12
+7449: 8, 4, 13
+7450: 8, 4, 14
+7451: 8, 4, 15
+7452: 8, 4, 16
+7453: 8, 4, 17
+7454: 8, 4, 18
+7455: 8, 4, 19
+7456: 8, 4, 20
+7457: 8, 4, 21
+7458: 8, 4, 22
+7459: 9, 0, 0
+7460: 9, 1, 0
+7461: 9, 1, 1
+7462: 9, 1, 2
+7463: 9, 1, 3
+7464: 9, 1, 4
+7465: 9, 1, 5
+7466: 9, 1, 6
+7467: 9, 1, 7
+7468: 9, 1, 8
+7469: 9, 1, 9
+7470: 9, 1, 10
+7471: 9, 1, 11
+7472: 9, 1, 12
+7473: 9, 1, 13
+7474: 9, 1, 14
+7475: 9, 1, 15
+7476: 9, 1, 16
+7477: 9, 1, 17
+7478: 9, 1, 18
+7479: 9, 1, 19
+7480: 9, 1, 20
+7481: 9, 1, 21
+7482: 9, 1, 22
+7483: 9, 1, 23
+7484: 9, 1, 24
+7485: 9, 1, 25
+7486: 9, 1, 26
+7487: 9, 1, 27
+7488: 9, 1, 28
+7489: 9, 2, 0
+7490: 9, 2, 1
+7491: 9, 2, 2
+7492: 9, 2, 3
+7493: 9, 2, 4
+7494: 9, 2, 5
+7495: 9, 2, 6
+7496: 9, 2, 7
+7497: 9, 2, 8
+7498: 9, 2, 9
+7499: 9, 2, 10
+7500: 9, 2, 11
+7501: 9, 2, 12
+7502: 9, 2, 13
+7503: 9, 2, 14
+7504: 9, 2, 15
+7505: 9, 2, 16
+7506: 9, 2, 17
+7507: 9, 2, 18
+7508: 9, 2, 19
+7509: 9, 2, 20
+7510: 9, 2, 21
+7511: 9, 2, 22
+7512: 9, 2, 23
+7513: 9, 2, 24
+7514: 9, 2, 25
+7515: 9, 2, 26
+7516: 9, 2, 27
+7517: 9, 2, 28
+7518: 9, 2, 29
+7519: 9, 2, 30
+7520: 9, 2, 31
+7521: 9, 2, 32
+7522: 9, 2, 33
+7523: 9, 2, 34
+7524: 9, 2, 35
+7525: 9, 2, 36
+7526: 9, 3, 0
+7527: 9, 3, 1
+7528: 9, 3, 2
+7529: 9, 3, 3
+7530: 9, 3, 4
+7531: 9, 3, 5
+7532: 9, 3, 6
+7533: 9, 3, 7
+7534: 9, 3, 8
+7535: 9, 3, 9
+7536: 9, 3, 10
+7537: 9, 3, 11
+7538: 9, 3, 12
+7539: 9, 3, 13
+7540: 9, 3, 14
+7541: 9, 3, 15
+7542: 9, 3, 16
+7543: 9, 3, 17
+7544: 9, 3, 18
+7545: 9, 3, 19
+7546: 9, 3, 20
+7547: 9, 3, 21
+7548: 9, 4, 0
+7549: 9, 4, 1
+7550: 9, 4, 2
+7551: 9, 4, 3
+7552: 9, 4, 4
+7553: 9, 4, 5
+7554: 9, 4, 6
+7555: 9, 4, 7
+7556: 9, 4, 8
+7557: 9, 4, 9
+7558: 9, 4, 10
+7559: 9, 4, 11
+7560: 9, 4, 12
+7561: 9, 4, 13
+7562: 9, 4, 14
+7563: 9, 4, 15
+7564: 9, 4, 16
+7565: 9, 4, 17
+7566: 9, 4, 18
+7567: 9, 4, 19
+7568: 9, 4, 20
+7569: 9, 4, 21
+7570: 9, 4, 22
+7571: 9, 5, 0
+7572: 9, 5, 1
+7573: 9, 5, 2
+7574: 9, 5, 3
+7575: 9, 5, 4
+7576: 9, 5, 5
+7577: 9, 5, 6
+7578: 9, 5, 7
+7579: 9, 5, 8
+7580: 9, 5, 9
+7581: 9, 5, 10
+7582: 9, 5, 11
+7583: 9, 5, 12
+7584: 9, 6, 0
+7585: 9, 6, 1
+7586: 9, 6, 2
+7587: 9, 6, 3
+7588: 9, 6, 4
+7589: 9, 6, 5
+7590: 9, 6, 6
+7591: 9, 6, 7
+7592: 9, 6, 8
+7593: 9, 6, 9
+7594: 9, 6, 10
+7595: 9, 6, 11
+7596: 9, 6, 12
+7597: 9, 6, 13
+7598: 9, 6, 14
+7599: 9, 6, 15
+7600: 9, 6, 16
+7601: 9, 6, 17
+7602: 9, 6, 18
+7603: 9, 6, 19
+7604: 9, 6, 20
+7605: 9, 6, 21
+7606: 9, 7, 0
+7607: 9, 7, 1
+7608: 9, 7, 2
+7609: 9, 7, 3
+7610: 9, 7, 4
+7611: 9, 7, 5
+7612: 9, 7, 6
+7613: 9, 7, 7
+7614: 9, 7, 8
+7615: 9, 7, 9
+7616: 9, 7, 10
+7617: 9, 7, 11
+7618: 9, 7, 12
+7619: 9, 7, 13
+7620: 9, 7, 14
+7621: 9, 7, 15
+7622: 9, 7, 16
+7623: 9, 7, 17
+7624: 9, 8, 0
+7625: 9, 8, 1
+7626: 9, 8, 2
+7627: 9, 8, 3
+7628: 9, 8, 4
+7629: 9, 8, 5
+7630: 9, 8, 6
+7631: 9, 8, 7
+7632: 9, 8, 8
+7633: 9, 8, 9
+7634: 9, 8, 10
+7635: 9, 8, 11
+7636: 9, 8, 12
+7637: 9, 8, 13
+7638: 9, 8, 14
+7639: 9, 8, 15
+7640: 9, 8, 16
+7641: 9, 8, 17
+7642: 9, 8, 18
+7643: 9, 8, 19
+7644: 9, 8, 20
+7645: 9, 8, 21
+7646: 9, 8, 22
+7647: 9, 9, 0
+7648: 9, 9, 1
+7649: 9, 9, 2
+7650: 9, 9, 3
+7651: 9, 9, 4
+7652: 9, 9, 5
+7653: 9, 9, 6
+7654: 9, 9, 7
+7655: 9, 9, 8
+7656: 9, 9, 9
+7657: 9, 9, 10
+7658: 9, 9, 11
+7659: 9, 9, 12
+7660: 9, 9, 13
+7661: 9, 9, 14
+7662: 9, 9, 15
+7663: 9, 9, 16
+7664: 9, 9, 17
+7665: 9, 9, 18
+7666: 9, 9, 19
+7667: 9, 9, 20
+7668: 9, 9, 21
+7669: 9, 9, 22
+7670: 9, 9, 23
+7671: 9, 9, 24
+7672: 9, 9, 25
+7673: 9, 9, 26
+7674: 9, 9, 27
+7675: 9, 10, 0
+7676: 9, 10, 1
+7677: 9, 10, 2
+7678: 9, 10, 3
+7679: 9, 10, 4
+7680: 9, 10, 5
+7681: 9, 10, 6
+7682: 9, 10, 7
+7683: 9, 10, 8
+7684: 9, 10, 9
+7685: 9, 10, 10
+7686: 9, 10, 11
+7687: 9, 10, 12
+7688: 9, 10, 13
+7689: 9, 10, 14
+7690: 9, 10, 15
+7691: 9, 10, 16
+7692: 9, 10, 17
+7693: 9, 10, 18
+7694: 9, 10, 19
+7695: 9, 10, 20
+7696: 9, 10, 21
+7697: 9, 10, 22
+7698: 9, 10, 23
+7699: 9, 10, 24
+7700: 9, 10, 25
+7701: 9, 10, 26
+7702: 9, 10, 27
+7703: 9, 11, 0
+7704: 9, 11, 1
+7705: 9, 11, 2
+7706: 9, 11, 3
+7707: 9, 11, 4
+7708: 9, 11, 5
+7709: 9, 11, 6
+7710: 9, 11, 7
+7711: 9, 11, 8
+7712: 9, 11, 9
+7713: 9, 11, 10
+7714: 9, 11, 11
+7715: 9, 11, 12
+7716: 9, 11, 13
+7717: 9, 11, 14
+7718: 9, 11, 15
+7719: 9, 12, 0
+7720: 9, 12, 1
+7721: 9, 12, 2
+7722: 9, 12, 3
+7723: 9, 12, 4
+7724: 9, 12, 5
+7725: 9, 12, 6
+7726: 9, 12, 7
+7727: 9, 12, 8
+7728: 9, 12, 9
+7729: 9, 12, 10
+7730: 9, 12, 11
+7731: 9, 12, 12
+7732: 9, 12, 13
+7733: 9, 12, 14
+7734: 9, 12, 15
+7735: 9, 12, 16
+7736: 9, 12, 17
+7737: 9, 12, 18
+7738: 9, 12, 19
+7739: 9, 12, 20
+7740: 9, 12, 21
+7741: 9, 12, 22
+7742: 9, 12, 23
+7743: 9, 12, 24
+7744: 9, 12, 25
+7745: 9, 13, 0
+7746: 9, 13, 1
+7747: 9, 13, 2
+7748: 9, 13, 3
+7749: 9, 13, 4
+7750: 9, 13, 5
+7751: 9, 13, 6
+7752: 9, 13, 7
+7753: 9, 13, 8
+7754: 9, 13, 9
+7755: 9, 13, 10
+7756: 9, 13, 11
+7757: 9, 13, 12
+7758: 9, 13, 13
+7759: 9, 13, 14
+7760: 9, 13, 15
+7761: 9, 13, 16
+7762: 9, 13, 17
+7763: 9, 13, 18
+7764: 9, 13, 19
+7765: 9, 13, 20
+7766: 9, 13, 21
+7767: 9, 13, 22
+7768: 9, 13, 23
+7769: 9, 14, 0
+7770: 9, 14, 1
+7771: 9, 14, 2
+7772: 9, 14, 3
+7773: 9, 14, 4
+7774: 9, 14, 5
+7775: 9, 14, 6
+7776: 9, 14, 7
+7777: 9, 14, 8
+7778: 9, 14, 9
+7779: 9, 14, 10
+7780: 9, 14, 11
+7781: 9, 14, 12
+7782: 9, 14, 13
+7783: 9, 14, 14
+7784: 9, 14, 15
+7785: 9, 14, 16
+7786: 9, 14, 17
+7787: 9, 14, 18
+7788: 9, 14, 19
+7789: 9, 14, 20
+7790: 9, 14, 21
+7791: 9, 14, 22
+7792: 9, 14, 23
+7793: 9, 14, 24
+7794: 9, 14, 25
+7795: 9, 14, 26
+7796: 9, 14, 27
+7797: 9, 14, 28
+7798: 9, 14, 29
+7799: 9, 14, 30
+7800: 9, 14, 31
+7801: 9, 14, 32
+7802: 9, 14, 33
+7803: 9, 14, 34
+7804: 9, 14, 35
+7805: 9, 14, 36
+7806: 9, 14, 37
+7807: 9, 14, 38
+7808: 9, 14, 39
+7809: 9, 14, 40
+7810: 9, 14, 41
+7811: 9, 14, 42
+7812: 9, 14, 43
+7813: 9, 14, 44
+7814: 9, 14, 45
+7815: 9, 14, 46
+7816: 9, 14, 47
+7817: 9, 14, 48
+7818: 9, 14, 49
+7819: 9, 14, 50
+7820: 9, 14, 51
+7821: 9, 14, 52
+7822: 9, 15, 0
+7823: 9, 15, 1
+7824: 9, 15, 2
+7825: 9, 15, 3
+7826: 9, 15, 4
+7827: 9, 15, 5
+7828: 9, 15, 6
+7829: 9, 15, 7
+7830: 9, 15, 8
+7831: 9, 15, 9
+7832: 9, 15, 10
+7833: 9, 15, 11
+7834: 9, 15, 12
+7835: 9, 15, 13
+7836: 9, 15, 14
+7837: 9, 15, 15
+7838: 9, 15, 16
+7839: 9, 15, 17
+7840: 9, 15, 18
+7841: 9, 15, 19
+7842: 9, 15, 20
+7843: 9, 15, 21
+7844: 9, 15, 22
+7845: 9, 15, 23
+7846: 9, 15, 24
+7847: 9, 15, 25
+7848: 9, 15, 26
+7849: 9, 15, 27
+7850: 9, 15, 28
+7851: 9, 15, 29
+7852: 9, 15, 30
+7853: 9, 15, 31
+7854: 9, 15, 32
+7855: 9, 15, 33
+7856: 9, 15, 34
+7857: 9, 15, 35
+7858: 9, 16, 0
+7859: 9, 16, 1
+7860: 9, 16, 2
+7861: 9, 16, 3
+7862: 9, 16, 4
+7863: 9, 16, 5
+7864: 9, 16, 6
+7865: 9, 16, 7
+7866: 9, 16, 8
+7867: 9, 16, 9
+7868: 9, 16, 10
+7869: 9, 16, 11
+7870: 9, 16, 12
+7871: 9, 16, 13
+7872: 9, 16, 14
+7873: 9, 16, 15
+7874: 9, 16, 16
+7875: 9, 16, 17
+7876: 9, 16, 18
+7877: 9, 16, 19
+7878: 9, 16, 20
+7879: 9, 16, 21
+7880: 9, 16, 22
+7881: 9, 16, 23
+7882: 9, 17, 0
+7883: 9, 17, 1
+7884: 9, 17, 2
+7885: 9, 17, 3
+7886: 9, 17, 4
+7887: 9, 17, 5
+7888: 9, 17, 6
+7889: 9, 17, 7
+7890: 9, 17, 8
+7891: 9, 17, 9
+7892: 9, 17, 10
+7893: 9, 17, 11
+7894: 9, 17, 12
+7895: 9, 17, 13
+7896: 9, 17, 14
+7897: 9, 17, 15
+7898: 9, 17, 16
+7899: 9, 17, 17
+7900: 9, 17, 18
+7901: 9, 17, 19
+7902: 9, 17, 20
+7903: 9, 17, 21
+7904: 9, 17, 22
+7905: 9, 17, 23
+7906: 9, 17, 24
+7907: 9, 17, 25
+7908: 9, 17, 26
+7909: 9, 17, 27
+7910: 9, 17, 28
+7911: 9, 17, 29
+7912: 9, 17, 30
+7913: 9, 17, 31
+7914: 9, 17, 32
+7915: 9, 17, 33
+7916: 9, 17, 34
+7917: 9, 17, 35
+7918: 9, 17, 36
+7919: 9, 17, 37
+7920: 9, 17, 38
+7921: 9, 17, 39
+7922: 9, 17, 40
+7923: 9, 17, 41
+7924: 9, 17, 42
+7925: 9, 17, 43
+7926: 9, 17, 44
+7927: 9, 17, 45
+7928: 9, 17, 46
+7929: 9, 17, 47
+7930: 9, 17, 48
+7931: 9, 17, 49
+7932: 9, 17, 50
+7933: 9, 17, 51
+7934: 9, 17, 52
+7935: 9, 17, 53
+7936: 9, 17, 54
+7937: 9, 17, 55
+7938: 9, 17, 56
+7939: 9, 17, 57
+7940: 9, 17, 58
+7941: 9, 18, 0
+7942: 9, 18, 1
+7943: 9, 18, 2
+7944: 9, 18, 3
+7945: 9, 18, 4
+7946: 9, 18, 5
+7947: 9, 18, 6
+7948: 9, 18, 7
+7949: 9, 18, 8
+7950: 9, 18, 9
+7951: 9, 18, 10
+7952: 9, 18, 11
+7953: 9, 18, 12
+7954: 9, 18, 13
+7955: 9, 18, 14
+7956: 9, 18, 15
+7957: 9, 18, 16
+7958: 9, 18, 17
+7959: 9, 18, 18
+7960: 9, 18, 19
+7961: 9, 18, 20
+7962: 9, 18, 21
+7963: 9, 18, 22
+7964: 9, 18, 23
+7965: 9, 18, 24
+7966: 9, 18, 25
+7967: 9, 18, 26
+7968: 9, 18, 27
+7969: 9, 18, 28
+7970: 9, 18, 29
+7971: 9, 18, 30
+7972: 9, 19, 0
+7973: 9, 19, 1
+7974: 9, 19, 2
+7975: 9, 19, 3
+7976: 9, 19, 4
+7977: 9, 19, 5
+7978: 9, 19, 6
+7979: 9, 19, 7
+7980: 9, 19, 8
+7981: 9, 19, 9
+7982: 9, 19, 10
+7983: 9, 19, 11
+7984: 9, 19, 12
+7985: 9, 19, 13
+7986: 9, 19, 14
+7987: 9, 19, 15
+7988: 9, 19, 16
+7989: 9, 19, 17
+7990: 9, 19, 18
+7991: 9, 19, 19
+7992: 9, 19, 20
+7993: 9, 19, 21
+7994: 9, 19, 22
+7995: 9, 19, 23
+7996: 9, 19, 24
+7997: 9, 20, 0
+7998: 9, 20, 1
+7999: 9, 20, 2
+8000: 9, 20, 3
+8001: 9, 20, 4
+8002: 9, 20, 5
+8003: 9, 20, 6
+8004: 9, 20, 7
+8005: 9, 20, 8
+8006: 9, 20, 9
+8007: 9, 20, 10
+8008: 9, 20, 11
+8009: 9, 20, 12
+8010: 9, 20, 13
+8011: 9, 20, 14
+8012: 9, 20, 15
+8013: 9, 20, 16
+8014: 9, 20, 17
+8015: 9, 20, 18
+8016: 9, 20, 19
+8017: 9, 20, 20
+8018: 9, 20, 21
+8019: 9, 20, 22
+8020: 9, 20, 23
+8021: 9, 20, 24
+8022: 9, 20, 25
+8023: 9, 20, 26
+8024: 9, 20, 27
+8025: 9, 20, 28
+8026: 9, 20, 29
+8027: 9, 20, 30
+8028: 9, 20, 31
+8029: 9, 20, 32
+8030: 9, 20, 33
+8031: 9, 20, 34
+8032: 9, 20, 35
+8033: 9, 20, 36
+8034: 9, 20, 37
+8035: 9, 20, 38
+8036: 9, 20, 39
+8037: 9, 20, 40
+8038: 9, 20, 41
+8039: 9, 20, 42
+8040: 9, 21, 0
+8041: 9, 21, 1
+8042: 9, 21, 2
+8043: 9, 21, 3
+8044: 9, 21, 4
+8045: 9, 21, 5
+8046: 9, 21, 6
+8047: 9, 21, 7
+8048: 9, 21, 8
+8049: 9, 21, 9
+8050: 9, 21, 10
+8051: 9, 21, 11
+8052: 9, 21, 12
+8053: 9, 21, 13
+8054: 9, 21, 14
+8055: 9, 21, 15
+8056: 9, 22, 0
+8057: 9, 22, 1
+8058: 9, 22, 2
+8059: 9, 22, 3
+8060: 9, 22, 4
+8061: 9, 22, 5
+8062: 9, 22, 6
+8063: 9, 22, 7
+8064: 9, 22, 8
+8065: 9, 22, 9
+8066: 9, 22, 10
+8067: 9, 22, 11
+8068: 9, 22, 12
+8069: 9, 22, 13
+8070: 9, 22, 14
+8071: 9, 22, 15
+8072: 9, 22, 16
+8073: 9, 22, 17
+8074: 9, 22, 18
+8075: 9, 22, 19
+8076: 9, 22, 20
+8077: 9, 22, 21
+8078: 9, 22, 22
+8079: 9, 22, 23
+8080: 9, 23, 0
+8081: 9, 23, 1
+8082: 9, 23, 2
+8083: 9, 23, 3
+8084: 9, 23, 4
+8085: 9, 23, 5
+8086: 9, 23, 6
+8087: 9, 23, 7
+8088: 9, 23, 8
+8089: 9, 23, 9
+8090: 9, 23, 10
+8091: 9, 23, 11
+8092: 9, 23, 12
+8093: 9, 23, 13
+8094: 9, 23, 14
+8095: 9, 23, 15
+8096: 9, 23, 16
+8097: 9, 23, 17
+8098: 9, 23, 18
+8099: 9, 23, 19
+8100: 9, 23, 20
+8101: 9, 23, 21
+8102: 9, 23, 22
+8103: 9, 23, 23
+8104: 9, 23, 24
+8105: 9, 23, 25
+8106: 9, 23, 26
+8107: 9, 23, 27
+8108: 9, 23, 28
+8109: 9, 23, 29
+8110: 9, 24, 0
+8111: 9, 24, 1
+8112: 9, 24, 2
+8113: 9, 24, 3
+8114: 9, 24, 4
+8115: 9, 24, 5
+8116: 9, 24, 6
+8117: 9, 24, 7
+8118: 9, 24, 8
+8119: 9, 24, 9
+8120: 9, 24, 10
+8121: 9, 24, 11
+8122: 9, 24, 12
+8123: 9, 24, 13
+8124: 9, 24, 14
+8125: 9, 24, 15
+8126: 9, 24, 16
+8127: 9, 24, 17
+8128: 9, 24, 18
+8129: 9, 24, 19
+8130: 9, 24, 20
+8131: 9, 24, 21
+8132: 9, 24, 22
+8133: 9, 25, 0
+8134: 9, 25, 1
+8135: 9, 25, 2
+8136: 9, 25, 3
+8137: 9, 25, 4
+8138: 9, 25, 5
+8139: 9, 25, 6
+8140: 9, 25, 7
+8141: 9, 25, 8
+8142: 9, 25, 9
+8143: 9, 25, 10
+8144: 9, 25, 11
+8145: 9, 25, 12
+8146: 9, 25, 13
+8147: 9, 25, 14
+8148: 9, 25, 15
+8149: 9, 25, 16
+8150: 9, 25, 17
+8151: 9, 25, 18
+8152: 9, 25, 19
+8153: 9, 25, 20
+8154: 9, 25, 21
+8155: 9, 25, 22
+8156: 9, 25, 23
+8157: 9, 25, 24
+8158: 9, 25, 25
+8159: 9, 25, 26
+8160: 9, 25, 27
+8161: 9, 25, 28
+8162: 9, 25, 29
+8163: 9, 25, 30
+8164: 9, 25, 31
+8165: 9, 25, 32
+8166: 9, 25, 33
+8167: 9, 25, 34
+8168: 9, 25, 35
+8169: 9, 25, 36
+8170: 9, 25, 37
+8171: 9, 25, 38
+8172: 9, 25, 39
+8173: 9, 25, 40
+8174: 9, 25, 41
+8175: 9, 25, 42
+8176: 9, 25, 43
+8177: 9, 25, 44
+8178: 9, 26, 0
+8179: 9, 26, 1
+8180: 9, 26, 2
+8181: 9, 26, 3
+8182: 9, 26, 4
+8183: 9, 26, 5
+8184: 9, 26, 6
+8185: 9, 26, 7
+8186: 9, 26, 8
+8187: 9, 26, 9
+8188: 9, 26, 10
+8189: 9, 26, 11
+8190: 9, 26, 12
+8191: 9, 26, 13
+8192: 9, 26, 14
+8193: 9, 26, 15
+8194: 9, 26, 16
+8195: 9, 26, 17
+8196: 9, 26, 18
+8197: 9, 26, 19
+8198: 9, 26, 20
+8199: 9, 26, 21
+8200: 9, 26, 22
+8201: 9, 26, 23
+8202: 9, 26, 24
+8203: 9, 26, 25
+8204: 9, 27, 0
+8205: 9, 27, 1
+8206: 9, 27, 2
+8207: 9, 27, 3
+8208: 9, 27, 4
+8209: 9, 27, 5
+8210: 9, 27, 6
+8211: 9, 27, 7
+8212: 9, 27, 8
+8213: 9, 27, 9
+8214: 9, 27, 10
+8215: 9, 27, 11
+8216: 9, 27, 12
+8217: 9, 28, 0
+8218: 9, 28, 1
+8219: 9, 28, 2
+8220: 9, 28, 3
+8221: 9, 28, 4
+8222: 9, 28, 5
+8223: 9, 28, 6
+8224: 9, 28, 7
+8225: 9, 28, 8
+8226: 9, 28, 9
+8227: 9, 28, 10
+8228: 9, 28, 11
+8229: 9, 28, 12
+8230: 9, 28, 13
+8231: 9, 28, 14
+8232: 9, 28, 15
+8233: 9, 28, 16
+8234: 9, 28, 17
+8235: 9, 28, 18
+8236: 9, 28, 19
+8237: 9, 28, 20
+8238: 9, 28, 21
+8239: 9, 28, 22
+8240: 9, 28, 23
+8241: 9, 28, 24
+8242: 9, 28, 25
+8243: 9, 29, 0
+8244: 9, 29, 1
+8245: 9, 29, 2
+8246: 9, 29, 3
+8247: 9, 29, 4
+8248: 9, 29, 5
+8249: 9, 29, 6
+8250: 9, 29, 7
+8251: 9, 29, 8
+8252: 9, 29, 9
+8253: 9, 29, 10
+8254: 9, 29, 11
+8255: 9, 30, 0
+8256: 9, 30, 1
+8257: 9, 30, 2
+8258: 9, 30, 3
+8259: 9, 30, 4
+8260: 9, 30, 5
+8261: 9, 30, 6
+8262: 9, 30, 7
+8263: 9, 30, 8
+8264: 9, 30, 9
+8265: 9, 30, 10
+8266: 9, 30, 11
+8267: 9, 30, 12
+8268: 9, 30, 13
+8269: 9, 30, 14
+8270: 9, 30, 15
+8271: 9, 30, 16
+8272: 9, 30, 17
+8273: 9, 30, 18
+8274: 9, 30, 19
+8275: 9, 30, 20
+8276: 9, 30, 21
+8277: 9, 30, 22
+8278: 9, 30, 23
+8279: 9, 30, 24
+8280: 9, 30, 25
+8281: 9, 30, 26
+8282: 9, 30, 27
+8283: 9, 30, 28
+8284: 9, 30, 29
+8285: 9, 30, 30
+8286: 9, 30, 31
+8287: 9, 31, 0
+8288: 9, 31, 1
+8289: 9, 31, 2
+8290: 9, 31, 3
+8291: 9, 31, 4
+8292: 9, 31, 5
+8293: 9, 31, 6
+8294: 9, 31, 7
+8295: 9, 31, 8
+8296: 9, 31, 9
+8297: 9, 31, 10
+8298: 9, 31, 11
+8299: 9, 31, 12
+8300: 9, 31, 13
+8301: 10, 0, 0
+8302: 10, 1, 0
+8303: 10, 1, 1
+8304: 10, 1, 2
+8305: 10, 1, 3
+8306: 10, 1, 4
+8307: 10, 1, 5
+8308: 10, 1, 6
+8309: 10, 1, 7
+8310: 10, 1, 8
+8311: 10, 1, 9
+8312: 10, 1, 10
+8313: 10, 1, 11
+8314: 10, 1, 12
+8315: 10, 1, 13
+8316: 10, 1, 14
+8317: 10, 1, 15
+8318: 10, 1, 16
+8319: 10, 1, 17
+8320: 10, 1, 18
+8321: 10, 1, 19
+8322: 10, 1, 20
+8323: 10, 1, 21
+8324: 10, 1, 22
+8325: 10, 1, 23
+8326: 10, 1, 24
+8327: 10, 1, 25
+8328: 10, 1, 26
+8329: 10, 1, 27
+8330: 10, 2, 0
+8331: 10, 2, 1
+8332: 10, 2, 2
+8333: 10, 2, 3
+8334: 10, 2, 4
+8335: 10, 2, 5
+8336: 10, 2, 6
+8337: 10, 2, 7
+8338: 10, 2, 8
+8339: 10, 2, 9
+8340: 10, 2, 10
+8341: 10, 2, 11
+8342: 10, 2, 12
+8343: 10, 2, 13
+8344: 10, 2, 14
+8345: 10, 2, 15
+8346: 10, 2, 16
+8347: 10, 2, 17
+8348: 10, 2, 18
+8349: 10, 2, 19
+8350: 10, 2, 20
+8351: 10, 2, 21
+8352: 10, 2, 22
+8353: 10, 2, 23
+8354: 10, 2, 24
+8355: 10, 2, 25
+8356: 10, 2, 26
+8357: 10, 2, 27
+8358: 10, 2, 28
+8359: 10, 2, 29
+8360: 10, 2, 30
+8361: 10, 2, 31
+8362: 10, 2, 32
+8363: 10, 3, 0
+8364: 10, 3, 1
+8365: 10, 3, 2
+8366: 10, 3, 3
+8367: 10, 3, 4
+8368: 10, 3, 5
+8369: 10, 3, 6
+8370: 10, 3, 7
+8371: 10, 3, 8
+8372: 10, 3, 9
+8373: 10, 3, 10
+8374: 10, 3, 11
+8375: 10, 3, 12
+8376: 10, 3, 13
+8377: 10, 3, 14
+8378: 10, 3, 15
+8379: 10, 3, 16
+8380: 10, 3, 17
+8381: 10, 3, 18
+8382: 10, 3, 19
+8383: 10, 3, 20
+8384: 10, 3, 21
+8385: 10, 3, 22
+8386: 10, 3, 23
+8387: 10, 3, 24
+8388: 10, 3, 25
+8389: 10, 3, 26
+8390: 10, 3, 27
+8391: 10, 3, 28
+8392: 10, 3, 29
+8393: 10, 3, 30
+8394: 10, 3, 31
+8395: 10, 3, 32
+8396: 10, 3, 33
+8397: 10, 3, 34
+8398: 10, 3, 35
+8399: 10, 3, 36
+8400: 10, 3, 37
+8401: 10, 3, 38
+8402: 10, 3, 39
+8403: 10, 4, 0
+8404: 10, 4, 1
+8405: 10, 4, 2
+8406: 10, 4, 3
+8407: 10, 4, 4
+8408: 10, 4, 5
+8409: 10, 4, 6
+8410: 10, 4, 7
+8411: 10, 4, 8
+8412: 10, 4, 9
+8413: 10, 4, 10
+8414: 10, 4, 11
+8415: 10, 4, 12
+8416: 10, 5, 0
+8417: 10, 5, 1
+8418: 10, 5, 2
+8419: 10, 5, 3
+8420: 10, 5, 4
+8421: 10, 5, 5
+8422: 10, 5, 6
+8423: 10, 5, 7
+8424: 10, 5, 8
+8425: 10, 5, 9
+8426: 10, 5, 10
+8427: 10, 5, 11
+8428: 10, 5, 12
+8429: 10, 5, 13
+8430: 10, 5, 14
+8431: 10, 5, 15
+8432: 10, 5, 16
+8433: 10, 5, 17
+8434: 10, 5, 18
+8435: 10, 5, 19
+8436: 10, 5, 20
+8437: 10, 5, 21
+8438: 10, 5, 22
+8439: 10, 5, 23
+8440: 10, 5, 24
+8441: 10, 5, 25
+8442: 10, 6, 0
+8443: 10, 6, 1
+8444: 10, 6, 2
+8445: 10, 6, 3
+8446: 10, 6, 4
+8447: 10, 6, 5
+8448: 10, 6, 6
+8449: 10, 6, 7
+8450: 10, 6, 8
+8451: 10, 6, 9
+8452: 10, 6, 10
+8453: 10, 6, 11
+8454: 10, 6, 12
+8455: 10, 6, 13
+8456: 10, 6, 14
+8457: 10, 6, 15
+8458: 10, 6, 16
+8459: 10, 6, 17
+8460: 10, 6, 18
+8461: 10, 6, 19
+8462: 10, 6, 20
+8463: 10, 6, 21
+8464: 10, 6, 22
+8465: 10, 6, 23
+8466: 10, 7, 0
+8467: 10, 7, 1
+8468: 10, 7, 2
+8469: 10, 7, 3
+8470: 10, 7, 4
+8471: 10, 7, 5
+8472: 10, 7, 6
+8473: 10, 7, 7
+8474: 10, 7, 8
+8475: 10, 7, 9
+8476: 10, 7, 10
+8477: 10, 7, 11
+8478: 10, 7, 12
+8479: 10, 7, 13
+8480: 10, 7, 14
+8481: 10, 7, 15
+8482: 10, 7, 16
+8483: 10, 7, 17
+8484: 10, 7, 18
+8485: 10, 7, 19
+8486: 10, 7, 20
+8487: 10, 7, 21
+8488: 10, 7, 22
+8489: 10, 7, 23
+8490: 10, 7, 24
+8491: 10, 7, 25
+8492: 10, 7, 26
+8493: 10, 7, 27
+8494: 10, 7, 28
+8495: 10, 7, 29
+8496: 10, 8, 0
+8497: 10, 8, 1
+8498: 10, 8, 2
+8499: 10, 8, 3
+8500: 10, 8, 4
+8501: 10, 8, 5
+8502: 10, 8, 6
+8503: 10, 8, 7
+8504: 10, 8, 8
+8505: 10, 8, 9
+8506: 10, 8, 10
+8507: 10, 8, 11
+8508: 10, 8, 12
+8509: 10, 8, 13
+8510: 10, 8, 14
+8511: 10, 8, 15
+8512: 10, 8, 16
+8513: 10, 8, 17
+8514: 10, 8, 18
+8515: 10, 9, 0
+8516: 10, 9, 1
+8517: 10, 9, 2
+8518: 10, 9, 3
+8519: 10, 9, 4
+8520: 10, 9, 5
+8521: 10, 9, 6
+8522: 10, 9, 7
+8523: 10, 9, 8
+8524: 10, 9, 9
+8525: 10, 9, 10
+8526: 10, 9, 11
+8527: 10, 9, 12
+8528: 10, 9, 13
+8529: 10, 10, 0
+8530: 10, 10, 1
+8531: 10, 10, 2
+8532: 10, 10, 3
+8533: 10, 10, 4
+8534: 10, 10, 5
+8535: 10, 10, 6
+8536: 10, 10, 7
+8537: 10, 10, 8
+8538: 10, 10, 9
+8539: 10, 10, 10
+8540: 10, 10, 11
+8541: 10, 10, 12
+8542: 10, 10, 13
+8543: 10, 10, 14
+8544: 10, 10, 15
+8545: 10, 10, 16
+8546: 10, 10, 17
+8547: 10, 10, 18
+8548: 10, 10, 19
+8549: 10, 11, 0
+8550: 10, 11, 1
+8551: 10, 11, 2
+8552: 10, 11, 3
+8553: 10, 11, 4
+8554: 10, 11, 5
+8555: 10, 11, 6
+8556: 10, 11, 7
+8557: 10, 11, 8
+8558: 10, 11, 9
+8559: 10, 11, 10
+8560: 10, 11, 11
+8561: 10, 11, 12
+8562: 10, 11, 13
+8563: 10, 11, 14
+8564: 10, 11, 15
+8565: 10, 11, 16
+8566: 10, 11, 17
+8567: 10, 11, 18
+8568: 10, 11, 19
+8569: 10, 11, 20
+8570: 10, 11, 21
+8571: 10, 11, 22
+8572: 10, 11, 23
+8573: 10, 11, 24
+8574: 10, 11, 25
+8575: 10, 11, 26
+8576: 10, 11, 27
+8577: 10, 12, 0
+8578: 10, 12, 1
+8579: 10, 12, 2
+8580: 10, 12, 3
+8581: 10, 12, 4
+8582: 10, 12, 5
+8583: 10, 12, 6
+8584: 10, 12, 7
+8585: 10, 12, 8
+8586: 10, 12, 9
+8587: 10, 12, 10
+8588: 10, 12, 11
+8589: 10, 12, 12
+8590: 10, 12, 13
+8591: 10, 12, 14
+8592: 10, 12, 15
+8593: 10, 12, 16
+8594: 10, 12, 17
+8595: 10, 12, 18
+8596: 10, 12, 19
+8597: 10, 12, 20
+8598: 10, 12, 21
+8599: 10, 12, 22
+8600: 10, 12, 23
+8601: 10, 12, 24
+8602: 10, 12, 25
+8603: 10, 12, 26
+8604: 10, 12, 27
+8605: 10, 12, 28
+8606: 10, 12, 29
+8607: 10, 12, 30
+8608: 10, 12, 31
+8609: 10, 13, 0
+8610: 10, 13, 1
+8611: 10, 13, 2
+8612: 10, 13, 3
+8613: 10, 13, 4
+8614: 10, 13, 5
+8615: 10, 13, 6
+8616: 10, 13, 7
+8617: 10, 13, 8
+8618: 10, 13, 9
+8619: 10, 13, 10
+8620: 10, 13, 11
+8621: 10, 13, 12
+8622: 10, 13, 13
+8623: 10, 13, 14
+8624: 10, 13, 15
+8625: 10, 13, 16
+8626: 10, 13, 17
+8627: 10, 13, 18
+8628: 10, 13, 19
+8629: 10, 13, 20
+8630: 10, 13, 21
+8631: 10, 13, 22
+8632: 10, 13, 23
+8633: 10, 13, 24
+8634: 10, 13, 25
+8635: 10, 13, 26
+8636: 10, 13, 27
+8637: 10, 13, 28
+8638: 10, 13, 29
+8639: 10, 13, 30
+8640: 10, 13, 31
+8641: 10, 13, 32
+8642: 10, 13, 33
+8643: 10, 13, 34
+8644: 10, 13, 35
+8645: 10, 13, 36
+8646: 10, 13, 37
+8647: 10, 13, 38
+8648: 10, 13, 39
+8649: 10, 14, 0
+8650: 10, 14, 1
+8651: 10, 14, 2
+8652: 10, 14, 3
+8653: 10, 14, 4
+8654: 10, 14, 5
+8655: 10, 14, 6
+8656: 10, 14, 7
+8657: 10, 14, 8
+8658: 10, 14, 9
+8659: 10, 14, 10
+8660: 10, 14, 11
+8661: 10, 14, 12
+8662: 10, 14, 13
+8663: 10, 14, 14
+8664: 10, 14, 15
+8665: 10, 14, 16
+8666: 10, 14, 17
+8667: 10, 14, 18
+8668: 10, 14, 19
+8669: 10, 14, 20
+8670: 10, 14, 21
+8671: 10, 14, 22
+8672: 10, 14, 23
+8673: 10, 14, 24
+8674: 10, 14, 25
+8675: 10, 14, 26
+8676: 10, 14, 27
+8677: 10, 14, 28
+8678: 10, 14, 29
+8679: 10, 14, 30
+8680: 10, 14, 31
+8681: 10, 14, 32
+8682: 10, 14, 33
+8683: 10, 15, 0
+8684: 10, 15, 1
+8685: 10, 15, 2
+8686: 10, 15, 3
+8687: 10, 15, 4
+8688: 10, 15, 5
+8689: 10, 15, 6
+8690: 10, 15, 7
+8691: 10, 15, 8
+8692: 10, 15, 9
+8693: 10, 15, 10
+8694: 10, 15, 11
+8695: 10, 15, 12
+8696: 10, 15, 13
+8697: 10, 15, 14
+8698: 10, 15, 15
+8699: 10, 15, 16
+8700: 10, 15, 17
+8701: 10, 15, 18
+8702: 10, 15, 19
+8703: 10, 15, 20
+8704: 10, 15, 21
+8705: 10, 15, 22
+8706: 10, 15, 23
+8707: 10, 15, 24
+8708: 10, 15, 25
+8709: 10, 15, 26
+8710: 10, 15, 27
+8711: 10, 15, 28
+8712: 10, 15, 29
+8713: 10, 15, 30
+8714: 10, 15, 31
+8715: 10, 15, 32
+8716: 10, 15, 33
+8717: 10, 15, 34
+8718: 10, 15, 35
+8719: 10, 15, 36
+8720: 10, 15, 37
+8721: 10, 16, 0
+8722: 10, 16, 1
+8723: 10, 16, 2
+8724: 10, 16, 3
+8725: 10, 16, 4
+8726: 10, 16, 5
+8727: 10, 16, 6
+8728: 10, 16, 7
+8729: 10, 16, 8
+8730: 10, 16, 9
+8731: 10, 16, 10
+8732: 10, 16, 11
+8733: 10, 16, 12
+8734: 10, 16, 13
+8735: 10, 16, 14
+8736: 10, 16, 15
+8737: 10, 16, 16
+8738: 10, 16, 17
+8739: 10, 16, 18
+8740: 10, 16, 19
+8741: 10, 16, 20
+8742: 10, 16, 21
+8743: 10, 16, 22
+8744: 10, 16, 23
+8745: 10, 17, 0
+8746: 10, 17, 1
+8747: 10, 17, 2
+8748: 10, 17, 3
+8749: 10, 17, 4
+8750: 10, 17, 5
+8751: 10, 17, 6
+8752: 10, 17, 7
+8753: 10, 17, 8
+8754: 10, 17, 9
+8755: 10, 17, 10
+8756: 10, 17, 11
+8757: 10, 17, 12
+8758: 10, 17, 13
+8759: 10, 17, 14
+8760: 10, 17, 15
+8761: 10, 17, 16
+8762: 10, 17, 17
+8763: 10, 17, 18
+8764: 10, 17, 19
+8765: 10, 17, 20
+8766: 10, 17, 21
+8767: 10, 17, 22
+8768: 10, 17, 23
+8769: 10, 17, 24
+8770: 10, 17, 25
+8771: 10, 17, 26
+8772: 10, 17, 27
+8773: 10, 17, 28
+8774: 10, 17, 29
+8775: 10, 18, 0
+8776: 10, 18, 1
+8777: 10, 18, 2
+8778: 10, 18, 3
+8779: 10, 18, 4
+8780: 10, 18, 5
+8781: 10, 18, 6
+8782: 10, 18, 7
+8783: 10, 18, 8
+8784: 10, 18, 9
+8785: 10, 18, 10
+8786: 10, 18, 11
+8787: 10, 18, 12
+8788: 10, 18, 13
+8789: 10, 18, 14
+8790: 10, 18, 15
+8791: 10, 18, 16
+8792: 10, 18, 17
+8793: 10, 18, 18
+8794: 10, 18, 19
+8795: 10, 18, 20
+8796: 10, 18, 21
+8797: 10, 18, 22
+8798: 10, 18, 23
+8799: 10, 18, 24
+8800: 10, 18, 25
+8801: 10, 18, 26
+8802: 10, 18, 27
+8803: 10, 18, 28
+8804: 10, 18, 29
+8805: 10, 18, 30
+8806: 10, 18, 31
+8807: 10, 18, 32
+8808: 10, 18, 33
+8809: 10, 19, 0
+8810: 10, 19, 1
+8811: 10, 19, 2
+8812: 10, 19, 3
+8813: 10, 19, 4
+8814: 10, 19, 5
+8815: 10, 19, 6
+8816: 10, 19, 7
+8817: 10, 19, 8
+8818: 10, 19, 9
+8819: 10, 19, 10
+8820: 10, 19, 11
+8821: 10, 19, 12
+8822: 10, 19, 13
+8823: 10, 19, 14
+8824: 10, 19, 15
+8825: 10, 19, 16
+8826: 10, 19, 17
+8827: 10, 19, 18
+8828: 10, 19, 19
+8829: 10, 19, 20
+8830: 10, 19, 21
+8831: 10, 19, 22
+8832: 10, 19, 23
+8833: 10, 19, 24
+8834: 10, 19, 25
+8835: 10, 19, 26
+8836: 10, 19, 27
+8837: 10, 19, 28
+8838: 10, 19, 29
+8839: 10, 19, 30
+8840: 10, 19, 31
+8841: 10, 19, 32
+8842: 10, 19, 33
+8843: 10, 19, 34
+8844: 10, 19, 35
+8845: 10, 19, 36
+8846: 10, 19, 37
+8847: 10, 19, 38
+8848: 10, 19, 39
+8849: 10, 19, 40
+8850: 10, 19, 41
+8851: 10, 19, 42
+8852: 10, 19, 43
+8853: 10, 20, 0
+8854: 10, 20, 1
+8855: 10, 20, 2
+8856: 10, 20, 3
+8857: 10, 20, 4
+8858: 10, 20, 5
+8859: 10, 20, 6
+8860: 10, 20, 7
+8861: 10, 20, 8
+8862: 10, 20, 9
+8863: 10, 20, 10
+8864: 10, 20, 11
+8865: 10, 20, 12
+8866: 10, 20, 13
+8867: 10, 20, 14
+8868: 10, 20, 15
+8869: 10, 20, 16
+8870: 10, 20, 17
+8871: 10, 20, 18
+8872: 10, 20, 19
+8873: 10, 20, 20
+8874: 10, 20, 21
+8875: 10, 20, 22
+8876: 10, 20, 23
+8877: 10, 20, 24
+8878: 10, 20, 25
+8879: 10, 20, 26
+8880: 10, 21, 0
+8881: 10, 21, 1
+8882: 10, 21, 2
+8883: 10, 21, 3
+8884: 10, 21, 4
+8885: 10, 21, 5
+8886: 10, 21, 6
+8887: 10, 21, 7
+8888: 10, 21, 8
+8889: 10, 21, 9
+8890: 10, 21, 10
+8891: 10, 21, 11
+8892: 10, 21, 12
+8893: 10, 21, 13
+8894: 10, 21, 14
+8895: 10, 21, 15
+8896: 10, 21, 16
+8897: 10, 21, 17
+8898: 10, 21, 18
+8899: 10, 21, 19
+8900: 10, 21, 20
+8901: 10, 21, 21
+8902: 10, 21, 22
+8903: 10, 22, 0
+8904: 10, 22, 1
+8905: 10, 22, 2
+8906: 10, 22, 3
+8907: 10, 22, 4
+8908: 10, 22, 5
+8909: 10, 22, 6
+8910: 10, 22, 7
+8911: 10, 22, 8
+8912: 10, 22, 9
+8913: 10, 22, 10
+8914: 10, 22, 11
+8915: 10, 22, 12
+8916: 10, 22, 13
+8917: 10, 22, 14
+8918: 10, 22, 15
+8919: 10, 22, 16
+8920: 10, 22, 17
+8921: 10, 22, 18
+8922: 10, 22, 19
+8923: 10, 22, 20
+8924: 10, 22, 21
+8925: 10, 22, 22
+8926: 10, 22, 23
+8927: 10, 22, 24
+8928: 10, 22, 25
+8929: 10, 22, 26
+8930: 10, 22, 27
+8931: 10, 22, 28
+8932: 10, 22, 29
+8933: 10, 22, 30
+8934: 10, 22, 31
+8935: 10, 22, 32
+8936: 10, 22, 33
+8937: 10, 22, 34
+8938: 10, 22, 35
+8939: 10, 22, 36
+8940: 10, 22, 37
+8941: 10, 22, 38
+8942: 10, 22, 39
+8943: 10, 22, 40
+8944: 10, 22, 41
+8945: 10, 22, 42
+8946: 10, 22, 43
+8947: 10, 22, 44
+8948: 10, 22, 45
+8949: 10, 22, 46
+8950: 10, 22, 47
+8951: 10, 22, 48
+8952: 10, 22, 49
+8953: 10, 22, 50
+8954: 10, 22, 51
+8955: 10, 23, 0
+8956: 10, 23, 1
+8957: 10, 23, 2
+8958: 10, 23, 3
+8959: 10, 23, 4
+8960: 10, 23, 5
+8961: 10, 23, 6
+8962: 10, 23, 7
+8963: 10, 23, 8
+8964: 10, 23, 9
+8965: 10, 23, 10
+8966: 10, 23, 11
+8967: 10, 23, 12
+8968: 10, 23, 13
+8969: 10, 23, 14
+8970: 10, 23, 15
+8971: 10, 23, 16
+8972: 10, 23, 17
+8973: 10, 23, 18
+8974: 10, 23, 19
+8975: 10, 23, 20
+8976: 10, 23, 21
+8977: 10, 23, 22
+8978: 10, 23, 23
+8979: 10, 23, 24
+8980: 10, 23, 25
+8981: 10, 23, 26
+8982: 10, 23, 27
+8983: 10, 23, 28
+8984: 10, 23, 29
+8985: 10, 23, 30
+8986: 10, 23, 31
+8987: 10, 23, 32
+8988: 10, 23, 33
+8989: 10, 23, 34
+8990: 10, 23, 35
+8991: 10, 23, 36
+8992: 10, 23, 37
+8993: 10, 23, 38
+8994: 10, 23, 39
+8995: 10, 24, 0
+8996: 10, 24, 1
+8997: 10, 24, 2
+8998: 10, 24, 3
+8999: 10, 24, 4
+9000: 10, 24, 5
+9001: 10, 24, 6
+9002: 10, 24, 7
+9003: 10, 24, 8
+9004: 10, 24, 9
+9005: 10, 24, 10
+9006: 10, 24, 11
+9007: 10, 24, 12
+9008: 10, 24, 13
+9009: 10, 24, 14
+9010: 10, 24, 15
+9011: 10, 24, 16
+9012: 10, 24, 17
+9013: 10, 24, 18
+9014: 10, 24, 19
+9015: 10, 24, 20
+9016: 10, 24, 21
+9017: 10, 24, 22
+9018: 10, 24, 23
+9019: 10, 24, 24
+9020: 10, 24, 25
+9021: 11, 0, 0
+9022: 11, 1, 0
+9023: 11, 1, 1
+9024: 11, 1, 2
+9025: 11, 1, 3
+9026: 11, 1, 4
+9027: 11, 1, 5
+9028: 11, 1, 6
+9029: 11, 1, 7
+9030: 11, 1, 8
+9031: 11, 1, 9
+9032: 11, 1, 10
+9033: 11, 1, 11
+9034: 11, 1, 12
+9035: 11, 1, 13
+9036: 11, 1, 14
+9037: 11, 1, 15
+9038: 11, 1, 16
+9039: 11, 1, 17
+9040: 11, 1, 18
+9041: 11, 1, 19
+9042: 11, 1, 20
+9043: 11, 1, 21
+9044: 11, 1, 22
+9045: 11, 1, 23
+9046: 11, 1, 24
+9047: 11, 1, 25
+9048: 11, 1, 26
+9049: 11, 1, 27
+9050: 11, 1, 28
+9051: 11, 1, 29
+9052: 11, 1, 30
+9053: 11, 1, 31
+9054: 11, 1, 32
+9055: 11, 1, 33
+9056: 11, 1, 34
+9057: 11, 1, 35
+9058: 11, 1, 36
+9059: 11, 1, 37
+9060: 11, 1, 38
+9061: 11, 1, 39
+9062: 11, 1, 40
+9063: 11, 1, 41
+9064: 11, 1, 42
+9065: 11, 1, 43
+9066: 11, 1, 44
+9067: 11, 1, 45
+9068: 11, 1, 46
+9069: 11, 1, 47
+9070: 11, 1, 48
+9071: 11, 1, 49
+9072: 11, 1, 50
+9073: 11, 1, 51
+9074: 11, 1, 52
+9075: 11, 1, 53
+9076: 11, 2, 0
+9077: 11, 2, 1
+9078: 11, 2, 2
+9079: 11, 2, 3
+9080: 11, 2, 4
+9081: 11, 2, 5
+9082: 11, 2, 6
+9083: 11, 2, 7
+9084: 11, 2, 8
+9085: 11, 2, 9
+9086: 11, 2, 10
+9087: 11, 2, 11
+9088: 11, 2, 12
+9089: 11, 2, 13
+9090: 11, 2, 14
+9091: 11, 2, 15
+9092: 11, 2, 16
+9093: 11, 2, 17
+9094: 11, 2, 18
+9095: 11, 2, 19
+9096: 11, 2, 20
+9097: 11, 2, 21
+9098: 11, 2, 22
+9099: 11, 2, 23
+9100: 11, 2, 24
+9101: 11, 2, 25
+9102: 11, 2, 26
+9103: 11, 2, 27
+9104: 11, 2, 28
+9105: 11, 2, 29
+9106: 11, 2, 30
+9107: 11, 2, 31
+9108: 11, 2, 32
+9109: 11, 2, 33
+9110: 11, 2, 34
+9111: 11, 2, 35
+9112: 11, 2, 36
+9113: 11, 2, 37
+9114: 11, 2, 38
+9115: 11, 2, 39
+9116: 11, 2, 40
+9117: 11, 2, 41
+9118: 11, 2, 42
+9119: 11, 2, 43
+9120: 11, 2, 44
+9121: 11, 2, 45
+9122: 11, 2, 46
+9123: 11, 3, 0
+9124: 11, 3, 1
+9125: 11, 3, 2
+9126: 11, 3, 3
+9127: 11, 3, 4
+9128: 11, 3, 5
+9129: 11, 3, 6
+9130: 11, 3, 7
+9131: 11, 3, 8
+9132: 11, 3, 9
+9133: 11, 3, 10
+9134: 11, 3, 11
+9135: 11, 3, 12
+9136: 11, 3, 13
+9137: 11, 3, 14
+9138: 11, 3, 15
+9139: 11, 3, 16
+9140: 11, 3, 17
+9141: 11, 3, 18
+9142: 11, 3, 19
+9143: 11, 3, 20
+9144: 11, 3, 21
+9145: 11, 3, 22
+9146: 11, 3, 23
+9147: 11, 3, 24
+9148: 11, 3, 25
+9149: 11, 3, 26
+9150: 11, 3, 27
+9151: 11, 3, 28
+9152: 11, 4, 0
+9153: 11, 4, 1
+9154: 11, 4, 2
+9155: 11, 4, 3
+9156: 11, 4, 4
+9157: 11, 4, 5
+9158: 11, 4, 6
+9159: 11, 4, 7
+9160: 11, 4, 8
+9161: 11, 4, 9
+9162: 11, 4, 10
+9163: 11, 4, 11
+9164: 11, 4, 12
+9165: 11, 4, 13
+9166: 11, 4, 14
+9167: 11, 4, 15
+9168: 11, 4, 16
+9169: 11, 4, 17
+9170: 11, 4, 18
+9171: 11, 4, 19
+9172: 11, 4, 20
+9173: 11, 4, 21
+9174: 11, 4, 22
+9175: 11, 4, 23
+9176: 11, 4, 24
+9177: 11, 4, 25
+9178: 11, 4, 26
+9179: 11, 4, 27
+9180: 11, 4, 28
+9181: 11, 4, 29
+9182: 11, 4, 30
+9183: 11, 4, 31
+9184: 11, 4, 32
+9185: 11, 4, 33
+9186: 11, 4, 34
+9187: 11, 5, 0
+9188: 11, 5, 1
+9189: 11, 5, 2
+9190: 11, 5, 3
+9191: 11, 5, 4
+9192: 11, 5, 5
+9193: 11, 5, 6
+9194: 11, 5, 7
+9195: 11, 5, 8
+9196: 11, 5, 9
+9197: 11, 5, 10
+9198: 11, 5, 11
+9199: 11, 5, 12
+9200: 11, 5, 13
+9201: 11, 5, 14
+9202: 11, 5, 15
+9203: 11, 5, 16
+9204: 11, 5, 17
+9205: 11, 5, 18
+9206: 11, 6, 0
+9207: 11, 6, 1
+9208: 11, 6, 2
+9209: 11, 6, 3
+9210: 11, 6, 4
+9211: 11, 6, 5
+9212: 11, 6, 6
+9213: 11, 6, 7
+9214: 11, 6, 8
+9215: 11, 6, 9
+9216: 11, 6, 10
+9217: 11, 6, 11
+9218: 11, 6, 12
+9219: 11, 6, 13
+9220: 11, 6, 14
+9221: 11, 6, 15
+9222: 11, 6, 16
+9223: 11, 6, 17
+9224: 11, 6, 18
+9225: 11, 6, 19
+9226: 11, 6, 20
+9227: 11, 6, 21
+9228: 11, 6, 22
+9229: 11, 6, 23
+9230: 11, 6, 24
+9231: 11, 6, 25
+9232: 11, 6, 26
+9233: 11, 6, 27
+9234: 11, 6, 28
+9235: 11, 6, 29
+9236: 11, 6, 30
+9237: 11, 6, 31
+9238: 11, 6, 32
+9239: 11, 6, 33
+9240: 11, 6, 34
+9241: 11, 6, 35
+9242: 11, 6, 36
+9243: 11, 6, 37
+9244: 11, 6, 38
+9245: 11, 7, 0
+9246: 11, 7, 1
+9247: 11, 7, 2
+9248: 11, 7, 3
+9249: 11, 7, 4
+9250: 11, 7, 5
+9251: 11, 7, 6
+9252: 11, 7, 7
+9253: 11, 7, 8
+9254: 11, 7, 9
+9255: 11, 7, 10
+9256: 11, 7, 11
+9257: 11, 7, 12
+9258: 11, 7, 13
+9259: 11, 7, 14
+9260: 11, 7, 15
+9261: 11, 7, 16
+9262: 11, 7, 17
+9263: 11, 7, 18
+9264: 11, 7, 19
+9265: 11, 7, 20
+9266: 11, 7, 21
+9267: 11, 7, 22
+9268: 11, 7, 23
+9269: 11, 7, 24
+9270: 11, 7, 25
+9271: 11, 7, 26
+9272: 11, 7, 27
+9273: 11, 7, 28
+9274: 11, 7, 29
+9275: 11, 7, 30
+9276: 11, 7, 31
+9277: 11, 7, 32
+9278: 11, 7, 33
+9279: 11, 7, 34
+9280: 11, 7, 35
+9281: 11, 7, 36
+9282: 11, 7, 37
+9283: 11, 7, 38
+9284: 11, 7, 39
+9285: 11, 7, 40
+9286: 11, 7, 41
+9287: 11, 7, 42
+9288: 11, 7, 43
+9289: 11, 7, 44
+9290: 11, 7, 45
+9291: 11, 7, 46
+9292: 11, 7, 47
+9293: 11, 7, 48
+9294: 11, 7, 49
+9295: 11, 7, 50
+9296: 11, 7, 51
+9297: 11, 8, 0
+9298: 11, 8, 1
+9299: 11, 8, 2
+9300: 11, 8, 3
+9301: 11, 8, 4
+9302: 11, 8, 5
+9303: 11, 8, 6
+9304: 11, 8, 7
+9305: 11, 8, 8
+9306: 11, 8, 9
+9307: 11, 8, 10
+9308: 11, 8, 11
+9309: 11, 8, 12
+9310: 11, 8, 13
+9311: 11, 8, 14
+9312: 11, 8, 15
+9313: 11, 8, 16
+9314: 11, 8, 17
+9315: 11, 8, 18
+9316: 11, 8, 19
+9317: 11, 8, 20
+9318: 11, 8, 21
+9319: 11, 8, 22
+9320: 11, 8, 23
+9321: 11, 8, 24
+9322: 11, 8, 25
+9323: 11, 8, 26
+9324: 11, 8, 27
+9325: 11, 8, 28
+9326: 11, 8, 29
+9327: 11, 8, 30
+9328: 11, 8, 31
+9329: 11, 8, 32
+9330: 11, 8, 33
+9331: 11, 8, 34
+9332: 11, 8, 35
+9333: 11, 8, 36
+9334: 11, 8, 37
+9335: 11, 8, 38
+9336: 11, 8, 39
+9337: 11, 8, 40
+9338: 11, 8, 41
+9339: 11, 8, 42
+9340: 11, 8, 43
+9341: 11, 8, 44
+9342: 11, 8, 45
+9343: 11, 8, 46
+9344: 11, 8, 47
+9345: 11, 8, 48
+9346: 11, 8, 49
+9347: 11, 8, 50
+9348: 11, 8, 51
+9349: 11, 8, 52
+9350: 11, 8, 53
+9351: 11, 8, 54
+9352: 11, 8, 55
+9353: 11, 8, 56
+9354: 11, 8, 57
+9355: 11, 8, 58
+9356: 11, 8, 59
+9357: 11, 8, 60
+9358: 11, 8, 61
+9359: 11, 8, 62
+9360: 11, 8, 63
+9361: 11, 8, 64
+9362: 11, 8, 65
+9363: 11, 8, 66
+9364: 11, 9, 0
+9365: 11, 9, 1
+9366: 11, 9, 2
+9367: 11, 9, 3
+9368: 11, 9, 4
+9369: 11, 9, 5
+9370: 11, 9, 6
+9371: 11, 9, 7
+9372: 11, 9, 8
+9373: 11, 9, 9
+9374: 11, 9, 10
+9375: 11, 9, 11
+9376: 11, 9, 12
+9377: 11, 9, 13
+9378: 11, 9, 14
+9379: 11, 9, 15
+9380: 11, 9, 16
+9381: 11, 9, 17
+9382: 11, 9, 18
+9383: 11, 9, 19
+9384: 11, 9, 20
+9385: 11, 9, 21
+9386: 11, 9, 22
+9387: 11, 9, 23
+9388: 11, 9, 24
+9389: 11, 9, 25
+9390: 11, 9, 26
+9391: 11, 9, 27
+9392: 11, 9, 28
+9393: 11, 10, 0
+9394: 11, 10, 1
+9395: 11, 10, 2
+9396: 11, 10, 3
+9397: 11, 10, 4
+9398: 11, 10, 5
+9399: 11, 10, 6
+9400: 11, 10, 7
+9401: 11, 10, 8
+9402: 11, 10, 9
+9403: 11, 10, 10
+9404: 11, 10, 11
+9405: 11, 10, 12
+9406: 11, 10, 13
+9407: 11, 10, 14
+9408: 11, 10, 15
+9409: 11, 10, 16
+9410: 11, 10, 17
+9411: 11, 10, 18
+9412: 11, 10, 19
+9413: 11, 10, 20
+9414: 11, 10, 21
+9415: 11, 10, 22
+9416: 11, 10, 23
+9417: 11, 10, 24
+9418: 11, 10, 25
+9419: 11, 10, 26
+9420: 11, 10, 27
+9421: 11, 10, 28
+9422: 11, 10, 29
+9423: 11, 11, 0
+9424: 11, 11, 1
+9425: 11, 11, 2
+9426: 11, 11, 3
+9427: 11, 11, 4
+9428: 11, 11, 5
+9429: 11, 11, 6
+9430: 11, 11, 7
+9431: 11, 11, 8
+9432: 11, 11, 9
+9433: 11, 11, 10
+9434: 11, 11, 11
+9435: 11, 11, 12
+9436: 11, 11, 13
+9437: 11, 11, 14
+9438: 11, 11, 15
+9439: 11, 11, 16
+9440: 11, 11, 17
+9441: 11, 11, 18
+9442: 11, 11, 19
+9443: 11, 11, 20
+9444: 11, 11, 21
+9445: 11, 11, 22
+9446: 11, 11, 23
+9447: 11, 11, 24
+9448: 11, 11, 25
+9449: 11, 11, 26
+9450: 11, 11, 27
+9451: 11, 11, 28
+9452: 11, 11, 29
+9453: 11, 11, 30
+9454: 11, 11, 31
+9455: 11, 11, 32
+9456: 11, 11, 33
+9457: 11, 11, 34
+9458: 11, 11, 35
+9459: 11, 11, 36
+9460: 11, 11, 37
+9461: 11, 11, 38
+9462: 11, 11, 39
+9463: 11, 11, 40
+9464: 11, 11, 41
+9465: 11, 11, 42
+9466: 11, 11, 43
+9467: 11, 12, 0
+9468: 11, 12, 1
+9469: 11, 12, 2
+9470: 11, 12, 3
+9471: 11, 12, 4
+9472: 11, 12, 5
+9473: 11, 12, 6
+9474: 11, 12, 7
+9475: 11, 12, 8
+9476: 11, 12, 9
+9477: 11, 12, 10
+9478: 11, 12, 11
+9479: 11, 12, 12
+9480: 11, 12, 13
+9481: 11, 12, 14
+9482: 11, 12, 15
+9483: 11, 12, 16
+9484: 11, 12, 17
+9485: 11, 12, 18
+9486: 11, 12, 19
+9487: 11, 12, 20
+9488: 11, 12, 21
+9489: 11, 12, 22
+9490: 11, 12, 23
+9491: 11, 12, 24
+9492: 11, 12, 25
+9493: 11, 12, 26
+9494: 11, 12, 27
+9495: 11, 12, 28
+9496: 11, 12, 29
+9497: 11, 12, 30
+9498: 11, 12, 31
+9499: 11, 12, 32
+9500: 11, 12, 33
+9501: 11, 13, 0
+9502: 11, 13, 1
+9503: 11, 13, 2
+9504: 11, 13, 3
+9505: 11, 13, 4
+9506: 11, 13, 5
+9507: 11, 13, 6
+9508: 11, 13, 7
+9509: 11, 13, 8
+9510: 11, 13, 9
+9511: 11, 13, 10
+9512: 11, 13, 11
+9513: 11, 13, 12
+9514: 11, 13, 13
+9515: 11, 13, 14
+9516: 11, 13, 15
+9517: 11, 13, 16
+9518: 11, 13, 17
+9519: 11, 13, 18
+9520: 11, 13, 19
+9521: 11, 13, 20
+9522: 11, 13, 21
+9523: 11, 13, 22
+9524: 11, 13, 23
+9525: 11, 13, 24
+9526: 11, 13, 25
+9527: 11, 13, 26
+9528: 11, 13, 27
+9529: 11, 13, 28
+9530: 11, 13, 29
+9531: 11, 13, 30
+9532: 11, 13, 31
+9533: 11, 13, 32
+9534: 11, 13, 33
+9535: 11, 13, 34
+9536: 11, 14, 0
+9537: 11, 14, 1
+9538: 11, 14, 2
+9539: 11, 14, 3
+9540: 11, 14, 4
+9541: 11, 14, 5
+9542: 11, 14, 6
+9543: 11, 14, 7
+9544: 11, 14, 8
+9545: 11, 14, 9
+9546: 11, 14, 10
+9547: 11, 14, 11
+9548: 11, 14, 12
+9549: 11, 14, 13
+9550: 11, 14, 14
+9551: 11, 14, 15
+9552: 11, 14, 16
+9553: 11, 14, 17
+9554: 11, 14, 18
+9555: 11, 14, 19
+9556: 11, 14, 20
+9557: 11, 14, 21
+9558: 11, 14, 22
+9559: 11, 14, 23
+9560: 11, 14, 24
+9561: 11, 14, 25
+9562: 11, 14, 26
+9563: 11, 14, 27
+9564: 11, 14, 28
+9565: 11, 14, 29
+9566: 11, 14, 30
+9567: 11, 14, 31
+9568: 11, 15, 0
+9569: 11, 15, 1
+9570: 11, 15, 2
+9571: 11, 15, 3
+9572: 11, 15, 4
+9573: 11, 15, 5
+9574: 11, 15, 6
+9575: 11, 15, 7
+9576: 11, 15, 8
+9577: 11, 15, 9
+9578: 11, 15, 10
+9579: 11, 15, 11
+9580: 11, 15, 12
+9581: 11, 15, 13
+9582: 11, 15, 14
+9583: 11, 15, 15
+9584: 11, 15, 16
+9585: 11, 15, 17
+9586: 11, 15, 18
+9587: 11, 15, 19
+9588: 11, 15, 20
+9589: 11, 15, 21
+9590: 11, 15, 22
+9591: 11, 15, 23
+9592: 11, 15, 24
+9593: 11, 15, 25
+9594: 11, 15, 26
+9595: 11, 15, 27
+9596: 11, 15, 28
+9597: 11, 15, 29
+9598: 11, 15, 30
+9599: 11, 15, 31
+9600: 11, 15, 32
+9601: 11, 15, 33
+9602: 11, 15, 34
+9603: 11, 16, 0
+9604: 11, 16, 1
+9605: 11, 16, 2
+9606: 11, 16, 3
+9607: 11, 16, 4
+9608: 11, 16, 5
+9609: 11, 16, 6
+9610: 11, 16, 7
+9611: 11, 16, 8
+9612: 11, 16, 9
+9613: 11, 16, 10
+9614: 11, 16, 11
+9615: 11, 16, 12
+9616: 11, 16, 13
+9617: 11, 16, 14
+9618: 11, 16, 15
+9619: 11, 16, 16
+9620: 11, 16, 17
+9621: 11, 16, 18
+9622: 11, 16, 19
+9623: 11, 16, 20
+9624: 11, 16, 21
+9625: 11, 16, 22
+9626: 11, 16, 23
+9627: 11, 16, 24
+9628: 11, 16, 25
+9629: 11, 16, 26
+9630: 11, 16, 27
+9631: 11, 16, 28
+9632: 11, 16, 29
+9633: 11, 16, 30
+9634: 11, 16, 31
+9635: 11, 16, 32
+9636: 11, 16, 33
+9637: 11, 16, 34
+9638: 11, 17, 0
+9639: 11, 17, 1
+9640: 11, 17, 2
+9641: 11, 17, 3
+9642: 11, 17, 4
+9643: 11, 17, 5
+9644: 11, 17, 6
+9645: 11, 17, 7
+9646: 11, 17, 8
+9647: 11, 17, 9
+9648: 11, 17, 10
+9649: 11, 17, 11
+9650: 11, 17, 12
+9651: 11, 17, 13
+9652: 11, 17, 14
+9653: 11, 17, 15
+9654: 11, 17, 16
+9655: 11, 17, 17
+9656: 11, 17, 18
+9657: 11, 17, 19
+9658: 11, 17, 20
+9659: 11, 17, 21
+9660: 11, 17, 22
+9661: 11, 17, 23
+9662: 11, 17, 24
+9663: 11, 18, 0
+9664: 11, 18, 1
+9665: 11, 18, 2
+9666: 11, 18, 3
+9667: 11, 18, 4
+9668: 11, 18, 5
+9669: 11, 18, 6
+9670: 11, 18, 7
+9671: 11, 18, 8
+9672: 11, 18, 9
+9673: 11, 18, 10
+9674: 11, 18, 11
+9675: 11, 18, 12
+9676: 11, 18, 13
+9677: 11, 18, 14
+9678: 11, 18, 15
+9679: 11, 18, 16
+9680: 11, 18, 17
+9681: 11, 18, 18
+9682: 11, 18, 19
+9683: 11, 18, 20
+9684: 11, 18, 21
+9685: 11, 18, 22
+9686: 11, 18, 23
+9687: 11, 18, 24
+9688: 11, 18, 25
+9689: 11, 18, 26
+9690: 11, 18, 27
+9691: 11, 18, 28
+9692: 11, 18, 29
+9693: 11, 18, 30
+9694: 11, 18, 31
+9695: 11, 18, 32
+9696: 11, 18, 33
+9697: 11, 18, 34
+9698: 11, 18, 35
+9699: 11, 18, 36
+9700: 11, 18, 37
+9701: 11, 18, 38
+9702: 11, 18, 39
+9703: 11, 18, 40
+9704: 11, 18, 41
+9705: 11, 18, 42
+9706: 11, 18, 43
+9707: 11, 18, 44
+9708: 11, 18, 45
+9709: 11, 18, 46
+9710: 11, 19, 0
+9711: 11, 19, 1
+9712: 11, 19, 2
+9713: 11, 19, 3
+9714: 11, 19, 4
+9715: 11, 19, 5
+9716: 11, 19, 6
+9717: 11, 19, 7
+9718: 11, 19, 8
+9719: 11, 19, 9
+9720: 11, 19, 10
+9721: 11, 19, 11
+9722: 11, 19, 12
+9723: 11, 19, 13
+9724: 11, 19, 14
+9725: 11, 19, 15
+9726: 11, 19, 16
+9727: 11, 19, 17
+9728: 11, 19, 18
+9729: 11, 19, 19
+9730: 11, 19, 20
+9731: 11, 19, 21
+9732: 11, 20, 0
+9733: 11, 20, 1
+9734: 11, 20, 2
+9735: 11, 20, 3
+9736: 11, 20, 4
+9737: 11, 20, 5
+9738: 11, 20, 6
+9739: 11, 20, 7
+9740: 11, 20, 8
+9741: 11, 20, 9
+9742: 11, 20, 10
+9743: 11, 20, 11
+9744: 11, 20, 12
+9745: 11, 20, 13
+9746: 11, 20, 14
+9747: 11, 20, 15
+9748: 11, 20, 16
+9749: 11, 20, 17
+9750: 11, 20, 18
+9751: 11, 20, 19
+9752: 11, 20, 20
+9753: 11, 20, 21
+9754: 11, 20, 22
+9755: 11, 20, 23
+9756: 11, 20, 24
+9757: 11, 20, 25
+9758: 11, 20, 26
+9759: 11, 20, 27
+9760: 11, 20, 28
+9761: 11, 20, 29
+9762: 11, 20, 30
+9763: 11, 20, 31
+9764: 11, 20, 32
+9765: 11, 20, 33
+9766: 11, 20, 34
+9767: 11, 20, 35
+9768: 11, 20, 36
+9769: 11, 20, 37
+9770: 11, 20, 38
+9771: 11, 20, 39
+9772: 11, 20, 40
+9773: 11, 20, 41
+9774: 11, 20, 42
+9775: 11, 20, 43
+9776: 11, 21, 0
+9777: 11, 21, 1
+9778: 11, 21, 2
+9779: 11, 21, 3
+9780: 11, 21, 4
+9781: 11, 21, 5
+9782: 11, 21, 6
+9783: 11, 21, 7
+9784: 11, 21, 8
+9785: 11, 21, 9
+9786: 11, 21, 10
+9787: 11, 21, 11
+9788: 11, 21, 12
+9789: 11, 21, 13
+9790: 11, 21, 14
+9791: 11, 21, 15
+9792: 11, 21, 16
+9793: 11, 21, 17
+9794: 11, 21, 18
+9795: 11, 21, 19
+9796: 11, 21, 20
+9797: 11, 21, 21
+9798: 11, 21, 22
+9799: 11, 21, 23
+9800: 11, 21, 24
+9801: 11, 21, 25
+9802: 11, 21, 26
+9803: 11, 21, 27
+9804: 11, 21, 28
+9805: 11, 21, 29
+9806: 11, 22, 0
+9807: 11, 22, 1
+9808: 11, 22, 2
+9809: 11, 22, 3
+9810: 11, 22, 4
+9811: 11, 22, 5
+9812: 11, 22, 6
+9813: 11, 22, 7
+9814: 11, 22, 8
+9815: 11, 22, 9
+9816: 11, 22, 10
+9817: 11, 22, 11
+9818: 11, 22, 12
+9819: 11, 22, 13
+9820: 11, 22, 14
+9821: 11, 22, 15
+9822: 11, 22, 16
+9823: 11, 22, 17
+9824: 11, 22, 18
+9825: 11, 22, 19
+9826: 11, 22, 20
+9827: 11, 22, 21
+9828: 11, 22, 22
+9829: 11, 22, 23
+9830: 11, 22, 24
+9831: 11, 22, 25
+9832: 11, 22, 26
+9833: 11, 22, 27
+9834: 11, 22, 28
+9835: 11, 22, 29
+9836: 11, 22, 30
+9837: 11, 22, 31
+9838: 11, 22, 32
+9839: 11, 22, 33
+9840: 11, 22, 34
+9841: 11, 22, 35
+9842: 11, 22, 36
+9843: 11, 22, 37
+9844: 11, 22, 38
+9845: 11, 22, 39
+9846: 11, 22, 40
+9847: 11, 22, 41
+9848: 11, 22, 42
+9849: 11, 22, 43
+9850: 11, 22, 44
+9851: 11, 22, 45
+9852: 11, 22, 46
+9853: 11, 22, 47
+9854: 11, 22, 48
+9855: 11, 22, 49
+9856: 11, 22, 50
+9857: 11, 22, 51
+9858: 11, 22, 52
+9859: 11, 22, 53
+9860: 12, 0, 0
+9861: 12, 1, 0
+9862: 12, 1, 1
+9863: 12, 1, 2
+9864: 12, 1, 3
+9865: 12, 1, 4
+9866: 12, 1, 5
+9867: 12, 1, 6
+9868: 12, 1, 7
+9869: 12, 1, 8
+9870: 12, 1, 9
+9871: 12, 1, 10
+9872: 12, 1, 11
+9873: 12, 1, 12
+9874: 12, 1, 13
+9875: 12, 1, 14
+9876: 12, 1, 15
+9877: 12, 1, 16
+9878: 12, 1, 17
+9879: 12, 1, 18
+9880: 12, 2, 0
+9881: 12, 2, 1
+9882: 12, 2, 2
+9883: 12, 2, 3
+9884: 12, 2, 4
+9885: 12, 2, 5
+9886: 12, 2, 6
+9887: 12, 2, 7
+9888: 12, 2, 8
+9889: 12, 2, 9
+9890: 12, 2, 10
+9891: 12, 2, 11
+9892: 12, 2, 12
+9893: 12, 2, 13
+9894: 12, 2, 14
+9895: 12, 2, 15
+9896: 12, 2, 16
+9897: 12, 2, 17
+9898: 12, 2, 18
+9899: 12, 2, 19
+9900: 12, 2, 20
+9901: 12, 2, 21
+9902: 12, 2, 22
+9903: 12, 2, 23
+9904: 12, 2, 24
+9905: 12, 2, 25
+9906: 12, 3, 0
+9907: 12, 3, 1
+9908: 12, 3, 2
+9909: 12, 3, 3
+9910: 12, 3, 4
+9911: 12, 3, 5
+9912: 12, 3, 6
+9913: 12, 3, 7
+9914: 12, 3, 8
+9915: 12, 3, 9
+9916: 12, 3, 10
+9917: 12, 3, 11
+9918: 12, 3, 12
+9919: 12, 3, 13
+9920: 12, 3, 14
+9921: 12, 3, 15
+9922: 12, 3, 16
+9923: 12, 3, 17
+9924: 12, 3, 18
+9925: 12, 3, 19
+9926: 12, 3, 20
+9927: 12, 3, 21
+9928: 12, 3, 22
+9929: 12, 3, 23
+9930: 12, 3, 24
+9931: 12, 3, 25
+9932: 12, 3, 26
+9933: 12, 3, 27
+9934: 12, 4, 0
+9935: 12, 4, 1
+9936: 12, 4, 2
+9937: 12, 4, 3
+9938: 12, 4, 4
+9939: 12, 4, 5
+9940: 12, 4, 6
+9941: 12, 4, 7
+9942: 12, 4, 8
+9943: 12, 4, 9
+9944: 12, 4, 10
+9945: 12, 4, 11
+9946: 12, 4, 12
+9947: 12, 4, 13
+9948: 12, 4, 14
+9949: 12, 4, 15
+9950: 12, 4, 16
+9951: 12, 4, 17
+9952: 12, 4, 18
+9953: 12, 4, 19
+9954: 12, 4, 20
+9955: 12, 4, 21
+9956: 12, 4, 22
+9957: 12, 4, 23
+9958: 12, 4, 24
+9959: 12, 4, 25
+9960: 12, 4, 26
+9961: 12, 4, 27
+9962: 12, 4, 28
+9963: 12, 4, 29
+9964: 12, 4, 30
+9965: 12, 4, 31
+9966: 12, 4, 32
+9967: 12, 4, 33
+9968: 12, 4, 34
+9969: 12, 4, 35
+9970: 12, 4, 36
+9971: 12, 4, 37
+9972: 12, 4, 38
+9973: 12, 4, 39
+9974: 12, 4, 40
+9975: 12, 4, 41
+9976: 12, 4, 42
+9977: 12, 4, 43
+9978: 12, 4, 44
+9979: 12, 5, 0
+9980: 12, 5, 1
+9981: 12, 5, 2
+9982: 12, 5, 3
+9983: 12, 5, 4
+9984: 12, 5, 5
+9985: 12, 5, 6
+9986: 12, 5, 7
+9987: 12, 5, 8
+9988: 12, 5, 9
+9989: 12, 5, 10
+9990: 12, 5, 11
+9991: 12, 5, 12
+9992: 12, 5, 13
+9993: 12, 5, 14
+9994: 12, 5, 15
+9995: 12, 5, 16
+9996: 12, 5, 17
+9997: 12, 5, 18
+9998: 12, 5, 19
+9999: 12, 5, 20
+10000: 12, 5, 21
+10001: 12, 5, 22
+10002: 12, 5, 23
+10003: 12, 5, 24
+10004: 12, 5, 25
+10005: 12, 5, 26
+10006: 12, 5, 27
+10007: 12, 6, 0
+10008: 12, 6, 1
+10009: 12, 6, 2
+10010: 12, 6, 3
+10011: 12, 6, 4
+10012: 12, 6, 5
+10013: 12, 6, 6
+10014: 12, 6, 7
+10015: 12, 6, 8
+10016: 12, 6, 9
+10017: 12, 6, 10
+10018: 12, 6, 11
+10019: 12, 6, 12
+10020: 12, 6, 13
+10021: 12, 6, 14
+10022: 12, 6, 15
+10023: 12, 6, 16
+10024: 12, 6, 17
+10025: 12, 6, 18
+10026: 12, 6, 19
+10027: 12, 6, 20
+10028: 12, 6, 21
+10029: 12, 6, 22
+10030: 12, 6, 23
+10031: 12, 6, 24
+10032: 12, 6, 25
+10033: 12, 6, 26
+10034: 12, 6, 27
+10035: 12, 6, 28
+10036: 12, 6, 29
+10037: 12, 6, 30
+10038: 12, 6, 31
+10039: 12, 6, 32
+10040: 12, 6, 33
+10041: 12, 7, 0
+10042: 12, 7, 1
+10043: 12, 7, 2
+10044: 12, 7, 3
+10045: 12, 7, 4
+10046: 12, 7, 5
+10047: 12, 7, 6
+10048: 12, 7, 7
+10049: 12, 7, 8
+10050: 12, 7, 9
+10051: 12, 7, 10
+10052: 12, 7, 11
+10053: 12, 7, 12
+10054: 12, 7, 13
+10055: 12, 7, 14
+10056: 12, 7, 15
+10057: 12, 7, 16
+10058: 12, 7, 17
+10059: 12, 7, 18
+10060: 12, 7, 19
+10061: 12, 7, 20
+10062: 12, 8, 0
+10063: 12, 8, 1
+10064: 12, 8, 2
+10065: 12, 8, 3
+10066: 12, 8, 4
+10067: 12, 8, 5
+10068: 12, 8, 6
+10069: 12, 8, 7
+10070: 12, 8, 8
+10071: 12, 8, 9
+10072: 12, 8, 10
+10073: 12, 8, 11
+10074: 12, 8, 12
+10075: 12, 8, 13
+10076: 12, 8, 14
+10077: 12, 8, 15
+10078: 12, 8, 16
+10079: 12, 8, 17
+10080: 12, 8, 18
+10081: 12, 8, 19
+10082: 12, 8, 20
+10083: 12, 8, 21
+10084: 12, 8, 22
+10085: 12, 8, 23
+10086: 12, 8, 24
+10087: 12, 8, 25
+10088: 12, 8, 26
+10089: 12, 8, 27
+10090: 12, 8, 28
+10091: 12, 8, 29
+10092: 12, 9, 0
+10093: 12, 9, 1
+10094: 12, 9, 2
+10095: 12, 9, 3
+10096: 12, 9, 4
+10097: 12, 9, 5
+10098: 12, 9, 6
+10099: 12, 9, 7
+10100: 12, 9, 8
+10101: 12, 9, 9
+10102: 12, 9, 10
+10103: 12, 9, 11
+10104: 12, 9, 12
+10105: 12, 9, 13
+10106: 12, 9, 14
+10107: 12, 9, 15
+10108: 12, 9, 16
+10109: 12, 9, 17
+10110: 12, 9, 18
+10111: 12, 9, 19
+10112: 12, 9, 20
+10113: 12, 9, 21
+10114: 12, 9, 22
+10115: 12, 9, 23
+10116: 12, 9, 24
+10117: 12, 9, 25
+10118: 12, 9, 26
+10119: 12, 9, 27
+10120: 12, 9, 28
+10121: 12, 9, 29
+10122: 12, 9, 30
+10123: 12, 9, 31
+10124: 12, 9, 32
+10125: 12, 9, 33
+10126: 12, 9, 34
+10127: 12, 9, 35
+10128: 12, 9, 36
+10129: 12, 9, 37
+10130: 12, 10, 0
+10131: 12, 10, 1
+10132: 12, 10, 2
+10133: 12, 10, 3
+10134: 12, 10, 4
+10135: 12, 10, 5
+10136: 12, 10, 6
+10137: 12, 10, 7
+10138: 12, 10, 8
+10139: 12, 10, 9
+10140: 12, 10, 10
+10141: 12, 10, 11
+10142: 12, 10, 12
+10143: 12, 10, 13
+10144: 12, 10, 14
+10145: 12, 10, 15
+10146: 12, 10, 16
+10147: 12, 10, 17
+10148: 12, 10, 18
+10149: 12, 10, 19
+10150: 12, 10, 20
+10151: 12, 10, 21
+10152: 12, 10, 22
+10153: 12, 10, 23
+10154: 12, 10, 24
+10155: 12, 10, 25
+10156: 12, 10, 26
+10157: 12, 10, 27
+10158: 12, 10, 28
+10159: 12, 10, 29
+10160: 12, 10, 30
+10161: 12, 10, 31
+10162: 12, 10, 32
+10163: 12, 10, 33
+10164: 12, 10, 34
+10165: 12, 10, 35
+10166: 12, 10, 36
+10167: 12, 11, 0
+10168: 12, 11, 1
+10169: 12, 11, 2
+10170: 12, 11, 3
+10171: 12, 11, 4
+10172: 12, 11, 5
+10173: 12, 11, 6
+10174: 12, 11, 7
+10175: 12, 11, 8
+10176: 12, 11, 9
+10177: 12, 11, 10
+10178: 12, 11, 11
+10179: 12, 11, 12
+10180: 12, 11, 13
+10181: 12, 11, 14
+10182: 12, 11, 15
+10183: 12, 11, 16
+10184: 12, 11, 17
+10185: 12, 11, 18
+10186: 12, 11, 19
+10187: 12, 11, 20
+10188: 12, 11, 21
+10189: 12, 12, 0
+10190: 12, 12, 1
+10191: 12, 12, 2
+10192: 12, 12, 3
+10193: 12, 12, 4
+10194: 12, 12, 5
+10195: 12, 12, 6
+10196: 12, 12, 7
+10197: 12, 12, 8
+10198: 12, 12, 9
+10199: 12, 12, 10
+10200: 12, 12, 11
+10201: 12, 12, 12
+10202: 12, 12, 13
+10203: 12, 12, 14
+10204: 12, 12, 15
+10205: 12, 12, 16
+10206: 12, 12, 17
+10207: 12, 12, 18
+10208: 12, 12, 19
+10209: 12, 12, 20
+10210: 12, 12, 21
+10211: 12, 13, 0
+10212: 12, 13, 1
+10213: 12, 13, 2
+10214: 12, 13, 3
+10215: 12, 13, 4
+10216: 12, 13, 5
+10217: 12, 13, 6
+10218: 12, 13, 7
+10219: 12, 13, 8
+10220: 12, 13, 9
+10221: 12, 13, 10
+10222: 12, 13, 11
+10223: 12, 13, 12
+10224: 12, 13, 13
+10225: 12, 13, 14
+10226: 12, 13, 15
+10227: 12, 13, 16
+10228: 12, 13, 17
+10229: 12, 13, 18
+10230: 12, 13, 19
+10231: 12, 13, 20
+10232: 12, 13, 21
+10233: 12, 13, 22
+10234: 12, 13, 23
+10235: 12, 13, 24
+10236: 12, 13, 25
+10237: 12, 14, 0
+10238: 12, 14, 1
+10239: 12, 14, 2
+10240: 12, 14, 3
+10241: 12, 14, 4
+10242: 12, 14, 5
+10243: 12, 14, 6
+10244: 12, 14, 7
+10245: 12, 14, 8
+10246: 12, 14, 9
+10247: 12, 14, 10
+10248: 12, 14, 11
+10249: 12, 14, 12
+10250: 12, 14, 13
+10251: 12, 14, 14
+10252: 12, 14, 15
+10253: 12, 14, 16
+10254: 12, 14, 17
+10255: 12, 14, 18
+10256: 12, 14, 19
+10257: 12, 14, 20
+10258: 12, 14, 21
+10259: 12, 14, 22
+10260: 12, 14, 23
+10261: 12, 14, 24
+10262: 12, 14, 25
+10263: 12, 14, 26
+10264: 12, 14, 27
+10265: 12, 14, 28
+10266: 12, 14, 29
+10267: 12, 15, 0
+10268: 12, 15, 1
+10269: 12, 15, 2
+10270: 12, 15, 3
+10271: 12, 15, 4
+10272: 12, 15, 5
+10273: 12, 15, 6
+10274: 12, 15, 7
+10275: 12, 15, 8
+10276: 12, 15, 9
+10277: 12, 15, 10
+10278: 12, 15, 11
+10279: 12, 15, 12
+10280: 12, 15, 13
+10281: 12, 15, 14
+10282: 12, 15, 15
+10283: 12, 15, 16
+10284: 12, 15, 17
+10285: 12, 15, 18
+10286: 12, 15, 19
+10287: 12, 15, 20
+10288: 12, 15, 21
+10289: 12, 15, 22
+10290: 12, 15, 23
+10291: 12, 15, 24
+10292: 12, 15, 25
+10293: 12, 15, 26
+10294: 12, 15, 27
+10295: 12, 15, 28
+10296: 12, 15, 29
+10297: 12, 15, 30
+10298: 12, 15, 31
+10299: 12, 15, 32
+10300: 12, 15, 33
+10301: 12, 15, 34
+10302: 12, 15, 35
+10303: 12, 15, 36
+10304: 12, 15, 37
+10305: 12, 15, 38
+10306: 12, 16, 0
+10307: 12, 16, 1
+10308: 12, 16, 2
+10309: 12, 16, 3
+10310: 12, 16, 4
+10311: 12, 16, 5
+10312: 12, 16, 6
+10313: 12, 16, 7
+10314: 12, 16, 8
+10315: 12, 16, 9
+10316: 12, 16, 10
+10317: 12, 16, 11
+10318: 12, 16, 12
+10319: 12, 16, 13
+10320: 12, 16, 14
+10321: 12, 16, 15
+10322: 12, 16, 16
+10323: 12, 16, 17
+10324: 12, 16, 18
+10325: 12, 16, 19
+10326: 12, 16, 20
+10327: 12, 17, 0
+10328: 12, 17, 1
+10329: 12, 17, 2
+10330: 12, 17, 3
+10331: 12, 17, 4
+10332: 12, 17, 5
+10333: 12, 17, 6
+10334: 12, 17, 7
+10335: 12, 17, 8
+10336: 12, 17, 9
+10337: 12, 17, 10
+10338: 12, 17, 11
+10339: 12, 17, 12
+10340: 12, 17, 13
+10341: 12, 17, 14
+10342: 12, 17, 15
+10343: 12, 17, 16
+10344: 12, 17, 17
+10345: 12, 17, 18
+10346: 12, 17, 19
+10347: 12, 17, 20
+10348: 12, 17, 21
+10349: 12, 17, 22
+10350: 12, 17, 23
+10351: 12, 17, 24
+10352: 12, 17, 25
+10353: 12, 17, 26
+10354: 12, 17, 27
+10355: 12, 17, 28
+10356: 12, 17, 29
+10357: 12, 17, 30
+10358: 12, 17, 31
+10359: 12, 17, 32
+10360: 12, 17, 33
+10361: 12, 17, 34
+10362: 12, 17, 35
+10363: 12, 17, 36
+10364: 12, 17, 37
+10365: 12, 17, 38
+10366: 12, 17, 39
+10367: 12, 17, 40
+10368: 12, 17, 41
+10369: 12, 18, 0
+10370: 12, 18, 1
+10371: 12, 18, 2
+10372: 12, 18, 3
+10373: 12, 18, 4
+10374: 12, 18, 5
+10375: 12, 18, 6
+10376: 12, 18, 7
+10377: 12, 18, 8
+10378: 12, 18, 9
+10379: 12, 18, 10
+10380: 12, 18, 11
+10381: 12, 18, 12
+10382: 12, 18, 13
+10383: 12, 18, 14
+10384: 12, 18, 15
+10385: 12, 18, 16
+10386: 12, 18, 17
+10387: 12, 18, 18
+10388: 12, 18, 19
+10389: 12, 18, 20
+10390: 12, 18, 21
+10391: 12, 18, 22
+10392: 12, 18, 23
+10393: 12, 18, 24
+10394: 12, 18, 25
+10395: 12, 18, 26
+10396: 12, 18, 27
+10397: 12, 18, 28
+10398: 12, 18, 29
+10399: 12, 18, 30
+10400: 12, 18, 31
+10401: 12, 18, 32
+10402: 12, 18, 33
+10403: 12, 18, 34
+10404: 12, 18, 35
+10405: 12, 18, 36
+10406: 12, 18, 37
+10407: 12, 19, 0
+10408: 12, 19, 1
+10409: 12, 19, 2
+10410: 12, 19, 3
+10411: 12, 19, 4
+10412: 12, 19, 5
+10413: 12, 19, 6
+10414: 12, 19, 7
+10415: 12, 19, 8
+10416: 12, 19, 9
+10417: 12, 19, 10
+10418: 12, 19, 11
+10419: 12, 19, 12
+10420: 12, 19, 13
+10421: 12, 19, 14
+10422: 12, 19, 15
+10423: 12, 19, 16
+10424: 12, 19, 17
+10425: 12, 19, 18
+10426: 12, 19, 19
+10427: 12, 19, 20
+10428: 12, 19, 21
+10429: 12, 19, 22
+10430: 12, 19, 23
+10431: 12, 19, 24
+10432: 12, 19, 25
+10433: 12, 19, 26
+10434: 12, 19, 27
+10435: 12, 19, 28
+10436: 12, 19, 29
+10437: 12, 19, 30
+10438: 12, 19, 31
+10439: 12, 19, 32
+10440: 12, 19, 33
+10441: 12, 19, 34
+10442: 12, 19, 35
+10443: 12, 19, 36
+10444: 12, 19, 37
+10445: 12, 20, 0
+10446: 12, 20, 1
+10447: 12, 20, 2
+10448: 12, 20, 3
+10449: 12, 20, 4
+10450: 12, 20, 5
+10451: 12, 20, 6
+10452: 12, 20, 7
+10453: 12, 20, 8
+10454: 12, 20, 9
+10455: 12, 20, 10
+10456: 12, 20, 11
+10457: 12, 20, 12
+10458: 12, 20, 13
+10459: 12, 20, 14
+10460: 12, 20, 15
+10461: 12, 20, 16
+10462: 12, 20, 17
+10463: 12, 20, 18
+10464: 12, 20, 19
+10465: 12, 20, 20
+10466: 12, 20, 21
+10467: 12, 21, 0
+10468: 12, 21, 1
+10469: 12, 21, 2
+10470: 12, 21, 3
+10471: 12, 21, 4
+10472: 12, 21, 5
+10473: 12, 21, 6
+10474: 12, 21, 7
+10475: 12, 21, 8
+10476: 12, 21, 9
+10477: 12, 21, 10
+10478: 12, 21, 11
+10479: 12, 21, 12
+10480: 12, 21, 13
+10481: 12, 21, 14
+10482: 12, 21, 15
+10483: 12, 21, 16
+10484: 12, 21, 17
+10485: 12, 21, 18
+10486: 12, 21, 19
+10487: 12, 21, 20
+10488: 12, 21, 21
+10489: 12, 21, 22
+10490: 12, 21, 23
+10491: 12, 21, 24
+10492: 12, 21, 25
+10493: 12, 21, 26
+10494: 12, 22, 0
+10495: 12, 22, 1
+10496: 12, 22, 2
+10497: 12, 22, 3
+10498: 12, 22, 4
+10499: 12, 22, 5
+10500: 12, 22, 6
+10501: 12, 22, 7
+10502: 12, 22, 8
+10503: 12, 22, 9
+10504: 12, 22, 10
+10505: 12, 22, 11
+10506: 12, 22, 12
+10507: 12, 22, 13
+10508: 12, 22, 14
+10509: 12, 22, 15
+10510: 12, 22, 16
+10511: 12, 22, 17
+10512: 12, 22, 18
+10513: 12, 22, 19
+10514: 12, 22, 20
+10515: 12, 23, 0
+10516: 12, 23, 1
+10517: 12, 23, 2
+10518: 12, 23, 3
+10519: 12, 23, 4
+10520: 12, 23, 5
+10521: 12, 23, 6
+10522: 12, 23, 7
+10523: 12, 23, 8
+10524: 12, 23, 9
+10525: 12, 23, 10
+10526: 12, 23, 11
+10527: 12, 23, 12
+10528: 12, 23, 13
+10529: 12, 23, 14
+10530: 12, 23, 15
+10531: 12, 23, 16
+10532: 12, 23, 17
+10533: 12, 23, 18
+10534: 12, 23, 19
+10535: 12, 23, 20
+10536: 12, 23, 21
+10537: 12, 23, 22
+10538: 12, 23, 23
+10539: 12, 23, 24
+10540: 12, 23, 25
+10541: 12, 23, 26
+10542: 12, 23, 27
+10543: 12, 23, 28
+10544: 12, 23, 29
+10545: 12, 23, 30
+10546: 12, 23, 31
+10547: 12, 23, 32
+10548: 12, 23, 33
+10549: 12, 23, 34
+10550: 12, 23, 35
+10551: 12, 23, 36
+10552: 12, 23, 37
+10553: 12, 24, 0
+10554: 12, 24, 1
+10555: 12, 24, 2
+10556: 12, 24, 3
+10557: 12, 24, 4
+10558: 12, 24, 5
+10559: 12, 24, 6
+10560: 12, 24, 7
+10561: 12, 24, 8
+10562: 12, 24, 9
+10563: 12, 24, 10
+10564: 12, 24, 11
+10565: 12, 24, 12
+10566: 12, 24, 13
+10567: 12, 24, 14
+10568: 12, 24, 15
+10569: 12, 24, 16
+10570: 12, 24, 17
+10571: 12, 24, 18
+10572: 12, 24, 19
+10573: 12, 24, 20
+10574: 12, 25, 0
+10575: 12, 25, 1
+10576: 12, 25, 2
+10577: 12, 25, 3
+10578: 12, 25, 4
+10579: 12, 25, 5
+10580: 12, 25, 6
+10581: 12, 25, 7
+10582: 12, 25, 8
+10583: 12, 25, 9
+10584: 12, 25, 10
+10585: 12, 25, 11
+10586: 12, 25, 12
+10587: 12, 25, 13
+10588: 12, 25, 14
+10589: 12, 25, 15
+10590: 12, 25, 16
+10591: 12, 25, 17
+10592: 12, 25, 18
+10593: 12, 25, 19
+10594: 12, 25, 20
+10595: 12, 25, 21
+10596: 12, 25, 22
+10597: 12, 25, 23
+10598: 12, 25, 24
+10599: 12, 25, 25
+10600: 12, 25, 26
+10601: 12, 25, 27
+10602: 12, 25, 28
+10603: 12, 25, 29
+10604: 12, 25, 30
+10605: 13, 0, 0
+10606: 13, 1, 0
+10607: 13, 1, 1
+10608: 13, 1, 2
+10609: 13, 1, 3
+10610: 13, 1, 4
+10611: 13, 1, 5
+10612: 13, 1, 6
+10613: 13, 1, 7
+10614: 13, 1, 8
+10615: 13, 1, 9
+10616: 13, 1, 10
+10617: 13, 1, 11
+10618: 13, 1, 12
+10619: 13, 1, 13
+10620: 13, 1, 14
+10621: 13, 1, 15
+10622: 13, 1, 16
+10623: 13, 1, 17
+10624: 13, 1, 18
+10625: 13, 1, 19
+10626: 13, 1, 20
+10627: 13, 1, 21
+10628: 13, 1, 22
+10629: 13, 1, 23
+10630: 13, 1, 24
+10631: 13, 1, 25
+10632: 13, 1, 26
+10633: 13, 1, 27
+10634: 13, 1, 28
+10635: 13, 1, 29
+10636: 13, 1, 30
+10637: 13, 1, 31
+10638: 13, 1, 32
+10639: 13, 1, 33
+10640: 13, 1, 34
+10641: 13, 1, 35
+10642: 13, 1, 36
+10643: 13, 1, 37
+10644: 13, 1, 38
+10645: 13, 1, 39
+10646: 13, 1, 40
+10647: 13, 1, 41
+10648: 13, 1, 42
+10649: 13, 1, 43
+10650: 13, 1, 44
+10651: 13, 1, 45
+10652: 13, 1, 46
+10653: 13, 1, 47
+10654: 13, 1, 48
+10655: 13, 1, 49
+10656: 13, 1, 50
+10657: 13, 1, 51
+10658: 13, 1, 52
+10659: 13, 1, 53
+10660: 13, 1, 54
+10661: 13, 2, 0
+10662: 13, 2, 1
+10663: 13, 2, 2
+10664: 13, 2, 3
+10665: 13, 2, 4
+10666: 13, 2, 5
+10667: 13, 2, 6
+10668: 13, 2, 7
+10669: 13, 2, 8
+10670: 13, 2, 9
+10671: 13, 2, 10
+10672: 13, 2, 11
+10673: 13, 2, 12
+10674: 13, 2, 13
+10675: 13, 2, 14
+10676: 13, 2, 15
+10677: 13, 2, 16
+10678: 13, 2, 17
+10679: 13, 2, 18
+10680: 13, 2, 19
+10681: 13, 2, 20
+10682: 13, 2, 21
+10683: 13, 2, 22
+10684: 13, 2, 23
+10685: 13, 2, 24
+10686: 13, 2, 25
+10687: 13, 2, 26
+10688: 13, 2, 27
+10689: 13, 2, 28
+10690: 13, 2, 29
+10691: 13, 2, 30
+10692: 13, 2, 31
+10693: 13, 2, 32
+10694: 13, 2, 33
+10695: 13, 2, 34
+10696: 13, 2, 35
+10697: 13, 2, 36
+10698: 13, 2, 37
+10699: 13, 2, 38
+10700: 13, 2, 39
+10701: 13, 2, 40
+10702: 13, 2, 41
+10703: 13, 2, 42
+10704: 13, 2, 43
+10705: 13, 2, 44
+10706: 13, 2, 45
+10707: 13, 2, 46
+10708: 13, 2, 47
+10709: 13, 2, 48
+10710: 13, 2, 49
+10711: 13, 2, 50
+10712: 13, 2, 51
+10713: 13, 2, 52
+10714: 13, 2, 53
+10715: 13, 2, 54
+10716: 13, 2, 55
+10717: 13, 3, 0
+10718: 13, 3, 1
+10719: 13, 3, 2
+10720: 13, 3, 3
+10721: 13, 3, 4
+10722: 13, 3, 5
+10723: 13, 3, 6
+10724: 13, 3, 7
+10725: 13, 3, 8
+10726: 13, 3, 9
+10727: 13, 3, 10
+10728: 13, 3, 11
+10729: 13, 3, 12
+10730: 13, 3, 13
+10731: 13, 3, 14
+10732: 13, 3, 15
+10733: 13, 3, 16
+10734: 13, 3, 17
+10735: 13, 3, 18
+10736: 13, 3, 19
+10737: 13, 3, 20
+10738: 13, 3, 21
+10739: 13, 3, 22
+10740: 13, 3, 23
+10741: 13, 3, 24
+10742: 13, 4, 0
+10743: 13, 4, 1
+10744: 13, 4, 2
+10745: 13, 4, 3
+10746: 13, 4, 4
+10747: 13, 4, 5
+10748: 13, 4, 6
+10749: 13, 4, 7
+10750: 13, 4, 8
+10751: 13, 4, 9
+10752: 13, 4, 10
+10753: 13, 4, 11
+10754: 13, 4, 12
+10755: 13, 4, 13
+10756: 13, 4, 14
+10757: 13, 4, 15
+10758: 13, 4, 16
+10759: 13, 4, 17
+10760: 13, 4, 18
+10761: 13, 4, 19
+10762: 13, 4, 20
+10763: 13, 4, 21
+10764: 13, 4, 22
+10765: 13, 4, 23
+10766: 13, 4, 24
+10767: 13, 4, 25
+10768: 13, 4, 26
+10769: 13, 4, 27
+10770: 13, 4, 28
+10771: 13, 4, 29
+10772: 13, 4, 30
+10773: 13, 4, 31
+10774: 13, 4, 32
+10775: 13, 4, 33
+10776: 13, 4, 34
+10777: 13, 4, 35
+10778: 13, 4, 36
+10779: 13, 4, 37
+10780: 13, 4, 38
+10781: 13, 4, 39
+10782: 13, 4, 40
+10783: 13, 4, 41
+10784: 13, 4, 42
+10785: 13, 4, 43
+10786: 13, 5, 0
+10787: 13, 5, 1
+10788: 13, 5, 2
+10789: 13, 5, 3
+10790: 13, 5, 4
+10791: 13, 5, 5
+10792: 13, 5, 6
+10793: 13, 5, 7
+10794: 13, 5, 8
+10795: 13, 5, 9
+10796: 13, 5, 10
+10797: 13, 5, 11
+10798: 13, 5, 12
+10799: 13, 5, 13
+10800: 13, 5, 14
+10801: 13, 5, 15
+10802: 13, 5, 16
+10803: 13, 5, 17
+10804: 13, 5, 18
+10805: 13, 5, 19
+10806: 13, 5, 20
+10807: 13, 5, 21
+10808: 13, 5, 22
+10809: 13, 5, 23
+10810: 13, 5, 24
+10811: 13, 5, 25
+10812: 13, 5, 26
+10813: 13, 6, 0
+10814: 13, 6, 1
+10815: 13, 6, 2
+10816: 13, 6, 3
+10817: 13, 6, 4
+10818: 13, 6, 5
+10819: 13, 6, 6
+10820: 13, 6, 7
+10821: 13, 6, 8
+10822: 13, 6, 9
+10823: 13, 6, 10
+10824: 13, 6, 11
+10825: 13, 6, 12
+10826: 13, 6, 13
+10827: 13, 6, 14
+10828: 13, 6, 15
+10829: 13, 6, 16
+10830: 13, 6, 17
+10831: 13, 6, 18
+10832: 13, 6, 19
+10833: 13, 6, 20
+10834: 13, 6, 21
+10835: 13, 6, 22
+10836: 13, 6, 23
+10837: 13, 6, 24
+10838: 13, 6, 25
+10839: 13, 6, 26
+10840: 13, 6, 27
+10841: 13, 6, 28
+10842: 13, 6, 29
+10843: 13, 6, 30
+10844: 13, 6, 31
+10845: 13, 6, 32
+10846: 13, 6, 33
+10847: 13, 6, 34
+10848: 13, 6, 35
+10849: 13, 6, 36
+10850: 13, 6, 37
+10851: 13, 6, 38
+10852: 13, 6, 39
+10853: 13, 6, 40
+10854: 13, 6, 41
+10855: 13, 6, 42
+10856: 13, 6, 43
+10857: 13, 6, 44
+10858: 13, 6, 45
+10859: 13, 6, 46
+10860: 13, 6, 47
+10861: 13, 6, 48
+10862: 13, 6, 49
+10863: 13, 6, 50
+10864: 13, 6, 51
+10865: 13, 6, 52
+10866: 13, 6, 53
+10867: 13, 6, 54
+10868: 13, 6, 55
+10869: 13, 6, 56
+10870: 13, 6, 57
+10871: 13, 6, 58
+10872: 13, 6, 59
+10873: 13, 6, 60
+10874: 13, 6, 61
+10875: 13, 6, 62
+10876: 13, 6, 63
+10877: 13, 6, 64
+10878: 13, 6, 65
+10879: 13, 6, 66
+10880: 13, 6, 67
+10881: 13, 6, 68
+10882: 13, 6, 69
+10883: 13, 6, 70
+10884: 13, 6, 71
+10885: 13, 6, 72
+10886: 13, 6, 73
+10887: 13, 6, 74
+10888: 13, 6, 75
+10889: 13, 6, 76
+10890: 13, 6, 77
+10891: 13, 6, 78
+10892: 13, 6, 79
+10893: 13, 6, 80
+10894: 13, 6, 81
+10895: 13, 7, 0
+10896: 13, 7, 1
+10897: 13, 7, 2
+10898: 13, 7, 3
+10899: 13, 7, 4
+10900: 13, 7, 5
+10901: 13, 7, 6
+10902: 13, 7, 7
+10903: 13, 7, 8
+10904: 13, 7, 9
+10905: 13, 7, 10
+10906: 13, 7, 11
+10907: 13, 7, 12
+10908: 13, 7, 13
+10909: 13, 7, 14
+10910: 13, 7, 15
+10911: 13, 7, 16
+10912: 13, 7, 17
+10913: 13, 7, 18
+10914: 13, 7, 19
+10915: 13, 7, 20
+10916: 13, 7, 21
+10917: 13, 7, 22
+10918: 13, 7, 23
+10919: 13, 7, 24
+10920: 13, 7, 25
+10921: 13, 7, 26
+10922: 13, 7, 27
+10923: 13, 7, 28
+10924: 13, 7, 29
+10925: 13, 7, 30
+10926: 13, 7, 31
+10927: 13, 7, 32
+10928: 13, 7, 33
+10929: 13, 7, 34
+10930: 13, 7, 35
+10931: 13, 7, 36
+10932: 13, 7, 37
+10933: 13, 7, 38
+10934: 13, 7, 39
+10935: 13, 7, 40
+10936: 13, 8, 0
+10937: 13, 8, 1
+10938: 13, 8, 2
+10939: 13, 8, 3
+10940: 13, 8, 4
+10941: 13, 8, 5
+10942: 13, 8, 6
+10943: 13, 8, 7
+10944: 13, 8, 8
+10945: 13, 8, 9
+10946: 13, 8, 10
+10947: 13, 8, 11
+10948: 13, 8, 12
+10949: 13, 8, 13
+10950: 13, 8, 14
+10951: 13, 8, 15
+10952: 13, 8, 16
+10953: 13, 8, 17
+10954: 13, 8, 18
+10955: 13, 8, 19
+10956: 13, 8, 20
+10957: 13, 8, 21
+10958: 13, 8, 22
+10959: 13, 8, 23
+10960: 13, 8, 24
+10961: 13, 8, 25
+10962: 13, 8, 26
+10963: 13, 8, 27
+10964: 13, 8, 28
+10965: 13, 8, 29
+10966: 13, 8, 30
+10967: 13, 8, 31
+10968: 13, 8, 32
+10969: 13, 8, 33
+10970: 13, 8, 34
+10971: 13, 8, 35
+10972: 13, 8, 36
+10973: 13, 8, 37
+10974: 13, 8, 38
+10975: 13, 8, 39
+10976: 13, 8, 40
+10977: 13, 9, 0
+10978: 13, 9, 1
+10979: 13, 9, 2
+10980: 13, 9, 3
+10981: 13, 9, 4
+10982: 13, 9, 5
+10983: 13, 9, 6
+10984: 13, 9, 7
+10985: 13, 9, 8
+10986: 13, 9, 9
+10987: 13, 9, 10
+10988: 13, 9, 11
+10989: 13, 9, 12
+10990: 13, 9, 13
+10991: 13, 9, 14
+10992: 13, 9, 15
+10993: 13, 9, 16
+10994: 13, 9, 17
+10995: 13, 9, 18
+10996: 13, 9, 19
+10997: 13, 9, 20
+10998: 13, 9, 21
+10999: 13, 9, 22
+11000: 13, 9, 23
+11001: 13, 9, 24
+11002: 13, 9, 25
+11003: 13, 9, 26
+11004: 13, 9, 27
+11005: 13, 9, 28
+11006: 13, 9, 29
+11007: 13, 9, 30
+11008: 13, 9, 31
+11009: 13, 9, 32
+11010: 13, 9, 33
+11011: 13, 9, 34
+11012: 13, 9, 35
+11013: 13, 9, 36
+11014: 13, 9, 37
+11015: 13, 9, 38
+11016: 13, 9, 39
+11017: 13, 9, 40
+11018: 13, 9, 41
+11019: 13, 9, 42
+11020: 13, 9, 43
+11021: 13, 9, 44
+11022: 13, 10, 0
+11023: 13, 10, 1
+11024: 13, 10, 2
+11025: 13, 10, 3
+11026: 13, 10, 4
+11027: 13, 10, 5
+11028: 13, 10, 6
+11029: 13, 10, 7
+11030: 13, 10, 8
+11031: 13, 10, 9
+11032: 13, 10, 10
+11033: 13, 10, 11
+11034: 13, 10, 12
+11035: 13, 10, 13
+11036: 13, 10, 14
+11037: 13, 11, 0
+11038: 13, 11, 1
+11039: 13, 11, 2
+11040: 13, 11, 3
+11041: 13, 11, 4
+11042: 13, 11, 5
+11043: 13, 11, 6
+11044: 13, 11, 7
+11045: 13, 11, 8
+11046: 13, 11, 9
+11047: 13, 11, 10
+11048: 13, 11, 11
+11049: 13, 11, 12
+11050: 13, 11, 13
+11051: 13, 11, 14
+11052: 13, 11, 15
+11053: 13, 11, 16
+11054: 13, 11, 17
+11055: 13, 11, 18
+11056: 13, 11, 19
+11057: 13, 11, 20
+11058: 13, 11, 21
+11059: 13, 11, 22
+11060: 13, 11, 23
+11061: 13, 11, 24
+11062: 13, 11, 25
+11063: 13, 11, 26
+11064: 13, 11, 27
+11065: 13, 11, 28
+11066: 13, 11, 29
+11067: 13, 11, 30
+11068: 13, 11, 31
+11069: 13, 11, 32
+11070: 13, 11, 33
+11071: 13, 11, 34
+11072: 13, 11, 35
+11073: 13, 11, 36
+11074: 13, 11, 37
+11075: 13, 11, 38
+11076: 13, 11, 39
+11077: 13, 11, 40
+11078: 13, 11, 41
+11079: 13, 11, 42
+11080: 13, 11, 43
+11081: 13, 11, 44
+11082: 13, 11, 45
+11083: 13, 11, 46
+11084: 13, 11, 47
+11085: 13, 12, 0
+11086: 13, 12, 1
+11087: 13, 12, 2
+11088: 13, 12, 3
+11089: 13, 12, 4
+11090: 13, 12, 5
+11091: 13, 12, 6
+11092: 13, 12, 7
+11093: 13, 12, 8
+11094: 13, 12, 9
+11095: 13, 12, 10
+11096: 13, 12, 11
+11097: 13, 12, 12
+11098: 13, 12, 13
+11099: 13, 12, 14
+11100: 13, 12, 15
+11101: 13, 12, 16
+11102: 13, 12, 17
+11103: 13, 12, 18
+11104: 13, 12, 19
+11105: 13, 12, 20
+11106: 13, 12, 21
+11107: 13, 12, 22
+11108: 13, 12, 23
+11109: 13, 12, 24
+11110: 13, 12, 25
+11111: 13, 12, 26
+11112: 13, 12, 27
+11113: 13, 12, 28
+11114: 13, 12, 29
+11115: 13, 12, 30
+11116: 13, 12, 31
+11117: 13, 12, 32
+11118: 13, 12, 33
+11119: 13, 12, 34
+11120: 13, 12, 35
+11121: 13, 12, 36
+11122: 13, 12, 37
+11123: 13, 12, 38
+11124: 13, 12, 39
+11125: 13, 12, 40
+11126: 13, 13, 0
+11127: 13, 13, 1
+11128: 13, 13, 2
+11129: 13, 13, 3
+11130: 13, 13, 4
+11131: 13, 13, 5
+11132: 13, 13, 6
+11133: 13, 13, 7
+11134: 13, 13, 8
+11135: 13, 13, 9
+11136: 13, 13, 10
+11137: 13, 13, 11
+11138: 13, 13, 12
+11139: 13, 13, 13
+11140: 13, 13, 14
+11141: 13, 14, 0
+11142: 13, 14, 1
+11143: 13, 14, 2
+11144: 13, 14, 3
+11145: 13, 14, 4
+11146: 13, 14, 5
+11147: 13, 14, 6
+11148: 13, 14, 7
+11149: 13, 14, 8
+11150: 13, 14, 9
+11151: 13, 14, 10
+11152: 13, 14, 11
+11153: 13, 14, 12
+11154: 13, 14, 13
+11155: 13, 14, 14
+11156: 13, 14, 15
+11157: 13, 14, 16
+11158: 13, 14, 17
+11159: 13, 15, 0
+11160: 13, 15, 1
+11161: 13, 15, 2
+11162: 13, 15, 3
+11163: 13, 15, 4
+11164: 13, 15, 5
+11165: 13, 15, 6
+11166: 13, 15, 7
+11167: 13, 15, 8
+11168: 13, 15, 9
+11169: 13, 15, 10
+11170: 13, 15, 11
+11171: 13, 15, 12
+11172: 13, 15, 13
+11173: 13, 15, 14
+11174: 13, 15, 15
+11175: 13, 15, 16
+11176: 13, 15, 17
+11177: 13, 15, 18
+11178: 13, 15, 19
+11179: 13, 15, 20
+11180: 13, 15, 21
+11181: 13, 15, 22
+11182: 13, 15, 23
+11183: 13, 15, 24
+11184: 13, 15, 25
+11185: 13, 15, 26
+11186: 13, 15, 27
+11187: 13, 15, 28
+11188: 13, 15, 29
+11189: 13, 16, 0
+11190: 13, 16, 1
+11191: 13, 16, 2
+11192: 13, 16, 3
+11193: 13, 16, 4
+11194: 13, 16, 5
+11195: 13, 16, 6
+11196: 13, 16, 7
+11197: 13, 16, 8
+11198: 13, 16, 9
+11199: 13, 16, 10
+11200: 13, 16, 11
+11201: 13, 16, 12
+11202: 13, 16, 13
+11203: 13, 16, 14
+11204: 13, 16, 15
+11205: 13, 16, 16
+11206: 13, 16, 17
+11207: 13, 16, 18
+11208: 13, 16, 19
+11209: 13, 16, 20
+11210: 13, 16, 21
+11211: 13, 16, 22
+11212: 13, 16, 23
+11213: 13, 16, 24
+11214: 13, 16, 25
+11215: 13, 16, 26
+11216: 13, 16, 27
+11217: 13, 16, 28
+11218: 13, 16, 29
+11219: 13, 16, 30
+11220: 13, 16, 31
+11221: 13, 16, 32
+11222: 13, 16, 33
+11223: 13, 16, 34
+11224: 13, 16, 35
+11225: 13, 16, 36
+11226: 13, 16, 37
+11227: 13, 16, 38
+11228: 13, 16, 39
+11229: 13, 16, 40
+11230: 13, 16, 41
+11231: 13, 16, 42
+11232: 13, 16, 43
+11233: 13, 17, 0
+11234: 13, 17, 1
+11235: 13, 17, 2
+11236: 13, 17, 3
+11237: 13, 17, 4
+11238: 13, 17, 5
+11239: 13, 17, 6
+11240: 13, 17, 7
+11241: 13, 17, 8
+11242: 13, 17, 9
+11243: 13, 17, 10
+11244: 13, 17, 11
+11245: 13, 17, 12
+11246: 13, 17, 13
+11247: 13, 17, 14
+11248: 13, 17, 15
+11249: 13, 17, 16
+11250: 13, 17, 17
+11251: 13, 17, 18
+11252: 13, 17, 19
+11253: 13, 17, 20
+11254: 13, 17, 21
+11255: 13, 17, 22
+11256: 13, 17, 23
+11257: 13, 17, 24
+11258: 13, 17, 25
+11259: 13, 17, 26
+11260: 13, 17, 27
+11261: 13, 18, 0
+11262: 13, 18, 1
+11263: 13, 18, 2
+11264: 13, 18, 3
+11265: 13, 18, 4
+11266: 13, 18, 5
+11267: 13, 18, 6
+11268: 13, 18, 7
+11269: 13, 18, 8
+11270: 13, 18, 9
+11271: 13, 18, 10
+11272: 13, 18, 11
+11273: 13, 18, 12
+11274: 13, 18, 13
+11275: 13, 18, 14
+11276: 13, 18, 15
+11277: 13, 18, 16
+11278: 13, 18, 17
+11279: 13, 19, 0
+11280: 13, 19, 1
+11281: 13, 19, 2
+11282: 13, 19, 3
+11283: 13, 19, 4
+11284: 13, 19, 5
+11285: 13, 19, 6
+11286: 13, 19, 7
+11287: 13, 19, 8
+11288: 13, 19, 9
+11289: 13, 19, 10
+11290: 13, 19, 11
+11291: 13, 19, 12
+11292: 13, 19, 13
+11293: 13, 19, 14
+11294: 13, 19, 15
+11295: 13, 19, 16
+11296: 13, 19, 17
+11297: 13, 19, 18
+11298: 13, 19, 19
+11299: 13, 20, 0
+11300: 13, 20, 1
+11301: 13, 20, 2
+11302: 13, 20, 3
+11303: 13, 20, 4
+11304: 13, 20, 5
+11305: 13, 20, 6
+11306: 13, 20, 7
+11307: 13, 20, 8
+11308: 13, 21, 0
+11309: 13, 21, 1
+11310: 13, 21, 2
+11311: 13, 21, 3
+11312: 13, 21, 4
+11313: 13, 21, 5
+11314: 13, 21, 6
+11315: 13, 21, 7
+11316: 13, 21, 8
+11317: 13, 21, 9
+11318: 13, 21, 10
+11319: 13, 21, 11
+11320: 13, 21, 12
+11321: 13, 21, 13
+11322: 13, 21, 14
+11323: 13, 21, 15
+11324: 13, 21, 16
+11325: 13, 21, 17
+11326: 13, 21, 18
+11327: 13, 21, 19
+11328: 13, 21, 20
+11329: 13, 21, 21
+11330: 13, 21, 22
+11331: 13, 21, 23
+11332: 13, 21, 24
+11333: 13, 21, 25
+11334: 13, 21, 26
+11335: 13, 21, 27
+11336: 13, 21, 28
+11337: 13, 21, 29
+11338: 13, 21, 30
+11339: 13, 22, 0
+11340: 13, 22, 1
+11341: 13, 22, 2
+11342: 13, 22, 3
+11343: 13, 22, 4
+11344: 13, 22, 5
+11345: 13, 22, 6
+11346: 13, 22, 7
+11347: 13, 22, 8
+11348: 13, 22, 9
+11349: 13, 22, 10
+11350: 13, 22, 11
+11351: 13, 22, 12
+11352: 13, 22, 13
+11353: 13, 22, 14
+11354: 13, 22, 15
+11355: 13, 22, 16
+11356: 13, 22, 17
+11357: 13, 22, 18
+11358: 13, 22, 19
+11359: 13, 23, 0
+11360: 13, 23, 1
+11361: 13, 23, 2
+11362: 13, 23, 3
+11363: 13, 23, 4
+11364: 13, 23, 5
+11365: 13, 23, 6
+11366: 13, 23, 7
+11367: 13, 23, 8
+11368: 13, 23, 9
+11369: 13, 23, 10
+11370: 13, 23, 11
+11371: 13, 23, 12
+11372: 13, 23, 13
+11373: 13, 23, 14
+11374: 13, 23, 15
+11375: 13, 23, 16
+11376: 13, 23, 17
+11377: 13, 23, 18
+11378: 13, 23, 19
+11379: 13, 23, 20
+11380: 13, 23, 21
+11381: 13, 23, 22
+11382: 13, 23, 23
+11383: 13, 23, 24
+11384: 13, 23, 25
+11385: 13, 23, 26
+11386: 13, 23, 27
+11387: 13, 23, 28
+11388: 13, 23, 29
+11389: 13, 23, 30
+11390: 13, 23, 31
+11391: 13, 23, 32
+11392: 13, 24, 0
+11393: 13, 24, 1
+11394: 13, 24, 2
+11395: 13, 24, 3
+11396: 13, 24, 4
+11397: 13, 24, 5
+11398: 13, 24, 6
+11399: 13, 24, 7
+11400: 13, 24, 8
+11401: 13, 24, 9
+11402: 13, 24, 10
+11403: 13, 24, 11
+11404: 13, 24, 12
+11405: 13, 24, 13
+11406: 13, 24, 14
+11407: 13, 24, 15
+11408: 13, 24, 16
+11409: 13, 24, 17
+11410: 13, 24, 18
+11411: 13, 24, 19
+11412: 13, 24, 20
+11413: 13, 24, 21
+11414: 13, 24, 22
+11415: 13, 24, 23
+11416: 13, 24, 24
+11417: 13, 24, 25
+11418: 13, 24, 26
+11419: 13, 24, 27
+11420: 13, 24, 28
+11421: 13, 24, 29
+11422: 13, 24, 30
+11423: 13, 24, 31
+11424: 13, 25, 0
+11425: 13, 25, 1
+11426: 13, 25, 2
+11427: 13, 25, 3
+11428: 13, 25, 4
+11429: 13, 25, 5
+11430: 13, 25, 6
+11431: 13, 25, 7
+11432: 13, 25, 8
+11433: 13, 25, 9
+11434: 13, 25, 10
+11435: 13, 25, 11
+11436: 13, 25, 12
+11437: 13, 25, 13
+11438: 13, 25, 14
+11439: 13, 25, 15
+11440: 13, 25, 16
+11441: 13, 25, 17
+11442: 13, 25, 18
+11443: 13, 25, 19
+11444: 13, 25, 20
+11445: 13, 25, 21
+11446: 13, 25, 22
+11447: 13, 25, 23
+11448: 13, 25, 24
+11449: 13, 25, 25
+11450: 13, 25, 26
+11451: 13, 25, 27
+11452: 13, 25, 28
+11453: 13, 25, 29
+11454: 13, 25, 30
+11455: 13, 25, 31
+11456: 13, 26, 0
+11457: 13, 26, 1
+11458: 13, 26, 2
+11459: 13, 26, 3
+11460: 13, 26, 4
+11461: 13, 26, 5
+11462: 13, 26, 6
+11463: 13, 26, 7
+11464: 13, 26, 8
+11465: 13, 26, 9
+11466: 13, 26, 10
+11467: 13, 26, 11
+11468: 13, 26, 12
+11469: 13, 26, 13
+11470: 13, 26, 14
+11471: 13, 26, 15
+11472: 13, 26, 16
+11473: 13, 26, 17
+11474: 13, 26, 18
+11475: 13, 26, 19
+11476: 13, 26, 20
+11477: 13, 26, 21
+11478: 13, 26, 22
+11479: 13, 26, 23
+11480: 13, 26, 24
+11481: 13, 26, 25
+11482: 13, 26, 26
+11483: 13, 26, 27
+11484: 13, 26, 28
+11485: 13, 26, 29
+11486: 13, 26, 30
+11487: 13, 26, 31
+11488: 13, 26, 32
+11489: 13, 27, 0
+11490: 13, 27, 1
+11491: 13, 27, 2
+11492: 13, 27, 3
+11493: 13, 27, 4
+11494: 13, 27, 5
+11495: 13, 27, 6
+11496: 13, 27, 7
+11497: 13, 27, 8
+11498: 13, 27, 9
+11499: 13, 27, 10
+11500: 13, 27, 11
+11501: 13, 27, 12
+11502: 13, 27, 13
+11503: 13, 27, 14
+11504: 13, 27, 15
+11505: 13, 27, 16
+11506: 13, 27, 17
+11507: 13, 27, 18
+11508: 13, 27, 19
+11509: 13, 27, 20
+11510: 13, 27, 21
+11511: 13, 27, 22
+11512: 13, 27, 23
+11513: 13, 27, 24
+11514: 13, 27, 25
+11515: 13, 27, 26
+11516: 13, 27, 27
+11517: 13, 27, 28
+11518: 13, 27, 29
+11519: 13, 27, 30
+11520: 13, 27, 31
+11521: 13, 27, 32
+11522: 13, 27, 33
+11523: 13, 27, 34
+11524: 13, 28, 0
+11525: 13, 28, 1
+11526: 13, 28, 2
+11527: 13, 28, 3
+11528: 13, 28, 4
+11529: 13, 28, 5
+11530: 13, 28, 6
+11531: 13, 28, 7
+11532: 13, 28, 8
+11533: 13, 28, 9
+11534: 13, 28, 10
+11535: 13, 28, 11
+11536: 13, 28, 12
+11537: 13, 28, 13
+11538: 13, 28, 14
+11539: 13, 28, 15
+11540: 13, 28, 16
+11541: 13, 28, 17
+11542: 13, 28, 18
+11543: 13, 28, 19
+11544: 13, 28, 20
+11545: 13, 28, 21
+11546: 13, 29, 0
+11547: 13, 29, 1
+11548: 13, 29, 2
+11549: 13, 29, 3
+11550: 13, 29, 4
+11551: 13, 29, 5
+11552: 13, 29, 6
+11553: 13, 29, 7
+11554: 13, 29, 8
+11555: 13, 29, 9
+11556: 13, 29, 10
+11557: 13, 29, 11
+11558: 13, 29, 12
+11559: 13, 29, 13
+11560: 13, 29, 14
+11561: 13, 29, 15
+11562: 13, 29, 16
+11563: 13, 29, 17
+11564: 13, 29, 18
+11565: 13, 29, 19
+11566: 13, 29, 20
+11567: 13, 29, 21
+11568: 13, 29, 22
+11569: 13, 29, 23
+11570: 13, 29, 24
+11571: 13, 29, 25
+11572: 13, 29, 26
+11573: 13, 29, 27
+11574: 13, 29, 28
+11575: 13, 29, 29
+11576: 13, 29, 30
+11577: 14, 0, 0
+11578: 14, 1, 0
+11579: 14, 1, 1
+11580: 14, 1, 2
+11581: 14, 1, 3
+11582: 14, 1, 4
+11583: 14, 1, 5
+11584: 14, 1, 6
+11585: 14, 1, 7
+11586: 14, 1, 8
+11587: 14, 1, 9
+11588: 14, 1, 10
+11589: 14, 1, 11
+11590: 14, 1, 12
+11591: 14, 1, 13
+11592: 14, 1, 14
+11593: 14, 1, 15
+11594: 14, 1, 16
+11595: 14, 1, 17
+11596: 14, 2, 0
+11597: 14, 2, 1
+11598: 14, 2, 2
+11599: 14, 2, 3
+11600: 14, 2, 4
+11601: 14, 2, 5
+11602: 14, 2, 6
+11603: 14, 2, 7
+11604: 14, 2, 8
+11605: 14, 2, 9
+11606: 14, 2, 10
+11607: 14, 2, 11
+11608: 14, 2, 12
+11609: 14, 2, 13
+11610: 14, 2, 14
+11611: 14, 2, 15
+11612: 14, 2, 16
+11613: 14, 2, 17
+11614: 14, 2, 18
+11615: 14, 3, 0
+11616: 14, 3, 1
+11617: 14, 3, 2
+11618: 14, 3, 3
+11619: 14, 3, 4
+11620: 14, 3, 5
+11621: 14, 3, 6
+11622: 14, 3, 7
+11623: 14, 3, 8
+11624: 14, 3, 9
+11625: 14, 3, 10
+11626: 14, 3, 11
+11627: 14, 3, 12
+11628: 14, 3, 13
+11629: 14, 3, 14
+11630: 14, 3, 15
+11631: 14, 3, 16
+11632: 14, 3, 17
+11633: 14, 4, 0
+11634: 14, 4, 1
+11635: 14, 4, 2
+11636: 14, 4, 3
+11637: 14, 4, 4
+11638: 14, 4, 5
+11639: 14, 4, 6
+11640: 14, 4, 7
+11641: 14, 4, 8
+11642: 14, 4, 9
+11643: 14, 4, 10
+11644: 14, 4, 11
+11645: 14, 4, 12
+11646: 14, 4, 13
+11647: 14, 4, 14
+11648: 14, 4, 15
+11649: 14, 4, 16
+11650: 14, 4, 17
+11651: 14, 4, 18
+11652: 14, 4, 19
+11653: 14, 4, 20
+11654: 14, 4, 21
+11655: 14, 4, 22
+11656: 14, 5, 0
+11657: 14, 5, 1
+11658: 14, 5, 2
+11659: 14, 5, 3
+11660: 14, 5, 4
+11661: 14, 5, 5
+11662: 14, 5, 6
+11663: 14, 5, 7
+11664: 14, 5, 8
+11665: 14, 5, 9
+11666: 14, 5, 10
+11667: 14, 5, 11
+11668: 14, 5, 12
+11669: 14, 5, 13
+11670: 14, 5, 14
+11671: 14, 6, 0
+11672: 14, 6, 1
+11673: 14, 6, 2
+11674: 14, 6, 3
+11675: 14, 6, 4
+11676: 14, 6, 5
+11677: 14, 6, 6
+11678: 14, 6, 7
+11679: 14, 6, 8
+11680: 14, 6, 9
+11681: 14, 6, 10
+11682: 14, 6, 11
+11683: 14, 6, 12
+11684: 14, 6, 13
+11685: 14, 6, 14
+11686: 14, 6, 15
+11687: 14, 6, 16
+11688: 14, 6, 17
+11689: 14, 6, 18
+11690: 14, 6, 19
+11691: 14, 6, 20
+11692: 14, 6, 21
+11693: 14, 6, 22
+11694: 14, 6, 23
+11695: 14, 6, 24
+11696: 14, 6, 25
+11697: 14, 6, 26
+11698: 14, 6, 27
+11699: 14, 6, 28
+11700: 14, 6, 29
+11701: 14, 6, 30
+11702: 14, 6, 31
+11703: 14, 6, 32
+11704: 14, 6, 33
+11705: 14, 6, 34
+11706: 14, 6, 35
+11707: 14, 6, 36
+11708: 14, 6, 37
+11709: 14, 6, 38
+11710: 14, 6, 39
+11711: 14, 6, 40
+11712: 14, 6, 41
+11713: 14, 6, 42
+11714: 14, 7, 0
+11715: 14, 7, 1
+11716: 14, 7, 2
+11717: 14, 7, 3
+11718: 14, 7, 4
+11719: 14, 7, 5
+11720: 14, 7, 6
+11721: 14, 7, 7
+11722: 14, 7, 8
+11723: 14, 7, 9
+11724: 14, 7, 10
+11725: 14, 7, 11
+11726: 14, 7, 12
+11727: 14, 7, 13
+11728: 14, 7, 14
+11729: 14, 7, 15
+11730: 14, 7, 16
+11731: 14, 7, 17
+11732: 14, 7, 18
+11733: 14, 7, 19
+11734: 14, 7, 20
+11735: 14, 7, 21
+11736: 14, 7, 22
+11737: 14, 8, 0
+11738: 14, 8, 1
+11739: 14, 8, 2
+11740: 14, 8, 3
+11741: 14, 8, 4
+11742: 14, 8, 5
+11743: 14, 8, 6
+11744: 14, 8, 7
+11745: 14, 8, 8
+11746: 14, 8, 9
+11747: 14, 8, 10
+11748: 14, 8, 11
+11749: 14, 8, 12
+11750: 14, 8, 13
+11751: 14, 8, 14
+11752: 14, 8, 15
+11753: 14, 8, 16
+11754: 14, 8, 17
+11755: 14, 8, 18
+11756: 14, 9, 0
+11757: 14, 9, 1
+11758: 14, 9, 2
+11759: 14, 9, 3
+11760: 14, 9, 4
+11761: 14, 9, 5
+11762: 14, 9, 6
+11763: 14, 9, 7
+11764: 14, 9, 8
+11765: 14, 9, 9
+11766: 14, 9, 10
+11767: 14, 9, 11
+11768: 14, 9, 12
+11769: 14, 9, 13
+11770: 14, 9, 14
+11771: 14, 9, 15
+11772: 14, 9, 16
+11773: 14, 9, 17
+11774: 14, 9, 18
+11775: 14, 9, 19
+11776: 14, 9, 20
+11777: 14, 9, 21
+11778: 14, 9, 22
+11779: 14, 9, 23
+11780: 14, 9, 24
+11781: 14, 9, 25
+11782: 14, 9, 26
+11783: 14, 9, 27
+11784: 14, 9, 28
+11785: 14, 9, 29
+11786: 14, 9, 30
+11787: 14, 9, 31
+11788: 14, 10, 0
+11789: 14, 10, 1
+11790: 14, 10, 2
+11791: 14, 10, 3
+11792: 14, 10, 4
+11793: 14, 10, 5
+11794: 14, 10, 6
+11795: 14, 10, 7
+11796: 14, 10, 8
+11797: 14, 10, 9
+11798: 14, 10, 10
+11799: 14, 10, 11
+11800: 14, 10, 12
+11801: 14, 10, 13
+11802: 14, 10, 14
+11803: 14, 10, 15
+11804: 14, 10, 16
+11805: 14, 10, 17
+11806: 14, 10, 18
+11807: 14, 10, 19
+11808: 14, 11, 0
+11809: 14, 11, 1
+11810: 14, 11, 2
+11811: 14, 11, 3
+11812: 14, 11, 4
+11813: 14, 11, 5
+11814: 14, 11, 6
+11815: 14, 11, 7
+11816: 14, 11, 8
+11817: 14, 11, 9
+11818: 14, 11, 10
+11819: 14, 11, 11
+11820: 14, 11, 12
+11821: 14, 11, 13
+11822: 14, 11, 14
+11823: 14, 11, 15
+11824: 14, 11, 16
+11825: 14, 11, 17
+11826: 14, 11, 18
+11827: 14, 11, 19
+11828: 14, 11, 20
+11829: 14, 11, 21
+11830: 14, 11, 22
+11831: 14, 11, 23
+11832: 14, 12, 0
+11833: 14, 12, 1
+11834: 14, 12, 2
+11835: 14, 12, 3
+11836: 14, 12, 4
+11837: 14, 12, 5
+11838: 14, 12, 6
+11839: 14, 12, 7
+11840: 14, 12, 8
+11841: 14, 12, 9
+11842: 14, 12, 10
+11843: 14, 12, 11
+11844: 14, 12, 12
+11845: 14, 12, 13
+11846: 14, 12, 14
+11847: 14, 12, 15
+11848: 14, 12, 16
+11849: 14, 13, 0
+11850: 14, 13, 1
+11851: 14, 13, 2
+11852: 14, 13, 3
+11853: 14, 13, 4
+11854: 14, 13, 5
+11855: 14, 13, 6
+11856: 14, 13, 7
+11857: 14, 13, 8
+11858: 14, 13, 9
+11859: 14, 13, 10
+11860: 14, 13, 11
+11861: 14, 13, 12
+11862: 14, 13, 13
+11863: 14, 13, 14
+11864: 14, 13, 15
+11865: 14, 13, 16
+11866: 14, 13, 17
+11867: 14, 13, 18
+11868: 14, 13, 19
+11869: 14, 13, 20
+11870: 14, 13, 21
+11871: 14, 13, 22
+11872: 14, 14, 0
+11873: 14, 14, 1
+11874: 14, 14, 2
+11875: 14, 14, 3
+11876: 14, 14, 4
+11877: 14, 14, 5
+11878: 14, 14, 6
+11879: 14, 14, 7
+11880: 14, 14, 8
+11881: 14, 14, 9
+11882: 14, 14, 10
+11883: 14, 14, 11
+11884: 14, 14, 12
+11885: 14, 14, 13
+11886: 14, 14, 14
+11887: 14, 14, 15
+11888: 14, 15, 0
+11889: 14, 15, 1
+11890: 14, 15, 2
+11891: 14, 15, 3
+11892: 14, 15, 4
+11893: 14, 15, 5
+11894: 14, 15, 6
+11895: 14, 15, 7
+11896: 14, 15, 8
+11897: 14, 15, 9
+11898: 14, 15, 10
+11899: 14, 15, 11
+11900: 14, 15, 12
+11901: 14, 15, 13
+11902: 14, 15, 14
+11903: 14, 15, 15
+11904: 14, 15, 16
+11905: 14, 15, 17
+11906: 14, 15, 18
+11907: 14, 15, 19
+11908: 14, 16, 0
+11909: 14, 16, 1
+11910: 14, 16, 2
+11911: 14, 16, 3
+11912: 14, 16, 4
+11913: 14, 16, 5
+11914: 14, 16, 6
+11915: 14, 16, 7
+11916: 14, 16, 8
+11917: 14, 16, 9
+11918: 14, 16, 10
+11919: 14, 16, 11
+11920: 14, 16, 12
+11921: 14, 16, 13
+11922: 14, 16, 14
+11923: 14, 17, 0
+11924: 14, 17, 1
+11925: 14, 17, 2
+11926: 14, 17, 3
+11927: 14, 17, 4
+11928: 14, 17, 5
+11929: 14, 17, 6
+11930: 14, 17, 7
+11931: 14, 17, 8
+11932: 14, 17, 9
+11933: 14, 17, 10
+11934: 14, 17, 11
+11935: 14, 17, 12
+11936: 14, 17, 13
+11937: 14, 17, 14
+11938: 14, 17, 15
+11939: 14, 17, 16
+11940: 14, 17, 17
+11941: 14, 17, 18
+11942: 14, 17, 19
+11943: 14, 18, 0
+11944: 14, 18, 1
+11945: 14, 18, 2
+11946: 14, 18, 3
+11947: 14, 18, 4
+11948: 14, 18, 5
+11949: 14, 18, 6
+11950: 14, 18, 7
+11951: 14, 18, 8
+11952: 14, 18, 9
+11953: 14, 18, 10
+11954: 14, 18, 11
+11955: 14, 18, 12
+11956: 14, 18, 13
+11957: 14, 18, 14
+11958: 14, 18, 15
+11959: 14, 18, 16
+11960: 14, 18, 17
+11961: 14, 18, 18
+11962: 14, 18, 19
+11963: 14, 18, 20
+11964: 14, 18, 21
+11965: 14, 18, 22
+11966: 14, 18, 23
+11967: 14, 18, 24
+11968: 14, 18, 25
+11969: 14, 18, 26
+11970: 14, 18, 27
+11971: 14, 18, 28
+11972: 14, 18, 29
+11973: 14, 18, 30
+11974: 14, 18, 31
+11975: 14, 18, 32
+11976: 14, 18, 33
+11977: 14, 18, 34
+11978: 14, 19, 0
+11979: 14, 19, 1
+11980: 14, 19, 2
+11981: 14, 19, 3
+11982: 14, 19, 4
+11983: 14, 19, 5
+11984: 14, 19, 6
+11985: 14, 19, 7
+11986: 14, 19, 8
+11987: 14, 19, 9
+11988: 14, 19, 10
+11989: 14, 19, 11
+11990: 14, 20, 0
+11991: 14, 20, 1
+11992: 14, 20, 2
+11993: 14, 20, 3
+11994: 14, 20, 4
+11995: 14, 20, 5
+11996: 14, 20, 6
+11997: 14, 20, 7
+11998: 14, 20, 8
+11999: 14, 20, 9
+12000: 14, 20, 10
+12001: 14, 20, 11
+12002: 14, 20, 12
+12003: 14, 20, 13
+12004: 14, 20, 14
+12005: 14, 20, 15
+12006: 14, 20, 16
+12007: 14, 20, 17
+12008: 14, 20, 18
+12009: 14, 20, 19
+12010: 14, 20, 20
+12011: 14, 20, 21
+12012: 14, 20, 22
+12013: 14, 20, 23
+12014: 14, 20, 24
+12015: 14, 20, 25
+12016: 14, 20, 26
+12017: 14, 20, 27
+12018: 14, 20, 28
+12019: 14, 20, 29
+12020: 14, 20, 30
+12021: 14, 20, 31
+12022: 14, 20, 32
+12023: 14, 20, 33
+12024: 14, 20, 34
+12025: 14, 20, 35
+12026: 14, 20, 36
+12027: 14, 20, 37
+12028: 14, 21, 0
+12029: 14, 21, 1
+12030: 14, 21, 2
+12031: 14, 21, 3
+12032: 14, 21, 4
+12033: 14, 21, 5
+12034: 14, 21, 6
+12035: 14, 21, 7
+12036: 14, 21, 8
+12037: 14, 21, 9
+12038: 14, 21, 10
+12039: 14, 21, 11
+12040: 14, 21, 12
+12041: 14, 21, 13
+12042: 14, 21, 14
+12043: 14, 21, 15
+12044: 14, 21, 16
+12045: 14, 21, 17
+12046: 14, 21, 18
+12047: 14, 21, 19
+12048: 14, 21, 20
+12049: 14, 22, 0
+12050: 14, 22, 1
+12051: 14, 22, 2
+12052: 14, 22, 3
+12053: 14, 22, 4
+12054: 14, 22, 5
+12055: 14, 22, 6
+12056: 14, 22, 7
+12057: 14, 22, 8
+12058: 14, 22, 9
+12059: 14, 22, 10
+12060: 14, 22, 11
+12061: 14, 22, 12
+12062: 14, 23, 0
+12063: 14, 23, 1
+12064: 14, 23, 2
+12065: 14, 23, 3
+12066: 14, 23, 4
+12067: 14, 23, 5
+12068: 14, 23, 6
+12069: 14, 23, 7
+12070: 14, 23, 8
+12071: 14, 23, 9
+12072: 14, 23, 10
+12073: 14, 23, 11
+12074: 14, 23, 12
+12075: 14, 23, 13
+12076: 14, 23, 14
+12077: 14, 23, 15
+12078: 14, 23, 16
+12079: 14, 23, 17
+12080: 14, 23, 18
+12081: 14, 23, 19
+12082: 14, 23, 20
+12083: 14, 23, 21
+12084: 14, 24, 0
+12085: 14, 24, 1
+12086: 14, 24, 2
+12087: 14, 24, 3
+12088: 14, 24, 4
+12089: 14, 24, 5
+12090: 14, 24, 6
+12091: 14, 24, 7
+12092: 14, 24, 8
+12093: 14, 24, 9
+12094: 14, 24, 10
+12095: 14, 24, 11
+12096: 14, 24, 12
+12097: 14, 24, 13
+12098: 14, 24, 14
+12099: 14, 24, 15
+12100: 14, 24, 16
+12101: 14, 24, 17
+12102: 14, 24, 18
+12103: 14, 24, 19
+12104: 14, 24, 20
+12105: 14, 24, 21
+12106: 14, 24, 22
+12107: 14, 24, 23
+12108: 14, 24, 24
+12109: 14, 24, 25
+12110: 14, 24, 26
+12111: 14, 24, 27
+12112: 14, 25, 0
+12113: 14, 25, 1
+12114: 14, 25, 2
+12115: 14, 25, 3
+12116: 14, 25, 4
+12117: 14, 25, 5
+12118: 14, 25, 6
+12119: 14, 25, 7
+12120: 14, 25, 8
+12121: 14, 25, 9
+12122: 14, 25, 10
+12123: 14, 25, 11
+12124: 14, 25, 12
+12125: 14, 25, 13
+12126: 14, 25, 14
+12127: 14, 25, 15
+12128: 14, 25, 16
+12129: 14, 25, 17
+12130: 14, 25, 18
+12131: 14, 25, 19
+12132: 14, 25, 20
+12133: 14, 25, 21
+12134: 14, 25, 22
+12135: 14, 25, 23
+12136: 14, 25, 24
+12137: 14, 25, 25
+12138: 14, 25, 26
+12139: 14, 25, 27
+12140: 14, 25, 28
+12141: 14, 26, 0
+12142: 14, 26, 1
+12143: 14, 26, 2
+12144: 14, 26, 3
+12145: 14, 26, 4
+12146: 14, 26, 5
+12147: 14, 26, 6
+12148: 14, 26, 7
+12149: 14, 26, 8
+12150: 14, 26, 9
+12151: 14, 26, 10
+12152: 14, 26, 11
+12153: 14, 26, 12
+12154: 14, 26, 13
+12155: 14, 26, 14
+12156: 14, 26, 15
+12157: 14, 26, 16
+12158: 14, 26, 17
+12159: 14, 26, 18
+12160: 14, 26, 19
+12161: 14, 26, 20
+12162: 14, 26, 21
+12163: 14, 26, 22
+12164: 14, 26, 23
+12165: 14, 27, 0
+12166: 14, 27, 1
+12167: 14, 27, 2
+12168: 14, 27, 3
+12169: 14, 27, 4
+12170: 14, 27, 5
+12171: 14, 27, 6
+12172: 14, 27, 7
+12173: 14, 27, 8
+12174: 14, 27, 9
+12175: 14, 28, 0
+12176: 14, 28, 1
+12177: 14, 28, 2
+12178: 14, 28, 3
+12179: 14, 28, 4
+12180: 14, 28, 5
+12181: 14, 28, 6
+12182: 14, 28, 7
+12183: 14, 28, 8
+12184: 14, 28, 9
+12185: 14, 28, 10
+12186: 14, 28, 11
+12187: 14, 28, 12
+12188: 14, 28, 13
+12189: 14, 28, 14
+12190: 14, 28, 15
+12191: 14, 28, 16
+12192: 14, 28, 17
+12193: 14, 28, 18
+12194: 14, 28, 19
+12195: 14, 28, 20
+12196: 14, 28, 21
+12197: 14, 28, 22
+12198: 14, 28, 23
+12199: 14, 28, 24
+12200: 14, 28, 25
+12201: 14, 28, 26
+12202: 14, 28, 27
+12203: 14, 29, 0
+12204: 14, 29, 1
+12205: 14, 29, 2
+12206: 14, 29, 3
+12207: 14, 29, 4
+12208: 14, 29, 5
+12209: 14, 29, 6
+12210: 14, 29, 7
+12211: 14, 29, 8
+12212: 14, 29, 9
+12213: 14, 29, 10
+12214: 14, 29, 11
+12215: 14, 29, 12
+12216: 14, 29, 13
+12217: 14, 29, 14
+12218: 14, 29, 15
+12219: 14, 29, 16
+12220: 14, 29, 17
+12221: 14, 29, 18
+12222: 14, 29, 19
+12223: 14, 29, 20
+12224: 14, 29, 21
+12225: 14, 29, 22
+12226: 14, 29, 23
+12227: 14, 29, 24
+12228: 14, 29, 25
+12229: 14, 29, 26
+12230: 14, 29, 27
+12231: 14, 29, 28
+12232: 14, 29, 29
+12233: 14, 29, 30
+12234: 14, 29, 31
+12235: 14, 29, 32
+12236: 14, 29, 33
+12237: 14, 29, 34
+12238: 14, 29, 35
+12239: 14, 29, 36
+12240: 14, 30, 0
+12241: 14, 30, 1
+12242: 14, 30, 2
+12243: 14, 30, 3
+12244: 14, 30, 4
+12245: 14, 30, 5
+12246: 14, 30, 6
+12247: 14, 30, 7
+12248: 14, 30, 8
+12249: 14, 30, 9
+12250: 14, 30, 10
+12251: 14, 30, 11
+12252: 14, 30, 12
+12253: 14, 30, 13
+12254: 14, 30, 14
+12255: 14, 30, 15
+12256: 14, 30, 16
+12257: 14, 30, 17
+12258: 14, 30, 18
+12259: 14, 30, 19
+12260: 14, 30, 20
+12261: 14, 30, 21
+12262: 14, 30, 22
+12263: 14, 30, 23
+12264: 14, 30, 24
+12265: 14, 30, 25
+12266: 14, 30, 26
+12267: 14, 30, 27
+12268: 14, 31, 0
+12269: 14, 31, 1
+12270: 14, 31, 2
+12271: 14, 31, 3
+12272: 14, 31, 4
+12273: 14, 31, 5
+12274: 14, 31, 6
+12275: 14, 31, 7
+12276: 14, 31, 8
+12277: 14, 31, 9
+12278: 14, 31, 10
+12279: 14, 31, 11
+12280: 14, 31, 12
+12281: 14, 31, 13
+12282: 14, 31, 14
+12283: 14, 31, 15
+12284: 14, 31, 16
+12285: 14, 31, 17
+12286: 14, 31, 18
+12287: 14, 31, 19
+12288: 14, 31, 20
+12289: 14, 31, 21
+12290: 14, 32, 0
+12291: 14, 32, 1
+12292: 14, 32, 2
+12293: 14, 32, 3
+12294: 14, 32, 4
+12295: 14, 32, 5
+12296: 14, 32, 6
+12297: 14, 32, 7
+12298: 14, 32, 8
+12299: 14, 32, 9
+12300: 14, 32, 10
+12301: 14, 32, 11
+12302: 14, 32, 12
+12303: 14, 32, 13
+12304: 14, 32, 14
+12305: 14, 32, 15
+12306: 14, 32, 16
+12307: 14, 32, 17
+12308: 14, 32, 18
+12309: 14, 32, 19
+12310: 14, 32, 20
+12311: 14, 32, 21
+12312: 14, 32, 22
+12313: 14, 32, 23
+12314: 14, 32, 24
+12315: 14, 32, 25
+12316: 14, 32, 26
+12317: 14, 32, 27
+12318: 14, 32, 28
+12319: 14, 32, 29
+12320: 14, 32, 30
+12321: 14, 32, 31
+12322: 14, 32, 32
+12323: 14, 32, 33
+12324: 14, 33, 0
+12325: 14, 33, 1
+12326: 14, 33, 2
+12327: 14, 33, 3
+12328: 14, 33, 4
+12329: 14, 33, 5
+12330: 14, 33, 6
+12331: 14, 33, 7
+12332: 14, 33, 8
+12333: 14, 33, 9
+12334: 14, 33, 10
+12335: 14, 33, 11
+12336: 14, 33, 12
+12337: 14, 33, 13
+12338: 14, 33, 14
+12339: 14, 33, 15
+12340: 14, 33, 16
+12341: 14, 33, 17
+12342: 14, 33, 18
+12343: 14, 33, 19
+12344: 14, 33, 20
+12345: 14, 33, 21
+12346: 14, 33, 22
+12347: 14, 33, 23
+12348: 14, 33, 24
+12349: 14, 33, 25
+12350: 14, 34, 0
+12351: 14, 34, 1
+12352: 14, 34, 2
+12353: 14, 34, 3
+12354: 14, 34, 4
+12355: 14, 34, 5
+12356: 14, 34, 6
+12357: 14, 34, 7
+12358: 14, 34, 8
+12359: 14, 34, 9
+12360: 14, 34, 10
+12361: 14, 34, 11
+12362: 14, 34, 12
+12363: 14, 34, 13
+12364: 14, 34, 14
+12365: 14, 34, 15
+12366: 14, 34, 16
+12367: 14, 34, 17
+12368: 14, 34, 18
+12369: 14, 34, 19
+12370: 14, 34, 20
+12371: 14, 34, 21
+12372: 14, 34, 22
+12373: 14, 34, 23
+12374: 14, 34, 24
+12375: 14, 34, 25
+12376: 14, 34, 26
+12377: 14, 34, 27
+12378: 14, 34, 28
+12379: 14, 34, 29
+12380: 14, 34, 30
+12381: 14, 34, 31
+12382: 14, 34, 32
+12383: 14, 34, 33
+12384: 14, 35, 0
+12385: 14, 35, 1
+12386: 14, 35, 2
+12387: 14, 35, 3
+12388: 14, 35, 4
+12389: 14, 35, 5
+12390: 14, 35, 6
+12391: 14, 35, 7
+12392: 14, 35, 8
+12393: 14, 35, 9
+12394: 14, 35, 10
+12395: 14, 35, 11
+12396: 14, 35, 12
+12397: 14, 35, 13
+12398: 14, 35, 14
+12399: 14, 35, 15
+12400: 14, 35, 16
+12401: 14, 35, 17
+12402: 14, 35, 18
+12403: 14, 35, 19
+12404: 14, 35, 20
+12405: 14, 35, 21
+12406: 14, 35, 22
+12407: 14, 35, 23
+12408: 14, 35, 24
+12409: 14, 35, 25
+12410: 14, 35, 26
+12411: 14, 35, 27
+12412: 14, 36, 0
+12413: 14, 36, 1
+12414: 14, 36, 2
+12415: 14, 36, 3
+12416: 14, 36, 4
+12417: 14, 36, 5
+12418: 14, 36, 6
+12419: 14, 36, 7
+12420: 14, 36, 8
+12421: 14, 36, 9
+12422: 14, 36, 10
+12423: 14, 36, 11
+12424: 14, 36, 12
+12425: 14, 36, 13
+12426: 14, 36, 14
+12427: 14, 36, 15
+12428: 14, 36, 16
+12429: 14, 36, 17
+12430: 14, 36, 18
+12431: 14, 36, 19
+12432: 14, 36, 20
+12433: 14, 36, 21
+12434: 14, 36, 22
+12435: 14, 36, 23
+12436: 15, 0, 0
+12437: 15, 1, 0
+12438: 15, 1, 1
+12439: 15, 1, 2
+12440: 15, 1, 3
+12441: 15, 1, 4
+12442: 15, 1, 5
+12443: 15, 1, 6
+12444: 15, 1, 7
+12445: 15, 1, 8
+12446: 15, 1, 9
+12447: 15, 1, 10
+12448: 15, 1, 11
+12449: 15, 2, 0
+12450: 15, 2, 1
+12451: 15, 2, 2
+12452: 15, 2, 3
+12453: 15, 2, 4
+12454: 15, 2, 5
+12455: 15, 2, 6
+12456: 15, 2, 7
+12457: 15, 2, 8
+12458: 15, 2, 9
+12459: 15, 2, 10
+12460: 15, 2, 11
+12461: 15, 2, 12
+12462: 15, 2, 13
+12463: 15, 2, 14
+12464: 15, 2, 15
+12465: 15, 2, 16
+12466: 15, 2, 17
+12467: 15, 2, 18
+12468: 15, 2, 19
+12469: 15, 2, 20
+12470: 15, 2, 21
+12471: 15, 2, 22
+12472: 15, 2, 23
+12473: 15, 2, 24
+12474: 15, 2, 25
+12475: 15, 2, 26
+12476: 15, 2, 27
+12477: 15, 2, 28
+12478: 15, 2, 29
+12479: 15, 2, 30
+12480: 15, 2, 31
+12481: 15, 2, 32
+12482: 15, 2, 33
+12483: 15, 2, 34
+12484: 15, 2, 35
+12485: 15, 2, 36
+12486: 15, 2, 37
+12487: 15, 2, 38
+12488: 15, 2, 39
+12489: 15, 2, 40
+12490: 15, 2, 41
+12491: 15, 2, 42
+12492: 15, 2, 43
+12493: 15, 2, 44
+12494: 15, 2, 45
+12495: 15, 2, 46
+12496: 15, 2, 47
+12497: 15, 2, 48
+12498: 15, 2, 49
+12499: 15, 2, 50
+12500: 15, 2, 51
+12501: 15, 2, 52
+12502: 15, 2, 53
+12503: 15, 2, 54
+12504: 15, 2, 55
+12505: 15, 2, 56
+12506: 15, 2, 57
+12507: 15, 2, 58
+12508: 15, 2, 59
+12509: 15, 2, 60
+12510: 15, 2, 61
+12511: 15, 2, 62
+12512: 15, 2, 63
+12513: 15, 2, 64
+12514: 15, 2, 65
+12515: 15, 2, 66
+12516: 15, 2, 67
+12517: 15, 2, 68
+12518: 15, 2, 69
+12519: 15, 2, 70
+12520: 15, 3, 0
+12521: 15, 3, 1
+12522: 15, 3, 2
+12523: 15, 3, 3
+12524: 15, 3, 4
+12525: 15, 3, 5
+12526: 15, 3, 6
+12527: 15, 3, 7
+12528: 15, 3, 8
+12529: 15, 3, 9
+12530: 15, 3, 10
+12531: 15, 3, 11
+12532: 15, 3, 12
+12533: 15, 3, 13
+12534: 15, 4, 0
+12535: 15, 4, 1
+12536: 15, 4, 2
+12537: 15, 4, 3
+12538: 15, 4, 4
+12539: 15, 4, 5
+12540: 15, 4, 6
+12541: 15, 4, 7
+12542: 15, 4, 8
+12543: 15, 4, 9
+12544: 15, 4, 10
+12545: 15, 4, 11
+12546: 15, 4, 12
+12547: 15, 4, 13
+12548: 15, 4, 14
+12549: 15, 4, 15
+12550: 15, 4, 16
+12551: 15, 4, 17
+12552: 15, 4, 18
+12553: 15, 4, 19
+12554: 15, 4, 20
+12555: 15, 4, 21
+12556: 15, 4, 22
+12557: 15, 4, 23
+12558: 15, 4, 24
+12559: 15, 5, 0
+12560: 15, 5, 1
+12561: 15, 5, 2
+12562: 15, 5, 3
+12563: 15, 5, 4
+12564: 15, 5, 5
+12565: 15, 5, 6
+12566: 15, 5, 7
+12567: 15, 5, 8
+12568: 15, 5, 9
+12569: 15, 5, 10
+12570: 15, 5, 11
+12571: 15, 5, 12
+12572: 15, 5, 13
+12573: 15, 5, 14
+12574: 15, 5, 15
+12575: 15, 5, 16
+12576: 15, 5, 17
+12577: 15, 6, 0
+12578: 15, 6, 1
+12579: 15, 6, 2
+12580: 15, 6, 3
+12581: 15, 6, 4
+12582: 15, 6, 5
+12583: 15, 6, 6
+12584: 15, 6, 7
+12585: 15, 6, 8
+12586: 15, 6, 9
+12587: 15, 6, 10
+12588: 15, 6, 11
+12589: 15, 6, 12
+12590: 15, 6, 13
+12591: 15, 6, 14
+12592: 15, 6, 15
+12593: 15, 6, 16
+12594: 15, 6, 17
+12595: 15, 6, 18
+12596: 15, 6, 19
+12597: 15, 6, 20
+12598: 15, 6, 21
+12599: 15, 6, 22
+12600: 15, 7, 0
+12601: 15, 7, 1
+12602: 15, 7, 2
+12603: 15, 7, 3
+12604: 15, 7, 4
+12605: 15, 7, 5
+12606: 15, 7, 6
+12607: 15, 7, 7
+12608: 15, 7, 8
+12609: 15, 7, 9
+12610: 15, 7, 10
+12611: 15, 7, 11
+12612: 15, 7, 12
+12613: 15, 7, 13
+12614: 15, 7, 14
+12615: 15, 7, 15
+12616: 15, 7, 16
+12617: 15, 7, 17
+12618: 15, 7, 18
+12619: 15, 7, 19
+12620: 15, 7, 20
+12621: 15, 7, 21
+12622: 15, 7, 22
+12623: 15, 7, 23
+12624: 15, 7, 24
+12625: 15, 7, 25
+12626: 15, 7, 26
+12627: 15, 7, 27
+12628: 15, 7, 28
+12629: 15, 8, 0
+12630: 15, 8, 1
+12631: 15, 8, 2
+12632: 15, 8, 3
+12633: 15, 8, 4
+12634: 15, 8, 5
+12635: 15, 8, 6
+12636: 15, 8, 7
+12637: 15, 8, 8
+12638: 15, 8, 9
+12639: 15, 8, 10
+12640: 15, 8, 11
+12641: 15, 8, 12
+12642: 15, 8, 13
+12643: 15, 8, 14
+12644: 15, 8, 15
+12645: 15, 8, 16
+12646: 15, 8, 17
+12647: 15, 8, 18
+12648: 15, 8, 19
+12649: 15, 8, 20
+12650: 15, 8, 21
+12651: 15, 8, 22
+12652: 15, 8, 23
+12653: 15, 8, 24
+12654: 15, 8, 25
+12655: 15, 8, 26
+12656: 15, 8, 27
+12657: 15, 8, 28
+12658: 15, 8, 29
+12659: 15, 8, 30
+12660: 15, 8, 31
+12661: 15, 8, 32
+12662: 15, 8, 33
+12663: 15, 8, 34
+12664: 15, 8, 35
+12665: 15, 8, 36
+12666: 15, 9, 0
+12667: 15, 9, 1
+12668: 15, 9, 2
+12669: 15, 9, 3
+12670: 15, 9, 4
+12671: 15, 9, 5
+12672: 15, 9, 6
+12673: 15, 9, 7
+12674: 15, 9, 8
+12675: 15, 9, 9
+12676: 15, 9, 10
+12677: 15, 9, 11
+12678: 15, 9, 12
+12679: 15, 9, 13
+12680: 15, 9, 14
+12681: 15, 9, 15
+12682: 15, 10, 0
+12683: 15, 10, 1
+12684: 15, 10, 2
+12685: 15, 10, 3
+12686: 15, 10, 4
+12687: 15, 10, 5
+12688: 15, 10, 6
+12689: 15, 10, 7
+12690: 15, 10, 8
+12691: 15, 10, 9
+12692: 15, 10, 10
+12693: 15, 10, 11
+12694: 15, 10, 12
+12695: 15, 10, 13
+12696: 15, 10, 14
+12697: 15, 10, 15
+12698: 15, 10, 16
+12699: 15, 10, 17
+12700: 15, 10, 18
+12701: 15, 10, 19
+12702: 15, 10, 20
+12703: 15, 10, 21
+12704: 15, 10, 22
+12705: 15, 10, 23
+12706: 15, 10, 24
+12707: 15, 10, 25
+12708: 15, 10, 26
+12709: 15, 10, 27
+12710: 15, 10, 28
+12711: 15, 10, 29
+12712: 15, 10, 30
+12713: 15, 10, 31
+12714: 15, 10, 32
+12715: 15, 10, 33
+12716: 15, 10, 34
+12717: 15, 10, 35
+12718: 15, 10, 36
+12719: 15, 10, 37
+12720: 15, 10, 38
+12721: 15, 10, 39
+12722: 15, 10, 40
+12723: 15, 10, 41
+12724: 15, 10, 42
+12725: 15, 10, 43
+12726: 15, 10, 44
+12727: 16, 0, 0
+12728: 16, 1, 0
+12729: 16, 1, 1
+12730: 16, 1, 2
+12731: 16, 1, 3
+12732: 16, 1, 4
+12733: 16, 1, 5
+12734: 16, 1, 6
+12735: 16, 1, 7
+12736: 16, 1, 8
+12737: 16, 1, 9
+12738: 16, 1, 10
+12739: 16, 1, 11
+12740: 16, 2, 0
+12741: 16, 2, 1
+12742: 16, 2, 2
+12743: 16, 2, 3
+12744: 16, 2, 4
+12745: 16, 2, 5
+12746: 16, 2, 6
+12747: 16, 2, 7
+12748: 16, 2, 8
+12749: 16, 2, 9
+12750: 16, 2, 10
+12751: 16, 2, 11
+12752: 16, 2, 12
+12753: 16, 2, 13
+12754: 16, 2, 14
+12755: 16, 2, 15
+12756: 16, 2, 16
+12757: 16, 2, 17
+12758: 16, 2, 18
+12759: 16, 2, 19
+12760: 16, 2, 20
+12761: 16, 3, 0
+12762: 16, 3, 1
+12763: 16, 3, 2
+12764: 16, 3, 3
+12765: 16, 3, 4
+12766: 16, 3, 5
+12767: 16, 3, 6
+12768: 16, 3, 7
+12769: 16, 3, 8
+12770: 16, 3, 9
+12771: 16, 3, 10
+12772: 16, 3, 11
+12773: 16, 3, 12
+12774: 16, 3, 13
+12775: 16, 3, 14
+12776: 16, 3, 15
+12777: 16, 3, 16
+12778: 16, 3, 17
+12779: 16, 3, 18
+12780: 16, 3, 19
+12781: 16, 3, 20
+12782: 16, 3, 21
+12783: 16, 3, 22
+12784: 16, 3, 23
+12785: 16, 3, 24
+12786: 16, 3, 25
+12787: 16, 3, 26
+12788: 16, 3, 27
+12789: 16, 3, 28
+12790: 16, 3, 29
+12791: 16, 3, 30
+12792: 16, 3, 31
+12793: 16, 3, 32
+12794: 16, 4, 0
+12795: 16, 4, 1
+12796: 16, 4, 2
+12797: 16, 4, 3
+12798: 16, 4, 4
+12799: 16, 4, 5
+12800: 16, 4, 6
+12801: 16, 4, 7
+12802: 16, 4, 8
+12803: 16, 4, 9
+12804: 16, 4, 10
+12805: 16, 4, 11
+12806: 16, 4, 12
+12807: 16, 4, 13
+12808: 16, 4, 14
+12809: 16, 4, 15
+12810: 16, 4, 16
+12811: 16, 4, 17
+12812: 16, 4, 18
+12813: 16, 4, 19
+12814: 16, 4, 20
+12815: 16, 4, 21
+12816: 16, 4, 22
+12817: 16, 4, 23
+12818: 16, 5, 0
+12819: 16, 5, 1
+12820: 16, 5, 2
+12821: 16, 5, 3
+12822: 16, 5, 4
+12823: 16, 5, 5
+12824: 16, 5, 6
+12825: 16, 5, 7
+12826: 16, 5, 8
+12827: 16, 5, 9
+12828: 16, 5, 10
+12829: 16, 5, 11
+12830: 16, 5, 12
+12831: 16, 5, 13
+12832: 16, 5, 14
+12833: 16, 5, 15
+12834: 16, 5, 16
+12835: 16, 5, 17
+12836: 16, 5, 18
+12837: 16, 5, 19
+12838: 16, 6, 0
+12839: 16, 6, 1
+12840: 16, 6, 2
+12841: 16, 6, 3
+12842: 16, 6, 4
+12843: 16, 6, 5
+12844: 16, 6, 6
+12845: 16, 6, 7
+12846: 16, 6, 8
+12847: 16, 6, 9
+12848: 16, 6, 10
+12849: 16, 6, 11
+12850: 16, 6, 12
+12851: 16, 6, 13
+12852: 16, 6, 14
+12853: 16, 6, 15
+12854: 16, 6, 16
+12855: 16, 6, 17
+12856: 16, 6, 18
+12857: 16, 6, 19
+12858: 16, 7, 0
+12859: 16, 7, 1
+12860: 16, 7, 2
+12861: 16, 7, 3
+12862: 16, 7, 4
+12863: 16, 7, 5
+12864: 16, 7, 6
+12865: 16, 7, 7
+12866: 16, 7, 8
+12867: 16, 7, 9
+12868: 16, 7, 10
+12869: 16, 7, 11
+12870: 16, 7, 12
+12871: 16, 7, 13
+12872: 16, 7, 14
+12873: 16, 7, 15
+12874: 16, 7, 16
+12875: 16, 7, 17
+12876: 16, 7, 18
+12877: 16, 7, 19
+12878: 16, 7, 20
+12879: 16, 7, 21
+12880: 16, 7, 22
+12881: 16, 7, 23
+12882: 16, 7, 24
+12883: 16, 7, 25
+12884: 16, 7, 26
+12885: 16, 7, 27
+12886: 16, 7, 28
+12887: 16, 7, 29
+12888: 16, 7, 30
+12889: 16, 7, 31
+12890: 16, 7, 32
+12891: 16, 7, 33
+12892: 16, 7, 34
+12893: 16, 7, 35
+12894: 16, 7, 36
+12895: 16, 7, 37
+12896: 16, 7, 38
+12897: 16, 7, 39
+12898: 16, 7, 40
+12899: 16, 7, 41
+12900: 16, 7, 42
+12901: 16, 7, 43
+12902: 16, 7, 44
+12903: 16, 7, 45
+12904: 16, 7, 46
+12905: 16, 7, 47
+12906: 16, 7, 48
+12907: 16, 7, 49
+12908: 16, 7, 50
+12909: 16, 7, 51
+12910: 16, 7, 52
+12911: 16, 7, 53
+12912: 16, 7, 54
+12913: 16, 7, 55
+12914: 16, 7, 56
+12915: 16, 7, 57
+12916: 16, 7, 58
+12917: 16, 7, 59
+12918: 16, 7, 60
+12919: 16, 7, 61
+12920: 16, 7, 62
+12921: 16, 7, 63
+12922: 16, 7, 64
+12923: 16, 7, 65
+12924: 16, 7, 66
+12925: 16, 7, 67
+12926: 16, 7, 68
+12927: 16, 7, 69
+12928: 16, 7, 70
+12929: 16, 7, 71
+12930: 16, 7, 72
+12931: 16, 7, 73
+12932: 16, 8, 0
+12933: 16, 8, 1
+12934: 16, 8, 2
+12935: 16, 8, 3
+12936: 16, 8, 4
+12937: 16, 8, 5
+12938: 16, 8, 6
+12939: 16, 8, 7
+12940: 16, 8, 8
+12941: 16, 8, 9
+12942: 16, 8, 10
+12943: 16, 8, 11
+12944: 16, 8, 12
+12945: 16, 8, 13
+12946: 16, 8, 14
+12947: 16, 8, 15
+12948: 16, 8, 16
+12949: 16, 8, 17
+12950: 16, 8, 18
+12951: 16, 9, 0
+12952: 16, 9, 1
+12953: 16, 9, 2
+12954: 16, 9, 3
+12955: 16, 9, 4
+12956: 16, 9, 5
+12957: 16, 9, 6
+12958: 16, 9, 7
+12959: 16, 9, 8
+12960: 16, 9, 9
+12961: 16, 9, 10
+12962: 16, 9, 11
+12963: 16, 9, 12
+12964: 16, 9, 13
+12965: 16, 9, 14
+12966: 16, 9, 15
+12967: 16, 9, 16
+12968: 16, 9, 17
+12969: 16, 9, 18
+12970: 16, 9, 19
+12971: 16, 9, 20
+12972: 16, 9, 21
+12973: 16, 9, 22
+12974: 16, 9, 23
+12975: 16, 9, 24
+12976: 16, 9, 25
+12977: 16, 9, 26
+12978: 16, 9, 27
+12979: 16, 9, 28
+12980: 16, 9, 29
+12981: 16, 9, 30
+12982: 16, 9, 31
+12983: 16, 9, 32
+12984: 16, 9, 33
+12985: 16, 9, 34
+12986: 16, 9, 35
+12987: 16, 9, 36
+12988: 16, 9, 37
+12989: 16, 9, 38
+12990: 16, 10, 0
+12991: 16, 10, 1
+12992: 16, 10, 2
+12993: 16, 10, 3
+12994: 16, 10, 4
+12995: 16, 10, 5
+12996: 16, 10, 6
+12997: 16, 10, 7
+12998: 16, 10, 8
+12999: 16, 10, 9
+13000: 16, 10, 10
+13001: 16, 10, 11
+13002: 16, 10, 12
+13003: 16, 10, 13
+13004: 16, 10, 14
+13005: 16, 10, 15
+13006: 16, 10, 16
+13007: 16, 10, 17
+13008: 16, 10, 18
+13009: 16, 10, 19
+13010: 16, 10, 20
+13011: 16, 10, 21
+13012: 16, 10, 22
+13013: 16, 10, 23
+13014: 16, 10, 24
+13015: 16, 10, 25
+13016: 16, 10, 26
+13017: 16, 10, 27
+13018: 16, 10, 28
+13019: 16, 10, 29
+13020: 16, 10, 30
+13021: 16, 10, 31
+13022: 16, 10, 32
+13023: 16, 10, 33
+13024: 16, 10, 34
+13025: 16, 10, 35
+13026: 16, 10, 36
+13027: 16, 10, 37
+13028: 16, 10, 38
+13029: 16, 10, 39
+13030: 16, 11, 0
+13031: 16, 11, 1
+13032: 16, 11, 2
+13033: 16, 11, 3
+13034: 16, 11, 4
+13035: 16, 11, 5
+13036: 16, 11, 6
+13037: 16, 11, 7
+13038: 16, 11, 8
+13039: 16, 11, 9
+13040: 16, 11, 10
+13041: 16, 11, 11
+13042: 16, 11, 12
+13043: 16, 11, 13
+13044: 16, 11, 14
+13045: 16, 11, 15
+13046: 16, 11, 16
+13047: 16, 11, 17
+13048: 16, 11, 18
+13049: 16, 11, 19
+13050: 16, 11, 20
+13051: 16, 11, 21
+13052: 16, 11, 22
+13053: 16, 11, 23
+13054: 16, 11, 24
+13055: 16, 11, 25
+13056: 16, 11, 26
+13057: 16, 11, 27
+13058: 16, 11, 28
+13059: 16, 11, 29
+13060: 16, 11, 30
+13061: 16, 11, 31
+13062: 16, 11, 32
+13063: 16, 11, 33
+13064: 16, 11, 34
+13065: 16, 11, 35
+13066: 16, 11, 36
+13067: 16, 12, 0
+13068: 16, 12, 1
+13069: 16, 12, 2
+13070: 16, 12, 3
+13071: 16, 12, 4
+13072: 16, 12, 5
+13073: 16, 12, 6
+13074: 16, 12, 7
+13075: 16, 12, 8
+13076: 16, 12, 9
+13077: 16, 12, 10
+13078: 16, 12, 11
+13079: 16, 12, 12
+13080: 16, 12, 13
+13081: 16, 12, 14
+13082: 16, 12, 15
+13083: 16, 12, 16
+13084: 16, 12, 17
+13085: 16, 12, 18
+13086: 16, 12, 19
+13087: 16, 12, 20
+13088: 16, 12, 21
+13089: 16, 12, 22
+13090: 16, 12, 23
+13091: 16, 12, 24
+13092: 16, 12, 25
+13093: 16, 12, 26
+13094: 16, 12, 27
+13095: 16, 12, 28
+13096: 16, 12, 29
+13097: 16, 12, 30
+13098: 16, 12, 31
+13099: 16, 12, 32
+13100: 16, 12, 33
+13101: 16, 12, 34
+13102: 16, 12, 35
+13103: 16, 12, 36
+13104: 16, 12, 37
+13105: 16, 12, 38
+13106: 16, 12, 39
+13107: 16, 12, 40
+13108: 16, 12, 41
+13109: 16, 12, 42
+13110: 16, 12, 43
+13111: 16, 12, 44
+13112: 16, 12, 45
+13113: 16, 12, 46
+13114: 16, 12, 47
+13115: 16, 13, 0
+13116: 16, 13, 1
+13117: 16, 13, 2
+13118: 16, 13, 3
+13119: 16, 13, 4
+13120: 16, 13, 5
+13121: 16, 13, 6
+13122: 16, 13, 7
+13123: 16, 13, 8
+13124: 16, 13, 9
+13125: 16, 13, 10
+13126: 16, 13, 11
+13127: 16, 13, 12
+13128: 16, 13, 13
+13129: 16, 13, 14
+13130: 16, 13, 15
+13131: 16, 13, 16
+13132: 16, 13, 17
+13133: 16, 13, 18
+13134: 16, 13, 19
+13135: 16, 13, 20
+13136: 16, 13, 21
+13137: 16, 13, 22
+13138: 16, 13, 23
+13139: 16, 13, 24
+13140: 16, 13, 25
+13141: 16, 13, 26
+13142: 16, 13, 27
+13143: 16, 13, 28
+13144: 16, 13, 29
+13145: 16, 13, 30
+13146: 16, 13, 31
+13147: 17, 0, 0
+13148: 17, 1, 0
+13149: 17, 1, 1
+13150: 17, 1, 2
+13151: 17, 1, 3
+13152: 17, 1, 4
+13153: 17, 1, 5
+13154: 17, 1, 6
+13155: 17, 1, 7
+13156: 17, 1, 8
+13157: 17, 1, 9
+13158: 17, 1, 10
+13159: 17, 1, 11
+13160: 17, 1, 12
+13161: 17, 1, 13
+13162: 17, 1, 14
+13163: 17, 1, 15
+13164: 17, 1, 16
+13165: 17, 1, 17
+13166: 17, 1, 18
+13167: 17, 1, 19
+13168: 17, 1, 20
+13169: 17, 1, 21
+13170: 17, 1, 22
+13171: 17, 2, 0
+13172: 17, 2, 1
+13173: 17, 2, 2
+13174: 17, 2, 3
+13175: 17, 2, 4
+13176: 17, 2, 5
+13177: 17, 2, 6
+13178: 17, 2, 7
+13179: 17, 2, 8
+13180: 17, 2, 9
+13181: 17, 2, 10
+13182: 17, 2, 11
+13183: 17, 2, 12
+13184: 17, 2, 13
+13185: 17, 2, 14
+13186: 17, 2, 15
+13187: 17, 2, 16
+13188: 17, 2, 17
+13189: 17, 2, 18
+13190: 17, 2, 19
+13191: 17, 2, 20
+13192: 17, 2, 21
+13193: 17, 2, 22
+13194: 17, 2, 23
+13195: 17, 3, 0
+13196: 17, 3, 1
+13197: 17, 3, 2
+13198: 17, 3, 3
+13199: 17, 3, 4
+13200: 17, 3, 5
+13201: 17, 3, 6
+13202: 17, 3, 7
+13203: 17, 3, 8
+13204: 17, 3, 9
+13205: 17, 3, 10
+13206: 17, 3, 11
+13207: 17, 3, 12
+13208: 17, 3, 13
+13209: 17, 3, 14
+13210: 17, 3, 15
+13211: 17, 4, 0
+13212: 17, 4, 1
+13213: 17, 4, 2
+13214: 17, 4, 3
+13215: 17, 4, 4
+13216: 17, 4, 5
+13217: 17, 4, 6
+13218: 17, 4, 7
+13219: 17, 4, 8
+13220: 17, 4, 9
+13221: 17, 4, 10
+13222: 17, 4, 11
+13223: 17, 4, 12
+13224: 17, 4, 13
+13225: 17, 4, 14
+13226: 17, 4, 15
+13227: 17, 4, 16
+13228: 17, 4, 17
+13229: 17, 5, 0
+13230: 17, 5, 1
+13231: 17, 5, 2
+13232: 17, 5, 3
+13233: 17, 5, 4
+13234: 17, 5, 5
+13235: 17, 5, 6
+13236: 17, 5, 7
+13237: 17, 5, 8
+13238: 17, 5, 9
+13239: 17, 5, 10
+13240: 17, 5, 11
+13241: 17, 5, 12
+13242: 17, 5, 13
+13243: 17, 5, 14
+13244: 17, 6, 0
+13245: 17, 6, 1
+13246: 17, 6, 2
+13247: 17, 6, 3
+13248: 17, 6, 4
+13249: 17, 6, 5
+13250: 17, 6, 6
+13251: 17, 6, 7
+13252: 17, 6, 8
+13253: 17, 6, 9
+13254: 17, 6, 10
+13255: 17, 6, 11
+13256: 17, 6, 12
+13257: 17, 6, 13
+13258: 17, 6, 14
+13259: 17, 7, 0
+13260: 17, 7, 1
+13261: 17, 7, 2
+13262: 17, 7, 3
+13263: 17, 7, 4
+13264: 17, 7, 5
+13265: 17, 7, 6
+13266: 17, 7, 7
+13267: 17, 7, 8
+13268: 17, 7, 9
+13269: 17, 7, 10
+13270: 17, 8, 0
+13271: 17, 8, 1
+13272: 17, 8, 2
+13273: 17, 8, 3
+13274: 17, 8, 4
+13275: 17, 8, 5
+13276: 17, 8, 6
+13277: 17, 8, 7
+13278: 17, 8, 8
+13279: 17, 8, 9
+13280: 17, 8, 10
+13281: 17, 8, 11
+13282: 17, 8, 12
+13283: 17, 8, 13
+13284: 17, 8, 14
+13285: 17, 8, 15
+13286: 17, 8, 16
+13287: 17, 8, 17
+13288: 17, 9, 0
+13289: 17, 9, 1
+13290: 17, 9, 2
+13291: 17, 9, 3
+13292: 17, 9, 4
+13293: 17, 9, 5
+13294: 17, 9, 6
+13295: 17, 9, 7
+13296: 17, 9, 8
+13297: 17, 9, 9
+13298: 17, 9, 10
+13299: 17, 9, 11
+13300: 17, 9, 12
+13301: 17, 9, 13
+13302: 17, 9, 14
+13303: 17, 9, 15
+13304: 17, 9, 16
+13305: 17, 9, 17
+13306: 17, 9, 18
+13307: 17, 9, 19
+13308: 17, 9, 20
+13309: 17, 9, 21
+13310: 17, 9, 22
+13311: 17, 9, 23
+13312: 17, 9, 24
+13313: 17, 9, 25
+13314: 17, 9, 26
+13315: 17, 9, 27
+13316: 17, 9, 28
+13317: 17, 9, 29
+13318: 17, 9, 30
+13319: 17, 9, 31
+13320: 17, 9, 32
+13321: 17, 10, 0
+13322: 17, 10, 1
+13323: 17, 10, 2
+13324: 17, 10, 3
+13325: 18, 0, 0
+13326: 18, 1, 0
+13327: 18, 1, 1
+13328: 18, 1, 2
+13329: 18, 1, 3
+13330: 18, 1, 4
+13331: 18, 1, 5
+13332: 18, 1, 6
+13333: 18, 1, 7
+13334: 18, 1, 8
+13335: 18, 1, 9
+13336: 18, 1, 10
+13337: 18, 1, 11
+13338: 18, 1, 12
+13339: 18, 1, 13
+13340: 18, 1, 14
+13341: 18, 1, 15
+13342: 18, 1, 16
+13343: 18, 1, 17
+13344: 18, 1, 18
+13345: 18, 1, 19
+13346: 18, 1, 20
+13347: 18, 1, 21
+13348: 18, 1, 22
+13349: 18, 2, 0
+13350: 18, 2, 1
+13351: 18, 2, 2
+13352: 18, 2, 3
+13353: 18, 2, 4
+13354: 18, 2, 5
+13355: 18, 2, 6
+13356: 18, 2, 7
+13357: 18, 2, 8
+13358: 18, 2, 9
+13359: 18, 2, 10
+13360: 18, 2, 11
+13361: 18, 2, 12
+13362: 18, 2, 13
+13363: 18, 3, 0
+13364: 18, 3, 1
+13365: 18, 3, 2
+13366: 18, 3, 3
+13367: 18, 3, 4
+13368: 18, 3, 5
+13369: 18, 3, 6
+13370: 18, 3, 7
+13371: 18, 3, 8
+13372: 18, 3, 9
+13373: 18, 3, 10
+13374: 18, 3, 11
+13375: 18, 3, 12
+13376: 18, 3, 13
+13377: 18, 3, 14
+13378: 18, 3, 15
+13379: 18, 3, 16
+13380: 18, 3, 17
+13381: 18, 3, 18
+13382: 18, 3, 19
+13383: 18, 3, 20
+13384: 18, 3, 21
+13385: 18, 3, 22
+13386: 18, 3, 23
+13387: 18, 3, 24
+13388: 18, 3, 25
+13389: 18, 3, 26
+13390: 18, 4, 0
+13391: 18, 4, 1
+13392: 18, 4, 2
+13393: 18, 4, 3
+13394: 18, 4, 4
+13395: 18, 4, 5
+13396: 18, 4, 6
+13397: 18, 4, 7
+13398: 18, 4, 8
+13399: 18, 4, 9
+13400: 18, 4, 10
+13401: 18, 4, 11
+13402: 18, 4, 12
+13403: 18, 4, 13
+13404: 18, 4, 14
+13405: 18, 4, 15
+13406: 18, 4, 16
+13407: 18, 4, 17
+13408: 18, 4, 18
+13409: 18, 4, 19
+13410: 18, 4, 20
+13411: 18, 4, 21
+13412: 18, 5, 0
+13413: 18, 5, 1
+13414: 18, 5, 2
+13415: 18, 5, 3
+13416: 18, 5, 4
+13417: 18, 5, 5
+13418: 18, 5, 6
+13419: 18, 5, 7
+13420: 18, 5, 8
+13421: 18, 5, 9
+13422: 18, 5, 10
+13423: 18, 5, 11
+13424: 18, 5, 12
+13425: 18, 5, 13
+13426: 18, 5, 14
+13427: 18, 5, 15
+13428: 18, 5, 16
+13429: 18, 5, 17
+13430: 18, 5, 18
+13431: 18, 5, 19
+13432: 18, 5, 20
+13433: 18, 5, 21
+13434: 18, 5, 22
+13435: 18, 5, 23
+13436: 18, 5, 24
+13437: 18, 5, 25
+13438: 18, 5, 26
+13439: 18, 5, 27
+13440: 18, 6, 0
+13441: 18, 6, 1
+13442: 18, 6, 2
+13443: 18, 6, 3
+13444: 18, 6, 4
+13445: 18, 6, 5
+13446: 18, 6, 6
+13447: 18, 6, 7
+13448: 18, 6, 8
+13449: 18, 6, 9
+13450: 18, 6, 10
+13451: 18, 6, 11
+13452: 18, 6, 12
+13453: 18, 6, 13
+13454: 18, 6, 14
+13455: 18, 6, 15
+13456: 18, 6, 16
+13457: 18, 6, 17
+13458: 18, 6, 18
+13459: 18, 6, 19
+13460: 18, 6, 20
+13461: 18, 6, 21
+13462: 18, 6, 22
+13463: 18, 6, 23
+13464: 18, 6, 24
+13465: 18, 6, 25
+13466: 18, 6, 26
+13467: 18, 6, 27
+13468: 18, 6, 28
+13469: 18, 6, 29
+13470: 18, 6, 30
+13471: 18, 7, 0
+13472: 18, 7, 1
+13473: 18, 7, 2
+13474: 18, 7, 3
+13475: 18, 7, 4
+13476: 18, 7, 5
+13477: 18, 7, 6
+13478: 18, 7, 7
+13479: 18, 7, 8
+13480: 18, 7, 9
+13481: 18, 7, 10
+13482: 18, 7, 11
+13483: 18, 7, 12
+13484: 18, 7, 13
+13485: 18, 7, 14
+13486: 18, 7, 15
+13487: 18, 7, 16
+13488: 18, 7, 17
+13489: 18, 7, 18
+13490: 18, 7, 19
+13491: 18, 7, 20
+13492: 18, 7, 21
+13493: 18, 8, 0
+13494: 18, 8, 1
+13495: 18, 8, 2
+13496: 18, 8, 3
+13497: 18, 8, 4
+13498: 18, 8, 5
+13499: 18, 8, 6
+13500: 18, 8, 7
+13501: 18, 8, 8
+13502: 18, 8, 9
+13503: 18, 8, 10
+13504: 18, 8, 11
+13505: 18, 8, 12
+13506: 18, 8, 13
+13507: 18, 8, 14
+13508: 18, 8, 15
+13509: 18, 8, 16
+13510: 18, 8, 17
+13511: 18, 8, 18
+13512: 18, 8, 19
+13513: 18, 8, 20
+13514: 18, 8, 21
+13515: 18, 8, 22
+13516: 18, 9, 0
+13517: 18, 9, 1
+13518: 18, 9, 2
+13519: 18, 9, 3
+13520: 18, 9, 4
+13521: 18, 9, 5
+13522: 18, 9, 6
+13523: 18, 9, 7
+13524: 18, 9, 8
+13525: 18, 9, 9
+13526: 18, 9, 10
+13527: 18, 9, 11
+13528: 18, 9, 12
+13529: 18, 9, 13
+13530: 18, 9, 14
+13531: 18, 9, 15
+13532: 18, 9, 16
+13533: 18, 9, 17
+13534: 18, 9, 18
+13535: 18, 9, 19
+13536: 18, 9, 20
+13537: 18, 9, 21
+13538: 18, 9, 22
+13539: 18, 9, 23
+13540: 18, 9, 24
+13541: 18, 9, 25
+13542: 18, 9, 26
+13543: 18, 9, 27
+13544: 18, 9, 28
+13545: 18, 9, 29
+13546: 18, 9, 30
+13547: 18, 9, 31
+13548: 18, 9, 32
+13549: 18, 9, 33
+13550: 18, 9, 34
+13551: 18, 9, 35
+13552: 18, 10, 0
+13553: 18, 10, 1
+13554: 18, 10, 2
+13555: 18, 10, 3
+13556: 18, 10, 4
+13557: 18, 10, 5
+13558: 18, 10, 6
+13559: 18, 10, 7
+13560: 18, 10, 8
+13561: 18, 10, 9
+13562: 18, 10, 10
+13563: 18, 10, 11
+13564: 18, 10, 12
+13565: 18, 10, 13
+13566: 18, 10, 14
+13567: 18, 10, 15
+13568: 18, 10, 16
+13569: 18, 10, 17
+13570: 18, 10, 18
+13571: 18, 10, 19
+13572: 18, 10, 20
+13573: 18, 10, 21
+13574: 18, 10, 22
+13575: 18, 11, 0
+13576: 18, 11, 1
+13577: 18, 11, 2
+13578: 18, 11, 3
+13579: 18, 11, 4
+13580: 18, 11, 5
+13581: 18, 11, 6
+13582: 18, 11, 7
+13583: 18, 11, 8
+13584: 18, 11, 9
+13585: 18, 11, 10
+13586: 18, 11, 11
+13587: 18, 11, 12
+13588: 18, 11, 13
+13589: 18, 11, 14
+13590: 18, 11, 15
+13591: 18, 11, 16
+13592: 18, 11, 17
+13593: 18, 11, 18
+13594: 18, 11, 19
+13595: 18, 11, 20
+13596: 18, 12, 0
+13597: 18, 12, 1
+13598: 18, 12, 2
+13599: 18, 12, 3
+13600: 18, 12, 4
+13601: 18, 12, 5
+13602: 18, 12, 6
+13603: 18, 12, 7
+13604: 18, 12, 8
+13605: 18, 12, 9
+13606: 18, 12, 10
+13607: 18, 12, 11
+13608: 18, 12, 12
+13609: 18, 12, 13
+13610: 18, 12, 14
+13611: 18, 12, 15
+13612: 18, 12, 16
+13613: 18, 12, 17
+13614: 18, 12, 18
+13615: 18, 12, 19
+13616: 18, 12, 20
+13617: 18, 12, 21
+13618: 18, 12, 22
+13619: 18, 12, 23
+13620: 18, 12, 24
+13621: 18, 12, 25
+13622: 18, 13, 0
+13623: 18, 13, 1
+13624: 18, 13, 2
+13625: 18, 13, 3
+13626: 18, 13, 4
+13627: 18, 13, 5
+13628: 18, 13, 6
+13629: 18, 13, 7
+13630: 18, 13, 8
+13631: 18, 13, 9
+13632: 18, 13, 10
+13633: 18, 13, 11
+13634: 18, 13, 12
+13635: 18, 13, 13
+13636: 18, 13, 14
+13637: 18, 13, 15
+13638: 18, 13, 16
+13639: 18, 13, 17
+13640: 18, 13, 18
+13641: 18, 13, 19
+13642: 18, 13, 20
+13643: 18, 13, 21
+13644: 18, 13, 22
+13645: 18, 13, 23
+13646: 18, 13, 24
+13647: 18, 13, 25
+13648: 18, 13, 26
+13649: 18, 13, 27
+13650: 18, 13, 28
+13651: 18, 14, 0
+13652: 18, 14, 1
+13653: 18, 14, 2
+13654: 18, 14, 3
+13655: 18, 14, 4
+13656: 18, 14, 5
+13657: 18, 14, 6
+13658: 18, 14, 7
+13659: 18, 14, 8
+13660: 18, 14, 9
+13661: 18, 14, 10
+13662: 18, 14, 11
+13663: 18, 14, 12
+13664: 18, 14, 13
+13665: 18, 14, 14
+13666: 18, 14, 15
+13667: 18, 14, 16
+13668: 18, 14, 17
+13669: 18, 14, 18
+13670: 18, 14, 19
+13671: 18, 14, 20
+13672: 18, 14, 21
+13673: 18, 14, 22
+13674: 18, 15, 0
+13675: 18, 15, 1
+13676: 18, 15, 2
+13677: 18, 15, 3
+13678: 18, 15, 4
+13679: 18, 15, 5
+13680: 18, 15, 6
+13681: 18, 15, 7
+13682: 18, 15, 8
+13683: 18, 15, 9
+13684: 18, 15, 10
+13685: 18, 15, 11
+13686: 18, 15, 12
+13687: 18, 15, 13
+13688: 18, 15, 14
+13689: 18, 15, 15
+13690: 18, 15, 16
+13691: 18, 15, 17
+13692: 18, 15, 18
+13693: 18, 15, 19
+13694: 18, 15, 20
+13695: 18, 15, 21
+13696: 18, 15, 22
+13697: 18, 15, 23
+13698: 18, 15, 24
+13699: 18, 15, 25
+13700: 18, 15, 26
+13701: 18, 15, 27
+13702: 18, 15, 28
+13703: 18, 15, 29
+13704: 18, 15, 30
+13705: 18, 15, 31
+13706: 18, 15, 32
+13707: 18, 15, 33
+13708: 18, 15, 34
+13709: 18, 15, 35
+13710: 18, 16, 0
+13711: 18, 16, 1
+13712: 18, 16, 2
+13713: 18, 16, 3
+13714: 18, 16, 4
+13715: 18, 16, 5
+13716: 18, 16, 6
+13717: 18, 16, 7
+13718: 18, 16, 8
+13719: 18, 16, 9
+13720: 18, 16, 10
+13721: 18, 16, 11
+13722: 18, 16, 12
+13723: 18, 16, 13
+13724: 18, 16, 14
+13725: 18, 16, 15
+13726: 18, 16, 16
+13727: 18, 16, 17
+13728: 18, 16, 18
+13729: 18, 16, 19
+13730: 18, 16, 20
+13731: 18, 16, 21
+13732: 18, 16, 22
+13733: 18, 17, 0
+13734: 18, 17, 1
+13735: 18, 17, 2
+13736: 18, 17, 3
+13737: 18, 17, 4
+13738: 18, 17, 5
+13739: 18, 17, 6
+13740: 18, 17, 7
+13741: 18, 17, 8
+13742: 18, 17, 9
+13743: 18, 17, 10
+13744: 18, 17, 11
+13745: 18, 17, 12
+13746: 18, 17, 13
+13747: 18, 17, 14
+13748: 18, 17, 15
+13749: 18, 17, 16
+13750: 18, 18, 0
+13751: 18, 18, 1
+13752: 18, 18, 2
+13753: 18, 18, 3
+13754: 18, 18, 4
+13755: 18, 18, 5
+13756: 18, 18, 6
+13757: 18, 18, 7
+13758: 18, 18, 8
+13759: 18, 18, 9
+13760: 18, 18, 10
+13761: 18, 18, 11
+13762: 18, 18, 12
+13763: 18, 18, 13
+13764: 18, 18, 14
+13765: 18, 18, 15
+13766: 18, 18, 16
+13767: 18, 18, 17
+13768: 18, 18, 18
+13769: 18, 18, 19
+13770: 18, 18, 20
+13771: 18, 18, 21
+13772: 18, 19, 0
+13773: 18, 19, 1
+13774: 18, 19, 2
+13775: 18, 19, 3
+13776: 18, 19, 4
+13777: 18, 19, 5
+13778: 18, 19, 6
+13779: 18, 19, 7
+13780: 18, 19, 8
+13781: 18, 19, 9
+13782: 18, 19, 10
+13783: 18, 19, 11
+13784: 18, 19, 12
+13785: 18, 19, 13
+13786: 18, 19, 14
+13787: 18, 19, 15
+13788: 18, 19, 16
+13789: 18, 19, 17
+13790: 18, 19, 18
+13791: 18, 19, 19
+13792: 18, 19, 20
+13793: 18, 19, 21
+13794: 18, 19, 22
+13795: 18, 19, 23
+13796: 18, 19, 24
+13797: 18, 19, 25
+13798: 18, 19, 26
+13799: 18, 19, 27
+13800: 18, 19, 28
+13801: 18, 19, 29
+13802: 18, 20, 0
+13803: 18, 20, 1
+13804: 18, 20, 2
+13805: 18, 20, 3
+13806: 18, 20, 4
+13807: 18, 20, 5
+13808: 18, 20, 6
+13809: 18, 20, 7
+13810: 18, 20, 8
+13811: 18, 20, 9
+13812: 18, 20, 10
+13813: 18, 20, 11
+13814: 18, 20, 12
+13815: 18, 20, 13
+13816: 18, 20, 14
+13817: 18, 20, 15
+13818: 18, 20, 16
+13819: 18, 20, 17
+13820: 18, 20, 18
+13821: 18, 20, 19
+13822: 18, 20, 20
+13823: 18, 20, 21
+13824: 18, 20, 22
+13825: 18, 20, 23
+13826: 18, 20, 24
+13827: 18, 20, 25
+13828: 18, 20, 26
+13829: 18, 20, 27
+13830: 18, 20, 28
+13831: 18, 20, 29
+13832: 18, 21, 0
+13833: 18, 21, 1
+13834: 18, 21, 2
+13835: 18, 21, 3
+13836: 18, 21, 4
+13837: 18, 21, 5
+13838: 18, 21, 6
+13839: 18, 21, 7
+13840: 18, 21, 8
+13841: 18, 21, 9
+13842: 18, 21, 10
+13843: 18, 21, 11
+13844: 18, 21, 12
+13845: 18, 21, 13
+13846: 18, 21, 14
+13847: 18, 21, 15
+13848: 18, 21, 16
+13849: 18, 21, 17
+13850: 18, 21, 18
+13851: 18, 21, 19
+13852: 18, 21, 20
+13853: 18, 21, 21
+13854: 18, 21, 22
+13855: 18, 21, 23
+13856: 18, 21, 24
+13857: 18, 21, 25
+13858: 18, 21, 26
+13859: 18, 21, 27
+13860: 18, 21, 28
+13861: 18, 21, 29
+13862: 18, 21, 30
+13863: 18, 21, 31
+13864: 18, 21, 32
+13865: 18, 21, 33
+13866: 18, 21, 34
+13867: 18, 22, 0
+13868: 18, 22, 1
+13869: 18, 22, 2
+13870: 18, 22, 3
+13871: 18, 22, 4
+13872: 18, 22, 5
+13873: 18, 22, 6
+13874: 18, 22, 7
+13875: 18, 22, 8
+13876: 18, 22, 9
+13877: 18, 22, 10
+13878: 18, 22, 11
+13879: 18, 22, 12
+13880: 18, 22, 13
+13881: 18, 22, 14
+13882: 18, 22, 15
+13883: 18, 22, 16
+13884: 18, 22, 17
+13885: 18, 22, 18
+13886: 18, 22, 19
+13887: 18, 22, 20
+13888: 18, 22, 21
+13889: 18, 22, 22
+13890: 18, 22, 23
+13891: 18, 22, 24
+13892: 18, 22, 25
+13893: 18, 22, 26
+13894: 18, 22, 27
+13895: 18, 22, 28
+13896: 18, 22, 29
+13897: 18, 22, 30
+13898: 18, 23, 0
+13899: 18, 23, 1
+13900: 18, 23, 2
+13901: 18, 23, 3
+13902: 18, 23, 4
+13903: 18, 23, 5
+13904: 18, 23, 6
+13905: 18, 23, 7
+13906: 18, 23, 8
+13907: 18, 23, 9
+13908: 18, 23, 10
+13909: 18, 23, 11
+13910: 18, 23, 12
+13911: 18, 23, 13
+13912: 18, 23, 14
+13913: 18, 23, 15
+13914: 18, 23, 16
+13915: 18, 23, 17
+13916: 18, 24, 0
+13917: 18, 24, 1
+13918: 18, 24, 2
+13919: 18, 24, 3
+13920: 18, 24, 4
+13921: 18, 24, 5
+13922: 18, 24, 6
+13923: 18, 24, 7
+13924: 18, 24, 8
+13925: 18, 24, 9
+13926: 18, 24, 10
+13927: 18, 24, 11
+13928: 18, 24, 12
+13929: 18, 24, 13
+13930: 18, 24, 14
+13931: 18, 24, 15
+13932: 18, 24, 16
+13933: 18, 24, 17
+13934: 18, 24, 18
+13935: 18, 24, 19
+13936: 18, 24, 20
+13937: 18, 24, 21
+13938: 18, 24, 22
+13939: 18, 24, 23
+13940: 18, 24, 24
+13941: 18, 24, 25
+13942: 18, 25, 0
+13943: 18, 25, 1
+13944: 18, 25, 2
+13945: 18, 25, 3
+13946: 18, 25, 4
+13947: 18, 25, 5
+13948: 18, 25, 6
+13949: 18, 26, 0
+13950: 18, 26, 1
+13951: 18, 26, 2
+13952: 18, 26, 3
+13953: 18, 26, 4
+13954: 18, 26, 5
+13955: 18, 26, 6
+13956: 18, 26, 7
+13957: 18, 26, 8
+13958: 18, 26, 9
+13959: 18, 26, 10
+13960: 18, 26, 11
+13961: 18, 26, 12
+13962: 18, 26, 13
+13963: 18, 26, 14
+13964: 18, 27, 0
+13965: 18, 27, 1
+13966: 18, 27, 2
+13967: 18, 27, 3
+13968: 18, 27, 4
+13969: 18, 27, 5
+13970: 18, 27, 6
+13971: 18, 27, 7
+13972: 18, 27, 8
+13973: 18, 27, 9
+13974: 18, 27, 10
+13975: 18, 27, 11
+13976: 18, 27, 12
+13977: 18, 27, 13
+13978: 18, 27, 14
+13979: 18, 27, 15
+13980: 18, 27, 16
+13981: 18, 27, 17
+13982: 18, 27, 18
+13983: 18, 27, 19
+13984: 18, 27, 20
+13985: 18, 27, 21
+13986: 18, 27, 22
+13987: 18, 27, 23
+13988: 18, 28, 0
+13989: 18, 28, 1
+13990: 18, 28, 2
+13991: 18, 28, 3
+13992: 18, 28, 4
+13993: 18, 28, 5
+13994: 18, 28, 6
+13995: 18, 28, 7
+13996: 18, 28, 8
+13997: 18, 28, 9
+13998: 18, 28, 10
+13999: 18, 28, 11
+14000: 18, 28, 12
+14001: 18, 28, 13
+14002: 18, 28, 14
+14003: 18, 28, 15
+14004: 18, 28, 16
+14005: 18, 28, 17
+14006: 18, 28, 18
+14007: 18, 28, 19
+14008: 18, 28, 20
+14009: 18, 28, 21
+14010: 18, 28, 22
+14011: 18, 28, 23
+14012: 18, 28, 24
+14013: 18, 28, 25
+14014: 18, 28, 26
+14015: 18, 28, 27
+14016: 18, 28, 28
+14017: 18, 29, 0
+14018: 18, 29, 1
+14019: 18, 29, 2
+14020: 18, 29, 3
+14021: 18, 29, 4
+14022: 18, 29, 5
+14023: 18, 29, 6
+14024: 18, 29, 7
+14025: 18, 29, 8
+14026: 18, 29, 9
+14027: 18, 29, 10
+14028: 18, 29, 11
+14029: 18, 29, 12
+14030: 18, 29, 13
+14031: 18, 29, 14
+14032: 18, 29, 15
+14033: 18, 29, 16
+14034: 18, 29, 17
+14035: 18, 29, 18
+14036: 18, 29, 19
+14037: 18, 29, 20
+14038: 18, 29, 21
+14039: 18, 29, 22
+14040: 18, 29, 23
+14041: 18, 29, 24
+14042: 18, 29, 25
+14043: 18, 30, 0
+14044: 18, 30, 1
+14045: 18, 30, 2
+14046: 18, 30, 3
+14047: 18, 30, 4
+14048: 18, 30, 5
+14049: 18, 30, 6
+14050: 18, 30, 7
+14051: 18, 30, 8
+14052: 18, 30, 9
+14053: 18, 30, 10
+14054: 18, 30, 11
+14055: 18, 30, 12
+14056: 18, 30, 13
+14057: 18, 30, 14
+14058: 18, 30, 15
+14059: 18, 30, 16
+14060: 18, 30, 17
+14061: 18, 30, 18
+14062: 18, 30, 19
+14063: 18, 30, 20
+14064: 18, 30, 21
+14065: 18, 30, 22
+14066: 18, 30, 23
+14067: 18, 30, 24
+14068: 18, 30, 25
+14069: 18, 30, 26
+14070: 18, 30, 27
+14071: 18, 30, 28
+14072: 18, 30, 29
+14073: 18, 30, 30
+14074: 18, 30, 31
+14075: 18, 31, 0
+14076: 18, 31, 1
+14077: 18, 31, 2
+14078: 18, 31, 3
+14079: 18, 31, 4
+14080: 18, 31, 5
+14081: 18, 31, 6
+14082: 18, 31, 7
+14083: 18, 31, 8
+14084: 18, 31, 9
+14085: 18, 31, 10
+14086: 18, 31, 11
+14087: 18, 31, 12
+14088: 18, 31, 13
+14089: 18, 31, 14
+14090: 18, 31, 15
+14091: 18, 31, 16
+14092: 18, 31, 17
+14093: 18, 31, 18
+14094: 18, 31, 19
+14095: 18, 31, 20
+14096: 18, 31, 21
+14097: 18, 31, 22
+14098: 18, 31, 23
+14099: 18, 31, 24
+14100: 18, 31, 25
+14101: 18, 31, 26
+14102: 18, 31, 27
+14103: 18, 31, 28
+14104: 18, 31, 29
+14105: 18, 31, 30
+14106: 18, 31, 31
+14107: 18, 31, 32
+14108: 18, 31, 33
+14109: 18, 31, 34
+14110: 18, 31, 35
+14111: 18, 31, 36
+14112: 18, 31, 37
+14113: 18, 31, 38
+14114: 18, 31, 39
+14115: 18, 31, 40
+14116: 18, 32, 0
+14117: 18, 32, 1
+14118: 18, 32, 2
+14119: 18, 32, 3
+14120: 18, 32, 4
+14121: 18, 32, 5
+14122: 18, 32, 6
+14123: 18, 32, 7
+14124: 18, 32, 8
+14125: 18, 32, 9
+14126: 18, 32, 10
+14127: 18, 32, 11
+14128: 18, 32, 12
+14129: 18, 32, 13
+14130: 18, 32, 14
+14131: 18, 32, 15
+14132: 18, 32, 16
+14133: 18, 32, 17
+14134: 18, 32, 18
+14135: 18, 32, 19
+14136: 18, 32, 20
+14137: 18, 32, 21
+14138: 18, 32, 22
+14139: 18, 33, 0
+14140: 18, 33, 1
+14141: 18, 33, 2
+14142: 18, 33, 3
+14143: 18, 33, 4
+14144: 18, 33, 5
+14145: 18, 33, 6
+14146: 18, 33, 7
+14147: 18, 33, 8
+14148: 18, 33, 9
+14149: 18, 33, 10
+14150: 18, 33, 11
+14151: 18, 33, 12
+14152: 18, 33, 13
+14153: 18, 33, 14
+14154: 18, 33, 15
+14155: 18, 33, 16
+14156: 18, 33, 17
+14157: 18, 33, 18
+14158: 18, 33, 19
+14159: 18, 33, 20
+14160: 18, 33, 21
+14161: 18, 33, 22
+14162: 18, 33, 23
+14163: 18, 33, 24
+14164: 18, 33, 25
+14165: 18, 33, 26
+14166: 18, 33, 27
+14167: 18, 33, 28
+14168: 18, 33, 29
+14169: 18, 33, 30
+14170: 18, 33, 31
+14171: 18, 33, 32
+14172: 18, 33, 33
+14173: 18, 34, 0
+14174: 18, 34, 1
+14175: 18, 34, 2
+14176: 18, 34, 3
+14177: 18, 34, 4
+14178: 18, 34, 5
+14179: 18, 34, 6
+14180: 18, 34, 7
+14181: 18, 34, 8
+14182: 18, 34, 9
+14183: 18, 34, 10
+14184: 18, 34, 11
+14185: 18, 34, 12
+14186: 18, 34, 13
+14187: 18, 34, 14
+14188: 18, 34, 15
+14189: 18, 34, 16
+14190: 18, 34, 17
+14191: 18, 34, 18
+14192: 18, 34, 19
+14193: 18, 34, 20
+14194: 18, 34, 21
+14195: 18, 34, 22
+14196: 18, 34, 23
+14197: 18, 34, 24
+14198: 18, 34, 25
+14199: 18, 34, 26
+14200: 18, 34, 27
+14201: 18, 34, 28
+14202: 18, 34, 29
+14203: 18, 34, 30
+14204: 18, 34, 31
+14205: 18, 34, 32
+14206: 18, 34, 33
+14207: 18, 34, 34
+14208: 18, 34, 35
+14209: 18, 34, 36
+14210: 18, 34, 37
+14211: 18, 35, 0
+14212: 18, 35, 1
+14213: 18, 35, 2
+14214: 18, 35, 3
+14215: 18, 35, 4
+14216: 18, 35, 5
+14217: 18, 35, 6
+14218: 18, 35, 7
+14219: 18, 35, 8
+14220: 18, 35, 9
+14221: 18, 35, 10
+14222: 18, 35, 11
+14223: 18, 35, 12
+14224: 18, 35, 13
+14225: 18, 35, 14
+14226: 18, 35, 15
+14227: 18, 35, 16
+14228: 18, 36, 0
+14229: 18, 36, 1
+14230: 18, 36, 2
+14231: 18, 36, 3
+14232: 18, 36, 4
+14233: 18, 36, 5
+14234: 18, 36, 6
+14235: 18, 36, 7
+14236: 18, 36, 8
+14237: 18, 36, 9
+14238: 18, 36, 10
+14239: 18, 36, 11
+14240: 18, 36, 12
+14241: 18, 36, 13
+14242: 18, 36, 14
+14243: 18, 36, 15
+14244: 18, 36, 16
+14245: 18, 36, 17
+14246: 18, 36, 18
+14247: 18, 36, 19
+14248: 18, 36, 20
+14249: 18, 36, 21
+14250: 18, 36, 22
+14251: 18, 36, 23
+14252: 18, 36, 24
+14253: 18, 36, 25
+14254: 18, 36, 26
+14255: 18, 36, 27
+14256: 18, 36, 28
+14257: 18, 36, 29
+14258: 18, 36, 30
+14259: 18, 36, 31
+14260: 18, 36, 32
+14261: 18, 36, 33
+14262: 18, 37, 0
+14263: 18, 37, 1
+14264: 18, 37, 2
+14265: 18, 37, 3
+14266: 18, 37, 4
+14267: 18, 37, 5
+14268: 18, 37, 6
+14269: 18, 37, 7
+14270: 18, 37, 8
+14271: 18, 37, 9
+14272: 18, 37, 10
+14273: 18, 37, 11
+14274: 18, 37, 12
+14275: 18, 37, 13
+14276: 18, 37, 14
+14277: 18, 37, 15
+14278: 18, 37, 16
+14279: 18, 37, 17
+14280: 18, 37, 18
+14281: 18, 37, 19
+14282: 18, 37, 20
+14283: 18, 37, 21
+14284: 18, 37, 22
+14285: 18, 37, 23
+14286: 18, 37, 24
+14287: 18, 38, 0
+14288: 18, 38, 1
+14289: 18, 38, 2
+14290: 18, 38, 3
+14291: 18, 38, 4
+14292: 18, 38, 5
+14293: 18, 38, 6
+14294: 18, 38, 7
+14295: 18, 38, 8
+14296: 18, 38, 9
+14297: 18, 38, 10
+14298: 18, 38, 11
+14299: 18, 38, 12
+14300: 18, 38, 13
+14301: 18, 38, 14
+14302: 18, 38, 15
+14303: 18, 38, 16
+14304: 18, 38, 17
+14305: 18, 38, 18
+14306: 18, 38, 19
+14307: 18, 38, 20
+14308: 18, 38, 21
+14309: 18, 38, 22
+14310: 18, 38, 23
+14311: 18, 38, 24
+14312: 18, 38, 25
+14313: 18, 38, 26
+14314: 18, 38, 27
+14315: 18, 38, 28
+14316: 18, 38, 29
+14317: 18, 38, 30
+14318: 18, 38, 31
+14319: 18, 38, 32
+14320: 18, 38, 33
+14321: 18, 38, 34
+14322: 18, 38, 35
+14323: 18, 38, 36
+14324: 18, 38, 37
+14325: 18, 38, 38
+14326: 18, 38, 39
+14327: 18, 38, 40
+14328: 18, 38, 41
+14329: 18, 39, 0
+14330: 18, 39, 1
+14331: 18, 39, 2
+14332: 18, 39, 3
+14333: 18, 39, 4
+14334: 18, 39, 5
+14335: 18, 39, 6
+14336: 18, 39, 7
+14337: 18, 39, 8
+14338: 18, 39, 9
+14339: 18, 39, 10
+14340: 18, 39, 11
+14341: 18, 39, 12
+14342: 18, 39, 13
+14343: 18, 39, 14
+14344: 18, 39, 15
+14345: 18, 39, 16
+14346: 18, 39, 17
+14347: 18, 39, 18
+14348: 18, 39, 19
+14349: 18, 39, 20
+14350: 18, 39, 21
+14351: 18, 39, 22
+14352: 18, 39, 23
+14353: 18, 39, 24
+14354: 18, 39, 25
+14355: 18, 39, 26
+14356: 18, 39, 27
+14357: 18, 39, 28
+14358: 18, 39, 29
+14359: 18, 39, 30
+14360: 18, 40, 0
+14361: 18, 40, 1
+14362: 18, 40, 2
+14363: 18, 40, 3
+14364: 18, 40, 4
+14365: 18, 40, 5
+14366: 18, 40, 6
+14367: 18, 40, 7
+14368: 18, 40, 8
+14369: 18, 40, 9
+14370: 18, 40, 10
+14371: 18, 40, 11
+14372: 18, 40, 12
+14373: 18, 40, 13
+14374: 18, 40, 14
+14375: 18, 40, 15
+14376: 18, 40, 16
+14377: 18, 40, 17
+14378: 18, 40, 18
+14379: 18, 40, 19
+14380: 18, 40, 20
+14381: 18, 40, 21
+14382: 18, 40, 22
+14383: 18, 40, 23
+14384: 18, 40, 24
+14385: 18, 41, 0
+14386: 18, 41, 1
+14387: 18, 41, 2
+14388: 18, 41, 3
+14389: 18, 41, 4
+14390: 18, 41, 5
+14391: 18, 41, 6
+14392: 18, 41, 7
+14393: 18, 41, 8
+14394: 18, 41, 9
+14395: 18, 41, 10
+14396: 18, 41, 11
+14397: 18, 41, 12
+14398: 18, 41, 13
+14399: 18, 41, 14
+14400: 18, 41, 15
+14401: 18, 41, 16
+14402: 18, 41, 17
+14403: 18, 41, 18
+14404: 18, 41, 19
+14405: 18, 41, 20
+14406: 18, 41, 21
+14407: 18, 41, 22
+14408: 18, 41, 23
+14409: 18, 41, 24
+14410: 18, 41, 25
+14411: 18, 41, 26
+14412: 18, 41, 27
+14413: 18, 41, 28
+14414: 18, 41, 29
+14415: 18, 41, 30
+14416: 18, 41, 31
+14417: 18, 41, 32
+14418: 18, 41, 33
+14419: 18, 41, 34
+14420: 18, 42, 0
+14421: 18, 42, 1
+14422: 18, 42, 2
+14423: 18, 42, 3
+14424: 18, 42, 4
+14425: 18, 42, 5
+14426: 18, 42, 6
+14427: 18, 42, 7
+14428: 18, 42, 8
+14429: 18, 42, 9
+14430: 18, 42, 10
+14431: 18, 42, 11
+14432: 18, 42, 12
+14433: 18, 42, 13
+14434: 18, 42, 14
+14435: 18, 42, 15
+14436: 18, 42, 16
+14437: 18, 42, 17
+14438: 19, 0, 0
+14439: 19, 1, 0
+14440: 19, 1, 1
+14441: 19, 1, 2
+14442: 19, 1, 3
+14443: 19, 1, 4
+14444: 19, 1, 5
+14445: 19, 1, 6
+14446: 19, 2, 0
+14447: 19, 2, 1
+14448: 19, 2, 2
+14449: 19, 2, 3
+14450: 19, 2, 4
+14451: 19, 2, 5
+14452: 19, 2, 6
+14453: 19, 2, 7
+14454: 19, 2, 8
+14455: 19, 2, 9
+14456: 19, 2, 10
+14457: 19, 2, 11
+14458: 19, 2, 12
+14459: 19, 3, 0
+14460: 19, 3, 1
+14461: 19, 3, 2
+14462: 19, 3, 3
+14463: 19, 3, 4
+14464: 19, 3, 5
+14465: 19, 3, 6
+14466: 19, 3, 7
+14467: 19, 3, 8
+14468: 19, 4, 0
+14469: 19, 4, 1
+14470: 19, 4, 2
+14471: 19, 4, 3
+14472: 19, 4, 4
+14473: 19, 4, 5
+14474: 19, 4, 6
+14475: 19, 4, 7
+14476: 19, 4, 8
+14477: 19, 5, 0
+14478: 19, 5, 1
+14479: 19, 5, 2
+14480: 19, 5, 3
+14481: 19, 5, 4
+14482: 19, 5, 5
+14483: 19, 5, 6
+14484: 19, 5, 7
+14485: 19, 5, 8
+14486: 19, 5, 9
+14487: 19, 5, 10
+14488: 19, 5, 11
+14489: 19, 5, 12
+14490: 19, 6, 0
+14491: 19, 6, 1
+14492: 19, 6, 2
+14493: 19, 6, 3
+14494: 19, 6, 4
+14495: 19, 6, 5
+14496: 19, 6, 6
+14497: 19, 6, 7
+14498: 19, 6, 8
+14499: 19, 6, 9
+14500: 19, 6, 10
+14501: 19, 7, 0
+14502: 19, 7, 1
+14503: 19, 7, 2
+14504: 19, 7, 3
+14505: 19, 7, 4
+14506: 19, 7, 5
+14507: 19, 7, 6
+14508: 19, 7, 7
+14509: 19, 7, 8
+14510: 19, 7, 9
+14511: 19, 7, 10
+14512: 19, 7, 11
+14513: 19, 7, 12
+14514: 19, 7, 13
+14515: 19, 7, 14
+14516: 19, 7, 15
+14517: 19, 7, 16
+14518: 19, 7, 17
+14519: 19, 8, 0
+14520: 19, 8, 1
+14521: 19, 8, 2
+14522: 19, 8, 3
+14523: 19, 8, 4
+14524: 19, 8, 5
+14525: 19, 8, 6
+14526: 19, 8, 7
+14527: 19, 8, 8
+14528: 19, 8, 9
+14529: 19, 9, 0
+14530: 19, 9, 1
+14531: 19, 9, 2
+14532: 19, 9, 3
+14533: 19, 9, 4
+14534: 19, 9, 5
+14535: 19, 9, 6
+14536: 19, 9, 7
+14537: 19, 9, 8
+14538: 19, 9, 9
+14539: 19, 9, 10
+14540: 19, 9, 11
+14541: 19, 9, 12
+14542: 19, 9, 13
+14543: 19, 9, 14
+14544: 19, 9, 15
+14545: 19, 9, 16
+14546: 19, 9, 17
+14547: 19, 9, 18
+14548: 19, 9, 19
+14549: 19, 9, 20
+14550: 19, 10, 0
+14551: 19, 10, 1
+14552: 19, 10, 2
+14553: 19, 10, 3
+14554: 19, 10, 4
+14555: 19, 10, 5
+14556: 19, 10, 6
+14557: 19, 10, 7
+14558: 19, 10, 8
+14559: 19, 10, 9
+14560: 19, 10, 10
+14561: 19, 10, 11
+14562: 19, 10, 12
+14563: 19, 10, 13
+14564: 19, 10, 14
+14565: 19, 10, 15
+14566: 19, 10, 16
+14567: 19, 10, 17
+14568: 19, 10, 18
+14569: 19, 11, 0
+14570: 19, 11, 1
+14571: 19, 11, 2
+14572: 19, 11, 3
+14573: 19, 11, 4
+14574: 19, 11, 5
+14575: 19, 11, 6
+14576: 19, 11, 7
+14577: 19, 12, 0
+14578: 19, 12, 1
+14579: 19, 12, 2
+14580: 19, 12, 3
+14581: 19, 12, 4
+14582: 19, 12, 5
+14583: 19, 12, 6
+14584: 19, 12, 7
+14585: 19, 12, 8
+14586: 19, 13, 0
+14587: 19, 13, 1
+14588: 19, 13, 2
+14589: 19, 13, 3
+14590: 19, 13, 4
+14591: 19, 13, 5
+14592: 19, 13, 6
+14593: 19, 14, 0
+14594: 19, 14, 1
+14595: 19, 14, 2
+14596: 19, 14, 3
+14597: 19, 14, 4
+14598: 19, 14, 5
+14599: 19, 14, 6
+14600: 19, 14, 7
+14601: 19, 15, 0
+14602: 19, 15, 1
+14603: 19, 15, 2
+14604: 19, 15, 3
+14605: 19, 15, 4
+14606: 19, 15, 5
+14607: 19, 16, 0
+14608: 19, 16, 1
+14609: 19, 16, 2
+14610: 19, 16, 3
+14611: 19, 16, 4
+14612: 19, 16, 5
+14613: 19, 16, 6
+14614: 19, 16, 7
+14615: 19, 16, 8
+14616: 19, 16, 9
+14617: 19, 16, 10
+14618: 19, 16, 11
+14619: 19, 17, 0
+14620: 19, 17, 1
+14621: 19, 17, 2
+14622: 19, 17, 3
+14623: 19, 17, 4
+14624: 19, 17, 5
+14625: 19, 17, 6
+14626: 19, 17, 7
+14627: 19, 17, 8
+14628: 19, 17, 9
+14629: 19, 17, 10
+14630: 19, 17, 11
+14631: 19, 17, 12
+14632: 19, 17, 13
+14633: 19, 17, 14
+14634: 19, 17, 15
+14635: 19, 18, 0
+14636: 19, 18, 1
+14637: 19, 18, 2
+14638: 19, 18, 3
+14639: 19, 18, 4
+14640: 19, 18, 5
+14641: 19, 18, 6
+14642: 19, 18, 7
+14643: 19, 18, 8
+14644: 19, 18, 9
+14645: 19, 18, 10
+14646: 19, 18, 11
+14647: 19, 18, 12
+14648: 19, 18, 13
+14649: 19, 18, 14
+14650: 19, 18, 15
+14651: 19, 18, 16
+14652: 19, 18, 17
+14653: 19, 18, 18
+14654: 19, 18, 19
+14655: 19, 18, 20
+14656: 19, 18, 21
+14657: 19, 18, 22
+14658: 19, 18, 23
+14659: 19, 18, 24
+14660: 19, 18, 25
+14661: 19, 18, 26
+14662: 19, 18, 27
+14663: 19, 18, 28
+14664: 19, 18, 29
+14665: 19, 18, 30
+14666: 19, 18, 31
+14667: 19, 18, 32
+14668: 19, 18, 33
+14669: 19, 18, 34
+14670: 19, 18, 35
+14671: 19, 18, 36
+14672: 19, 18, 37
+14673: 19, 18, 38
+14674: 19, 18, 39
+14675: 19, 18, 40
+14676: 19, 18, 41
+14677: 19, 18, 42
+14678: 19, 18, 43
+14679: 19, 18, 44
+14680: 19, 18, 45
+14681: 19, 18, 46
+14682: 19, 18, 47
+14683: 19, 18, 48
+14684: 19, 18, 49
+14685: 19, 18, 50
+14686: 19, 19, 0
+14687: 19, 19, 1
+14688: 19, 19, 2
+14689: 19, 19, 3
+14690: 19, 19, 4
+14691: 19, 19, 5
+14692: 19, 19, 6
+14693: 19, 19, 7
+14694: 19, 19, 8
+14695: 19, 19, 9
+14696: 19, 19, 10
+14697: 19, 19, 11
+14698: 19, 19, 12
+14699: 19, 19, 13
+14700: 19, 19, 14
+14701: 19, 20, 0
+14702: 19, 20, 1
+14703: 19, 20, 2
+14704: 19, 20, 3
+14705: 19, 20, 4
+14706: 19, 20, 5
+14707: 19, 20, 6
+14708: 19, 20, 7
+14709: 19, 20, 8
+14710: 19, 20, 9
+14711: 19, 21, 0
+14712: 19, 21, 1
+14713: 19, 21, 2
+14714: 19, 21, 3
+14715: 19, 21, 4
+14716: 19, 21, 5
+14717: 19, 21, 6
+14718: 19, 21, 7
+14719: 19, 21, 8
+14720: 19, 21, 9
+14721: 19, 21, 10
+14722: 19, 21, 11
+14723: 19, 21, 12
+14724: 19, 21, 13
+14725: 19, 22, 0
+14726: 19, 22, 1
+14727: 19, 22, 2
+14728: 19, 22, 3
+14729: 19, 22, 4
+14730: 19, 22, 5
+14731: 19, 22, 6
+14732: 19, 22, 7
+14733: 19, 22, 8
+14734: 19, 22, 9
+14735: 19, 22, 10
+14736: 19, 22, 11
+14737: 19, 22, 12
+14738: 19, 22, 13
+14739: 19, 22, 14
+14740: 19, 22, 15
+14741: 19, 22, 16
+14742: 19, 22, 17
+14743: 19, 22, 18
+14744: 19, 22, 19
+14745: 19, 22, 20
+14746: 19, 22, 21
+14747: 19, 22, 22
+14748: 19, 22, 23
+14749: 19, 22, 24
+14750: 19, 22, 25
+14751: 19, 22, 26
+14752: 19, 22, 27
+14753: 19, 22, 28
+14754: 19, 22, 29
+14755: 19, 22, 30
+14756: 19, 22, 31
+14757: 19, 23, 0
+14758: 19, 23, 1
+14759: 19, 23, 2
+14760: 19, 23, 3
+14761: 19, 23, 4
+14762: 19, 23, 5
+14763: 19, 23, 6
+14764: 19, 24, 0
+14765: 19, 24, 1
+14766: 19, 24, 2
+14767: 19, 24, 3
+14768: 19, 24, 4
+14769: 19, 24, 5
+14770: 19, 24, 6
+14771: 19, 24, 7
+14772: 19, 24, 8
+14773: 19, 24, 9
+14774: 19, 24, 10
+14775: 19, 25, 0
+14776: 19, 25, 1
+14777: 19, 25, 2
+14778: 19, 25, 3
+14779: 19, 25, 4
+14780: 19, 25, 5
+14781: 19, 25, 6
+14782: 19, 25, 7
+14783: 19, 25, 8
+14784: 19, 25, 9
+14785: 19, 25, 10
+14786: 19, 25, 11
+14787: 19, 25, 12
+14788: 19, 25, 13
+14789: 19, 25, 14
+14790: 19, 25, 15
+14791: 19, 25, 16
+14792: 19, 25, 17
+14793: 19, 25, 18
+14794: 19, 25, 19
+14795: 19, 25, 20
+14796: 19, 25, 21
+14797: 19, 25, 22
+14798: 19, 26, 0
+14799: 19, 26, 1
+14800: 19, 26, 2
+14801: 19, 26, 3
+14802: 19, 26, 4
+14803: 19, 26, 5
+14804: 19, 26, 6
+14805: 19, 26, 7
+14806: 19, 26, 8
+14807: 19, 26, 9
+14808: 19, 26, 10
+14809: 19, 26, 11
+14810: 19, 26, 12
+14811: 19, 27, 0
+14812: 19, 27, 1
+14813: 19, 27, 2
+14814: 19, 27, 3
+14815: 19, 27, 4
+14816: 19, 27, 5
+14817: 19, 27, 6
+14818: 19, 27, 7
+14819: 19, 27, 8
+14820: 19, 27, 9
+14821: 19, 27, 10
+14822: 19, 27, 11
+14823: 19, 27, 12
+14824: 19, 27, 13
+14825: 19, 27, 14
+14826: 19, 28, 0
+14827: 19, 28, 1
+14828: 19, 28, 2
+14829: 19, 28, 3
+14830: 19, 28, 4
+14831: 19, 28, 5
+14832: 19, 28, 6
+14833: 19, 28, 7
+14834: 19, 28, 8
+14835: 19, 28, 9
+14836: 19, 29, 0
+14837: 19, 29, 1
+14838: 19, 29, 2
+14839: 19, 29, 3
+14840: 19, 29, 4
+14841: 19, 29, 5
+14842: 19, 29, 6
+14843: 19, 29, 7
+14844: 19, 29, 8
+14845: 19, 29, 9
+14846: 19, 29, 10
+14847: 19, 29, 11
+14848: 19, 30, 0
+14849: 19, 30, 1
+14850: 19, 30, 2
+14851: 19, 30, 3
+14852: 19, 30, 4
+14853: 19, 30, 5
+14854: 19, 30, 6
+14855: 19, 30, 7
+14856: 19, 30, 8
+14857: 19, 30, 9
+14858: 19, 30, 10
+14859: 19, 30, 11
+14860: 19, 30, 12
+14861: 19, 31, 0
+14862: 19, 31, 1
+14863: 19, 31, 2
+14864: 19, 31, 3
+14865: 19, 31, 4
+14866: 19, 31, 5
+14867: 19, 31, 6
+14868: 19, 31, 7
+14869: 19, 31, 8
+14870: 19, 31, 9
+14871: 19, 31, 10
+14872: 19, 31, 11
+14873: 19, 31, 12
+14874: 19, 31, 13
+14875: 19, 31, 14
+14876: 19, 31, 15
+14877: 19, 31, 16
+14878: 19, 31, 17
+14879: 19, 31, 18
+14880: 19, 31, 19
+14881: 19, 31, 20
+14882: 19, 31, 21
+14883: 19, 31, 22
+14884: 19, 31, 23
+14885: 19, 31, 24
+14886: 19, 32, 0
+14887: 19, 32, 1
+14888: 19, 32, 2
+14889: 19, 32, 3
+14890: 19, 32, 4
+14891: 19, 32, 5
+14892: 19, 32, 6
+14893: 19, 32, 7
+14894: 19, 32, 8
+14895: 19, 32, 9
+14896: 19, 32, 10
+14897: 19, 32, 11
+14898: 19, 33, 0
+14899: 19, 33, 1
+14900: 19, 33, 2
+14901: 19, 33, 3
+14902: 19, 33, 4
+14903: 19, 33, 5
+14904: 19, 33, 6
+14905: 19, 33, 7
+14906: 19, 33, 8
+14907: 19, 33, 9
+14908: 19, 33, 10
+14909: 19, 33, 11
+14910: 19, 33, 12
+14911: 19, 33, 13
+14912: 19, 33, 14
+14913: 19, 33, 15
+14914: 19, 33, 16
+14915: 19, 33, 17
+14916: 19, 33, 18
+14917: 19, 33, 19
+14918: 19, 33, 20
+14919: 19, 33, 21
+14920: 19, 33, 22
+14921: 19, 34, 0
+14922: 19, 34, 1
+14923: 19, 34, 2
+14924: 19, 34, 3
+14925: 19, 34, 4
+14926: 19, 34, 5
+14927: 19, 34, 6
+14928: 19, 34, 7
+14929: 19, 34, 8
+14930: 19, 34, 9
+14931: 19, 34, 10
+14932: 19, 34, 11
+14933: 19, 34, 12
+14934: 19, 34, 13
+14935: 19, 34, 14
+14936: 19, 34, 15
+14937: 19, 34, 16
+14938: 19, 34, 17
+14939: 19, 34, 18
+14940: 19, 34, 19
+14941: 19, 34, 20
+14942: 19, 34, 21
+14943: 19, 34, 22
+14944: 19, 35, 0
+14945: 19, 35, 1
+14946: 19, 35, 2
+14947: 19, 35, 3
+14948: 19, 35, 4
+14949: 19, 35, 5
+14950: 19, 35, 6
+14951: 19, 35, 7
+14952: 19, 35, 8
+14953: 19, 35, 9
+14954: 19, 35, 10
+14955: 19, 35, 11
+14956: 19, 35, 12
+14957: 19, 35, 13
+14958: 19, 35, 14
+14959: 19, 35, 15
+14960: 19, 35, 16
+14961: 19, 35, 17
+14962: 19, 35, 18
+14963: 19, 35, 19
+14964: 19, 35, 20
+14965: 19, 35, 21
+14966: 19, 35, 22
+14967: 19, 35, 23
+14968: 19, 35, 24
+14969: 19, 35, 25
+14970: 19, 35, 26
+14971: 19, 35, 27
+14972: 19, 35, 28
+14973: 19, 36, 0
+14974: 19, 36, 1
+14975: 19, 36, 2
+14976: 19, 36, 3
+14977: 19, 36, 4
+14978: 19, 36, 5
+14979: 19, 36, 6
+14980: 19, 36, 7
+14981: 19, 36, 8
+14982: 19, 36, 9
+14983: 19, 36, 10
+14984: 19, 36, 11
+14985: 19, 36, 12
+14986: 19, 37, 0
+14987: 19, 37, 1
+14988: 19, 37, 2
+14989: 19, 37, 3
+14990: 19, 37, 4
+14991: 19, 37, 5
+14992: 19, 37, 6
+14993: 19, 37, 7
+14994: 19, 37, 8
+14995: 19, 37, 9
+14996: 19, 37, 10
+14997: 19, 37, 11
+14998: 19, 37, 12
+14999: 19, 37, 13
+15000: 19, 37, 14
+15001: 19, 37, 15
+15002: 19, 37, 16
+15003: 19, 37, 17
+15004: 19, 37, 18
+15005: 19, 37, 19
+15006: 19, 37, 20
+15007: 19, 37, 21
+15008: 19, 37, 22
+15009: 19, 37, 23
+15010: 19, 37, 24
+15011: 19, 37, 25
+15012: 19, 37, 26
+15013: 19, 37, 27
+15014: 19, 37, 28
+15015: 19, 37, 29
+15016: 19, 37, 30
+15017: 19, 37, 31
+15018: 19, 37, 32
+15019: 19, 37, 33
+15020: 19, 37, 34
+15021: 19, 37, 35
+15022: 19, 37, 36
+15023: 19, 37, 37
+15024: 19, 37, 38
+15025: 19, 37, 39
+15026: 19, 37, 40
+15027: 19, 38, 0
+15028: 19, 38, 1
+15029: 19, 38, 2
+15030: 19, 38, 3
+15031: 19, 38, 4
+15032: 19, 38, 5
+15033: 19, 38, 6
+15034: 19, 38, 7
+15035: 19, 38, 8
+15036: 19, 38, 9
+15037: 19, 38, 10
+15038: 19, 38, 11
+15039: 19, 38, 12
+15040: 19, 38, 13
+15041: 19, 38, 14
+15042: 19, 38, 15
+15043: 19, 38, 16
+15044: 19, 38, 17
+15045: 19, 38, 18
+15046: 19, 38, 19
+15047: 19, 38, 20
+15048: 19, 38, 21
+15049: 19, 38, 22
+15050: 19, 39, 0
+15051: 19, 39, 1
+15052: 19, 39, 2
+15053: 19, 39, 3
+15054: 19, 39, 4
+15055: 19, 39, 5
+15056: 19, 39, 6
+15057: 19, 39, 7
+15058: 19, 39, 8
+15059: 19, 39, 9
+15060: 19, 39, 10
+15061: 19, 39, 11
+15062: 19, 39, 12
+15063: 19, 39, 13
+15064: 19, 40, 0
+15065: 19, 40, 1
+15066: 19, 40, 2
+15067: 19, 40, 3
+15068: 19, 40, 4
+15069: 19, 40, 5
+15070: 19, 40, 6
+15071: 19, 40, 7
+15072: 19, 40, 8
+15073: 19, 40, 9
+15074: 19, 40, 10
+15075: 19, 40, 11
+15076: 19, 40, 12
+15077: 19, 40, 13
+15078: 19, 40, 14
+15079: 19, 40, 15
+15080: 19, 40, 16
+15081: 19, 40, 17
+15082: 19, 41, 0
+15083: 19, 41, 1
+15084: 19, 41, 2
+15085: 19, 41, 3
+15086: 19, 41, 4
+15087: 19, 41, 5
+15088: 19, 41, 6
+15089: 19, 41, 7
+15090: 19, 41, 8
+15091: 19, 41, 9
+15092: 19, 41, 10
+15093: 19, 41, 11
+15094: 19, 41, 12
+15095: 19, 41, 13
+15096: 19, 42, 0
+15097: 19, 42, 1
+15098: 19, 42, 2
+15099: 19, 42, 3
+15100: 19, 42, 4
+15101: 19, 42, 5
+15102: 19, 42, 6
+15103: 19, 42, 7
+15104: 19, 42, 8
+15105: 19, 42, 9
+15106: 19, 42, 10
+15107: 19, 42, 11
+15108: 19, 43, 0
+15109: 19, 43, 1
+15110: 19, 43, 2
+15111: 19, 43, 3
+15112: 19, 43, 4
+15113: 19, 43, 5
+15114: 19, 44, 0
+15115: 19, 44, 1
+15116: 19, 44, 2
+15117: 19, 44, 3
+15118: 19, 44, 4
+15119: 19, 44, 5
+15120: 19, 44, 6
+15121: 19, 44, 7
+15122: 19, 44, 8
+15123: 19, 44, 9
+15124: 19, 44, 10
+15125: 19, 44, 11
+15126: 19, 44, 12
+15127: 19, 44, 13
+15128: 19, 44, 14
+15129: 19, 44, 15
+15130: 19, 44, 16
+15131: 19, 44, 17
+15132: 19, 44, 18
+15133: 19, 44, 19
+15134: 19, 44, 20
+15135: 19, 44, 21
+15136: 19, 44, 22
+15137: 19, 44, 23
+15138: 19, 44, 24
+15139: 19, 44, 25
+15140: 19, 44, 26
+15141: 19, 45, 0
+15142: 19, 45, 1
+15143: 19, 45, 2
+15144: 19, 45, 3
+15145: 19, 45, 4
+15146: 19, 45, 5
+15147: 19, 45, 6
+15148: 19, 45, 7
+15149: 19, 45, 8
+15150: 19, 45, 9
+15151: 19, 45, 10
+15152: 19, 45, 11
+15153: 19, 45, 12
+15154: 19, 45, 13
+15155: 19, 45, 14
+15156: 19, 45, 15
+15157: 19, 45, 16
+15158: 19, 45, 17
+15159: 19, 46, 0
+15160: 19, 46, 1
+15161: 19, 46, 2
+15162: 19, 46, 3
+15163: 19, 46, 4
+15164: 19, 46, 5
+15165: 19, 46, 6
+15166: 19, 46, 7
+15167: 19, 46, 8
+15168: 19, 46, 9
+15169: 19, 46, 10
+15170: 19, 46, 11
+15171: 19, 47, 0
+15172: 19, 47, 1
+15173: 19, 47, 2
+15174: 19, 47, 3
+15175: 19, 47, 4
+15176: 19, 47, 5
+15177: 19, 47, 6
+15178: 19, 47, 7
+15179: 19, 47, 8
+15180: 19, 47, 9
+15181: 19, 48, 0
+15182: 19, 48, 1
+15183: 19, 48, 2
+15184: 19, 48, 3
+15185: 19, 48, 4
+15186: 19, 48, 5
+15187: 19, 48, 6
+15188: 19, 48, 7
+15189: 19, 48, 8
+15190: 19, 48, 9
+15191: 19, 48, 10
+15192: 19, 48, 11
+15193: 19, 48, 12
+15194: 19, 48, 13
+15195: 19, 48, 14
+15196: 19, 49, 0
+15197: 19, 49, 1
+15198: 19, 49, 2
+15199: 19, 49, 3
+15200: 19, 49, 4
+15201: 19, 49, 5
+15202: 19, 49, 6
+15203: 19, 49, 7
+15204: 19, 49, 8
+15205: 19, 49, 9
+15206: 19, 49, 10
+15207: 19, 49, 11
+15208: 19, 49, 12
+15209: 19, 49, 13
+15210: 19, 49, 14
+15211: 19, 49, 15
+15212: 19, 49, 16
+15213: 19, 49, 17
+15214: 19, 49, 18
+15215: 19, 49, 19
+15216: 19, 49, 20
+15217: 19, 50, 0
+15218: 19, 50, 1
+15219: 19, 50, 2
+15220: 19, 50, 3
+15221: 19, 50, 4
+15222: 19, 50, 5
+15223: 19, 50, 6
+15224: 19, 50, 7
+15225: 19, 50, 8
+15226: 19, 50, 9
+15227: 19, 50, 10
+15228: 19, 50, 11
+15229: 19, 50, 12
+15230: 19, 50, 13
+15231: 19, 50, 14
+15232: 19, 50, 15
+15233: 19, 50, 16
+15234: 19, 50, 17
+15235: 19, 50, 18
+15236: 19, 50, 19
+15237: 19, 50, 20
+15238: 19, 50, 21
+15239: 19, 50, 22
+15240: 19, 50, 23
+15241: 19, 51, 0
+15242: 19, 51, 1
+15243: 19, 51, 2
+15244: 19, 51, 3
+15245: 19, 51, 4
+15246: 19, 51, 5
+15247: 19, 51, 6
+15248: 19, 51, 7
+15249: 19, 51, 8
+15250: 19, 51, 9
+15251: 19, 51, 10
+15252: 19, 51, 11
+15253: 19, 51, 12
+15254: 19, 51, 13
+15255: 19, 51, 14
+15256: 19, 51, 15
+15257: 19, 51, 16
+15258: 19, 51, 17
+15259: 19, 51, 18
+15260: 19, 51, 19
+15261: 19, 52, 0
+15262: 19, 52, 1
+15263: 19, 52, 2
+15264: 19, 52, 3
+15265: 19, 52, 4
+15266: 19, 52, 5
+15267: 19, 52, 6
+15268: 19, 52, 7
+15269: 19, 52, 8
+15270: 19, 52, 9
+15271: 19, 53, 0
+15272: 19, 53, 1
+15273: 19, 53, 2
+15274: 19, 53, 3
+15275: 19, 53, 4
+15276: 19, 53, 5
+15277: 19, 53, 6
+15278: 19, 54, 0
+15279: 19, 54, 1
+15280: 19, 54, 2
+15281: 19, 54, 3
+15282: 19, 54, 4
+15283: 19, 54, 5
+15284: 19, 54, 6
+15285: 19, 54, 7
+15286: 19, 55, 0
+15287: 19, 55, 1
+15288: 19, 55, 2
+15289: 19, 55, 3
+15290: 19, 55, 4
+15291: 19, 55, 5
+15292: 19, 55, 6
+15293: 19, 55, 7
+15294: 19, 55, 8
+15295: 19, 55, 9
+15296: 19, 55, 10
+15297: 19, 55, 11
+15298: 19, 55, 12
+15299: 19, 55, 13
+15300: 19, 55, 14
+15301: 19, 55, 15
+15302: 19, 55, 16
+15303: 19, 55, 17
+15304: 19, 55, 18
+15305: 19, 55, 19
+15306: 19, 55, 20
+15307: 19, 55, 21
+15308: 19, 55, 22
+15309: 19, 55, 23
+15310: 19, 56, 0
+15311: 19, 56, 1
+15312: 19, 56, 2
+15313: 19, 56, 3
+15314: 19, 56, 4
+15315: 19, 56, 5
+15316: 19, 56, 6
+15317: 19, 56, 7
+15318: 19, 56, 8
+15319: 19, 56, 9
+15320: 19, 56, 10
+15321: 19, 56, 11
+15322: 19, 56, 12
+15323: 19, 56, 13
+15324: 19, 57, 0
+15325: 19, 57, 1
+15326: 19, 57, 2
+15327: 19, 57, 3
+15328: 19, 57, 4
+15329: 19, 57, 5
+15330: 19, 57, 6
+15331: 19, 57, 7
+15332: 19, 57, 8
+15333: 19, 57, 9
+15334: 19, 57, 10
+15335: 19, 57, 11
+15336: 19, 58, 0
+15337: 19, 58, 1
+15338: 19, 58, 2
+15339: 19, 58, 3
+15340: 19, 58, 4
+15341: 19, 58, 5
+15342: 19, 58, 6
+15343: 19, 58, 7
+15344: 19, 58, 8
+15345: 19, 58, 9
+15346: 19, 58, 10
+15347: 19, 58, 11
+15348: 19, 59, 0
+15349: 19, 59, 1
+15350: 19, 59, 2
+15351: 19, 59, 3
+15352: 19, 59, 4
+15353: 19, 59, 5
+15354: 19, 59, 6
+15355: 19, 59, 7
+15356: 19, 59, 8
+15357: 19, 59, 9
+15358: 19, 59, 10
+15359: 19, 59, 11
+15360: 19, 59, 12
+15361: 19, 59, 13
+15362: 19, 59, 14
+15363: 19, 59, 15
+15364: 19, 59, 16
+15365: 19, 59, 17
+15366: 19, 60, 0
+15367: 19, 60, 1
+15368: 19, 60, 2
+15369: 19, 60, 3
+15370: 19, 60, 4
+15371: 19, 60, 5
+15372: 19, 60, 6
+15373: 19, 60, 7
+15374: 19, 60, 8
+15375: 19, 60, 9
+15376: 19, 60, 10
+15377: 19, 60, 11
+15378: 19, 60, 12
+15379: 19, 61, 0
+15380: 19, 61, 1
+15381: 19, 61, 2
+15382: 19, 61, 3
+15383: 19, 61, 4
+15384: 19, 61, 5
+15385: 19, 61, 6
+15386: 19, 61, 7
+15387: 19, 61, 8
+15388: 19, 62, 0
+15389: 19, 62, 1
+15390: 19, 62, 2
+15391: 19, 62, 3
+15392: 19, 62, 4
+15393: 19, 62, 5
+15394: 19, 62, 6
+15395: 19, 62, 7
+15396: 19, 62, 8
+15397: 19, 62, 9
+15398: 19, 62, 10
+15399: 19, 62, 11
+15400: 19, 62, 12
+15401: 19, 63, 0
+15402: 19, 63, 1
+15403: 19, 63, 2
+15404: 19, 63, 3
+15405: 19, 63, 4
+15406: 19, 63, 5
+15407: 19, 63, 6
+15408: 19, 63, 7
+15409: 19, 63, 8
+15410: 19, 63, 9
+15411: 19, 63, 10
+15412: 19, 63, 11
+15413: 19, 64, 0
+15414: 19, 64, 1
+15415: 19, 64, 2
+15416: 19, 64, 3
+15417: 19, 64, 4
+15418: 19, 64, 5
+15419: 19, 64, 6
+15420: 19, 64, 7
+15421: 19, 64, 8
+15422: 19, 64, 9
+15423: 19, 64, 10
+15424: 19, 65, 0
+15425: 19, 65, 1
+15426: 19, 65, 2
+15427: 19, 65, 3
+15428: 19, 65, 4
+15429: 19, 65, 5
+15430: 19, 65, 6
+15431: 19, 65, 7
+15432: 19, 65, 8
+15433: 19, 65, 9
+15434: 19, 65, 10
+15435: 19, 65, 11
+15436: 19, 65, 12
+15437: 19, 65, 13
+15438: 19, 66, 0
+15439: 19, 66, 1
+15440: 19, 66, 2
+15441: 19, 66, 3
+15442: 19, 66, 4
+15443: 19, 66, 5
+15444: 19, 66, 6
+15445: 19, 66, 7
+15446: 19, 66, 8
+15447: 19, 66, 9
+15448: 19, 66, 10
+15449: 19, 66, 11
+15450: 19, 66, 12
+15451: 19, 66, 13
+15452: 19, 66, 14
+15453: 19, 66, 15
+15454: 19, 66, 16
+15455: 19, 66, 17
+15456: 19, 66, 18
+15457: 19, 66, 19
+15458: 19, 66, 20
+15459: 19, 67, 0
+15460: 19, 67, 1
+15461: 19, 67, 2
+15462: 19, 67, 3
+15463: 19, 67, 4
+15464: 19, 67, 5
+15465: 19, 67, 6
+15466: 19, 67, 7
+15467: 19, 68, 0
+15468: 19, 68, 1
+15469: 19, 68, 2
+15470: 19, 68, 3
+15471: 19, 68, 4
+15472: 19, 68, 5
+15473: 19, 68, 6
+15474: 19, 68, 7
+15475: 19, 68, 8
+15476: 19, 68, 9
+15477: 19, 68, 10
+15478: 19, 68, 11
+15479: 19, 68, 12
+15480: 19, 68, 13
+15481: 19, 68, 14
+15482: 19, 68, 15
+15483: 19, 68, 16
+15484: 19, 68, 17
+15485: 19, 68, 18
+15486: 19, 68, 19
+15487: 19, 68, 20
+15488: 19, 68, 21
+15489: 19, 68, 22
+15490: 19, 68, 23
+15491: 19, 68, 24
+15492: 19, 68, 25
+15493: 19, 68, 26
+15494: 19, 68, 27
+15495: 19, 68, 28
+15496: 19, 68, 29
+15497: 19, 68, 30
+15498: 19, 68, 31
+15499: 19, 68, 32
+15500: 19, 68, 33
+15501: 19, 68, 34
+15502: 19, 68, 35
+15503: 19, 69, 0
+15504: 19, 69, 1
+15505: 19, 69, 2
+15506: 19, 69, 3
+15507: 19, 69, 4
+15508: 19, 69, 5
+15509: 19, 69, 6
+15510: 19, 69, 7
+15511: 19, 69, 8
+15512: 19, 69, 9
+15513: 19, 69, 10
+15514: 19, 69, 11
+15515: 19, 69, 12
+15516: 19, 69, 13
+15517: 19, 69, 14
+15518: 19, 69, 15
+15519: 19, 69, 16
+15520: 19, 69, 17
+15521: 19, 69, 18
+15522: 19, 69, 19
+15523: 19, 69, 20
+15524: 19, 69, 21
+15525: 19, 69, 22
+15526: 19, 69, 23
+15527: 19, 69, 24
+15528: 19, 69, 25
+15529: 19, 69, 26
+15530: 19, 69, 27
+15531: 19, 69, 28
+15532: 19, 69, 29
+15533: 19, 69, 30
+15534: 19, 69, 31
+15535: 19, 69, 32
+15536: 19, 69, 33
+15537: 19, 69, 34
+15538: 19, 69, 35
+15539: 19, 69, 36
+15540: 19, 70, 0
+15541: 19, 70, 1
+15542: 19, 70, 2
+15543: 19, 70, 3
+15544: 19, 70, 4
+15545: 19, 70, 5
+15546: 19, 71, 0
+15547: 19, 71, 1
+15548: 19, 71, 2
+15549: 19, 71, 3
+15550: 19, 71, 4
+15551: 19, 71, 5
+15552: 19, 71, 6
+15553: 19, 71, 7
+15554: 19, 71, 8
+15555: 19, 71, 9
+15556: 19, 71, 10
+15557: 19, 71, 11
+15558: 19, 71, 12
+15559: 19, 71, 13
+15560: 19, 71, 14
+15561: 19, 71, 15
+15562: 19, 71, 16
+15563: 19, 71, 17
+15564: 19, 71, 18
+15565: 19, 71, 19
+15566: 19, 71, 20
+15567: 19, 71, 21
+15568: 19, 71, 22
+15569: 19, 71, 23
+15570: 19, 71, 24
+15571: 19, 72, 0
+15572: 19, 72, 1
+15573: 19, 72, 2
+15574: 19, 72, 3
+15575: 19, 72, 4
+15576: 19, 72, 5
+15577: 19, 72, 6
+15578: 19, 72, 7
+15579: 19, 72, 8
+15580: 19, 72, 9
+15581: 19, 72, 10
+15582: 19, 72, 11
+15583: 19, 72, 12
+15584: 19, 72, 13
+15585: 19, 72, 14
+15586: 19, 72, 15
+15587: 19, 72, 16
+15588: 19, 72, 17
+15589: 19, 72, 18
+15590: 19, 72, 19
+15591: 19, 72, 20
+15592: 19, 73, 0
+15593: 19, 73, 1
+15594: 19, 73, 2
+15595: 19, 73, 3
+15596: 19, 73, 4
+15597: 19, 73, 5
+15598: 19, 73, 6
+15599: 19, 73, 7
+15600: 19, 73, 8
+15601: 19, 73, 9
+15602: 19, 73, 10
+15603: 19, 73, 11
+15604: 19, 73, 12
+15605: 19, 73, 13
+15606: 19, 73, 14
+15607: 19, 73, 15
+15608: 19, 73, 16
+15609: 19, 73, 17
+15610: 19, 73, 18
+15611: 19, 73, 19
+15612: 19, 73, 20
+15613: 19, 73, 21
+15614: 19, 73, 22
+15615: 19, 73, 23
+15616: 19, 73, 24
+15617: 19, 73, 25
+15618: 19, 73, 26
+15619: 19, 73, 27
+15620: 19, 73, 28
+15621: 19, 74, 0
+15622: 19, 74, 1
+15623: 19, 74, 2
+15624: 19, 74, 3
+15625: 19, 74, 4
+15626: 19, 74, 5
+15627: 19, 74, 6
+15628: 19, 74, 7
+15629: 19, 74, 8
+15630: 19, 74, 9
+15631: 19, 74, 10
+15632: 19, 74, 11
+15633: 19, 74, 12
+15634: 19, 74, 13
+15635: 19, 74, 14
+15636: 19, 74, 15
+15637: 19, 74, 16
+15638: 19, 74, 17
+15639: 19, 74, 18
+15640: 19, 74, 19
+15641: 19, 74, 20
+15642: 19, 74, 21
+15643: 19, 74, 22
+15644: 19, 74, 23
+15645: 19, 75, 0
+15646: 19, 75, 1
+15647: 19, 75, 2
+15648: 19, 75, 3
+15649: 19, 75, 4
+15650: 19, 75, 5
+15651: 19, 75, 6
+15652: 19, 75, 7
+15653: 19, 75, 8
+15654: 19, 75, 9
+15655: 19, 75, 10
+15656: 19, 76, 0
+15657: 19, 76, 1
+15658: 19, 76, 2
+15659: 19, 76, 3
+15660: 19, 76, 4
+15661: 19, 76, 5
+15662: 19, 76, 6
+15663: 19, 76, 7
+15664: 19, 76, 8
+15665: 19, 76, 9
+15666: 19, 76, 10
+15667: 19, 76, 11
+15668: 19, 76, 12
+15669: 19, 77, 0
+15670: 19, 77, 1
+15671: 19, 77, 2
+15672: 19, 77, 3
+15673: 19, 77, 4
+15674: 19, 77, 5
+15675: 19, 77, 6
+15676: 19, 77, 7
+15677: 19, 77, 8
+15678: 19, 77, 9
+15679: 19, 77, 10
+15680: 19, 77, 11
+15681: 19, 77, 12
+15682: 19, 77, 13
+15683: 19, 77, 14
+15684: 19, 77, 15
+15685: 19, 77, 16
+15686: 19, 77, 17
+15687: 19, 77, 18
+15688: 19, 77, 19
+15689: 19, 77, 20
+15690: 19, 78, 0
+15691: 19, 78, 1
+15692: 19, 78, 2
+15693: 19, 78, 3
+15694: 19, 78, 4
+15695: 19, 78, 5
+15696: 19, 78, 6
+15697: 19, 78, 7
+15698: 19, 78, 8
+15699: 19, 78, 9
+15700: 19, 78, 10
+15701: 19, 78, 11
+15702: 19, 78, 12
+15703: 19, 78, 13
+15704: 19, 78, 14
+15705: 19, 78, 15
+15706: 19, 78, 16
+15707: 19, 78, 17
+15708: 19, 78, 18
+15709: 19, 78, 19
+15710: 19, 78, 20
+15711: 19, 78, 21
+15712: 19, 78, 22
+15713: 19, 78, 23
+15714: 19, 78, 24
+15715: 19, 78, 25
+15716: 19, 78, 26
+15717: 19, 78, 27
+15718: 19, 78, 28
+15719: 19, 78, 29
+15720: 19, 78, 30
+15721: 19, 78, 31
+15722: 19, 78, 32
+15723: 19, 78, 33
+15724: 19, 78, 34
+15725: 19, 78, 35
+15726: 19, 78, 36
+15727: 19, 78, 37
+15728: 19, 78, 38
+15729: 19, 78, 39
+15730: 19, 78, 40
+15731: 19, 78, 41
+15732: 19, 78, 42
+15733: 19, 78, 43
+15734: 19, 78, 44
+15735: 19, 78, 45
+15736: 19, 78, 46
+15737: 19, 78, 47
+15738: 19, 78, 48
+15739: 19, 78, 49
+15740: 19, 78, 50
+15741: 19, 78, 51
+15742: 19, 78, 52
+15743: 19, 78, 53
+15744: 19, 78, 54
+15745: 19, 78, 55
+15746: 19, 78, 56
+15747: 19, 78, 57
+15748: 19, 78, 58
+15749: 19, 78, 59
+15750: 19, 78, 60
+15751: 19, 78, 61
+15752: 19, 78, 62
+15753: 19, 78, 63
+15754: 19, 78, 64
+15755: 19, 78, 65
+15756: 19, 78, 66
+15757: 19, 78, 67
+15758: 19, 78, 68
+15759: 19, 78, 69
+15760: 19, 78, 70
+15761: 19, 78, 71
+15762: 19, 78, 72
+15763: 19, 79, 0
+15764: 19, 79, 1
+15765: 19, 79, 2
+15766: 19, 79, 3
+15767: 19, 79, 4
+15768: 19, 79, 5
+15769: 19, 79, 6
+15770: 19, 79, 7
+15771: 19, 79, 8
+15772: 19, 79, 9
+15773: 19, 79, 10
+15774: 19, 79, 11
+15775: 19, 79, 12
+15776: 19, 79, 13
+15777: 19, 80, 0
+15778: 19, 80, 1
+15779: 19, 80, 2
+15780: 19, 80, 3
+15781: 19, 80, 4
+15782: 19, 80, 5
+15783: 19, 80, 6
+15784: 19, 80, 7
+15785: 19, 80, 8
+15786: 19, 80, 9
+15787: 19, 80, 10
+15788: 19, 80, 11
+15789: 19, 80, 12
+15790: 19, 80, 13
+15791: 19, 80, 14
+15792: 19, 80, 15
+15793: 19, 80, 16
+15794: 19, 80, 17
+15795: 19, 80, 18
+15796: 19, 80, 19
+15797: 19, 81, 0
+15798: 19, 81, 1
+15799: 19, 81, 2
+15800: 19, 81, 3
+15801: 19, 81, 4
+15802: 19, 81, 5
+15803: 19, 81, 6
+15804: 19, 81, 7
+15805: 19, 81, 8
+15806: 19, 81, 9
+15807: 19, 81, 10
+15808: 19, 81, 11
+15809: 19, 81, 12
+15810: 19, 81, 13
+15811: 19, 81, 14
+15812: 19, 81, 15
+15813: 19, 81, 16
+15814: 19, 82, 0
+15815: 19, 82, 1
+15816: 19, 82, 2
+15817: 19, 82, 3
+15818: 19, 82, 4
+15819: 19, 82, 5
+15820: 19, 82, 6
+15821: 19, 82, 7
+15822: 19, 82, 8
+15823: 19, 83, 0
+15824: 19, 83, 1
+15825: 19, 83, 2
+15826: 19, 83, 3
+15827: 19, 83, 4
+15828: 19, 83, 5
+15829: 19, 83, 6
+15830: 19, 83, 7
+15831: 19, 83, 8
+15832: 19, 83, 9
+15833: 19, 83, 10
+15834: 19, 83, 11
+15835: 19, 83, 12
+15836: 19, 83, 13
+15837: 19, 83, 14
+15838: 19, 83, 15
+15839: 19, 83, 16
+15840: 19, 83, 17
+15841: 19, 83, 18
+15842: 19, 84, 0
+15843: 19, 84, 1
+15844: 19, 84, 2
+15845: 19, 84, 3
+15846: 19, 84, 4
+15847: 19, 84, 5
+15848: 19, 84, 6
+15849: 19, 84, 7
+15850: 19, 84, 8
+15851: 19, 84, 9
+15852: 19, 84, 10
+15853: 19, 84, 11
+15854: 19, 84, 12
+15855: 19, 85, 0
+15856: 19, 85, 1
+15857: 19, 85, 2
+15858: 19, 85, 3
+15859: 19, 85, 4
+15860: 19, 85, 5
+15861: 19, 85, 6
+15862: 19, 85, 7
+15863: 19, 85, 8
+15864: 19, 85, 9
+15865: 19, 85, 10
+15866: 19, 85, 11
+15867: 19, 85, 12
+15868: 19, 85, 13
+15869: 19, 86, 0
+15870: 19, 86, 1
+15871: 19, 86, 2
+15872: 19, 86, 3
+15873: 19, 86, 4
+15874: 19, 86, 5
+15875: 19, 86, 6
+15876: 19, 86, 7
+15877: 19, 86, 8
+15878: 19, 86, 9
+15879: 19, 86, 10
+15880: 19, 86, 11
+15881: 19, 86, 12
+15882: 19, 86, 13
+15883: 19, 86, 14
+15884: 19, 86, 15
+15885: 19, 86, 16
+15886: 19, 86, 17
+15887: 19, 87, 0
+15888: 19, 87, 1
+15889: 19, 87, 2
+15890: 19, 87, 3
+15891: 19, 87, 4
+15892: 19, 87, 5
+15893: 19, 87, 6
+15894: 19, 87, 7
+15895: 19, 88, 0
+15896: 19, 88, 1
+15897: 19, 88, 2
+15898: 19, 88, 3
+15899: 19, 88, 4
+15900: 19, 88, 5
+15901: 19, 88, 6
+15902: 19, 88, 7
+15903: 19, 88, 8
+15904: 19, 88, 9
+15905: 19, 88, 10
+15906: 19, 88, 11
+15907: 19, 88, 12
+15908: 19, 88, 13
+15909: 19, 88, 14
+15910: 19, 88, 15
+15911: 19, 88, 16
+15912: 19, 88, 17
+15913: 19, 88, 18
+15914: 19, 89, 0
+15915: 19, 89, 1
+15916: 19, 89, 2
+15917: 19, 89, 3
+15918: 19, 89, 4
+15919: 19, 89, 5
+15920: 19, 89, 6
+15921: 19, 89, 7
+15922: 19, 89, 8
+15923: 19, 89, 9
+15924: 19, 89, 10
+15925: 19, 89, 11
+15926: 19, 89, 12
+15927: 19, 89, 13
+15928: 19, 89, 14
+15929: 19, 89, 15
+15930: 19, 89, 16
+15931: 19, 89, 17
+15932: 19, 89, 18
+15933: 19, 89, 19
+15934: 19, 89, 20
+15935: 19, 89, 21
+15936: 19, 89, 22
+15937: 19, 89, 23
+15938: 19, 89, 24
+15939: 19, 89, 25
+15940: 19, 89, 26
+15941: 19, 89, 27
+15942: 19, 89, 28
+15943: 19, 89, 29
+15944: 19, 89, 30
+15945: 19, 89, 31
+15946: 19, 89, 32
+15947: 19, 89, 33
+15948: 19, 89, 34
+15949: 19, 89, 35
+15950: 19, 89, 36
+15951: 19, 89, 37
+15952: 19, 89, 38
+15953: 19, 89, 39
+15954: 19, 89, 40
+15955: 19, 89, 41
+15956: 19, 89, 42
+15957: 19, 89, 43
+15958: 19, 89, 44
+15959: 19, 89, 45
+15960: 19, 89, 46
+15961: 19, 89, 47
+15962: 19, 89, 48
+15963: 19, 89, 49
+15964: 19, 89, 50
+15965: 19, 89, 51
+15966: 19, 89, 52
+15967: 19, 90, 0
+15968: 19, 90, 1
+15969: 19, 90, 2
+15970: 19, 90, 3
+15971: 19, 90, 4
+15972: 19, 90, 5
+15973: 19, 90, 6
+15974: 19, 90, 7
+15975: 19, 90, 8
+15976: 19, 90, 9
+15977: 19, 90, 10
+15978: 19, 90, 11
+15979: 19, 90, 12
+15980: 19, 90, 13
+15981: 19, 90, 14
+15982: 19, 90, 15
+15983: 19, 90, 16
+15984: 19, 90, 17
+15985: 19, 91, 0
+15986: 19, 91, 1
+15987: 19, 91, 2
+15988: 19, 91, 3
+15989: 19, 91, 4
+15990: 19, 91, 5
+15991: 19, 91, 6
+15992: 19, 91, 7
+15993: 19, 91, 8
+15994: 19, 91, 9
+15995: 19, 91, 10
+15996: 19, 91, 11
+15997: 19, 91, 12
+15998: 19, 91, 13
+15999: 19, 91, 14
+16000: 19, 91, 15
+16001: 19, 91, 16
+16002: 19, 92, 0
+16003: 19, 92, 1
+16004: 19, 92, 2
+16005: 19, 92, 3
+16006: 19, 92, 4
+16007: 19, 92, 5
+16008: 19, 92, 6
+16009: 19, 92, 7
+16010: 19, 92, 8
+16011: 19, 92, 9
+16012: 19, 92, 10
+16013: 19, 92, 11
+16014: 19, 92, 12
+16015: 19, 92, 13
+16016: 19, 92, 14
+16017: 19, 92, 15
+16018: 19, 93, 0
+16019: 19, 93, 1
+16020: 19, 93, 2
+16021: 19, 93, 3
+16022: 19, 93, 4
+16023: 19, 93, 5
+16024: 19, 94, 0
+16025: 19, 94, 1
+16026: 19, 94, 2
+16027: 19, 94, 3
+16028: 19, 94, 4
+16029: 19, 94, 5
+16030: 19, 94, 6
+16031: 19, 94, 7
+16032: 19, 94, 8
+16033: 19, 94, 9
+16034: 19, 94, 10
+16035: 19, 94, 11
+16036: 19, 94, 12
+16037: 19, 94, 13
+16038: 19, 94, 14
+16039: 19, 94, 15
+16040: 19, 94, 16
+16041: 19, 94, 17
+16042: 19, 94, 18
+16043: 19, 94, 19
+16044: 19, 94, 20
+16045: 19, 94, 21
+16046: 19, 94, 22
+16047: 19, 94, 23
+16048: 19, 95, 0
+16049: 19, 95, 1
+16050: 19, 95, 2
+16051: 19, 95, 3
+16052: 19, 95, 4
+16053: 19, 95, 5
+16054: 19, 95, 6
+16055: 19, 95, 7
+16056: 19, 95, 8
+16057: 19, 95, 9
+16058: 19, 95, 10
+16059: 19, 95, 11
+16060: 19, 96, 0
+16061: 19, 96, 1
+16062: 19, 96, 2
+16063: 19, 96, 3
+16064: 19, 96, 4
+16065: 19, 96, 5
+16066: 19, 96, 6
+16067: 19, 96, 7
+16068: 19, 96, 8
+16069: 19, 96, 9
+16070: 19, 96, 10
+16071: 19, 96, 11
+16072: 19, 96, 12
+16073: 19, 96, 13
+16074: 19, 97, 0
+16075: 19, 97, 1
+16076: 19, 97, 2
+16077: 19, 97, 3
+16078: 19, 97, 4
+16079: 19, 97, 5
+16080: 19, 97, 6
+16081: 19, 97, 7
+16082: 19, 97, 8
+16083: 19, 97, 9
+16084: 19, 97, 10
+16085: 19, 97, 11
+16086: 19, 97, 12
+16087: 19, 98, 0
+16088: 19, 98, 1
+16089: 19, 98, 2
+16090: 19, 98, 3
+16091: 19, 98, 4
+16092: 19, 98, 5
+16093: 19, 98, 6
+16094: 19, 98, 7
+16095: 19, 98, 8
+16096: 19, 98, 9
+16097: 19, 99, 0
+16098: 19, 99, 1
+16099: 19, 99, 2
+16100: 19, 99, 3
+16101: 19, 99, 4
+16102: 19, 99, 5
+16103: 19, 99, 6
+16104: 19, 99, 7
+16105: 19, 99, 8
+16106: 19, 99, 9
+16107: 19, 100, 0
+16108: 19, 100, 1
+16109: 19, 100, 2
+16110: 19, 100, 3
+16111: 19, 100, 4
+16112: 19, 100, 5
+16113: 19, 101, 0
+16114: 19, 101, 1
+16115: 19, 101, 2
+16116: 19, 101, 3
+16117: 19, 101, 4
+16118: 19, 101, 5
+16119: 19, 101, 6
+16120: 19, 101, 7
+16121: 19, 101, 8
+16122: 19, 102, 0
+16123: 19, 102, 1
+16124: 19, 102, 2
+16125: 19, 102, 3
+16126: 19, 102, 4
+16127: 19, 102, 5
+16128: 19, 102, 6
+16129: 19, 102, 7
+16130: 19, 102, 8
+16131: 19, 102, 9
+16132: 19, 102, 10
+16133: 19, 102, 11
+16134: 19, 102, 12
+16135: 19, 102, 13
+16136: 19, 102, 14
+16137: 19, 102, 15
+16138: 19, 102, 16
+16139: 19, 102, 17
+16140: 19, 102, 18
+16141: 19, 102, 19
+16142: 19, 102, 20
+16143: 19, 102, 21
+16144: 19, 102, 22
+16145: 19, 102, 23
+16146: 19, 102, 24
+16147: 19, 102, 25
+16148: 19, 102, 26
+16149: 19, 102, 27
+16150: 19, 102, 28
+16151: 19, 103, 0
+16152: 19, 103, 1
+16153: 19, 103, 2
+16154: 19, 103, 3
+16155: 19, 103, 4
+16156: 19, 103, 5
+16157: 19, 103, 6
+16158: 19, 103, 7
+16159: 19, 103, 8
+16160: 19, 103, 9
+16161: 19, 103, 10
+16162: 19, 103, 11
+16163: 19, 103, 12
+16164: 19, 103, 13
+16165: 19, 103, 14
+16166: 19, 103, 15
+16167: 19, 103, 16
+16168: 19, 103, 17
+16169: 19, 103, 18
+16170: 19, 103, 19
+16171: 19, 103, 20
+16172: 19, 103, 21
+16173: 19, 103, 22
+16174: 19, 104, 0
+16175: 19, 104, 1
+16176: 19, 104, 2
+16177: 19, 104, 3
+16178: 19, 104, 4
+16179: 19, 104, 5
+16180: 19, 104, 6
+16181: 19, 104, 7
+16182: 19, 104, 8
+16183: 19, 104, 9
+16184: 19, 104, 10
+16185: 19, 104, 11
+16186: 19, 104, 12
+16187: 19, 104, 13
+16188: 19, 104, 14
+16189: 19, 104, 15
+16190: 19, 104, 16
+16191: 19, 104, 17
+16192: 19, 104, 18
+16193: 19, 104, 19
+16194: 19, 104, 20
+16195: 19, 104, 21
+16196: 19, 104, 22
+16197: 19, 104, 23
+16198: 19, 104, 24
+16199: 19, 104, 25
+16200: 19, 104, 26
+16201: 19, 104, 27
+16202: 19, 104, 28
+16203: 19, 104, 29
+16204: 19, 104, 30
+16205: 19, 104, 31
+16206: 19, 104, 32
+16207: 19, 104, 33
+16208: 19, 104, 34
+16209: 19, 104, 35
+16210: 19, 105, 0
+16211: 19, 105, 1
+16212: 19, 105, 2
+16213: 19, 105, 3
+16214: 19, 105, 4
+16215: 19, 105, 5
+16216: 19, 105, 6
+16217: 19, 105, 7
+16218: 19, 105, 8
+16219: 19, 105, 9
+16220: 19, 105, 10
+16221: 19, 105, 11
+16222: 19, 105, 12
+16223: 19, 105, 13
+16224: 19, 105, 14
+16225: 19, 105, 15
+16226: 19, 105, 16
+16227: 19, 105, 17
+16228: 19, 105, 18
+16229: 19, 105, 19
+16230: 19, 105, 20
+16231: 19, 105, 21
+16232: 19, 105, 22
+16233: 19, 105, 23
+16234: 19, 105, 24
+16235: 19, 105, 25
+16236: 19, 105, 26
+16237: 19, 105, 27
+16238: 19, 105, 28
+16239: 19, 105, 29
+16240: 19, 105, 30
+16241: 19, 105, 31
+16242: 19, 105, 32
+16243: 19, 105, 33
+16244: 19, 105, 34
+16245: 19, 105, 35
+16246: 19, 105, 36
+16247: 19, 105, 37
+16248: 19, 105, 38
+16249: 19, 105, 39
+16250: 19, 105, 40
+16251: 19, 105, 41
+16252: 19, 105, 42
+16253: 19, 105, 43
+16254: 19, 105, 44
+16255: 19, 105, 45
+16256: 19, 106, 0
+16257: 19, 106, 1
+16258: 19, 106, 2
+16259: 19, 106, 3
+16260: 19, 106, 4
+16261: 19, 106, 5
+16262: 19, 106, 6
+16263: 19, 106, 7
+16264: 19, 106, 8
+16265: 19, 106, 9
+16266: 19, 106, 10
+16267: 19, 106, 11
+16268: 19, 106, 12
+16269: 19, 106, 13
+16270: 19, 106, 14
+16271: 19, 106, 15
+16272: 19, 106, 16
+16273: 19, 106, 17
+16274: 19, 106, 18
+16275: 19, 106, 19
+16276: 19, 106, 20
+16277: 19, 106, 21
+16278: 19, 106, 22
+16279: 19, 106, 23
+16280: 19, 106, 24
+16281: 19, 106, 25
+16282: 19, 106, 26
+16283: 19, 106, 27
+16284: 19, 106, 28
+16285: 19, 106, 29
+16286: 19, 106, 30
+16287: 19, 106, 31
+16288: 19, 106, 32
+16289: 19, 106, 33
+16290: 19, 106, 34
+16291: 19, 106, 35
+16292: 19, 106, 36
+16293: 19, 106, 37
+16294: 19, 106, 38
+16295: 19, 106, 39
+16296: 19, 106, 40
+16297: 19, 106, 41
+16298: 19, 106, 42
+16299: 19, 106, 43
+16300: 19, 106, 44
+16301: 19, 106, 45
+16302: 19, 106, 46
+16303: 19, 106, 47
+16304: 19, 106, 48
+16305: 19, 107, 0
+16306: 19, 107, 1
+16307: 19, 107, 2
+16308: 19, 107, 3
+16309: 19, 107, 4
+16310: 19, 107, 5
+16311: 19, 107, 6
+16312: 19, 107, 7
+16313: 19, 107, 8
+16314: 19, 107, 9
+16315: 19, 107, 10
+16316: 19, 107, 11
+16317: 19, 107, 12
+16318: 19, 107, 13
+16319: 19, 107, 14
+16320: 19, 107, 15
+16321: 19, 107, 16
+16322: 19, 107, 17
+16323: 19, 107, 18
+16324: 19, 107, 19
+16325: 19, 107, 20
+16326: 19, 107, 21
+16327: 19, 107, 22
+16328: 19, 107, 23
+16329: 19, 107, 24
+16330: 19, 107, 25
+16331: 19, 107, 26
+16332: 19, 107, 27
+16333: 19, 107, 28
+16334: 19, 107, 29
+16335: 19, 107, 30
+16336: 19, 107, 31
+16337: 19, 107, 32
+16338: 19, 107, 33
+16339: 19, 107, 34
+16340: 19, 107, 35
+16341: 19, 107, 36
+16342: 19, 107, 37
+16343: 19, 107, 38
+16344: 19, 107, 39
+16345: 19, 107, 40
+16346: 19, 107, 41
+16347: 19, 107, 42
+16348: 19, 107, 43
+16349: 19, 108, 0
+16350: 19, 108, 1
+16351: 19, 108, 2
+16352: 19, 108, 3
+16353: 19, 108, 4
+16354: 19, 108, 5
+16355: 19, 108, 6
+16356: 19, 108, 7
+16357: 19, 108, 8
+16358: 19, 108, 9
+16359: 19, 108, 10
+16360: 19, 108, 11
+16361: 19, 108, 12
+16362: 19, 108, 13
+16363: 19, 109, 0
+16364: 19, 109, 1
+16365: 19, 109, 2
+16366: 19, 109, 3
+16367: 19, 109, 4
+16368: 19, 109, 5
+16369: 19, 109, 6
+16370: 19, 109, 7
+16371: 19, 109, 8
+16372: 19, 109, 9
+16373: 19, 109, 10
+16374: 19, 109, 11
+16375: 19, 109, 12
+16376: 19, 109, 13
+16377: 19, 109, 14
+16378: 19, 109, 15
+16379: 19, 109, 16
+16380: 19, 109, 17
+16381: 19, 109, 18
+16382: 19, 109, 19
+16383: 19, 109, 20
+16384: 19, 109, 21
+16385: 19, 109, 22
+16386: 19, 109, 23
+16387: 19, 109, 24
+16388: 19, 109, 25
+16389: 19, 109, 26
+16390: 19, 109, 27
+16391: 19, 109, 28
+16392: 19, 109, 29
+16393: 19, 109, 30
+16394: 19, 109, 31
+16395: 19, 110, 0
+16396: 19, 110, 1
+16397: 19, 110, 2
+16398: 19, 110, 3
+16399: 19, 110, 4
+16400: 19, 110, 5
+16401: 19, 110, 6
+16402: 19, 110, 7
+16403: 19, 111, 0
+16404: 19, 111, 1
+16405: 19, 111, 2
+16406: 19, 111, 3
+16407: 19, 111, 4
+16408: 19, 111, 5
+16409: 19, 111, 6
+16410: 19, 111, 7
+16411: 19, 111, 8
+16412: 19, 111, 9
+16413: 19, 111, 10
+16414: 19, 112, 0
+16415: 19, 112, 1
+16416: 19, 112, 2
+16417: 19, 112, 3
+16418: 19, 112, 4
+16419: 19, 112, 5
+16420: 19, 112, 6
+16421: 19, 112, 7
+16422: 19, 112, 8
+16423: 19, 112, 9
+16424: 19, 112, 10
+16425: 19, 113, 0
+16426: 19, 113, 1
+16427: 19, 113, 2
+16428: 19, 113, 3
+16429: 19, 113, 4
+16430: 19, 113, 5
+16431: 19, 113, 6
+16432: 19, 113, 7
+16433: 19, 113, 8
+16434: 19, 113, 9
+16435: 19, 114, 0
+16436: 19, 114, 1
+16437: 19, 114, 2
+16438: 19, 114, 3
+16439: 19, 114, 4
+16440: 19, 114, 5
+16441: 19, 114, 6
+16442: 19, 114, 7
+16443: 19, 114, 8
+16444: 19, 115, 0
+16445: 19, 115, 1
+16446: 19, 115, 2
+16447: 19, 115, 3
+16448: 19, 115, 4
+16449: 19, 115, 5
+16450: 19, 115, 6
+16451: 19, 115, 7
+16452: 19, 115, 8
+16453: 19, 115, 9
+16454: 19, 115, 10
+16455: 19, 115, 11
+16456: 19, 115, 12
+16457: 19, 115, 13
+16458: 19, 115, 14
+16459: 19, 115, 15
+16460: 19, 115, 16
+16461: 19, 115, 17
+16462: 19, 115, 18
+16463: 19, 116, 0
+16464: 19, 116, 1
+16465: 19, 116, 2
+16466: 19, 116, 3
+16467: 19, 116, 4
+16468: 19, 116, 5
+16469: 19, 116, 6
+16470: 19, 116, 7
+16471: 19, 116, 8
+16472: 19, 116, 9
+16473: 19, 116, 10
+16474: 19, 116, 11
+16475: 19, 116, 12
+16476: 19, 116, 13
+16477: 19, 116, 14
+16478: 19, 116, 15
+16479: 19, 116, 16
+16480: 19, 116, 17
+16481: 19, 116, 18
+16482: 19, 116, 19
+16483: 19, 117, 0
+16484: 19, 117, 1
+16485: 19, 117, 2
+16486: 19, 118, 0
+16487: 19, 118, 1
+16488: 19, 118, 2
+16489: 19, 118, 3
+16490: 19, 118, 4
+16491: 19, 118, 5
+16492: 19, 118, 6
+16493: 19, 118, 7
+16494: 19, 118, 8
+16495: 19, 118, 9
+16496: 19, 118, 10
+16497: 19, 118, 11
+16498: 19, 118, 12
+16499: 19, 118, 13
+16500: 19, 118, 14
+16501: 19, 118, 15
+16502: 19, 118, 16
+16503: 19, 118, 17
+16504: 19, 118, 18
+16505: 19, 118, 19
+16506: 19, 118, 20
+16507: 19, 118, 21
+16508: 19, 118, 22
+16509: 19, 118, 23
+16510: 19, 118, 24
+16511: 19, 118, 25
+16512: 19, 118, 26
+16513: 19, 118, 27
+16514: 19, 118, 28
+16515: 19, 118, 29
+16516: 19, 119, 0
+16517: 19, 119, 1
+16518: 19, 119, 2
+16519: 19, 119, 3
+16520: 19, 119, 4
+16521: 19, 119, 5
+16522: 19, 119, 6
+16523: 19, 119, 7
+16524: 19, 119, 8
+16525: 19, 119, 9
+16526: 19, 119, 10
+16527: 19, 119, 11
+16528: 19, 119, 12
+16529: 19, 119, 13
+16530: 19, 119, 14
+16531: 19, 119, 15
+16532: 19, 119, 16
+16533: 19, 119, 17
+16534: 19, 119, 18
+16535: 19, 119, 19
+16536: 19, 119, 20
+16537: 19, 119, 21
+16538: 19, 119, 22
+16539: 19, 119, 23
+16540: 19, 119, 24
+16541: 19, 119, 25
+16542: 19, 119, 26
+16543: 19, 119, 27
+16544: 19, 119, 28
+16545: 19, 119, 29
+16546: 19, 119, 30
+16547: 19, 119, 31
+16548: 19, 119, 32
+16549: 19, 119, 33
+16550: 19, 119, 34
+16551: 19, 119, 35
+16552: 19, 119, 36
+16553: 19, 119, 37
+16554: 19, 119, 38
+16555: 19, 119, 39
+16556: 19, 119, 40
+16557: 19, 119, 41
+16558: 19, 119, 42
+16559: 19, 119, 43
+16560: 19, 119, 44
+16561: 19, 119, 45
+16562: 19, 119, 46
+16563: 19, 119, 47
+16564: 19, 119, 48
+16565: 19, 119, 49
+16566: 19, 119, 50
+16567: 19, 119, 51
+16568: 19, 119, 52
+16569: 19, 119, 53
+16570: 19, 119, 54
+16571: 19, 119, 55
+16572: 19, 119, 56
+16573: 19, 119, 57
+16574: 19, 119, 58
+16575: 19, 119, 59
+16576: 19, 119, 60
+16577: 19, 119, 61
+16578: 19, 119, 62
+16579: 19, 119, 63
+16580: 19, 119, 64
+16581: 19, 119, 65
+16582: 19, 119, 66
+16583: 19, 119, 67
+16584: 19, 119, 68
+16585: 19, 119, 69
+16586: 19, 119, 70
+16587: 19, 119, 71
+16588: 19, 119, 72
+16589: 19, 119, 73
+16590: 19, 119, 74
+16591: 19, 119, 75
+16592: 19, 119, 76
+16593: 19, 119, 77
+16594: 19, 119, 78
+16595: 19, 119, 79
+16596: 19, 119, 80
+16597: 19, 119, 81
+16598: 19, 119, 82
+16599: 19, 119, 83
+16600: 19, 119, 84
+16601: 19, 119, 85
+16602: 19, 119, 86
+16603: 19, 119, 87
+16604: 19, 119, 88
+16605: 19, 119, 89
+16606: 19, 119, 90
+16607: 19, 119, 91
+16608: 19, 119, 92
+16609: 19, 119, 93
+16610: 19, 119, 94
+16611: 19, 119, 95
+16612: 19, 119, 96
+16613: 19, 119, 97
+16614: 19, 119, 98
+16615: 19, 119, 99
+16616: 19, 119, 100
+16617: 19, 119, 101
+16618: 19, 119, 102
+16619: 19, 119, 103
+16620: 19, 119, 104
+16621: 19, 119, 105
+16622: 19, 119, 106
+16623: 19, 119, 107
+16624: 19, 119, 108
+16625: 19, 119, 109
+16626: 19, 119, 110
+16627: 19, 119, 111
+16628: 19, 119, 112
+16629: 19, 119, 113
+16630: 19, 119, 114
+16631: 19, 119, 115
+16632: 19, 119, 116
+16633: 19, 119, 117
+16634: 19, 119, 118
+16635: 19, 119, 119
+16636: 19, 119, 120
+16637: 19, 119, 121
+16638: 19, 119, 122
+16639: 19, 119, 123
+16640: 19, 119, 124
+16641: 19, 119, 125
+16642: 19, 119, 126
+16643: 19, 119, 127
+16644: 19, 119, 128
+16645: 19, 119, 129
+16646: 19, 119, 130
+16647: 19, 119, 131
+16648: 19, 119, 132
+16649: 19, 119, 133
+16650: 19, 119, 134
+16651: 19, 119, 135
+16652: 19, 119, 136
+16653: 19, 119, 137
+16654: 19, 119, 138
+16655: 19, 119, 139
+16656: 19, 119, 140
+16657: 19, 119, 141
+16658: 19, 119, 142
+16659: 19, 119, 143
+16660: 19, 119, 144
+16661: 19, 119, 145
+16662: 19, 119, 146
+16663: 19, 119, 147
+16664: 19, 119, 148
+16665: 19, 119, 149
+16666: 19, 119, 150
+16667: 19, 119, 151
+16668: 19, 119, 152
+16669: 19, 119, 153
+16670: 19, 119, 154
+16671: 19, 119, 155
+16672: 19, 119, 156
+16673: 19, 119, 157
+16674: 19, 119, 158
+16675: 19, 119, 159
+16676: 19, 119, 160
+16677: 19, 119, 161
+16678: 19, 119, 162
+16679: 19, 119, 163
+16680: 19, 119, 164
+16681: 19, 119, 165
+16682: 19, 119, 166
+16683: 19, 119, 167
+16684: 19, 119, 168
+16685: 19, 119, 169
+16686: 19, 119, 170
+16687: 19, 119, 171
+16688: 19, 119, 172
+16689: 19, 119, 173
+16690: 19, 119, 174
+16691: 19, 119, 175
+16692: 19, 119, 176
+16693: 19, 120, 0
+16694: 19, 120, 1
+16695: 19, 120, 2
+16696: 19, 120, 3
+16697: 19, 120, 4
+16698: 19, 120, 5
+16699: 19, 120, 6
+16700: 19, 120, 7
+16701: 19, 121, 0
+16702: 19, 121, 1
+16703: 19, 121, 2
+16704: 19, 121, 3
+16705: 19, 121, 4
+16706: 19, 121, 5
+16707: 19, 121, 6
+16708: 19, 121, 7
+16709: 19, 121, 8
+16710: 19, 122, 0
+16711: 19, 122, 1
+16712: 19, 122, 2
+16713: 19, 122, 3
+16714: 19, 122, 4
+16715: 19, 122, 5
+16716: 19, 122, 6
+16717: 19, 122, 7
+16718: 19, 122, 8
+16719: 19, 122, 9
+16720: 19, 123, 0
+16721: 19, 123, 1
+16722: 19, 123, 2
+16723: 19, 123, 3
+16724: 19, 123, 4
+16725: 19, 124, 0
+16726: 19, 124, 1
+16727: 19, 124, 2
+16728: 19, 124, 3
+16729: 19, 124, 4
+16730: 19, 124, 5
+16731: 19, 124, 6
+16732: 19, 124, 7
+16733: 19, 124, 8
+16734: 19, 125, 0
+16735: 19, 125, 1
+16736: 19, 125, 2
+16737: 19, 125, 3
+16738: 19, 125, 4
+16739: 19, 125, 5
+16740: 19, 126, 0
+16741: 19, 126, 1
+16742: 19, 126, 2
+16743: 19, 126, 3
+16744: 19, 126, 4
+16745: 19, 126, 5
+16746: 19, 126, 6
+16747: 19, 127, 0
+16748: 19, 127, 1
+16749: 19, 127, 2
+16750: 19, 127, 3
+16751: 19, 127, 4
+16752: 19, 127, 5
+16753: 19, 128, 0
+16754: 19, 128, 1
+16755: 19, 128, 2
+16756: 19, 128, 3
+16757: 19, 128, 4
+16758: 19, 128, 5
+16759: 19, 128, 6
+16760: 19, 129, 0
+16761: 19, 129, 1
+16762: 19, 129, 2
+16763: 19, 129, 3
+16764: 19, 129, 4
+16765: 19, 129, 5
+16766: 19, 129, 6
+16767: 19, 129, 7
+16768: 19, 129, 8
+16769: 19, 130, 0
+16770: 19, 130, 1
+16771: 19, 130, 2
+16772: 19, 130, 3
+16773: 19, 130, 4
+16774: 19, 130, 5
+16775: 19, 130, 6
+16776: 19, 130, 7
+16777: 19, 130, 8
+16778: 19, 131, 0
+16779: 19, 131, 1
+16780: 19, 131, 2
+16781: 19, 131, 3
+16782: 19, 132, 0
+16783: 19, 132, 1
+16784: 19, 132, 2
+16785: 19, 132, 3
+16786: 19, 132, 4
+16787: 19, 132, 5
+16788: 19, 132, 6
+16789: 19, 132, 7
+16790: 19, 132, 8
+16791: 19, 132, 9
+16792: 19, 132, 10
+16793: 19, 132, 11
+16794: 19, 132, 12
+16795: 19, 132, 13
+16796: 19, 132, 14
+16797: 19, 132, 15
+16798: 19, 132, 16
+16799: 19, 132, 17
+16800: 19, 132, 18
+16801: 19, 133, 0
+16802: 19, 133, 1
+16803: 19, 133, 2
+16804: 19, 133, 3
+16805: 19, 134, 0
+16806: 19, 134, 1
+16807: 19, 134, 2
+16808: 19, 134, 3
+16809: 19, 135, 0
+16810: 19, 135, 1
+16811: 19, 135, 2
+16812: 19, 135, 3
+16813: 19, 135, 4
+16814: 19, 135, 5
+16815: 19, 135, 6
+16816: 19, 135, 7
+16817: 19, 135, 8
+16818: 19, 135, 9
+16819: 19, 135, 10
+16820: 19, 135, 11
+16821: 19, 135, 12
+16822: 19, 135, 13
+16823: 19, 135, 14
+16824: 19, 135, 15
+16825: 19, 135, 16
+16826: 19, 135, 17
+16827: 19, 135, 18
+16828: 19, 135, 19
+16829: 19, 135, 20
+16830: 19, 135, 21
+16831: 19, 136, 0
+16832: 19, 136, 1
+16833: 19, 136, 2
+16834: 19, 136, 3
+16835: 19, 136, 4
+16836: 19, 136, 5
+16837: 19, 136, 6
+16838: 19, 136, 7
+16839: 19, 136, 8
+16840: 19, 136, 9
+16841: 19, 136, 10
+16842: 19, 136, 11
+16843: 19, 136, 12
+16844: 19, 136, 13
+16845: 19, 136, 14
+16846: 19, 136, 15
+16847: 19, 136, 16
+16848: 19, 136, 17
+16849: 19, 136, 18
+16850: 19, 136, 19
+16851: 19, 136, 20
+16852: 19, 136, 21
+16853: 19, 136, 22
+16854: 19, 136, 23
+16855: 19, 136, 24
+16856: 19, 136, 25
+16857: 19, 136, 26
+16858: 19, 137, 0
+16859: 19, 137, 1
+16860: 19, 137, 2
+16861: 19, 137, 3
+16862: 19, 137, 4
+16863: 19, 137, 5
+16864: 19, 137, 6
+16865: 19, 137, 7
+16866: 19, 137, 8
+16867: 19, 137, 9
+16868: 19, 138, 0
+16869: 19, 138, 1
+16870: 19, 138, 2
+16871: 19, 138, 3
+16872: 19, 138, 4
+16873: 19, 138, 5
+16874: 19, 138, 6
+16875: 19, 138, 7
+16876: 19, 138, 8
+16877: 19, 139, 0
+16878: 19, 139, 1
+16879: 19, 139, 2
+16880: 19, 139, 3
+16881: 19, 139, 4
+16882: 19, 139, 5
+16883: 19, 139, 6
+16884: 19, 139, 7
+16885: 19, 139, 8
+16886: 19, 139, 9
+16887: 19, 139, 10
+16888: 19, 139, 11
+16889: 19, 139, 12
+16890: 19, 139, 13
+16891: 19, 139, 14
+16892: 19, 139, 15
+16893: 19, 139, 16
+16894: 19, 139, 17
+16895: 19, 139, 18
+16896: 19, 139, 19
+16897: 19, 139, 20
+16898: 19, 139, 21
+16899: 19, 139, 22
+16900: 19, 139, 23
+16901: 19, 139, 24
+16902: 19, 140, 0
+16903: 19, 140, 1
+16904: 19, 140, 2
+16905: 19, 140, 3
+16906: 19, 140, 4
+16907: 19, 140, 5
+16908: 19, 140, 6
+16909: 19, 140, 7
+16910: 19, 140, 8
+16911: 19, 140, 9
+16912: 19, 140, 10
+16913: 19, 140, 11
+16914: 19, 140, 12
+16915: 19, 140, 13
+16916: 19, 141, 0
+16917: 19, 141, 1
+16918: 19, 141, 2
+16919: 19, 141, 3
+16920: 19, 141, 4
+16921: 19, 141, 5
+16922: 19, 141, 6
+16923: 19, 141, 7
+16924: 19, 141, 8
+16925: 19, 141, 9
+16926: 19, 141, 10
+16927: 19, 142, 0
+16928: 19, 142, 1
+16929: 19, 142, 2
+16930: 19, 142, 3
+16931: 19, 142, 4
+16932: 19, 142, 5
+16933: 19, 142, 6
+16934: 19, 142, 7
+16935: 19, 143, 0
+16936: 19, 143, 1
+16937: 19, 143, 2
+16938: 19, 143, 3
+16939: 19, 143, 4
+16940: 19, 143, 5
+16941: 19, 143, 6
+16942: 19, 143, 7
+16943: 19, 143, 8
+16944: 19, 143, 9
+16945: 19, 143, 10
+16946: 19, 143, 11
+16947: 19, 143, 12
+16948: 19, 144, 0
+16949: 19, 144, 1
+16950: 19, 144, 2
+16951: 19, 144, 3
+16952: 19, 144, 4
+16953: 19, 144, 5
+16954: 19, 144, 6
+16955: 19, 144, 7
+16956: 19, 144, 8
+16957: 19, 144, 9
+16958: 19, 144, 10
+16959: 19, 144, 11
+16960: 19, 144, 12
+16961: 19, 144, 13
+16962: 19, 144, 14
+16963: 19, 144, 15
+16964: 19, 145, 0
+16965: 19, 145, 1
+16966: 19, 145, 2
+16967: 19, 145, 3
+16968: 19, 145, 4
+16969: 19, 145, 5
+16970: 19, 145, 6
+16971: 19, 145, 7
+16972: 19, 145, 8
+16973: 19, 145, 9
+16974: 19, 145, 10
+16975: 19, 145, 11
+16976: 19, 145, 12
+16977: 19, 145, 13
+16978: 19, 145, 14
+16979: 19, 145, 15
+16980: 19, 145, 16
+16981: 19, 145, 17
+16982: 19, 145, 18
+16983: 19, 145, 19
+16984: 19, 145, 20
+16985: 19, 145, 21
+16986: 19, 146, 0
+16987: 19, 146, 1
+16988: 19, 146, 2
+16989: 19, 146, 3
+16990: 19, 146, 4
+16991: 19, 146, 5
+16992: 19, 146, 6
+16993: 19, 146, 7
+16994: 19, 146, 8
+16995: 19, 146, 9
+16996: 19, 146, 10
+16997: 19, 147, 0
+16998: 19, 147, 1
+16999: 19, 147, 2
+17000: 19, 147, 3
+17001: 19, 147, 4
+17002: 19, 147, 5
+17003: 19, 147, 6
+17004: 19, 147, 7
+17005: 19, 147, 8
+17006: 19, 147, 9
+17007: 19, 147, 10
+17008: 19, 147, 11
+17009: 19, 147, 12
+17010: 19, 147, 13
+17011: 19, 147, 14
+17012: 19, 147, 15
+17013: 19, 147, 16
+17014: 19, 147, 17
+17015: 19, 147, 18
+17016: 19, 147, 19
+17017: 19, 147, 20
+17018: 19, 148, 0
+17019: 19, 148, 1
+17020: 19, 148, 2
+17021: 19, 148, 3
+17022: 19, 148, 4
+17023: 19, 148, 5
+17024: 19, 148, 6
+17025: 19, 148, 7
+17026: 19, 148, 8
+17027: 19, 148, 9
+17028: 19, 148, 10
+17029: 19, 148, 11
+17030: 19, 148, 12
+17031: 19, 148, 13
+17032: 19, 148, 14
+17033: 19, 149, 0
+17034: 19, 149, 1
+17035: 19, 149, 2
+17036: 19, 149, 3
+17037: 19, 149, 4
+17038: 19, 149, 5
+17039: 19, 149, 6
+17040: 19, 149, 7
+17041: 19, 149, 8
+17042: 19, 149, 9
+17043: 19, 150, 0
+17044: 19, 150, 1
+17045: 19, 150, 2
+17046: 19, 150, 3
+17047: 19, 150, 4
+17048: 19, 150, 5
+17049: 19, 150, 6
+17050: 20, 0, 0
+17051: 20, 1, 0
+17052: 20, 1, 1
+17053: 20, 1, 2
+17054: 20, 1, 3
+17055: 20, 1, 4
+17056: 20, 1, 5
+17057: 20, 1, 6
+17058: 20, 1, 7
+17059: 20, 1, 8
+17060: 20, 1, 9
+17061: 20, 1, 10
+17062: 20, 1, 11
+17063: 20, 1, 12
+17064: 20, 1, 13
+17065: 20, 1, 14
+17066: 20, 1, 15
+17067: 20, 1, 16
+17068: 20, 1, 17
+17069: 20, 1, 18
+17070: 20, 1, 19
+17071: 20, 1, 20
+17072: 20, 1, 21
+17073: 20, 1, 22
+17074: 20, 1, 23
+17075: 20, 1, 24
+17076: 20, 1, 25
+17077: 20, 1, 26
+17078: 20, 1, 27
+17079: 20, 1, 28
+17080: 20, 1, 29
+17081: 20, 1, 30
+17082: 20, 1, 31
+17083: 20, 1, 32
+17084: 20, 1, 33
+17085: 20, 2, 0
+17086: 20, 2, 1
+17087: 20, 2, 2
+17088: 20, 2, 3
+17089: 20, 2, 4
+17090: 20, 2, 5
+17091: 20, 2, 6
+17092: 20, 2, 7
+17093: 20, 2, 8
+17094: 20, 2, 9
+17095: 20, 2, 10
+17096: 20, 2, 11
+17097: 20, 2, 12
+17098: 20, 2, 13
+17099: 20, 2, 14
+17100: 20, 2, 15
+17101: 20, 2, 16
+17102: 20, 2, 17
+17103: 20, 2, 18
+17104: 20, 2, 19
+17105: 20, 2, 20
+17106: 20, 2, 21
+17107: 20, 2, 22
+17108: 20, 3, 0
+17109: 20, 3, 1
+17110: 20, 3, 2
+17111: 20, 3, 3
+17112: 20, 3, 4
+17113: 20, 3, 5
+17114: 20, 3, 6
+17115: 20, 3, 7
+17116: 20, 3, 8
+17117: 20, 3, 9
+17118: 20, 3, 10
+17119: 20, 3, 11
+17120: 20, 3, 12
+17121: 20, 3, 13
+17122: 20, 3, 14
+17123: 20, 3, 15
+17124: 20, 3, 16
+17125: 20, 3, 17
+17126: 20, 3, 18
+17127: 20, 3, 19
+17128: 20, 3, 20
+17129: 20, 3, 21
+17130: 20, 3, 22
+17131: 20, 3, 23
+17132: 20, 3, 24
+17133: 20, 3, 25
+17134: 20, 3, 26
+17135: 20, 3, 27
+17136: 20, 3, 28
+17137: 20, 3, 29
+17138: 20, 3, 30
+17139: 20, 3, 31
+17140: 20, 3, 32
+17141: 20, 3, 33
+17142: 20, 3, 34
+17143: 20, 3, 35
+17144: 20, 4, 0
+17145: 20, 4, 1
+17146: 20, 4, 2
+17147: 20, 4, 3
+17148: 20, 4, 4
+17149: 20, 4, 5
+17150: 20, 4, 6
+17151: 20, 4, 7
+17152: 20, 4, 8
+17153: 20, 4, 9
+17154: 20, 4, 10
+17155: 20, 4, 11
+17156: 20, 4, 12
+17157: 20, 4, 13
+17158: 20, 4, 14
+17159: 20, 4, 15
+17160: 20, 4, 16
+17161: 20, 4, 17
+17162: 20, 4, 18
+17163: 20, 4, 19
+17164: 20, 4, 20
+17165: 20, 4, 21
+17166: 20, 4, 22
+17167: 20, 4, 23
+17168: 20, 4, 24
+17169: 20, 4, 25
+17170: 20, 4, 26
+17171: 20, 4, 27
+17172: 20, 5, 0
+17173: 20, 5, 1
+17174: 20, 5, 2
+17175: 20, 5, 3
+17176: 20, 5, 4
+17177: 20, 5, 5
+17178: 20, 5, 6
+17179: 20, 5, 7
+17180: 20, 5, 8
+17181: 20, 5, 9
+17182: 20, 5, 10
+17183: 20, 5, 11
+17184: 20, 5, 12
+17185: 20, 5, 13
+17186: 20, 5, 14
+17187: 20, 5, 15
+17188: 20, 5, 16
+17189: 20, 5, 17
+17190: 20, 5, 18
+17191: 20, 5, 19
+17192: 20, 5, 20
+17193: 20, 5, 21
+17194: 20, 5, 22
+17195: 20, 5, 23
+17196: 20, 6, 0
+17197: 20, 6, 1
+17198: 20, 6, 2
+17199: 20, 6, 3
+17200: 20, 6, 4
+17201: 20, 6, 5
+17202: 20, 6, 6
+17203: 20, 6, 7
+17204: 20, 6, 8
+17205: 20, 6, 9
+17206: 20, 6, 10
+17207: 20, 6, 11
+17208: 20, 6, 12
+17209: 20, 6, 13
+17210: 20, 6, 14
+17211: 20, 6, 15
+17212: 20, 6, 16
+17213: 20, 6, 17
+17214: 20, 6, 18
+17215: 20, 6, 19
+17216: 20, 6, 20
+17217: 20, 6, 21
+17218: 20, 6, 22
+17219: 20, 6, 23
+17220: 20, 6, 24
+17221: 20, 6, 25
+17222: 20, 6, 26
+17223: 20, 6, 27
+17224: 20, 6, 28
+17225: 20, 6, 29
+17226: 20, 6, 30
+17227: 20, 6, 31
+17228: 20, 6, 32
+17229: 20, 6, 33
+17230: 20, 6, 34
+17231: 20, 6, 35
+17232: 20, 7, 0
+17233: 20, 7, 1
+17234: 20, 7, 2
+17235: 20, 7, 3
+17236: 20, 7, 4
+17237: 20, 7, 5
+17238: 20, 7, 6
+17239: 20, 7, 7
+17240: 20, 7, 8
+17241: 20, 7, 9
+17242: 20, 7, 10
+17243: 20, 7, 11
+17244: 20, 7, 12
+17245: 20, 7, 13
+17246: 20, 7, 14
+17247: 20, 7, 15
+17248: 20, 7, 16
+17249: 20, 7, 17
+17250: 20, 7, 18
+17251: 20, 7, 19
+17252: 20, 7, 20
+17253: 20, 7, 21
+17254: 20, 7, 22
+17255: 20, 7, 23
+17256: 20, 7, 24
+17257: 20, 7, 25
+17258: 20, 7, 26
+17259: 20, 7, 27
+17260: 20, 8, 0
+17261: 20, 8, 1
+17262: 20, 8, 2
+17263: 20, 8, 3
+17264: 20, 8, 4
+17265: 20, 8, 5
+17266: 20, 8, 6
+17267: 20, 8, 7
+17268: 20, 8, 8
+17269: 20, 8, 9
+17270: 20, 8, 10
+17271: 20, 8, 11
+17272: 20, 8, 12
+17273: 20, 8, 13
+17274: 20, 8, 14
+17275: 20, 8, 15
+17276: 20, 8, 16
+17277: 20, 8, 17
+17278: 20, 8, 18
+17279: 20, 8, 19
+17280: 20, 8, 20
+17281: 20, 8, 21
+17282: 20, 8, 22
+17283: 20, 8, 23
+17284: 20, 8, 24
+17285: 20, 8, 25
+17286: 20, 8, 26
+17287: 20, 8, 27
+17288: 20, 8, 28
+17289: 20, 8, 29
+17290: 20, 8, 30
+17291: 20, 8, 31
+17292: 20, 8, 32
+17293: 20, 8, 33
+17294: 20, 8, 34
+17295: 20, 8, 35
+17296: 20, 8, 36
+17297: 20, 9, 0
+17298: 20, 9, 1
+17299: 20, 9, 2
+17300: 20, 9, 3
+17301: 20, 9, 4
+17302: 20, 9, 5
+17303: 20, 9, 6
+17304: 20, 9, 7
+17305: 20, 9, 8
+17306: 20, 9, 9
+17307: 20, 9, 10
+17308: 20, 9, 11
+17309: 20, 9, 12
+17310: 20, 9, 13
+17311: 20, 9, 14
+17312: 20, 9, 15
+17313: 20, 9, 16
+17314: 20, 9, 17
+17315: 20, 9, 18
+17316: 20, 10, 0
+17317: 20, 10, 1
+17318: 20, 10, 2
+17319: 20, 10, 3
+17320: 20, 10, 4
+17321: 20, 10, 5
+17322: 20, 10, 6
+17323: 20, 10, 7
+17324: 20, 10, 8
+17325: 20, 10, 9
+17326: 20, 10, 10
+17327: 20, 10, 11
+17328: 20, 10, 12
+17329: 20, 10, 13
+17330: 20, 10, 14
+17331: 20, 10, 15
+17332: 20, 10, 16
+17333: 20, 10, 17
+17334: 20, 10, 18
+17335: 20, 10, 19
+17336: 20, 10, 20
+17337: 20, 10, 21
+17338: 20, 10, 22
+17339: 20, 10, 23
+17340: 20, 10, 24
+17341: 20, 10, 25
+17342: 20, 10, 26
+17343: 20, 10, 27
+17344: 20, 10, 28
+17345: 20, 10, 29
+17346: 20, 10, 30
+17347: 20, 10, 31
+17348: 20, 10, 32
+17349: 20, 11, 0
+17350: 20, 11, 1
+17351: 20, 11, 2
+17352: 20, 11, 3
+17353: 20, 11, 4
+17354: 20, 11, 5
+17355: 20, 11, 6
+17356: 20, 11, 7
+17357: 20, 11, 8
+17358: 20, 11, 9
+17359: 20, 11, 10
+17360: 20, 11, 11
+17361: 20, 11, 12
+17362: 20, 11, 13
+17363: 20, 11, 14
+17364: 20, 11, 15
+17365: 20, 11, 16
+17366: 20, 11, 17
+17367: 20, 11, 18
+17368: 20, 11, 19
+17369: 20, 11, 20
+17370: 20, 11, 21
+17371: 20, 11, 22
+17372: 20, 11, 23
+17373: 20, 11, 24
+17374: 20, 11, 25
+17375: 20, 11, 26
+17376: 20, 11, 27
+17377: 20, 11, 28
+17378: 20, 11, 29
+17379: 20, 11, 30
+17380: 20, 11, 31
+17381: 20, 12, 0
+17382: 20, 12, 1
+17383: 20, 12, 2
+17384: 20, 12, 3
+17385: 20, 12, 4
+17386: 20, 12, 5
+17387: 20, 12, 6
+17388: 20, 12, 7
+17389: 20, 12, 8
+17390: 20, 12, 9
+17391: 20, 12, 10
+17392: 20, 12, 11
+17393: 20, 12, 12
+17394: 20, 12, 13
+17395: 20, 12, 14
+17396: 20, 12, 15
+17397: 20, 12, 16
+17398: 20, 12, 17
+17399: 20, 12, 18
+17400: 20, 12, 19
+17401: 20, 12, 20
+17402: 20, 12, 21
+17403: 20, 12, 22
+17404: 20, 12, 23
+17405: 20, 12, 24
+17406: 20, 12, 25
+17407: 20, 12, 26
+17408: 20, 12, 27
+17409: 20, 12, 28
+17410: 20, 13, 0
+17411: 20, 13, 1
+17412: 20, 13, 2
+17413: 20, 13, 3
+17414: 20, 13, 4
+17415: 20, 13, 5
+17416: 20, 13, 6
+17417: 20, 13, 7
+17418: 20, 13, 8
+17419: 20, 13, 9
+17420: 20, 13, 10
+17421: 20, 13, 11
+17422: 20, 13, 12
+17423: 20, 13, 13
+17424: 20, 13, 14
+17425: 20, 13, 15
+17426: 20, 13, 16
+17427: 20, 13, 17
+17428: 20, 13, 18
+17429: 20, 13, 19
+17430: 20, 13, 20
+17431: 20, 13, 21
+17432: 20, 13, 22
+17433: 20, 13, 23
+17434: 20, 13, 24
+17435: 20, 13, 25
+17436: 20, 14, 0
+17437: 20, 14, 1
+17438: 20, 14, 2
+17439: 20, 14, 3
+17440: 20, 14, 4
+17441: 20, 14, 5
+17442: 20, 14, 6
+17443: 20, 14, 7
+17444: 20, 14, 8
+17445: 20, 14, 9
+17446: 20, 14, 10
+17447: 20, 14, 11
+17448: 20, 14, 12
+17449: 20, 14, 13
+17450: 20, 14, 14
+17451: 20, 14, 15
+17452: 20, 14, 16
+17453: 20, 14, 17
+17454: 20, 14, 18
+17455: 20, 14, 19
+17456: 20, 14, 20
+17457: 20, 14, 21
+17458: 20, 14, 22
+17459: 20, 14, 23
+17460: 20, 14, 24
+17461: 20, 14, 25
+17462: 20, 14, 26
+17463: 20, 14, 27
+17464: 20, 14, 28
+17465: 20, 14, 29
+17466: 20, 14, 30
+17467: 20, 14, 31
+17468: 20, 14, 32
+17469: 20, 14, 33
+17470: 20, 14, 34
+17471: 20, 14, 35
+17472: 20, 15, 0
+17473: 20, 15, 1
+17474: 20, 15, 2
+17475: 20, 15, 3
+17476: 20, 15, 4
+17477: 20, 15, 5
+17478: 20, 15, 6
+17479: 20, 15, 7
+17480: 20, 15, 8
+17481: 20, 15, 9
+17482: 20, 15, 10
+17483: 20, 15, 11
+17484: 20, 15, 12
+17485: 20, 15, 13
+17486: 20, 15, 14
+17487: 20, 15, 15
+17488: 20, 15, 16
+17489: 20, 15, 17
+17490: 20, 15, 18
+17491: 20, 15, 19
+17492: 20, 15, 20
+17493: 20, 15, 21
+17494: 20, 15, 22
+17495: 20, 15, 23
+17496: 20, 15, 24
+17497: 20, 15, 25
+17498: 20, 15, 26
+17499: 20, 15, 27
+17500: 20, 15, 28
+17501: 20, 15, 29
+17502: 20, 15, 30
+17503: 20, 15, 31
+17504: 20, 15, 32
+17505: 20, 15, 33
+17506: 20, 16, 0
+17507: 20, 16, 1
+17508: 20, 16, 2
+17509: 20, 16, 3
+17510: 20, 16, 4
+17511: 20, 16, 5
+17512: 20, 16, 6
+17513: 20, 16, 7
+17514: 20, 16, 8
+17515: 20, 16, 9
+17516: 20, 16, 10
+17517: 20, 16, 11
+17518: 20, 16, 12
+17519: 20, 16, 13
+17520: 20, 16, 14
+17521: 20, 16, 15
+17522: 20, 16, 16
+17523: 20, 16, 17
+17524: 20, 16, 18
+17525: 20, 16, 19
+17526: 20, 16, 20
+17527: 20, 16, 21
+17528: 20, 16, 22
+17529: 20, 16, 23
+17530: 20, 16, 24
+17531: 20, 16, 25
+17532: 20, 16, 26
+17533: 20, 16, 27
+17534: 20, 16, 28
+17535: 20, 16, 29
+17536: 20, 16, 30
+17537: 20, 16, 31
+17538: 20, 16, 32
+17539: 20, 16, 33
+17540: 20, 17, 0
+17541: 20, 17, 1
+17542: 20, 17, 2
+17543: 20, 17, 3
+17544: 20, 17, 4
+17545: 20, 17, 5
+17546: 20, 17, 6
+17547: 20, 17, 7
+17548: 20, 17, 8
+17549: 20, 17, 9
+17550: 20, 17, 10
+17551: 20, 17, 11
+17552: 20, 17, 12
+17553: 20, 17, 13
+17554: 20, 17, 14
+17555: 20, 17, 15
+17556: 20, 17, 16
+17557: 20, 17, 17
+17558: 20, 17, 18
+17559: 20, 17, 19
+17560: 20, 17, 20
+17561: 20, 17, 21
+17562: 20, 17, 22
+17563: 20, 17, 23
+17564: 20, 17, 24
+17565: 20, 17, 25
+17566: 20, 17, 26
+17567: 20, 17, 27
+17568: 20, 17, 28
+17569: 20, 18, 0
+17570: 20, 18, 1
+17571: 20, 18, 2
+17572: 20, 18, 3
+17573: 20, 18, 4
+17574: 20, 18, 5
+17575: 20, 18, 6
+17576: 20, 18, 7
+17577: 20, 18, 8
+17578: 20, 18, 9
+17579: 20, 18, 10
+17580: 20, 18, 11
+17581: 20, 18, 12
+17582: 20, 18, 13
+17583: 20, 18, 14
+17584: 20, 18, 15
+17585: 20, 18, 16
+17586: 20, 18, 17
+17587: 20, 18, 18
+17588: 20, 18, 19
+17589: 20, 18, 20
+17590: 20, 18, 21
+17591: 20, 18, 22
+17592: 20, 18, 23
+17593: 20, 18, 24
+17594: 20, 19, 0
+17595: 20, 19, 1
+17596: 20, 19, 2
+17597: 20, 19, 3
+17598: 20, 19, 4
+17599: 20, 19, 5
+17600: 20, 19, 6
+17601: 20, 19, 7
+17602: 20, 19, 8
+17603: 20, 19, 9
+17604: 20, 19, 10
+17605: 20, 19, 11
+17606: 20, 19, 12
+17607: 20, 19, 13
+17608: 20, 19, 14
+17609: 20, 19, 15
+17610: 20, 19, 16
+17611: 20, 19, 17
+17612: 20, 19, 18
+17613: 20, 19, 19
+17614: 20, 19, 20
+17615: 20, 19, 21
+17616: 20, 19, 22
+17617: 20, 19, 23
+17618: 20, 19, 24
+17619: 20, 19, 25
+17620: 20, 19, 26
+17621: 20, 19, 27
+17622: 20, 19, 28
+17623: 20, 19, 29
+17624: 20, 20, 0
+17625: 20, 20, 1
+17626: 20, 20, 2
+17627: 20, 20, 3
+17628: 20, 20, 4
+17629: 20, 20, 5
+17630: 20, 20, 6
+17631: 20, 20, 7
+17632: 20, 20, 8
+17633: 20, 20, 9
+17634: 20, 20, 10
+17635: 20, 20, 11
+17636: 20, 20, 12
+17637: 20, 20, 13
+17638: 20, 20, 14
+17639: 20, 20, 15
+17640: 20, 20, 16
+17641: 20, 20, 17
+17642: 20, 20, 18
+17643: 20, 20, 19
+17644: 20, 20, 20
+17645: 20, 20, 21
+17646: 20, 20, 22
+17647: 20, 20, 23
+17648: 20, 20, 24
+17649: 20, 20, 25
+17650: 20, 20, 26
+17651: 20, 20, 27
+17652: 20, 20, 28
+17653: 20, 20, 29
+17654: 20, 20, 30
+17655: 20, 21, 0
+17656: 20, 21, 1
+17657: 20, 21, 2
+17658: 20, 21, 3
+17659: 20, 21, 4
+17660: 20, 21, 5
+17661: 20, 21, 6
+17662: 20, 21, 7
+17663: 20, 21, 8
+17664: 20, 21, 9
+17665: 20, 21, 10
+17666: 20, 21, 11
+17667: 20, 21, 12
+17668: 20, 21, 13
+17669: 20, 21, 14
+17670: 20, 21, 15
+17671: 20, 21, 16
+17672: 20, 21, 17
+17673: 20, 21, 18
+17674: 20, 21, 19
+17675: 20, 21, 20
+17676: 20, 21, 21
+17677: 20, 21, 22
+17678: 20, 21, 23
+17679: 20, 21, 24
+17680: 20, 21, 25
+17681: 20, 21, 26
+17682: 20, 21, 27
+17683: 20, 21, 28
+17684: 20, 21, 29
+17685: 20, 21, 30
+17686: 20, 21, 31
+17687: 20, 22, 0
+17688: 20, 22, 1
+17689: 20, 22, 2
+17690: 20, 22, 3
+17691: 20, 22, 4
+17692: 20, 22, 5
+17693: 20, 22, 6
+17694: 20, 22, 7
+17695: 20, 22, 8
+17696: 20, 22, 9
+17697: 20, 22, 10
+17698: 20, 22, 11
+17699: 20, 22, 12
+17700: 20, 22, 13
+17701: 20, 22, 14
+17702: 20, 22, 15
+17703: 20, 22, 16
+17704: 20, 22, 17
+17705: 20, 22, 18
+17706: 20, 22, 19
+17707: 20, 22, 20
+17708: 20, 22, 21
+17709: 20, 22, 22
+17710: 20, 22, 23
+17711: 20, 22, 24
+17712: 20, 22, 25
+17713: 20, 22, 26
+17714: 20, 22, 27
+17715: 20, 22, 28
+17716: 20, 22, 29
+17717: 20, 23, 0
+17718: 20, 23, 1
+17719: 20, 23, 2
+17720: 20, 23, 3
+17721: 20, 23, 4
+17722: 20, 23, 5
+17723: 20, 23, 6
+17724: 20, 23, 7
+17725: 20, 23, 8
+17726: 20, 23, 9
+17727: 20, 23, 10
+17728: 20, 23, 11
+17729: 20, 23, 12
+17730: 20, 23, 13
+17731: 20, 23, 14
+17732: 20, 23, 15
+17733: 20, 23, 16
+17734: 20, 23, 17
+17735: 20, 23, 18
+17736: 20, 23, 19
+17737: 20, 23, 20
+17738: 20, 23, 21
+17739: 20, 23, 22
+17740: 20, 23, 23
+17741: 20, 23, 24
+17742: 20, 23, 25
+17743: 20, 23, 26
+17744: 20, 23, 27
+17745: 20, 23, 28
+17746: 20, 23, 29
+17747: 20, 23, 30
+17748: 20, 23, 31
+17749: 20, 23, 32
+17750: 20, 23, 33
+17751: 20, 23, 34
+17752: 20, 23, 35
+17753: 20, 24, 0
+17754: 20, 24, 1
+17755: 20, 24, 2
+17756: 20, 24, 3
+17757: 20, 24, 4
+17758: 20, 24, 5
+17759: 20, 24, 6
+17760: 20, 24, 7
+17761: 20, 24, 8
+17762: 20, 24, 9
+17763: 20, 24, 10
+17764: 20, 24, 11
+17765: 20, 24, 12
+17766: 20, 24, 13
+17767: 20, 24, 14
+17768: 20, 24, 15
+17769: 20, 24, 16
+17770: 20, 24, 17
+17771: 20, 24, 18
+17772: 20, 24, 19
+17773: 20, 24, 20
+17774: 20, 24, 21
+17775: 20, 24, 22
+17776: 20, 24, 23
+17777: 20, 24, 24
+17778: 20, 24, 25
+17779: 20, 24, 26
+17780: 20, 24, 27
+17781: 20, 24, 28
+17782: 20, 24, 29
+17783: 20, 24, 30
+17784: 20, 24, 31
+17785: 20, 24, 32
+17786: 20, 24, 33
+17787: 20, 24, 34
+17788: 20, 25, 0
+17789: 20, 25, 1
+17790: 20, 25, 2
+17791: 20, 25, 3
+17792: 20, 25, 4
+17793: 20, 25, 5
+17794: 20, 25, 6
+17795: 20, 25, 7
+17796: 20, 25, 8
+17797: 20, 25, 9
+17798: 20, 25, 10
+17799: 20, 25, 11
+17800: 20, 25, 12
+17801: 20, 25, 13
+17802: 20, 25, 14
+17803: 20, 25, 15
+17804: 20, 25, 16
+17805: 20, 25, 17
+17806: 20, 25, 18
+17807: 20, 25, 19
+17808: 20, 25, 20
+17809: 20, 25, 21
+17810: 20, 25, 22
+17811: 20, 25, 23
+17812: 20, 25, 24
+17813: 20, 25, 25
+17814: 20, 25, 26
+17815: 20, 25, 27
+17816: 20, 25, 28
+17817: 20, 26, 0
+17818: 20, 26, 1
+17819: 20, 26, 2
+17820: 20, 26, 3
+17821: 20, 26, 4
+17822: 20, 26, 5
+17823: 20, 26, 6
+17824: 20, 26, 7
+17825: 20, 26, 8
+17826: 20, 26, 9
+17827: 20, 26, 10
+17828: 20, 26, 11
+17829: 20, 26, 12
+17830: 20, 26, 13
+17831: 20, 26, 14
+17832: 20, 26, 15
+17833: 20, 26, 16
+17834: 20, 26, 17
+17835: 20, 26, 18
+17836: 20, 26, 19
+17837: 20, 26, 20
+17838: 20, 26, 21
+17839: 20, 26, 22
+17840: 20, 26, 23
+17841: 20, 26, 24
+17842: 20, 26, 25
+17843: 20, 26, 26
+17844: 20, 26, 27
+17845: 20, 26, 28
+17846: 20, 27, 0
+17847: 20, 27, 1
+17848: 20, 27, 2
+17849: 20, 27, 3
+17850: 20, 27, 4
+17851: 20, 27, 5
+17852: 20, 27, 6
+17853: 20, 27, 7
+17854: 20, 27, 8
+17855: 20, 27, 9
+17856: 20, 27, 10
+17857: 20, 27, 11
+17858: 20, 27, 12
+17859: 20, 27, 13
+17860: 20, 27, 14
+17861: 20, 27, 15
+17862: 20, 27, 16
+17863: 20, 27, 17
+17864: 20, 27, 18
+17865: 20, 27, 19
+17866: 20, 27, 20
+17867: 20, 27, 21
+17868: 20, 27, 22
+17869: 20, 27, 23
+17870: 20, 27, 24
+17871: 20, 27, 25
+17872: 20, 27, 26
+17873: 20, 27, 27
+17874: 20, 28, 0
+17875: 20, 28, 1
+17876: 20, 28, 2
+17877: 20, 28, 3
+17878: 20, 28, 4
+17879: 20, 28, 5
+17880: 20, 28, 6
+17881: 20, 28, 7
+17882: 20, 28, 8
+17883: 20, 28, 9
+17884: 20, 28, 10
+17885: 20, 28, 11
+17886: 20, 28, 12
+17887: 20, 28, 13
+17888: 20, 28, 14
+17889: 20, 28, 15
+17890: 20, 28, 16
+17891: 20, 28, 17
+17892: 20, 28, 18
+17893: 20, 28, 19
+17894: 20, 28, 20
+17895: 20, 28, 21
+17896: 20, 28, 22
+17897: 20, 28, 23
+17898: 20, 28, 24
+17899: 20, 28, 25
+17900: 20, 28, 26
+17901: 20, 28, 27
+17902: 20, 28, 28
+17903: 20, 29, 0
+17904: 20, 29, 1
+17905: 20, 29, 2
+17906: 20, 29, 3
+17907: 20, 29, 4
+17908: 20, 29, 5
+17909: 20, 29, 6
+17910: 20, 29, 7
+17911: 20, 29, 8
+17912: 20, 29, 9
+17913: 20, 29, 10
+17914: 20, 29, 11
+17915: 20, 29, 12
+17916: 20, 29, 13
+17917: 20, 29, 14
+17918: 20, 29, 15
+17919: 20, 29, 16
+17920: 20, 29, 17
+17921: 20, 29, 18
+17922: 20, 29, 19
+17923: 20, 29, 20
+17924: 20, 29, 21
+17925: 20, 29, 22
+17926: 20, 29, 23
+17927: 20, 29, 24
+17928: 20, 29, 25
+17929: 20, 29, 26
+17930: 20, 29, 27
+17931: 20, 30, 0
+17932: 20, 30, 1
+17933: 20, 30, 2
+17934: 20, 30, 3
+17935: 20, 30, 4
+17936: 20, 30, 5
+17937: 20, 30, 6
+17938: 20, 30, 7
+17939: 20, 30, 8
+17940: 20, 30, 9
+17941: 20, 30, 10
+17942: 20, 30, 11
+17943: 20, 30, 12
+17944: 20, 30, 13
+17945: 20, 30, 14
+17946: 20, 30, 15
+17947: 20, 30, 16
+17948: 20, 30, 17
+17949: 20, 30, 18
+17950: 20, 30, 19
+17951: 20, 30, 20
+17952: 20, 30, 21
+17953: 20, 30, 22
+17954: 20, 30, 23
+17955: 20, 30, 24
+17956: 20, 30, 25
+17957: 20, 30, 26
+17958: 20, 30, 27
+17959: 20, 30, 28
+17960: 20, 30, 29
+17961: 20, 30, 30
+17962: 20, 30, 31
+17963: 20, 30, 32
+17964: 20, 30, 33
+17965: 20, 31, 0
+17966: 20, 31, 1
+17967: 20, 31, 2
+17968: 20, 31, 3
+17969: 20, 31, 4
+17970: 20, 31, 5
+17971: 20, 31, 6
+17972: 20, 31, 7
+17973: 20, 31, 8
+17974: 20, 31, 9
+17975: 20, 31, 10
+17976: 20, 31, 11
+17977: 20, 31, 12
+17978: 20, 31, 13
+17979: 20, 31, 14
+17980: 20, 31, 15
+17981: 20, 31, 16
+17982: 20, 31, 17
+17983: 20, 31, 18
+17984: 20, 31, 19
+17985: 20, 31, 20
+17986: 20, 31, 21
+17987: 20, 31, 22
+17988: 20, 31, 23
+17989: 20, 31, 24
+17990: 20, 31, 25
+17991: 20, 31, 26
+17992: 20, 31, 27
+17993: 20, 31, 28
+17994: 20, 31, 29
+17995: 20, 31, 30
+17996: 20, 31, 31
+17997: 21, 0, 0
+17998: 21, 1, 0
+17999: 21, 1, 1
+18000: 21, 1, 2
+18001: 21, 1, 3
+18002: 21, 1, 4
+18003: 21, 1, 5
+18004: 21, 1, 6
+18005: 21, 1, 7
+18006: 21, 1, 8
+18007: 21, 1, 9
+18008: 21, 1, 10
+18009: 21, 1, 11
+18010: 21, 1, 12
+18011: 21, 1, 13
+18012: 21, 1, 14
+18013: 21, 1, 15
+18014: 21, 1, 16
+18015: 21, 1, 17
+18016: 21, 1, 18
+18017: 21, 2, 0
+18018: 21, 2, 1
+18019: 21, 2, 2
+18020: 21, 2, 3
+18021: 21, 2, 4
+18022: 21, 2, 5
+18023: 21, 2, 6
+18024: 21, 2, 7
+18025: 21, 2, 8
+18026: 21, 2, 9
+18027: 21, 2, 10
+18028: 21, 2, 11
+18029: 21, 2, 12
+18030: 21, 2, 13
+18031: 21, 2, 14
+18032: 21, 2, 15
+18033: 21, 2, 16
+18034: 21, 2, 17
+18035: 21, 2, 18
+18036: 21, 2, 19
+18037: 21, 2, 20
+18038: 21, 2, 21
+18039: 21, 2, 22
+18040: 21, 2, 23
+18041: 21, 2, 24
+18042: 21, 2, 25
+18043: 21, 2, 26
+18044: 21, 3, 0
+18045: 21, 3, 1
+18046: 21, 3, 2
+18047: 21, 3, 3
+18048: 21, 3, 4
+18049: 21, 3, 5
+18050: 21, 3, 6
+18051: 21, 3, 7
+18052: 21, 3, 8
+18053: 21, 3, 9
+18054: 21, 3, 10
+18055: 21, 3, 11
+18056: 21, 3, 12
+18057: 21, 3, 13
+18058: 21, 3, 14
+18059: 21, 3, 15
+18060: 21, 3, 16
+18061: 21, 3, 17
+18062: 21, 3, 18
+18063: 21, 3, 19
+18064: 21, 3, 20
+18065: 21, 3, 21
+18066: 21, 3, 22
+18067: 21, 4, 0
+18068: 21, 4, 1
+18069: 21, 4, 2
+18070: 21, 4, 3
+18071: 21, 4, 4
+18072: 21, 4, 5
+18073: 21, 4, 6
+18074: 21, 4, 7
+18075: 21, 4, 8
+18076: 21, 4, 9
+18077: 21, 4, 10
+18078: 21, 4, 11
+18079: 21, 4, 12
+18080: 21, 4, 13
+18081: 21, 4, 14
+18082: 21, 4, 15
+18083: 21, 4, 16
+18084: 21, 5, 0
+18085: 21, 5, 1
+18086: 21, 5, 2
+18087: 21, 5, 3
+18088: 21, 5, 4
+18089: 21, 5, 5
+18090: 21, 5, 6
+18091: 21, 5, 7
+18092: 21, 5, 8
+18093: 21, 5, 9
+18094: 21, 5, 10
+18095: 21, 5, 11
+18096: 21, 5, 12
+18097: 21, 5, 13
+18098: 21, 5, 14
+18099: 21, 5, 15
+18100: 21, 5, 16
+18101: 21, 5, 17
+18102: 21, 5, 18
+18103: 21, 5, 19
+18104: 21, 5, 20
+18105: 21, 6, 0
+18106: 21, 6, 1
+18107: 21, 6, 2
+18108: 21, 6, 3
+18109: 21, 6, 4
+18110: 21, 6, 5
+18111: 21, 6, 6
+18112: 21, 6, 7
+18113: 21, 6, 8
+18114: 21, 6, 9
+18115: 21, 6, 10
+18116: 21, 6, 11
+18117: 21, 6, 12
+18118: 21, 7, 0
+18119: 21, 7, 1
+18120: 21, 7, 2
+18121: 21, 7, 3
+18122: 21, 7, 4
+18123: 21, 7, 5
+18124: 21, 7, 6
+18125: 21, 7, 7
+18126: 21, 7, 8
+18127: 21, 7, 9
+18128: 21, 7, 10
+18129: 21, 7, 11
+18130: 21, 7, 12
+18131: 21, 7, 13
+18132: 21, 7, 14
+18133: 21, 7, 15
+18134: 21, 7, 16
+18135: 21, 7, 17
+18136: 21, 7, 18
+18137: 21, 7, 19
+18138: 21, 7, 20
+18139: 21, 7, 21
+18140: 21, 7, 22
+18141: 21, 7, 23
+18142: 21, 7, 24
+18143: 21, 7, 25
+18144: 21, 7, 26
+18145: 21, 7, 27
+18146: 21, 7, 28
+18147: 21, 7, 29
+18148: 21, 8, 0
+18149: 21, 8, 1
+18150: 21, 8, 2
+18151: 21, 8, 3
+18152: 21, 8, 4
+18153: 21, 8, 5
+18154: 21, 8, 6
+18155: 21, 8, 7
+18156: 21, 8, 8
+18157: 21, 8, 9
+18158: 21, 8, 10
+18159: 21, 8, 11
+18160: 21, 8, 12
+18161: 21, 8, 13
+18162: 21, 8, 14
+18163: 21, 8, 15
+18164: 21, 8, 16
+18165: 21, 8, 17
+18166: 21, 9, 0
+18167: 21, 9, 1
+18168: 21, 9, 2
+18169: 21, 9, 3
+18170: 21, 9, 4
+18171: 21, 9, 5
+18172: 21, 9, 6
+18173: 21, 9, 7
+18174: 21, 9, 8
+18175: 21, 9, 9
+18176: 21, 9, 10
+18177: 21, 9, 11
+18178: 21, 9, 12
+18179: 21, 9, 13
+18180: 21, 9, 14
+18181: 21, 9, 15
+18182: 21, 9, 16
+18183: 21, 9, 17
+18184: 21, 9, 18
+18185: 21, 10, 0
+18186: 21, 10, 1
+18187: 21, 10, 2
+18188: 21, 10, 3
+18189: 21, 10, 4
+18190: 21, 10, 5
+18191: 21, 10, 6
+18192: 21, 10, 7
+18193: 21, 10, 8
+18194: 21, 10, 9
+18195: 21, 10, 10
+18196: 21, 10, 11
+18197: 21, 10, 12
+18198: 21, 10, 13
+18199: 21, 10, 14
+18200: 21, 10, 15
+18201: 21, 10, 16
+18202: 21, 10, 17
+18203: 21, 10, 18
+18204: 21, 10, 19
+18205: 21, 10, 20
+18206: 21, 11, 0
+18207: 21, 11, 1
+18208: 21, 11, 2
+18209: 21, 11, 3
+18210: 21, 11, 4
+18211: 21, 11, 5
+18212: 21, 11, 6
+18213: 21, 11, 7
+18214: 21, 11, 8
+18215: 21, 11, 9
+18216: 21, 11, 10
+18217: 21, 12, 0
+18218: 21, 12, 1
+18219: 21, 12, 2
+18220: 21, 12, 3
+18221: 21, 12, 4
+18222: 21, 12, 5
+18223: 21, 12, 6
+18224: 21, 12, 7
+18225: 21, 12, 8
+18226: 21, 12, 9
+18227: 21, 12, 10
+18228: 21, 12, 11
+18229: 21, 12, 12
+18230: 21, 12, 13
+18231: 21, 12, 14
+18232: 22, 0, 0
+18233: 22, 1, 0
+18234: 22, 1, 1
+18235: 22, 1, 2
+18236: 22, 1, 3
+18237: 22, 1, 4
+18238: 22, 1, 5
+18239: 22, 1, 6
+18240: 22, 1, 7
+18241: 22, 1, 8
+18242: 22, 1, 9
+18243: 22, 1, 10
+18244: 22, 1, 11
+18245: 22, 1, 12
+18246: 22, 1, 13
+18247: 22, 1, 14
+18248: 22, 1, 15
+18249: 22, 1, 16
+18250: 22, 1, 17
+18251: 22, 2, 0
+18252: 22, 2, 1
+18253: 22, 2, 2
+18254: 22, 2, 3
+18255: 22, 2, 4
+18256: 22, 2, 5
+18257: 22, 2, 6
+18258: 22, 2, 7
+18259: 22, 2, 8
+18260: 22, 2, 9
+18261: 22, 2, 10
+18262: 22, 2, 11
+18263: 22, 2, 12
+18264: 22, 2, 13
+18265: 22, 2, 14
+18266: 22, 2, 15
+18267: 22, 2, 16
+18268: 22, 2, 17
+18269: 22, 3, 0
+18270: 22, 3, 1
+18271: 22, 3, 2
+18272: 22, 3, 3
+18273: 22, 3, 4
+18274: 22, 3, 5
+18275: 22, 3, 6
+18276: 22, 3, 7
+18277: 22, 3, 8
+18278: 22, 3, 9
+18279: 22, 3, 10
+18280: 22, 3, 11
+18281: 22, 4, 0
+18282: 22, 4, 1
+18283: 22, 4, 2
+18284: 22, 4, 3
+18285: 22, 4, 4
+18286: 22, 4, 5
+18287: 22, 4, 6
+18288: 22, 4, 7
+18289: 22, 4, 8
+18290: 22, 4, 9
+18291: 22, 4, 10
+18292: 22, 4, 11
+18293: 22, 4, 12
+18294: 22, 4, 13
+18295: 22, 4, 14
+18296: 22, 4, 15
+18297: 22, 4, 16
+18298: 22, 5, 0
+18299: 22, 5, 1
+18300: 22, 5, 2
+18301: 22, 5, 3
+18302: 22, 5, 4
+18303: 22, 5, 5
+18304: 22, 5, 6
+18305: 22, 5, 7
+18306: 22, 5, 8
+18307: 22, 5, 9
+18308: 22, 5, 10
+18309: 22, 5, 11
+18310: 22, 5, 12
+18311: 22, 5, 13
+18312: 22, 5, 14
+18313: 22, 5, 15
+18314: 22, 5, 16
+18315: 22, 6, 0
+18316: 22, 6, 1
+18317: 22, 6, 2
+18318: 22, 6, 3
+18319: 22, 6, 4
+18320: 22, 6, 5
+18321: 22, 6, 6
+18322: 22, 6, 7
+18323: 22, 6, 8
+18324: 22, 6, 9
+18325: 22, 6, 10
+18326: 22, 6, 11
+18327: 22, 6, 12
+18328: 22, 6, 13
+18329: 22, 7, 0
+18330: 22, 7, 1
+18331: 22, 7, 2
+18332: 22, 7, 3
+18333: 22, 7, 4
+18334: 22, 7, 5
+18335: 22, 7, 6
+18336: 22, 7, 7
+18337: 22, 7, 8
+18338: 22, 7, 9
+18339: 22, 7, 10
+18340: 22, 7, 11
+18341: 22, 7, 12
+18342: 22, 7, 13
+18343: 22, 8, 0
+18344: 22, 8, 1
+18345: 22, 8, 2
+18346: 22, 8, 3
+18347: 22, 8, 4
+18348: 22, 8, 5
+18349: 22, 8, 6
+18350: 22, 8, 7
+18351: 22, 8, 8
+18352: 22, 8, 9
+18353: 22, 8, 10
+18354: 22, 8, 11
+18355: 22, 8, 12
+18356: 22, 8, 13
+18357: 22, 8, 14
+18358: 23, 0, 0
+18359: 23, 1, 0
+18360: 23, 1, 1
+18361: 23, 1, 2
+18362: 23, 1, 3
+18363: 23, 1, 4
+18364: 23, 1, 5
+18365: 23, 1, 6
+18366: 23, 1, 7
+18367: 23, 1, 8
+18368: 23, 1, 9
+18369: 23, 1, 10
+18370: 23, 1, 11
+18371: 23, 1, 12
+18372: 23, 1, 13
+18373: 23, 1, 14
+18374: 23, 1, 15
+18375: 23, 1, 16
+18376: 23, 1, 17
+18377: 23, 1, 18
+18378: 23, 1, 19
+18379: 23, 1, 20
+18380: 23, 1, 21
+18381: 23, 1, 22
+18382: 23, 1, 23
+18383: 23, 1, 24
+18384: 23, 1, 25
+18385: 23, 1, 26
+18386: 23, 1, 27
+18387: 23, 1, 28
+18388: 23, 1, 29
+18389: 23, 1, 30
+18390: 23, 1, 31
+18391: 23, 2, 0
+18392: 23, 2, 1
+18393: 23, 2, 2
+18394: 23, 2, 3
+18395: 23, 2, 4
+18396: 23, 2, 5
+18397: 23, 2, 6
+18398: 23, 2, 7
+18399: 23, 2, 8
+18400: 23, 2, 9
+18401: 23, 2, 10
+18402: 23, 2, 11
+18403: 23, 2, 12
+18404: 23, 2, 13
+18405: 23, 2, 14
+18406: 23, 2, 15
+18407: 23, 2, 16
+18408: 23, 2, 17
+18409: 23, 2, 18
+18410: 23, 2, 19
+18411: 23, 2, 20
+18412: 23, 2, 21
+18413: 23, 2, 22
+18414: 23, 3, 0
+18415: 23, 3, 1
+18416: 23, 3, 2
+18417: 23, 3, 3
+18418: 23, 3, 4
+18419: 23, 3, 5
+18420: 23, 3, 6
+18421: 23, 3, 7
+18422: 23, 3, 8
+18423: 23, 3, 9
+18424: 23, 3, 10
+18425: 23, 3, 11
+18426: 23, 3, 12
+18427: 23, 3, 13
+18428: 23, 3, 14
+18429: 23, 3, 15
+18430: 23, 3, 16
+18431: 23, 3, 17
+18432: 23, 3, 18
+18433: 23, 3, 19
+18434: 23, 3, 20
+18435: 23, 3, 21
+18436: 23, 3, 22
+18437: 23, 3, 23
+18438: 23, 3, 24
+18439: 23, 3, 25
+18440: 23, 3, 26
+18441: 23, 4, 0
+18442: 23, 4, 1
+18443: 23, 4, 2
+18444: 23, 4, 3
+18445: 23, 4, 4
+18446: 23, 4, 5
+18447: 23, 4, 6
+18448: 23, 5, 0
+18449: 23, 5, 1
+18450: 23, 5, 2
+18451: 23, 5, 3
+18452: 23, 5, 4
+18453: 23, 5, 5
+18454: 23, 5, 6
+18455: 23, 5, 7
+18456: 23, 5, 8
+18457: 23, 5, 9
+18458: 23, 5, 10
+18459: 23, 5, 11
+18460: 23, 5, 12
+18461: 23, 5, 13
+18462: 23, 5, 14
+18463: 23, 5, 15
+18464: 23, 5, 16
+18465: 23, 5, 17
+18466: 23, 5, 18
+18467: 23, 5, 19
+18468: 23, 5, 20
+18469: 23, 5, 21
+18470: 23, 5, 22
+18471: 23, 5, 23
+18472: 23, 5, 24
+18473: 23, 5, 25
+18474: 23, 5, 26
+18475: 23, 5, 27
+18476: 23, 5, 28
+18477: 23, 5, 29
+18478: 23, 5, 30
+18479: 23, 6, 0
+18480: 23, 6, 1
+18481: 23, 6, 2
+18482: 23, 6, 3
+18483: 23, 6, 4
+18484: 23, 6, 5
+18485: 23, 6, 6
+18486: 23, 6, 7
+18487: 23, 6, 8
+18488: 23, 6, 9
+18489: 23, 6, 10
+18490: 23, 6, 11
+18491: 23, 6, 12
+18492: 23, 6, 13
+18493: 23, 7, 0
+18494: 23, 7, 1
+18495: 23, 7, 2
+18496: 23, 7, 3
+18497: 23, 7, 4
+18498: 23, 7, 5
+18499: 23, 7, 6
+18500: 23, 7, 7
+18501: 23, 7, 8
+18502: 23, 7, 9
+18503: 23, 7, 10
+18504: 23, 7, 11
+18505: 23, 7, 12
+18506: 23, 7, 13
+18507: 23, 7, 14
+18508: 23, 7, 15
+18509: 23, 7, 16
+18510: 23, 7, 17
+18511: 23, 7, 18
+18512: 23, 7, 19
+18513: 23, 7, 20
+18514: 23, 7, 21
+18515: 23, 7, 22
+18516: 23, 7, 23
+18517: 23, 7, 24
+18518: 23, 7, 25
+18519: 23, 8, 0
+18520: 23, 8, 1
+18521: 23, 8, 2
+18522: 23, 8, 3
+18523: 23, 8, 4
+18524: 23, 8, 5
+18525: 23, 8, 6
+18526: 23, 8, 7
+18527: 23, 8, 8
+18528: 23, 8, 9
+18529: 23, 8, 10
+18530: 23, 8, 11
+18531: 23, 8, 12
+18532: 23, 8, 13
+18533: 23, 8, 14
+18534: 23, 8, 15
+18535: 23, 8, 16
+18536: 23, 8, 17
+18537: 23, 8, 18
+18538: 23, 8, 19
+18539: 23, 8, 20
+18540: 23, 8, 21
+18541: 23, 8, 22
+18542: 23, 9, 0
+18543: 23, 9, 1
+18544: 23, 9, 2
+18545: 23, 9, 3
+18546: 23, 9, 4
+18547: 23, 9, 5
+18548: 23, 9, 6
+18549: 23, 9, 7
+18550: 23, 9, 8
+18551: 23, 9, 9
+18552: 23, 9, 10
+18553: 23, 9, 11
+18554: 23, 9, 12
+18555: 23, 9, 13
+18556: 23, 9, 14
+18557: 23, 9, 15
+18558: 23, 9, 16
+18559: 23, 9, 17
+18560: 23, 9, 18
+18561: 23, 9, 19
+18562: 23, 9, 20
+18563: 23, 9, 21
+18564: 23, 10, 0
+18565: 23, 10, 1
+18566: 23, 10, 2
+18567: 23, 10, 3
+18568: 23, 10, 4
+18569: 23, 10, 5
+18570: 23, 10, 6
+18571: 23, 10, 7
+18572: 23, 10, 8
+18573: 23, 10, 9
+18574: 23, 10, 10
+18575: 23, 10, 11
+18576: 23, 10, 12
+18577: 23, 10, 13
+18578: 23, 10, 14
+18579: 23, 10, 15
+18580: 23, 10, 16
+18581: 23, 10, 17
+18582: 23, 10, 18
+18583: 23, 10, 19
+18584: 23, 10, 20
+18585: 23, 10, 21
+18586: 23, 10, 22
+18587: 23, 10, 23
+18588: 23, 10, 24
+18589: 23, 10, 25
+18590: 23, 10, 26
+18591: 23, 10, 27
+18592: 23, 10, 28
+18593: 23, 10, 29
+18594: 23, 10, 30
+18595: 23, 10, 31
+18596: 23, 10, 32
+18597: 23, 10, 33
+18598: 23, 10, 34
+18599: 23, 11, 0
+18600: 23, 11, 1
+18601: 23, 11, 2
+18602: 23, 11, 3
+18603: 23, 11, 4
+18604: 23, 11, 5
+18605: 23, 11, 6
+18606: 23, 11, 7
+18607: 23, 11, 8
+18608: 23, 11, 9
+18609: 23, 11, 10
+18610: 23, 11, 11
+18611: 23, 11, 12
+18612: 23, 11, 13
+18613: 23, 11, 14
+18614: 23, 11, 15
+18615: 23, 11, 16
+18616: 23, 12, 0
+18617: 23, 12, 1
+18618: 23, 12, 2
+18619: 23, 12, 3
+18620: 23, 12, 4
+18621: 23, 12, 5
+18622: 23, 12, 6
+18623: 23, 13, 0
+18624: 23, 13, 1
+18625: 23, 13, 2
+18626: 23, 13, 3
+18627: 23, 13, 4
+18628: 23, 13, 5
+18629: 23, 13, 6
+18630: 23, 13, 7
+18631: 23, 13, 8
+18632: 23, 13, 9
+18633: 23, 13, 10
+18634: 23, 13, 11
+18635: 23, 13, 12
+18636: 23, 13, 13
+18637: 23, 13, 14
+18638: 23, 13, 15
+18639: 23, 13, 16
+18640: 23, 13, 17
+18641: 23, 13, 18
+18642: 23, 13, 19
+18643: 23, 13, 20
+18644: 23, 13, 21
+18645: 23, 13, 22
+18646: 23, 14, 0
+18647: 23, 14, 1
+18648: 23, 14, 2
+18649: 23, 14, 3
+18650: 23, 14, 4
+18651: 23, 14, 5
+18652: 23, 14, 6
+18653: 23, 14, 7
+18654: 23, 14, 8
+18655: 23, 14, 9
+18656: 23, 14, 10
+18657: 23, 14, 11
+18658: 23, 14, 12
+18659: 23, 14, 13
+18660: 23, 14, 14
+18661: 23, 14, 15
+18662: 23, 14, 16
+18663: 23, 14, 17
+18664: 23, 14, 18
+18665: 23, 14, 19
+18666: 23, 14, 20
+18667: 23, 14, 21
+18668: 23, 14, 22
+18669: 23, 14, 23
+18670: 23, 14, 24
+18671: 23, 14, 25
+18672: 23, 14, 26
+18673: 23, 14, 27
+18674: 23, 14, 28
+18675: 23, 14, 29
+18676: 23, 14, 30
+18677: 23, 14, 31
+18678: 23, 14, 32
+18679: 23, 15, 0
+18680: 23, 15, 1
+18681: 23, 15, 2
+18682: 23, 15, 3
+18683: 23, 15, 4
+18684: 23, 15, 5
+18685: 23, 15, 6
+18686: 23, 15, 7
+18687: 23, 15, 8
+18688: 23, 15, 9
+18689: 23, 16, 0
+18690: 23, 16, 1
+18691: 23, 16, 2
+18692: 23, 16, 3
+18693: 23, 16, 4
+18694: 23, 16, 5
+18695: 23, 16, 6
+18696: 23, 16, 7
+18697: 23, 16, 8
+18698: 23, 16, 9
+18699: 23, 16, 10
+18700: 23, 16, 11
+18701: 23, 16, 12
+18702: 23, 16, 13
+18703: 23, 16, 14
+18704: 23, 17, 0
+18705: 23, 17, 1
+18706: 23, 17, 2
+18707: 23, 17, 3
+18708: 23, 17, 4
+18709: 23, 17, 5
+18710: 23, 17, 6
+18711: 23, 17, 7
+18712: 23, 17, 8
+18713: 23, 17, 9
+18714: 23, 17, 10
+18715: 23, 17, 11
+18716: 23, 17, 12
+18717: 23, 17, 13
+18718: 23, 17, 14
+18719: 23, 18, 0
+18720: 23, 18, 1
+18721: 23, 18, 2
+18722: 23, 18, 3
+18723: 23, 18, 4
+18724: 23, 18, 5
+18725: 23, 18, 6
+18726: 23, 18, 7
+18727: 23, 19, 0
+18728: 23, 19, 1
+18729: 23, 19, 2
+18730: 23, 19, 3
+18731: 23, 19, 4
+18732: 23, 19, 5
+18733: 23, 19, 6
+18734: 23, 19, 7
+18735: 23, 19, 8
+18736: 23, 19, 9
+18737: 23, 19, 10
+18738: 23, 19, 11
+18739: 23, 19, 12
+18740: 23, 19, 13
+18741: 23, 19, 14
+18742: 23, 19, 15
+18743: 23, 19, 16
+18744: 23, 19, 17
+18745: 23, 19, 18
+18746: 23, 19, 19
+18747: 23, 19, 20
+18748: 23, 19, 21
+18749: 23, 19, 22
+18750: 23, 19, 23
+18751: 23, 19, 24
+18752: 23, 19, 25
+18753: 23, 20, 0
+18754: 23, 20, 1
+18755: 23, 20, 2
+18756: 23, 20, 3
+18757: 23, 20, 4
+18758: 23, 20, 5
+18759: 23, 20, 6
+18760: 23, 21, 0
+18761: 23, 21, 1
+18762: 23, 21, 2
+18763: 23, 21, 3
+18764: 23, 21, 4
+18765: 23, 21, 5
+18766: 23, 21, 6
+18767: 23, 21, 7
+18768: 23, 21, 8
+18769: 23, 21, 9
+18770: 23, 21, 10
+18771: 23, 21, 11
+18772: 23, 21, 12
+18773: 23, 21, 13
+18774: 23, 21, 14
+18775: 23, 21, 15
+18776: 23, 21, 16
+18777: 23, 21, 17
+18778: 23, 22, 0
+18779: 23, 22, 1
+18780: 23, 22, 2
+18781: 23, 22, 3
+18782: 23, 22, 4
+18783: 23, 22, 5
+18784: 23, 22, 6
+18785: 23, 22, 7
+18786: 23, 22, 8
+18787: 23, 22, 9
+18788: 23, 22, 10
+18789: 23, 22, 11
+18790: 23, 22, 12
+18791: 23, 22, 13
+18792: 23, 22, 14
+18793: 23, 22, 15
+18794: 23, 22, 16
+18795: 23, 22, 17
+18796: 23, 22, 18
+18797: 23, 22, 19
+18798: 23, 22, 20
+18799: 23, 22, 21
+18800: 23, 22, 22
+18801: 23, 22, 23
+18802: 23, 22, 24
+18803: 23, 22, 25
+18804: 23, 23, 0
+18805: 23, 23, 1
+18806: 23, 23, 2
+18807: 23, 23, 3
+18808: 23, 23, 4
+18809: 23, 23, 5
+18810: 23, 23, 6
+18811: 23, 23, 7
+18812: 23, 23, 8
+18813: 23, 23, 9
+18814: 23, 23, 10
+18815: 23, 23, 11
+18816: 23, 23, 12
+18817: 23, 23, 13
+18818: 23, 23, 14
+18819: 23, 23, 15
+18820: 23, 23, 16
+18821: 23, 23, 17
+18822: 23, 23, 18
+18823: 23, 24, 0
+18824: 23, 24, 1
+18825: 23, 24, 2
+18826: 23, 24, 3
+18827: 23, 24, 4
+18828: 23, 24, 5
+18829: 23, 24, 6
+18830: 23, 24, 7
+18831: 23, 24, 8
+18832: 23, 24, 9
+18833: 23, 24, 10
+18834: 23, 24, 11
+18835: 23, 24, 12
+18836: 23, 24, 13
+18837: 23, 24, 14
+18838: 23, 24, 15
+18839: 23, 24, 16
+18840: 23, 24, 17
+18841: 23, 24, 18
+18842: 23, 24, 19
+18843: 23, 24, 20
+18844: 23, 24, 21
+18845: 23, 24, 22
+18846: 23, 24, 23
+18847: 23, 25, 0
+18848: 23, 25, 1
+18849: 23, 25, 2
+18850: 23, 25, 3
+18851: 23, 25, 4
+18852: 23, 25, 5
+18853: 23, 25, 6
+18854: 23, 25, 7
+18855: 23, 25, 8
+18856: 23, 25, 9
+18857: 23, 25, 10
+18858: 23, 25, 11
+18859: 23, 25, 12
+18860: 23, 26, 0
+18861: 23, 26, 1
+18862: 23, 26, 2
+18863: 23, 26, 3
+18864: 23, 26, 4
+18865: 23, 26, 5
+18866: 23, 26, 6
+18867: 23, 26, 7
+18868: 23, 26, 8
+18869: 23, 26, 9
+18870: 23, 26, 10
+18871: 23, 26, 11
+18872: 23, 26, 12
+18873: 23, 26, 13
+18874: 23, 26, 14
+18875: 23, 26, 15
+18876: 23, 26, 16
+18877: 23, 26, 17
+18878: 23, 26, 18
+18879: 23, 26, 19
+18880: 23, 26, 20
+18881: 23, 26, 21
+18882: 23, 27, 0
+18883: 23, 27, 1
+18884: 23, 27, 2
+18885: 23, 27, 3
+18886: 23, 27, 4
+18887: 23, 27, 5
+18888: 23, 27, 6
+18889: 23, 27, 7
+18890: 23, 27, 8
+18891: 23, 27, 9
+18892: 23, 27, 10
+18893: 23, 27, 11
+18894: 23, 27, 12
+18895: 23, 27, 13
+18896: 23, 28, 0
+18897: 23, 28, 1
+18898: 23, 28, 2
+18899: 23, 28, 3
+18900: 23, 28, 4
+18901: 23, 28, 5
+18902: 23, 28, 6
+18903: 23, 28, 7
+18904: 23, 28, 8
+18905: 23, 28, 9
+18906: 23, 28, 10
+18907: 23, 28, 11
+18908: 23, 28, 12
+18909: 23, 28, 13
+18910: 23, 28, 14
+18911: 23, 28, 15
+18912: 23, 28, 16
+18913: 23, 28, 17
+18914: 23, 28, 18
+18915: 23, 28, 19
+18916: 23, 28, 20
+18917: 23, 28, 21
+18918: 23, 28, 22
+18919: 23, 28, 23
+18920: 23, 28, 24
+18921: 23, 28, 25
+18922: 23, 28, 26
+18923: 23, 28, 27
+18924: 23, 28, 28
+18925: 23, 28, 29
+18926: 23, 29, 0
+18927: 23, 29, 1
+18928: 23, 29, 2
+18929: 23, 29, 3
+18930: 23, 29, 4
+18931: 23, 29, 5
+18932: 23, 29, 6
+18933: 23, 29, 7
+18934: 23, 29, 8
+18935: 23, 29, 9
+18936: 23, 29, 10
+18937: 23, 29, 11
+18938: 23, 29, 12
+18939: 23, 29, 13
+18940: 23, 29, 14
+18941: 23, 29, 15
+18942: 23, 29, 16
+18943: 23, 29, 17
+18944: 23, 29, 18
+18945: 23, 29, 19
+18946: 23, 29, 20
+18947: 23, 29, 21
+18948: 23, 29, 22
+18949: 23, 29, 23
+18950: 23, 29, 24
+18951: 23, 30, 0
+18952: 23, 30, 1
+18953: 23, 30, 2
+18954: 23, 30, 3
+18955: 23, 30, 4
+18956: 23, 30, 5
+18957: 23, 30, 6
+18958: 23, 30, 7
+18959: 23, 30, 8
+18960: 23, 30, 9
+18961: 23, 30, 10
+18962: 23, 30, 11
+18963: 23, 30, 12
+18964: 23, 30, 13
+18965: 23, 30, 14
+18966: 23, 30, 15
+18967: 23, 30, 16
+18968: 23, 30, 17
+18969: 23, 30, 18
+18970: 23, 30, 19
+18971: 23, 30, 20
+18972: 23, 30, 21
+18973: 23, 30, 22
+18974: 23, 30, 23
+18975: 23, 30, 24
+18976: 23, 30, 25
+18977: 23, 30, 26
+18978: 23, 30, 27
+18979: 23, 30, 28
+18980: 23, 30, 29
+18981: 23, 30, 30
+18982: 23, 30, 31
+18983: 23, 30, 32
+18984: 23, 30, 33
+18985: 23, 31, 0
+18986: 23, 31, 1
+18987: 23, 31, 2
+18988: 23, 31, 3
+18989: 23, 31, 4
+18990: 23, 31, 5
+18991: 23, 31, 6
+18992: 23, 31, 7
+18993: 23, 31, 8
+18994: 23, 31, 9
+18995: 23, 32, 0
+18996: 23, 32, 1
+18997: 23, 32, 2
+18998: 23, 32, 3
+18999: 23, 32, 4
+19000: 23, 32, 5
+19001: 23, 32, 6
+19002: 23, 32, 7
+19003: 23, 32, 8
+19004: 23, 32, 9
+19005: 23, 32, 10
+19006: 23, 32, 11
+19007: 23, 32, 12
+19008: 23, 32, 13
+19009: 23, 32, 14
+19010: 23, 32, 15
+19011: 23, 32, 16
+19012: 23, 32, 17
+19013: 23, 32, 18
+19014: 23, 32, 19
+19015: 23, 32, 20
+19016: 23, 33, 0
+19017: 23, 33, 1
+19018: 23, 33, 2
+19019: 23, 33, 3
+19020: 23, 33, 4
+19021: 23, 33, 5
+19022: 23, 33, 6
+19023: 23, 33, 7
+19024: 23, 33, 8
+19025: 23, 33, 9
+19026: 23, 33, 10
+19027: 23, 33, 11
+19028: 23, 33, 12
+19029: 23, 33, 13
+19030: 23, 33, 14
+19031: 23, 33, 15
+19032: 23, 33, 16
+19033: 23, 33, 17
+19034: 23, 33, 18
+19035: 23, 33, 19
+19036: 23, 33, 20
+19037: 23, 33, 21
+19038: 23, 33, 22
+19039: 23, 33, 23
+19040: 23, 33, 24
+19041: 23, 34, 0
+19042: 23, 34, 1
+19043: 23, 34, 2
+19044: 23, 34, 3
+19045: 23, 34, 4
+19046: 23, 34, 5
+19047: 23, 34, 6
+19048: 23, 34, 7
+19049: 23, 34, 8
+19050: 23, 34, 9
+19051: 23, 34, 10
+19052: 23, 34, 11
+19053: 23, 34, 12
+19054: 23, 34, 13
+19055: 23, 34, 14
+19056: 23, 34, 15
+19057: 23, 34, 16
+19058: 23, 34, 17
+19059: 23, 35, 0
+19060: 23, 35, 1
+19061: 23, 35, 2
+19062: 23, 35, 3
+19063: 23, 35, 4
+19064: 23, 35, 5
+19065: 23, 35, 6
+19066: 23, 35, 7
+19067: 23, 35, 8
+19068: 23, 35, 9
+19069: 23, 35, 10
+19070: 23, 36, 0
+19071: 23, 36, 1
+19072: 23, 36, 2
+19073: 23, 36, 3
+19074: 23, 36, 4
+19075: 23, 36, 5
+19076: 23, 36, 6
+19077: 23, 36, 7
+19078: 23, 36, 8
+19079: 23, 36, 9
+19080: 23, 36, 10
+19081: 23, 36, 11
+19082: 23, 36, 12
+19083: 23, 36, 13
+19084: 23, 36, 14
+19085: 23, 36, 15
+19086: 23, 36, 16
+19087: 23, 36, 17
+19088: 23, 36, 18
+19089: 23, 36, 19
+19090: 23, 36, 20
+19091: 23, 36, 21
+19092: 23, 36, 22
+19093: 23, 37, 0
+19094: 23, 37, 1
+19095: 23, 37, 2
+19096: 23, 37, 3
+19097: 23, 37, 4
+19098: 23, 37, 5
+19099: 23, 37, 6
+19100: 23, 37, 7
+19101: 23, 37, 8
+19102: 23, 37, 9
+19103: 23, 37, 10
+19104: 23, 37, 11
+19105: 23, 37, 12
+19106: 23, 37, 13
+19107: 23, 37, 14
+19108: 23, 37, 15
+19109: 23, 37, 16
+19110: 23, 37, 17
+19111: 23, 37, 18
+19112: 23, 37, 19
+19113: 23, 37, 20
+19114: 23, 37, 21
+19115: 23, 37, 22
+19116: 23, 37, 23
+19117: 23, 37, 24
+19118: 23, 37, 25
+19119: 23, 37, 26
+19120: 23, 37, 27
+19121: 23, 37, 28
+19122: 23, 37, 29
+19123: 23, 37, 30
+19124: 23, 37, 31
+19125: 23, 37, 32
+19126: 23, 37, 33
+19127: 23, 37, 34
+19128: 23, 37, 35
+19129: 23, 37, 36
+19130: 23, 37, 37
+19131: 23, 37, 38
+19132: 23, 38, 0
+19133: 23, 38, 1
+19134: 23, 38, 2
+19135: 23, 38, 3
+19136: 23, 38, 4
+19137: 23, 38, 5
+19138: 23, 38, 6
+19139: 23, 38, 7
+19140: 23, 38, 8
+19141: 23, 38, 9
+19142: 23, 38, 10
+19143: 23, 38, 11
+19144: 23, 38, 12
+19145: 23, 38, 13
+19146: 23, 38, 14
+19147: 23, 38, 15
+19148: 23, 38, 16
+19149: 23, 38, 17
+19150: 23, 38, 18
+19151: 23, 38, 19
+19152: 23, 38, 20
+19153: 23, 38, 21
+19154: 23, 38, 22
+19155: 23, 39, 0
+19156: 23, 39, 1
+19157: 23, 39, 2
+19158: 23, 39, 3
+19159: 23, 39, 4
+19160: 23, 39, 5
+19161: 23, 39, 6
+19162: 23, 39, 7
+19163: 23, 39, 8
+19164: 23, 40, 0
+19165: 23, 40, 1
+19166: 23, 40, 2
+19167: 23, 40, 3
+19168: 23, 40, 4
+19169: 23, 40, 5
+19170: 23, 40, 6
+19171: 23, 40, 7
+19172: 23, 40, 8
+19173: 23, 40, 9
+19174: 23, 40, 10
+19175: 23, 40, 11
+19176: 23, 40, 12
+19177: 23, 40, 13
+19178: 23, 40, 14
+19179: 23, 40, 15
+19180: 23, 40, 16
+19181: 23, 40, 17
+19182: 23, 40, 18
+19183: 23, 40, 19
+19184: 23, 40, 20
+19185: 23, 40, 21
+19186: 23, 40, 22
+19187: 23, 40, 23
+19188: 23, 40, 24
+19189: 23, 40, 25
+19190: 23, 40, 26
+19191: 23, 40, 27
+19192: 23, 40, 28
+19193: 23, 40, 29
+19194: 23, 40, 30
+19195: 23, 40, 31
+19196: 23, 41, 0
+19197: 23, 41, 1
+19198: 23, 41, 2
+19199: 23, 41, 3
+19200: 23, 41, 4
+19201: 23, 41, 5
+19202: 23, 41, 6
+19203: 23, 41, 7
+19204: 23, 41, 8
+19205: 23, 41, 9
+19206: 23, 41, 10
+19207: 23, 41, 11
+19208: 23, 41, 12
+19209: 23, 41, 13
+19210: 23, 41, 14
+19211: 23, 41, 15
+19212: 23, 41, 16
+19213: 23, 41, 17
+19214: 23, 41, 18
+19215: 23, 41, 19
+19216: 23, 41, 20
+19217: 23, 41, 21
+19218: 23, 41, 22
+19219: 23, 41, 23
+19220: 23, 41, 24
+19221: 23, 41, 25
+19222: 23, 41, 26
+19223: 23, 41, 27
+19224: 23, 41, 28
+19225: 23, 41, 29
+19226: 23, 42, 0
+19227: 23, 42, 1
+19228: 23, 42, 2
+19229: 23, 42, 3
+19230: 23, 42, 4
+19231: 23, 42, 5
+19232: 23, 42, 6
+19233: 23, 42, 7
+19234: 23, 42, 8
+19235: 23, 42, 9
+19236: 23, 42, 10
+19237: 23, 42, 11
+19238: 23, 42, 12
+19239: 23, 42, 13
+19240: 23, 42, 14
+19241: 23, 42, 15
+19242: 23, 42, 16
+19243: 23, 42, 17
+19244: 23, 42, 18
+19245: 23, 42, 19
+19246: 23, 42, 20
+19247: 23, 42, 21
+19248: 23, 42, 22
+19249: 23, 42, 23
+19250: 23, 42, 24
+19251: 23, 42, 25
+19252: 23, 43, 0
+19253: 23, 43, 1
+19254: 23, 43, 2
+19255: 23, 43, 3
+19256: 23, 43, 4
+19257: 23, 43, 5
+19258: 23, 43, 6
+19259: 23, 43, 7
+19260: 23, 43, 8
+19261: 23, 43, 9
+19262: 23, 43, 10
+19263: 23, 43, 11
+19264: 23, 43, 12
+19265: 23, 43, 13
+19266: 23, 43, 14
+19267: 23, 43, 15
+19268: 23, 43, 16
+19269: 23, 43, 17
+19270: 23, 43, 18
+19271: 23, 43, 19
+19272: 23, 43, 20
+19273: 23, 43, 21
+19274: 23, 43, 22
+19275: 23, 43, 23
+19276: 23, 43, 24
+19277: 23, 43, 25
+19278: 23, 43, 26
+19279: 23, 43, 27
+19280: 23, 43, 28
+19281: 23, 44, 0
+19282: 23, 44, 1
+19283: 23, 44, 2
+19284: 23, 44, 3
+19285: 23, 44, 4
+19286: 23, 44, 5
+19287: 23, 44, 6
+19288: 23, 44, 7
+19289: 23, 44, 8
+19290: 23, 44, 9
+19291: 23, 44, 10
+19292: 23, 44, 11
+19293: 23, 44, 12
+19294: 23, 44, 13
+19295: 23, 44, 14
+19296: 23, 44, 15
+19297: 23, 44, 16
+19298: 23, 44, 17
+19299: 23, 44, 18
+19300: 23, 44, 19
+19301: 23, 44, 20
+19302: 23, 44, 21
+19303: 23, 44, 22
+19304: 23, 44, 23
+19305: 23, 44, 24
+19306: 23, 44, 25
+19307: 23, 44, 26
+19308: 23, 44, 27
+19309: 23, 44, 28
+19310: 23, 45, 0
+19311: 23, 45, 1
+19312: 23, 45, 2
+19313: 23, 45, 3
+19314: 23, 45, 4
+19315: 23, 45, 5
+19316: 23, 45, 6
+19317: 23, 45, 7
+19318: 23, 45, 8
+19319: 23, 45, 9
+19320: 23, 45, 10
+19321: 23, 45, 11
+19322: 23, 45, 12
+19323: 23, 45, 13
+19324: 23, 45, 14
+19325: 23, 45, 15
+19326: 23, 45, 16
+19327: 23, 45, 17
+19328: 23, 45, 18
+19329: 23, 45, 19
+19330: 23, 45, 20
+19331: 23, 45, 21
+19332: 23, 45, 22
+19333: 23, 45, 23
+19334: 23, 45, 24
+19335: 23, 45, 25
+19336: 23, 46, 0
+19337: 23, 46, 1
+19338: 23, 46, 2
+19339: 23, 46, 3
+19340: 23, 46, 4
+19341: 23, 46, 5
+19342: 23, 46, 6
+19343: 23, 46, 7
+19344: 23, 46, 8
+19345: 23, 46, 9
+19346: 23, 46, 10
+19347: 23, 46, 11
+19348: 23, 46, 12
+19349: 23, 46, 13
+19350: 23, 47, 0
+19351: 23, 47, 1
+19352: 23, 47, 2
+19353: 23, 47, 3
+19354: 23, 47, 4
+19355: 23, 47, 5
+19356: 23, 47, 6
+19357: 23, 47, 7
+19358: 23, 47, 8
+19359: 23, 47, 9
+19360: 23, 47, 10
+19361: 23, 47, 11
+19362: 23, 47, 12
+19363: 23, 47, 13
+19364: 23, 47, 14
+19365: 23, 47, 15
+19366: 23, 48, 0
+19367: 23, 48, 1
+19368: 23, 48, 2
+19369: 23, 48, 3
+19370: 23, 48, 4
+19371: 23, 48, 5
+19372: 23, 48, 6
+19373: 23, 48, 7
+19374: 23, 48, 8
+19375: 23, 48, 9
+19376: 23, 48, 10
+19377: 23, 48, 11
+19378: 23, 48, 12
+19379: 23, 48, 13
+19380: 23, 48, 14
+19381: 23, 48, 15
+19382: 23, 48, 16
+19383: 23, 48, 17
+19384: 23, 48, 18
+19385: 23, 48, 19
+19386: 23, 48, 20
+19387: 23, 48, 21
+19388: 23, 48, 22
+19389: 23, 49, 0
+19390: 23, 49, 1
+19391: 23, 49, 2
+19392: 23, 49, 3
+19393: 23, 49, 4
+19394: 23, 49, 5
+19395: 23, 49, 6
+19396: 23, 49, 7
+19397: 23, 49, 8
+19398: 23, 49, 9
+19399: 23, 49, 10
+19400: 23, 49, 11
+19401: 23, 49, 12
+19402: 23, 49, 13
+19403: 23, 49, 14
+19404: 23, 49, 15
+19405: 23, 49, 16
+19406: 23, 49, 17
+19407: 23, 49, 18
+19408: 23, 49, 19
+19409: 23, 49, 20
+19410: 23, 49, 21
+19411: 23, 49, 22
+19412: 23, 49, 23
+19413: 23, 49, 24
+19414: 23, 49, 25
+19415: 23, 49, 26
+19416: 23, 50, 0
+19417: 23, 50, 1
+19418: 23, 50, 2
+19419: 23, 50, 3
+19420: 23, 50, 4
+19421: 23, 50, 5
+19422: 23, 50, 6
+19423: 23, 50, 7
+19424: 23, 50, 8
+19425: 23, 50, 9
+19426: 23, 50, 10
+19427: 23, 50, 11
+19428: 23, 51, 0
+19429: 23, 51, 1
+19430: 23, 51, 2
+19431: 23, 51, 3
+19432: 23, 51, 4
+19433: 23, 51, 5
+19434: 23, 51, 6
+19435: 23, 51, 7
+19436: 23, 51, 8
+19437: 23, 51, 9
+19438: 23, 51, 10
+19439: 23, 51, 11
+19440: 23, 51, 12
+19441: 23, 51, 13
+19442: 23, 51, 14
+19443: 23, 51, 15
+19444: 23, 51, 16
+19445: 23, 51, 17
+19446: 23, 51, 18
+19447: 23, 51, 19
+19448: 23, 51, 20
+19449: 23, 51, 21
+19450: 23, 51, 22
+19451: 23, 51, 23
+19452: 23, 52, 0
+19453: 23, 52, 1
+19454: 23, 52, 2
+19455: 23, 52, 3
+19456: 23, 52, 4
+19457: 23, 52, 5
+19458: 23, 52, 6
+19459: 23, 52, 7
+19460: 23, 52, 8
+19461: 23, 52, 9
+19462: 23, 52, 10
+19463: 23, 52, 11
+19464: 23, 52, 12
+19465: 23, 52, 13
+19466: 23, 52, 14
+19467: 23, 52, 15
+19468: 23, 53, 0
+19469: 23, 53, 1
+19470: 23, 53, 2
+19471: 23, 53, 3
+19472: 23, 53, 4
+19473: 23, 53, 5
+19474: 23, 53, 6
+19475: 23, 53, 7
+19476: 23, 53, 8
+19477: 23, 53, 9
+19478: 23, 53, 10
+19479: 23, 53, 11
+19480: 23, 53, 12
+19481: 23, 54, 0
+19482: 23, 54, 1
+19483: 23, 54, 2
+19484: 23, 54, 3
+19485: 23, 54, 4
+19486: 23, 54, 5
+19487: 23, 54, 6
+19488: 23, 54, 7
+19489: 23, 54, 8
+19490: 23, 54, 9
+19491: 23, 54, 10
+19492: 23, 54, 11
+19493: 23, 54, 12
+19494: 23, 54, 13
+19495: 23, 54, 14
+19496: 23, 54, 15
+19497: 23, 54, 16
+19498: 23, 54, 17
+19499: 23, 55, 0
+19500: 23, 55, 1
+19501: 23, 55, 2
+19502: 23, 55, 3
+19503: 23, 55, 4
+19504: 23, 55, 5
+19505: 23, 55, 6
+19506: 23, 55, 7
+19507: 23, 55, 8
+19508: 23, 55, 9
+19509: 23, 55, 10
+19510: 23, 55, 11
+19511: 23, 55, 12
+19512: 23, 55, 13
+19513: 23, 56, 0
+19514: 23, 56, 1
+19515: 23, 56, 2
+19516: 23, 56, 3
+19517: 23, 56, 4
+19518: 23, 56, 5
+19519: 23, 56, 6
+19520: 23, 56, 7
+19521: 23, 56, 8
+19522: 23, 56, 9
+19523: 23, 56, 10
+19524: 23, 56, 11
+19525: 23, 56, 12
+19526: 23, 57, 0
+19527: 23, 57, 1
+19528: 23, 57, 2
+19529: 23, 57, 3
+19530: 23, 57, 4
+19531: 23, 57, 5
+19532: 23, 57, 6
+19533: 23, 57, 7
+19534: 23, 57, 8
+19535: 23, 57, 9
+19536: 23, 57, 10
+19537: 23, 57, 11
+19538: 23, 57, 12
+19539: 23, 57, 13
+19540: 23, 57, 14
+19541: 23, 57, 15
+19542: 23, 57, 16
+19543: 23, 57, 17
+19544: 23, 57, 18
+19545: 23, 57, 19
+19546: 23, 57, 20
+19547: 23, 57, 21
+19548: 23, 58, 0
+19549: 23, 58, 1
+19550: 23, 58, 2
+19551: 23, 58, 3
+19552: 23, 58, 4
+19553: 23, 58, 5
+19554: 23, 58, 6
+19555: 23, 58, 7
+19556: 23, 58, 8
+19557: 23, 58, 9
+19558: 23, 58, 10
+19559: 23, 58, 11
+19560: 23, 58, 12
+19561: 23, 58, 13
+19562: 23, 58, 14
+19563: 23, 59, 0
+19564: 23, 59, 1
+19565: 23, 59, 2
+19566: 23, 59, 3
+19567: 23, 59, 4
+19568: 23, 59, 5
+19569: 23, 59, 6
+19570: 23, 59, 7
+19571: 23, 59, 8
+19572: 23, 59, 9
+19573: 23, 59, 10
+19574: 23, 59, 11
+19575: 23, 59, 12
+19576: 23, 59, 13
+19577: 23, 59, 14
+19578: 23, 59, 15
+19579: 23, 59, 16
+19580: 23, 59, 17
+19581: 23, 59, 18
+19582: 23, 59, 19
+19583: 23, 59, 20
+19584: 23, 59, 21
+19585: 23, 60, 0
+19586: 23, 60, 1
+19587: 23, 60, 2
+19588: 23, 60, 3
+19589: 23, 60, 4
+19590: 23, 60, 5
+19591: 23, 60, 6
+19592: 23, 60, 7
+19593: 23, 60, 8
+19594: 23, 60, 9
+19595: 23, 60, 10
+19596: 23, 60, 11
+19597: 23, 60, 12
+19598: 23, 60, 13
+19599: 23, 60, 14
+19600: 23, 60, 15
+19601: 23, 60, 16
+19602: 23, 60, 17
+19603: 23, 60, 18
+19604: 23, 60, 19
+19605: 23, 60, 20
+19606: 23, 60, 21
+19607: 23, 60, 22
+19608: 23, 61, 0
+19609: 23, 61, 1
+19610: 23, 61, 2
+19611: 23, 61, 3
+19612: 23, 61, 4
+19613: 23, 61, 5
+19614: 23, 61, 6
+19615: 23, 61, 7
+19616: 23, 61, 8
+19617: 23, 61, 9
+19618: 23, 61, 10
+19619: 23, 61, 11
+19620: 23, 62, 0
+19621: 23, 62, 1
+19622: 23, 62, 2
+19623: 23, 62, 3
+19624: 23, 62, 4
+19625: 23, 62, 5
+19626: 23, 62, 6
+19627: 23, 62, 7
+19628: 23, 62, 8
+19629: 23, 62, 9
+19630: 23, 62, 10
+19631: 23, 62, 11
+19632: 23, 62, 12
+19633: 23, 63, 0
+19634: 23, 63, 1
+19635: 23, 63, 2
+19636: 23, 63, 3
+19637: 23, 63, 4
+19638: 23, 63, 5
+19639: 23, 63, 6
+19640: 23, 63, 7
+19641: 23, 63, 8
+19642: 23, 63, 9
+19643: 23, 63, 10
+19644: 23, 63, 11
+19645: 23, 63, 12
+19646: 23, 63, 13
+19647: 23, 63, 14
+19648: 23, 63, 15
+19649: 23, 63, 16
+19650: 23, 63, 17
+19651: 23, 63, 18
+19652: 23, 63, 19
+19653: 23, 64, 0
+19654: 23, 64, 1
+19655: 23, 64, 2
+19656: 23, 64, 3
+19657: 23, 64, 4
+19658: 23, 64, 5
+19659: 23, 64, 6
+19660: 23, 64, 7
+19661: 23, 64, 8
+19662: 23, 64, 9
+19663: 23, 64, 10
+19664: 23, 64, 11
+19665: 23, 64, 12
+19666: 23, 65, 0
+19667: 23, 65, 1
+19668: 23, 65, 2
+19669: 23, 65, 3
+19670: 23, 65, 4
+19671: 23, 65, 5
+19672: 23, 65, 6
+19673: 23, 65, 7
+19674: 23, 65, 8
+19675: 23, 65, 9
+19676: 23, 65, 10
+19677: 23, 65, 11
+19678: 23, 65, 12
+19679: 23, 65, 13
+19680: 23, 65, 14
+19681: 23, 65, 15
+19682: 23, 65, 16
+19683: 23, 65, 17
+19684: 23, 65, 18
+19685: 23, 65, 19
+19686: 23, 65, 20
+19687: 23, 65, 21
+19688: 23, 65, 22
+19689: 23, 65, 23
+19690: 23, 65, 24
+19691: 23, 65, 25
+19692: 23, 66, 0
+19693: 23, 66, 1
+19694: 23, 66, 2
+19695: 23, 66, 3
+19696: 23, 66, 4
+19697: 23, 66, 5
+19698: 23, 66, 6
+19699: 23, 66, 7
+19700: 23, 66, 8
+19701: 23, 66, 9
+19702: 23, 66, 10
+19703: 23, 66, 11
+19704: 23, 66, 12
+19705: 23, 66, 13
+19706: 23, 66, 14
+19707: 23, 66, 15
+19708: 23, 66, 16
+19709: 23, 66, 17
+19710: 23, 66, 18
+19711: 23, 66, 19
+19712: 23, 66, 20
+19713: 23, 66, 21
+19714: 23, 66, 22
+19715: 23, 66, 23
+19716: 23, 66, 24
+19717: 24, 0, 0
+19718: 24, 1, 0
+19719: 24, 1, 1
+19720: 24, 1, 2
+19721: 24, 1, 3
+19722: 24, 1, 4
+19723: 24, 1, 5
+19724: 24, 1, 6
+19725: 24, 1, 7
+19726: 24, 1, 8
+19727: 24, 1, 9
+19728: 24, 1, 10
+19729: 24, 1, 11
+19730: 24, 1, 12
+19731: 24, 1, 13
+19732: 24, 1, 14
+19733: 24, 1, 15
+19734: 24, 1, 16
+19735: 24, 1, 17
+19736: 24, 1, 18
+19737: 24, 1, 19
+19738: 24, 2, 0
+19739: 24, 2, 1
+19740: 24, 2, 2
+19741: 24, 2, 3
+19742: 24, 2, 4
+19743: 24, 2, 5
+19744: 24, 2, 6
+19745: 24, 2, 7
+19746: 24, 2, 8
+19747: 24, 2, 9
+19748: 24, 2, 10
+19749: 24, 2, 11
+19750: 24, 2, 12
+19751: 24, 2, 13
+19752: 24, 2, 14
+19753: 24, 2, 15
+19754: 24, 2, 16
+19755: 24, 2, 17
+19756: 24, 2, 18
+19757: 24, 2, 19
+19758: 24, 2, 20
+19759: 24, 2, 21
+19760: 24, 2, 22
+19761: 24, 2, 23
+19762: 24, 2, 24
+19763: 24, 2, 25
+19764: 24, 2, 26
+19765: 24, 2, 27
+19766: 24, 2, 28
+19767: 24, 2, 29
+19768: 24, 2, 30
+19769: 24, 2, 31
+19770: 24, 2, 32
+19771: 24, 2, 33
+19772: 24, 2, 34
+19773: 24, 2, 35
+19774: 24, 2, 36
+19775: 24, 2, 37
+19776: 24, 3, 0
+19777: 24, 3, 1
+19778: 24, 3, 2
+19779: 24, 3, 3
+19780: 24, 3, 4
+19781: 24, 3, 5
+19782: 24, 3, 6
+19783: 24, 3, 7
+19784: 24, 3, 8
+19785: 24, 3, 9
+19786: 24, 3, 10
+19787: 24, 3, 11
+19788: 24, 3, 12
+19789: 24, 3, 13
+19790: 24, 3, 14
+19791: 24, 3, 15
+19792: 24, 3, 16
+19793: 24, 3, 17
+19794: 24, 3, 18
+19795: 24, 3, 19
+19796: 24, 3, 20
+19797: 24, 3, 21
+19798: 24, 3, 22
+19799: 24, 3, 23
+19800: 24, 3, 24
+19801: 24, 3, 25
+19802: 24, 4, 0
+19803: 24, 4, 1
+19804: 24, 4, 2
+19805: 24, 4, 3
+19806: 24, 4, 4
+19807: 24, 4, 5
+19808: 24, 4, 6
+19809: 24, 4, 7
+19810: 24, 4, 8
+19811: 24, 4, 9
+19812: 24, 4, 10
+19813: 24, 4, 11
+19814: 24, 4, 12
+19815: 24, 4, 13
+19816: 24, 4, 14
+19817: 24, 4, 15
+19818: 24, 4, 16
+19819: 24, 4, 17
+19820: 24, 4, 18
+19821: 24, 4, 19
+19822: 24, 4, 20
+19823: 24, 4, 21
+19824: 24, 4, 22
+19825: 24, 4, 23
+19826: 24, 4, 24
+19827: 24, 4, 25
+19828: 24, 4, 26
+19829: 24, 4, 27
+19830: 24, 4, 28
+19831: 24, 4, 29
+19832: 24, 4, 30
+19833: 24, 4, 31
+19834: 24, 5, 0
+19835: 24, 5, 1
+19836: 24, 5, 2
+19837: 24, 5, 3
+19838: 24, 5, 4
+19839: 24, 5, 5
+19840: 24, 5, 6
+19841: 24, 5, 7
+19842: 24, 5, 8
+19843: 24, 5, 9
+19844: 24, 5, 10
+19845: 24, 5, 11
+19846: 24, 5, 12
+19847: 24, 5, 13
+19848: 24, 5, 14
+19849: 24, 5, 15
+19850: 24, 5, 16
+19851: 24, 5, 17
+19852: 24, 5, 18
+19853: 24, 5, 19
+19854: 24, 5, 20
+19855: 24, 5, 21
+19856: 24, 5, 22
+19857: 24, 5, 23
+19858: 24, 5, 24
+19859: 24, 5, 25
+19860: 24, 5, 26
+19861: 24, 5, 27
+19862: 24, 5, 28
+19863: 24, 5, 29
+19864: 24, 5, 30
+19865: 24, 5, 31
+19866: 24, 6, 0
+19867: 24, 6, 1
+19868: 24, 6, 2
+19869: 24, 6, 3
+19870: 24, 6, 4
+19871: 24, 6, 5
+19872: 24, 6, 6
+19873: 24, 6, 7
+19874: 24, 6, 8
+19875: 24, 6, 9
+19876: 24, 6, 10
+19877: 24, 6, 11
+19878: 24, 6, 12
+19879: 24, 6, 13
+19880: 24, 6, 14
+19881: 24, 6, 15
+19882: 24, 6, 16
+19883: 24, 6, 17
+19884: 24, 6, 18
+19885: 24, 6, 19
+19886: 24, 6, 20
+19887: 24, 6, 21
+19888: 24, 6, 22
+19889: 24, 6, 23
+19890: 24, 6, 24
+19891: 24, 6, 25
+19892: 24, 6, 26
+19893: 24, 6, 27
+19894: 24, 6, 28
+19895: 24, 6, 29
+19896: 24, 6, 30
+19897: 24, 7, 0
+19898: 24, 7, 1
+19899: 24, 7, 2
+19900: 24, 7, 3
+19901: 24, 7, 4
+19902: 24, 7, 5
+19903: 24, 7, 6
+19904: 24, 7, 7
+19905: 24, 7, 8
+19906: 24, 7, 9
+19907: 24, 7, 10
+19908: 24, 7, 11
+19909: 24, 7, 12
+19910: 24, 7, 13
+19911: 24, 7, 14
+19912: 24, 7, 15
+19913: 24, 7, 16
+19914: 24, 7, 17
+19915: 24, 7, 18
+19916: 24, 7, 19
+19917: 24, 7, 20
+19918: 24, 7, 21
+19919: 24, 7, 22
+19920: 24, 7, 23
+19921: 24, 7, 24
+19922: 24, 7, 25
+19923: 24, 7, 26
+19924: 24, 7, 27
+19925: 24, 7, 28
+19926: 24, 7, 29
+19927: 24, 7, 30
+19928: 24, 7, 31
+19929: 24, 7, 32
+19930: 24, 7, 33
+19931: 24, 7, 34
+19932: 24, 8, 0
+19933: 24, 8, 1
+19934: 24, 8, 2
+19935: 24, 8, 3
+19936: 24, 8, 4
+19937: 24, 8, 5
+19938: 24, 8, 6
+19939: 24, 8, 7
+19940: 24, 8, 8
+19941: 24, 8, 9
+19942: 24, 8, 10
+19943: 24, 8, 11
+19944: 24, 8, 12
+19945: 24, 8, 13
+19946: 24, 8, 14
+19947: 24, 8, 15
+19948: 24, 8, 16
+19949: 24, 8, 17
+19950: 24, 8, 18
+19951: 24, 8, 19
+19952: 24, 8, 20
+19953: 24, 8, 21
+19954: 24, 8, 22
+19955: 24, 9, 0
+19956: 24, 9, 1
+19957: 24, 9, 2
+19958: 24, 9, 3
+19959: 24, 9, 4
+19960: 24, 9, 5
+19961: 24, 9, 6
+19962: 24, 9, 7
+19963: 24, 9, 8
+19964: 24, 9, 9
+19965: 24, 9, 10
+19966: 24, 9, 11
+19967: 24, 9, 12
+19968: 24, 9, 13
+19969: 24, 9, 14
+19970: 24, 9, 15
+19971: 24, 9, 16
+19972: 24, 9, 17
+19973: 24, 9, 18
+19974: 24, 9, 19
+19975: 24, 9, 20
+19976: 24, 9, 21
+19977: 24, 9, 22
+19978: 24, 9, 23
+19979: 24, 9, 24
+19980: 24, 9, 25
+19981: 24, 9, 26
+19982: 24, 10, 0
+19983: 24, 10, 1
+19984: 24, 10, 2
+19985: 24, 10, 3
+19986: 24, 10, 4
+19987: 24, 10, 5
+19988: 24, 10, 6
+19989: 24, 10, 7
+19990: 24, 10, 8
+19991: 24, 10, 9
+19992: 24, 10, 10
+19993: 24, 10, 11
+19994: 24, 10, 12
+19995: 24, 10, 13
+19996: 24, 10, 14
+19997: 24, 10, 15
+19998: 24, 10, 16
+19999: 24, 10, 17
+20000: 24, 10, 18
+20001: 24, 10, 19
+20002: 24, 10, 20
+20003: 24, 10, 21
+20004: 24, 10, 22
+20005: 24, 10, 23
+20006: 24, 10, 24
+20007: 24, 10, 25
+20008: 24, 11, 0
+20009: 24, 11, 1
+20010: 24, 11, 2
+20011: 24, 11, 3
+20012: 24, 11, 4
+20013: 24, 11, 5
+20014: 24, 11, 6
+20015: 24, 11, 7
+20016: 24, 11, 8
+20017: 24, 11, 9
+20018: 24, 11, 10
+20019: 24, 11, 11
+20020: 24, 11, 12
+20021: 24, 11, 13
+20022: 24, 11, 14
+20023: 24, 11, 15
+20024: 24, 11, 16
+20025: 24, 11, 17
+20026: 24, 11, 18
+20027: 24, 11, 19
+20028: 24, 11, 20
+20029: 24, 11, 21
+20030: 24, 11, 22
+20031: 24, 11, 23
+20032: 24, 12, 0
+20033: 24, 12, 1
+20034: 24, 12, 2
+20035: 24, 12, 3
+20036: 24, 12, 4
+20037: 24, 12, 5
+20038: 24, 12, 6
+20039: 24, 12, 7
+20040: 24, 12, 8
+20041: 24, 12, 9
+20042: 24, 12, 10
+20043: 24, 12, 11
+20044: 24, 12, 12
+20045: 24, 12, 13
+20046: 24, 12, 14
+20047: 24, 12, 15
+20048: 24, 12, 16
+20049: 24, 12, 17
+20050: 24, 13, 0
+20051: 24, 13, 1
+20052: 24, 13, 2
+20053: 24, 13, 3
+20054: 24, 13, 4
+20055: 24, 13, 5
+20056: 24, 13, 6
+20057: 24, 13, 7
+20058: 24, 13, 8
+20059: 24, 13, 9
+20060: 24, 13, 10
+20061: 24, 13, 11
+20062: 24, 13, 12
+20063: 24, 13, 13
+20064: 24, 13, 14
+20065: 24, 13, 15
+20066: 24, 13, 16
+20067: 24, 13, 17
+20068: 24, 13, 18
+20069: 24, 13, 19
+20070: 24, 13, 20
+20071: 24, 13, 21
+20072: 24, 13, 22
+20073: 24, 13, 23
+20074: 24, 13, 24
+20075: 24, 13, 25
+20076: 24, 13, 26
+20077: 24, 13, 27
+20078: 24, 14, 0
+20079: 24, 14, 1
+20080: 24, 14, 2
+20081: 24, 14, 3
+20082: 24, 14, 4
+20083: 24, 14, 5
+20084: 24, 14, 6
+20085: 24, 14, 7
+20086: 24, 14, 8
+20087: 24, 14, 9
+20088: 24, 14, 10
+20089: 24, 14, 11
+20090: 24, 14, 12
+20091: 24, 14, 13
+20092: 24, 14, 14
+20093: 24, 14, 15
+20094: 24, 14, 16
+20095: 24, 14, 17
+20096: 24, 14, 18
+20097: 24, 14, 19
+20098: 24, 14, 20
+20099: 24, 14, 21
+20100: 24, 14, 22
+20101: 24, 15, 0
+20102: 24, 15, 1
+20103: 24, 15, 2
+20104: 24, 15, 3
+20105: 24, 15, 4
+20106: 24, 15, 5
+20107: 24, 15, 6
+20108: 24, 15, 7
+20109: 24, 15, 8
+20110: 24, 15, 9
+20111: 24, 15, 10
+20112: 24, 15, 11
+20113: 24, 15, 12
+20114: 24, 15, 13
+20115: 24, 15, 14
+20116: 24, 15, 15
+20117: 24, 15, 16
+20118: 24, 15, 17
+20119: 24, 15, 18
+20120: 24, 15, 19
+20121: 24, 15, 20
+20122: 24, 15, 21
+20123: 24, 16, 0
+20124: 24, 16, 1
+20125: 24, 16, 2
+20126: 24, 16, 3
+20127: 24, 16, 4
+20128: 24, 16, 5
+20129: 24, 16, 6
+20130: 24, 16, 7
+20131: 24, 16, 8
+20132: 24, 16, 9
+20133: 24, 16, 10
+20134: 24, 16, 11
+20135: 24, 16, 12
+20136: 24, 16, 13
+20137: 24, 16, 14
+20138: 24, 16, 15
+20139: 24, 16, 16
+20140: 24, 16, 17
+20141: 24, 16, 18
+20142: 24, 16, 19
+20143: 24, 16, 20
+20144: 24, 16, 21
+20145: 24, 17, 0
+20146: 24, 17, 1
+20147: 24, 17, 2
+20148: 24, 17, 3
+20149: 24, 17, 4
+20150: 24, 17, 5
+20151: 24, 17, 6
+20152: 24, 17, 7
+20153: 24, 17, 8
+20154: 24, 17, 9
+20155: 24, 17, 10
+20156: 24, 17, 11
+20157: 24, 17, 12
+20158: 24, 17, 13
+20159: 24, 17, 14
+20160: 24, 17, 15
+20161: 24, 17, 16
+20162: 24, 17, 17
+20163: 24, 17, 18
+20164: 24, 17, 19
+20165: 24, 17, 20
+20166: 24, 17, 21
+20167: 24, 17, 22
+20168: 24, 17, 23
+20169: 24, 17, 24
+20170: 24, 17, 25
+20171: 24, 17, 26
+20172: 24, 17, 27
+20173: 24, 18, 0
+20174: 24, 18, 1
+20175: 24, 18, 2
+20176: 24, 18, 3
+20177: 24, 18, 4
+20178: 24, 18, 5
+20179: 24, 18, 6
+20180: 24, 18, 7
+20181: 24, 18, 8
+20182: 24, 18, 9
+20183: 24, 18, 10
+20184: 24, 18, 11
+20185: 24, 18, 12
+20186: 24, 18, 13
+20187: 24, 18, 14
+20188: 24, 18, 15
+20189: 24, 18, 16
+20190: 24, 18, 17
+20191: 24, 18, 18
+20192: 24, 18, 19
+20193: 24, 18, 20
+20194: 24, 18, 21
+20195: 24, 18, 22
+20196: 24, 18, 23
+20197: 24, 19, 0
+20198: 24, 19, 1
+20199: 24, 19, 2
+20200: 24, 19, 3
+20201: 24, 19, 4
+20202: 24, 19, 5
+20203: 24, 19, 6
+20204: 24, 19, 7
+20205: 24, 19, 8
+20206: 24, 19, 9
+20207: 24, 19, 10
+20208: 24, 19, 11
+20209: 24, 19, 12
+20210: 24, 19, 13
+20211: 24, 19, 14
+20212: 24, 19, 15
+20213: 24, 20, 0
+20214: 24, 20, 1
+20215: 24, 20, 2
+20216: 24, 20, 3
+20217: 24, 20, 4
+20218: 24, 20, 5
+20219: 24, 20, 6
+20220: 24, 20, 7
+20221: 24, 20, 8
+20222: 24, 20, 9
+20223: 24, 20, 10
+20224: 24, 20, 11
+20225: 24, 20, 12
+20226: 24, 20, 13
+20227: 24, 20, 14
+20228: 24, 20, 15
+20229: 24, 20, 16
+20230: 24, 20, 17
+20231: 24, 20, 18
+20232: 24, 21, 0
+20233: 24, 21, 1
+20234: 24, 21, 2
+20235: 24, 21, 3
+20236: 24, 21, 4
+20237: 24, 21, 5
+20238: 24, 21, 6
+20239: 24, 21, 7
+20240: 24, 21, 8
+20241: 24, 21, 9
+20242: 24, 21, 10
+20243: 24, 21, 11
+20244: 24, 21, 12
+20245: 24, 21, 13
+20246: 24, 21, 14
+20247: 24, 22, 0
+20248: 24, 22, 1
+20249: 24, 22, 2
+20250: 24, 22, 3
+20251: 24, 22, 4
+20252: 24, 22, 5
+20253: 24, 22, 6
+20254: 24, 22, 7
+20255: 24, 22, 8
+20256: 24, 22, 9
+20257: 24, 22, 10
+20258: 24, 22, 11
+20259: 24, 22, 12
+20260: 24, 22, 13
+20261: 24, 22, 14
+20262: 24, 22, 15
+20263: 24, 22, 16
+20264: 24, 22, 17
+20265: 24, 22, 18
+20266: 24, 22, 19
+20267: 24, 22, 20
+20268: 24, 22, 21
+20269: 24, 22, 22
+20270: 24, 22, 23
+20271: 24, 22, 24
+20272: 24, 22, 25
+20273: 24, 22, 26
+20274: 24, 22, 27
+20275: 24, 22, 28
+20276: 24, 22, 29
+20277: 24, 22, 30
+20278: 24, 23, 0
+20279: 24, 23, 1
+20280: 24, 23, 2
+20281: 24, 23, 3
+20282: 24, 23, 4
+20283: 24, 23, 5
+20284: 24, 23, 6
+20285: 24, 23, 7
+20286: 24, 23, 8
+20287: 24, 23, 9
+20288: 24, 23, 10
+20289: 24, 23, 11
+20290: 24, 23, 12
+20291: 24, 23, 13
+20292: 24, 23, 14
+20293: 24, 23, 15
+20294: 24, 23, 16
+20295: 24, 23, 17
+20296: 24, 23, 18
+20297: 24, 23, 19
+20298: 24, 23, 20
+20299: 24, 23, 21
+20300: 24, 23, 22
+20301: 24, 23, 23
+20302: 24, 23, 24
+20303: 24, 23, 25
+20304: 24, 23, 26
+20305: 24, 23, 27
+20306: 24, 23, 28
+20307: 24, 23, 29
+20308: 24, 23, 30
+20309: 24, 23, 31
+20310: 24, 23, 32
+20311: 24, 23, 33
+20312: 24, 23, 34
+20313: 24, 23, 35
+20314: 24, 23, 36
+20315: 24, 23, 37
+20316: 24, 23, 38
+20317: 24, 23, 39
+20318: 24, 23, 40
+20319: 24, 24, 0
+20320: 24, 24, 1
+20321: 24, 24, 2
+20322: 24, 24, 3
+20323: 24, 24, 4
+20324: 24, 24, 5
+20325: 24, 24, 6
+20326: 24, 24, 7
+20327: 24, 24, 8
+20328: 24, 24, 9
+20329: 24, 24, 10
+20330: 24, 25, 0
+20331: 24, 25, 1
+20332: 24, 25, 2
+20333: 24, 25, 3
+20334: 24, 25, 4
+20335: 24, 25, 5
+20336: 24, 25, 6
+20337: 24, 25, 7
+20338: 24, 25, 8
+20339: 24, 25, 9
+20340: 24, 25, 10
+20341: 24, 25, 11
+20342: 24, 25, 12
+20343: 24, 25, 13
+20344: 24, 25, 14
+20345: 24, 25, 15
+20346: 24, 25, 16
+20347: 24, 25, 17
+20348: 24, 25, 18
+20349: 24, 25, 19
+20350: 24, 25, 20
+20351: 24, 25, 21
+20352: 24, 25, 22
+20353: 24, 25, 23
+20354: 24, 25, 24
+20355: 24, 25, 25
+20356: 24, 25, 26
+20357: 24, 25, 27
+20358: 24, 25, 28
+20359: 24, 25, 29
+20360: 24, 25, 30
+20361: 24, 25, 31
+20362: 24, 25, 32
+20363: 24, 25, 33
+20364: 24, 25, 34
+20365: 24, 25, 35
+20366: 24, 25, 36
+20367: 24, 25, 37
+20368: 24, 25, 38
+20369: 24, 26, 0
+20370: 24, 26, 1
+20371: 24, 26, 2
+20372: 24, 26, 3
+20373: 24, 26, 4
+20374: 24, 26, 5
+20375: 24, 26, 6
+20376: 24, 26, 7
+20377: 24, 26, 8
+20378: 24, 26, 9
+20379: 24, 26, 10
+20380: 24, 26, 11
+20381: 24, 26, 12
+20382: 24, 26, 13
+20383: 24, 26, 14
+20384: 24, 26, 15
+20385: 24, 26, 16
+20386: 24, 26, 17
+20387: 24, 26, 18
+20388: 24, 26, 19
+20389: 24, 26, 20
+20390: 24, 26, 21
+20391: 24, 26, 22
+20392: 24, 26, 23
+20393: 24, 26, 24
+20394: 24, 27, 0
+20395: 24, 27, 1
+20396: 24, 27, 2
+20397: 24, 27, 3
+20398: 24, 27, 4
+20399: 24, 27, 5
+20400: 24, 27, 6
+20401: 24, 27, 7
+20402: 24, 27, 8
+20403: 24, 27, 9
+20404: 24, 27, 10
+20405: 24, 27, 11
+20406: 24, 27, 12
+20407: 24, 27, 13
+20408: 24, 27, 14
+20409: 24, 27, 15
+20410: 24, 27, 16
+20411: 24, 27, 17
+20412: 24, 27, 18
+20413: 24, 27, 19
+20414: 24, 27, 20
+20415: 24, 27, 21
+20416: 24, 27, 22
+20417: 24, 28, 0
+20418: 24, 28, 1
+20419: 24, 28, 2
+20420: 24, 28, 3
+20421: 24, 28, 4
+20422: 24, 28, 5
+20423: 24, 28, 6
+20424: 24, 28, 7
+20425: 24, 28, 8
+20426: 24, 28, 9
+20427: 24, 28, 10
+20428: 24, 28, 11
+20429: 24, 28, 12
+20430: 24, 28, 13
+20431: 24, 28, 14
+20432: 24, 28, 15
+20433: 24, 28, 16
+20434: 24, 28, 17
+20435: 24, 29, 0
+20436: 24, 29, 1
+20437: 24, 29, 2
+20438: 24, 29, 3
+20439: 24, 29, 4
+20440: 24, 29, 5
+20441: 24, 29, 6
+20442: 24, 29, 7
+20443: 24, 29, 8
+20444: 24, 29, 9
+20445: 24, 29, 10
+20446: 24, 29, 11
+20447: 24, 29, 12
+20448: 24, 29, 13
+20449: 24, 29, 14
+20450: 24, 29, 15
+20451: 24, 29, 16
+20452: 24, 29, 17
+20453: 24, 29, 18
+20454: 24, 29, 19
+20455: 24, 29, 20
+20456: 24, 29, 21
+20457: 24, 29, 22
+20458: 24, 29, 23
+20459: 24, 29, 24
+20460: 24, 29, 25
+20461: 24, 29, 26
+20462: 24, 29, 27
+20463: 24, 29, 28
+20464: 24, 29, 29
+20465: 24, 29, 30
+20466: 24, 29, 31
+20467: 24, 29, 32
+20468: 24, 30, 0
+20469: 24, 30, 1
+20470: 24, 30, 2
+20471: 24, 30, 3
+20472: 24, 30, 4
+20473: 24, 30, 5
+20474: 24, 30, 6
+20475: 24, 30, 7
+20476: 24, 30, 8
+20477: 24, 30, 9
+20478: 24, 30, 10
+20479: 24, 30, 11
+20480: 24, 30, 12
+20481: 24, 30, 13
+20482: 24, 30, 14
+20483: 24, 30, 15
+20484: 24, 30, 16
+20485: 24, 30, 17
+20486: 24, 30, 18
+20487: 24, 30, 19
+20488: 24, 30, 20
+20489: 24, 30, 21
+20490: 24, 30, 22
+20491: 24, 30, 23
+20492: 24, 30, 24
+20493: 24, 31, 0
+20494: 24, 31, 1
+20495: 24, 31, 2
+20496: 24, 31, 3
+20497: 24, 31, 4
+20498: 24, 31, 5
+20499: 24, 31, 6
+20500: 24, 31, 7
+20501: 24, 31, 8
+20502: 24, 31, 9
+20503: 24, 31, 10
+20504: 24, 31, 11
+20505: 24, 31, 12
+20506: 24, 31, 13
+20507: 24, 31, 14
+20508: 24, 31, 15
+20509: 24, 31, 16
+20510: 24, 31, 17
+20511: 24, 31, 18
+20512: 24, 31, 19
+20513: 24, 31, 20
+20514: 24, 31, 21
+20515: 24, 31, 22
+20516: 24, 31, 23
+20517: 24, 31, 24
+20518: 24, 31, 25
+20519: 24, 31, 26
+20520: 24, 31, 27
+20521: 24, 31, 28
+20522: 24, 31, 29
+20523: 24, 31, 30
+20524: 24, 31, 31
+20525: 24, 31, 32
+20526: 24, 31, 33
+20527: 24, 31, 34
+20528: 24, 31, 35
+20529: 24, 31, 36
+20530: 24, 31, 37
+20531: 24, 31, 38
+20532: 24, 31, 39
+20533: 24, 31, 40
+20534: 24, 32, 0
+20535: 24, 32, 1
+20536: 24, 32, 2
+20537: 24, 32, 3
+20538: 24, 32, 4
+20539: 24, 32, 5
+20540: 24, 32, 6
+20541: 24, 32, 7
+20542: 24, 32, 8
+20543: 24, 32, 9
+20544: 24, 32, 10
+20545: 24, 32, 11
+20546: 24, 32, 12
+20547: 24, 32, 13
+20548: 24, 32, 14
+20549: 24, 32, 15
+20550: 24, 32, 16
+20551: 24, 32, 17
+20552: 24, 32, 18
+20553: 24, 32, 19
+20554: 24, 32, 20
+20555: 24, 32, 21
+20556: 24, 32, 22
+20557: 24, 32, 23
+20558: 24, 32, 24
+20559: 24, 32, 25
+20560: 24, 32, 26
+20561: 24, 32, 27
+20562: 24, 32, 28
+20563: 24, 32, 29
+20564: 24, 32, 30
+20565: 24, 32, 31
+20566: 24, 32, 32
+20567: 24, 32, 33
+20568: 24, 32, 34
+20569: 24, 32, 35
+20570: 24, 32, 36
+20571: 24, 32, 37
+20572: 24, 32, 38
+20573: 24, 32, 39
+20574: 24, 32, 40
+20575: 24, 32, 41
+20576: 24, 32, 42
+20577: 24, 32, 43
+20578: 24, 32, 44
+20579: 24, 33, 0
+20580: 24, 33, 1
+20581: 24, 33, 2
+20582: 24, 33, 3
+20583: 24, 33, 4
+20584: 24, 33, 5
+20585: 24, 33, 6
+20586: 24, 33, 7
+20587: 24, 33, 8
+20588: 24, 33, 9
+20589: 24, 33, 10
+20590: 24, 33, 11
+20591: 24, 33, 12
+20592: 24, 33, 13
+20593: 24, 33, 14
+20594: 24, 33, 15
+20595: 24, 33, 16
+20596: 24, 33, 17
+20597: 24, 33, 18
+20598: 24, 33, 19
+20599: 24, 33, 20
+20600: 24, 33, 21
+20601: 24, 33, 22
+20602: 24, 33, 23
+20603: 24, 33, 24
+20604: 24, 33, 25
+20605: 24, 33, 26
+20606: 24, 34, 0
+20607: 24, 34, 1
+20608: 24, 34, 2
+20609: 24, 34, 3
+20610: 24, 34, 4
+20611: 24, 34, 5
+20612: 24, 34, 6
+20613: 24, 34, 7
+20614: 24, 34, 8
+20615: 24, 34, 9
+20616: 24, 34, 10
+20617: 24, 34, 11
+20618: 24, 34, 12
+20619: 24, 34, 13
+20620: 24, 34, 14
+20621: 24, 34, 15
+20622: 24, 34, 16
+20623: 24, 34, 17
+20624: 24, 34, 18
+20625: 24, 34, 19
+20626: 24, 34, 20
+20627: 24, 34, 21
+20628: 24, 34, 22
+20629: 24, 35, 0
+20630: 24, 35, 1
+20631: 24, 35, 2
+20632: 24, 35, 3
+20633: 24, 35, 4
+20634: 24, 35, 5
+20635: 24, 35, 6
+20636: 24, 35, 7
+20637: 24, 35, 8
+20638: 24, 35, 9
+20639: 24, 35, 10
+20640: 24, 35, 11
+20641: 24, 35, 12
+20642: 24, 35, 13
+20643: 24, 35, 14
+20644: 24, 35, 15
+20645: 24, 35, 16
+20646: 24, 35, 17
+20647: 24, 35, 18
+20648: 24, 35, 19
+20649: 24, 36, 0
+20650: 24, 36, 1
+20651: 24, 36, 2
+20652: 24, 36, 3
+20653: 24, 36, 4
+20654: 24, 36, 5
+20655: 24, 36, 6
+20656: 24, 36, 7
+20657: 24, 36, 8
+20658: 24, 36, 9
+20659: 24, 36, 10
+20660: 24, 36, 11
+20661: 24, 36, 12
+20662: 24, 36, 13
+20663: 24, 36, 14
+20664: 24, 36, 15
+20665: 24, 36, 16
+20666: 24, 36, 17
+20667: 24, 36, 18
+20668: 24, 36, 19
+20669: 24, 36, 20
+20670: 24, 36, 21
+20671: 24, 36, 22
+20672: 24, 36, 23
+20673: 24, 36, 24
+20674: 24, 36, 25
+20675: 24, 36, 26
+20676: 24, 36, 27
+20677: 24, 36, 28
+20678: 24, 36, 29
+20679: 24, 36, 30
+20680: 24, 36, 31
+20681: 24, 36, 32
+20682: 24, 37, 0
+20683: 24, 37, 1
+20684: 24, 37, 2
+20685: 24, 37, 3
+20686: 24, 37, 4
+20687: 24, 37, 5
+20688: 24, 37, 6
+20689: 24, 37, 7
+20690: 24, 37, 8
+20691: 24, 37, 9
+20692: 24, 37, 10
+20693: 24, 37, 11
+20694: 24, 37, 12
+20695: 24, 37, 13
+20696: 24, 37, 14
+20697: 24, 37, 15
+20698: 24, 37, 16
+20699: 24, 37, 17
+20700: 24, 37, 18
+20701: 24, 37, 19
+20702: 24, 37, 20
+20703: 24, 37, 21
+20704: 24, 38, 0
+20705: 24, 38, 1
+20706: 24, 38, 2
+20707: 24, 38, 3
+20708: 24, 38, 4
+20709: 24, 38, 5
+20710: 24, 38, 6
+20711: 24, 38, 7
+20712: 24, 38, 8
+20713: 24, 38, 9
+20714: 24, 38, 10
+20715: 24, 38, 11
+20716: 24, 38, 12
+20717: 24, 38, 13
+20718: 24, 38, 14
+20719: 24, 38, 15
+20720: 24, 38, 16
+20721: 24, 38, 17
+20722: 24, 38, 18
+20723: 24, 38, 19
+20724: 24, 38, 20
+20725: 24, 38, 21
+20726: 24, 38, 22
+20727: 24, 38, 23
+20728: 24, 38, 24
+20729: 24, 38, 25
+20730: 24, 38, 26
+20731: 24, 38, 27
+20732: 24, 38, 28
+20733: 24, 39, 0
+20734: 24, 39, 1
+20735: 24, 39, 2
+20736: 24, 39, 3
+20737: 24, 39, 4
+20738: 24, 39, 5
+20739: 24, 39, 6
+20740: 24, 39, 7
+20741: 24, 39, 8
+20742: 24, 39, 9
+20743: 24, 39, 10
+20744: 24, 39, 11
+20745: 24, 39, 12
+20746: 24, 39, 13
+20747: 24, 39, 14
+20748: 24, 39, 15
+20749: 24, 39, 16
+20750: 24, 39, 17
+20751: 24, 39, 18
+20752: 24, 40, 0
+20753: 24, 40, 1
+20754: 24, 40, 2
+20755: 24, 40, 3
+20756: 24, 40, 4
+20757: 24, 40, 5
+20758: 24, 40, 6
+20759: 24, 40, 7
+20760: 24, 40, 8
+20761: 24, 40, 9
+20762: 24, 40, 10
+20763: 24, 40, 11
+20764: 24, 40, 12
+20765: 24, 40, 13
+20766: 24, 40, 14
+20767: 24, 40, 15
+20768: 24, 40, 16
+20769: 24, 41, 0
+20770: 24, 41, 1
+20771: 24, 41, 2
+20772: 24, 41, 3
+20773: 24, 41, 4
+20774: 24, 41, 5
+20775: 24, 41, 6
+20776: 24, 41, 7
+20777: 24, 41, 8
+20778: 24, 41, 9
+20779: 24, 41, 10
+20780: 24, 41, 11
+20781: 24, 41, 12
+20782: 24, 41, 13
+20783: 24, 41, 14
+20784: 24, 41, 15
+20785: 24, 41, 16
+20786: 24, 41, 17
+20787: 24, 41, 18
+20788: 24, 42, 0
+20789: 24, 42, 1
+20790: 24, 42, 2
+20791: 24, 42, 3
+20792: 24, 42, 4
+20793: 24, 42, 5
+20794: 24, 42, 6
+20795: 24, 42, 7
+20796: 24, 42, 8
+20797: 24, 42, 9
+20798: 24, 42, 10
+20799: 24, 42, 11
+20800: 24, 42, 12
+20801: 24, 42, 13
+20802: 24, 42, 14
+20803: 24, 42, 15
+20804: 24, 42, 16
+20805: 24, 42, 17
+20806: 24, 42, 18
+20807: 24, 42, 19
+20808: 24, 42, 20
+20809: 24, 42, 21
+20810: 24, 42, 22
+20811: 24, 43, 0
+20812: 24, 43, 1
+20813: 24, 43, 2
+20814: 24, 43, 3
+20815: 24, 43, 4
+20816: 24, 43, 5
+20817: 24, 43, 6
+20818: 24, 43, 7
+20819: 24, 43, 8
+20820: 24, 43, 9
+20821: 24, 43, 10
+20822: 24, 43, 11
+20823: 24, 43, 12
+20824: 24, 43, 13
+20825: 24, 44, 0
+20826: 24, 44, 1
+20827: 24, 44, 2
+20828: 24, 44, 3
+20829: 24, 44, 4
+20830: 24, 44, 5
+20831: 24, 44, 6
+20832: 24, 44, 7
+20833: 24, 44, 8
+20834: 24, 44, 9
+20835: 24, 44, 10
+20836: 24, 44, 11
+20837: 24, 44, 12
+20838: 24, 44, 13
+20839: 24, 44, 14
+20840: 24, 44, 15
+20841: 24, 44, 16
+20842: 24, 44, 17
+20843: 24, 44, 18
+20844: 24, 44, 19
+20845: 24, 44, 20
+20846: 24, 44, 21
+20847: 24, 44, 22
+20848: 24, 44, 23
+20849: 24, 44, 24
+20850: 24, 44, 25
+20851: 24, 44, 26
+20852: 24, 44, 27
+20853: 24, 44, 28
+20854: 24, 44, 29
+20855: 24, 44, 30
+20856: 24, 45, 0
+20857: 24, 45, 1
+20858: 24, 45, 2
+20859: 24, 45, 3
+20860: 24, 45, 4
+20861: 24, 45, 5
+20862: 24, 46, 0
+20863: 24, 46, 1
+20864: 24, 46, 2
+20865: 24, 46, 3
+20866: 24, 46, 4
+20867: 24, 46, 5
+20868: 24, 46, 6
+20869: 24, 46, 7
+20870: 24, 46, 8
+20871: 24, 46, 9
+20872: 24, 46, 10
+20873: 24, 46, 11
+20874: 24, 46, 12
+20875: 24, 46, 13
+20876: 24, 46, 14
+20877: 24, 46, 15
+20878: 24, 46, 16
+20879: 24, 46, 17
+20880: 24, 46, 18
+20881: 24, 46, 19
+20882: 24, 46, 20
+20883: 24, 46, 21
+20884: 24, 46, 22
+20885: 24, 46, 23
+20886: 24, 46, 24
+20887: 24, 46, 25
+20888: 24, 46, 26
+20889: 24, 46, 27
+20890: 24, 46, 28
+20891: 24, 47, 0
+20892: 24, 47, 1
+20893: 24, 47, 2
+20894: 24, 47, 3
+20895: 24, 47, 4
+20896: 24, 47, 5
+20897: 24, 47, 6
+20898: 24, 47, 7
+20899: 24, 48, 0
+20900: 24, 48, 1
+20901: 24, 48, 2
+20902: 24, 48, 3
+20903: 24, 48, 4
+20904: 24, 48, 5
+20905: 24, 48, 6
+20906: 24, 48, 7
+20907: 24, 48, 8
+20908: 24, 48, 9
+20909: 24, 48, 10
+20910: 24, 48, 11
+20911: 24, 48, 12
+20912: 24, 48, 13
+20913: 24, 48, 14
+20914: 24, 48, 15
+20915: 24, 48, 16
+20916: 24, 48, 17
+20917: 24, 48, 18
+20918: 24, 48, 19
+20919: 24, 48, 20
+20920: 24, 48, 21
+20921: 24, 48, 22
+20922: 24, 48, 23
+20923: 24, 48, 24
+20924: 24, 48, 25
+20925: 24, 48, 26
+20926: 24, 48, 27
+20927: 24, 48, 28
+20928: 24, 48, 29
+20929: 24, 48, 30
+20930: 24, 48, 31
+20931: 24, 48, 32
+20932: 24, 48, 33
+20933: 24, 48, 34
+20934: 24, 48, 35
+20935: 24, 48, 36
+20936: 24, 48, 37
+20937: 24, 48, 38
+20938: 24, 48, 39
+20939: 24, 48, 40
+20940: 24, 48, 41
+20941: 24, 48, 42
+20942: 24, 48, 43
+20943: 24, 48, 44
+20944: 24, 48, 45
+20945: 24, 48, 46
+20946: 24, 48, 47
+20947: 24, 49, 0
+20948: 24, 49, 1
+20949: 24, 49, 2
+20950: 24, 49, 3
+20951: 24, 49, 4
+20952: 24, 49, 5
+20953: 24, 49, 6
+20954: 24, 49, 7
+20955: 24, 49, 8
+20956: 24, 49, 9
+20957: 24, 49, 10
+20958: 24, 49, 11
+20959: 24, 49, 12
+20960: 24, 49, 13
+20961: 24, 49, 14
+20962: 24, 49, 15
+20963: 24, 49, 16
+20964: 24, 49, 17
+20965: 24, 49, 18
+20966: 24, 49, 19
+20967: 24, 49, 20
+20968: 24, 49, 21
+20969: 24, 49, 22
+20970: 24, 49, 23
+20971: 24, 49, 24
+20972: 24, 49, 25
+20973: 24, 49, 26
+20974: 24, 49, 27
+20975: 24, 49, 28
+20976: 24, 49, 29
+20977: 24, 49, 30
+20978: 24, 49, 31
+20979: 24, 49, 32
+20980: 24, 49, 33
+20981: 24, 49, 34
+20982: 24, 49, 35
+20983: 24, 49, 36
+20984: 24, 49, 37
+20985: 24, 49, 38
+20986: 24, 49, 39
+20987: 24, 50, 0
+20988: 24, 50, 1
+20989: 24, 50, 2
+20990: 24, 50, 3
+20991: 24, 50, 4
+20992: 24, 50, 5
+20993: 24, 50, 6
+20994: 24, 50, 7
+20995: 24, 50, 8
+20996: 24, 50, 9
+20997: 24, 50, 10
+20998: 24, 50, 11
+20999: 24, 50, 12
+21000: 24, 50, 13
+21001: 24, 50, 14
+21002: 24, 50, 15
+21003: 24, 50, 16
+21004: 24, 50, 17
+21005: 24, 50, 18
+21006: 24, 50, 19
+21007: 24, 50, 20
+21008: 24, 50, 21
+21009: 24, 50, 22
+21010: 24, 50, 23
+21011: 24, 50, 24
+21012: 24, 50, 25
+21013: 24, 50, 26
+21014: 24, 50, 27
+21015: 24, 50, 28
+21016: 24, 50, 29
+21017: 24, 50, 30
+21018: 24, 50, 31
+21019: 24, 50, 32
+21020: 24, 50, 33
+21021: 24, 50, 34
+21022: 24, 50, 35
+21023: 24, 50, 36
+21024: 24, 50, 37
+21025: 24, 50, 38
+21026: 24, 50, 39
+21027: 24, 50, 40
+21028: 24, 50, 41
+21029: 24, 50, 42
+21030: 24, 50, 43
+21031: 24, 50, 44
+21032: 24, 50, 45
+21033: 24, 50, 46
+21034: 24, 51, 0
+21035: 24, 51, 1
+21036: 24, 51, 2
+21037: 24, 51, 3
+21038: 24, 51, 4
+21039: 24, 51, 5
+21040: 24, 51, 6
+21041: 24, 51, 7
+21042: 24, 51, 8
+21043: 24, 51, 9
+21044: 24, 51, 10
+21045: 24, 51, 11
+21046: 24, 51, 12
+21047: 24, 51, 13
+21048: 24, 51, 14
+21049: 24, 51, 15
+21050: 24, 51, 16
+21051: 24, 51, 17
+21052: 24, 51, 18
+21053: 24, 51, 19
+21054: 24, 51, 20
+21055: 24, 51, 21
+21056: 24, 51, 22
+21057: 24, 51, 23
+21058: 24, 51, 24
+21059: 24, 51, 25
+21060: 24, 51, 26
+21061: 24, 51, 27
+21062: 24, 51, 28
+21063: 24, 51, 29
+21064: 24, 51, 30
+21065: 24, 51, 31
+21066: 24, 51, 32
+21067: 24, 51, 33
+21068: 24, 51, 34
+21069: 24, 51, 35
+21070: 24, 51, 36
+21071: 24, 51, 37
+21072: 24, 51, 38
+21073: 24, 51, 39
+21074: 24, 51, 40
+21075: 24, 51, 41
+21076: 24, 51, 42
+21077: 24, 51, 43
+21078: 24, 51, 44
+21079: 24, 51, 45
+21080: 24, 51, 46
+21081: 24, 51, 47
+21082: 24, 51, 48
+21083: 24, 51, 49
+21084: 24, 51, 50
+21085: 24, 51, 51
+21086: 24, 51, 52
+21087: 24, 51, 53
+21088: 24, 51, 54
+21089: 24, 51, 55
+21090: 24, 51, 56
+21091: 24, 51, 57
+21092: 24, 51, 58
+21093: 24, 51, 59
+21094: 24, 51, 60
+21095: 24, 51, 61
+21096: 24, 51, 62
+21097: 24, 51, 63
+21098: 24, 51, 64
+21099: 24, 52, 0
+21100: 24, 52, 1
+21101: 24, 52, 2
+21102: 24, 52, 3
+21103: 24, 52, 4
+21104: 24, 52, 5
+21105: 24, 52, 6
+21106: 24, 52, 7
+21107: 24, 52, 8
+21108: 24, 52, 9
+21109: 24, 52, 10
+21110: 24, 52, 11
+21111: 24, 52, 12
+21112: 24, 52, 13
+21113: 24, 52, 14
+21114: 24, 52, 15
+21115: 24, 52, 16
+21116: 24, 52, 17
+21117: 24, 52, 18
+21118: 24, 52, 19
+21119: 24, 52, 20
+21120: 24, 52, 21
+21121: 24, 52, 22
+21122: 24, 52, 23
+21123: 24, 52, 24
+21124: 24, 52, 25
+21125: 24, 52, 26
+21126: 24, 52, 27
+21127: 24, 52, 28
+21128: 24, 52, 29
+21129: 24, 52, 30
+21130: 24, 52, 31
+21131: 24, 52, 32
+21132: 24, 52, 33
+21133: 24, 52, 34
+21134: 25, 0, 0
+21135: 25, 1, 0
+21136: 25, 1, 1
+21137: 25, 1, 2
+21138: 25, 1, 3
+21139: 25, 1, 4
+21140: 25, 1, 5
+21141: 25, 1, 6
+21142: 25, 1, 7
+21143: 25, 1, 8
+21144: 25, 1, 9
+21145: 25, 1, 10
+21146: 25, 1, 11
+21147: 25, 1, 12
+21148: 25, 1, 13
+21149: 25, 1, 14
+21150: 25, 1, 15
+21151: 25, 1, 16
+21152: 25, 1, 17
+21153: 25, 1, 18
+21154: 25, 1, 19
+21155: 25, 1, 20
+21156: 25, 1, 21
+21157: 25, 1, 22
+21158: 25, 2, 0
+21159: 25, 2, 1
+21160: 25, 2, 2
+21161: 25, 2, 3
+21162: 25, 2, 4
+21163: 25, 2, 5
+21164: 25, 2, 6
+21165: 25, 2, 7
+21166: 25, 2, 8
+21167: 25, 2, 9
+21168: 25, 2, 10
+21169: 25, 2, 11
+21170: 25, 2, 12
+21171: 25, 2, 13
+21172: 25, 2, 14
+21173: 25, 2, 15
+21174: 25, 2, 16
+21175: 25, 2, 17
+21176: 25, 2, 18
+21177: 25, 2, 19
+21178: 25, 2, 20
+21179: 25, 2, 21
+21180: 25, 2, 22
+21181: 25, 3, 0
+21182: 25, 3, 1
+21183: 25, 3, 2
+21184: 25, 3, 3
+21185: 25, 3, 4
+21186: 25, 3, 5
+21187: 25, 3, 6
+21188: 25, 3, 7
+21189: 25, 3, 8
+21190: 25, 3, 9
+21191: 25, 3, 10
+21192: 25, 3, 11
+21193: 25, 3, 12
+21194: 25, 3, 13
+21195: 25, 3, 14
+21196: 25, 3, 15
+21197: 25, 3, 16
+21198: 25, 3, 17
+21199: 25, 3, 18
+21200: 25, 3, 19
+21201: 25, 3, 20
+21202: 25, 3, 21
+21203: 25, 3, 22
+21204: 25, 3, 23
+21205: 25, 3, 24
+21206: 25, 3, 25
+21207: 25, 3, 26
+21208: 25, 3, 27
+21209: 25, 3, 28
+21210: 25, 3, 29
+21211: 25, 3, 30
+21212: 25, 3, 31
+21213: 25, 3, 32
+21214: 25, 3, 33
+21215: 25, 3, 34
+21216: 25, 3, 35
+21217: 25, 3, 36
+21218: 25, 3, 37
+21219: 25, 3, 38
+21220: 25, 3, 39
+21221: 25, 3, 40
+21222: 25, 3, 41
+21223: 25, 3, 42
+21224: 25, 3, 43
+21225: 25, 3, 44
+21226: 25, 3, 45
+21227: 25, 3, 46
+21228: 25, 3, 47
+21229: 25, 3, 48
+21230: 25, 3, 49
+21231: 25, 3, 50
+21232: 25, 3, 51
+21233: 25, 3, 52
+21234: 25, 3, 53
+21235: 25, 3, 54
+21236: 25, 3, 55
+21237: 25, 3, 56
+21238: 25, 3, 57
+21239: 25, 3, 58
+21240: 25, 3, 59
+21241: 25, 3, 60
+21242: 25, 3, 61
+21243: 25, 3, 62
+21244: 25, 3, 63
+21245: 25, 3, 64
+21246: 25, 3, 65
+21247: 25, 3, 66
+21248: 25, 4, 0
+21249: 25, 4, 1
+21250: 25, 4, 2
+21251: 25, 4, 3
+21252: 25, 4, 4
+21253: 25, 4, 5
+21254: 25, 4, 6
+21255: 25, 4, 7
+21256: 25, 4, 8
+21257: 25, 4, 9
+21258: 25, 4, 10
+21259: 25, 4, 11
+21260: 25, 4, 12
+21261: 25, 4, 13
+21262: 25, 4, 14
+21263: 25, 4, 15
+21264: 25, 4, 16
+21265: 25, 4, 17
+21266: 25, 4, 18
+21267: 25, 4, 19
+21268: 25, 4, 20
+21269: 25, 4, 21
+21270: 25, 4, 22
+21271: 25, 5, 0
+21272: 25, 5, 1
+21273: 25, 5, 2
+21274: 25, 5, 3
+21275: 25, 5, 4
+21276: 25, 5, 5
+21277: 25, 5, 6
+21278: 25, 5, 7
+21279: 25, 5, 8
+21280: 25, 5, 9
+21281: 25, 5, 10
+21282: 25, 5, 11
+21283: 25, 5, 12
+21284: 25, 5, 13
+21285: 25, 5, 14
+21286: 25, 5, 15
+21287: 25, 5, 16
+21288: 25, 5, 17
+21289: 25, 5, 18
+21290: 25, 5, 19
+21291: 25, 5, 20
+21292: 25, 5, 21
+21293: 25, 5, 22
+21294: 26, 0, 0
+21295: 26, 1, 0
+21296: 26, 1, 1
+21297: 26, 1, 2
+21298: 26, 1, 3
+21299: 26, 1, 4
+21300: 26, 1, 5
+21301: 26, 1, 6
+21302: 26, 1, 7
+21303: 26, 1, 8
+21304: 26, 1, 9
+21305: 26, 1, 10
+21306: 26, 1, 11
+21307: 26, 1, 12
+21308: 26, 1, 13
+21309: 26, 1, 14
+21310: 26, 1, 15
+21311: 26, 1, 16
+21312: 26, 1, 17
+21313: 26, 1, 18
+21314: 26, 1, 19
+21315: 26, 1, 20
+21316: 26, 1, 21
+21317: 26, 1, 22
+21318: 26, 1, 23
+21319: 26, 1, 24
+21320: 26, 1, 25
+21321: 26, 1, 26
+21322: 26, 1, 27
+21323: 26, 1, 28
+21324: 26, 2, 0
+21325: 26, 2, 1
+21326: 26, 2, 2
+21327: 26, 2, 3
+21328: 26, 2, 4
+21329: 26, 2, 5
+21330: 26, 2, 6
+21331: 26, 2, 7
+21332: 26, 2, 8
+21333: 26, 2, 9
+21334: 26, 2, 10
+21335: 26, 3, 0
+21336: 26, 3, 1
+21337: 26, 3, 2
+21338: 26, 3, 3
+21339: 26, 3, 4
+21340: 26, 3, 5
+21341: 26, 3, 6
+21342: 26, 3, 7
+21343: 26, 3, 8
+21344: 26, 3, 9
+21345: 26, 3, 10
+21346: 26, 3, 11
+21347: 26, 3, 12
+21348: 26, 3, 13
+21349: 26, 3, 14
+21350: 26, 3, 15
+21351: 26, 3, 16
+21352: 26, 3, 17
+21353: 26, 3, 18
+21354: 26, 3, 19
+21355: 26, 3, 20
+21356: 26, 3, 21
+21357: 26, 3, 22
+21358: 26, 3, 23
+21359: 26, 3, 24
+21360: 26, 3, 25
+21361: 26, 3, 26
+21362: 26, 3, 27
+21363: 26, 4, 0
+21364: 26, 4, 1
+21365: 26, 4, 2
+21366: 26, 4, 3
+21367: 26, 4, 4
+21368: 26, 4, 5
+21369: 26, 4, 6
+21370: 26, 4, 7
+21371: 26, 4, 8
+21372: 26, 4, 9
+21373: 26, 4, 10
+21374: 26, 4, 11
+21375: 26, 4, 12
+21376: 26, 4, 13
+21377: 26, 4, 14
+21378: 26, 4, 15
+21379: 26, 4, 16
+21380: 26, 4, 17
+21381: 26, 5, 0
+21382: 26, 5, 1
+21383: 26, 5, 2
+21384: 26, 5, 3
+21385: 26, 5, 4
+21386: 26, 5, 5
+21387: 26, 5, 6
+21388: 26, 5, 7
+21389: 26, 5, 8
+21390: 26, 5, 9
+21391: 26, 5, 10
+21392: 26, 5, 11
+21393: 26, 5, 12
+21394: 26, 5, 13
+21395: 26, 5, 14
+21396: 26, 5, 15
+21397: 26, 5, 16
+21398: 26, 5, 17
+21399: 26, 6, 0
+21400: 26, 6, 1
+21401: 26, 6, 2
+21402: 26, 6, 3
+21403: 26, 6, 4
+21404: 26, 6, 5
+21405: 26, 6, 6
+21406: 26, 6, 7
+21407: 26, 6, 8
+21408: 26, 6, 9
+21409: 26, 6, 10
+21410: 26, 6, 11
+21411: 26, 6, 12
+21412: 26, 6, 13
+21413: 26, 6, 14
+21414: 26, 7, 0
+21415: 26, 7, 1
+21416: 26, 7, 2
+21417: 26, 7, 3
+21418: 26, 7, 4
+21419: 26, 7, 5
+21420: 26, 7, 6
+21421: 26, 7, 7
+21422: 26, 7, 8
+21423: 26, 7, 9
+21424: 26, 7, 10
+21425: 26, 7, 11
+21426: 26, 7, 12
+21427: 26, 7, 13
+21428: 26, 7, 14
+21429: 26, 7, 15
+21430: 26, 7, 16
+21431: 26, 7, 17
+21432: 26, 7, 18
+21433: 26, 7, 19
+21434: 26, 7, 20
+21435: 26, 7, 21
+21436: 26, 7, 22
+21437: 26, 7, 23
+21438: 26, 7, 24
+21439: 26, 7, 25
+21440: 26, 7, 26
+21441: 26, 7, 27
+21442: 26, 8, 0
+21443: 26, 8, 1
+21444: 26, 8, 2
+21445: 26, 8, 3
+21446: 26, 8, 4
+21447: 26, 8, 5
+21448: 26, 8, 6
+21449: 26, 8, 7
+21450: 26, 8, 8
+21451: 26, 8, 9
+21452: 26, 8, 10
+21453: 26, 8, 11
+21454: 26, 8, 12
+21455: 26, 8, 13
+21456: 26, 8, 14
+21457: 26, 8, 15
+21458: 26, 8, 16
+21459: 26, 8, 17
+21460: 26, 8, 18
+21461: 26, 9, 0
+21462: 26, 9, 1
+21463: 26, 9, 2
+21464: 26, 9, 3
+21465: 26, 9, 4
+21466: 26, 9, 5
+21467: 26, 9, 6
+21468: 26, 9, 7
+21469: 26, 9, 8
+21470: 26, 9, 9
+21471: 26, 9, 10
+21472: 26, 9, 11
+21473: 26, 10, 0
+21474: 26, 10, 1
+21475: 26, 10, 2
+21476: 26, 10, 3
+21477: 26, 10, 4
+21478: 26, 10, 5
+21479: 26, 10, 6
+21480: 26, 10, 7
+21481: 26, 10, 8
+21482: 26, 10, 9
+21483: 26, 10, 10
+21484: 26, 10, 11
+21485: 26, 10, 12
+21486: 26, 10, 13
+21487: 26, 10, 14
+21488: 26, 10, 15
+21489: 26, 10, 16
+21490: 26, 10, 17
+21491: 26, 10, 18
+21492: 26, 10, 19
+21493: 26, 10, 20
+21494: 26, 10, 21
+21495: 26, 10, 22
+21496: 26, 11, 0
+21497: 26, 11, 1
+21498: 26, 11, 2
+21499: 26, 11, 3
+21500: 26, 11, 4
+21501: 26, 11, 5
+21502: 26, 11, 6
+21503: 26, 11, 7
+21504: 26, 11, 8
+21505: 26, 11, 9
+21506: 26, 11, 10
+21507: 26, 11, 11
+21508: 26, 11, 12
+21509: 26, 11, 13
+21510: 26, 11, 14
+21511: 26, 11, 15
+21512: 26, 11, 16
+21513: 26, 11, 17
+21514: 26, 11, 18
+21515: 26, 11, 19
+21516: 26, 11, 20
+21517: 26, 11, 21
+21518: 26, 11, 22
+21519: 26, 11, 23
+21520: 26, 11, 24
+21521: 26, 11, 25
+21522: 26, 12, 0
+21523: 26, 12, 1
+21524: 26, 12, 2
+21525: 26, 12, 3
+21526: 26, 12, 4
+21527: 26, 12, 5
+21528: 26, 12, 6
+21529: 26, 12, 7
+21530: 26, 12, 8
+21531: 26, 12, 9
+21532: 26, 12, 10
+21533: 26, 12, 11
+21534: 26, 12, 12
+21535: 26, 12, 13
+21536: 26, 12, 14
+21537: 26, 12, 15
+21538: 26, 12, 16
+21539: 26, 12, 17
+21540: 26, 12, 18
+21541: 26, 12, 19
+21542: 26, 12, 20
+21543: 26, 12, 21
+21544: 26, 12, 22
+21545: 26, 12, 23
+21546: 26, 12, 24
+21547: 26, 12, 25
+21548: 26, 12, 26
+21549: 26, 12, 27
+21550: 26, 12, 28
+21551: 26, 13, 0
+21552: 26, 13, 1
+21553: 26, 13, 2
+21554: 26, 13, 3
+21555: 26, 13, 4
+21556: 26, 13, 5
+21557: 26, 13, 6
+21558: 26, 13, 7
+21559: 26, 13, 8
+21560: 26, 13, 9
+21561: 26, 13, 10
+21562: 26, 13, 11
+21563: 26, 13, 12
+21564: 26, 13, 13
+21565: 26, 13, 14
+21566: 26, 13, 15
+21567: 26, 13, 16
+21568: 26, 13, 17
+21569: 26, 13, 18
+21570: 26, 13, 19
+21571: 26, 13, 20
+21572: 26, 13, 21
+21573: 26, 13, 22
+21574: 26, 13, 23
+21575: 26, 14, 0
+21576: 26, 14, 1
+21577: 26, 14, 2
+21578: 26, 14, 3
+21579: 26, 14, 4
+21580: 26, 14, 5
+21581: 26, 14, 6
+21582: 26, 14, 7
+21583: 26, 14, 8
+21584: 26, 14, 9
+21585: 26, 14, 10
+21586: 26, 14, 11
+21587: 26, 14, 12
+21588: 26, 14, 13
+21589: 26, 14, 14
+21590: 26, 14, 15
+21591: 26, 14, 16
+21592: 26, 14, 17
+21593: 26, 14, 18
+21594: 26, 14, 19
+21595: 26, 14, 20
+21596: 26, 14, 21
+21597: 26, 14, 22
+21598: 26, 14, 23
+21599: 26, 15, 0
+21600: 26, 15, 1
+21601: 26, 15, 2
+21602: 26, 15, 3
+21603: 26, 15, 4
+21604: 26, 15, 5
+21605: 26, 15, 6
+21606: 26, 15, 7
+21607: 26, 15, 8
+21608: 26, 16, 0
+21609: 26, 16, 1
+21610: 26, 16, 2
+21611: 26, 16, 3
+21612: 26, 16, 4
+21613: 26, 16, 5
+21614: 26, 16, 6
+21615: 26, 16, 7
+21616: 26, 16, 8
+21617: 26, 16, 9
+21618: 26, 16, 10
+21619: 26, 16, 11
+21620: 26, 16, 12
+21621: 26, 16, 13
+21622: 26, 16, 14
+21623: 26, 16, 15
+21624: 26, 16, 16
+21625: 26, 16, 17
+21626: 26, 16, 18
+21627: 26, 16, 19
+21628: 26, 16, 20
+21629: 26, 16, 21
+21630: 26, 16, 22
+21631: 26, 16, 23
+21632: 26, 16, 24
+21633: 26, 16, 25
+21634: 26, 16, 26
+21635: 26, 16, 27
+21636: 26, 16, 28
+21637: 26, 16, 29
+21638: 26, 16, 30
+21639: 26, 16, 31
+21640: 26, 16, 32
+21641: 26, 16, 33
+21642: 26, 16, 34
+21643: 26, 16, 35
+21644: 26, 16, 36
+21645: 26, 16, 37
+21646: 26, 16, 38
+21647: 26, 16, 39
+21648: 26, 16, 40
+21649: 26, 16, 41
+21650: 26, 16, 42
+21651: 26, 16, 43
+21652: 26, 16, 44
+21653: 26, 16, 45
+21654: 26, 16, 46
+21655: 26, 16, 47
+21656: 26, 16, 48
+21657: 26, 16, 49
+21658: 26, 16, 50
+21659: 26, 16, 51
+21660: 26, 16, 52
+21661: 26, 16, 53
+21662: 26, 16, 54
+21663: 26, 16, 55
+21664: 26, 16, 56
+21665: 26, 16, 57
+21666: 26, 16, 58
+21667: 26, 16, 59
+21668: 26, 16, 60
+21669: 26, 16, 61
+21670: 26, 16, 62
+21671: 26, 16, 63
+21672: 26, 17, 0
+21673: 26, 17, 1
+21674: 26, 17, 2
+21675: 26, 17, 3
+21676: 26, 17, 4
+21677: 26, 17, 5
+21678: 26, 17, 6
+21679: 26, 17, 7
+21680: 26, 17, 8
+21681: 26, 17, 9
+21682: 26, 17, 10
+21683: 26, 17, 11
+21684: 26, 17, 12
+21685: 26, 17, 13
+21686: 26, 17, 14
+21687: 26, 17, 15
+21688: 26, 17, 16
+21689: 26, 17, 17
+21690: 26, 17, 18
+21691: 26, 17, 19
+21692: 26, 17, 20
+21693: 26, 17, 21
+21694: 26, 17, 22
+21695: 26, 17, 23
+21696: 26, 17, 24
+21697: 26, 18, 0
+21698: 26, 18, 1
+21699: 26, 18, 2
+21700: 26, 18, 3
+21701: 26, 18, 4
+21702: 26, 18, 5
+21703: 26, 18, 6
+21704: 26, 18, 7
+21705: 26, 18, 8
+21706: 26, 18, 9
+21707: 26, 18, 10
+21708: 26, 18, 11
+21709: 26, 18, 12
+21710: 26, 18, 13
+21711: 26, 18, 14
+21712: 26, 18, 15
+21713: 26, 18, 16
+21714: 26, 18, 17
+21715: 26, 18, 18
+21716: 26, 18, 19
+21717: 26, 18, 20
+21718: 26, 18, 21
+21719: 26, 18, 22
+21720: 26, 18, 23
+21721: 26, 18, 24
+21722: 26, 18, 25
+21723: 26, 18, 26
+21724: 26, 18, 27
+21725: 26, 18, 28
+21726: 26, 18, 29
+21727: 26, 18, 30
+21728: 26, 18, 31
+21729: 26, 18, 32
+21730: 26, 19, 0
+21731: 26, 19, 1
+21732: 26, 19, 2
+21733: 26, 19, 3
+21734: 26, 19, 4
+21735: 26, 19, 5
+21736: 26, 19, 6
+21737: 26, 19, 7
+21738: 26, 19, 8
+21739: 26, 19, 9
+21740: 26, 19, 10
+21741: 26, 19, 11
+21742: 26, 19, 12
+21743: 26, 19, 13
+21744: 26, 19, 14
+21745: 26, 20, 0
+21746: 26, 20, 1
+21747: 26, 20, 2
+21748: 26, 20, 3
+21749: 26, 20, 4
+21750: 26, 20, 5
+21751: 26, 20, 6
+21752: 26, 20, 7
+21753: 26, 20, 8
+21754: 26, 20, 9
+21755: 26, 20, 10
+21756: 26, 20, 11
+21757: 26, 20, 12
+21758: 26, 20, 13
+21759: 26, 20, 14
+21760: 26, 20, 15
+21761: 26, 20, 16
+21762: 26, 20, 17
+21763: 26, 20, 18
+21764: 26, 20, 19
+21765: 26, 20, 20
+21766: 26, 20, 21
+21767: 26, 20, 22
+21768: 26, 20, 23
+21769: 26, 20, 24
+21770: 26, 20, 25
+21771: 26, 20, 26
+21772: 26, 20, 27
+21773: 26, 20, 28
+21774: 26, 20, 29
+21775: 26, 20, 30
+21776: 26, 20, 31
+21777: 26, 20, 32
+21778: 26, 20, 33
+21779: 26, 20, 34
+21780: 26, 20, 35
+21781: 26, 20, 36
+21782: 26, 20, 37
+21783: 26, 20, 38
+21784: 26, 20, 39
+21785: 26, 20, 40
+21786: 26, 20, 41
+21787: 26, 20, 42
+21788: 26, 20, 43
+21789: 26, 20, 44
+21790: 26, 20, 45
+21791: 26, 20, 46
+21792: 26, 20, 47
+21793: 26, 20, 48
+21794: 26, 20, 49
+21795: 26, 21, 0
+21796: 26, 21, 1
+21797: 26, 21, 2
+21798: 26, 21, 3
+21799: 26, 21, 4
+21800: 26, 21, 5
+21801: 26, 21, 6
+21802: 26, 21, 7
+21803: 26, 21, 8
+21804: 26, 21, 9
+21805: 26, 21, 10
+21806: 26, 21, 11
+21807: 26, 21, 12
+21808: 26, 21, 13
+21809: 26, 21, 14
+21810: 26, 21, 15
+21811: 26, 21, 16
+21812: 26, 21, 17
+21813: 26, 21, 18
+21814: 26, 21, 19
+21815: 26, 21, 20
+21816: 26, 21, 21
+21817: 26, 21, 22
+21818: 26, 21, 23
+21819: 26, 21, 24
+21820: 26, 21, 25
+21821: 26, 21, 26
+21822: 26, 21, 27
+21823: 26, 21, 28
+21824: 26, 21, 29
+21825: 26, 21, 30
+21826: 26, 21, 31
+21827: 26, 21, 32
+21828: 26, 22, 0
+21829: 26, 22, 1
+21830: 26, 22, 2
+21831: 26, 22, 3
+21832: 26, 22, 4
+21833: 26, 22, 5
+21834: 26, 22, 6
+21835: 26, 22, 7
+21836: 26, 22, 8
+21837: 26, 22, 9
+21838: 26, 22, 10
+21839: 26, 22, 11
+21840: 26, 22, 12
+21841: 26, 22, 13
+21842: 26, 22, 14
+21843: 26, 22, 15
+21844: 26, 22, 16
+21845: 26, 22, 17
+21846: 26, 22, 18
+21847: 26, 22, 19
+21848: 26, 22, 20
+21849: 26, 22, 21
+21850: 26, 22, 22
+21851: 26, 22, 23
+21852: 26, 22, 24
+21853: 26, 22, 25
+21854: 26, 22, 26
+21855: 26, 22, 27
+21856: 26, 22, 28
+21857: 26, 22, 29
+21858: 26, 22, 30
+21859: 26, 22, 31
+21860: 26, 23, 0
+21861: 26, 23, 1
+21862: 26, 23, 2
+21863: 26, 23, 3
+21864: 26, 23, 4
+21865: 26, 23, 5
+21866: 26, 23, 6
+21867: 26, 23, 7
+21868: 26, 23, 8
+21869: 26, 23, 9
+21870: 26, 23, 10
+21871: 26, 23, 11
+21872: 26, 23, 12
+21873: 26, 23, 13
+21874: 26, 23, 14
+21875: 26, 23, 15
+21876: 26, 23, 16
+21877: 26, 23, 17
+21878: 26, 23, 18
+21879: 26, 23, 19
+21880: 26, 23, 20
+21881: 26, 23, 21
+21882: 26, 23, 22
+21883: 26, 23, 23
+21884: 26, 23, 24
+21885: 26, 23, 25
+21886: 26, 23, 26
+21887: 26, 23, 27
+21888: 26, 23, 28
+21889: 26, 23, 29
+21890: 26, 23, 30
+21891: 26, 23, 31
+21892: 26, 23, 32
+21893: 26, 23, 33
+21894: 26, 23, 34
+21895: 26, 23, 35
+21896: 26, 23, 36
+21897: 26, 23, 37
+21898: 26, 23, 38
+21899: 26, 23, 39
+21900: 26, 23, 40
+21901: 26, 23, 41
+21902: 26, 23, 42
+21903: 26, 23, 43
+21904: 26, 23, 44
+21905: 26, 23, 45
+21906: 26, 23, 46
+21907: 26, 23, 47
+21908: 26, 23, 48
+21909: 26, 23, 49
+21910: 26, 24, 0
+21911: 26, 24, 1
+21912: 26, 24, 2
+21913: 26, 24, 3
+21914: 26, 24, 4
+21915: 26, 24, 5
+21916: 26, 24, 6
+21917: 26, 24, 7
+21918: 26, 24, 8
+21919: 26, 24, 9
+21920: 26, 24, 10
+21921: 26, 24, 11
+21922: 26, 24, 12
+21923: 26, 24, 13
+21924: 26, 24, 14
+21925: 26, 24, 15
+21926: 26, 24, 16
+21927: 26, 24, 17
+21928: 26, 24, 18
+21929: 26, 24, 19
+21930: 26, 24, 20
+21931: 26, 24, 21
+21932: 26, 24, 22
+21933: 26, 24, 23
+21934: 26, 24, 24
+21935: 26, 24, 25
+21936: 26, 24, 26
+21937: 26, 24, 27
+21938: 26, 25, 0
+21939: 26, 25, 1
+21940: 26, 25, 2
+21941: 26, 25, 3
+21942: 26, 25, 4
+21943: 26, 25, 5
+21944: 26, 25, 6
+21945: 26, 25, 7
+21946: 26, 25, 8
+21947: 26, 25, 9
+21948: 26, 25, 10
+21949: 26, 25, 11
+21950: 26, 25, 12
+21951: 26, 25, 13
+21952: 26, 25, 14
+21953: 26, 25, 15
+21954: 26, 25, 16
+21955: 26, 25, 17
+21956: 26, 26, 0
+21957: 26, 26, 1
+21958: 26, 26, 2
+21959: 26, 26, 3
+21960: 26, 26, 4
+21961: 26, 26, 5
+21962: 26, 26, 6
+21963: 26, 26, 7
+21964: 26, 26, 8
+21965: 26, 26, 9
+21966: 26, 26, 10
+21967: 26, 26, 11
+21968: 26, 26, 12
+21969: 26, 26, 13
+21970: 26, 26, 14
+21971: 26, 26, 15
+21972: 26, 26, 16
+21973: 26, 26, 17
+21974: 26, 26, 18
+21975: 26, 26, 19
+21976: 26, 26, 20
+21977: 26, 26, 21
+21978: 26, 27, 0
+21979: 26, 27, 1
+21980: 26, 27, 2
+21981: 26, 27, 3
+21982: 26, 27, 4
+21983: 26, 27, 5
+21984: 26, 27, 6
+21985: 26, 27, 7
+21986: 26, 27, 8
+21987: 26, 27, 9
+21988: 26, 27, 10
+21989: 26, 27, 11
+21990: 26, 27, 12
+21991: 26, 27, 13
+21992: 26, 27, 14
+21993: 26, 27, 15
+21994: 26, 27, 16
+21995: 26, 27, 17
+21996: 26, 27, 18
+21997: 26, 27, 19
+21998: 26, 27, 20
+21999: 26, 27, 21
+22000: 26, 27, 22
+22001: 26, 27, 23
+22002: 26, 27, 24
+22003: 26, 27, 25
+22004: 26, 27, 26
+22005: 26, 27, 27
+22006: 26, 27, 28
+22007: 26, 27, 29
+22008: 26, 27, 30
+22009: 26, 27, 31
+22010: 26, 27, 32
+22011: 26, 27, 33
+22012: 26, 27, 34
+22013: 26, 27, 35
+22014: 26, 27, 36
+22015: 26, 28, 0
+22016: 26, 28, 1
+22017: 26, 28, 2
+22018: 26, 28, 3
+22019: 26, 28, 4
+22020: 26, 28, 5
+22021: 26, 28, 6
+22022: 26, 28, 7
+22023: 26, 28, 8
+22024: 26, 28, 9
+22025: 26, 28, 10
+22026: 26, 28, 11
+22027: 26, 28, 12
+22028: 26, 28, 13
+22029: 26, 28, 14
+22030: 26, 28, 15
+22031: 26, 28, 16
+22032: 26, 28, 17
+22033: 26, 28, 18
+22034: 26, 28, 19
+22035: 26, 28, 20
+22036: 26, 28, 21
+22037: 26, 28, 22
+22038: 26, 28, 23
+22039: 26, 28, 24
+22040: 26, 28, 25
+22041: 26, 28, 26
+22042: 26, 29, 0
+22043: 26, 29, 1
+22044: 26, 29, 2
+22045: 26, 29, 3
+22046: 26, 29, 4
+22047: 26, 29, 5
+22048: 26, 29, 6
+22049: 26, 29, 7
+22050: 26, 29, 8
+22051: 26, 29, 9
+22052: 26, 29, 10
+22053: 26, 29, 11
+22054: 26, 29, 12
+22055: 26, 29, 13
+22056: 26, 29, 14
+22057: 26, 29, 15
+22058: 26, 29, 16
+22059: 26, 29, 17
+22060: 26, 29, 18
+22061: 26, 29, 19
+22062: 26, 29, 20
+22063: 26, 29, 21
+22064: 26, 30, 0
+22065: 26, 30, 1
+22066: 26, 30, 2
+22067: 26, 30, 3
+22068: 26, 30, 4
+22069: 26, 30, 5
+22070: 26, 30, 6
+22071: 26, 30, 7
+22072: 26, 30, 8
+22073: 26, 30, 9
+22074: 26, 30, 10
+22075: 26, 30, 11
+22076: 26, 30, 12
+22077: 26, 30, 13
+22078: 26, 30, 14
+22079: 26, 30, 15
+22080: 26, 30, 16
+22081: 26, 30, 17
+22082: 26, 30, 18
+22083: 26, 30, 19
+22084: 26, 30, 20
+22085: 26, 30, 21
+22086: 26, 30, 22
+22087: 26, 30, 23
+22088: 26, 30, 24
+22089: 26, 30, 25
+22090: 26, 30, 26
+22091: 26, 31, 0
+22092: 26, 31, 1
+22093: 26, 31, 2
+22094: 26, 31, 3
+22095: 26, 31, 4
+22096: 26, 31, 5
+22097: 26, 31, 6
+22098: 26, 31, 7
+22099: 26, 31, 8
+22100: 26, 31, 9
+22101: 26, 31, 10
+22102: 26, 31, 11
+22103: 26, 31, 12
+22104: 26, 31, 13
+22105: 26, 31, 14
+22106: 26, 31, 15
+22107: 26, 31, 16
+22108: 26, 31, 17
+22109: 26, 31, 18
+22110: 26, 32, 0
+22111: 26, 32, 1
+22112: 26, 32, 2
+22113: 26, 32, 3
+22114: 26, 32, 4
+22115: 26, 32, 5
+22116: 26, 32, 6
+22117: 26, 32, 7
+22118: 26, 32, 8
+22119: 26, 32, 9
+22120: 26, 32, 10
+22121: 26, 32, 11
+22122: 26, 32, 12
+22123: 26, 32, 13
+22124: 26, 32, 14
+22125: 26, 32, 15
+22126: 26, 32, 16
+22127: 26, 32, 17
+22128: 26, 32, 18
+22129: 26, 32, 19
+22130: 26, 32, 20
+22131: 26, 32, 21
+22132: 26, 32, 22
+22133: 26, 32, 23
+22134: 26, 32, 24
+22135: 26, 32, 25
+22136: 26, 32, 26
+22137: 26, 32, 27
+22138: 26, 32, 28
+22139: 26, 32, 29
+22140: 26, 32, 30
+22141: 26, 32, 31
+22142: 26, 32, 32
+22143: 26, 33, 0
+22144: 26, 33, 1
+22145: 26, 33, 2
+22146: 26, 33, 3
+22147: 26, 33, 4
+22148: 26, 33, 5
+22149: 26, 33, 6
+22150: 26, 33, 7
+22151: 26, 33, 8
+22152: 26, 33, 9
+22153: 26, 33, 10
+22154: 26, 33, 11
+22155: 26, 33, 12
+22156: 26, 33, 13
+22157: 26, 33, 14
+22158: 26, 33, 15
+22159: 26, 33, 16
+22160: 26, 33, 17
+22161: 26, 33, 18
+22162: 26, 33, 19
+22163: 26, 33, 20
+22164: 26, 33, 21
+22165: 26, 33, 22
+22166: 26, 33, 23
+22167: 26, 33, 24
+22168: 26, 33, 25
+22169: 26, 33, 26
+22170: 26, 33, 27
+22171: 26, 33, 28
+22172: 26, 33, 29
+22173: 26, 33, 30
+22174: 26, 33, 31
+22175: 26, 33, 32
+22176: 26, 33, 33
+22177: 26, 34, 0
+22178: 26, 34, 1
+22179: 26, 34, 2
+22180: 26, 34, 3
+22181: 26, 34, 4
+22182: 26, 34, 5
+22183: 26, 34, 6
+22184: 26, 34, 7
+22185: 26, 34, 8
+22186: 26, 34, 9
+22187: 26, 34, 10
+22188: 26, 34, 11
+22189: 26, 34, 12
+22190: 26, 34, 13
+22191: 26, 34, 14
+22192: 26, 34, 15
+22193: 26, 34, 16
+22194: 26, 34, 17
+22195: 26, 34, 18
+22196: 26, 34, 19
+22197: 26, 34, 20
+22198: 26, 34, 21
+22199: 26, 34, 22
+22200: 26, 34, 23
+22201: 26, 34, 24
+22202: 26, 34, 25
+22203: 26, 34, 26
+22204: 26, 34, 27
+22205: 26, 34, 28
+22206: 26, 34, 29
+22207: 26, 34, 30
+22208: 26, 34, 31
+22209: 26, 35, 0
+22210: 26, 35, 1
+22211: 26, 35, 2
+22212: 26, 35, 3
+22213: 26, 35, 4
+22214: 26, 35, 5
+22215: 26, 35, 6
+22216: 26, 35, 7
+22217: 26, 35, 8
+22218: 26, 35, 9
+22219: 26, 35, 10
+22220: 26, 35, 11
+22221: 26, 35, 12
+22222: 26, 35, 13
+22223: 26, 35, 14
+22224: 26, 35, 15
+22225: 26, 36, 0
+22226: 26, 36, 1
+22227: 26, 36, 2
+22228: 26, 36, 3
+22229: 26, 36, 4
+22230: 26, 36, 5
+22231: 26, 36, 6
+22232: 26, 36, 7
+22233: 26, 36, 8
+22234: 26, 36, 9
+22235: 26, 36, 10
+22236: 26, 36, 11
+22237: 26, 36, 12
+22238: 26, 36, 13
+22239: 26, 36, 14
+22240: 26, 36, 15
+22241: 26, 36, 16
+22242: 26, 36, 17
+22243: 26, 36, 18
+22244: 26, 36, 19
+22245: 26, 36, 20
+22246: 26, 36, 21
+22247: 26, 36, 22
+22248: 26, 36, 23
+22249: 26, 36, 24
+22250: 26, 36, 25
+22251: 26, 36, 26
+22252: 26, 36, 27
+22253: 26, 36, 28
+22254: 26, 36, 29
+22255: 26, 36, 30
+22256: 26, 36, 31
+22257: 26, 36, 32
+22258: 26, 36, 33
+22259: 26, 36, 34
+22260: 26, 36, 35
+22261: 26, 36, 36
+22262: 26, 36, 37
+22263: 26, 36, 38
+22264: 26, 37, 0
+22265: 26, 37, 1
+22266: 26, 37, 2
+22267: 26, 37, 3
+22268: 26, 37, 4
+22269: 26, 37, 5
+22270: 26, 37, 6
+22271: 26, 37, 7
+22272: 26, 37, 8
+22273: 26, 37, 9
+22274: 26, 37, 10
+22275: 26, 37, 11
+22276: 26, 37, 12
+22277: 26, 37, 13
+22278: 26, 37, 14
+22279: 26, 37, 15
+22280: 26, 37, 16
+22281: 26, 37, 17
+22282: 26, 37, 18
+22283: 26, 37, 19
+22284: 26, 37, 20
+22285: 26, 37, 21
+22286: 26, 37, 22
+22287: 26, 37, 23
+22288: 26, 37, 24
+22289: 26, 37, 25
+22290: 26, 37, 26
+22291: 26, 37, 27
+22292: 26, 37, 28
+22293: 26, 38, 0
+22294: 26, 38, 1
+22295: 26, 38, 2
+22296: 26, 38, 3
+22297: 26, 38, 4
+22298: 26, 38, 5
+22299: 26, 38, 6
+22300: 26, 38, 7
+22301: 26, 38, 8
+22302: 26, 38, 9
+22303: 26, 38, 10
+22304: 26, 38, 11
+22305: 26, 38, 12
+22306: 26, 38, 13
+22307: 26, 38, 14
+22308: 26, 38, 15
+22309: 26, 38, 16
+22310: 26, 38, 17
+22311: 26, 38, 18
+22312: 26, 38, 19
+22313: 26, 38, 20
+22314: 26, 38, 21
+22315: 26, 38, 22
+22316: 26, 38, 23
+22317: 26, 39, 0
+22318: 26, 39, 1
+22319: 26, 39, 2
+22320: 26, 39, 3
+22321: 26, 39, 4
+22322: 26, 39, 5
+22323: 26, 39, 6
+22324: 26, 39, 7
+22325: 26, 39, 8
+22326: 26, 39, 9
+22327: 26, 39, 10
+22328: 26, 39, 11
+22329: 26, 39, 12
+22330: 26, 39, 13
+22331: 26, 39, 14
+22332: 26, 39, 15
+22333: 26, 39, 16
+22334: 26, 39, 17
+22335: 26, 39, 18
+22336: 26, 39, 19
+22337: 26, 39, 20
+22338: 26, 39, 21
+22339: 26, 39, 22
+22340: 26, 39, 23
+22341: 26, 39, 24
+22342: 26, 39, 25
+22343: 26, 39, 26
+22344: 26, 39, 27
+22345: 26, 39, 28
+22346: 26, 39, 29
+22347: 26, 40, 0
+22348: 26, 40, 1
+22349: 26, 40, 2
+22350: 26, 40, 3
+22351: 26, 40, 4
+22352: 26, 40, 5
+22353: 26, 40, 6
+22354: 26, 40, 7
+22355: 26, 40, 8
+22356: 26, 40, 9
+22357: 26, 40, 10
+22358: 26, 40, 11
+22359: 26, 40, 12
+22360: 26, 40, 13
+22361: 26, 40, 14
+22362: 26, 40, 15
+22363: 26, 40, 16
+22364: 26, 40, 17
+22365: 26, 40, 18
+22366: 26, 40, 19
+22367: 26, 40, 20
+22368: 26, 40, 21
+22369: 26, 40, 22
+22370: 26, 40, 23
+22371: 26, 40, 24
+22372: 26, 40, 25
+22373: 26, 40, 26
+22374: 26, 40, 27
+22375: 26, 40, 28
+22376: 26, 40, 29
+22377: 26, 40, 30
+22378: 26, 40, 31
+22379: 26, 40, 32
+22380: 26, 40, 33
+22381: 26, 40, 34
+22382: 26, 40, 35
+22383: 26, 40, 36
+22384: 26, 40, 37
+22385: 26, 40, 38
+22386: 26, 40, 39
+22387: 26, 40, 40
+22388: 26, 40, 41
+22389: 26, 40, 42
+22390: 26, 40, 43
+22391: 26, 40, 44
+22392: 26, 40, 45
+22393: 26, 40, 46
+22394: 26, 40, 47
+22395: 26, 40, 48
+22396: 26, 40, 49
+22397: 26, 41, 0
+22398: 26, 41, 1
+22399: 26, 41, 2
+22400: 26, 41, 3
+22401: 26, 41, 4
+22402: 26, 41, 5
+22403: 26, 41, 6
+22404: 26, 41, 7
+22405: 26, 41, 8
+22406: 26, 41, 9
+22407: 26, 41, 10
+22408: 26, 41, 11
+22409: 26, 41, 12
+22410: 26, 41, 13
+22411: 26, 41, 14
+22412: 26, 41, 15
+22413: 26, 41, 16
+22414: 26, 41, 17
+22415: 26, 41, 18
+22416: 26, 41, 19
+22417: 26, 41, 20
+22418: 26, 41, 21
+22419: 26, 41, 22
+22420: 26, 41, 23
+22421: 26, 41, 24
+22422: 26, 41, 25
+22423: 26, 41, 26
+22424: 26, 42, 0
+22425: 26, 42, 1
+22426: 26, 42, 2
+22427: 26, 42, 3
+22428: 26, 42, 4
+22429: 26, 42, 5
+22430: 26, 42, 6
+22431: 26, 42, 7
+22432: 26, 42, 8
+22433: 26, 42, 9
+22434: 26, 42, 10
+22435: 26, 42, 11
+22436: 26, 42, 12
+22437: 26, 42, 13
+22438: 26, 42, 14
+22439: 26, 42, 15
+22440: 26, 42, 16
+22441: 26, 42, 17
+22442: 26, 42, 18
+22443: 26, 42, 19
+22444: 26, 42, 20
+22445: 26, 43, 0
+22446: 26, 43, 1
+22447: 26, 43, 2
+22448: 26, 43, 3
+22449: 26, 43, 4
+22450: 26, 43, 5
+22451: 26, 43, 6
+22452: 26, 43, 7
+22453: 26, 43, 8
+22454: 26, 43, 9
+22455: 26, 43, 10
+22456: 26, 43, 11
+22457: 26, 43, 12
+22458: 26, 43, 13
+22459: 26, 43, 14
+22460: 26, 43, 15
+22461: 26, 43, 16
+22462: 26, 43, 17
+22463: 26, 43, 18
+22464: 26, 43, 19
+22465: 26, 43, 20
+22466: 26, 43, 21
+22467: 26, 43, 22
+22468: 26, 43, 23
+22469: 26, 43, 24
+22470: 26, 43, 25
+22471: 26, 43, 26
+22472: 26, 43, 27
+22473: 26, 44, 0
+22474: 26, 44, 1
+22475: 26, 44, 2
+22476: 26, 44, 3
+22477: 26, 44, 4
+22478: 26, 44, 5
+22479: 26, 44, 6
+22480: 26, 44, 7
+22481: 26, 44, 8
+22482: 26, 44, 9
+22483: 26, 44, 10
+22484: 26, 44, 11
+22485: 26, 44, 12
+22486: 26, 44, 13
+22487: 26, 44, 14
+22488: 26, 44, 15
+22489: 26, 44, 16
+22490: 26, 44, 17
+22491: 26, 44, 18
+22492: 26, 44, 19
+22493: 26, 44, 20
+22494: 26, 44, 21
+22495: 26, 44, 22
+22496: 26, 44, 23
+22497: 26, 44, 24
+22498: 26, 44, 25
+22499: 26, 44, 26
+22500: 26, 44, 27
+22501: 26, 44, 28
+22502: 26, 44, 29
+22503: 26, 44, 30
+22504: 26, 44, 31
+22505: 26, 45, 0
+22506: 26, 45, 1
+22507: 26, 45, 2
+22508: 26, 45, 3
+22509: 26, 45, 4
+22510: 26, 45, 5
+22511: 26, 45, 6
+22512: 26, 45, 7
+22513: 26, 45, 8
+22514: 26, 45, 9
+22515: 26, 45, 10
+22516: 26, 45, 11
+22517: 26, 45, 12
+22518: 26, 45, 13
+22519: 26, 45, 14
+22520: 26, 45, 15
+22521: 26, 45, 16
+22522: 26, 45, 17
+22523: 26, 45, 18
+22524: 26, 45, 19
+22525: 26, 45, 20
+22526: 26, 45, 21
+22527: 26, 45, 22
+22528: 26, 45, 23
+22529: 26, 45, 24
+22530: 26, 45, 25
+22531: 26, 46, 0
+22532: 26, 46, 1
+22533: 26, 46, 2
+22534: 26, 46, 3
+22535: 26, 46, 4
+22536: 26, 46, 5
+22537: 26, 46, 6
+22538: 26, 46, 7
+22539: 26, 46, 8
+22540: 26, 46, 9
+22541: 26, 46, 10
+22542: 26, 46, 11
+22543: 26, 46, 12
+22544: 26, 46, 13
+22545: 26, 46, 14
+22546: 26, 46, 15
+22547: 26, 46, 16
+22548: 26, 46, 17
+22549: 26, 46, 18
+22550: 26, 46, 19
+22551: 26, 46, 20
+22552: 26, 46, 21
+22553: 26, 46, 22
+22554: 26, 46, 23
+22555: 26, 46, 24
+22556: 26, 47, 0
+22557: 26, 47, 1
+22558: 26, 47, 2
+22559: 26, 47, 3
+22560: 26, 47, 4
+22561: 26, 47, 5
+22562: 26, 47, 6
+22563: 26, 47, 7
+22564: 26, 47, 8
+22565: 26, 47, 9
+22566: 26, 47, 10
+22567: 26, 47, 11
+22568: 26, 47, 12
+22569: 26, 47, 13
+22570: 26, 47, 14
+22571: 26, 47, 15
+22572: 26, 47, 16
+22573: 26, 47, 17
+22574: 26, 47, 18
+22575: 26, 47, 19
+22576: 26, 47, 20
+22577: 26, 47, 21
+22578: 26, 47, 22
+22579: 26, 47, 23
+22580: 26, 48, 0
+22581: 26, 48, 1
+22582: 26, 48, 2
+22583: 26, 48, 3
+22584: 26, 48, 4
+22585: 26, 48, 5
+22586: 26, 48, 6
+22587: 26, 48, 7
+22588: 26, 48, 8
+22589: 26, 48, 9
+22590: 26, 48, 10
+22591: 26, 48, 11
+22592: 26, 48, 12
+22593: 26, 48, 13
+22594: 26, 48, 14
+22595: 26, 48, 15
+22596: 26, 48, 16
+22597: 26, 48, 17
+22598: 26, 48, 18
+22599: 26, 48, 19
+22600: 26, 48, 20
+22601: 26, 48, 21
+22602: 26, 48, 22
+22603: 26, 48, 23
+22604: 26, 48, 24
+22605: 26, 48, 25
+22606: 26, 48, 26
+22607: 26, 48, 27
+22608: 26, 48, 28
+22609: 26, 48, 29
+22610: 26, 48, 30
+22611: 26, 48, 31
+22612: 26, 48, 32
+22613: 26, 48, 33
+22614: 26, 48, 34
+22615: 26, 48, 35
+22616: 27, 0, 0
+22617: 27, 1, 0
+22618: 27, 1, 1
+22619: 27, 1, 2
+22620: 27, 1, 3
+22621: 27, 1, 4
+22622: 27, 1, 5
+22623: 27, 1, 6
+22624: 27, 1, 7
+22625: 27, 1, 8
+22626: 27, 1, 9
+22627: 27, 1, 10
+22628: 27, 1, 11
+22629: 27, 1, 12
+22630: 27, 1, 13
+22631: 27, 1, 14
+22632: 27, 1, 15
+22633: 27, 1, 16
+22634: 27, 1, 17
+22635: 27, 1, 18
+22636: 27, 1, 19
+22637: 27, 1, 20
+22638: 27, 1, 21
+22639: 27, 2, 0
+22640: 27, 2, 1
+22641: 27, 2, 2
+22642: 27, 2, 3
+22643: 27, 2, 4
+22644: 27, 2, 5
+22645: 27, 2, 6
+22646: 27, 2, 7
+22647: 27, 2, 8
+22648: 27, 2, 9
+22649: 27, 2, 10
+22650: 27, 2, 11
+22651: 27, 2, 12
+22652: 27, 2, 13
+22653: 27, 2, 14
+22654: 27, 2, 15
+22655: 27, 2, 16
+22656: 27, 2, 17
+22657: 27, 2, 18
+22658: 27, 2, 19
+22659: 27, 2, 20
+22660: 27, 2, 21
+22661: 27, 2, 22
+22662: 27, 2, 23
+22663: 27, 2, 24
+22664: 27, 2, 25
+22665: 27, 2, 26
+22666: 27, 2, 27
+22667: 27, 2, 28
+22668: 27, 2, 29
+22669: 27, 2, 30
+22670: 27, 2, 31
+22671: 27, 2, 32
+22672: 27, 2, 33
+22673: 27, 2, 34
+22674: 27, 2, 35
+22675: 27, 2, 36
+22676: 27, 2, 37
+22677: 27, 2, 38
+22678: 27, 2, 39
+22679: 27, 2, 40
+22680: 27, 2, 41
+22681: 27, 2, 42
+22682: 27, 2, 43
+22683: 27, 2, 44
+22684: 27, 2, 45
+22685: 27, 2, 46
+22686: 27, 2, 47
+22687: 27, 2, 48
+22688: 27, 2, 49
+22689: 27, 3, 0
+22690: 27, 3, 1
+22691: 27, 3, 2
+22692: 27, 3, 3
+22693: 27, 3, 4
+22694: 27, 3, 5
+22695: 27, 3, 6
+22696: 27, 3, 7
+22697: 27, 3, 8
+22698: 27, 3, 9
+22699: 27, 3, 10
+22700: 27, 3, 11
+22701: 27, 3, 12
+22702: 27, 3, 13
+22703: 27, 3, 14
+22704: 27, 3, 15
+22705: 27, 3, 16
+22706: 27, 3, 17
+22707: 27, 3, 18
+22708: 27, 3, 19
+22709: 27, 3, 20
+22710: 27, 3, 21
+22711: 27, 3, 22
+22712: 27, 3, 23
+22713: 27, 3, 24
+22714: 27, 3, 25
+22715: 27, 3, 26
+22716: 27, 3, 27
+22717: 27, 3, 28
+22718: 27, 3, 29
+22719: 27, 3, 30
+22720: 27, 4, 0
+22721: 27, 4, 1
+22722: 27, 4, 2
+22723: 27, 4, 3
+22724: 27, 4, 4
+22725: 27, 4, 5
+22726: 27, 4, 6
+22727: 27, 4, 7
+22728: 27, 4, 8
+22729: 27, 4, 9
+22730: 27, 4, 10
+22731: 27, 4, 11
+22732: 27, 4, 12
+22733: 27, 4, 13
+22734: 27, 4, 14
+22735: 27, 4, 15
+22736: 27, 4, 16
+22737: 27, 4, 17
+22738: 27, 4, 18
+22739: 27, 4, 19
+22740: 27, 4, 20
+22741: 27, 4, 21
+22742: 27, 4, 22
+22743: 27, 4, 23
+22744: 27, 4, 24
+22745: 27, 4, 25
+22746: 27, 4, 26
+22747: 27, 4, 27
+22748: 27, 4, 28
+22749: 27, 4, 29
+22750: 27, 4, 30
+22751: 27, 4, 31
+22752: 27, 4, 32
+22753: 27, 4, 33
+22754: 27, 4, 34
+22755: 27, 4, 35
+22756: 27, 4, 36
+22757: 27, 4, 37
+22758: 27, 5, 0
+22759: 27, 5, 1
+22760: 27, 5, 2
+22761: 27, 5, 3
+22762: 27, 5, 4
+22763: 27, 5, 5
+22764: 27, 5, 6
+22765: 27, 5, 7
+22766: 27, 5, 8
+22767: 27, 5, 9
+22768: 27, 5, 10
+22769: 27, 5, 11
+22770: 27, 5, 12
+22771: 27, 5, 13
+22772: 27, 5, 14
+22773: 27, 5, 15
+22774: 27, 5, 16
+22775: 27, 5, 17
+22776: 27, 5, 18
+22777: 27, 5, 19
+22778: 27, 5, 20
+22779: 27, 5, 21
+22780: 27, 5, 22
+22781: 27, 5, 23
+22782: 27, 5, 24
+22783: 27, 5, 25
+22784: 27, 5, 26
+22785: 27, 5, 27
+22786: 27, 5, 28
+22787: 27, 5, 29
+22788: 27, 5, 30
+22789: 27, 5, 31
+22790: 27, 6, 0
+22791: 27, 6, 1
+22792: 27, 6, 2
+22793: 27, 6, 3
+22794: 27, 6, 4
+22795: 27, 6, 5
+22796: 27, 6, 6
+22797: 27, 6, 7
+22798: 27, 6, 8
+22799: 27, 6, 9
+22800: 27, 6, 10
+22801: 27, 6, 11
+22802: 27, 6, 12
+22803: 27, 6, 13
+22804: 27, 6, 14
+22805: 27, 6, 15
+22806: 27, 6, 16
+22807: 27, 6, 17
+22808: 27, 6, 18
+22809: 27, 6, 19
+22810: 27, 6, 20
+22811: 27, 6, 21
+22812: 27, 6, 22
+22813: 27, 6, 23
+22814: 27, 6, 24
+22815: 27, 6, 25
+22816: 27, 6, 26
+22817: 27, 6, 27
+22818: 27, 6, 28
+22819: 27, 7, 0
+22820: 27, 7, 1
+22821: 27, 7, 2
+22822: 27, 7, 3
+22823: 27, 7, 4
+22824: 27, 7, 5
+22825: 27, 7, 6
+22826: 27, 7, 7
+22827: 27, 7, 8
+22828: 27, 7, 9
+22829: 27, 7, 10
+22830: 27, 7, 11
+22831: 27, 7, 12
+22832: 27, 7, 13
+22833: 27, 7, 14
+22834: 27, 7, 15
+22835: 27, 7, 16
+22836: 27, 7, 17
+22837: 27, 7, 18
+22838: 27, 7, 19
+22839: 27, 7, 20
+22840: 27, 7, 21
+22841: 27, 7, 22
+22842: 27, 7, 23
+22843: 27, 7, 24
+22844: 27, 7, 25
+22845: 27, 7, 26
+22846: 27, 7, 27
+22847: 27, 7, 28
+22848: 27, 8, 0
+22849: 27, 8, 1
+22850: 27, 8, 2
+22851: 27, 8, 3
+22852: 27, 8, 4
+22853: 27, 8, 5
+22854: 27, 8, 6
+22855: 27, 8, 7
+22856: 27, 8, 8
+22857: 27, 8, 9
+22858: 27, 8, 10
+22859: 27, 8, 11
+22860: 27, 8, 12
+22861: 27, 8, 13
+22862: 27, 8, 14
+22863: 27, 8, 15
+22864: 27, 8, 16
+22865: 27, 8, 17
+22866: 27, 8, 18
+22867: 27, 8, 19
+22868: 27, 8, 20
+22869: 27, 8, 21
+22870: 27, 8, 22
+22871: 27, 8, 23
+22872: 27, 8, 24
+22873: 27, 8, 25
+22874: 27, 8, 26
+22875: 27, 8, 27
+22876: 27, 9, 0
+22877: 27, 9, 1
+22878: 27, 9, 2
+22879: 27, 9, 3
+22880: 27, 9, 4
+22881: 27, 9, 5
+22882: 27, 9, 6
+22883: 27, 9, 7
+22884: 27, 9, 8
+22885: 27, 9, 9
+22886: 27, 9, 10
+22887: 27, 9, 11
+22888: 27, 9, 12
+22889: 27, 9, 13
+22890: 27, 9, 14
+22891: 27, 9, 15
+22892: 27, 9, 16
+22893: 27, 9, 17
+22894: 27, 9, 18
+22895: 27, 9, 19
+22896: 27, 9, 20
+22897: 27, 9, 21
+22898: 27, 9, 22
+22899: 27, 9, 23
+22900: 27, 9, 24
+22901: 27, 9, 25
+22902: 27, 9, 26
+22903: 27, 9, 27
+22904: 27, 10, 0
+22905: 27, 10, 1
+22906: 27, 10, 2
+22907: 27, 10, 3
+22908: 27, 10, 4
+22909: 27, 10, 5
+22910: 27, 10, 6
+22911: 27, 10, 7
+22912: 27, 10, 8
+22913: 27, 10, 9
+22914: 27, 10, 10
+22915: 27, 10, 11
+22916: 27, 10, 12
+22917: 27, 10, 13
+22918: 27, 10, 14
+22919: 27, 10, 15
+22920: 27, 10, 16
+22921: 27, 10, 17
+22922: 27, 10, 18
+22923: 27, 10, 19
+22924: 27, 10, 20
+22925: 27, 10, 21
+22926: 27, 11, 0
+22927: 27, 11, 1
+22928: 27, 11, 2
+22929: 27, 11, 3
+22930: 27, 11, 4
+22931: 27, 11, 5
+22932: 27, 11, 6
+22933: 27, 11, 7
+22934: 27, 11, 8
+22935: 27, 11, 9
+22936: 27, 11, 10
+22937: 27, 11, 11
+22938: 27, 11, 12
+22939: 27, 11, 13
+22940: 27, 11, 14
+22941: 27, 11, 15
+22942: 27, 11, 16
+22943: 27, 11, 17
+22944: 27, 11, 18
+22945: 27, 11, 19
+22946: 27, 11, 20
+22947: 27, 11, 21
+22948: 27, 11, 22
+22949: 27, 11, 23
+22950: 27, 11, 24
+22951: 27, 11, 25
+22952: 27, 11, 26
+22953: 27, 11, 27
+22954: 27, 11, 28
+22955: 27, 11, 29
+22956: 27, 11, 30
+22957: 27, 11, 31
+22958: 27, 11, 32
+22959: 27, 11, 33
+22960: 27, 11, 34
+22961: 27, 11, 35
+22962: 27, 11, 36
+22963: 27, 11, 37
+22964: 27, 11, 38
+22965: 27, 11, 39
+22966: 27, 11, 40
+22967: 27, 11, 41
+22968: 27, 11, 42
+22969: 27, 11, 43
+22970: 27, 11, 44
+22971: 27, 11, 45
+22972: 27, 12, 0
+22973: 27, 12, 1
+22974: 27, 12, 2
+22975: 27, 12, 3
+22976: 27, 12, 4
+22977: 27, 12, 5
+22978: 27, 12, 6
+22979: 27, 12, 7
+22980: 27, 12, 8
+22981: 27, 12, 9
+22982: 27, 12, 10
+22983: 27, 12, 11
+22984: 27, 12, 12
+22985: 27, 12, 13
+22986: 28, 0, 0
+22987: 28, 1, 0
+22988: 28, 1, 1
+22989: 28, 1, 2
+22990: 28, 1, 3
+22991: 28, 1, 4
+22992: 28, 1, 5
+22993: 28, 1, 6
+22994: 28, 1, 7
+22995: 28, 1, 8
+22996: 28, 1, 9
+22997: 28, 1, 10
+22998: 28, 1, 11
+22999: 28, 2, 0
+23000: 28, 2, 1
+23001: 28, 2, 2
+23002: 28, 2, 3
+23003: 28, 2, 4
+23004: 28, 2, 5
+23005: 28, 2, 6
+23006: 28, 2, 7
+23007: 28, 2, 8
+23008: 28, 2, 9
+23009: 28, 2, 10
+23010: 28, 2, 11
+23011: 28, 2, 12
+23012: 28, 2, 13
+23013: 28, 2, 14
+23014: 28, 2, 15
+23015: 28, 2, 16
+23016: 28, 2, 17
+23017: 28, 2, 18
+23018: 28, 2, 19
+23019: 28, 2, 20
+23020: 28, 2, 21
+23021: 28, 2, 22
+23022: 28, 2, 23
+23023: 28, 3, 0
+23024: 28, 3, 1
+23025: 28, 3, 2
+23026: 28, 3, 3
+23027: 28, 3, 4
+23028: 28, 3, 5
+23029: 28, 4, 0
+23030: 28, 4, 1
+23031: 28, 4, 2
+23032: 28, 4, 3
+23033: 28, 4, 4
+23034: 28, 4, 5
+23035: 28, 4, 6
+23036: 28, 4, 7
+23037: 28, 4, 8
+23038: 28, 4, 9
+23039: 28, 4, 10
+23040: 28, 4, 11
+23041: 28, 4, 12
+23042: 28, 4, 13
+23043: 28, 4, 14
+23044: 28, 4, 15
+23045: 28, 4, 16
+23046: 28, 4, 17
+23047: 28, 4, 18
+23048: 28, 4, 19
+23049: 28, 5, 0
+23050: 28, 5, 1
+23051: 28, 5, 2
+23052: 28, 5, 3
+23053: 28, 5, 4
+23054: 28, 5, 5
+23055: 28, 5, 6
+23056: 28, 5, 7
+23057: 28, 5, 8
+23058: 28, 5, 9
+23059: 28, 5, 10
+23060: 28, 5, 11
+23061: 28, 5, 12
+23062: 28, 5, 13
+23063: 28, 5, 14
+23064: 28, 5, 15
+23065: 28, 6, 0
+23066: 28, 6, 1
+23067: 28, 6, 2
+23068: 28, 6, 3
+23069: 28, 6, 4
+23070: 28, 6, 5
+23071: 28, 6, 6
+23072: 28, 6, 7
+23073: 28, 6, 8
+23074: 28, 6, 9
+23075: 28, 6, 10
+23076: 28, 6, 11
+23077: 28, 7, 0
+23078: 28, 7, 1
+23079: 28, 7, 2
+23080: 28, 7, 3
+23081: 28, 7, 4
+23082: 28, 7, 5
+23083: 28, 7, 6
+23084: 28, 7, 7
+23085: 28, 7, 8
+23086: 28, 7, 9
+23087: 28, 7, 10
+23088: 28, 7, 11
+23089: 28, 7, 12
+23090: 28, 7, 13
+23091: 28, 7, 14
+23092: 28, 7, 15
+23093: 28, 7, 16
+23094: 28, 8, 0
+23095: 28, 8, 1
+23096: 28, 8, 2
+23097: 28, 8, 3
+23098: 28, 8, 4
+23099: 28, 8, 5
+23100: 28, 8, 6
+23101: 28, 8, 7
+23102: 28, 8, 8
+23103: 28, 8, 9
+23104: 28, 8, 10
+23105: 28, 8, 11
+23106: 28, 8, 12
+23107: 28, 8, 13
+23108: 28, 8, 14
+23109: 28, 9, 0
+23110: 28, 9, 1
+23111: 28, 9, 2
+23112: 28, 9, 3
+23113: 28, 9, 4
+23114: 28, 9, 5
+23115: 28, 9, 6
+23116: 28, 9, 7
+23117: 28, 9, 8
+23118: 28, 9, 9
+23119: 28, 9, 10
+23120: 28, 9, 11
+23121: 28, 9, 12
+23122: 28, 9, 13
+23123: 28, 9, 14
+23124: 28, 9, 15
+23125: 28, 9, 16
+23126: 28, 9, 17
+23127: 28, 10, 0
+23128: 28, 10, 1
+23129: 28, 10, 2
+23130: 28, 10, 3
+23131: 28, 10, 4
+23132: 28, 10, 5
+23133: 28, 10, 6
+23134: 28, 10, 7
+23135: 28, 10, 8
+23136: 28, 10, 9
+23137: 28, 10, 10
+23138: 28, 10, 11
+23139: 28, 10, 12
+23140: 28, 10, 13
+23141: 28, 10, 14
+23142: 28, 10, 15
+23143: 28, 11, 0
+23144: 28, 11, 1
+23145: 28, 11, 2
+23146: 28, 11, 3
+23147: 28, 11, 4
+23148: 28, 11, 5
+23149: 28, 11, 6
+23150: 28, 11, 7
+23151: 28, 11, 8
+23152: 28, 11, 9
+23153: 28, 11, 10
+23154: 28, 11, 11
+23155: 28, 11, 12
+23156: 28, 12, 0
+23157: 28, 12, 1
+23158: 28, 12, 2
+23159: 28, 12, 3
+23160: 28, 12, 4
+23161: 28, 12, 5
+23162: 28, 12, 6
+23163: 28, 12, 7
+23164: 28, 12, 8
+23165: 28, 12, 9
+23166: 28, 12, 10
+23167: 28, 12, 11
+23168: 28, 12, 12
+23169: 28, 12, 13
+23170: 28, 12, 14
+23171: 28, 13, 0
+23172: 28, 13, 1
+23173: 28, 13, 2
+23174: 28, 13, 3
+23175: 28, 13, 4
+23176: 28, 13, 5
+23177: 28, 13, 6
+23178: 28, 13, 7
+23179: 28, 13, 8
+23180: 28, 13, 9
+23181: 28, 13, 10
+23182: 28, 13, 11
+23183: 28, 13, 12
+23184: 28, 13, 13
+23185: 28, 13, 14
+23186: 28, 13, 15
+23187: 28, 13, 16
+23188: 28, 14, 0
+23189: 28, 14, 1
+23190: 28, 14, 2
+23191: 28, 14, 3
+23192: 28, 14, 4
+23193: 28, 14, 5
+23194: 28, 14, 6
+23195: 28, 14, 7
+23196: 28, 14, 8
+23197: 28, 14, 9
+23198: 29, 0, 0
+23199: 29, 1, 0
+23200: 29, 1, 1
+23201: 29, 1, 2
+23202: 29, 1, 3
+23203: 29, 1, 4
+23204: 29, 1, 5
+23205: 29, 1, 6
+23206: 29, 1, 7
+23207: 29, 1, 8
+23208: 29, 1, 9
+23209: 29, 1, 10
+23210: 29, 1, 11
+23211: 29, 1, 12
+23212: 29, 1, 13
+23213: 29, 1, 14
+23214: 29, 1, 15
+23215: 29, 1, 16
+23216: 29, 1, 17
+23217: 29, 1, 18
+23218: 29, 1, 19
+23219: 29, 1, 20
+23220: 29, 2, 0
+23221: 29, 2, 1
+23222: 29, 2, 2
+23223: 29, 2, 3
+23224: 29, 2, 4
+23225: 29, 2, 5
+23226: 29, 2, 6
+23227: 29, 2, 7
+23228: 29, 2, 8
+23229: 29, 2, 9
+23230: 29, 2, 10
+23231: 29, 2, 11
+23232: 29, 2, 12
+23233: 29, 2, 13
+23234: 29, 2, 14
+23235: 29, 2, 15
+23236: 29, 2, 16
+23237: 29, 2, 17
+23238: 29, 2, 18
+23239: 29, 2, 19
+23240: 29, 2, 20
+23241: 29, 2, 21
+23242: 29, 2, 22
+23243: 29, 2, 23
+23244: 29, 2, 24
+23245: 29, 2, 25
+23246: 29, 2, 26
+23247: 29, 2, 27
+23248: 29, 2, 28
+23249: 29, 2, 29
+23250: 29, 2, 30
+23251: 29, 2, 31
+23252: 29, 2, 32
+23253: 29, 3, 0
+23254: 29, 3, 1
+23255: 29, 3, 2
+23256: 29, 3, 3
+23257: 29, 3, 4
+23258: 29, 3, 5
+23259: 29, 3, 6
+23260: 29, 3, 7
+23261: 29, 3, 8
+23262: 29, 3, 9
+23263: 29, 3, 10
+23264: 29, 3, 11
+23265: 29, 3, 12
+23266: 29, 3, 13
+23267: 29, 3, 14
+23268: 29, 3, 15
+23269: 29, 3, 16
+23270: 29, 3, 17
+23271: 29, 3, 18
+23272: 29, 3, 19
+23273: 29, 3, 20
+23274: 29, 3, 21
+23275: 30, 0, 0
+23276: 30, 1, 0
+23277: 30, 1, 1
+23278: 30, 1, 2
+23279: 30, 1, 3
+23280: 30, 1, 4
+23281: 30, 1, 5
+23282: 30, 1, 6
+23283: 30, 1, 7
+23284: 30, 1, 8
+23285: 30, 1, 9
+23286: 30, 1, 10
+23287: 30, 1, 11
+23288: 30, 1, 12
+23289: 30, 1, 13
+23290: 30, 1, 14
+23291: 30, 1, 15
+23292: 30, 2, 0
+23293: 30, 2, 1
+23294: 30, 2, 2
+23295: 30, 2, 3
+23296: 30, 2, 4
+23297: 30, 2, 5
+23298: 30, 2, 6
+23299: 30, 2, 7
+23300: 30, 2, 8
+23301: 30, 2, 9
+23302: 30, 2, 10
+23303: 30, 2, 11
+23304: 30, 2, 12
+23305: 30, 2, 13
+23306: 30, 2, 14
+23307: 30, 2, 15
+23308: 30, 2, 16
+23309: 30, 3, 0
+23310: 30, 3, 1
+23311: 30, 3, 2
+23312: 30, 3, 3
+23313: 30, 3, 4
+23314: 30, 3, 5
+23315: 30, 3, 6
+23316: 30, 3, 7
+23317: 30, 3, 8
+23318: 30, 3, 9
+23319: 30, 3, 10
+23320: 30, 3, 11
+23321: 30, 3, 12
+23322: 30, 3, 13
+23323: 30, 3, 14
+23324: 30, 3, 15
+23325: 30, 4, 0
+23326: 30, 4, 1
+23327: 30, 4, 2
+23328: 30, 4, 3
+23329: 30, 4, 4
+23330: 30, 4, 5
+23331: 30, 4, 6
+23332: 30, 4, 7
+23333: 30, 4, 8
+23334: 30, 4, 9
+23335: 30, 4, 10
+23336: 30, 4, 11
+23337: 30, 4, 12
+23338: 30, 4, 13
+23339: 30, 5, 0
+23340: 30, 5, 1
+23341: 30, 5, 2
+23342: 30, 5, 3
+23343: 30, 5, 4
+23344: 30, 5, 5
+23345: 30, 5, 6
+23346: 30, 5, 7
+23347: 30, 5, 8
+23348: 30, 5, 9
+23349: 30, 5, 10
+23350: 30, 5, 11
+23351: 30, 5, 12
+23352: 30, 5, 13
+23353: 30, 5, 14
+23354: 30, 5, 15
+23355: 30, 5, 16
+23356: 30, 5, 17
+23357: 30, 5, 18
+23358: 30, 5, 19
+23359: 30, 5, 20
+23360: 30, 5, 21
+23361: 30, 5, 22
+23362: 30, 5, 23
+23363: 30, 5, 24
+23364: 30, 5, 25
+23365: 30, 5, 26
+23366: 30, 5, 27
+23367: 30, 6, 0
+23368: 30, 6, 1
+23369: 30, 6, 2
+23370: 30, 6, 3
+23371: 30, 6, 4
+23372: 30, 6, 5
+23373: 30, 6, 6
+23374: 30, 6, 7
+23375: 30, 6, 8
+23376: 30, 6, 9
+23377: 30, 6, 10
+23378: 30, 6, 11
+23379: 30, 6, 12
+23380: 30, 6, 13
+23381: 30, 6, 14
+23382: 30, 7, 0
+23383: 30, 7, 1
+23384: 30, 7, 2
+23385: 30, 7, 3
+23386: 30, 7, 4
+23387: 30, 7, 5
+23388: 30, 7, 6
+23389: 30, 7, 7
+23390: 30, 7, 8
+23391: 30, 7, 9
+23392: 30, 7, 10
+23393: 30, 7, 11
+23394: 30, 7, 12
+23395: 30, 7, 13
+23396: 30, 7, 14
+23397: 30, 7, 15
+23398: 30, 7, 16
+23399: 30, 7, 17
+23400: 30, 8, 0
+23401: 30, 8, 1
+23402: 30, 8, 2
+23403: 30, 8, 3
+23404: 30, 8, 4
+23405: 30, 8, 5
+23406: 30, 8, 6
+23407: 30, 8, 7
+23408: 30, 8, 8
+23409: 30, 8, 9
+23410: 30, 8, 10
+23411: 30, 8, 11
+23412: 30, 8, 12
+23413: 30, 8, 13
+23414: 30, 8, 14
+23415: 30, 9, 0
+23416: 30, 9, 1
+23417: 30, 9, 2
+23418: 30, 9, 3
+23419: 30, 9, 4
+23420: 30, 9, 5
+23421: 30, 9, 6
+23422: 30, 9, 7
+23423: 30, 9, 8
+23424: 30, 9, 9
+23425: 30, 9, 10
+23426: 30, 9, 11
+23427: 30, 9, 12
+23428: 30, 9, 13
+23429: 30, 9, 14
+23430: 30, 9, 15
+23431: 31, 0, 0
+23432: 31, 1, 0
+23433: 31, 1, 1
+23434: 31, 1, 2
+23435: 31, 1, 3
+23436: 31, 1, 4
+23437: 31, 1, 5
+23438: 31, 1, 6
+23439: 31, 1, 7
+23440: 31, 1, 8
+23441: 31, 1, 9
+23442: 31, 1, 10
+23443: 31, 1, 11
+23444: 31, 1, 12
+23445: 31, 1, 13
+23446: 31, 1, 14
+23447: 31, 1, 15
+23448: 31, 1, 16
+23449: 31, 1, 17
+23450: 31, 1, 18
+23451: 31, 1, 19
+23452: 31, 1, 20
+23453: 31, 1, 21
+23454: 32, 0, 0
+23455: 32, 1, 0
+23456: 32, 1, 1
+23457: 32, 1, 2
+23458: 32, 1, 3
+23459: 32, 1, 4
+23460: 32, 1, 5
+23461: 32, 1, 6
+23462: 32, 1, 7
+23463: 32, 1, 8
+23464: 32, 1, 9
+23465: 32, 1, 10
+23466: 32, 1, 11
+23467: 32, 1, 12
+23468: 32, 1, 13
+23469: 32, 1, 14
+23470: 32, 1, 15
+23471: 32, 1, 16
+23472: 32, 1, 17
+23473: 32, 2, 0
+23474: 32, 2, 1
+23475: 32, 2, 2
+23476: 32, 2, 3
+23477: 32, 2, 4
+23478: 32, 2, 5
+23479: 32, 2, 6
+23480: 32, 2, 7
+23481: 32, 2, 8
+23482: 32, 2, 9
+23483: 32, 2, 10
+23484: 32, 3, 0
+23485: 32, 3, 1
+23486: 32, 3, 2
+23487: 32, 3, 3
+23488: 32, 3, 4
+23489: 32, 3, 5
+23490: 32, 3, 6
+23491: 32, 3, 7
+23492: 32, 3, 8
+23493: 32, 3, 9
+23494: 32, 3, 10
+23495: 32, 4, 0
+23496: 32, 4, 1
+23497: 32, 4, 2
+23498: 32, 4, 3
+23499: 32, 4, 4
+23500: 32, 4, 5
+23501: 32, 4, 6
+23502: 32, 4, 7
+23503: 32, 4, 8
+23504: 32, 4, 9
+23505: 32, 4, 10
+23506: 32, 4, 11
+23507: 33, 0, 0
+23508: 33, 1, 0
+23509: 33, 1, 1
+23510: 33, 1, 2
+23511: 33, 1, 3
+23512: 33, 1, 4
+23513: 33, 1, 5
+23514: 33, 1, 6
+23515: 33, 1, 7
+23516: 33, 1, 8
+23517: 33, 1, 9
+23518: 33, 1, 10
+23519: 33, 1, 11
+23520: 33, 1, 12
+23521: 33, 1, 13
+23522: 33, 1, 14
+23523: 33, 1, 15
+23524: 33, 1, 16
+23525: 33, 2, 0
+23526: 33, 2, 1
+23527: 33, 2, 2
+23528: 33, 2, 3
+23529: 33, 2, 4
+23530: 33, 2, 5
+23531: 33, 2, 6
+23532: 33, 2, 7
+23533: 33, 2, 8
+23534: 33, 2, 9
+23535: 33, 2, 10
+23536: 33, 2, 11
+23537: 33, 2, 12
+23538: 33, 2, 13
+23539: 33, 3, 0
+23540: 33, 3, 1
+23541: 33, 3, 2
+23542: 33, 3, 3
+23543: 33, 3, 4
+23544: 33, 3, 5
+23545: 33, 3, 6
+23546: 33, 3, 7
+23547: 33, 3, 8
+23548: 33, 3, 9
+23549: 33, 3, 10
+23550: 33, 3, 11
+23551: 33, 3, 12
+23552: 33, 4, 0
+23553: 33, 4, 1
+23554: 33, 4, 2
+23555: 33, 4, 3
+23556: 33, 4, 4
+23557: 33, 4, 5
+23558: 33, 4, 6
+23559: 33, 4, 7
+23560: 33, 4, 8
+23561: 33, 4, 9
+23562: 33, 4, 10
+23563: 33, 4, 11
+23564: 33, 4, 12
+23565: 33, 4, 13
+23566: 33, 5, 0
+23567: 33, 5, 1
+23568: 33, 5, 2
+23569: 33, 5, 3
+23570: 33, 5, 4
+23571: 33, 5, 5
+23572: 33, 5, 6
+23573: 33, 5, 7
+23574: 33, 5, 8
+23575: 33, 5, 9
+23576: 33, 5, 10
+23577: 33, 5, 11
+23578: 33, 5, 12
+23579: 33, 5, 13
+23580: 33, 5, 14
+23581: 33, 5, 15
+23582: 33, 6, 0
+23583: 33, 6, 1
+23584: 33, 6, 2
+23585: 33, 6, 3
+23586: 33, 6, 4
+23587: 33, 6, 5
+23588: 33, 6, 6
+23589: 33, 6, 7
+23590: 33, 6, 8
+23591: 33, 6, 9
+23592: 33, 6, 10
+23593: 33, 6, 11
+23594: 33, 6, 12
+23595: 33, 6, 13
+23596: 33, 6, 14
+23597: 33, 6, 15
+23598: 33, 6, 16
+23599: 33, 7, 0
+23600: 33, 7, 1
+23601: 33, 7, 2
+23602: 33, 7, 3
+23603: 33, 7, 4
+23604: 33, 7, 5
+23605: 33, 7, 6
+23606: 33, 7, 7
+23607: 33, 7, 8
+23608: 33, 7, 9
+23609: 33, 7, 10
+23610: 33, 7, 11
+23611: 33, 7, 12
+23612: 33, 7, 13
+23613: 33, 7, 14
+23614: 33, 7, 15
+23615: 33, 7, 16
+23616: 33, 7, 17
+23617: 33, 7, 18
+23618: 33, 7, 19
+23619: 33, 7, 20
+23620: 34, 0, 0
+23621: 34, 1, 0
+23622: 34, 1, 1
+23623: 34, 1, 2
+23624: 34, 1, 3
+23625: 34, 1, 4
+23626: 34, 1, 5
+23627: 34, 1, 6
+23628: 34, 1, 7
+23629: 34, 1, 8
+23630: 34, 1, 9
+23631: 34, 1, 10
+23632: 34, 1, 11
+23633: 34, 1, 12
+23634: 34, 1, 13
+23635: 34, 1, 14
+23636: 34, 1, 15
+23637: 34, 2, 0
+23638: 34, 2, 1
+23639: 34, 2, 2
+23640: 34, 2, 3
+23641: 34, 2, 4
+23642: 34, 2, 5
+23643: 34, 2, 6
+23644: 34, 2, 7
+23645: 34, 2, 8
+23646: 34, 2, 9
+23647: 34, 2, 10
+23648: 34, 2, 11
+23649: 34, 2, 12
+23650: 34, 2, 13
+23651: 34, 3, 0
+23652: 34, 3, 1
+23653: 34, 3, 2
+23654: 34, 3, 3
+23655: 34, 3, 4
+23656: 34, 3, 5
+23657: 34, 3, 6
+23658: 34, 3, 7
+23659: 34, 3, 8
+23660: 34, 3, 9
+23661: 34, 3, 10
+23662: 34, 3, 11
+23663: 34, 3, 12
+23664: 34, 3, 13
+23665: 34, 3, 14
+23666: 34, 3, 15
+23667: 34, 3, 16
+23668: 34, 3, 17
+23669: 34, 3, 18
+23670: 34, 3, 19
+23671: 35, 0, 0
+23672: 35, 1, 0
+23673: 35, 1, 1
+23674: 35, 1, 2
+23675: 35, 1, 3
+23676: 35, 1, 4
+23677: 35, 1, 5
+23678: 35, 1, 6
+23679: 35, 1, 7
+23680: 35, 1, 8
+23681: 35, 1, 9
+23682: 35, 1, 10
+23683: 35, 1, 11
+23684: 35, 1, 12
+23685: 35, 1, 13
+23686: 35, 1, 14
+23687: 35, 1, 15
+23688: 35, 1, 16
+23689: 35, 1, 17
+23690: 35, 2, 0
+23691: 35, 2, 1
+23692: 35, 2, 2
+23693: 35, 2, 3
+23694: 35, 2, 4
+23695: 35, 2, 5
+23696: 35, 2, 6
+23697: 35, 2, 7
+23698: 35, 2, 8
+23699: 35, 2, 9
+23700: 35, 2, 10
+23701: 35, 2, 11
+23702: 35, 2, 12
+23703: 35, 2, 13
+23704: 35, 2, 14
+23705: 35, 2, 15
+23706: 35, 2, 16
+23707: 35, 2, 17
+23708: 35, 2, 18
+23709: 35, 2, 19
+23710: 35, 2, 20
+23711: 35, 3, 0
+23712: 35, 3, 1
+23713: 35, 3, 2
+23714: 35, 3, 3
+23715: 35, 3, 4
+23716: 35, 3, 5
+23717: 35, 3, 6
+23718: 35, 3, 7
+23719: 35, 3, 8
+23720: 35, 3, 9
+23721: 35, 3, 10
+23722: 35, 3, 11
+23723: 35, 3, 12
+23724: 35, 3, 13
+23725: 35, 3, 14
+23726: 35, 3, 15
+23727: 35, 3, 16
+23728: 35, 3, 17
+23729: 35, 3, 18
+23730: 35, 3, 19
+23731: 36, 0, 0
+23732: 36, 1, 0
+23733: 36, 1, 1
+23734: 36, 1, 2
+23735: 36, 1, 3
+23736: 36, 1, 4
+23737: 36, 1, 5
+23738: 36, 1, 6
+23739: 36, 1, 7
+23740: 36, 1, 8
+23741: 36, 1, 9
+23742: 36, 1, 10
+23743: 36, 1, 11
+23744: 36, 1, 12
+23745: 36, 1, 13
+23746: 36, 1, 14
+23747: 36, 1, 15
+23748: 36, 1, 16
+23749: 36, 1, 17
+23750: 36, 1, 18
+23751: 36, 2, 0
+23752: 36, 2, 1
+23753: 36, 2, 2
+23754: 36, 2, 3
+23755: 36, 2, 4
+23756: 36, 2, 5
+23757: 36, 2, 6
+23758: 36, 2, 7
+23759: 36, 2, 8
+23760: 36, 2, 9
+23761: 36, 2, 10
+23762: 36, 2, 11
+23763: 36, 2, 12
+23764: 36, 2, 13
+23765: 36, 2, 14
+23766: 36, 2, 15
+23767: 36, 3, 0
+23768: 36, 3, 1
+23769: 36, 3, 2
+23770: 36, 3, 3
+23771: 36, 3, 4
+23772: 36, 3, 5
+23773: 36, 3, 6
+23774: 36, 3, 7
+23775: 36, 3, 8
+23776: 36, 3, 9
+23777: 36, 3, 10
+23778: 36, 3, 11
+23779: 36, 3, 12
+23780: 36, 3, 13
+23781: 36, 3, 14
+23782: 36, 3, 15
+23783: 36, 3, 16
+23784: 36, 3, 17
+23785: 36, 3, 18
+23786: 36, 3, 19
+23787: 36, 3, 20
+23788: 37, 0, 0
+23789: 37, 1, 0
+23790: 37, 1, 1
+23791: 37, 1, 2
+23792: 37, 1, 3
+23793: 37, 1, 4
+23794: 37, 1, 5
+23795: 37, 1, 6
+23796: 37, 1, 7
+23797: 37, 1, 8
+23798: 37, 1, 9
+23799: 37, 1, 10
+23800: 37, 1, 11
+23801: 37, 1, 12
+23802: 37, 1, 13
+23803: 37, 1, 14
+23804: 37, 1, 15
+23805: 37, 2, 0
+23806: 37, 2, 1
+23807: 37, 2, 2
+23808: 37, 2, 3
+23809: 37, 2, 4
+23810: 37, 2, 5
+23811: 37, 2, 6
+23812: 37, 2, 7
+23813: 37, 2, 8
+23814: 37, 2, 9
+23815: 37, 2, 10
+23816: 37, 2, 11
+23817: 37, 2, 12
+23818: 37, 2, 13
+23819: 37, 2, 14
+23820: 37, 2, 15
+23821: 37, 2, 16
+23822: 37, 2, 17
+23823: 37, 2, 18
+23824: 37, 2, 19
+23825: 37, 2, 20
+23826: 37, 2, 21
+23827: 37, 2, 22
+23828: 37, 2, 23
+23829: 38, 0, 0
+23830: 38, 1, 0
+23831: 38, 1, 1
+23832: 38, 1, 2
+23833: 38, 1, 3
+23834: 38, 1, 4
+23835: 38, 1, 5
+23836: 38, 1, 6
+23837: 38, 1, 7
+23838: 38, 1, 8
+23839: 38, 1, 9
+23840: 38, 1, 10
+23841: 38, 1, 11
+23842: 38, 1, 12
+23843: 38, 1, 13
+23844: 38, 1, 14
+23845: 38, 1, 15
+23846: 38, 1, 16
+23847: 38, 1, 17
+23848: 38, 1, 18
+23849: 38, 1, 19
+23850: 38, 1, 20
+23851: 38, 1, 21
+23852: 38, 2, 0
+23853: 38, 2, 1
+23854: 38, 2, 2
+23855: 38, 2, 3
+23856: 38, 2, 4
+23857: 38, 2, 5
+23858: 38, 2, 6
+23859: 38, 2, 7
+23860: 38, 2, 8
+23861: 38, 2, 9
+23862: 38, 2, 10
+23863: 38, 2, 11
+23864: 38, 2, 12
+23865: 38, 2, 13
+23866: 38, 3, 0
+23867: 38, 3, 1
+23868: 38, 3, 2
+23869: 38, 3, 3
+23870: 38, 3, 4
+23871: 38, 3, 5
+23872: 38, 3, 6
+23873: 38, 3, 7
+23874: 38, 3, 8
+23875: 38, 3, 9
+23876: 38, 3, 10
+23877: 38, 4, 0
+23878: 38, 4, 1
+23879: 38, 4, 2
+23880: 38, 4, 3
+23881: 38, 4, 4
+23882: 38, 4, 5
+23883: 38, 4, 6
+23884: 38, 4, 7
+23885: 38, 4, 8
+23886: 38, 4, 9
+23887: 38, 4, 10
+23888: 38, 4, 11
+23889: 38, 4, 12
+23890: 38, 4, 13
+23891: 38, 4, 14
+23892: 38, 5, 0
+23893: 38, 5, 1
+23894: 38, 5, 2
+23895: 38, 5, 3
+23896: 38, 5, 4
+23897: 38, 5, 5
+23898: 38, 5, 6
+23899: 38, 5, 7
+23900: 38, 5, 8
+23901: 38, 5, 9
+23902: 38, 5, 10
+23903: 38, 5, 11
+23904: 38, 6, 0
+23905: 38, 6, 1
+23906: 38, 6, 2
+23907: 38, 6, 3
+23908: 38, 6, 4
+23909: 38, 6, 5
+23910: 38, 6, 6
+23911: 38, 6, 7
+23912: 38, 6, 8
+23913: 38, 6, 9
+23914: 38, 6, 10
+23915: 38, 6, 11
+23916: 38, 6, 12
+23917: 38, 6, 13
+23918: 38, 6, 14
+23919: 38, 6, 15
+23920: 38, 7, 0
+23921: 38, 7, 1
+23922: 38, 7, 2
+23923: 38, 7, 3
+23924: 38, 7, 4
+23925: 38, 7, 5
+23926: 38, 7, 6
+23927: 38, 7, 7
+23928: 38, 7, 8
+23929: 38, 7, 9
+23930: 38, 7, 10
+23931: 38, 7, 11
+23932: 38, 7, 12
+23933: 38, 7, 13
+23934: 38, 7, 14
+23935: 38, 8, 0
+23936: 38, 8, 1
+23937: 38, 8, 2
+23938: 38, 8, 3
+23939: 38, 8, 4
+23940: 38, 8, 5
+23941: 38, 8, 6
+23942: 38, 8, 7
+23943: 38, 8, 8
+23944: 38, 8, 9
+23945: 38, 8, 10
+23946: 38, 8, 11
+23947: 38, 8, 12
+23948: 38, 8, 13
+23949: 38, 8, 14
+23950: 38, 8, 15
+23951: 38, 8, 16
+23952: 38, 8, 17
+23953: 38, 8, 18
+23954: 38, 8, 19
+23955: 38, 8, 20
+23956: 38, 8, 21
+23957: 38, 8, 22
+23958: 38, 8, 23
+23959: 38, 9, 0
+23960: 38, 9, 1
+23961: 38, 9, 2
+23962: 38, 9, 3
+23963: 38, 9, 4
+23964: 38, 9, 5
+23965: 38, 9, 6
+23966: 38, 9, 7
+23967: 38, 9, 8
+23968: 38, 9, 9
+23969: 38, 9, 10
+23970: 38, 9, 11
+23971: 38, 9, 12
+23972: 38, 9, 13
+23973: 38, 9, 14
+23974: 38, 9, 15
+23975: 38, 9, 16
+23976: 38, 9, 17
+23977: 38, 10, 0
+23978: 38, 10, 1
+23979: 38, 10, 2
+23980: 38, 10, 3
+23981: 38, 10, 4
+23982: 38, 10, 5
+23983: 38, 10, 6
+23984: 38, 10, 7
+23985: 38, 10, 8
+23986: 38, 10, 9
+23987: 38, 10, 10
+23988: 38, 10, 11
+23989: 38, 10, 12
+23990: 38, 11, 0
+23991: 38, 11, 1
+23992: 38, 11, 2
+23993: 38, 11, 3
+23994: 38, 11, 4
+23995: 38, 11, 5
+23996: 38, 11, 6
+23997: 38, 11, 7
+23998: 38, 11, 8
+23999: 38, 11, 9
+24000: 38, 11, 10
+24001: 38, 11, 11
+24002: 38, 11, 12
+24003: 38, 11, 13
+24004: 38, 11, 14
+24005: 38, 11, 15
+24006: 38, 11, 16
+24007: 38, 11, 17
+24008: 38, 12, 0
+24009: 38, 12, 1
+24010: 38, 12, 2
+24011: 38, 12, 3
+24012: 38, 12, 4
+24013: 38, 12, 5
+24014: 38, 12, 6
+24015: 38, 12, 7
+24016: 38, 12, 8
+24017: 38, 12, 9
+24018: 38, 12, 10
+24019: 38, 12, 11
+24020: 38, 12, 12
+24021: 38, 12, 13
+24022: 38, 12, 14
+24023: 38, 13, 0
+24024: 38, 13, 1
+24025: 38, 13, 2
+24026: 38, 13, 3
+24027: 38, 13, 4
+24028: 38, 13, 5
+24029: 38, 13, 6
+24030: 38, 13, 7
+24031: 38, 13, 8
+24032: 38, 13, 9
+24033: 38, 14, 0
+24034: 38, 14, 1
+24035: 38, 14, 2
+24036: 38, 14, 3
+24037: 38, 14, 4
+24038: 38, 14, 5
+24039: 38, 14, 6
+24040: 38, 14, 7
+24041: 38, 14, 8
+24042: 38, 14, 9
+24043: 38, 14, 10
+24044: 38, 14, 11
+24045: 38, 14, 12
+24046: 38, 14, 13
+24047: 38, 14, 14
+24048: 38, 14, 15
+24049: 38, 14, 16
+24050: 38, 14, 17
+24051: 38, 14, 18
+24052: 38, 14, 19
+24053: 38, 14, 20
+24054: 38, 14, 21
+24055: 39, 0, 0
+24056: 39, 1, 0
+24057: 39, 1, 1
+24058: 39, 1, 2
+24059: 39, 1, 3
+24060: 39, 1, 4
+24061: 39, 1, 5
+24062: 39, 1, 6
+24063: 39, 1, 7
+24064: 39, 1, 8
+24065: 39, 1, 9
+24066: 39, 1, 10
+24067: 39, 1, 11
+24068: 39, 1, 12
+24069: 39, 1, 13
+24070: 39, 1, 14
+24071: 39, 2, 0
+24072: 39, 2, 1
+24073: 39, 2, 2
+24074: 39, 2, 3
+24075: 39, 2, 4
+24076: 39, 2, 5
+24077: 39, 2, 6
+24078: 39, 2, 7
+24079: 39, 2, 8
+24080: 39, 2, 9
+24081: 39, 2, 10
+24082: 39, 2, 11
+24083: 39, 2, 12
+24084: 39, 2, 13
+24085: 39, 2, 14
+24086: 39, 2, 15
+24087: 39, 2, 16
+24088: 39, 2, 17
+24089: 39, 3, 0
+24090: 39, 3, 1
+24091: 39, 3, 2
+24092: 39, 3, 3
+24093: 39, 3, 4
+24094: 39, 3, 5
+24095: 39, 3, 6
+24096: 39, 3, 7
+24097: 39, 3, 8
+24098: 39, 3, 9
+24099: 39, 3, 10
+24100: 39, 3, 11
+24101: 39, 3, 12
+24102: 39, 3, 13
+24103: 39, 3, 14
+24104: 39, 3, 15
+24105: 39, 3, 16
+24106: 39, 3, 17
+24107: 39, 3, 18
+24108: 39, 4, 0
+24109: 39, 4, 1
+24110: 39, 4, 2
+24111: 39, 4, 3
+24112: 39, 4, 4
+24113: 39, 4, 5
+24114: 39, 4, 6
+24115: 40, -1, 0
+24116: 40, 0, 0
+24117: 40, 1, 0
+24118: 40, 1, 1
+24119: 40, 1, 2
+24120: 40, 1, 3
+24121: 40, 1, 4
+24122: 40, 1, 5
+24123: 40, 1, 6
+24124: 40, 1, 7
+24125: 40, 1, 8
+24126: 40, 1, 9
+24127: 40, 1, 10
+24128: 40, 1, 11
+24129: 40, 1, 12
+24130: 40, 1, 13
+24131: 40, 1, 14
+24132: 40, 1, 15
+24133: 40, 1, 16
+24134: 40, 1, 17
+24135: 40, 1, 18
+24136: 40, 1, 19
+24137: 40, 1, 20
+24138: 40, 1, 21
+24139: 40, 1, 22
+24140: 40, 1, 23
+24141: 40, 1, 24
+24142: 40, 1, 25
+24143: 40, 2, 0
+24144: 40, 2, 1
+24145: 40, 2, 2
+24146: 40, 2, 3
+24147: 40, 2, 4
+24148: 40, 2, 5
+24149: 40, 2, 6
+24150: 40, 2, 7
+24151: 40, 2, 8
+24152: 40, 2, 9
+24153: 40, 2, 10
+24154: 40, 2, 11
+24155: 40, 2, 12
+24156: 40, 2, 13
+24157: 40, 2, 14
+24158: 40, 2, 15
+24159: 40, 2, 16
+24160: 40, 2, 17
+24161: 40, 2, 18
+24162: 40, 2, 19
+24163: 40, 2, 20
+24164: 40, 2, 21
+24165: 40, 2, 22
+24166: 40, 2, 23
+24167: 40, 3, 0
+24168: 40, 3, 1
+24169: 40, 3, 2
+24170: 40, 3, 3
+24171: 40, 3, 4
+24172: 40, 3, 5
+24173: 40, 3, 6
+24174: 40, 3, 7
+24175: 40, 3, 8
+24176: 40, 3, 9
+24177: 40, 3, 10
+24178: 40, 3, 11
+24179: 40, 3, 12
+24180: 40, 3, 13
+24181: 40, 3, 14
+24182: 40, 3, 15
+24183: 40, 3, 16
+24184: 40, 3, 17
+24185: 40, 4, 0
+24186: 40, 4, 1
+24187: 40, 4, 2
+24188: 40, 4, 3
+24189: 40, 4, 4
+24190: 40, 4, 5
+24191: 40, 4, 6
+24192: 40, 4, 7
+24193: 40, 4, 8
+24194: 40, 4, 9
+24195: 40, 4, 10
+24196: 40, 4, 11
+24197: 40, 4, 12
+24198: 40, 4, 13
+24199: 40, 4, 14
+24200: 40, 4, 15
+24201: 40, 4, 16
+24202: 40, 4, 17
+24203: 40, 4, 18
+24204: 40, 4, 19
+24205: 40, 4, 20
+24206: 40, 4, 21
+24207: 40, 4, 22
+24208: 40, 4, 23
+24209: 40, 4, 24
+24210: 40, 4, 25
+24211: 40, 5, 0
+24212: 40, 5, 1
+24213: 40, 5, 2
+24214: 40, 5, 3
+24215: 40, 5, 4
+24216: 40, 5, 5
+24217: 40, 5, 6
+24218: 40, 5, 7
+24219: 40, 5, 8
+24220: 40, 5, 9
+24221: 40, 5, 10
+24222: 40, 5, 11
+24223: 40, 5, 12
+24224: 40, 5, 13
+24225: 40, 5, 14
+24226: 40, 5, 15
+24227: 40, 5, 16
+24228: 40, 5, 17
+24229: 40, 5, 18
+24230: 40, 5, 19
+24231: 40, 5, 20
+24232: 40, 5, 21
+24233: 40, 5, 22
+24234: 40, 5, 23
+24235: 40, 5, 24
+24236: 40, 5, 25
+24237: 40, 5, 26
+24238: 40, 5, 27
+24239: 40, 5, 28
+24240: 40, 5, 29
+24241: 40, 5, 30
+24242: 40, 5, 31
+24243: 40, 5, 32
+24244: 40, 5, 33
+24245: 40, 5, 34
+24246: 40, 5, 35
+24247: 40, 5, 36
+24248: 40, 5, 37
+24249: 40, 5, 38
+24250: 40, 5, 39
+24251: 40, 5, 40
+24252: 40, 5, 41
+24253: 40, 5, 42
+24254: 40, 5, 43
+24255: 40, 5, 44
+24256: 40, 5, 45
+24257: 40, 5, 46
+24258: 40, 5, 47
+24259: 40, 5, 48
+24260: 40, 6, 0
+24261: 40, 6, 1
+24262: 40, 6, 2
+24263: 40, 6, 3
+24264: 40, 6, 4
+24265: 40, 6, 5
+24266: 40, 6, 6
+24267: 40, 6, 7
+24268: 40, 6, 8
+24269: 40, 6, 9
+24270: 40, 6, 10
+24271: 40, 6, 11
+24272: 40, 6, 12
+24273: 40, 6, 13
+24274: 40, 6, 14
+24275: 40, 6, 15
+24276: 40, 6, 16
+24277: 40, 6, 17
+24278: 40, 6, 18
+24279: 40, 6, 19
+24280: 40, 6, 20
+24281: 40, 6, 21
+24282: 40, 6, 22
+24283: 40, 6, 23
+24284: 40, 6, 24
+24285: 40, 6, 25
+24286: 40, 6, 26
+24287: 40, 6, 27
+24288: 40, 6, 28
+24289: 40, 6, 29
+24290: 40, 6, 30
+24291: 40, 6, 31
+24292: 40, 6, 32
+24293: 40, 6, 33
+24294: 40, 6, 34
+24295: 40, 7, 0
+24296: 40, 7, 1
+24297: 40, 7, 2
+24298: 40, 7, 3
+24299: 40, 7, 4
+24300: 40, 7, 5
+24301: 40, 7, 6
+24302: 40, 7, 7
+24303: 40, 7, 8
+24304: 40, 7, 9
+24305: 40, 7, 10
+24306: 40, 7, 11
+24307: 40, 7, 12
+24308: 40, 7, 13
+24309: 40, 7, 14
+24310: 40, 7, 15
+24311: 40, 7, 16
+24312: 40, 7, 17
+24313: 40, 7, 18
+24314: 40, 7, 19
+24315: 40, 7, 20
+24316: 40, 7, 21
+24317: 40, 7, 22
+24318: 40, 7, 23
+24319: 40, 7, 24
+24320: 40, 7, 25
+24321: 40, 7, 26
+24322: 40, 7, 27
+24323: 40, 7, 28
+24324: 40, 7, 29
+24325: 40, 8, 0
+24326: 40, 8, 1
+24327: 40, 8, 2
+24328: 40, 8, 3
+24329: 40, 8, 4
+24330: 40, 8, 5
+24331: 40, 8, 6
+24332: 40, 8, 7
+24333: 40, 8, 8
+24334: 40, 8, 9
+24335: 40, 8, 10
+24336: 40, 8, 11
+24337: 40, 8, 12
+24338: 40, 8, 13
+24339: 40, 8, 14
+24340: 40, 8, 15
+24341: 40, 8, 16
+24342: 40, 8, 17
+24343: 40, 8, 18
+24344: 40, 8, 19
+24345: 40, 8, 20
+24346: 40, 8, 21
+24347: 40, 8, 22
+24348: 40, 8, 23
+24349: 40, 8, 24
+24350: 40, 8, 25
+24351: 40, 8, 26
+24352: 40, 8, 27
+24353: 40, 8, 28
+24354: 40, 8, 29
+24355: 40, 8, 30
+24356: 40, 8, 31
+24357: 40, 8, 32
+24358: 40, 8, 33
+24359: 40, 8, 34
+24360: 40, 9, 0
+24361: 40, 9, 1
+24362: 40, 9, 2
+24363: 40, 9, 3
+24364: 40, 9, 4
+24365: 40, 9, 5
+24366: 40, 9, 6
+24367: 40, 9, 7
+24368: 40, 9, 8
+24369: 40, 9, 9
+24370: 40, 9, 10
+24371: 40, 9, 11
+24372: 40, 9, 12
+24373: 40, 9, 13
+24374: 40, 9, 14
+24375: 40, 9, 15
+24376: 40, 9, 16
+24377: 40, 9, 17
+24378: 40, 9, 18
+24379: 40, 9, 19
+24380: 40, 9, 20
+24381: 40, 9, 21
+24382: 40, 9, 22
+24383: 40, 9, 23
+24384: 40, 9, 24
+24385: 40, 9, 25
+24386: 40, 9, 26
+24387: 40, 9, 27
+24388: 40, 9, 28
+24389: 40, 9, 29
+24390: 40, 9, 30
+24391: 40, 9, 31
+24392: 40, 9, 32
+24393: 40, 9, 33
+24394: 40, 9, 34
+24395: 40, 9, 35
+24396: 40, 9, 36
+24397: 40, 9, 37
+24398: 40, 9, 38
+24399: 40, 10, 0
+24400: 40, 10, 1
+24401: 40, 10, 2
+24402: 40, 10, 3
+24403: 40, 10, 4
+24404: 40, 10, 5
+24405: 40, 10, 6
+24406: 40, 10, 7
+24407: 40, 10, 8
+24408: 40, 10, 9
+24409: 40, 10, 10
+24410: 40, 10, 11
+24411: 40, 10, 12
+24412: 40, 10, 13
+24413: 40, 10, 14
+24414: 40, 10, 15
+24415: 40, 10, 16
+24416: 40, 10, 17
+24417: 40, 10, 18
+24418: 40, 10, 19
+24419: 40, 10, 20
+24420: 40, 10, 21
+24421: 40, 10, 22
+24422: 40, 10, 23
+24423: 40, 10, 24
+24424: 40, 10, 25
+24425: 40, 10, 26
+24426: 40, 10, 27
+24427: 40, 10, 28
+24428: 40, 10, 29
+24429: 40, 10, 30
+24430: 40, 10, 31
+24431: 40, 10, 32
+24432: 40, 10, 33
+24433: 40, 10, 34
+24434: 40, 10, 35
+24435: 40, 10, 36
+24436: 40, 10, 37
+24437: 40, 10, 38
+24438: 40, 10, 39
+24439: 40, 10, 40
+24440: 40, 10, 41
+24441: 40, 10, 42
+24442: 40, 11, 0
+24443: 40, 11, 1
+24444: 40, 11, 2
+24445: 40, 11, 3
+24446: 40, 11, 4
+24447: 40, 11, 5
+24448: 40, 11, 6
+24449: 40, 11, 7
+24450: 40, 11, 8
+24451: 40, 11, 9
+24452: 40, 11, 10
+24453: 40, 11, 11
+24454: 40, 11, 12
+24455: 40, 11, 13
+24456: 40, 11, 14
+24457: 40, 11, 15
+24458: 40, 11, 16
+24459: 40, 11, 17
+24460: 40, 11, 18
+24461: 40, 11, 19
+24462: 40, 11, 20
+24463: 40, 11, 21
+24464: 40, 11, 22
+24465: 40, 11, 23
+24466: 40, 11, 24
+24467: 40, 11, 25
+24468: 40, 11, 26
+24469: 40, 11, 27
+24470: 40, 11, 28
+24471: 40, 11, 29
+24472: 40, 11, 30
+24473: 40, 12, 0
+24474: 40, 12, 1
+24475: 40, 12, 2
+24476: 40, 12, 3
+24477: 40, 12, 4
+24478: 40, 12, 5
+24479: 40, 12, 6
+24480: 40, 12, 7
+24481: 40, 12, 8
+24482: 40, 12, 9
+24483: 40, 12, 10
+24484: 40, 12, 11
+24485: 40, 12, 12
+24486: 40, 12, 13
+24487: 40, 12, 14
+24488: 40, 12, 15
+24489: 40, 12, 16
+24490: 40, 12, 17
+24491: 40, 12, 18
+24492: 40, 12, 19
+24493: 40, 12, 20
+24494: 40, 12, 21
+24495: 40, 12, 22
+24496: 40, 12, 23
+24497: 40, 12, 24
+24498: 40, 12, 25
+24499: 40, 12, 26
+24500: 40, 12, 27
+24501: 40, 12, 28
+24502: 40, 12, 29
+24503: 40, 12, 30
+24504: 40, 12, 31
+24505: 40, 12, 32
+24506: 40, 12, 33
+24507: 40, 12, 34
+24508: 40, 12, 35
+24509: 40, 12, 36
+24510: 40, 12, 37
+24511: 40, 12, 38
+24512: 40, 12, 39
+24513: 40, 12, 40
+24514: 40, 12, 41
+24515: 40, 12, 42
+24516: 40, 12, 43
+24517: 40, 12, 44
+24518: 40, 12, 45
+24519: 40, 12, 46
+24520: 40, 12, 47
+24521: 40, 12, 48
+24522: 40, 12, 49
+24523: 40, 12, 50
+24524: 40, 13, 0
+24525: 40, 13, 1
+24526: 40, 13, 2
+24527: 40, 13, 3
+24528: 40, 13, 4
+24529: 40, 13, 5
+24530: 40, 13, 6
+24531: 40, 13, 7
+24532: 40, 13, 8
+24533: 40, 13, 9
+24534: 40, 13, 10
+24535: 40, 13, 11
+24536: 40, 13, 12
+24537: 40, 13, 13
+24538: 40, 13, 14
+24539: 40, 13, 15
+24540: 40, 13, 16
+24541: 40, 13, 17
+24542: 40, 13, 18
+24543: 40, 13, 19
+24544: 40, 13, 20
+24545: 40, 13, 21
+24546: 40, 13, 22
+24547: 40, 13, 23
+24548: 40, 13, 24
+24549: 40, 13, 25
+24550: 40, 13, 26
+24551: 40, 13, 27
+24552: 40, 13, 28
+24553: 40, 13, 29
+24554: 40, 13, 30
+24555: 40, 13, 31
+24556: 40, 13, 32
+24557: 40, 13, 33
+24558: 40, 13, 34
+24559: 40, 13, 35
+24560: 40, 13, 36
+24561: 40, 13, 37
+24562: 40, 13, 38
+24563: 40, 13, 39
+24564: 40, 13, 40
+24565: 40, 13, 41
+24566: 40, 13, 42
+24567: 40, 13, 43
+24568: 40, 13, 44
+24569: 40, 13, 45
+24570: 40, 13, 46
+24571: 40, 13, 47
+24572: 40, 13, 48
+24573: 40, 13, 49
+24574: 40, 13, 50
+24575: 40, 13, 51
+24576: 40, 13, 52
+24577: 40, 13, 53
+24578: 40, 13, 54
+24579: 40, 13, 55
+24580: 40, 13, 56
+24581: 40, 13, 57
+24582: 40, 13, 58
+24583: 40, 14, 0
+24584: 40, 14, 1
+24585: 40, 14, 2
+24586: 40, 14, 3
+24587: 40, 14, 4
+24588: 40, 14, 5
+24589: 40, 14, 6
+24590: 40, 14, 7
+24591: 40, 14, 8
+24592: 40, 14, 9
+24593: 40, 14, 10
+24594: 40, 14, 11
+24595: 40, 14, 12
+24596: 40, 14, 13
+24597: 40, 14, 14
+24598: 40, 14, 15
+24599: 40, 14, 16
+24600: 40, 14, 17
+24601: 40, 14, 18
+24602: 40, 14, 19
+24603: 40, 14, 20
+24604: 40, 14, 21
+24605: 40, 14, 22
+24606: 40, 14, 23
+24607: 40, 14, 24
+24608: 40, 14, 25
+24609: 40, 14, 26
+24610: 40, 14, 27
+24611: 40, 14, 28
+24612: 40, 14, 29
+24613: 40, 14, 30
+24614: 40, 14, 31
+24615: 40, 14, 32
+24616: 40, 14, 33
+24617: 40, 14, 34
+24618: 40, 14, 35
+24619: 40, 14, 36
+24620: 40, 15, 0
+24621: 40, 15, 1
+24622: 40, 15, 2
+24623: 40, 15, 3
+24624: 40, 15, 4
+24625: 40, 15, 5
+24626: 40, 15, 6
+24627: 40, 15, 7
+24628: 40, 15, 8
+24629: 40, 15, 9
+24630: 40, 15, 10
+24631: 40, 15, 11
+24632: 40, 15, 12
+24633: 40, 15, 13
+24634: 40, 15, 14
+24635: 40, 15, 15
+24636: 40, 15, 16
+24637: 40, 15, 17
+24638: 40, 15, 18
+24639: 40, 15, 19
+24640: 40, 15, 20
+24641: 40, 15, 21
+24642: 40, 15, 22
+24643: 40, 15, 23
+24644: 40, 15, 24
+24645: 40, 15, 25
+24646: 40, 15, 26
+24647: 40, 15, 27
+24648: 40, 15, 28
+24649: 40, 15, 29
+24650: 40, 15, 30
+24651: 40, 15, 31
+24652: 40, 15, 32
+24653: 40, 15, 33
+24654: 40, 15, 34
+24655: 40, 15, 35
+24656: 40, 15, 36
+24657: 40, 15, 37
+24658: 40, 15, 38
+24659: 40, 15, 39
+24660: 40, 16, 0
+24661: 40, 16, 1
+24662: 40, 16, 2
+24663: 40, 16, 3
+24664: 40, 16, 4
+24665: 40, 16, 5
+24666: 40, 16, 6
+24667: 40, 16, 7
+24668: 40, 16, 8
+24669: 40, 16, 9
+24670: 40, 16, 10
+24671: 40, 16, 11
+24672: 40, 16, 12
+24673: 40, 16, 13
+24674: 40, 16, 14
+24675: 40, 16, 15
+24676: 40, 16, 16
+24677: 40, 16, 17
+24678: 40, 16, 18
+24679: 40, 16, 19
+24680: 40, 16, 20
+24681: 40, 16, 21
+24682: 40, 16, 22
+24683: 40, 16, 23
+24684: 40, 16, 24
+24685: 40, 16, 25
+24686: 40, 16, 26
+24687: 40, 16, 27
+24688: 40, 16, 28
+24689: 40, 17, 0
+24690: 40, 17, 1
+24691: 40, 17, 2
+24692: 40, 17, 3
+24693: 40, 17, 4
+24694: 40, 17, 5
+24695: 40, 17, 6
+24696: 40, 17, 7
+24697: 40, 17, 8
+24698: 40, 17, 9
+24699: 40, 17, 10
+24700: 40, 17, 11
+24701: 40, 17, 12
+24702: 40, 17, 13
+24703: 40, 17, 14
+24704: 40, 17, 15
+24705: 40, 17, 16
+24706: 40, 17, 17
+24707: 40, 17, 18
+24708: 40, 17, 19
+24709: 40, 17, 20
+24710: 40, 17, 21
+24711: 40, 17, 22
+24712: 40, 17, 23
+24713: 40, 17, 24
+24714: 40, 17, 25
+24715: 40, 17, 26
+24716: 40, 17, 27
+24717: 40, 18, 0
+24718: 40, 18, 1
+24719: 40, 18, 2
+24720: 40, 18, 3
+24721: 40, 18, 4
+24722: 40, 18, 5
+24723: 40, 18, 6
+24724: 40, 18, 7
+24725: 40, 18, 8
+24726: 40, 18, 9
+24727: 40, 18, 10
+24728: 40, 18, 11
+24729: 40, 18, 12
+24730: 40, 18, 13
+24731: 40, 18, 14
+24732: 40, 18, 15
+24733: 40, 18, 16
+24734: 40, 18, 17
+24735: 40, 18, 18
+24736: 40, 18, 19
+24737: 40, 18, 20
+24738: 40, 18, 21
+24739: 40, 18, 22
+24740: 40, 18, 23
+24741: 40, 18, 24
+24742: 40, 18, 25
+24743: 40, 18, 26
+24744: 40, 18, 27
+24745: 40, 18, 28
+24746: 40, 18, 29
+24747: 40, 18, 30
+24748: 40, 18, 31
+24749: 40, 18, 32
+24750: 40, 18, 33
+24751: 40, 18, 34
+24752: 40, 18, 35
+24753: 40, 19, 0
+24754: 40, 19, 1
+24755: 40, 19, 2
+24756: 40, 19, 3
+24757: 40, 19, 4
+24758: 40, 19, 5
+24759: 40, 19, 6
+24760: 40, 19, 7
+24761: 40, 19, 8
+24762: 40, 19, 9
+24763: 40, 19, 10
+24764: 40, 19, 11
+24765: 40, 19, 12
+24766: 40, 19, 13
+24767: 40, 19, 14
+24768: 40, 19, 15
+24769: 40, 19, 16
+24770: 40, 19, 17
+24771: 40, 19, 18
+24772: 40, 19, 19
+24773: 40, 19, 20
+24774: 40, 19, 21
+24775: 40, 19, 22
+24776: 40, 19, 23
+24777: 40, 19, 24
+24778: 40, 19, 25
+24779: 40, 19, 26
+24780: 40, 19, 27
+24781: 40, 19, 28
+24782: 40, 19, 29
+24783: 40, 19, 30
+24784: 40, 20, 0
+24785: 40, 20, 1
+24786: 40, 20, 2
+24787: 40, 20, 3
+24788: 40, 20, 4
+24789: 40, 20, 5
+24790: 40, 20, 6
+24791: 40, 20, 7
+24792: 40, 20, 8
+24793: 40, 20, 9
+24794: 40, 20, 10
+24795: 40, 20, 11
+24796: 40, 20, 12
+24797: 40, 20, 13
+24798: 40, 20, 14
+24799: 40, 20, 15
+24800: 40, 20, 16
+24801: 40, 20, 17
+24802: 40, 20, 18
+24803: 40, 20, 19
+24804: 40, 20, 20
+24805: 40, 20, 21
+24806: 40, 20, 22
+24807: 40, 20, 23
+24808: 40, 20, 24
+24809: 40, 20, 25
+24810: 40, 20, 26
+24811: 40, 20, 27
+24812: 40, 20, 28
+24813: 40, 20, 29
+24814: 40, 20, 30
+24815: 40, 20, 31
+24816: 40, 20, 32
+24817: 40, 20, 33
+24818: 40, 20, 34
+24819: 40, 21, 0
+24820: 40, 21, 1
+24821: 40, 21, 2
+24822: 40, 21, 3
+24823: 40, 21, 4
+24824: 40, 21, 5
+24825: 40, 21, 6
+24826: 40, 21, 7
+24827: 40, 21, 8
+24828: 40, 21, 9
+24829: 40, 21, 10
+24830: 40, 21, 11
+24831: 40, 21, 12
+24832: 40, 21, 13
+24833: 40, 21, 14
+24834: 40, 21, 15
+24835: 40, 21, 16
+24836: 40, 21, 17
+24837: 40, 21, 18
+24838: 40, 21, 19
+24839: 40, 21, 20
+24840: 40, 21, 21
+24841: 40, 21, 22
+24842: 40, 21, 23
+24843: 40, 21, 24
+24844: 40, 21, 25
+24845: 40, 21, 26
+24846: 40, 21, 27
+24847: 40, 21, 28
+24848: 40, 21, 29
+24849: 40, 21, 30
+24850: 40, 21, 31
+24851: 40, 21, 32
+24852: 40, 21, 33
+24853: 40, 21, 34
+24854: 40, 21, 35
+24855: 40, 21, 36
+24856: 40, 21, 37
+24857: 40, 21, 38
+24858: 40, 21, 39
+24859: 40, 21, 40
+24860: 40, 21, 41
+24861: 40, 21, 42
+24862: 40, 21, 43
+24863: 40, 21, 44
+24864: 40, 21, 45
+24865: 40, 21, 46
+24866: 40, 22, 0
+24867: 40, 22, 1
+24868: 40, 22, 2
+24869: 40, 22, 3
+24870: 40, 22, 4
+24871: 40, 22, 5
+24872: 40, 22, 6
+24873: 40, 22, 7
+24874: 40, 22, 8
+24875: 40, 22, 9
+24876: 40, 22, 10
+24877: 40, 22, 11
+24878: 40, 22, 12
+24879: 40, 22, 13
+24880: 40, 22, 14
+24881: 40, 22, 15
+24882: 40, 22, 16
+24883: 40, 22, 17
+24884: 40, 22, 18
+24885: 40, 22, 19
+24886: 40, 22, 20
+24887: 40, 22, 21
+24888: 40, 22, 22
+24889: 40, 22, 23
+24890: 40, 22, 24
+24891: 40, 22, 25
+24892: 40, 22, 26
+24893: 40, 22, 27
+24894: 40, 22, 28
+24895: 40, 22, 29
+24896: 40, 22, 30
+24897: 40, 22, 31
+24898: 40, 22, 32
+24899: 40, 22, 33
+24900: 40, 22, 34
+24901: 40, 22, 35
+24902: 40, 22, 36
+24903: 40, 22, 37
+24904: 40, 22, 38
+24905: 40, 22, 39
+24906: 40, 22, 40
+24907: 40, 22, 41
+24908: 40, 22, 42
+24909: 40, 22, 43
+24910: 40, 22, 44
+24911: 40, 22, 45
+24912: 40, 22, 46
+24913: 40, 23, 0
+24914: 40, 23, 1
+24915: 40, 23, 2
+24916: 40, 23, 3
+24917: 40, 23, 4
+24918: 40, 23, 5
+24919: 40, 23, 6
+24920: 40, 23, 7
+24921: 40, 23, 8
+24922: 40, 23, 9
+24923: 40, 23, 10
+24924: 40, 23, 11
+24925: 40, 23, 12
+24926: 40, 23, 13
+24927: 40, 23, 14
+24928: 40, 23, 15
+24929: 40, 23, 16
+24930: 40, 23, 17
+24931: 40, 23, 18
+24932: 40, 23, 19
+24933: 40, 23, 20
+24934: 40, 23, 21
+24935: 40, 23, 22
+24936: 40, 23, 23
+24937: 40, 23, 24
+24938: 40, 23, 25
+24939: 40, 23, 26
+24940: 40, 23, 27
+24941: 40, 23, 28
+24942: 40, 23, 29
+24943: 40, 23, 30
+24944: 40, 23, 31
+24945: 40, 23, 32
+24946: 40, 23, 33
+24947: 40, 23, 34
+24948: 40, 23, 35
+24949: 40, 23, 36
+24950: 40, 23, 37
+24951: 40, 23, 38
+24952: 40, 23, 39
+24953: 40, 24, 0
+24954: 40, 24, 1
+24955: 40, 24, 2
+24956: 40, 24, 3
+24957: 40, 24, 4
+24958: 40, 24, 5
+24959: 40, 24, 6
+24960: 40, 24, 7
+24961: 40, 24, 8
+24962: 40, 24, 9
+24963: 40, 24, 10
+24964: 40, 24, 11
+24965: 40, 24, 12
+24966: 40, 24, 13
+24967: 40, 24, 14
+24968: 40, 24, 15
+24969: 40, 24, 16
+24970: 40, 24, 17
+24971: 40, 24, 18
+24972: 40, 24, 19
+24973: 40, 24, 20
+24974: 40, 24, 21
+24975: 40, 24, 22
+24976: 40, 24, 23
+24977: 40, 24, 24
+24978: 40, 24, 25
+24979: 40, 24, 26
+24980: 40, 24, 27
+24981: 40, 24, 28
+24982: 40, 24, 29
+24983: 40, 24, 30
+24984: 40, 24, 31
+24985: 40, 24, 32
+24986: 40, 24, 33
+24987: 40, 24, 34
+24988: 40, 24, 35
+24989: 40, 24, 36
+24990: 40, 24, 37
+24991: 40, 24, 38
+24992: 40, 24, 39
+24993: 40, 24, 40
+24994: 40, 24, 41
+24995: 40, 24, 42
+24996: 40, 24, 43
+24997: 40, 24, 44
+24998: 40, 24, 45
+24999: 40, 24, 46
+25000: 40, 24, 47
+25001: 40, 24, 48
+25002: 40, 24, 49
+25003: 40, 24, 50
+25004: 40, 24, 51
+25005: 40, 25, 0
+25006: 40, 25, 1
+25007: 40, 25, 2
+25008: 40, 25, 3
+25009: 40, 25, 4
+25010: 40, 25, 5
+25011: 40, 25, 6
+25012: 40, 25, 7
+25013: 40, 25, 8
+25014: 40, 25, 9
+25015: 40, 25, 10
+25016: 40, 25, 11
+25017: 40, 25, 12
+25018: 40, 25, 13
+25019: 40, 25, 14
+25020: 40, 25, 15
+25021: 40, 25, 16
+25022: 40, 25, 17
+25023: 40, 25, 18
+25024: 40, 25, 19
+25025: 40, 25, 20
+25026: 40, 25, 21
+25027: 40, 25, 22
+25028: 40, 25, 23
+25029: 40, 25, 24
+25030: 40, 25, 25
+25031: 40, 25, 26
+25032: 40, 25, 27
+25033: 40, 25, 28
+25034: 40, 25, 29
+25035: 40, 25, 30
+25036: 40, 25, 31
+25037: 40, 25, 32
+25038: 40, 25, 33
+25039: 40, 25, 34
+25040: 40, 25, 35
+25041: 40, 25, 36
+25042: 40, 25, 37
+25043: 40, 25, 38
+25044: 40, 25, 39
+25045: 40, 25, 40
+25046: 40, 25, 41
+25047: 40, 25, 42
+25048: 40, 25, 43
+25049: 40, 25, 44
+25050: 40, 25, 45
+25051: 40, 25, 46
+25052: 40, 26, 0
+25053: 40, 26, 1
+25054: 40, 26, 2
+25055: 40, 26, 3
+25056: 40, 26, 4
+25057: 40, 26, 5
+25058: 40, 26, 6
+25059: 40, 26, 7
+25060: 40, 26, 8
+25061: 40, 26, 9
+25062: 40, 26, 10
+25063: 40, 26, 11
+25064: 40, 26, 12
+25065: 40, 26, 13
+25066: 40, 26, 14
+25067: 40, 26, 15
+25068: 40, 26, 16
+25069: 40, 26, 17
+25070: 40, 26, 18
+25071: 40, 26, 19
+25072: 40, 26, 20
+25073: 40, 26, 21
+25074: 40, 26, 22
+25075: 40, 26, 23
+25076: 40, 26, 24
+25077: 40, 26, 25
+25078: 40, 26, 26
+25079: 40, 26, 27
+25080: 40, 26, 28
+25081: 40, 26, 29
+25082: 40, 26, 30
+25083: 40, 26, 31
+25084: 40, 26, 32
+25085: 40, 26, 33
+25086: 40, 26, 34
+25087: 40, 26, 35
+25088: 40, 26, 36
+25089: 40, 26, 37
+25090: 40, 26, 38
+25091: 40, 26, 39
+25092: 40, 26, 40
+25093: 40, 26, 41
+25094: 40, 26, 42
+25095: 40, 26, 43
+25096: 40, 26, 44
+25097: 40, 26, 45
+25098: 40, 26, 46
+25099: 40, 26, 47
+25100: 40, 26, 48
+25101: 40, 26, 49
+25102: 40, 26, 50
+25103: 40, 26, 51
+25104: 40, 26, 52
+25105: 40, 26, 53
+25106: 40, 26, 54
+25107: 40, 26, 55
+25108: 40, 26, 56
+25109: 40, 26, 57
+25110: 40, 26, 58
+25111: 40, 26, 59
+25112: 40, 26, 60
+25113: 40, 26, 61
+25114: 40, 26, 62
+25115: 40, 26, 63
+25116: 40, 26, 64
+25117: 40, 26, 65
+25118: 40, 26, 66
+25119: 40, 26, 67
+25120: 40, 26, 68
+25121: 40, 26, 69
+25122: 40, 26, 70
+25123: 40, 26, 71
+25124: 40, 26, 72
+25125: 40, 26, 73
+25126: 40, 26, 74
+25127: 40, 26, 75
+25128: 40, 27, 0
+25129: 40, 27, 1
+25130: 40, 27, 2
+25131: 40, 27, 3
+25132: 40, 27, 4
+25133: 40, 27, 5
+25134: 40, 27, 6
+25135: 40, 27, 7
+25136: 40, 27, 8
+25137: 40, 27, 9
+25138: 40, 27, 10
+25139: 40, 27, 11
+25140: 40, 27, 12
+25141: 40, 27, 13
+25142: 40, 27, 14
+25143: 40, 27, 15
+25144: 40, 27, 16
+25145: 40, 27, 17
+25146: 40, 27, 18
+25147: 40, 27, 19
+25148: 40, 27, 20
+25149: 40, 27, 21
+25150: 40, 27, 22
+25151: 40, 27, 23
+25152: 40, 27, 24
+25153: 40, 27, 25
+25154: 40, 27, 26
+25155: 40, 27, 27
+25156: 40, 27, 28
+25157: 40, 27, 29
+25158: 40, 27, 30
+25159: 40, 27, 31
+25160: 40, 27, 32
+25161: 40, 27, 33
+25162: 40, 27, 34
+25163: 40, 27, 35
+25164: 40, 27, 36
+25165: 40, 27, 37
+25166: 40, 27, 38
+25167: 40, 27, 39
+25168: 40, 27, 40
+25169: 40, 27, 41
+25170: 40, 27, 42
+25171: 40, 27, 43
+25172: 40, 27, 44
+25173: 40, 27, 45
+25174: 40, 27, 46
+25175: 40, 27, 47
+25176: 40, 27, 48
+25177: 40, 27, 49
+25178: 40, 27, 50
+25179: 40, 27, 51
+25180: 40, 27, 52
+25181: 40, 27, 53
+25182: 40, 27, 54
+25183: 40, 27, 55
+25184: 40, 27, 56
+25185: 40, 27, 57
+25186: 40, 27, 58
+25187: 40, 27, 59
+25188: 40, 27, 60
+25189: 40, 27, 61
+25190: 40, 27, 62
+25191: 40, 27, 63
+25192: 40, 27, 64
+25193: 40, 27, 65
+25194: 40, 27, 66
+25195: 40, 28, 0
+25196: 40, 28, 1
+25197: 40, 28, 2
+25198: 40, 28, 3
+25199: 40, 28, 4
+25200: 40, 28, 5
+25201: 40, 28, 6
+25202: 40, 28, 7
+25203: 40, 28, 8
+25204: 40, 28, 9
+25205: 40, 28, 10
+25206: 40, 28, 11
+25207: 40, 28, 12
+25208: 40, 28, 13
+25209: 40, 28, 14
+25210: 40, 28, 15
+25211: 40, 28, 16
+25212: 40, 28, 17
+25213: 40, 28, 18
+25214: 40, 28, 19
+25215: 40, 28, 20
+25216: 41, 0, 0
+25217: 41, 1, 0
+25218: 41, 1, 1
+25219: 41, 1, 2
+25220: 41, 1, 3
+25221: 41, 1, 4
+25222: 41, 1, 5
+25223: 41, 1, 6
+25224: 41, 1, 7
+25225: 41, 1, 8
+25226: 41, 1, 9
+25227: 41, 1, 10
+25228: 41, 1, 11
+25229: 41, 1, 12
+25230: 41, 1, 13
+25231: 41, 1, 14
+25232: 41, 1, 15
+25233: 41, 1, 16
+25234: 41, 1, 17
+25235: 41, 1, 18
+25236: 41, 1, 19
+25237: 41, 1, 20
+25238: 41, 1, 21
+25239: 41, 1, 22
+25240: 41, 1, 23
+25241: 41, 1, 24
+25242: 41, 1, 25
+25243: 41, 1, 26
+25244: 41, 1, 27
+25245: 41, 1, 28
+25246: 41, 1, 29
+25247: 41, 1, 30
+25248: 41, 1, 31
+25249: 41, 1, 32
+25250: 41, 1, 33
+25251: 41, 1, 34
+25252: 41, 1, 35
+25253: 41, 1, 36
+25254: 41, 1, 37
+25255: 41, 1, 38
+25256: 41, 1, 39
+25257: 41, 1, 40
+25258: 41, 1, 41
+25259: 41, 1, 42
+25260: 41, 1, 43
+25261: 41, 1, 44
+25262: 41, 1, 45
+25263: 41, 2, 0
+25264: 41, 2, 1
+25265: 41, 2, 2
+25266: 41, 2, 3
+25267: 41, 2, 4
+25268: 41, 2, 5
+25269: 41, 2, 6
+25270: 41, 2, 7
+25271: 41, 2, 8
+25272: 41, 2, 9
+25273: 41, 2, 10
+25274: 41, 2, 11
+25275: 41, 2, 12
+25276: 41, 2, 13
+25277: 41, 2, 14
+25278: 41, 2, 15
+25279: 41, 2, 16
+25280: 41, 2, 17
+25281: 41, 2, 18
+25282: 41, 2, 19
+25283: 41, 2, 20
+25284: 41, 2, 21
+25285: 41, 2, 22
+25286: 41, 2, 23
+25287: 41, 2, 24
+25288: 41, 2, 25
+25289: 41, 2, 26
+25290: 41, 2, 27
+25291: 41, 2, 28
+25292: 41, 3, 0
+25293: 41, 3, 1
+25294: 41, 3, 2
+25295: 41, 3, 3
+25296: 41, 3, 4
+25297: 41, 3, 5
+25298: 41, 3, 6
+25299: 41, 3, 7
+25300: 41, 3, 8
+25301: 41, 3, 9
+25302: 41, 3, 10
+25303: 41, 3, 11
+25304: 41, 3, 12
+25305: 41, 3, 13
+25306: 41, 3, 14
+25307: 41, 3, 15
+25308: 41, 3, 16
+25309: 41, 3, 17
+25310: 41, 3, 18
+25311: 41, 3, 19
+25312: 41, 3, 20
+25313: 41, 3, 21
+25314: 41, 3, 22
+25315: 41, 3, 23
+25316: 41, 3, 24
+25317: 41, 3, 25
+25318: 41, 3, 26
+25319: 41, 3, 27
+25320: 41, 3, 28
+25321: 41, 3, 29
+25322: 41, 3, 30
+25323: 41, 3, 31
+25324: 41, 3, 32
+25325: 41, 3, 33
+25326: 41, 3, 34
+25327: 41, 3, 35
+25328: 41, 4, 0
+25329: 41, 4, 1
+25330: 41, 4, 2
+25331: 41, 4, 3
+25332: 41, 4, 4
+25333: 41, 4, 5
+25334: 41, 4, 6
+25335: 41, 4, 7
+25336: 41, 4, 8
+25337: 41, 4, 9
+25338: 41, 4, 10
+25339: 41, 4, 11
+25340: 41, 4, 12
+25341: 41, 4, 13
+25342: 41, 4, 14
+25343: 41, 4, 15
+25344: 41, 4, 16
+25345: 41, 4, 17
+25346: 41, 4, 18
+25347: 41, 4, 19
+25348: 41, 4, 20
+25349: 41, 4, 21
+25350: 41, 4, 22
+25351: 41, 4, 23
+25352: 41, 4, 24
+25353: 41, 4, 25
+25354: 41, 4, 26
+25355: 41, 4, 27
+25356: 41, 4, 28
+25357: 41, 4, 29
+25358: 41, 4, 30
+25359: 41, 4, 31
+25360: 41, 4, 32
+25361: 41, 4, 33
+25362: 41, 4, 34
+25363: 41, 4, 35
+25364: 41, 4, 36
+25365: 41, 4, 37
+25366: 41, 4, 38
+25367: 41, 4, 39
+25368: 41, 4, 40
+25369: 41, 4, 41
+25370: 41, 5, 0
+25371: 41, 5, 1
+25372: 41, 5, 2
+25373: 41, 5, 3
+25374: 41, 5, 4
+25375: 41, 5, 5
+25376: 41, 5, 6
+25377: 41, 5, 7
+25378: 41, 5, 8
+25379: 41, 5, 9
+25380: 41, 5, 10
+25381: 41, 5, 11
+25382: 41, 5, 12
+25383: 41, 5, 13
+25384: 41, 5, 14
+25385: 41, 5, 15
+25386: 41, 5, 16
+25387: 41, 5, 17
+25388: 41, 5, 18
+25389: 41, 5, 19
+25390: 41, 5, 20
+25391: 41, 5, 21
+25392: 41, 5, 22
+25393: 41, 5, 23
+25394: 41, 5, 24
+25395: 41, 5, 25
+25396: 41, 5, 26
+25397: 41, 5, 27
+25398: 41, 5, 28
+25399: 41, 5, 29
+25400: 41, 5, 30
+25401: 41, 5, 31
+25402: 41, 5, 32
+25403: 41, 5, 33
+25404: 41, 5, 34
+25405: 41, 5, 35
+25406: 41, 5, 36
+25407: 41, 5, 37
+25408: 41, 5, 38
+25409: 41, 5, 39
+25410: 41, 5, 40
+25411: 41, 5, 41
+25412: 41, 5, 42
+25413: 41, 5, 43
+25414: 41, 6, 0
+25415: 41, 6, 1
+25416: 41, 6, 2
+25417: 41, 6, 3
+25418: 41, 6, 4
+25419: 41, 6, 5
+25420: 41, 6, 6
+25421: 41, 6, 7
+25422: 41, 6, 8
+25423: 41, 6, 9
+25424: 41, 6, 10
+25425: 41, 6, 11
+25426: 41, 6, 12
+25427: 41, 6, 13
+25428: 41, 6, 14
+25429: 41, 6, 15
+25430: 41, 6, 16
+25431: 41, 6, 17
+25432: 41, 6, 18
+25433: 41, 6, 19
+25434: 41, 6, 20
+25435: 41, 6, 21
+25436: 41, 6, 22
+25437: 41, 6, 23
+25438: 41, 6, 24
+25439: 41, 6, 25
+25440: 41, 6, 26
+25441: 41, 6, 27
+25442: 41, 6, 28
+25443: 41, 6, 29
+25444: 41, 6, 30
+25445: 41, 6, 31
+25446: 41, 6, 32
+25447: 41, 6, 33
+25448: 41, 6, 34
+25449: 41, 6, 35
+25450: 41, 6, 36
+25451: 41, 6, 37
+25452: 41, 6, 38
+25453: 41, 6, 39
+25454: 41, 6, 40
+25455: 41, 6, 41
+25456: 41, 6, 42
+25457: 41, 6, 43
+25458: 41, 6, 44
+25459: 41, 6, 45
+25460: 41, 6, 46
+25461: 41, 6, 47
+25462: 41, 6, 48
+25463: 41, 6, 49
+25464: 41, 6, 50
+25465: 41, 6, 51
+25466: 41, 6, 52
+25467: 41, 6, 53
+25468: 41, 6, 54
+25469: 41, 6, 55
+25470: 41, 6, 56
+25471: 41, 7, 0
+25472: 41, 7, 1
+25473: 41, 7, 2
+25474: 41, 7, 3
+25475: 41, 7, 4
+25476: 41, 7, 5
+25477: 41, 7, 6
+25478: 41, 7, 7
+25479: 41, 7, 8
+25480: 41, 7, 9
+25481: 41, 7, 10
+25482: 41, 7, 11
+25483: 41, 7, 12
+25484: 41, 7, 13
+25485: 41, 7, 14
+25486: 41, 7, 15
+25487: 41, 7, 16
+25488: 41, 7, 17
+25489: 41, 7, 18
+25490: 41, 7, 19
+25491: 41, 7, 20
+25492: 41, 7, 21
+25493: 41, 7, 22
+25494: 41, 7, 23
+25495: 41, 7, 24
+25496: 41, 7, 25
+25497: 41, 7, 26
+25498: 41, 7, 27
+25499: 41, 7, 28
+25500: 41, 7, 29
+25501: 41, 7, 30
+25502: 41, 7, 31
+25503: 41, 7, 32
+25504: 41, 7, 33
+25505: 41, 7, 34
+25506: 41, 7, 35
+25507: 41, 7, 36
+25508: 41, 7, 37
+25509: 41, 8, 0
+25510: 41, 8, 1
+25511: 41, 8, 2
+25512: 41, 8, 3
+25513: 41, 8, 4
+25514: 41, 8, 5
+25515: 41, 8, 6
+25516: 41, 8, 7
+25517: 41, 8, 8
+25518: 41, 8, 9
+25519: 41, 8, 10
+25520: 41, 8, 11
+25521: 41, 8, 12
+25522: 41, 8, 13
+25523: 41, 8, 14
+25524: 41, 8, 15
+25525: 41, 8, 16
+25526: 41, 8, 17
+25527: 41, 8, 18
+25528: 41, 8, 19
+25529: 41, 8, 20
+25530: 41, 8, 21
+25531: 41, 8, 22
+25532: 41, 8, 23
+25533: 41, 8, 24
+25534: 41, 8, 25
+25535: 41, 8, 26
+25536: 41, 8, 27
+25537: 41, 8, 28
+25538: 41, 8, 29
+25539: 41, 8, 30
+25540: 41, 8, 31
+25541: 41, 8, 32
+25542: 41, 8, 33
+25543: 41, 8, 34
+25544: 41, 8, 35
+25545: 41, 8, 36
+25546: 41, 8, 37
+25547: 41, 8, 38
+25548: 41, 9, 0
+25549: 41, 9, 1
+25550: 41, 9, 2
+25551: 41, 9, 3
+25552: 41, 9, 4
+25553: 41, 9, 5
+25554: 41, 9, 6
+25555: 41, 9, 7
+25556: 41, 9, 8
+25557: 41, 9, 9
+25558: 41, 9, 10
+25559: 41, 9, 11
+25560: 41, 9, 12
+25561: 41, 9, 13
+25562: 41, 9, 14
+25563: 41, 9, 15
+25564: 41, 9, 16
+25565: 41, 9, 17
+25566: 41, 9, 18
+25567: 41, 9, 19
+25568: 41, 9, 20
+25569: 41, 9, 21
+25570: 41, 9, 22
+25571: 41, 9, 23
+25572: 41, 9, 24
+25573: 41, 9, 25
+25574: 41, 9, 26
+25575: 41, 9, 27
+25576: 41, 9, 28
+25577: 41, 9, 29
+25578: 41, 9, 30
+25579: 41, 9, 31
+25580: 41, 9, 32
+25581: 41, 9, 33
+25582: 41, 9, 34
+25583: 41, 9, 35
+25584: 41, 9, 36
+25585: 41, 9, 37
+25586: 41, 9, 38
+25587: 41, 9, 39
+25588: 41, 9, 40
+25589: 41, 9, 41
+25590: 41, 9, 42
+25591: 41, 9, 43
+25592: 41, 9, 44
+25593: 41, 9, 45
+25594: 41, 9, 46
+25595: 41, 9, 47
+25596: 41, 9, 48
+25597: 41, 9, 49
+25598: 41, 9, 50
+25599: 41, 10, 0
+25600: 41, 10, 1
+25601: 41, 10, 2
+25602: 41, 10, 3
+25603: 41, 10, 4
+25604: 41, 10, 5
+25605: 41, 10, 6
+25606: 41, 10, 7
+25607: 41, 10, 8
+25608: 41, 10, 9
+25609: 41, 10, 10
+25610: 41, 10, 11
+25611: 41, 10, 12
+25612: 41, 10, 13
+25613: 41, 10, 14
+25614: 41, 10, 15
+25615: 41, 10, 16
+25616: 41, 10, 17
+25617: 41, 10, 18
+25618: 41, 10, 19
+25619: 41, 10, 20
+25620: 41, 10, 21
+25621: 41, 10, 22
+25622: 41, 10, 23
+25623: 41, 10, 24
+25624: 41, 10, 25
+25625: 41, 10, 26
+25626: 41, 10, 27
+25627: 41, 10, 28
+25628: 41, 10, 29
+25629: 41, 10, 30
+25630: 41, 10, 31
+25631: 41, 10, 32
+25632: 41, 10, 33
+25633: 41, 10, 34
+25634: 41, 10, 35
+25635: 41, 10, 36
+25636: 41, 10, 37
+25637: 41, 10, 38
+25638: 41, 10, 39
+25639: 41, 10, 40
+25640: 41, 10, 41
+25641: 41, 10, 42
+25642: 41, 10, 43
+25643: 41, 10, 44
+25644: 41, 10, 45
+25645: 41, 10, 46
+25646: 41, 10, 47
+25647: 41, 10, 48
+25648: 41, 10, 49
+25649: 41, 10, 50
+25650: 41, 10, 51
+25651: 41, 10, 52
+25652: 41, 11, 0
+25653: 41, 11, 1
+25654: 41, 11, 2
+25655: 41, 11, 3
+25656: 41, 11, 4
+25657: 41, 11, 5
+25658: 41, 11, 6
+25659: 41, 11, 7
+25660: 41, 11, 8
+25661: 41, 11, 9
+25662: 41, 11, 10
+25663: 41, 11, 11
+25664: 41, 11, 12
+25665: 41, 11, 13
+25666: 41, 11, 14
+25667: 41, 11, 15
+25668: 41, 11, 16
+25669: 41, 11, 17
+25670: 41, 11, 18
+25671: 41, 11, 19
+25672: 41, 11, 20
+25673: 41, 11, 21
+25674: 41, 11, 22
+25675: 41, 11, 23
+25676: 41, 11, 24
+25677: 41, 11, 25
+25678: 41, 11, 26
+25679: 41, 11, 27
+25680: 41, 11, 28
+25681: 41, 11, 29
+25682: 41, 11, 30
+25683: 41, 11, 31
+25684: 41, 11, 32
+25685: 41, 11, 33
+25686: 41, 12, 0
+25687: 41, 12, 1
+25688: 41, 12, 2
+25689: 41, 12, 3
+25690: 41, 12, 4
+25691: 41, 12, 5
+25692: 41, 12, 6
+25693: 41, 12, 7
+25694: 41, 12, 8
+25695: 41, 12, 9
+25696: 41, 12, 10
+25697: 41, 12, 11
+25698: 41, 12, 12
+25699: 41, 12, 13
+25700: 41, 12, 14
+25701: 41, 12, 15
+25702: 41, 12, 16
+25703: 41, 12, 17
+25704: 41, 12, 18
+25705: 41, 12, 19
+25706: 41, 12, 20
+25707: 41, 12, 21
+25708: 41, 12, 22
+25709: 41, 12, 23
+25710: 41, 12, 24
+25711: 41, 12, 25
+25712: 41, 12, 26
+25713: 41, 12, 27
+25714: 41, 12, 28
+25715: 41, 12, 29
+25716: 41, 12, 30
+25717: 41, 12, 31
+25718: 41, 12, 32
+25719: 41, 12, 33
+25720: 41, 12, 34
+25721: 41, 12, 35
+25722: 41, 12, 36
+25723: 41, 12, 37
+25724: 41, 12, 38
+25725: 41, 12, 39
+25726: 41, 12, 40
+25727: 41, 12, 41
+25728: 41, 12, 42
+25729: 41, 12, 43
+25730: 41, 12, 44
+25731: 41, 13, 0
+25732: 41, 13, 1
+25733: 41, 13, 2
+25734: 41, 13, 3
+25735: 41, 13, 4
+25736: 41, 13, 5
+25737: 41, 13, 6
+25738: 41, 13, 7
+25739: 41, 13, 8
+25740: 41, 13, 9
+25741: 41, 13, 10
+25742: 41, 13, 11
+25743: 41, 13, 12
+25744: 41, 13, 13
+25745: 41, 13, 14
+25746: 41, 13, 15
+25747: 41, 13, 16
+25748: 41, 13, 17
+25749: 41, 13, 18
+25750: 41, 13, 19
+25751: 41, 13, 20
+25752: 41, 13, 21
+25753: 41, 13, 22
+25754: 41, 13, 23
+25755: 41, 13, 24
+25756: 41, 13, 25
+25757: 41, 13, 26
+25758: 41, 13, 27
+25759: 41, 13, 28
+25760: 41, 13, 29
+25761: 41, 13, 30
+25762: 41, 13, 31
+25763: 41, 13, 32
+25764: 41, 13, 33
+25765: 41, 13, 34
+25766: 41, 13, 35
+25767: 41, 13, 36
+25768: 41, 13, 37
+25769: 41, 14, 0
+25770: 41, 14, 1
+25771: 41, 14, 2
+25772: 41, 14, 3
+25773: 41, 14, 4
+25774: 41, 14, 5
+25775: 41, 14, 6
+25776: 41, 14, 7
+25777: 41, 14, 8
+25778: 41, 14, 9
+25779: 41, 14, 10
+25780: 41, 14, 11
+25781: 41, 14, 12
+25782: 41, 14, 13
+25783: 41, 14, 14
+25784: 41, 14, 15
+25785: 41, 14, 16
+25786: 41, 14, 17
+25787: 41, 14, 18
+25788: 41, 14, 19
+25789: 41, 14, 20
+25790: 41, 14, 21
+25791: 41, 14, 22
+25792: 41, 14, 23
+25793: 41, 14, 24
+25794: 41, 14, 25
+25795: 41, 14, 26
+25796: 41, 14, 27
+25797: 41, 14, 28
+25798: 41, 14, 29
+25799: 41, 14, 30
+25800: 41, 14, 31
+25801: 41, 14, 32
+25802: 41, 14, 33
+25803: 41, 14, 34
+25804: 41, 14, 35
+25805: 41, 14, 36
+25806: 41, 14, 37
+25807: 41, 14, 38
+25808: 41, 14, 39
+25809: 41, 14, 40
+25810: 41, 14, 41
+25811: 41, 14, 42
+25812: 41, 14, 43
+25813: 41, 14, 44
+25814: 41, 14, 45
+25815: 41, 14, 46
+25816: 41, 14, 47
+25817: 41, 14, 48
+25818: 41, 14, 49
+25819: 41, 14, 50
+25820: 41, 14, 51
+25821: 41, 14, 52
+25822: 41, 14, 53
+25823: 41, 14, 54
+25824: 41, 14, 55
+25825: 41, 14, 56
+25826: 41, 14, 57
+25827: 41, 14, 58
+25828: 41, 14, 59
+25829: 41, 14, 60
+25830: 41, 14, 61
+25831: 41, 14, 62
+25832: 41, 14, 63
+25833: 41, 14, 64
+25834: 41, 14, 65
+25835: 41, 14, 66
+25836: 41, 14, 67
+25837: 41, 14, 68
+25838: 41, 14, 69
+25839: 41, 14, 70
+25840: 41, 14, 71
+25841: 41, 14, 72
+25842: 41, 15, 0
+25843: 41, 15, 1
+25844: 41, 15, 2
+25845: 41, 15, 3
+25846: 41, 15, 4
+25847: 41, 15, 5
+25848: 41, 15, 6
+25849: 41, 15, 7
+25850: 41, 15, 8
+25851: 41, 15, 9
+25852: 41, 15, 10
+25853: 41, 15, 11
+25854: 41, 15, 12
+25855: 41, 15, 13
+25856: 41, 15, 14
+25857: 41, 15, 15
+25858: 41, 15, 16
+25859: 41, 15, 17
+25860: 41, 15, 18
+25861: 41, 15, 19
+25862: 41, 15, 20
+25863: 41, 15, 21
+25864: 41, 15, 22
+25865: 41, 15, 23
+25866: 41, 15, 24
+25867: 41, 15, 25
+25868: 41, 15, 26
+25869: 41, 15, 27
+25870: 41, 15, 28
+25871: 41, 15, 29
+25872: 41, 15, 30
+25873: 41, 15, 31
+25874: 41, 15, 32
+25875: 41, 15, 33
+25876: 41, 15, 34
+25877: 41, 15, 35
+25878: 41, 15, 36
+25879: 41, 15, 37
+25880: 41, 15, 38
+25881: 41, 15, 39
+25882: 41, 15, 40
+25883: 41, 15, 41
+25884: 41, 15, 42
+25885: 41, 15, 43
+25886: 41, 15, 44
+25887: 41, 15, 45
+25888: 41, 15, 46
+25889: 41, 15, 47
+25890: 41, 16, 0
+25891: 41, 16, 1
+25892: 41, 16, 2
+25893: 41, 16, 3
+25894: 41, 16, 4
+25895: 41, 16, 5
+25896: 41, 16, 6
+25897: 41, 16, 7
+25898: 41, 16, 8
+25899: 41, 16, 9
+25900: 41, 16, 10
+25901: 41, 16, 11
+25902: 41, 16, 12
+25903: 41, 16, 13
+25904: 41, 16, 14
+25905: 41, 16, 15
+25906: 41, 16, 16
+25907: 41, 16, 17
+25908: 41, 16, 18
+25909: 41, 16, 19
+25910: 41, 16, 20
+25911: 42, 0, 0
+25912: 42, 1, 0
+25913: 42, 1, 1
+25914: 42, 1, 2
+25915: 42, 1, 3
+25916: 42, 1, 4
+25917: 42, 1, 5
+25918: 42, 1, 6
+25919: 42, 1, 7
+25920: 42, 1, 8
+25921: 42, 1, 9
+25922: 42, 1, 10
+25923: 42, 1, 11
+25924: 42, 1, 12
+25925: 42, 1, 13
+25926: 42, 1, 14
+25927: 42, 1, 15
+25928: 42, 1, 16
+25929: 42, 1, 17
+25930: 42, 1, 18
+25931: 42, 1, 19
+25932: 42, 1, 20
+25933: 42, 1, 21
+25934: 42, 1, 22
+25935: 42, 1, 23
+25936: 42, 1, 24
+25937: 42, 1, 25
+25938: 42, 1, 26
+25939: 42, 1, 27
+25940: 42, 1, 28
+25941: 42, 1, 29
+25942: 42, 1, 30
+25943: 42, 1, 31
+25944: 42, 1, 32
+25945: 42, 1, 33
+25946: 42, 1, 34
+25947: 42, 1, 35
+25948: 42, 1, 36
+25949: 42, 1, 37
+25950: 42, 1, 38
+25951: 42, 1, 39
+25952: 42, 1, 40
+25953: 42, 1, 41
+25954: 42, 1, 42
+25955: 42, 1, 43
+25956: 42, 1, 44
+25957: 42, 1, 45
+25958: 42, 1, 46
+25959: 42, 1, 47
+25960: 42, 1, 48
+25961: 42, 1, 49
+25962: 42, 1, 50
+25963: 42, 1, 51
+25964: 42, 1, 52
+25965: 42, 1, 53
+25966: 42, 1, 54
+25967: 42, 1, 55
+25968: 42, 1, 56
+25969: 42, 1, 57
+25970: 42, 1, 58
+25971: 42, 1, 59
+25972: 42, 1, 60
+25973: 42, 1, 61
+25974: 42, 1, 62
+25975: 42, 1, 63
+25976: 42, 1, 64
+25977: 42, 1, 65
+25978: 42, 1, 66
+25979: 42, 1, 67
+25980: 42, 1, 68
+25981: 42, 1, 69
+25982: 42, 1, 70
+25983: 42, 1, 71
+25984: 42, 1, 72
+25985: 42, 1, 73
+25986: 42, 1, 74
+25987: 42, 1, 75
+25988: 42, 1, 76
+25989: 42, 1, 77
+25990: 42, 1, 78
+25991: 42, 1, 79
+25992: 42, 1, 80
+25993: 42, 2, 0
+25994: 42, 2, 1
+25995: 42, 2, 2
+25996: 42, 2, 3
+25997: 42, 2, 4
+25998: 42, 2, 5
+25999: 42, 2, 6
+26000: 42, 2, 7
+26001: 42, 2, 8
+26002: 42, 2, 9
+26003: 42, 2, 10
+26004: 42, 2, 11
+26005: 42, 2, 12
+26006: 42, 2, 13
+26007: 42, 2, 14
+26008: 42, 2, 15
+26009: 42, 2, 16
+26010: 42, 2, 17
+26011: 42, 2, 18
+26012: 42, 2, 19
+26013: 42, 2, 20
+26014: 42, 2, 21
+26015: 42, 2, 22
+26016: 42, 2, 23
+26017: 42, 2, 24
+26018: 42, 2, 25
+26019: 42, 2, 26
+26020: 42, 2, 27
+26021: 42, 2, 28
+26022: 42, 2, 29
+26023: 42, 2, 30
+26024: 42, 2, 31
+26025: 42, 2, 32
+26026: 42, 2, 33
+26027: 42, 2, 34
+26028: 42, 2, 35
+26029: 42, 2, 36
+26030: 42, 2, 37
+26031: 42, 2, 38
+26032: 42, 2, 39
+26033: 42, 2, 40
+26034: 42, 2, 41
+26035: 42, 2, 42
+26036: 42, 2, 43
+26037: 42, 2, 44
+26038: 42, 2, 45
+26039: 42, 2, 46
+26040: 42, 2, 47
+26041: 42, 2, 48
+26042: 42, 2, 49
+26043: 42, 2, 50
+26044: 42, 2, 51
+26045: 42, 2, 52
+26046: 42, 3, 0
+26047: 42, 3, 1
+26048: 42, 3, 2
+26049: 42, 3, 3
+26050: 42, 3, 4
+26051: 42, 3, 5
+26052: 42, 3, 6
+26053: 42, 3, 7
+26054: 42, 3, 8
+26055: 42, 3, 9
+26056: 42, 3, 10
+26057: 42, 3, 11
+26058: 42, 3, 12
+26059: 42, 3, 13
+26060: 42, 3, 14
+26061: 42, 3, 15
+26062: 42, 3, 16
+26063: 42, 3, 17
+26064: 42, 3, 18
+26065: 42, 3, 19
+26066: 42, 3, 20
+26067: 42, 3, 21
+26068: 42, 3, 22
+26069: 42, 3, 23
+26070: 42, 3, 24
+26071: 42, 3, 25
+26072: 42, 3, 26
+26073: 42, 3, 27
+26074: 42, 3, 28
+26075: 42, 3, 29
+26076: 42, 3, 30
+26077: 42, 3, 31
+26078: 42, 3, 32
+26079: 42, 3, 33
+26080: 42, 3, 34
+26081: 42, 3, 35
+26082: 42, 3, 36
+26083: 42, 3, 37
+26084: 42, 3, 38
+26085: 42, 4, 0
+26086: 42, 4, 1
+26087: 42, 4, 2
+26088: 42, 4, 3
+26089: 42, 4, 4
+26090: 42, 4, 5
+26091: 42, 4, 6
+26092: 42, 4, 7
+26093: 42, 4, 8
+26094: 42, 4, 9
+26095: 42, 4, 10
+26096: 42, 4, 11
+26097: 42, 4, 12
+26098: 42, 4, 13
+26099: 42, 4, 14
+26100: 42, 4, 15
+26101: 42, 4, 16
+26102: 42, 4, 17
+26103: 42, 4, 18
+26104: 42, 4, 19
+26105: 42, 4, 20
+26106: 42, 4, 21
+26107: 42, 4, 22
+26108: 42, 4, 23
+26109: 42, 4, 24
+26110: 42, 4, 25
+26111: 42, 4, 26
+26112: 42, 4, 27
+26113: 42, 4, 28
+26114: 42, 4, 29
+26115: 42, 4, 30
+26116: 42, 4, 31
+26117: 42, 4, 32
+26118: 42, 4, 33
+26119: 42, 4, 34
+26120: 42, 4, 35
+26121: 42, 4, 36
+26122: 42, 4, 37
+26123: 42, 4, 38
+26124: 42, 4, 39
+26125: 42, 4, 40
+26126: 42, 4, 41
+26127: 42, 4, 42
+26128: 42, 4, 43
+26129: 42, 4, 44
+26130: 42, 5, 0
+26131: 42, 5, 1
+26132: 42, 5, 2
+26133: 42, 5, 3
+26134: 42, 5, 4
+26135: 42, 5, 5
+26136: 42, 5, 6
+26137: 42, 5, 7
+26138: 42, 5, 8
+26139: 42, 5, 9
+26140: 42, 5, 10
+26141: 42, 5, 11
+26142: 42, 5, 12
+26143: 42, 5, 13
+26144: 42, 5, 14
+26145: 42, 5, 15
+26146: 42, 5, 16
+26147: 42, 5, 17
+26148: 42, 5, 18
+26149: 42, 5, 19
+26150: 42, 5, 20
+26151: 42, 5, 21
+26152: 42, 5, 22
+26153: 42, 5, 23
+26154: 42, 5, 24
+26155: 42, 5, 25
+26156: 42, 5, 26
+26157: 42, 5, 27
+26158: 42, 5, 28
+26159: 42, 5, 29
+26160: 42, 5, 30
+26161: 42, 5, 31
+26162: 42, 5, 32
+26163: 42, 5, 33
+26164: 42, 5, 34
+26165: 42, 5, 35
+26166: 42, 5, 36
+26167: 42, 5, 37
+26168: 42, 5, 38
+26169: 42, 5, 39
+26170: 42, 6, 0
+26171: 42, 6, 1
+26172: 42, 6, 2
+26173: 42, 6, 3
+26174: 42, 6, 4
+26175: 42, 6, 5
+26176: 42, 6, 6
+26177: 42, 6, 7
+26178: 42, 6, 8
+26179: 42, 6, 9
+26180: 42, 6, 10
+26181: 42, 6, 11
+26182: 42, 6, 12
+26183: 42, 6, 13
+26184: 42, 6, 14
+26185: 42, 6, 15
+26186: 42, 6, 16
+26187: 42, 6, 17
+26188: 42, 6, 18
+26189: 42, 6, 19
+26190: 42, 6, 20
+26191: 42, 6, 21
+26192: 42, 6, 22
+26193: 42, 6, 23
+26194: 42, 6, 24
+26195: 42, 6, 25
+26196: 42, 6, 26
+26197: 42, 6, 27
+26198: 42, 6, 28
+26199: 42, 6, 29
+26200: 42, 6, 30
+26201: 42, 6, 31
+26202: 42, 6, 32
+26203: 42, 6, 33
+26204: 42, 6, 34
+26205: 42, 6, 35
+26206: 42, 6, 36
+26207: 42, 6, 37
+26208: 42, 6, 38
+26209: 42, 6, 39
+26210: 42, 6, 40
+26211: 42, 6, 41
+26212: 42, 6, 42
+26213: 42, 6, 43
+26214: 42, 6, 44
+26215: 42, 6, 45
+26216: 42, 6, 46
+26217: 42, 6, 47
+26218: 42, 6, 48
+26219: 42, 6, 49
+26220: 42, 7, 0
+26221: 42, 7, 1
+26222: 42, 7, 2
+26223: 42, 7, 3
+26224: 42, 7, 4
+26225: 42, 7, 5
+26226: 42, 7, 6
+26227: 42, 7, 7
+26228: 42, 7, 8
+26229: 42, 7, 9
+26230: 42, 7, 10
+26231: 42, 7, 11
+26232: 42, 7, 12
+26233: 42, 7, 13
+26234: 42, 7, 14
+26235: 42, 7, 15
+26236: 42, 7, 16
+26237: 42, 7, 17
+26238: 42, 7, 18
+26239: 42, 7, 19
+26240: 42, 7, 20
+26241: 42, 7, 21
+26242: 42, 7, 22
+26243: 42, 7, 23
+26244: 42, 7, 24
+26245: 42, 7, 25
+26246: 42, 7, 26
+26247: 42, 7, 27
+26248: 42, 7, 28
+26249: 42, 7, 29
+26250: 42, 7, 30
+26251: 42, 7, 31
+26252: 42, 7, 32
+26253: 42, 7, 33
+26254: 42, 7, 34
+26255: 42, 7, 35
+26256: 42, 7, 36
+26257: 42, 7, 37
+26258: 42, 7, 38
+26259: 42, 7, 39
+26260: 42, 7, 40
+26261: 42, 7, 41
+26262: 42, 7, 42
+26263: 42, 7, 43
+26264: 42, 7, 44
+26265: 42, 7, 45
+26266: 42, 7, 46
+26267: 42, 7, 47
+26268: 42, 7, 48
+26269: 42, 7, 49
+26270: 42, 7, 50
+26271: 42, 8, 0
+26272: 42, 8, 1
+26273: 42, 8, 2
+26274: 42, 8, 3
+26275: 42, 8, 4
+26276: 42, 8, 5
+26277: 42, 8, 6
+26278: 42, 8, 7
+26279: 42, 8, 8
+26280: 42, 8, 9
+26281: 42, 8, 10
+26282: 42, 8, 11
+26283: 42, 8, 12
+26284: 42, 8, 13
+26285: 42, 8, 14
+26286: 42, 8, 15
+26287: 42, 8, 16
+26288: 42, 8, 17
+26289: 42, 8, 18
+26290: 42, 8, 19
+26291: 42, 8, 20
+26292: 42, 8, 21
+26293: 42, 8, 22
+26294: 42, 8, 23
+26295: 42, 8, 24
+26296: 42, 8, 25
+26297: 42, 8, 26
+26298: 42, 8, 27
+26299: 42, 8, 28
+26300: 42, 8, 29
+26301: 42, 8, 30
+26302: 42, 8, 31
+26303: 42, 8, 32
+26304: 42, 8, 33
+26305: 42, 8, 34
+26306: 42, 8, 35
+26307: 42, 8, 36
+26308: 42, 8, 37
+26309: 42, 8, 38
+26310: 42, 8, 39
+26311: 42, 8, 40
+26312: 42, 8, 41
+26313: 42, 8, 42
+26314: 42, 8, 43
+26315: 42, 8, 44
+26316: 42, 8, 45
+26317: 42, 8, 46
+26318: 42, 8, 47
+26319: 42, 8, 48
+26320: 42, 8, 49
+26321: 42, 8, 50
+26322: 42, 8, 51
+26323: 42, 8, 52
+26324: 42, 8, 53
+26325: 42, 8, 54
+26326: 42, 8, 55
+26327: 42, 8, 56
+26328: 42, 9, 0
+26329: 42, 9, 1
+26330: 42, 9, 2
+26331: 42, 9, 3
+26332: 42, 9, 4
+26333: 42, 9, 5
+26334: 42, 9, 6
+26335: 42, 9, 7
+26336: 42, 9, 8
+26337: 42, 9, 9
+26338: 42, 9, 10
+26339: 42, 9, 11
+26340: 42, 9, 12
+26341: 42, 9, 13
+26342: 42, 9, 14
+26343: 42, 9, 15
+26344: 42, 9, 16
+26345: 42, 9, 17
+26346: 42, 9, 18
+26347: 42, 9, 19
+26348: 42, 9, 20
+26349: 42, 9, 21
+26350: 42, 9, 22
+26351: 42, 9, 23
+26352: 42, 9, 24
+26353: 42, 9, 25
+26354: 42, 9, 26
+26355: 42, 9, 27
+26356: 42, 9, 28
+26357: 42, 9, 29
+26358: 42, 9, 30
+26359: 42, 9, 31
+26360: 42, 9, 32
+26361: 42, 9, 33
+26362: 42, 9, 34
+26363: 42, 9, 35
+26364: 42, 9, 36
+26365: 42, 9, 37
+26366: 42, 9, 38
+26367: 42, 9, 39
+26368: 42, 9, 40
+26369: 42, 9, 41
+26370: 42, 9, 42
+26371: 42, 9, 43
+26372: 42, 9, 44
+26373: 42, 9, 45
+26374: 42, 9, 46
+26375: 42, 9, 47
+26376: 42, 9, 48
+26377: 42, 9, 49
+26378: 42, 9, 50
+26379: 42, 9, 51
+26380: 42, 9, 52
+26381: 42, 9, 53
+26382: 42, 9, 54
+26383: 42, 9, 55
+26384: 42, 9, 56
+26385: 42, 9, 57
+26386: 42, 9, 58
+26387: 42, 9, 59
+26388: 42, 9, 60
+26389: 42, 9, 61
+26390: 42, 9, 62
+26391: 42, 10, 0
+26392: 42, 10, 1
+26393: 42, 10, 2
+26394: 42, 10, 3
+26395: 42, 10, 4
+26396: 42, 10, 5
+26397: 42, 10, 6
+26398: 42, 10, 7
+26399: 42, 10, 8
+26400: 42, 10, 9
+26401: 42, 10, 10
+26402: 42, 10, 11
+26403: 42, 10, 12
+26404: 42, 10, 13
+26405: 42, 10, 14
+26406: 42, 10, 15
+26407: 42, 10, 16
+26408: 42, 10, 17
+26409: 42, 10, 18
+26410: 42, 10, 19
+26411: 42, 10, 20
+26412: 42, 10, 21
+26413: 42, 10, 22
+26414: 42, 10, 23
+26415: 42, 10, 24
+26416: 42, 10, 25
+26417: 42, 10, 26
+26418: 42, 10, 27
+26419: 42, 10, 28
+26420: 42, 10, 29
+26421: 42, 10, 30
+26422: 42, 10, 31
+26423: 42, 10, 32
+26424: 42, 10, 33
+26425: 42, 10, 34
+26426: 42, 10, 35
+26427: 42, 10, 36
+26428: 42, 10, 37
+26429: 42, 10, 38
+26430: 42, 10, 39
+26431: 42, 10, 40
+26432: 42, 10, 41
+26433: 42, 10, 42
+26434: 42, 11, 0
+26435: 42, 11, 1
+26436: 42, 11, 2
+26437: 42, 11, 3
+26438: 42, 11, 4
+26439: 42, 11, 5
+26440: 42, 11, 6
+26441: 42, 11, 7
+26442: 42, 11, 8
+26443: 42, 11, 9
+26444: 42, 11, 10
+26445: 42, 11, 11
+26446: 42, 11, 12
+26447: 42, 11, 13
+26448: 42, 11, 14
+26449: 42, 11, 15
+26450: 42, 11, 16
+26451: 42, 11, 17
+26452: 42, 11, 18
+26453: 42, 11, 19
+26454: 42, 11, 20
+26455: 42, 11, 21
+26456: 42, 11, 22
+26457: 42, 11, 23
+26458: 42, 11, 24
+26459: 42, 11, 25
+26460: 42, 11, 26
+26461: 42, 11, 27
+26462: 42, 11, 28
+26463: 42, 11, 29
+26464: 42, 11, 30
+26465: 42, 11, 31
+26466: 42, 11, 32
+26467: 42, 11, 33
+26468: 42, 11, 34
+26469: 42, 11, 35
+26470: 42, 11, 36
+26471: 42, 11, 37
+26472: 42, 11, 38
+26473: 42, 11, 39
+26474: 42, 11, 40
+26475: 42, 11, 41
+26476: 42, 11, 42
+26477: 42, 11, 43
+26478: 42, 11, 44
+26479: 42, 11, 45
+26480: 42, 11, 46
+26481: 42, 11, 47
+26482: 42, 11, 48
+26483: 42, 11, 49
+26484: 42, 11, 50
+26485: 42, 11, 51
+26486: 42, 11, 52
+26487: 42, 11, 53
+26488: 42, 11, 54
+26489: 42, 12, 0
+26490: 42, 12, 1
+26491: 42, 12, 2
+26492: 42, 12, 3
+26493: 42, 12, 4
+26494: 42, 12, 5
+26495: 42, 12, 6
+26496: 42, 12, 7
+26497: 42, 12, 8
+26498: 42, 12, 9
+26499: 42, 12, 10
+26500: 42, 12, 11
+26501: 42, 12, 12
+26502: 42, 12, 13
+26503: 42, 12, 14
+26504: 42, 12, 15
+26505: 42, 12, 16
+26506: 42, 12, 17
+26507: 42, 12, 18
+26508: 42, 12, 19
+26509: 42, 12, 20
+26510: 42, 12, 21
+26511: 42, 12, 22
+26512: 42, 12, 23
+26513: 42, 12, 24
+26514: 42, 12, 25
+26515: 42, 12, 26
+26516: 42, 12, 27
+26517: 42, 12, 28
+26518: 42, 12, 29
+26519: 42, 12, 30
+26520: 42, 12, 31
+26521: 42, 12, 32
+26522: 42, 12, 33
+26523: 42, 12, 34
+26524: 42, 12, 35
+26525: 42, 12, 36
+26526: 42, 12, 37
+26527: 42, 12, 38
+26528: 42, 12, 39
+26529: 42, 12, 40
+26530: 42, 12, 41
+26531: 42, 12, 42
+26532: 42, 12, 43
+26533: 42, 12, 44
+26534: 42, 12, 45
+26535: 42, 12, 46
+26536: 42, 12, 47
+26537: 42, 12, 48
+26538: 42, 12, 49
+26539: 42, 12, 50
+26540: 42, 12, 51
+26541: 42, 12, 52
+26542: 42, 12, 53
+26543: 42, 12, 54
+26544: 42, 12, 55
+26545: 42, 12, 56
+26546: 42, 12, 57
+26547: 42, 12, 58
+26548: 42, 12, 59
+26549: 42, 13, 0
+26550: 42, 13, 1
+26551: 42, 13, 2
+26552: 42, 13, 3
+26553: 42, 13, 4
+26554: 42, 13, 5
+26555: 42, 13, 6
+26556: 42, 13, 7
+26557: 42, 13, 8
+26558: 42, 13, 9
+26559: 42, 13, 10
+26560: 42, 13, 11
+26561: 42, 13, 12
+26562: 42, 13, 13
+26563: 42, 13, 14
+26564: 42, 13, 15
+26565: 42, 13, 16
+26566: 42, 13, 17
+26567: 42, 13, 18
+26568: 42, 13, 19
+26569: 42, 13, 20
+26570: 42, 13, 21
+26571: 42, 13, 22
+26572: 42, 13, 23
+26573: 42, 13, 24
+26574: 42, 13, 25
+26575: 42, 13, 26
+26576: 42, 13, 27
+26577: 42, 13, 28
+26578: 42, 13, 29
+26579: 42, 13, 30
+26580: 42, 13, 31
+26581: 42, 13, 32
+26582: 42, 13, 33
+26583: 42, 13, 34
+26584: 42, 13, 35
+26585: 42, 14, 0
+26586: 42, 14, 1
+26587: 42, 14, 2
+26588: 42, 14, 3
+26589: 42, 14, 4
+26590: 42, 14, 5
+26591: 42, 14, 6
+26592: 42, 14, 7
+26593: 42, 14, 8
+26594: 42, 14, 9
+26595: 42, 14, 10
+26596: 42, 14, 11
+26597: 42, 14, 12
+26598: 42, 14, 13
+26599: 42, 14, 14
+26600: 42, 14, 15
+26601: 42, 14, 16
+26602: 42, 14, 17
+26603: 42, 14, 18
+26604: 42, 14, 19
+26605: 42, 14, 20
+26606: 42, 14, 21
+26607: 42, 14, 22
+26608: 42, 14, 23
+26609: 42, 14, 24
+26610: 42, 14, 25
+26611: 42, 14, 26
+26612: 42, 14, 27
+26613: 42, 14, 28
+26614: 42, 14, 29
+26615: 42, 14, 30
+26616: 42, 14, 31
+26617: 42, 14, 32
+26618: 42, 14, 33
+26619: 42, 14, 34
+26620: 42, 14, 35
+26621: 42, 15, 0
+26622: 42, 15, 1
+26623: 42, 15, 2
+26624: 42, 15, 3
+26625: 42, 15, 4
+26626: 42, 15, 5
+26627: 42, 15, 6
+26628: 42, 15, 7
+26629: 42, 15, 8
+26630: 42, 15, 9
+26631: 42, 15, 10
+26632: 42, 15, 11
+26633: 42, 15, 12
+26634: 42, 15, 13
+26635: 42, 15, 14
+26636: 42, 15, 15
+26637: 42, 15, 16
+26638: 42, 15, 17
+26639: 42, 15, 18
+26640: 42, 15, 19
+26641: 42, 15, 20
+26642: 42, 15, 21
+26643: 42, 15, 22
+26644: 42, 15, 23
+26645: 42, 15, 24
+26646: 42, 15, 25
+26647: 42, 15, 26
+26648: 42, 15, 27
+26649: 42, 15, 28
+26650: 42, 15, 29
+26651: 42, 15, 30
+26652: 42, 15, 31
+26653: 42, 15, 32
+26654: 42, 16, 0
+26655: 42, 16, 1
+26656: 42, 16, 2
+26657: 42, 16, 3
+26658: 42, 16, 4
+26659: 42, 16, 5
+26660: 42, 16, 6
+26661: 42, 16, 7
+26662: 42, 16, 8
+26663: 42, 16, 9
+26664: 42, 16, 10
+26665: 42, 16, 11
+26666: 42, 16, 12
+26667: 42, 16, 13
+26668: 42, 16, 14
+26669: 42, 16, 15
+26670: 42, 16, 16
+26671: 42, 16, 17
+26672: 42, 16, 18
+26673: 42, 16, 19
+26674: 42, 16, 20
+26675: 42, 16, 21
+26676: 42, 16, 22
+26677: 42, 16, 23
+26678: 42, 16, 24
+26679: 42, 16, 25
+26680: 42, 16, 26
+26681: 42, 16, 27
+26682: 42, 16, 28
+26683: 42, 16, 29
+26684: 42, 16, 30
+26685: 42, 16, 31
+26686: 42, 17, 0
+26687: 42, 17, 1
+26688: 42, 17, 2
+26689: 42, 17, 3
+26690: 42, 17, 4
+26691: 42, 17, 5
+26692: 42, 17, 6
+26693: 42, 17, 7
+26694: 42, 17, 8
+26695: 42, 17, 9
+26696: 42, 17, 10
+26697: 42, 17, 11
+26698: 42, 17, 12
+26699: 42, 17, 13
+26700: 42, 17, 14
+26701: 42, 17, 15
+26702: 42, 17, 16
+26703: 42, 17, 17
+26704: 42, 17, 18
+26705: 42, 17, 19
+26706: 42, 17, 20
+26707: 42, 17, 21
+26708: 42, 17, 22
+26709: 42, 17, 23
+26710: 42, 17, 24
+26711: 42, 17, 25
+26712: 42, 17, 26
+26713: 42, 17, 27
+26714: 42, 17, 28
+26715: 42, 17, 29
+26716: 42, 17, 30
+26717: 42, 17, 31
+26718: 42, 17, 32
+26719: 42, 17, 33
+26720: 42, 17, 34
+26721: 42, 17, 35
+26722: 42, 17, 36
+26723: 42, 17, 37
+26724: 42, 18, 0
+26725: 42, 18, 1
+26726: 42, 18, 2
+26727: 42, 18, 3
+26728: 42, 18, 4
+26729: 42, 18, 5
+26730: 42, 18, 6
+26731: 42, 18, 7
+26732: 42, 18, 8
+26733: 42, 18, 9
+26734: 42, 18, 10
+26735: 42, 18, 11
+26736: 42, 18, 12
+26737: 42, 18, 13
+26738: 42, 18, 14
+26739: 42, 18, 15
+26740: 42, 18, 16
+26741: 42, 18, 17
+26742: 42, 18, 18
+26743: 42, 18, 19
+26744: 42, 18, 20
+26745: 42, 18, 21
+26746: 42, 18, 22
+26747: 42, 18, 23
+26748: 42, 18, 24
+26749: 42, 18, 25
+26750: 42, 18, 26
+26751: 42, 18, 27
+26752: 42, 18, 28
+26753: 42, 18, 29
+26754: 42, 18, 30
+26755: 42, 18, 31
+26756: 42, 18, 32
+26757: 42, 18, 33
+26758: 42, 18, 34
+26759: 42, 18, 35
+26760: 42, 18, 36
+26761: 42, 18, 37
+26762: 42, 18, 38
+26763: 42, 18, 39
+26764: 42, 18, 40
+26765: 42, 18, 41
+26766: 42, 18, 42
+26767: 42, 18, 43
+26768: 42, 19, 0
+26769: 42, 19, 1
+26770: 42, 19, 2
+26771: 42, 19, 3
+26772: 42, 19, 4
+26773: 42, 19, 5
+26774: 42, 19, 6
+26775: 42, 19, 7
+26776: 42, 19, 8
+26777: 42, 19, 9
+26778: 42, 19, 10
+26779: 42, 19, 11
+26780: 42, 19, 12
+26781: 42, 19, 13
+26782: 42, 19, 14
+26783: 42, 19, 15
+26784: 42, 19, 16
+26785: 42, 19, 17
+26786: 42, 19, 18
+26787: 42, 19, 19
+26788: 42, 19, 20
+26789: 42, 19, 21
+26790: 42, 19, 22
+26791: 42, 19, 23
+26792: 42, 19, 24
+26793: 42, 19, 25
+26794: 42, 19, 26
+26795: 42, 19, 27
+26796: 42, 19, 28
+26797: 42, 19, 29
+26798: 42, 19, 30
+26799: 42, 19, 31
+26800: 42, 19, 32
+26801: 42, 19, 33
+26802: 42, 19, 34
+26803: 42, 19, 35
+26804: 42, 19, 36
+26805: 42, 19, 37
+26806: 42, 19, 38
+26807: 42, 19, 39
+26808: 42, 19, 40
+26809: 42, 19, 41
+26810: 42, 19, 42
+26811: 42, 19, 43
+26812: 42, 19, 44
+26813: 42, 19, 45
+26814: 42, 19, 46
+26815: 42, 19, 47
+26816: 42, 19, 48
+26817: 42, 20, 0
+26818: 42, 20, 1
+26819: 42, 20, 2
+26820: 42, 20, 3
+26821: 42, 20, 4
+26822: 42, 20, 5
+26823: 42, 20, 6
+26824: 42, 20, 7
+26825: 42, 20, 8
+26826: 42, 20, 9
+26827: 42, 20, 10
+26828: 42, 20, 11
+26829: 42, 20, 12
+26830: 42, 20, 13
+26831: 42, 20, 14
+26832: 42, 20, 15
+26833: 42, 20, 16
+26834: 42, 20, 17
+26835: 42, 20, 18
+26836: 42, 20, 19
+26837: 42, 20, 20
+26838: 42, 20, 21
+26839: 42, 20, 22
+26840: 42, 20, 23
+26841: 42, 20, 24
+26842: 42, 20, 25
+26843: 42, 20, 26
+26844: 42, 20, 27
+26845: 42, 20, 28
+26846: 42, 20, 29
+26847: 42, 20, 30
+26848: 42, 20, 31
+26849: 42, 20, 32
+26850: 42, 20, 33
+26851: 42, 20, 34
+26852: 42, 20, 35
+26853: 42, 20, 36
+26854: 42, 20, 37
+26855: 42, 20, 38
+26856: 42, 20, 39
+26857: 42, 20, 40
+26858: 42, 20, 41
+26859: 42, 20, 42
+26860: 42, 20, 43
+26861: 42, 20, 44
+26862: 42, 20, 45
+26863: 42, 20, 46
+26864: 42, 20, 47
+26865: 42, 21, 0
+26866: 42, 21, 1
+26867: 42, 21, 2
+26868: 42, 21, 3
+26869: 42, 21, 4
+26870: 42, 21, 5
+26871: 42, 21, 6
+26872: 42, 21, 7
+26873: 42, 21, 8
+26874: 42, 21, 9
+26875: 42, 21, 10
+26876: 42, 21, 11
+26877: 42, 21, 12
+26878: 42, 21, 13
+26879: 42, 21, 14
+26880: 42, 21, 15
+26881: 42, 21, 16
+26882: 42, 21, 17
+26883: 42, 21, 18
+26884: 42, 21, 19
+26885: 42, 21, 20
+26886: 42, 21, 21
+26887: 42, 21, 22
+26888: 42, 21, 23
+26889: 42, 21, 24
+26890: 42, 21, 25
+26891: 42, 21, 26
+26892: 42, 21, 27
+26893: 42, 21, 28
+26894: 42, 21, 29
+26895: 42, 21, 30
+26896: 42, 21, 31
+26897: 42, 21, 32
+26898: 42, 21, 33
+26899: 42, 21, 34
+26900: 42, 21, 35
+26901: 42, 21, 36
+26902: 42, 21, 37
+26903: 42, 21, 38
+26904: 42, 22, 0
+26905: 42, 22, 1
+26906: 42, 22, 2
+26907: 42, 22, 3
+26908: 42, 22, 4
+26909: 42, 22, 5
+26910: 42, 22, 6
+26911: 42, 22, 7
+26912: 42, 22, 8
+26913: 42, 22, 9
+26914: 42, 22, 10
+26915: 42, 22, 11
+26916: 42, 22, 12
+26917: 42, 22, 13
+26918: 42, 22, 14
+26919: 42, 22, 15
+26920: 42, 22, 16
+26921: 42, 22, 17
+26922: 42, 22, 18
+26923: 42, 22, 19
+26924: 42, 22, 20
+26925: 42, 22, 21
+26926: 42, 22, 22
+26927: 42, 22, 23
+26928: 42, 22, 24
+26929: 42, 22, 25
+26930: 42, 22, 26
+26931: 42, 22, 27
+26932: 42, 22, 28
+26933: 42, 22, 29
+26934: 42, 22, 30
+26935: 42, 22, 31
+26936: 42, 22, 32
+26937: 42, 22, 33
+26938: 42, 22, 34
+26939: 42, 22, 35
+26940: 42, 22, 36
+26941: 42, 22, 37
+26942: 42, 22, 38
+26943: 42, 22, 39
+26944: 42, 22, 40
+26945: 42, 22, 41
+26946: 42, 22, 42
+26947: 42, 22, 43
+26948: 42, 22, 44
+26949: 42, 22, 45
+26950: 42, 22, 46
+26951: 42, 22, 47
+26952: 42, 22, 48
+26953: 42, 22, 49
+26954: 42, 22, 50
+26955: 42, 22, 51
+26956: 42, 22, 52
+26957: 42, 22, 53
+26958: 42, 22, 54
+26959: 42, 22, 55
+26960: 42, 22, 56
+26961: 42, 22, 57
+26962: 42, 22, 58
+26963: 42, 22, 59
+26964: 42, 22, 60
+26965: 42, 22, 61
+26966: 42, 22, 62
+26967: 42, 22, 63
+26968: 42, 22, 64
+26969: 42, 22, 65
+26970: 42, 22, 66
+26971: 42, 22, 67
+26972: 42, 22, 68
+26973: 42, 22, 69
+26974: 42, 22, 70
+26975: 42, 22, 71
+26976: 42, 23, 0
+26977: 42, 23, 1
+26978: 42, 23, 2
+26979: 42, 23, 3
+26980: 42, 23, 4
+26981: 42, 23, 5
+26982: 42, 23, 6
+26983: 42, 23, 7
+26984: 42, 23, 8
+26985: 42, 23, 9
+26986: 42, 23, 10
+26987: 42, 23, 11
+26988: 42, 23, 12
+26989: 42, 23, 13
+26990: 42, 23, 14
+26991: 42, 23, 15
+26992: 42, 23, 16
+26993: 42, 23, 17
+26994: 42, 23, 18
+26995: 42, 23, 19
+26996: 42, 23, 20
+26997: 42, 23, 21
+26998: 42, 23, 22
+26999: 42, 23, 23
+27000: 42, 23, 24
+27001: 42, 23, 25
+27002: 42, 23, 26
+27003: 42, 23, 27
+27004: 42, 23, 28
+27005: 42, 23, 29
+27006: 42, 23, 30
+27007: 42, 23, 31
+27008: 42, 23, 32
+27009: 42, 23, 33
+27010: 42, 23, 34
+27011: 42, 23, 35
+27012: 42, 23, 36
+27013: 42, 23, 37
+27014: 42, 23, 38
+27015: 42, 23, 39
+27016: 42, 23, 40
+27017: 42, 23, 41
+27018: 42, 23, 42
+27019: 42, 23, 43
+27020: 42, 23, 44
+27021: 42, 23, 45
+27022: 42, 23, 46
+27023: 42, 23, 47
+27024: 42, 23, 48
+27025: 42, 23, 49
+27026: 42, 23, 50
+27027: 42, 23, 51
+27028: 42, 23, 52
+27029: 42, 23, 53
+27030: 42, 23, 54
+27031: 42, 23, 55
+27032: 42, 23, 56
+27033: 42, 24, 0
+27034: 42, 24, 1
+27035: 42, 24, 2
+27036: 42, 24, 3
+27037: 42, 24, 4
+27038: 42, 24, 5
+27039: 42, 24, 6
+27040: 42, 24, 7
+27041: 42, 24, 8
+27042: 42, 24, 9
+27043: 42, 24, 10
+27044: 42, 24, 11
+27045: 42, 24, 12
+27046: 42, 24, 13
+27047: 42, 24, 14
+27048: 42, 24, 15
+27049: 42, 24, 16
+27050: 42, 24, 17
+27051: 42, 24, 18
+27052: 42, 24, 19
+27053: 42, 24, 20
+27054: 42, 24, 21
+27055: 42, 24, 22
+27056: 42, 24, 23
+27057: 42, 24, 24
+27058: 42, 24, 25
+27059: 42, 24, 26
+27060: 42, 24, 27
+27061: 42, 24, 28
+27062: 42, 24, 29
+27063: 42, 24, 30
+27064: 42, 24, 31
+27065: 42, 24, 32
+27066: 42, 24, 33
+27067: 42, 24, 34
+27068: 42, 24, 35
+27069: 42, 24, 36
+27070: 42, 24, 37
+27071: 42, 24, 38
+27072: 42, 24, 39
+27073: 42, 24, 40
+27074: 42, 24, 41
+27075: 42, 24, 42
+27076: 42, 24, 43
+27077: 42, 24, 44
+27078: 42, 24, 45
+27079: 42, 24, 46
+27080: 42, 24, 47
+27081: 42, 24, 48
+27082: 42, 24, 49
+27083: 42, 24, 50
+27084: 42, 24, 51
+27085: 42, 24, 52
+27086: 42, 24, 53
+27087: 43, 0, 0
+27088: 43, 1, 0
+27089: 43, 1, 1
+27090: 43, 1, 2
+27091: 43, 1, 3
+27092: 43, 1, 4
+27093: 43, 1, 5
+27094: 43, 1, 6
+27095: 43, 1, 7
+27096: 43, 1, 8
+27097: 43, 1, 9
+27098: 43, 1, 10
+27099: 43, 1, 11
+27100: 43, 1, 12
+27101: 43, 1, 13
+27102: 43, 1, 14
+27103: 43, 1, 15
+27104: 43, 1, 16
+27105: 43, 1, 17
+27106: 43, 1, 18
+27107: 43, 1, 19
+27108: 43, 1, 20
+27109: 43, 1, 21
+27110: 43, 1, 22
+27111: 43, 1, 23
+27112: 43, 1, 24
+27113: 43, 1, 25
+27114: 43, 1, 26
+27115: 43, 1, 27
+27116: 43, 1, 28
+27117: 43, 1, 29
+27118: 43, 1, 30
+27119: 43, 1, 31
+27120: 43, 1, 32
+27121: 43, 1, 33
+27122: 43, 1, 34
+27123: 43, 1, 35
+27124: 43, 1, 36
+27125: 43, 1, 37
+27126: 43, 1, 38
+27127: 43, 1, 39
+27128: 43, 1, 40
+27129: 43, 1, 41
+27130: 43, 1, 42
+27131: 43, 1, 43
+27132: 43, 1, 44
+27133: 43, 1, 45
+27134: 43, 1, 46
+27135: 43, 1, 47
+27136: 43, 1, 48
+27137: 43, 1, 49
+27138: 43, 1, 50
+27139: 43, 1, 51
+27140: 43, 2, 0
+27141: 43, 2, 1
+27142: 43, 2, 2
+27143: 43, 2, 3
+27144: 43, 2, 4
+27145: 43, 2, 5
+27146: 43, 2, 6
+27147: 43, 2, 7
+27148: 43, 2, 8
+27149: 43, 2, 9
+27150: 43, 2, 10
+27151: 43, 2, 11
+27152: 43, 2, 12
+27153: 43, 2, 13
+27154: 43, 2, 14
+27155: 43, 2, 15
+27156: 43, 2, 16
+27157: 43, 2, 17
+27158: 43, 2, 18
+27159: 43, 2, 19
+27160: 43, 2, 20
+27161: 43, 2, 21
+27162: 43, 2, 22
+27163: 43, 2, 23
+27164: 43, 2, 24
+27165: 43, 2, 25
+27166: 43, 3, 0
+27167: 43, 3, 1
+27168: 43, 3, 2
+27169: 43, 3, 3
+27170: 43, 3, 4
+27171: 43, 3, 5
+27172: 43, 3, 6
+27173: 43, 3, 7
+27174: 43, 3, 8
+27175: 43, 3, 9
+27176: 43, 3, 10
+27177: 43, 3, 11
+27178: 43, 3, 12
+27179: 43, 3, 13
+27180: 43, 3, 14
+27181: 43, 3, 15
+27182: 43, 3, 16
+27183: 43, 3, 17
+27184: 43, 3, 18
+27185: 43, 3, 19
+27186: 43, 3, 20
+27187: 43, 3, 21
+27188: 43, 3, 22
+27189: 43, 3, 23
+27190: 43, 3, 24
+27191: 43, 3, 25
+27192: 43, 3, 26
+27193: 43, 3, 27
+27194: 43, 3, 28
+27195: 43, 3, 29
+27196: 43, 3, 30
+27197: 43, 3, 31
+27198: 43, 3, 32
+27199: 43, 3, 33
+27200: 43, 3, 34
+27201: 43, 3, 35
+27202: 43, 3, 36
+27203: 43, 4, 0
+27204: 43, 4, 1
+27205: 43, 4, 2
+27206: 43, 4, 3
+27207: 43, 4, 4
+27208: 43, 4, 5
+27209: 43, 4, 6
+27210: 43, 4, 7
+27211: 43, 4, 8
+27212: 43, 4, 9
+27213: 43, 4, 10
+27214: 43, 4, 11
+27215: 43, 4, 12
+27216: 43, 4, 13
+27217: 43, 4, 14
+27218: 43, 4, 15
+27219: 43, 4, 16
+27220: 43, 4, 17
+27221: 43, 4, 18
+27222: 43, 4, 19
+27223: 43, 4, 20
+27224: 43, 4, 21
+27225: 43, 4, 22
+27226: 43, 4, 23
+27227: 43, 4, 24
+27228: 43, 4, 25
+27229: 43, 4, 26
+27230: 43, 4, 27
+27231: 43, 4, 28
+27232: 43, 4, 29
+27233: 43, 4, 30
+27234: 43, 4, 31
+27235: 43, 4, 32
+27236: 43, 4, 33
+27237: 43, 4, 34
+27238: 43, 4, 35
+27239: 43, 4, 36
+27240: 43, 4, 37
+27241: 43, 4, 38
+27242: 43, 4, 39
+27243: 43, 4, 40
+27244: 43, 4, 41
+27245: 43, 4, 42
+27246: 43, 4, 43
+27247: 43, 4, 44
+27248: 43, 4, 45
+27249: 43, 4, 46
+27250: 43, 4, 47
+27251: 43, 4, 48
+27252: 43, 4, 49
+27253: 43, 4, 50
+27254: 43, 4, 51
+27255: 43, 4, 52
+27256: 43, 4, 53
+27257: 43, 4, 54
+27258: 43, 5, 0
+27259: 43, 5, 1
+27260: 43, 5, 2
+27261: 43, 5, 3
+27262: 43, 5, 4
+27263: 43, 5, 5
+27264: 43, 5, 6
+27265: 43, 5, 7
+27266: 43, 5, 8
+27267: 43, 5, 9
+27268: 43, 5, 10
+27269: 43, 5, 11
+27270: 43, 5, 12
+27271: 43, 5, 13
+27272: 43, 5, 14
+27273: 43, 5, 15
+27274: 43, 5, 16
+27275: 43, 5, 17
+27276: 43, 5, 18
+27277: 43, 5, 19
+27278: 43, 5, 20
+27279: 43, 5, 21
+27280: 43, 5, 22
+27281: 43, 5, 23
+27282: 43, 5, 24
+27283: 43, 5, 25
+27284: 43, 5, 26
+27285: 43, 5, 27
+27286: 43, 5, 28
+27287: 43, 5, 29
+27288: 43, 5, 30
+27289: 43, 5, 31
+27290: 43, 5, 32
+27291: 43, 5, 33
+27292: 43, 5, 34
+27293: 43, 5, 35
+27294: 43, 5, 36
+27295: 43, 5, 37
+27296: 43, 5, 38
+27297: 43, 5, 39
+27298: 43, 5, 40
+27299: 43, 5, 41
+27300: 43, 5, 42
+27301: 43, 5, 43
+27302: 43, 5, 44
+27303: 43, 5, 45
+27304: 43, 5, 46
+27305: 43, 5, 47
+27306: 43, 6, 0
+27307: 43, 6, 1
+27308: 43, 6, 2
+27309: 43, 6, 3
+27310: 43, 6, 4
+27311: 43, 6, 5
+27312: 43, 6, 6
+27313: 43, 6, 7
+27314: 43, 6, 8
+27315: 43, 6, 9
+27316: 43, 6, 10
+27317: 43, 6, 11
+27318: 43, 6, 12
+27319: 43, 6, 13
+27320: 43, 6, 14
+27321: 43, 6, 15
+27322: 43, 6, 16
+27323: 43, 6, 17
+27324: 43, 6, 18
+27325: 43, 6, 19
+27326: 43, 6, 20
+27327: 43, 6, 21
+27328: 43, 6, 22
+27329: 43, 6, 23
+27330: 43, 6, 24
+27331: 43, 6, 25
+27332: 43, 6, 26
+27333: 43, 6, 27
+27334: 43, 6, 28
+27335: 43, 6, 29
+27336: 43, 6, 30
+27337: 43, 6, 31
+27338: 43, 6, 32
+27339: 43, 6, 33
+27340: 43, 6, 34
+27341: 43, 6, 35
+27342: 43, 6, 36
+27343: 43, 6, 37
+27344: 43, 6, 38
+27345: 43, 6, 39
+27346: 43, 6, 40
+27347: 43, 6, 41
+27348: 43, 6, 42
+27349: 43, 6, 43
+27350: 43, 6, 44
+27351: 43, 6, 45
+27352: 43, 6, 46
+27353: 43, 6, 47
+27354: 43, 6, 48
+27355: 43, 6, 49
+27356: 43, 6, 50
+27357: 43, 6, 51
+27358: 43, 6, 52
+27359: 43, 6, 53
+27360: 43, 6, 54
+27361: 43, 6, 55
+27362: 43, 6, 56
+27363: 43, 6, 57
+27364: 43, 6, 58
+27365: 43, 6, 59
+27366: 43, 6, 60
+27367: 43, 6, 61
+27368: 43, 6, 62
+27369: 43, 6, 63
+27370: 43, 6, 64
+27371: 43, 6, 65
+27372: 43, 6, 66
+27373: 43, 6, 67
+27374: 43, 6, 68
+27375: 43, 6, 69
+27376: 43, 6, 70
+27377: 43, 6, 71
+27378: 43, 7, 0
+27379: 43, 7, 1
+27380: 43, 7, 2
+27381: 43, 7, 3
+27382: 43, 7, 4
+27383: 43, 7, 5
+27384: 43, 7, 6
+27385: 43, 7, 7
+27386: 43, 7, 8
+27387: 43, 7, 9
+27388: 43, 7, 10
+27389: 43, 7, 11
+27390: 43, 7, 12
+27391: 43, 7, 13
+27392: 43, 7, 14
+27393: 43, 7, 15
+27394: 43, 7, 16
+27395: 43, 7, 17
+27396: 43, 7, 18
+27397: 43, 7, 19
+27398: 43, 7, 20
+27399: 43, 7, 21
+27400: 43, 7, 22
+27401: 43, 7, 23
+27402: 43, 7, 24
+27403: 43, 7, 25
+27404: 43, 7, 26
+27405: 43, 7, 27
+27406: 43, 7, 28
+27407: 43, 7, 29
+27408: 43, 7, 30
+27409: 43, 7, 31
+27410: 43, 7, 32
+27411: 43, 7, 33
+27412: 43, 7, 34
+27413: 43, 7, 35
+27414: 43, 7, 36
+27415: 43, 7, 37
+27416: 43, 7, 38
+27417: 43, 7, 39
+27418: 43, 7, 40
+27419: 43, 7, 41
+27420: 43, 7, 42
+27421: 43, 7, 43
+27422: 43, 7, 44
+27423: 43, 7, 45
+27424: 43, 7, 46
+27425: 43, 7, 47
+27426: 43, 7, 48
+27427: 43, 7, 49
+27428: 43, 7, 50
+27429: 43, 7, 51
+27430: 43, 7, 52
+27431: 43, 7, 53
+27432: 43, 8, 0
+27433: 43, 8, 1
+27434: 43, 8, 2
+27435: 43, 8, 3
+27436: 43, 8, 4
+27437: 43, 8, 5
+27438: 43, 8, 6
+27439: 43, 8, 7
+27440: 43, 8, 8
+27441: 43, 8, 9
+27442: 43, 8, 10
+27443: 43, 8, 11
+27444: 43, 8, 12
+27445: 43, 8, 13
+27446: 43, 8, 14
+27447: 43, 8, 15
+27448: 43, 8, 16
+27449: 43, 8, 17
+27450: 43, 8, 18
+27451: 43, 8, 19
+27452: 43, 8, 20
+27453: 43, 8, 21
+27454: 43, 8, 22
+27455: 43, 8, 23
+27456: 43, 8, 24
+27457: 43, 8, 25
+27458: 43, 8, 26
+27459: 43, 8, 27
+27460: 43, 8, 28
+27461: 43, 8, 29
+27462: 43, 8, 30
+27463: 43, 8, 31
+27464: 43, 8, 32
+27465: 43, 8, 33
+27466: 43, 8, 34
+27467: 43, 8, 35
+27468: 43, 8, 36
+27469: 43, 8, 37
+27470: 43, 8, 38
+27471: 43, 8, 39
+27472: 43, 8, 40
+27473: 43, 8, 41
+27474: 43, 8, 42
+27475: 43, 8, 43
+27476: 43, 8, 44
+27477: 43, 8, 45
+27478: 43, 8, 46
+27479: 43, 8, 47
+27480: 43, 8, 48
+27481: 43, 8, 49
+27482: 43, 8, 50
+27483: 43, 8, 51
+27484: 43, 8, 52
+27485: 43, 8, 53
+27486: 43, 8, 54
+27487: 43, 8, 55
+27488: 43, 8, 56
+27489: 43, 8, 57
+27490: 43, 8, 58
+27491: 43, 8, 59
+27492: 43, 9, 0
+27493: 43, 9, 1
+27494: 43, 9, 2
+27495: 43, 9, 3
+27496: 43, 9, 4
+27497: 43, 9, 5
+27498: 43, 9, 6
+27499: 43, 9, 7
+27500: 43, 9, 8
+27501: 43, 9, 9
+27502: 43, 9, 10
+27503: 43, 9, 11
+27504: 43, 9, 12
+27505: 43, 9, 13
+27506: 43, 9, 14
+27507: 43, 9, 15
+27508: 43, 9, 16
+27509: 43, 9, 17
+27510: 43, 9, 18
+27511: 43, 9, 19
+27512: 43, 9, 20
+27513: 43, 9, 21
+27514: 43, 9, 22
+27515: 43, 9, 23
+27516: 43, 9, 24
+27517: 43, 9, 25
+27518: 43, 9, 26
+27519: 43, 9, 27
+27520: 43, 9, 28
+27521: 43, 9, 29
+27522: 43, 9, 30
+27523: 43, 9, 31
+27524: 43, 9, 32
+27525: 43, 9, 33
+27526: 43, 9, 34
+27527: 43, 9, 35
+27528: 43, 9, 36
+27529: 43, 9, 37
+27530: 43, 9, 38
+27531: 43, 9, 39
+27532: 43, 9, 40
+27533: 43, 9, 41
+27534: 43, 10, 0
+27535: 43, 10, 1
+27536: 43, 10, 2
+27537: 43, 10, 3
+27538: 43, 10, 4
+27539: 43, 10, 5
+27540: 43, 10, 6
+27541: 43, 10, 7
+27542: 43, 10, 8
+27543: 43, 10, 9
+27544: 43, 10, 10
+27545: 43, 10, 11
+27546: 43, 10, 12
+27547: 43, 10, 13
+27548: 43, 10, 14
+27549: 43, 10, 15
+27550: 43, 10, 16
+27551: 43, 10, 17
+27552: 43, 10, 18
+27553: 43, 10, 19
+27554: 43, 10, 20
+27555: 43, 10, 21
+27556: 43, 10, 22
+27557: 43, 10, 23
+27558: 43, 10, 24
+27559: 43, 10, 25
+27560: 43, 10, 26
+27561: 43, 10, 27
+27562: 43, 10, 28
+27563: 43, 10, 29
+27564: 43, 10, 30
+27565: 43, 10, 31
+27566: 43, 10, 32
+27567: 43, 10, 33
+27568: 43, 10, 34
+27569: 43, 10, 35
+27570: 43, 10, 36
+27571: 43, 10, 37
+27572: 43, 10, 38
+27573: 43, 10, 39
+27574: 43, 10, 40
+27575: 43, 10, 41
+27576: 43, 10, 42
+27577: 43, 11, 0
+27578: 43, 11, 1
+27579: 43, 11, 2
+27580: 43, 11, 3
+27581: 43, 11, 4
+27582: 43, 11, 5
+27583: 43, 11, 6
+27584: 43, 11, 7
+27585: 43, 11, 8
+27586: 43, 11, 9
+27587: 43, 11, 10
+27588: 43, 11, 11
+27589: 43, 11, 12
+27590: 43, 11, 13
+27591: 43, 11, 14
+27592: 43, 11, 15
+27593: 43, 11, 16
+27594: 43, 11, 17
+27595: 43, 11, 18
+27596: 43, 11, 19
+27597: 43, 11, 20
+27598: 43, 11, 21
+27599: 43, 11, 22
+27600: 43, 11, 23
+27601: 43, 11, 24
+27602: 43, 11, 25
+27603: 43, 11, 26
+27604: 43, 11, 27
+27605: 43, 11, 28
+27606: 43, 11, 29
+27607: 43, 11, 30
+27608: 43, 11, 31
+27609: 43, 11, 32
+27610: 43, 11, 33
+27611: 43, 11, 34
+27612: 43, 11, 35
+27613: 43, 11, 36
+27614: 43, 11, 37
+27615: 43, 11, 38
+27616: 43, 11, 39
+27617: 43, 11, 40
+27618: 43, 11, 41
+27619: 43, 11, 42
+27620: 43, 11, 43
+27621: 43, 11, 44
+27622: 43, 11, 45
+27623: 43, 11, 46
+27624: 43, 11, 47
+27625: 43, 11, 48
+27626: 43, 11, 49
+27627: 43, 11, 50
+27628: 43, 11, 51
+27629: 43, 11, 52
+27630: 43, 11, 53
+27631: 43, 11, 54
+27632: 43, 11, 55
+27633: 43, 11, 56
+27634: 43, 11, 57
+27635: 43, 12, 0
+27636: 43, 12, 1
+27637: 43, 12, 2
+27638: 43, 12, 3
+27639: 43, 12, 4
+27640: 43, 12, 5
+27641: 43, 12, 6
+27642: 43, 12, 7
+27643: 43, 12, 8
+27644: 43, 12, 9
+27645: 43, 12, 10
+27646: 43, 12, 11
+27647: 43, 12, 12
+27648: 43, 12, 13
+27649: 43, 12, 14
+27650: 43, 12, 15
+27651: 43, 12, 16
+27652: 43, 12, 17
+27653: 43, 12, 18
+27654: 43, 12, 19
+27655: 43, 12, 20
+27656: 43, 12, 21
+27657: 43, 12, 22
+27658: 43, 12, 23
+27659: 43, 12, 24
+27660: 43, 12, 25
+27661: 43, 12, 26
+27662: 43, 12, 27
+27663: 43, 12, 28
+27664: 43, 12, 29
+27665: 43, 12, 30
+27666: 43, 12, 31
+27667: 43, 12, 32
+27668: 43, 12, 33
+27669: 43, 12, 34
+27670: 43, 12, 35
+27671: 43, 12, 36
+27672: 43, 12, 37
+27673: 43, 12, 38
+27674: 43, 12, 39
+27675: 43, 12, 40
+27676: 43, 12, 41
+27677: 43, 12, 42
+27678: 43, 12, 43
+27679: 43, 12, 44
+27680: 43, 12, 45
+27681: 43, 12, 46
+27682: 43, 12, 47
+27683: 43, 12, 48
+27684: 43, 12, 49
+27685: 43, 12, 50
+27686: 43, 13, 0
+27687: 43, 13, 1
+27688: 43, 13, 2
+27689: 43, 13, 3
+27690: 43, 13, 4
+27691: 43, 13, 5
+27692: 43, 13, 6
+27693: 43, 13, 7
+27694: 43, 13, 8
+27695: 43, 13, 9
+27696: 43, 13, 10
+27697: 43, 13, 11
+27698: 43, 13, 12
+27699: 43, 13, 13
+27700: 43, 13, 14
+27701: 43, 13, 15
+27702: 43, 13, 16
+27703: 43, 13, 17
+27704: 43, 13, 18
+27705: 43, 13, 19
+27706: 43, 13, 20
+27707: 43, 13, 21
+27708: 43, 13, 22
+27709: 43, 13, 23
+27710: 43, 13, 24
+27711: 43, 13, 25
+27712: 43, 13, 26
+27713: 43, 13, 27
+27714: 43, 13, 28
+27715: 43, 13, 29
+27716: 43, 13, 30
+27717: 43, 13, 31
+27718: 43, 13, 32
+27719: 43, 13, 33
+27720: 43, 13, 34
+27721: 43, 13, 35
+27722: 43, 13, 36
+27723: 43, 13, 37
+27724: 43, 13, 38
+27725: 43, 14, 0
+27726: 43, 14, 1
+27727: 43, 14, 2
+27728: 43, 14, 3
+27729: 43, 14, 4
+27730: 43, 14, 5
+27731: 43, 14, 6
+27732: 43, 14, 7
+27733: 43, 14, 8
+27734: 43, 14, 9
+27735: 43, 14, 10
+27736: 43, 14, 11
+27737: 43, 14, 12
+27738: 43, 14, 13
+27739: 43, 14, 14
+27740: 43, 14, 15
+27741: 43, 14, 16
+27742: 43, 14, 17
+27743: 43, 14, 18
+27744: 43, 14, 19
+27745: 43, 14, 20
+27746: 43, 14, 21
+27747: 43, 14, 22
+27748: 43, 14, 23
+27749: 43, 14, 24
+27750: 43, 14, 25
+27751: 43, 14, 26
+27752: 43, 14, 27
+27753: 43, 14, 28
+27754: 43, 14, 29
+27755: 43, 14, 30
+27756: 43, 14, 31
+27757: 43, 15, 0
+27758: 43, 15, 1
+27759: 43, 15, 2
+27760: 43, 15, 3
+27761: 43, 15, 4
+27762: 43, 15, 5
+27763: 43, 15, 6
+27764: 43, 15, 7
+27765: 43, 15, 8
+27766: 43, 15, 9
+27767: 43, 15, 10
+27768: 43, 15, 11
+27769: 43, 15, 12
+27770: 43, 15, 13
+27771: 43, 15, 14
+27772: 43, 15, 15
+27773: 43, 15, 16
+27774: 43, 15, 17
+27775: 43, 15, 18
+27776: 43, 15, 19
+27777: 43, 15, 20
+27778: 43, 15, 21
+27779: 43, 15, 22
+27780: 43, 15, 23
+27781: 43, 15, 24
+27782: 43, 15, 25
+27783: 43, 15, 26
+27784: 43, 15, 27
+27785: 43, 16, 0
+27786: 43, 16, 1
+27787: 43, 16, 2
+27788: 43, 16, 3
+27789: 43, 16, 4
+27790: 43, 16, 5
+27791: 43, 16, 6
+27792: 43, 16, 7
+27793: 43, 16, 8
+27794: 43, 16, 9
+27795: 43, 16, 10
+27796: 43, 16, 11
+27797: 43, 16, 12
+27798: 43, 16, 13
+27799: 43, 16, 14
+27800: 43, 16, 15
+27801: 43, 16, 16
+27802: 43, 16, 17
+27803: 43, 16, 18
+27804: 43, 16, 19
+27805: 43, 16, 20
+27806: 43, 16, 21
+27807: 43, 16, 22
+27808: 43, 16, 23
+27809: 43, 16, 24
+27810: 43, 16, 25
+27811: 43, 16, 26
+27812: 43, 16, 27
+27813: 43, 16, 28
+27814: 43, 16, 29
+27815: 43, 16, 30
+27816: 43, 16, 31
+27817: 43, 16, 32
+27818: 43, 16, 33
+27819: 43, 17, 0
+27820: 43, 17, 1
+27821: 43, 17, 2
+27822: 43, 17, 3
+27823: 43, 17, 4
+27824: 43, 17, 5
+27825: 43, 17, 6
+27826: 43, 17, 7
+27827: 43, 17, 8
+27828: 43, 17, 9
+27829: 43, 17, 10
+27830: 43, 17, 11
+27831: 43, 17, 12
+27832: 43, 17, 13
+27833: 43, 17, 14
+27834: 43, 17, 15
+27835: 43, 17, 16
+27836: 43, 17, 17
+27837: 43, 17, 18
+27838: 43, 17, 19
+27839: 43, 17, 20
+27840: 43, 17, 21
+27841: 43, 17, 22
+27842: 43, 17, 23
+27843: 43, 17, 24
+27844: 43, 17, 25
+27845: 43, 17, 26
+27846: 43, 18, 0
+27847: 43, 18, 1
+27848: 43, 18, 2
+27849: 43, 18, 3
+27850: 43, 18, 4
+27851: 43, 18, 5
+27852: 43, 18, 6
+27853: 43, 18, 7
+27854: 43, 18, 8
+27855: 43, 18, 9
+27856: 43, 18, 10
+27857: 43, 18, 11
+27858: 43, 18, 12
+27859: 43, 18, 13
+27860: 43, 18, 14
+27861: 43, 18, 15
+27862: 43, 18, 16
+27863: 43, 18, 17
+27864: 43, 18, 18
+27865: 43, 18, 19
+27866: 43, 18, 20
+27867: 43, 18, 21
+27868: 43, 18, 22
+27869: 43, 18, 23
+27870: 43, 18, 24
+27871: 43, 18, 25
+27872: 43, 18, 26
+27873: 43, 18, 27
+27874: 43, 18, 28
+27875: 43, 18, 29
+27876: 43, 18, 30
+27877: 43, 18, 31
+27878: 43, 18, 32
+27879: 43, 18, 33
+27880: 43, 18, 34
+27881: 43, 18, 35
+27882: 43, 18, 36
+27883: 43, 18, 37
+27884: 43, 18, 38
+27885: 43, 18, 39
+27886: 43, 18, 40
+27887: 43, 19, 0
+27888: 43, 19, 1
+27889: 43, 19, 2
+27890: 43, 19, 3
+27891: 43, 19, 4
+27892: 43, 19, 5
+27893: 43, 19, 6
+27894: 43, 19, 7
+27895: 43, 19, 8
+27896: 43, 19, 9
+27897: 43, 19, 10
+27898: 43, 19, 11
+27899: 43, 19, 12
+27900: 43, 19, 13
+27901: 43, 19, 14
+27902: 43, 19, 15
+27903: 43, 19, 16
+27904: 43, 19, 17
+27905: 43, 19, 18
+27906: 43, 19, 19
+27907: 43, 19, 20
+27908: 43, 19, 21
+27909: 43, 19, 22
+27910: 43, 19, 23
+27911: 43, 19, 24
+27912: 43, 19, 25
+27913: 43, 19, 26
+27914: 43, 19, 27
+27915: 43, 19, 28
+27916: 43, 19, 29
+27917: 43, 19, 30
+27918: 43, 19, 31
+27919: 43, 19, 32
+27920: 43, 19, 33
+27921: 43, 19, 34
+27922: 43, 19, 35
+27923: 43, 19, 36
+27924: 43, 19, 37
+27925: 43, 19, 38
+27926: 43, 19, 39
+27927: 43, 19, 40
+27928: 43, 19, 41
+27929: 43, 19, 42
+27930: 43, 20, 0
+27931: 43, 20, 1
+27932: 43, 20, 2
+27933: 43, 20, 3
+27934: 43, 20, 4
+27935: 43, 20, 5
+27936: 43, 20, 6
+27937: 43, 20, 7
+27938: 43, 20, 8
+27939: 43, 20, 9
+27940: 43, 20, 10
+27941: 43, 20, 11
+27942: 43, 20, 12
+27943: 43, 20, 13
+27944: 43, 20, 14
+27945: 43, 20, 15
+27946: 43, 20, 16
+27947: 43, 20, 17
+27948: 43, 20, 18
+27949: 43, 20, 19
+27950: 43, 20, 20
+27951: 43, 20, 21
+27952: 43, 20, 22
+27953: 43, 20, 23
+27954: 43, 20, 24
+27955: 43, 20, 25
+27956: 43, 20, 26
+27957: 43, 20, 27
+27958: 43, 20, 28
+27959: 43, 20, 29
+27960: 43, 20, 30
+27961: 43, 20, 31
+27962: 43, 21, 0
+27963: 43, 21, 1
+27964: 43, 21, 2
+27965: 43, 21, 3
+27966: 43, 21, 4
+27967: 43, 21, 5
+27968: 43, 21, 6
+27969: 43, 21, 7
+27970: 43, 21, 8
+27971: 43, 21, 9
+27972: 43, 21, 10
+27973: 43, 21, 11
+27974: 43, 21, 12
+27975: 43, 21, 13
+27976: 43, 21, 14
+27977: 43, 21, 15
+27978: 43, 21, 16
+27979: 43, 21, 17
+27980: 43, 21, 18
+27981: 43, 21, 19
+27982: 43, 21, 20
+27983: 43, 21, 21
+27984: 43, 21, 22
+27985: 43, 21, 23
+27986: 43, 21, 24
+27987: 43, 21, 25
+27988: 44, 0, 0
+27989: 44, 1, 0
+27990: 44, 1, 1
+27991: 44, 1, 2
+27992: 44, 1, 3
+27993: 44, 1, 4
+27994: 44, 1, 5
+27995: 44, 1, 6
+27996: 44, 1, 7
+27997: 44, 1, 8
+27998: 44, 1, 9
+27999: 44, 1, 10
+28000: 44, 1, 11
+28001: 44, 1, 12
+28002: 44, 1, 13
+28003: 44, 1, 14
+28004: 44, 1, 15
+28005: 44, 1, 16
+28006: 44, 1, 17
+28007: 44, 1, 18
+28008: 44, 1, 19
+28009: 44, 1, 20
+28010: 44, 1, 21
+28011: 44, 1, 22
+28012: 44, 1, 23
+28013: 44, 1, 24
+28014: 44, 1, 25
+28015: 44, 1, 26
+28016: 44, 2, 0
+28017: 44, 2, 1
+28018: 44, 2, 2
+28019: 44, 2, 3
+28020: 44, 2, 4
+28021: 44, 2, 5
+28022: 44, 2, 6
+28023: 44, 2, 7
+28024: 44, 2, 8
+28025: 44, 2, 9
+28026: 44, 2, 10
+28027: 44, 2, 11
+28028: 44, 2, 12
+28029: 44, 2, 13
+28030: 44, 2, 14
+28031: 44, 2, 15
+28032: 44, 2, 16
+28033: 44, 2, 17
+28034: 44, 2, 18
+28035: 44, 2, 19
+28036: 44, 2, 20
+28037: 44, 2, 21
+28038: 44, 2, 22
+28039: 44, 2, 23
+28040: 44, 2, 24
+28041: 44, 2, 25
+28042: 44, 2, 26
+28043: 44, 2, 27
+28044: 44, 2, 28
+28045: 44, 2, 29
+28046: 44, 2, 30
+28047: 44, 2, 31
+28048: 44, 2, 32
+28049: 44, 2, 33
+28050: 44, 2, 34
+28051: 44, 2, 35
+28052: 44, 2, 36
+28053: 44, 2, 37
+28054: 44, 2, 38
+28055: 44, 2, 39
+28056: 44, 2, 40
+28057: 44, 2, 41
+28058: 44, 2, 42
+28059: 44, 2, 43
+28060: 44, 2, 44
+28061: 44, 2, 45
+28062: 44, 2, 46
+28063: 44, 2, 47
+28064: 44, 3, 0
+28065: 44, 3, 1
+28066: 44, 3, 2
+28067: 44, 3, 3
+28068: 44, 3, 4
+28069: 44, 3, 5
+28070: 44, 3, 6
+28071: 44, 3, 7
+28072: 44, 3, 8
+28073: 44, 3, 9
+28074: 44, 3, 10
+28075: 44, 3, 11
+28076: 44, 3, 12
+28077: 44, 3, 13
+28078: 44, 3, 14
+28079: 44, 3, 15
+28080: 44, 3, 16
+28081: 44, 3, 17
+28082: 44, 3, 18
+28083: 44, 3, 19
+28084: 44, 3, 20
+28085: 44, 3, 21
+28086: 44, 3, 22
+28087: 44, 3, 23
+28088: 44, 3, 24
+28089: 44, 3, 25
+28090: 44, 3, 26
+28091: 44, 4, 0
+28092: 44, 4, 1
+28093: 44, 4, 2
+28094: 44, 4, 3
+28095: 44, 4, 4
+28096: 44, 4, 5
+28097: 44, 4, 6
+28098: 44, 4, 7
+28099: 44, 4, 8
+28100: 44, 4, 9
+28101: 44, 4, 10
+28102: 44, 4, 11
+28103: 44, 4, 12
+28104: 44, 4, 13
+28105: 44, 4, 14
+28106: 44, 4, 15
+28107: 44, 4, 16
+28108: 44, 4, 17
+28109: 44, 4, 18
+28110: 44, 4, 19
+28111: 44, 4, 20
+28112: 44, 4, 21
+28113: 44, 4, 22
+28114: 44, 4, 23
+28115: 44, 4, 24
+28116: 44, 4, 25
+28117: 44, 4, 26
+28118: 44, 4, 27
+28119: 44, 4, 28
+28120: 44, 4, 29
+28121: 44, 4, 30
+28122: 44, 4, 31
+28123: 44, 4, 32
+28124: 44, 4, 33
+28125: 44, 4, 34
+28126: 44, 4, 35
+28127: 44, 4, 36
+28128: 44, 4, 37
+28129: 44, 5, 0
+28130: 44, 5, 1
+28131: 44, 5, 2
+28132: 44, 5, 3
+28133: 44, 5, 4
+28134: 44, 5, 5
+28135: 44, 5, 6
+28136: 44, 5, 7
+28137: 44, 5, 8
+28138: 44, 5, 9
+28139: 44, 5, 10
+28140: 44, 5, 11
+28141: 44, 5, 12
+28142: 44, 5, 13
+28143: 44, 5, 14
+28144: 44, 5, 15
+28145: 44, 5, 16
+28146: 44, 5, 17
+28147: 44, 5, 18
+28148: 44, 5, 19
+28149: 44, 5, 20
+28150: 44, 5, 21
+28151: 44, 5, 22
+28152: 44, 5, 23
+28153: 44, 5, 24
+28154: 44, 5, 25
+28155: 44, 5, 26
+28156: 44, 5, 27
+28157: 44, 5, 28
+28158: 44, 5, 29
+28159: 44, 5, 30
+28160: 44, 5, 31
+28161: 44, 5, 32
+28162: 44, 5, 33
+28163: 44, 5, 34
+28164: 44, 5, 35
+28165: 44, 5, 36
+28166: 44, 5, 37
+28167: 44, 5, 38
+28168: 44, 5, 39
+28169: 44, 5, 40
+28170: 44, 5, 41
+28171: 44, 5, 42
+28172: 44, 6, 0
+28173: 44, 6, 1
+28174: 44, 6, 2
+28175: 44, 6, 3
+28176: 44, 6, 4
+28177: 44, 6, 5
+28178: 44, 6, 6
+28179: 44, 6, 7
+28180: 44, 6, 8
+28181: 44, 6, 9
+28182: 44, 6, 10
+28183: 44, 6, 11
+28184: 44, 6, 12
+28185: 44, 6, 13
+28186: 44, 6, 14
+28187: 44, 6, 15
+28188: 44, 7, 0
+28189: 44, 7, 1
+28190: 44, 7, 2
+28191: 44, 7, 3
+28192: 44, 7, 4
+28193: 44, 7, 5
+28194: 44, 7, 6
+28195: 44, 7, 7
+28196: 44, 7, 8
+28197: 44, 7, 9
+28198: 44, 7, 10
+28199: 44, 7, 11
+28200: 44, 7, 12
+28201: 44, 7, 13
+28202: 44, 7, 14
+28203: 44, 7, 15
+28204: 44, 7, 16
+28205: 44, 7, 17
+28206: 44, 7, 18
+28207: 44, 7, 19
+28208: 44, 7, 20
+28209: 44, 7, 21
+28210: 44, 7, 22
+28211: 44, 7, 23
+28212: 44, 7, 24
+28213: 44, 7, 25
+28214: 44, 7, 26
+28215: 44, 7, 27
+28216: 44, 7, 28
+28217: 44, 7, 29
+28218: 44, 7, 30
+28219: 44, 7, 31
+28220: 44, 7, 32
+28221: 44, 7, 33
+28222: 44, 7, 34
+28223: 44, 7, 35
+28224: 44, 7, 36
+28225: 44, 7, 37
+28226: 44, 7, 38
+28227: 44, 7, 39
+28228: 44, 7, 40
+28229: 44, 7, 41
+28230: 44, 7, 42
+28231: 44, 7, 43
+28232: 44, 7, 44
+28233: 44, 7, 45
+28234: 44, 7, 46
+28235: 44, 7, 47
+28236: 44, 7, 48
+28237: 44, 7, 49
+28238: 44, 7, 50
+28239: 44, 7, 51
+28240: 44, 7, 52
+28241: 44, 7, 53
+28242: 44, 7, 54
+28243: 44, 7, 55
+28244: 44, 7, 56
+28245: 44, 7, 57
+28246: 44, 7, 58
+28247: 44, 7, 59
+28248: 44, 7, 60
+28249: 44, 8, 0
+28250: 44, 8, 1
+28251: 44, 8, 2
+28252: 44, 8, 3
+28253: 44, 8, 4
+28254: 44, 8, 5
+28255: 44, 8, 6
+28256: 44, 8, 7
+28257: 44, 8, 8
+28258: 44, 8, 9
+28259: 44, 8, 10
+28260: 44, 8, 11
+28261: 44, 8, 12
+28262: 44, 8, 13
+28263: 44, 8, 14
+28264: 44, 8, 15
+28265: 44, 8, 16
+28266: 44, 8, 17
+28267: 44, 8, 18
+28268: 44, 8, 19
+28269: 44, 8, 20
+28270: 44, 8, 21
+28271: 44, 8, 22
+28272: 44, 8, 23
+28273: 44, 8, 24
+28274: 44, 8, 25
+28275: 44, 8, 26
+28276: 44, 8, 27
+28277: 44, 8, 28
+28278: 44, 8, 29
+28279: 44, 8, 30
+28280: 44, 8, 31
+28281: 44, 8, 32
+28282: 44, 8, 33
+28283: 44, 8, 34
+28284: 44, 8, 35
+28285: 44, 8, 36
+28286: 44, 8, 37
+28287: 44, 8, 38
+28288: 44, 8, 39
+28289: 44, 8, 40
+28290: 44, 9, 0
+28291: 44, 9, 1
+28292: 44, 9, 2
+28293: 44, 9, 3
+28294: 44, 9, 4
+28295: 44, 9, 5
+28296: 44, 9, 6
+28297: 44, 9, 7
+28298: 44, 9, 8
+28299: 44, 9, 9
+28300: 44, 9, 10
+28301: 44, 9, 11
+28302: 44, 9, 12
+28303: 44, 9, 13
+28304: 44, 9, 14
+28305: 44, 9, 15
+28306: 44, 9, 16
+28307: 44, 9, 17
+28308: 44, 9, 18
+28309: 44, 9, 19
+28310: 44, 9, 20
+28311: 44, 9, 21
+28312: 44, 9, 22
+28313: 44, 9, 23
+28314: 44, 9, 24
+28315: 44, 9, 25
+28316: 44, 9, 26
+28317: 44, 9, 27
+28318: 44, 9, 28
+28319: 44, 9, 29
+28320: 44, 9, 30
+28321: 44, 9, 31
+28322: 44, 9, 32
+28323: 44, 9, 33
+28324: 44, 9, 34
+28325: 44, 9, 35
+28326: 44, 9, 36
+28327: 44, 9, 37
+28328: 44, 9, 38
+28329: 44, 9, 39
+28330: 44, 9, 40
+28331: 44, 9, 41
+28332: 44, 9, 42
+28333: 44, 9, 43
+28334: 44, 10, 0
+28335: 44, 10, 1
+28336: 44, 10, 2
+28337: 44, 10, 3
+28338: 44, 10, 4
+28339: 44, 10, 5
+28340: 44, 10, 6
+28341: 44, 10, 7
+28342: 44, 10, 8
+28343: 44, 10, 9
+28344: 44, 10, 10
+28345: 44, 10, 11
+28346: 44, 10, 12
+28347: 44, 10, 13
+28348: 44, 10, 14
+28349: 44, 10, 15
+28350: 44, 10, 16
+28351: 44, 10, 17
+28352: 44, 10, 18
+28353: 44, 10, 19
+28354: 44, 10, 20
+28355: 44, 10, 21
+28356: 44, 10, 22
+28357: 44, 10, 23
+28358: 44, 10, 24
+28359: 44, 10, 25
+28360: 44, 10, 26
+28361: 44, 10, 27
+28362: 44, 10, 28
+28363: 44, 10, 29
+28364: 44, 10, 30
+28365: 44, 10, 31
+28366: 44, 10, 32
+28367: 44, 10, 33
+28368: 44, 10, 34
+28369: 44, 10, 35
+28370: 44, 10, 36
+28371: 44, 10, 37
+28372: 44, 10, 38
+28373: 44, 10, 39
+28374: 44, 10, 40
+28375: 44, 10, 41
+28376: 44, 10, 42
+28377: 44, 10, 43
+28378: 44, 10, 44
+28379: 44, 10, 45
+28380: 44, 10, 46
+28381: 44, 10, 47
+28382: 44, 10, 48
+28383: 44, 11, 0
+28384: 44, 11, 1
+28385: 44, 11, 2
+28386: 44, 11, 3
+28387: 44, 11, 4
+28388: 44, 11, 5
+28389: 44, 11, 6
+28390: 44, 11, 7
+28391: 44, 11, 8
+28392: 44, 11, 9
+28393: 44, 11, 10
+28394: 44, 11, 11
+28395: 44, 11, 12
+28396: 44, 11, 13
+28397: 44, 11, 14
+28398: 44, 11, 15
+28399: 44, 11, 16
+28400: 44, 11, 17
+28401: 44, 11, 18
+28402: 44, 11, 19
+28403: 44, 11, 20
+28404: 44, 11, 21
+28405: 44, 11, 22
+28406: 44, 11, 23
+28407: 44, 11, 24
+28408: 44, 11, 25
+28409: 44, 11, 26
+28410: 44, 11, 27
+28411: 44, 11, 28
+28412: 44, 11, 29
+28413: 44, 11, 30
+28414: 44, 12, 0
+28415: 44, 12, 1
+28416: 44, 12, 2
+28417: 44, 12, 3
+28418: 44, 12, 4
+28419: 44, 12, 5
+28420: 44, 12, 6
+28421: 44, 12, 7
+28422: 44, 12, 8
+28423: 44, 12, 9
+28424: 44, 12, 10
+28425: 44, 12, 11
+28426: 44, 12, 12
+28427: 44, 12, 13
+28428: 44, 12, 14
+28429: 44, 12, 15
+28430: 44, 12, 16
+28431: 44, 12, 17
+28432: 44, 12, 18
+28433: 44, 12, 19
+28434: 44, 12, 20
+28435: 44, 12, 21
+28436: 44, 12, 22
+28437: 44, 12, 23
+28438: 44, 12, 24
+28439: 44, 12, 25
+28440: 44, 13, 0
+28441: 44, 13, 1
+28442: 44, 13, 2
+28443: 44, 13, 3
+28444: 44, 13, 4
+28445: 44, 13, 5
+28446: 44, 13, 6
+28447: 44, 13, 7
+28448: 44, 13, 8
+28449: 44, 13, 9
+28450: 44, 13, 10
+28451: 44, 13, 11
+28452: 44, 13, 12
+28453: 44, 13, 13
+28454: 44, 13, 14
+28455: 44, 13, 15
+28456: 44, 13, 16
+28457: 44, 13, 17
+28458: 44, 13, 18
+28459: 44, 13, 19
+28460: 44, 13, 20
+28461: 44, 13, 21
+28462: 44, 13, 22
+28463: 44, 13, 23
+28464: 44, 13, 24
+28465: 44, 13, 25
+28466: 44, 13, 26
+28467: 44, 13, 27
+28468: 44, 13, 28
+28469: 44, 13, 29
+28470: 44, 13, 30
+28471: 44, 13, 31
+28472: 44, 13, 32
+28473: 44, 13, 33
+28474: 44, 13, 34
+28475: 44, 13, 35
+28476: 44, 13, 36
+28477: 44, 13, 37
+28478: 44, 13, 38
+28479: 44, 13, 39
+28480: 44, 13, 40
+28481: 44, 13, 41
+28482: 44, 13, 42
+28483: 44, 13, 43
+28484: 44, 13, 44
+28485: 44, 13, 45
+28486: 44, 13, 46
+28487: 44, 13, 47
+28488: 44, 13, 48
+28489: 44, 13, 49
+28490: 44, 13, 50
+28491: 44, 13, 51
+28492: 44, 13, 52
+28493: 44, 14, 0
+28494: 44, 14, 1
+28495: 44, 14, 2
+28496: 44, 14, 3
+28497: 44, 14, 4
+28498: 44, 14, 5
+28499: 44, 14, 6
+28500: 44, 14, 7
+28501: 44, 14, 8
+28502: 44, 14, 9
+28503: 44, 14, 10
+28504: 44, 14, 11
+28505: 44, 14, 12
+28506: 44, 14, 13
+28507: 44, 14, 14
+28508: 44, 14, 15
+28509: 44, 14, 16
+28510: 44, 14, 17
+28511: 44, 14, 18
+28512: 44, 14, 19
+28513: 44, 14, 20
+28514: 44, 14, 21
+28515: 44, 14, 22
+28516: 44, 14, 23
+28517: 44, 14, 24
+28518: 44, 14, 25
+28519: 44, 14, 26
+28520: 44, 14, 27
+28521: 44, 14, 28
+28522: 44, 15, 0
+28523: 44, 15, 1
+28524: 44, 15, 2
+28525: 44, 15, 3
+28526: 44, 15, 4
+28527: 44, 15, 5
+28528: 44, 15, 6
+28529: 44, 15, 7
+28530: 44, 15, 8
+28531: 44, 15, 9
+28532: 44, 15, 10
+28533: 44, 15, 11
+28534: 44, 15, 12
+28535: 44, 15, 13
+28536: 44, 15, 14
+28537: 44, 15, 15
+28538: 44, 15, 16
+28539: 44, 15, 17
+28540: 44, 15, 18
+28541: 44, 15, 19
+28542: 44, 15, 20
+28543: 44, 15, 21
+28544: 44, 15, 22
+28545: 44, 15, 23
+28546: 44, 15, 24
+28547: 44, 15, 25
+28548: 44, 15, 26
+28549: 44, 15, 27
+28550: 44, 15, 28
+28551: 44, 15, 29
+28552: 44, 15, 30
+28553: 44, 15, 31
+28554: 44, 15, 32
+28555: 44, 15, 33
+28556: 44, 15, 34
+28557: 44, 15, 35
+28558: 44, 15, 36
+28559: 44, 15, 37
+28560: 44, 15, 38
+28561: 44, 15, 39
+28562: 44, 15, 40
+28563: 44, 15, 41
+28564: 44, 16, 0
+28565: 44, 16, 1
+28566: 44, 16, 2
+28567: 44, 16, 3
+28568: 44, 16, 4
+28569: 44, 16, 5
+28570: 44, 16, 6
+28571: 44, 16, 7
+28572: 44, 16, 8
+28573: 44, 16, 9
+28574: 44, 16, 10
+28575: 44, 16, 11
+28576: 44, 16, 12
+28577: 44, 16, 13
+28578: 44, 16, 14
+28579: 44, 16, 15
+28580: 44, 16, 16
+28581: 44, 16, 17
+28582: 44, 16, 18
+28583: 44, 16, 19
+28584: 44, 16, 20
+28585: 44, 16, 21
+28586: 44, 16, 22
+28587: 44, 16, 23
+28588: 44, 16, 24
+28589: 44, 16, 25
+28590: 44, 16, 26
+28591: 44, 16, 27
+28592: 44, 16, 28
+28593: 44, 16, 29
+28594: 44, 16, 30
+28595: 44, 16, 31
+28596: 44, 16, 32
+28597: 44, 16, 33
+28598: 44, 16, 34
+28599: 44, 16, 35
+28600: 44, 16, 36
+28601: 44, 16, 37
+28602: 44, 16, 38
+28603: 44, 16, 39
+28604: 44, 16, 40
+28605: 44, 17, 0
+28606: 44, 17, 1
+28607: 44, 17, 2
+28608: 44, 17, 3
+28609: 44, 17, 4
+28610: 44, 17, 5
+28611: 44, 17, 6
+28612: 44, 17, 7
+28613: 44, 17, 8
+28614: 44, 17, 9
+28615: 44, 17, 10
+28616: 44, 17, 11
+28617: 44, 17, 12
+28618: 44, 17, 13
+28619: 44, 17, 14
+28620: 44, 17, 15
+28621: 44, 17, 16
+28622: 44, 17, 17
+28623: 44, 17, 18
+28624: 44, 17, 19
+28625: 44, 17, 20
+28626: 44, 17, 21
+28627: 44, 17, 22
+28628: 44, 17, 23
+28629: 44, 17, 24
+28630: 44, 17, 25
+28631: 44, 17, 26
+28632: 44, 17, 27
+28633: 44, 17, 28
+28634: 44, 17, 29
+28635: 44, 17, 30
+28636: 44, 17, 31
+28637: 44, 17, 32
+28638: 44, 17, 33
+28639: 44, 17, 34
+28640: 44, 18, 0
+28641: 44, 18, 1
+28642: 44, 18, 2
+28643: 44, 18, 3
+28644: 44, 18, 4
+28645: 44, 18, 5
+28646: 44, 18, 6
+28647: 44, 18, 7
+28648: 44, 18, 8
+28649: 44, 18, 9
+28650: 44, 18, 10
+28651: 44, 18, 11
+28652: 44, 18, 12
+28653: 44, 18, 13
+28654: 44, 18, 14
+28655: 44, 18, 15
+28656: 44, 18, 16
+28657: 44, 18, 17
+28658: 44, 18, 18
+28659: 44, 18, 19
+28660: 44, 18, 20
+28661: 44, 18, 21
+28662: 44, 18, 22
+28663: 44, 18, 23
+28664: 44, 18, 24
+28665: 44, 18, 25
+28666: 44, 18, 26
+28667: 44, 18, 27
+28668: 44, 18, 28
+28669: 44, 19, 0
+28670: 44, 19, 1
+28671: 44, 19, 2
+28672: 44, 19, 3
+28673: 44, 19, 4
+28674: 44, 19, 5
+28675: 44, 19, 6
+28676: 44, 19, 7
+28677: 44, 19, 8
+28678: 44, 19, 9
+28679: 44, 19, 10
+28680: 44, 19, 11
+28681: 44, 19, 12
+28682: 44, 19, 13
+28683: 44, 19, 14
+28684: 44, 19, 15
+28685: 44, 19, 16
+28686: 44, 19, 17
+28687: 44, 19, 18
+28688: 44, 19, 19
+28689: 44, 19, 20
+28690: 44, 19, 21
+28691: 44, 19, 22
+28692: 44, 19, 23
+28693: 44, 19, 24
+28694: 44, 19, 25
+28695: 44, 19, 26
+28696: 44, 19, 27
+28697: 44, 19, 28
+28698: 44, 19, 29
+28699: 44, 19, 30
+28700: 44, 19, 31
+28701: 44, 19, 32
+28702: 44, 19, 33
+28703: 44, 19, 34
+28704: 44, 19, 35
+28705: 44, 19, 36
+28706: 44, 19, 37
+28707: 44, 19, 38
+28708: 44, 19, 39
+28709: 44, 19, 40
+28710: 44, 19, 41
+28711: 44, 20, 0
+28712: 44, 20, 1
+28713: 44, 20, 2
+28714: 44, 20, 3
+28715: 44, 20, 4
+28716: 44, 20, 5
+28717: 44, 20, 6
+28718: 44, 20, 7
+28719: 44, 20, 8
+28720: 44, 20, 9
+28721: 44, 20, 10
+28722: 44, 20, 11
+28723: 44, 20, 12
+28724: 44, 20, 13
+28725: 44, 20, 14
+28726: 44, 20, 15
+28727: 44, 20, 16
+28728: 44, 20, 17
+28729: 44, 20, 18
+28730: 44, 20, 19
+28731: 44, 20, 20
+28732: 44, 20, 21
+28733: 44, 20, 22
+28734: 44, 20, 23
+28735: 44, 20, 24
+28736: 44, 20, 25
+28737: 44, 20, 26
+28738: 44, 20, 27
+28739: 44, 20, 28
+28740: 44, 20, 29
+28741: 44, 20, 30
+28742: 44, 20, 31
+28743: 44, 20, 32
+28744: 44, 20, 33
+28745: 44, 20, 34
+28746: 44, 20, 35
+28747: 44, 20, 36
+28748: 44, 20, 37
+28749: 44, 20, 38
+28750: 44, 21, 0
+28751: 44, 21, 1
+28752: 44, 21, 2
+28753: 44, 21, 3
+28754: 44, 21, 4
+28755: 44, 21, 5
+28756: 44, 21, 6
+28757: 44, 21, 7
+28758: 44, 21, 8
+28759: 44, 21, 9
+28760: 44, 21, 10
+28761: 44, 21, 11
+28762: 44, 21, 12
+28763: 44, 21, 13
+28764: 44, 21, 14
+28765: 44, 21, 15
+28766: 44, 21, 16
+28767: 44, 21, 17
+28768: 44, 21, 18
+28769: 44, 21, 19
+28770: 44, 21, 20
+28771: 44, 21, 21
+28772: 44, 21, 22
+28773: 44, 21, 23
+28774: 44, 21, 24
+28775: 44, 21, 25
+28776: 44, 21, 26
+28777: 44, 21, 27
+28778: 44, 21, 28
+28779: 44, 21, 29
+28780: 44, 21, 30
+28781: 44, 21, 31
+28782: 44, 21, 32
+28783: 44, 21, 33
+28784: 44, 21, 34
+28785: 44, 21, 35
+28786: 44, 21, 36
+28787: 44, 21, 37
+28788: 44, 21, 38
+28789: 44, 21, 39
+28790: 44, 21, 40
+28791: 44, 22, 0
+28792: 44, 22, 1
+28793: 44, 22, 2
+28794: 44, 22, 3
+28795: 44, 22, 4
+28796: 44, 22, 5
+28797: 44, 22, 6
+28798: 44, 22, 7
+28799: 44, 22, 8
+28800: 44, 22, 9
+28801: 44, 22, 10
+28802: 44, 22, 11
+28803: 44, 22, 12
+28804: 44, 22, 13
+28805: 44, 22, 14
+28806: 44, 22, 15
+28807: 44, 22, 16
+28808: 44, 22, 17
+28809: 44, 22, 18
+28810: 44, 22, 19
+28811: 44, 22, 20
+28812: 44, 22, 21
+28813: 44, 22, 22
+28814: 44, 22, 23
+28815: 44, 22, 24
+28816: 44, 22, 25
+28817: 44, 22, 26
+28818: 44, 22, 27
+28819: 44, 22, 28
+28820: 44, 22, 29
+28821: 44, 22, 30
+28822: 44, 23, 0
+28823: 44, 23, 1
+28824: 44, 23, 2
+28825: 44, 23, 3
+28826: 44, 23, 4
+28827: 44, 23, 5
+28828: 44, 23, 6
+28829: 44, 23, 7
+28830: 44, 23, 8
+28831: 44, 23, 9
+28832: 44, 23, 10
+28833: 44, 23, 11
+28834: 44, 23, 12
+28835: 44, 23, 13
+28836: 44, 23, 14
+28837: 44, 23, 15
+28838: 44, 23, 16
+28839: 44, 23, 17
+28840: 44, 23, 18
+28841: 44, 23, 19
+28842: 44, 23, 20
+28843: 44, 23, 21
+28844: 44, 23, 22
+28845: 44, 23, 23
+28846: 44, 23, 24
+28847: 44, 23, 25
+28848: 44, 23, 26
+28849: 44, 23, 27
+28850: 44, 23, 28
+28851: 44, 23, 29
+28852: 44, 23, 30
+28853: 44, 23, 31
+28854: 44, 23, 32
+28855: 44, 23, 33
+28856: 44, 23, 34
+28857: 44, 23, 35
+28858: 44, 24, 0
+28859: 44, 24, 1
+28860: 44, 24, 2
+28861: 44, 24, 3
+28862: 44, 24, 4
+28863: 44, 24, 5
+28864: 44, 24, 6
+28865: 44, 24, 7
+28866: 44, 24, 8
+28867: 44, 24, 9
+28868: 44, 24, 10
+28869: 44, 24, 11
+28870: 44, 24, 12
+28871: 44, 24, 13
+28872: 44, 24, 14
+28873: 44, 24, 15
+28874: 44, 24, 16
+28875: 44, 24, 17
+28876: 44, 24, 18
+28877: 44, 24, 19
+28878: 44, 24, 20
+28879: 44, 24, 21
+28880: 44, 24, 22
+28881: 44, 24, 23
+28882: 44, 24, 24
+28883: 44, 24, 25
+28884: 44, 24, 26
+28885: 44, 24, 27
+28886: 44, 25, 0
+28887: 44, 25, 1
+28888: 44, 25, 2
+28889: 44, 25, 3
+28890: 44, 25, 4
+28891: 44, 25, 5
+28892: 44, 25, 6
+28893: 44, 25, 7
+28894: 44, 25, 8
+28895: 44, 25, 9
+28896: 44, 25, 10
+28897: 44, 25, 11
+28898: 44, 25, 12
+28899: 44, 25, 13
+28900: 44, 25, 14
+28901: 44, 25, 15
+28902: 44, 25, 16
+28903: 44, 25, 17
+28904: 44, 25, 18
+28905: 44, 25, 19
+28906: 44, 25, 20
+28907: 44, 25, 21
+28908: 44, 25, 22
+28909: 44, 25, 23
+28910: 44, 25, 24
+28911: 44, 25, 25
+28912: 44, 25, 26
+28913: 44, 25, 27
+28914: 44, 26, 0
+28915: 44, 26, 1
+28916: 44, 26, 2
+28917: 44, 26, 3
+28918: 44, 26, 4
+28919: 44, 26, 5
+28920: 44, 26, 6
+28921: 44, 26, 7
+28922: 44, 26, 8
+28923: 44, 26, 9
+28924: 44, 26, 10
+28925: 44, 26, 11
+28926: 44, 26, 12
+28927: 44, 26, 13
+28928: 44, 26, 14
+28929: 44, 26, 15
+28930: 44, 26, 16
+28931: 44, 26, 17
+28932: 44, 26, 18
+28933: 44, 26, 19
+28934: 44, 26, 20
+28935: 44, 26, 21
+28936: 44, 26, 22
+28937: 44, 26, 23
+28938: 44, 26, 24
+28939: 44, 26, 25
+28940: 44, 26, 26
+28941: 44, 26, 27
+28942: 44, 26, 28
+28943: 44, 26, 29
+28944: 44, 26, 30
+28945: 44, 26, 31
+28946: 44, 26, 32
+28947: 44, 27, 0
+28948: 44, 27, 1
+28949: 44, 27, 2
+28950: 44, 27, 3
+28951: 44, 27, 4
+28952: 44, 27, 5
+28953: 44, 27, 6
+28954: 44, 27, 7
+28955: 44, 27, 8
+28956: 44, 27, 9
+28957: 44, 27, 10
+28958: 44, 27, 11
+28959: 44, 27, 12
+28960: 44, 27, 13
+28961: 44, 27, 14
+28962: 44, 27, 15
+28963: 44, 27, 16
+28964: 44, 27, 17
+28965: 44, 27, 18
+28966: 44, 27, 19
+28967: 44, 27, 20
+28968: 44, 27, 21
+28969: 44, 27, 22
+28970: 44, 27, 23
+28971: 44, 27, 24
+28972: 44, 27, 25
+28973: 44, 27, 26
+28974: 44, 27, 27
+28975: 44, 27, 28
+28976: 44, 27, 29
+28977: 44, 27, 30
+28978: 44, 27, 31
+28979: 44, 27, 32
+28980: 44, 27, 33
+28981: 44, 27, 34
+28982: 44, 27, 35
+28983: 44, 27, 36
+28984: 44, 27, 37
+28985: 44, 27, 38
+28986: 44, 27, 39
+28987: 44, 27, 40
+28988: 44, 27, 41
+28989: 44, 27, 42
+28990: 44, 27, 43
+28991: 44, 27, 44
+28992: 44, 28, 0
+28993: 44, 28, 1
+28994: 44, 28, 2
+28995: 44, 28, 3
+28996: 44, 28, 4
+28997: 44, 28, 5
+28998: 44, 28, 6
+28999: 44, 28, 7
+29000: 44, 28, 8
+29001: 44, 28, 9
+29002: 44, 28, 10
+29003: 44, 28, 11
+29004: 44, 28, 12
+29005: 44, 28, 13
+29006: 44, 28, 14
+29007: 44, 28, 15
+29008: 44, 28, 16
+29009: 44, 28, 17
+29010: 44, 28, 18
+29011: 44, 28, 19
+29012: 44, 28, 20
+29013: 44, 28, 21
+29014: 44, 28, 22
+29015: 44, 28, 23
+29016: 44, 28, 24
+29017: 44, 28, 25
+29018: 44, 28, 26
+29019: 44, 28, 27
+29020: 44, 28, 28
+29021: 44, 28, 29
+29022: 44, 28, 30
+29023: 44, 28, 31
+29024: 45, 0, 0
+29025: 45, 1, 0
+29026: 45, 1, 1
+29027: 45, 1, 2
+29028: 45, 1, 3
+29029: 45, 1, 4
+29030: 45, 1, 5
+29031: 45, 1, 6
+29032: 45, 1, 7
+29033: 45, 1, 8
+29034: 45, 1, 9
+29035: 45, 1, 10
+29036: 45, 1, 11
+29037: 45, 1, 12
+29038: 45, 1, 13
+29039: 45, 1, 14
+29040: 45, 1, 15
+29041: 45, 1, 16
+29042: 45, 1, 17
+29043: 45, 1, 18
+29044: 45, 1, 19
+29045: 45, 1, 20
+29046: 45, 1, 21
+29047: 45, 1, 22
+29048: 45, 1, 23
+29049: 45, 1, 24
+29050: 45, 1, 25
+29051: 45, 1, 26
+29052: 45, 1, 27
+29053: 45, 1, 28
+29054: 45, 1, 29
+29055: 45, 1, 30
+29056: 45, 1, 31
+29057: 45, 1, 32
+29058: 45, 2, 0
+29059: 45, 2, 1
+29060: 45, 2, 2
+29061: 45, 2, 3
+29062: 45, 2, 4
+29063: 45, 2, 5
+29064: 45, 2, 6
+29065: 45, 2, 7
+29066: 45, 2, 8
+29067: 45, 2, 9
+29068: 45, 2, 10
+29069: 45, 2, 11
+29070: 45, 2, 12
+29071: 45, 2, 13
+29072: 45, 2, 14
+29073: 45, 2, 15
+29074: 45, 2, 16
+29075: 45, 2, 17
+29076: 45, 2, 18
+29077: 45, 2, 19
+29078: 45, 2, 20
+29079: 45, 2, 21
+29080: 45, 2, 22
+29081: 45, 2, 23
+29082: 45, 2, 24
+29083: 45, 2, 25
+29084: 45, 2, 26
+29085: 45, 2, 27
+29086: 45, 2, 28
+29087: 45, 2, 29
+29088: 45, 3, 0
+29089: 45, 3, 1
+29090: 45, 3, 2
+29091: 45, 3, 3
+29092: 45, 3, 4
+29093: 45, 3, 5
+29094: 45, 3, 6
+29095: 45, 3, 7
+29096: 45, 3, 8
+29097: 45, 3, 9
+29098: 45, 3, 10
+29099: 45, 3, 11
+29100: 45, 3, 12
+29101: 45, 3, 13
+29102: 45, 3, 14
+29103: 45, 3, 15
+29104: 45, 3, 16
+29105: 45, 3, 17
+29106: 45, 3, 18
+29107: 45, 3, 19
+29108: 45, 3, 20
+29109: 45, 3, 21
+29110: 45, 3, 22
+29111: 45, 3, 23
+29112: 45, 3, 24
+29113: 45, 3, 25
+29114: 45, 3, 26
+29115: 45, 3, 27
+29116: 45, 3, 28
+29117: 45, 3, 29
+29118: 45, 3, 30
+29119: 45, 3, 31
+29120: 45, 4, 0
+29121: 45, 4, 1
+29122: 45, 4, 2
+29123: 45, 4, 3
+29124: 45, 4, 4
+29125: 45, 4, 5
+29126: 45, 4, 6
+29127: 45, 4, 7
+29128: 45, 4, 8
+29129: 45, 4, 9
+29130: 45, 4, 10
+29131: 45, 4, 11
+29132: 45, 4, 12
+29133: 45, 4, 13
+29134: 45, 4, 14
+29135: 45, 4, 15
+29136: 45, 4, 16
+29137: 45, 4, 17
+29138: 45, 4, 18
+29139: 45, 4, 19
+29140: 45, 4, 20
+29141: 45, 4, 21
+29142: 45, 4, 22
+29143: 45, 4, 23
+29144: 45, 4, 24
+29145: 45, 4, 25
+29146: 45, 5, 0
+29147: 45, 5, 1
+29148: 45, 5, 2
+29149: 45, 5, 3
+29150: 45, 5, 4
+29151: 45, 5, 5
+29152: 45, 5, 6
+29153: 45, 5, 7
+29154: 45, 5, 8
+29155: 45, 5, 9
+29156: 45, 5, 10
+29157: 45, 5, 11
+29158: 45, 5, 12
+29159: 45, 5, 13
+29160: 45, 5, 14
+29161: 45, 5, 15
+29162: 45, 5, 16
+29163: 45, 5, 17
+29164: 45, 5, 18
+29165: 45, 5, 19
+29166: 45, 5, 20
+29167: 45, 5, 21
+29168: 45, 6, 0
+29169: 45, 6, 1
+29170: 45, 6, 2
+29171: 45, 6, 3
+29172: 45, 6, 4
+29173: 45, 6, 5
+29174: 45, 6, 6
+29175: 45, 6, 7
+29176: 45, 6, 8
+29177: 45, 6, 9
+29178: 45, 6, 10
+29179: 45, 6, 11
+29180: 45, 6, 12
+29181: 45, 6, 13
+29182: 45, 6, 14
+29183: 45, 6, 15
+29184: 45, 6, 16
+29185: 45, 6, 17
+29186: 45, 6, 18
+29187: 45, 6, 19
+29188: 45, 6, 20
+29189: 45, 6, 21
+29190: 45, 6, 22
+29191: 45, 6, 23
+29192: 45, 7, 0
+29193: 45, 7, 1
+29194: 45, 7, 2
+29195: 45, 7, 3
+29196: 45, 7, 4
+29197: 45, 7, 5
+29198: 45, 7, 6
+29199: 45, 7, 7
+29200: 45, 7, 8
+29201: 45, 7, 9
+29202: 45, 7, 10
+29203: 45, 7, 11
+29204: 45, 7, 12
+29205: 45, 7, 13
+29206: 45, 7, 14
+29207: 45, 7, 15
+29208: 45, 7, 16
+29209: 45, 7, 17
+29210: 45, 7, 18
+29211: 45, 7, 19
+29212: 45, 7, 20
+29213: 45, 7, 21
+29214: 45, 7, 22
+29215: 45, 7, 23
+29216: 45, 7, 24
+29217: 45, 7, 25
+29218: 45, 8, 0
+29219: 45, 8, 1
+29220: 45, 8, 2
+29221: 45, 8, 3
+29222: 45, 8, 4
+29223: 45, 8, 5
+29224: 45, 8, 6
+29225: 45, 8, 7
+29226: 45, 8, 8
+29227: 45, 8, 9
+29228: 45, 8, 10
+29229: 45, 8, 11
+29230: 45, 8, 12
+29231: 45, 8, 13
+29232: 45, 8, 14
+29233: 45, 8, 15
+29234: 45, 8, 16
+29235: 45, 8, 17
+29236: 45, 8, 18
+29237: 45, 8, 19
+29238: 45, 8, 20
+29239: 45, 8, 21
+29240: 45, 8, 22
+29241: 45, 8, 23
+29242: 45, 8, 24
+29243: 45, 8, 25
+29244: 45, 8, 26
+29245: 45, 8, 27
+29246: 45, 8, 28
+29247: 45, 8, 29
+29248: 45, 8, 30
+29249: 45, 8, 31
+29250: 45, 8, 32
+29251: 45, 8, 33
+29252: 45, 8, 34
+29253: 45, 8, 35
+29254: 45, 8, 36
+29255: 45, 8, 37
+29256: 45, 8, 38
+29257: 45, 8, 39
+29258: 45, 9, 0
+29259: 45, 9, 1
+29260: 45, 9, 2
+29261: 45, 9, 3
+29262: 45, 9, 4
+29263: 45, 9, 5
+29264: 45, 9, 6
+29265: 45, 9, 7
+29266: 45, 9, 8
+29267: 45, 9, 9
+29268: 45, 9, 10
+29269: 45, 9, 11
+29270: 45, 9, 12
+29271: 45, 9, 13
+29272: 45, 9, 14
+29273: 45, 9, 15
+29274: 45, 9, 16
+29275: 45, 9, 17
+29276: 45, 9, 18
+29277: 45, 9, 19
+29278: 45, 9, 20
+29279: 45, 9, 21
+29280: 45, 9, 22
+29281: 45, 9, 23
+29282: 45, 9, 24
+29283: 45, 9, 25
+29284: 45, 9, 26
+29285: 45, 9, 27
+29286: 45, 9, 28
+29287: 45, 9, 29
+29288: 45, 9, 30
+29289: 45, 9, 31
+29290: 45, 9, 32
+29291: 45, 9, 33
+29292: 45, 10, 0
+29293: 45, 10, 1
+29294: 45, 10, 2
+29295: 45, 10, 3
+29296: 45, 10, 4
+29297: 45, 10, 5
+29298: 45, 10, 6
+29299: 45, 10, 7
+29300: 45, 10, 8
+29301: 45, 10, 9
+29302: 45, 10, 10
+29303: 45, 10, 11
+29304: 45, 10, 12
+29305: 45, 10, 13
+29306: 45, 10, 14
+29307: 45, 10, 15
+29308: 45, 10, 16
+29309: 45, 10, 17
+29310: 45, 10, 18
+29311: 45, 10, 19
+29312: 45, 10, 20
+29313: 45, 10, 21
+29314: 45, 11, 0
+29315: 45, 11, 1
+29316: 45, 11, 2
+29317: 45, 11, 3
+29318: 45, 11, 4
+29319: 45, 11, 5
+29320: 45, 11, 6
+29321: 45, 11, 7
+29322: 45, 11, 8
+29323: 45, 11, 9
+29324: 45, 11, 10
+29325: 45, 11, 11
+29326: 45, 11, 12
+29327: 45, 11, 13
+29328: 45, 11, 14
+29329: 45, 11, 15
+29330: 45, 11, 16
+29331: 45, 11, 17
+29332: 45, 11, 18
+29333: 45, 11, 19
+29334: 45, 11, 20
+29335: 45, 11, 21
+29336: 45, 11, 22
+29337: 45, 11, 23
+29338: 45, 11, 24
+29339: 45, 11, 25
+29340: 45, 11, 26
+29341: 45, 11, 27
+29342: 45, 11, 28
+29343: 45, 11, 29
+29344: 45, 11, 30
+29345: 45, 11, 31
+29346: 45, 11, 32
+29347: 45, 11, 33
+29348: 45, 11, 34
+29349: 45, 11, 35
+29350: 45, 11, 36
+29351: 45, 12, 0
+29352: 45, 12, 1
+29353: 45, 12, 2
+29354: 45, 12, 3
+29355: 45, 12, 4
+29356: 45, 12, 5
+29357: 45, 12, 6
+29358: 45, 12, 7
+29359: 45, 12, 8
+29360: 45, 12, 9
+29361: 45, 12, 10
+29362: 45, 12, 11
+29363: 45, 12, 12
+29364: 45, 12, 13
+29365: 45, 12, 14
+29366: 45, 12, 15
+29367: 45, 12, 16
+29368: 45, 12, 17
+29369: 45, 12, 18
+29370: 45, 12, 19
+29371: 45, 12, 20
+29372: 45, 12, 21
+29373: 45, 13, 0
+29374: 45, 13, 1
+29375: 45, 13, 2
+29376: 45, 13, 3
+29377: 45, 13, 4
+29378: 45, 13, 5
+29379: 45, 13, 6
+29380: 45, 13, 7
+29381: 45, 13, 8
+29382: 45, 13, 9
+29383: 45, 13, 10
+29384: 45, 13, 11
+29385: 45, 13, 12
+29386: 45, 13, 13
+29387: 45, 13, 14
+29388: 45, 14, 0
+29389: 45, 14, 1
+29390: 45, 14, 2
+29391: 45, 14, 3
+29392: 45, 14, 4
+29393: 45, 14, 5
+29394: 45, 14, 6
+29395: 45, 14, 7
+29396: 45, 14, 8
+29397: 45, 14, 9
+29398: 45, 14, 10
+29399: 45, 14, 11
+29400: 45, 14, 12
+29401: 45, 14, 13
+29402: 45, 14, 14
+29403: 45, 14, 15
+29404: 45, 14, 16
+29405: 45, 14, 17
+29406: 45, 14, 18
+29407: 45, 14, 19
+29408: 45, 14, 20
+29409: 45, 14, 21
+29410: 45, 14, 22
+29411: 45, 14, 23
+29412: 45, 15, 0
+29413: 45, 15, 1
+29414: 45, 15, 2
+29415: 45, 15, 3
+29416: 45, 15, 4
+29417: 45, 15, 5
+29418: 45, 15, 6
+29419: 45, 15, 7
+29420: 45, 15, 8
+29421: 45, 15, 9
+29422: 45, 15, 10
+29423: 45, 15, 11
+29424: 45, 15, 12
+29425: 45, 15, 13
+29426: 45, 15, 14
+29427: 45, 15, 15
+29428: 45, 15, 16
+29429: 45, 15, 17
+29430: 45, 15, 18
+29431: 45, 15, 19
+29432: 45, 15, 20
+29433: 45, 15, 21
+29434: 45, 15, 22
+29435: 45, 15, 23
+29436: 45, 15, 24
+29437: 45, 15, 25
+29438: 45, 15, 26
+29439: 45, 15, 27
+29440: 45, 15, 28
+29441: 45, 15, 29
+29442: 45, 15, 30
+29443: 45, 15, 31
+29444: 45, 15, 32
+29445: 45, 15, 33
+29446: 45, 16, 0
+29447: 45, 16, 1
+29448: 45, 16, 2
+29449: 45, 16, 3
+29450: 45, 16, 4
+29451: 45, 16, 5
+29452: 45, 16, 6
+29453: 45, 16, 7
+29454: 45, 16, 8
+29455: 45, 16, 9
+29456: 45, 16, 10
+29457: 45, 16, 11
+29458: 45, 16, 12
+29459: 45, 16, 13
+29460: 45, 16, 14
+29461: 45, 16, 15
+29462: 45, 16, 16
+29463: 45, 16, 17
+29464: 45, 16, 18
+29465: 45, 16, 19
+29466: 45, 16, 20
+29467: 45, 16, 21
+29468: 45, 16, 22
+29469: 45, 16, 23
+29470: 45, 16, 24
+29471: 45, 16, 25
+29472: 45, 16, 26
+29473: 45, 16, 27
+29474: 46, 0, 0
+29475: 46, 1, 0
+29476: 46, 1, 1
+29477: 46, 1, 2
+29478: 46, 1, 3
+29479: 46, 1, 4
+29480: 46, 1, 5
+29481: 46, 1, 6
+29482: 46, 1, 7
+29483: 46, 1, 8
+29484: 46, 1, 9
+29485: 46, 1, 10
+29486: 46, 1, 11
+29487: 46, 1, 12
+29488: 46, 1, 13
+29489: 46, 1, 14
+29490: 46, 1, 15
+29491: 46, 1, 16
+29492: 46, 1, 17
+29493: 46, 1, 18
+29494: 46, 1, 19
+29495: 46, 1, 20
+29496: 46, 1, 21
+29497: 46, 1, 22
+29498: 46, 1, 23
+29499: 46, 1, 24
+29500: 46, 1, 25
+29501: 46, 1, 26
+29502: 46, 1, 27
+29503: 46, 1, 28
+29504: 46, 1, 29
+29505: 46, 1, 30
+29506: 46, 1, 31
+29507: 46, 2, 0
+29508: 46, 2, 1
+29509: 46, 2, 2
+29510: 46, 2, 3
+29511: 46, 2, 4
+29512: 46, 2, 5
+29513: 46, 2, 6
+29514: 46, 2, 7
+29515: 46, 2, 8
+29516: 46, 2, 9
+29517: 46, 2, 10
+29518: 46, 2, 11
+29519: 46, 2, 12
+29520: 46, 2, 13
+29521: 46, 2, 14
+29522: 46, 2, 15
+29523: 46, 2, 16
+29524: 46, 3, 0
+29525: 46, 3, 1
+29526: 46, 3, 2
+29527: 46, 3, 3
+29528: 46, 3, 4
+29529: 46, 3, 5
+29530: 46, 3, 6
+29531: 46, 3, 7
+29532: 46, 3, 8
+29533: 46, 3, 9
+29534: 46, 3, 10
+29535: 46, 3, 11
+29536: 46, 3, 12
+29537: 46, 3, 13
+29538: 46, 3, 14
+29539: 46, 3, 15
+29540: 46, 3, 16
+29541: 46, 3, 17
+29542: 46, 3, 18
+29543: 46, 3, 19
+29544: 46, 3, 20
+29545: 46, 3, 21
+29546: 46, 3, 22
+29547: 46, 3, 23
+29548: 46, 4, 0
+29549: 46, 4, 1
+29550: 46, 4, 2
+29551: 46, 4, 3
+29552: 46, 4, 4
+29553: 46, 4, 5
+29554: 46, 4, 6
+29555: 46, 4, 7
+29556: 46, 4, 8
+29557: 46, 4, 9
+29558: 46, 4, 10
+29559: 46, 4, 11
+29560: 46, 4, 12
+29561: 46, 4, 13
+29562: 46, 4, 14
+29563: 46, 4, 15
+29564: 46, 4, 16
+29565: 46, 4, 17
+29566: 46, 4, 18
+29567: 46, 4, 19
+29568: 46, 4, 20
+29569: 46, 4, 21
+29570: 46, 5, 0
+29571: 46, 5, 1
+29572: 46, 5, 2
+29573: 46, 5, 3
+29574: 46, 5, 4
+29575: 46, 5, 5
+29576: 46, 5, 6
+29577: 46, 5, 7
+29578: 46, 5, 8
+29579: 46, 5, 9
+29580: 46, 5, 10
+29581: 46, 5, 11
+29582: 46, 5, 12
+29583: 46, 5, 13
+29584: 46, 6, 0
+29585: 46, 6, 1
+29586: 46, 6, 2
+29587: 46, 6, 3
+29588: 46, 6, 4
+29589: 46, 6, 5
+29590: 46, 6, 6
+29591: 46, 6, 7
+29592: 46, 6, 8
+29593: 46, 6, 9
+29594: 46, 6, 10
+29595: 46, 6, 11
+29596: 46, 6, 12
+29597: 46, 6, 13
+29598: 46, 6, 14
+29599: 46, 6, 15
+29600: 46, 6, 16
+29601: 46, 6, 17
+29602: 46, 6, 18
+29603: 46, 6, 19
+29604: 46, 6, 20
+29605: 46, 7, 0
+29606: 46, 7, 1
+29607: 46, 7, 2
+29608: 46, 7, 3
+29609: 46, 7, 4
+29610: 46, 7, 5
+29611: 46, 7, 6
+29612: 46, 7, 7
+29613: 46, 7, 8
+29614: 46, 7, 9
+29615: 46, 7, 10
+29616: 46, 7, 11
+29617: 46, 7, 12
+29618: 46, 7, 13
+29619: 46, 7, 14
+29620: 46, 7, 15
+29621: 46, 7, 16
+29622: 46, 7, 17
+29623: 46, 7, 18
+29624: 46, 7, 19
+29625: 46, 7, 20
+29626: 46, 7, 21
+29627: 46, 7, 22
+29628: 46, 7, 23
+29629: 46, 7, 24
+29630: 46, 7, 25
+29631: 46, 7, 26
+29632: 46, 7, 27
+29633: 46, 7, 28
+29634: 46, 7, 29
+29635: 46, 7, 30
+29636: 46, 7, 31
+29637: 46, 7, 32
+29638: 46, 7, 33
+29639: 46, 7, 34
+29640: 46, 7, 35
+29641: 46, 7, 36
+29642: 46, 7, 37
+29643: 46, 7, 38
+29644: 46, 7, 39
+29645: 46, 7, 40
+29646: 46, 8, 0
+29647: 46, 8, 1
+29648: 46, 8, 2
+29649: 46, 8, 3
+29650: 46, 8, 4
+29651: 46, 8, 5
+29652: 46, 8, 6
+29653: 46, 8, 7
+29654: 46, 8, 8
+29655: 46, 8, 9
+29656: 46, 8, 10
+29657: 46, 8, 11
+29658: 46, 8, 12
+29659: 46, 8, 13
+29660: 46, 9, 0
+29661: 46, 9, 1
+29662: 46, 9, 2
+29663: 46, 9, 3
+29664: 46, 9, 4
+29665: 46, 9, 5
+29666: 46, 9, 6
+29667: 46, 9, 7
+29668: 46, 9, 8
+29669: 46, 9, 9
+29670: 46, 9, 10
+29671: 46, 9, 11
+29672: 46, 9, 12
+29673: 46, 9, 13
+29674: 46, 9, 14
+29675: 46, 9, 15
+29676: 46, 9, 16
+29677: 46, 9, 17
+29678: 46, 9, 18
+29679: 46, 9, 19
+29680: 46, 9, 20
+29681: 46, 9, 21
+29682: 46, 9, 22
+29683: 46, 9, 23
+29684: 46, 9, 24
+29685: 46, 9, 25
+29686: 46, 9, 26
+29687: 46, 9, 27
+29688: 46, 10, 0
+29689: 46, 10, 1
+29690: 46, 10, 2
+29691: 46, 10, 3
+29692: 46, 10, 4
+29693: 46, 10, 5
+29694: 46, 10, 6
+29695: 46, 10, 7
+29696: 46, 10, 8
+29697: 46, 10, 9
+29698: 46, 10, 10
+29699: 46, 10, 11
+29700: 46, 10, 12
+29701: 46, 10, 13
+29702: 46, 10, 14
+29703: 46, 10, 15
+29704: 46, 10, 16
+29705: 46, 10, 17
+29706: 46, 10, 18
+29707: 46, 10, 19
+29708: 46, 10, 20
+29709: 46, 10, 21
+29710: 46, 10, 22
+29711: 46, 10, 23
+29712: 46, 10, 24
+29713: 46, 10, 25
+29714: 46, 10, 26
+29715: 46, 10, 27
+29716: 46, 10, 28
+29717: 46, 10, 29
+29718: 46, 10, 30
+29719: 46, 10, 31
+29720: 46, 10, 32
+29721: 46, 10, 33
+29722: 46, 11, 0
+29723: 46, 11, 1
+29724: 46, 11, 2
+29725: 46, 11, 3
+29726: 46, 11, 4
+29727: 46, 11, 5
+29728: 46, 11, 6
+29729: 46, 11, 7
+29730: 46, 11, 8
+29731: 46, 11, 9
+29732: 46, 11, 10
+29733: 46, 11, 11
+29734: 46, 11, 12
+29735: 46, 11, 13
+29736: 46, 11, 14
+29737: 46, 11, 15
+29738: 46, 11, 16
+29739: 46, 11, 17
+29740: 46, 11, 18
+29741: 46, 11, 19
+29742: 46, 11, 20
+29743: 46, 11, 21
+29744: 46, 11, 22
+29745: 46, 11, 23
+29746: 46, 11, 24
+29747: 46, 11, 25
+29748: 46, 11, 26
+29749: 46, 11, 27
+29750: 46, 11, 28
+29751: 46, 11, 29
+29752: 46, 11, 30
+29753: 46, 11, 31
+29754: 46, 11, 32
+29755: 46, 11, 33
+29756: 46, 11, 34
+29757: 46, 12, 0
+29758: 46, 12, 1
+29759: 46, 12, 2
+29760: 46, 12, 3
+29761: 46, 12, 4
+29762: 46, 12, 5
+29763: 46, 12, 6
+29764: 46, 12, 7
+29765: 46, 12, 8
+29766: 46, 12, 9
+29767: 46, 12, 10
+29768: 46, 12, 11
+29769: 46, 12, 12
+29770: 46, 12, 13
+29771: 46, 12, 14
+29772: 46, 12, 15
+29773: 46, 12, 16
+29774: 46, 12, 17
+29775: 46, 12, 18
+29776: 46, 12, 19
+29777: 46, 12, 20
+29778: 46, 12, 21
+29779: 46, 12, 22
+29780: 46, 12, 23
+29781: 46, 12, 24
+29782: 46, 12, 25
+29783: 46, 12, 26
+29784: 46, 12, 27
+29785: 46, 12, 28
+29786: 46, 12, 29
+29787: 46, 12, 30
+29788: 46, 12, 31
+29789: 46, 13, 0
+29790: 46, 13, 1
+29791: 46, 13, 2
+29792: 46, 13, 3
+29793: 46, 13, 4
+29794: 46, 13, 5
+29795: 46, 13, 6
+29796: 46, 13, 7
+29797: 46, 13, 8
+29798: 46, 13, 9
+29799: 46, 13, 10
+29800: 46, 13, 11
+29801: 46, 13, 12
+29802: 46, 13, 13
+29803: 46, 14, 0
+29804: 46, 14, 1
+29805: 46, 14, 2
+29806: 46, 14, 3
+29807: 46, 14, 4
+29808: 46, 14, 5
+29809: 46, 14, 6
+29810: 46, 14, 7
+29811: 46, 14, 8
+29812: 46, 14, 9
+29813: 46, 14, 10
+29814: 46, 14, 11
+29815: 46, 14, 12
+29816: 46, 14, 13
+29817: 46, 14, 14
+29818: 46, 14, 15
+29819: 46, 14, 16
+29820: 46, 14, 17
+29821: 46, 14, 18
+29822: 46, 14, 19
+29823: 46, 14, 20
+29824: 46, 14, 21
+29825: 46, 14, 22
+29826: 46, 14, 23
+29827: 46, 14, 24
+29828: 46, 14, 25
+29829: 46, 14, 26
+29830: 46, 14, 27
+29831: 46, 14, 28
+29832: 46, 14, 29
+29833: 46, 14, 30
+29834: 46, 14, 31
+29835: 46, 14, 32
+29836: 46, 14, 33
+29837: 46, 14, 34
+29838: 46, 14, 35
+29839: 46, 14, 36
+29840: 46, 14, 37
+29841: 46, 14, 38
+29842: 46, 14, 39
+29843: 46, 14, 40
+29844: 46, 15, 0
+29845: 46, 15, 1
+29846: 46, 15, 2
+29847: 46, 15, 3
+29848: 46, 15, 4
+29849: 46, 15, 5
+29850: 46, 15, 6
+29851: 46, 15, 7
+29852: 46, 15, 8
+29853: 46, 15, 9
+29854: 46, 15, 10
+29855: 46, 15, 11
+29856: 46, 15, 12
+29857: 46, 15, 13
+29858: 46, 15, 14
+29859: 46, 15, 15
+29860: 46, 15, 16
+29861: 46, 15, 17
+29862: 46, 15, 18
+29863: 46, 15, 19
+29864: 46, 15, 20
+29865: 46, 15, 21
+29866: 46, 15, 22
+29867: 46, 15, 23
+29868: 46, 15, 24
+29869: 46, 15, 25
+29870: 46, 15, 26
+29871: 46, 15, 27
+29872: 46, 15, 28
+29873: 46, 15, 29
+29874: 46, 15, 30
+29875: 46, 15, 31
+29876: 46, 15, 32
+29877: 46, 15, 33
+29878: 46, 15, 34
+29879: 46, 15, 35
+29880: 46, 15, 36
+29881: 46, 15, 37
+29882: 46, 15, 38
+29883: 46, 15, 39
+29884: 46, 15, 40
+29885: 46, 15, 41
+29886: 46, 15, 42
+29887: 46, 15, 43
+29888: 46, 15, 44
+29889: 46, 15, 45
+29890: 46, 15, 46
+29891: 46, 15, 47
+29892: 46, 15, 48
+29893: 46, 15, 49
+29894: 46, 15, 50
+29895: 46, 15, 51
+29896: 46, 15, 52
+29897: 46, 15, 53
+29898: 46, 15, 54
+29899: 46, 15, 55
+29900: 46, 15, 56
+29901: 46, 15, 57
+29902: 46, 15, 58
+29903: 46, 16, 0
+29904: 46, 16, 1
+29905: 46, 16, 2
+29906: 46, 16, 3
+29907: 46, 16, 4
+29908: 46, 16, 5
+29909: 46, 16, 6
+29910: 46, 16, 7
+29911: 46, 16, 8
+29912: 46, 16, 9
+29913: 46, 16, 10
+29914: 46, 16, 11
+29915: 46, 16, 12
+29916: 46, 16, 13
+29917: 46, 16, 14
+29918: 46, 16, 15
+29919: 46, 16, 16
+29920: 46, 16, 17
+29921: 46, 16, 18
+29922: 46, 16, 19
+29923: 46, 16, 20
+29924: 46, 16, 21
+29925: 46, 16, 22
+29926: 46, 16, 23
+29927: 46, 16, 24
+29928: 47, 0, 0
+29929: 47, 1, 0
+29930: 47, 1, 1
+29931: 47, 1, 2
+29932: 47, 1, 3
+29933: 47, 1, 4
+29934: 47, 1, 5
+29935: 47, 1, 6
+29936: 47, 1, 7
+29937: 47, 1, 8
+29938: 47, 1, 9
+29939: 47, 1, 10
+29940: 47, 1, 11
+29941: 47, 1, 12
+29942: 47, 1, 13
+29943: 47, 1, 14
+29944: 47, 1, 15
+29945: 47, 1, 16
+29946: 47, 1, 17
+29947: 47, 1, 18
+29948: 47, 1, 19
+29949: 47, 1, 20
+29950: 47, 1, 21
+29951: 47, 1, 22
+29952: 47, 1, 23
+29953: 47, 1, 24
+29954: 47, 2, 0
+29955: 47, 2, 1
+29956: 47, 2, 2
+29957: 47, 2, 3
+29958: 47, 2, 4
+29959: 47, 2, 5
+29960: 47, 2, 6
+29961: 47, 2, 7
+29962: 47, 2, 8
+29963: 47, 2, 9
+29964: 47, 2, 10
+29965: 47, 2, 11
+29966: 47, 2, 12
+29967: 47, 2, 13
+29968: 47, 2, 14
+29969: 47, 2, 15
+29970: 47, 2, 16
+29971: 47, 2, 17
+29972: 47, 3, 0
+29973: 47, 3, 1
+29974: 47, 3, 2
+29975: 47, 3, 3
+29976: 47, 3, 4
+29977: 47, 3, 5
+29978: 47, 3, 6
+29979: 47, 3, 7
+29980: 47, 3, 8
+29981: 47, 3, 9
+29982: 47, 3, 10
+29983: 47, 3, 11
+29984: 47, 3, 12
+29985: 47, 3, 13
+29986: 47, 3, 14
+29987: 47, 3, 15
+29988: 47, 3, 16
+29989: 47, 3, 17
+29990: 47, 3, 18
+29991: 47, 4, 0
+29992: 47, 4, 1
+29993: 47, 4, 2
+29994: 47, 4, 3
+29995: 47, 4, 4
+29996: 47, 4, 5
+29997: 47, 4, 6
+29998: 47, 4, 7
+29999: 47, 4, 8
+30000: 47, 4, 9
+30001: 47, 4, 10
+30002: 47, 4, 11
+30003: 47, 4, 12
+30004: 47, 4, 13
+30005: 47, 4, 14
+30006: 47, 4, 15
+30007: 47, 4, 16
+30008: 47, 4, 17
+30009: 47, 4, 18
+30010: 47, 5, 0
+30011: 47, 5, 1
+30012: 47, 5, 2
+30013: 47, 5, 3
+30014: 47, 5, 4
+30015: 47, 5, 5
+30016: 47, 5, 6
+30017: 47, 5, 7
+30018: 47, 5, 8
+30019: 47, 5, 9
+30020: 47, 5, 10
+30021: 47, 5, 11
+30022: 47, 5, 12
+30023: 47, 5, 13
+30024: 47, 5, 14
+30025: 47, 5, 15
+30026: 47, 5, 16
+30027: 47, 5, 17
+30028: 47, 5, 18
+30029: 47, 5, 19
+30030: 47, 5, 20
+30031: 47, 5, 21
+30032: 47, 6, 0
+30033: 47, 6, 1
+30034: 47, 6, 2
+30035: 47, 6, 3
+30036: 47, 6, 4
+30037: 47, 6, 5
+30038: 47, 6, 6
+30039: 47, 6, 7
+30040: 47, 6, 8
+30041: 47, 6, 9
+30042: 47, 6, 10
+30043: 47, 6, 11
+30044: 47, 6, 12
+30045: 47, 6, 13
+30046: 47, 6, 14
+30047: 47, 6, 15
+30048: 47, 6, 16
+30049: 47, 6, 17
+30050: 47, 6, 18
+30051: 47, 7, 0
+30052: 47, 7, 1
+30053: 47, 7, 2
+30054: 47, 7, 3
+30055: 47, 7, 4
+30056: 47, 7, 5
+30057: 47, 7, 6
+30058: 47, 7, 7
+30059: 47, 7, 8
+30060: 47, 7, 9
+30061: 47, 7, 10
+30062: 47, 7, 11
+30063: 47, 7, 12
+30064: 47, 7, 13
+30065: 47, 7, 14
+30066: 47, 7, 15
+30067: 47, 7, 16
+30068: 47, 8, 0
+30069: 47, 8, 1
+30070: 47, 8, 2
+30071: 47, 8, 3
+30072: 47, 8, 4
+30073: 47, 8, 5
+30074: 47, 8, 6
+30075: 47, 8, 7
+30076: 47, 8, 8
+30077: 47, 8, 9
+30078: 47, 8, 10
+30079: 47, 8, 11
+30080: 47, 8, 12
+30081: 47, 8, 13
+30082: 47, 8, 14
+30083: 47, 8, 15
+30084: 47, 8, 16
+30085: 47, 8, 17
+30086: 47, 8, 18
+30087: 47, 8, 19
+30088: 47, 8, 20
+30089: 47, 8, 21
+30090: 47, 8, 22
+30091: 47, 8, 23
+30092: 47, 8, 24
+30093: 47, 9, 0
+30094: 47, 9, 1
+30095: 47, 9, 2
+30096: 47, 9, 3
+30097: 47, 9, 4
+30098: 47, 9, 5
+30099: 47, 9, 6
+30100: 47, 9, 7
+30101: 47, 9, 8
+30102: 47, 9, 9
+30103: 47, 9, 10
+30104: 47, 9, 11
+30105: 47, 9, 12
+30106: 47, 9, 13
+30107: 47, 9, 14
+30108: 47, 9, 15
+30109: 47, 10, 0
+30110: 47, 10, 1
+30111: 47, 10, 2
+30112: 47, 10, 3
+30113: 47, 10, 4
+30114: 47, 10, 5
+30115: 47, 10, 6
+30116: 47, 10, 7
+30117: 47, 10, 8
+30118: 47, 10, 9
+30119: 47, 10, 10
+30120: 47, 10, 11
+30121: 47, 10, 12
+30122: 47, 10, 13
+30123: 47, 10, 14
+30124: 47, 10, 15
+30125: 47, 10, 16
+30126: 47, 10, 17
+30127: 47, 10, 18
+30128: 47, 11, 0
+30129: 47, 11, 1
+30130: 47, 11, 2
+30131: 47, 11, 3
+30132: 47, 11, 4
+30133: 47, 11, 5
+30134: 47, 11, 6
+30135: 47, 11, 7
+30136: 47, 11, 8
+30137: 47, 11, 9
+30138: 47, 11, 10
+30139: 47, 11, 11
+30140: 47, 11, 12
+30141: 47, 11, 13
+30142: 47, 11, 14
+30143: 47, 11, 15
+30144: 47, 11, 16
+30145: 47, 11, 17
+30146: 47, 11, 18
+30147: 47, 11, 19
+30148: 47, 11, 20
+30149: 47, 11, 21
+30150: 47, 11, 22
+30151: 47, 11, 23
+30152: 47, 11, 24
+30153: 47, 11, 25
+30154: 47, 11, 26
+30155: 47, 11, 27
+30156: 47, 11, 28
+30157: 47, 11, 29
+30158: 47, 11, 30
+30159: 47, 11, 31
+30160: 47, 11, 32
+30161: 47, 11, 33
+30162: 47, 12, 0
+30163: 47, 12, 1
+30164: 47, 12, 2
+30165: 47, 12, 3
+30166: 47, 12, 4
+30167: 47, 12, 5
+30168: 47, 12, 6
+30169: 47, 12, 7
+30170: 47, 12, 8
+30171: 47, 12, 9
+30172: 47, 12, 10
+30173: 47, 12, 11
+30174: 47, 12, 12
+30175: 47, 12, 13
+30176: 47, 12, 14
+30177: 47, 12, 15
+30178: 47, 12, 16
+30179: 47, 12, 17
+30180: 47, 12, 18
+30181: 47, 12, 19
+30182: 47, 12, 20
+30183: 47, 12, 21
+30184: 47, 13, 0
+30185: 47, 13, 1
+30186: 47, 13, 2
+30187: 47, 13, 3
+30188: 47, 13, 4
+30189: 47, 13, 5
+30190: 47, 13, 6
+30191: 47, 13, 7
+30192: 47, 13, 8
+30193: 47, 13, 9
+30194: 47, 13, 10
+30195: 47, 13, 11
+30196: 47, 13, 12
+30197: 47, 13, 13
+30198: 47, 13, 14
+30199: 48, 0, 0
+30200: 48, 1, 0
+30201: 48, 1, 1
+30202: 48, 1, 2
+30203: 48, 1, 3
+30204: 48, 1, 4
+30205: 48, 1, 5
+30206: 48, 1, 6
+30207: 48, 1, 7
+30208: 48, 1, 8
+30209: 48, 1, 9
+30210: 48, 1, 10
+30211: 48, 1, 11
+30212: 48, 1, 12
+30213: 48, 1, 13
+30214: 48, 1, 14
+30215: 48, 1, 15
+30216: 48, 1, 16
+30217: 48, 1, 17
+30218: 48, 1, 18
+30219: 48, 1, 19
+30220: 48, 1, 20
+30221: 48, 1, 21
+30222: 48, 1, 22
+30223: 48, 1, 23
+30224: 48, 1, 24
+30225: 48, 2, 0
+30226: 48, 2, 1
+30227: 48, 2, 2
+30228: 48, 2, 3
+30229: 48, 2, 4
+30230: 48, 2, 5
+30231: 48, 2, 6
+30232: 48, 2, 7
+30233: 48, 2, 8
+30234: 48, 2, 9
+30235: 48, 2, 10
+30236: 48, 2, 11
+30237: 48, 2, 12
+30238: 48, 2, 13
+30239: 48, 2, 14
+30240: 48, 2, 15
+30241: 48, 2, 16
+30242: 48, 2, 17
+30243: 48, 2, 18
+30244: 48, 2, 19
+30245: 48, 2, 20
+30246: 48, 2, 21
+30247: 48, 3, 0
+30248: 48, 3, 1
+30249: 48, 3, 2
+30250: 48, 3, 3
+30251: 48, 3, 4
+30252: 48, 3, 5
+30253: 48, 3, 6
+30254: 48, 3, 7
+30255: 48, 3, 8
+30256: 48, 3, 9
+30257: 48, 3, 10
+30258: 48, 3, 11
+30259: 48, 3, 12
+30260: 48, 3, 13
+30261: 48, 3, 14
+30262: 48, 3, 15
+30263: 48, 3, 16
+30264: 48, 3, 17
+30265: 48, 3, 18
+30266: 48, 3, 19
+30267: 48, 3, 20
+30268: 48, 3, 21
+30269: 48, 3, 22
+30270: 48, 3, 23
+30271: 48, 3, 24
+30272: 48, 3, 25
+30273: 48, 3, 26
+30274: 48, 3, 27
+30275: 48, 3, 28
+30276: 48, 3, 29
+30277: 48, 4, 0
+30278: 48, 4, 1
+30279: 48, 4, 2
+30280: 48, 4, 3
+30281: 48, 4, 4
+30282: 48, 4, 5
+30283: 48, 4, 6
+30284: 48, 4, 7
+30285: 48, 4, 8
+30286: 48, 4, 9
+30287: 48, 4, 10
+30288: 48, 4, 11
+30289: 48, 4, 12
+30290: 48, 4, 13
+30291: 48, 4, 14
+30292: 48, 4, 15
+30293: 48, 4, 16
+30294: 48, 4, 17
+30295: 48, 4, 18
+30296: 48, 4, 19
+30297: 48, 4, 20
+30298: 48, 4, 21
+30299: 48, 4, 22
+30300: 48, 4, 23
+30301: 48, 4, 24
+30302: 48, 4, 25
+30303: 48, 4, 26
+30304: 48, 4, 27
+30305: 48, 4, 28
+30306: 48, 4, 29
+30307: 48, 4, 30
+30308: 48, 4, 31
+30309: 48, 5, 0
+30310: 48, 5, 1
+30311: 48, 5, 2
+30312: 48, 5, 3
+30313: 48, 5, 4
+30314: 48, 5, 5
+30315: 48, 5, 6
+30316: 48, 5, 7
+30317: 48, 5, 8
+30318: 48, 5, 9
+30319: 48, 5, 10
+30320: 48, 5, 11
+30321: 48, 5, 12
+30322: 48, 5, 13
+30323: 48, 5, 14
+30324: 48, 5, 15
+30325: 48, 5, 16
+30326: 48, 5, 17
+30327: 48, 5, 18
+30328: 48, 5, 19
+30329: 48, 5, 20
+30330: 48, 5, 21
+30331: 48, 5, 22
+30332: 48, 5, 23
+30333: 48, 5, 24
+30334: 48, 5, 25
+30335: 48, 5, 26
+30336: 48, 6, 0
+30337: 48, 6, 1
+30338: 48, 6, 2
+30339: 48, 6, 3
+30340: 48, 6, 4
+30341: 48, 6, 5
+30342: 48, 6, 6
+30343: 48, 6, 7
+30344: 48, 6, 8
+30345: 48, 6, 9
+30346: 48, 6, 10
+30347: 48, 6, 11
+30348: 48, 6, 12
+30349: 48, 6, 13
+30350: 48, 6, 14
+30351: 48, 6, 15
+30352: 48, 6, 16
+30353: 48, 6, 17
+30354: 48, 6, 18
+30355: 49, 0, 0
+30356: 49, 1, 0
+30357: 49, 1, 1
+30358: 49, 1, 2
+30359: 49, 1, 3
+30360: 49, 1, 4
+30361: 49, 1, 5
+30362: 49, 1, 6
+30363: 49, 1, 7
+30364: 49, 1, 8
+30365: 49, 1, 9
+30366: 49, 1, 10
+30367: 49, 1, 11
+30368: 49, 1, 12
+30369: 49, 1, 13
+30370: 49, 1, 14
+30371: 49, 1, 15
+30372: 49, 1, 16
+30373: 49, 1, 17
+30374: 49, 1, 18
+30375: 49, 1, 19
+30376: 49, 1, 20
+30377: 49, 1, 21
+30378: 49, 1, 22
+30379: 49, 1, 23
+30380: 49, 2, 0
+30381: 49, 2, 1
+30382: 49, 2, 2
+30383: 49, 2, 3
+30384: 49, 2, 4
+30385: 49, 2, 5
+30386: 49, 2, 6
+30387: 49, 2, 7
+30388: 49, 2, 8
+30389: 49, 2, 9
+30390: 49, 2, 10
+30391: 49, 2, 11
+30392: 49, 2, 12
+30393: 49, 2, 13
+30394: 49, 2, 14
+30395: 49, 2, 15
+30396: 49, 2, 16
+30397: 49, 2, 17
+30398: 49, 2, 18
+30399: 49, 2, 19
+30400: 49, 2, 20
+30401: 49, 2, 21
+30402: 49, 2, 22
+30403: 49, 3, 0
+30404: 49, 3, 1
+30405: 49, 3, 2
+30406: 49, 3, 3
+30407: 49, 3, 4
+30408: 49, 3, 5
+30409: 49, 3, 6
+30410: 49, 3, 7
+30411: 49, 3, 8
+30412: 49, 3, 9
+30413: 49, 3, 10
+30414: 49, 3, 11
+30415: 49, 3, 12
+30416: 49, 3, 13
+30417: 49, 3, 14
+30418: 49, 3, 15
+30419: 49, 3, 16
+30420: 49, 3, 17
+30421: 49, 3, 18
+30422: 49, 3, 19
+30423: 49, 3, 20
+30424: 49, 3, 21
+30425: 49, 4, 0
+30426: 49, 4, 1
+30427: 49, 4, 2
+30428: 49, 4, 3
+30429: 49, 4, 4
+30430: 49, 4, 5
+30431: 49, 4, 6
+30432: 49, 4, 7
+30433: 49, 4, 8
+30434: 49, 4, 9
+30435: 49, 4, 10
+30436: 49, 4, 11
+30437: 49, 4, 12
+30438: 49, 4, 13
+30439: 49, 4, 14
+30440: 49, 4, 15
+30441: 49, 4, 16
+30442: 49, 4, 17
+30443: 49, 4, 18
+30444: 49, 4, 19
+30445: 49, 4, 20
+30446: 49, 4, 21
+30447: 49, 4, 22
+30448: 49, 4, 23
+30449: 49, 4, 24
+30450: 49, 4, 25
+30451: 49, 4, 26
+30452: 49, 4, 27
+30453: 49, 4, 28
+30454: 49, 4, 29
+30455: 49, 4, 30
+30456: 49, 4, 31
+30457: 49, 4, 32
+30458: 49, 5, 0
+30459: 49, 5, 1
+30460: 49, 5, 2
+30461: 49, 5, 3
+30462: 49, 5, 4
+30463: 49, 5, 5
+30464: 49, 5, 6
+30465: 49, 5, 7
+30466: 49, 5, 8
+30467: 49, 5, 9
+30468: 49, 5, 10
+30469: 49, 5, 11
+30470: 49, 5, 12
+30471: 49, 5, 13
+30472: 49, 5, 14
+30473: 49, 5, 15
+30474: 49, 5, 16
+30475: 49, 5, 17
+30476: 49, 5, 18
+30477: 49, 5, 19
+30478: 49, 5, 20
+30479: 49, 5, 21
+30480: 49, 5, 22
+30481: 49, 5, 23
+30482: 49, 5, 24
+30483: 49, 5, 25
+30484: 49, 5, 26
+30485: 49, 5, 27
+30486: 49, 5, 28
+30487: 49, 5, 29
+30488: 49, 5, 30
+30489: 49, 5, 31
+30490: 49, 5, 32
+30491: 49, 5, 33
+30492: 49, 6, 0
+30493: 49, 6, 1
+30494: 49, 6, 2
+30495: 49, 6, 3
+30496: 49, 6, 4
+30497: 49, 6, 5
+30498: 49, 6, 6
+30499: 49, 6, 7
+30500: 49, 6, 8
+30501: 49, 6, 9
+30502: 49, 6, 10
+30503: 49, 6, 11
+30504: 49, 6, 12
+30505: 49, 6, 13
+30506: 49, 6, 14
+30507: 49, 6, 15
+30508: 49, 6, 16
+30509: 49, 6, 17
+30510: 49, 6, 18
+30511: 49, 6, 19
+30512: 49, 6, 20
+30513: 49, 6, 21
+30514: 49, 6, 22
+30515: 49, 6, 23
+30516: 49, 6, 24
+30517: 50, 0, 0
+30518: 50, 1, 0
+30519: 50, 1, 1
+30520: 50, 1, 2
+30521: 50, 1, 3
+30522: 50, 1, 4
+30523: 50, 1, 5
+30524: 50, 1, 6
+30525: 50, 1, 7
+30526: 50, 1, 8
+30527: 50, 1, 9
+30528: 50, 1, 10
+30529: 50, 1, 11
+30530: 50, 1, 12
+30531: 50, 1, 13
+30532: 50, 1, 14
+30533: 50, 1, 15
+30534: 50, 1, 16
+30535: 50, 1, 17
+30536: 50, 1, 18
+30537: 50, 1, 19
+30538: 50, 1, 20
+30539: 50, 1, 21
+30540: 50, 1, 22
+30541: 50, 1, 23
+30542: 50, 1, 24
+30543: 50, 1, 25
+30544: 50, 1, 26
+30545: 50, 1, 27
+30546: 50, 1, 28
+30547: 50, 1, 29
+30548: 50, 1, 30
+30549: 50, 2, 0
+30550: 50, 2, 1
+30551: 50, 2, 2
+30552: 50, 2, 3
+30553: 50, 2, 4
+30554: 50, 2, 5
+30555: 50, 2, 6
+30556: 50, 2, 7
+30557: 50, 2, 8
+30558: 50, 2, 9
+30559: 50, 2, 10
+30560: 50, 2, 11
+30561: 50, 2, 12
+30562: 50, 2, 13
+30563: 50, 2, 14
+30564: 50, 2, 15
+30565: 50, 2, 16
+30566: 50, 2, 17
+30567: 50, 2, 18
+30568: 50, 2, 19
+30569: 50, 2, 20
+30570: 50, 2, 21
+30571: 50, 2, 22
+30572: 50, 2, 23
+30573: 50, 2, 24
+30574: 50, 2, 25
+30575: 50, 2, 26
+30576: 50, 2, 27
+30577: 50, 2, 28
+30578: 50, 2, 29
+30579: 50, 2, 30
+30580: 50, 3, 0
+30581: 50, 3, 1
+30582: 50, 3, 2
+30583: 50, 3, 3
+30584: 50, 3, 4
+30585: 50, 3, 5
+30586: 50, 3, 6
+30587: 50, 3, 7
+30588: 50, 3, 8
+30589: 50, 3, 9
+30590: 50, 3, 10
+30591: 50, 3, 11
+30592: 50, 3, 12
+30593: 50, 3, 13
+30594: 50, 3, 14
+30595: 50, 3, 15
+30596: 50, 3, 16
+30597: 50, 3, 17
+30598: 50, 3, 18
+30599: 50, 3, 19
+30600: 50, 3, 20
+30601: 50, 3, 21
+30602: 50, 4, 0
+30603: 50, 4, 1
+30604: 50, 4, 2
+30605: 50, 4, 3
+30606: 50, 4, 4
+30607: 50, 4, 5
+30608: 50, 4, 6
+30609: 50, 4, 7
+30610: 50, 4, 8
+30611: 50, 4, 9
+30612: 50, 4, 10
+30613: 50, 4, 11
+30614: 50, 4, 12
+30615: 50, 4, 13
+30616: 50, 4, 14
+30617: 50, 4, 15
+30618: 50, 4, 16
+30619: 50, 4, 17
+30620: 50, 4, 18
+30621: 50, 4, 19
+30622: 50, 4, 20
+30623: 50, 4, 21
+30624: 50, 4, 22
+30625: 50, 4, 23
+30626: 51, 0, 0
+30627: 51, 1, 0
+30628: 51, 1, 1
+30629: 51, 1, 2
+30630: 51, 1, 3
+30631: 51, 1, 4
+30632: 51, 1, 5
+30633: 51, 1, 6
+30634: 51, 1, 7
+30635: 51, 1, 8
+30636: 51, 1, 9
+30637: 51, 1, 10
+30638: 51, 1, 11
+30639: 51, 1, 12
+30640: 51, 1, 13
+30641: 51, 1, 14
+30642: 51, 1, 15
+30643: 51, 1, 16
+30644: 51, 1, 17
+30645: 51, 1, 18
+30646: 51, 1, 19
+30647: 51, 1, 20
+30648: 51, 1, 21
+30649: 51, 1, 22
+30650: 51, 1, 23
+30651: 51, 1, 24
+30652: 51, 1, 25
+30653: 51, 1, 26
+30654: 51, 1, 27
+30655: 51, 1, 28
+30656: 51, 1, 29
+30657: 51, 2, 0
+30658: 51, 2, 1
+30659: 51, 2, 2
+30660: 51, 2, 3
+30661: 51, 2, 4
+30662: 51, 2, 5
+30663: 51, 2, 6
+30664: 51, 2, 7
+30665: 51, 2, 8
+30666: 51, 2, 9
+30667: 51, 2, 10
+30668: 51, 2, 11
+30669: 51, 2, 12
+30670: 51, 2, 13
+30671: 51, 2, 14
+30672: 51, 2, 15
+30673: 51, 2, 16
+30674: 51, 2, 17
+30675: 51, 2, 18
+30676: 51, 2, 19
+30677: 51, 2, 20
+30678: 51, 2, 21
+30679: 51, 2, 22
+30680: 51, 2, 23
+30681: 51, 3, 0
+30682: 51, 3, 1
+30683: 51, 3, 2
+30684: 51, 3, 3
+30685: 51, 3, 4
+30686: 51, 3, 5
+30687: 51, 3, 6
+30688: 51, 3, 7
+30689: 51, 3, 8
+30690: 51, 3, 9
+30691: 51, 3, 10
+30692: 51, 3, 11
+30693: 51, 3, 12
+30694: 51, 3, 13
+30695: 51, 3, 14
+30696: 51, 3, 15
+30697: 51, 3, 16
+30698: 51, 3, 17
+30699: 51, 3, 18
+30700: 51, 3, 19
+30701: 51, 3, 20
+30702: 51, 3, 21
+30703: 51, 3, 22
+30704: 51, 3, 23
+30705: 51, 3, 24
+30706: 51, 3, 25
+30707: 51, 4, 0
+30708: 51, 4, 1
+30709: 51, 4, 2
+30710: 51, 4, 3
+30711: 51, 4, 4
+30712: 51, 4, 5
+30713: 51, 4, 6
+30714: 51, 4, 7
+30715: 51, 4, 8
+30716: 51, 4, 9
+30717: 51, 4, 10
+30718: 51, 4, 11
+30719: 51, 4, 12
+30720: 51, 4, 13
+30721: 51, 4, 14
+30722: 51, 4, 15
+30723: 51, 4, 16
+30724: 51, 4, 17
+30725: 51, 4, 18
+30726: 52, 0, 0
+30727: 52, 1, 0
+30728: 52, 1, 1
+30729: 52, 1, 2
+30730: 52, 1, 3
+30731: 52, 1, 4
+30732: 52, 1, 5
+30733: 52, 1, 6
+30734: 52, 1, 7
+30735: 52, 1, 8
+30736: 52, 1, 9
+30737: 52, 1, 10
+30738: 52, 2, 0
+30739: 52, 2, 1
+30740: 52, 2, 2
+30741: 52, 2, 3
+30742: 52, 2, 4
+30743: 52, 2, 5
+30744: 52, 2, 6
+30745: 52, 2, 7
+30746: 52, 2, 8
+30747: 52, 2, 9
+30748: 52, 2, 10
+30749: 52, 2, 11
+30750: 52, 2, 12
+30751: 52, 2, 13
+30752: 52, 2, 14
+30753: 52, 2, 15
+30754: 52, 2, 16
+30755: 52, 2, 17
+30756: 52, 2, 18
+30757: 52, 2, 19
+30758: 52, 2, 20
+30759: 52, 3, 0
+30760: 52, 3, 1
+30761: 52, 3, 2
+30762: 52, 3, 3
+30763: 52, 3, 4
+30764: 52, 3, 5
+30765: 52, 3, 6
+30766: 52, 3, 7
+30767: 52, 3, 8
+30768: 52, 3, 9
+30769: 52, 3, 10
+30770: 52, 3, 11
+30771: 52, 3, 12
+30772: 52, 3, 13
+30773: 52, 4, 0
+30774: 52, 4, 1
+30775: 52, 4, 2
+30776: 52, 4, 3
+30777: 52, 4, 4
+30778: 52, 4, 5
+30779: 52, 4, 6
+30780: 52, 4, 7
+30781: 52, 4, 8
+30782: 52, 4, 9
+30783: 52, 4, 10
+30784: 52, 4, 11
+30785: 52, 4, 12
+30786: 52, 4, 13
+30787: 52, 4, 14
+30788: 52, 4, 15
+30789: 52, 4, 16
+30790: 52, 4, 17
+30791: 52, 4, 18
+30792: 52, 5, 0
+30793: 52, 5, 1
+30794: 52, 5, 2
+30795: 52, 5, 3
+30796: 52, 5, 4
+30797: 52, 5, 5
+30798: 52, 5, 6
+30799: 52, 5, 7
+30800: 52, 5, 8
+30801: 52, 5, 9
+30802: 52, 5, 10
+30803: 52, 5, 11
+30804: 52, 5, 12
+30805: 52, 5, 13
+30806: 52, 5, 14
+30807: 52, 5, 15
+30808: 52, 5, 16
+30809: 52, 5, 17
+30810: 52, 5, 18
+30811: 52, 5, 19
+30812: 52, 5, 20
+30813: 52, 5, 21
+30814: 52, 5, 22
+30815: 52, 5, 23
+30816: 52, 5, 24
+30817: 52, 5, 25
+30818: 52, 5, 26
+30819: 52, 5, 27
+30820: 52, 5, 28
+30821: 53, 0, 0
+30822: 53, 1, 0
+30823: 53, 1, 1
+30824: 53, 1, 2
+30825: 53, 1, 3
+30826: 53, 1, 4
+30827: 53, 1, 5
+30828: 53, 1, 6
+30829: 53, 1, 7
+30830: 53, 1, 8
+30831: 53, 1, 9
+30832: 53, 1, 10
+30833: 53, 1, 11
+30834: 53, 1, 12
+30835: 53, 2, 0
+30836: 53, 2, 1
+30837: 53, 2, 2
+30838: 53, 2, 3
+30839: 53, 2, 4
+30840: 53, 2, 5
+30841: 53, 2, 6
+30842: 53, 2, 7
+30843: 53, 2, 8
+30844: 53, 2, 9
+30845: 53, 2, 10
+30846: 53, 2, 11
+30847: 53, 2, 12
+30848: 53, 2, 13
+30849: 53, 2, 14
+30850: 53, 2, 15
+30851: 53, 2, 16
+30852: 53, 2, 17
+30853: 53, 3, 0
+30854: 53, 3, 1
+30855: 53, 3, 2
+30856: 53, 3, 3
+30857: 53, 3, 4
+30858: 53, 3, 5
+30859: 53, 3, 6
+30860: 53, 3, 7
+30861: 53, 3, 8
+30862: 53, 3, 9
+30863: 53, 3, 10
+30864: 53, 3, 11
+30865: 53, 3, 12
+30866: 53, 3, 13
+30867: 53, 3, 14
+30868: 53, 3, 15
+30869: 53, 3, 16
+30870: 53, 3, 17
+30871: 53, 3, 18
+30872: 54, 0, 0
+30873: 54, 1, 0
+30874: 54, 1, 1
+30875: 54, 1, 2
+30876: 54, 1, 3
+30877: 54, 1, 4
+30878: 54, 1, 5
+30879: 54, 1, 6
+30880: 54, 1, 7
+30881: 54, 1, 8
+30882: 54, 1, 9
+30883: 54, 1, 10
+30884: 54, 1, 11
+30885: 54, 1, 12
+30886: 54, 1, 13
+30887: 54, 1, 14
+30888: 54, 1, 15
+30889: 54, 1, 16
+30890: 54, 1, 17
+30891: 54, 1, 18
+30892: 54, 1, 19
+30893: 54, 1, 20
+30894: 54, 2, 0
+30895: 54, 2, 1
+30896: 54, 2, 2
+30897: 54, 2, 3
+30898: 54, 2, 4
+30899: 54, 2, 5
+30900: 54, 2, 6
+30901: 54, 2, 7
+30902: 54, 2, 8
+30903: 54, 2, 9
+30904: 54, 2, 10
+30905: 54, 2, 11
+30906: 54, 2, 12
+30907: 54, 2, 13
+30908: 54, 2, 14
+30909: 54, 2, 15
+30910: 54, 3, 0
+30911: 54, 3, 1
+30912: 54, 3, 2
+30913: 54, 3, 3
+30914: 54, 3, 4
+30915: 54, 3, 5
+30916: 54, 3, 6
+30917: 54, 3, 7
+30918: 54, 3, 8
+30919: 54, 3, 9
+30920: 54, 3, 10
+30921: 54, 3, 11
+30922: 54, 3, 12
+30923: 54, 3, 13
+30924: 54, 3, 14
+30925: 54, 3, 15
+30926: 54, 3, 16
+30927: 54, 4, 0
+30928: 54, 4, 1
+30929: 54, 4, 2
+30930: 54, 4, 3
+30931: 54, 4, 4
+30932: 54, 4, 5
+30933: 54, 4, 6
+30934: 54, 4, 7
+30935: 54, 4, 8
+30936: 54, 4, 9
+30937: 54, 4, 10
+30938: 54, 4, 11
+30939: 54, 4, 12
+30940: 54, 4, 13
+30941: 54, 4, 14
+30942: 54, 4, 15
+30943: 54, 4, 16
+30944: 54, 5, 0
+30945: 54, 5, 1
+30946: 54, 5, 2
+30947: 54, 5, 3
+30948: 54, 5, 4
+30949: 54, 5, 5
+30950: 54, 5, 6
+30951: 54, 5, 7
+30952: 54, 5, 8
+30953: 54, 5, 9
+30954: 54, 5, 10
+30955: 54, 5, 11
+30956: 54, 5, 12
+30957: 54, 5, 13
+30958: 54, 5, 14
+30959: 54, 5, 15
+30960: 54, 5, 16
+30961: 54, 5, 17
+30962: 54, 5, 18
+30963: 54, 5, 19
+30964: 54, 5, 20
+30965: 54, 5, 21
+30966: 54, 5, 22
+30967: 54, 5, 23
+30968: 54, 5, 24
+30969: 54, 5, 25
+30970: 54, 6, 0
+30971: 54, 6, 1
+30972: 54, 6, 2
+30973: 54, 6, 3
+30974: 54, 6, 4
+30975: 54, 6, 5
+30976: 54, 6, 6
+30977: 54, 6, 7
+30978: 54, 6, 8
+30979: 54, 6, 9
+30980: 54, 6, 10
+30981: 54, 6, 11
+30982: 54, 6, 12
+30983: 54, 6, 13
+30984: 54, 6, 14
+30985: 54, 6, 15
+30986: 54, 6, 16
+30987: 54, 6, 17
+30988: 54, 6, 18
+30989: 54, 6, 19
+30990: 54, 6, 20
+30991: 54, 6, 21
+30992: 55, 0, 0
+30993: 55, 1, 0
+30994: 55, 1, 1
+30995: 55, 1, 2
+30996: 55, 1, 3
+30997: 55, 1, 4
+30998: 55, 1, 5
+30999: 55, 1, 6
+31000: 55, 1, 7
+31001: 55, 1, 8
+31002: 55, 1, 9
+31003: 55, 1, 10
+31004: 55, 1, 11
+31005: 55, 1, 12
+31006: 55, 1, 13
+31007: 55, 1, 14
+31008: 55, 1, 15
+31009: 55, 1, 16
+31010: 55, 1, 17
+31011: 55, 1, 18
+31012: 55, 2, 0
+31013: 55, 2, 1
+31014: 55, 2, 2
+31015: 55, 2, 3
+31016: 55, 2, 4
+31017: 55, 2, 5
+31018: 55, 2, 6
+31019: 55, 2, 7
+31020: 55, 2, 8
+31021: 55, 2, 9
+31022: 55, 2, 10
+31023: 55, 2, 11
+31024: 55, 2, 12
+31025: 55, 2, 13
+31026: 55, 2, 14
+31027: 55, 2, 15
+31028: 55, 2, 16
+31029: 55, 2, 17
+31030: 55, 2, 18
+31031: 55, 2, 19
+31032: 55, 2, 20
+31033: 55, 2, 21
+31034: 55, 2, 22
+31035: 55, 2, 23
+31036: 55, 2, 24
+31037: 55, 2, 25
+31038: 55, 2, 26
+31039: 55, 3, 0
+31040: 55, 3, 1
+31041: 55, 3, 2
+31042: 55, 3, 3
+31043: 55, 3, 4
+31044: 55, 3, 5
+31045: 55, 3, 6
+31046: 55, 3, 7
+31047: 55, 3, 8
+31048: 55, 3, 9
+31049: 55, 3, 10
+31050: 55, 3, 11
+31051: 55, 3, 12
+31052: 55, 3, 13
+31053: 55, 3, 14
+31054: 55, 3, 15
+31055: 55, 3, 16
+31056: 55, 3, 17
+31057: 55, 4, 0
+31058: 55, 4, 1
+31059: 55, 4, 2
+31060: 55, 4, 3
+31061: 55, 4, 4
+31062: 55, 4, 5
+31063: 55, 4, 6
+31064: 55, 4, 7
+31065: 55, 4, 8
+31066: 55, 4, 9
+31067: 55, 4, 10
+31068: 55, 4, 11
+31069: 55, 4, 12
+31070: 55, 4, 13
+31071: 55, 4, 14
+31072: 55, 4, 15
+31073: 55, 4, 16
+31074: 55, 4, 17
+31075: 55, 4, 18
+31076: 55, 4, 19
+31077: 55, 4, 20
+31078: 55, 4, 21
+31079: 55, 4, 22
+31080: 56, 0, 0
+31081: 56, 1, 0
+31082: 56, 1, 1
+31083: 56, 1, 2
+31084: 56, 1, 3
+31085: 56, 1, 4
+31086: 56, 1, 5
+31087: 56, 1, 6
+31088: 56, 1, 7
+31089: 56, 1, 8
+31090: 56, 1, 9
+31091: 56, 1, 10
+31092: 56, 1, 11
+31093: 56, 1, 12
+31094: 56, 1, 13
+31095: 56, 1, 14
+31096: 56, 1, 15
+31097: 56, 1, 16
+31098: 56, 2, 0
+31099: 56, 2, 1
+31100: 56, 2, 2
+31101: 56, 2, 3
+31102: 56, 2, 4
+31103: 56, 2, 5
+31104: 56, 2, 6
+31105: 56, 2, 7
+31106: 56, 2, 8
+31107: 56, 2, 9
+31108: 56, 2, 10
+31109: 56, 2, 11
+31110: 56, 2, 12
+31111: 56, 2, 13
+31112: 56, 2, 14
+31113: 56, 2, 15
+31114: 56, 3, 0
+31115: 56, 3, 1
+31116: 56, 3, 2
+31117: 56, 3, 3
+31118: 56, 3, 4
+31119: 56, 3, 5
+31120: 56, 3, 6
+31121: 56, 3, 7
+31122: 56, 3, 8
+31123: 56, 3, 9
+31124: 56, 3, 10
+31125: 56, 3, 11
+31126: 56, 3, 12
+31127: 56, 3, 13
+31128: 56, 3, 14
+31129: 56, 3, 15
+31130: 57, 0, 0
+31131: 57, 1, 0
+31132: 57, 1, 1
+31133: 57, 1, 2
+31134: 57, 1, 3
+31135: 57, 1, 4
+31136: 57, 1, 5
+31137: 57, 1, 6
+31138: 57, 1, 7
+31139: 57, 1, 8
+31140: 57, 1, 9
+31141: 57, 1, 10
+31142: 57, 1, 11
+31143: 57, 1, 12
+31144: 57, 1, 13
+31145: 57, 1, 14
+31146: 57, 1, 15
+31147: 57, 1, 16
+31148: 57, 1, 17
+31149: 57, 1, 18
+31150: 57, 1, 19
+31151: 57, 1, 20
+31152: 57, 1, 21
+31153: 57, 1, 22
+31154: 57, 1, 23
+31155: 57, 1, 24
+31156: 57, 1, 25
+31157: 58, 0, 0
+31158: 58, 1, 0
+31159: 58, 1, 1
+31160: 58, 1, 2
+31161: 58, 1, 3
+31162: 58, 1, 4
+31163: 58, 1, 5
+31164: 58, 1, 6
+31165: 58, 1, 7
+31166: 58, 1, 8
+31167: 58, 1, 9
+31168: 58, 1, 10
+31169: 58, 1, 11
+31170: 58, 1, 12
+31171: 58, 1, 13
+31172: 58, 1, 14
+31173: 58, 2, 0
+31174: 58, 2, 1
+31175: 58, 2, 2
+31176: 58, 2, 3
+31177: 58, 2, 4
+31178: 58, 2, 5
+31179: 58, 2, 6
+31180: 58, 2, 7
+31181: 58, 2, 8
+31182: 58, 2, 9
+31183: 58, 2, 10
+31184: 58, 2, 11
+31185: 58, 2, 12
+31186: 58, 2, 13
+31187: 58, 2, 14
+31188: 58, 2, 15
+31189: 58, 2, 16
+31190: 58, 2, 17
+31191: 58, 2, 18
+31192: 58, 3, 0
+31193: 58, 3, 1
+31194: 58, 3, 2
+31195: 58, 3, 3
+31196: 58, 3, 4
+31197: 58, 3, 5
+31198: 58, 3, 6
+31199: 58, 3, 7
+31200: 58, 3, 8
+31201: 58, 3, 9
+31202: 58, 3, 10
+31203: 58, 3, 11
+31204: 58, 3, 12
+31205: 58, 3, 13
+31206: 58, 3, 14
+31207: 58, 3, 15
+31208: 58, 3, 16
+31209: 58, 3, 17
+31210: 58, 3, 18
+31211: 58, 3, 19
+31212: 58, 4, 0
+31213: 58, 4, 1
+31214: 58, 4, 2
+31215: 58, 4, 3
+31216: 58, 4, 4
+31217: 58, 4, 5
+31218: 58, 4, 6
+31219: 58, 4, 7
+31220: 58, 4, 8
+31221: 58, 4, 9
+31222: 58, 4, 10
+31223: 58, 4, 11
+31224: 58, 4, 12
+31225: 58, 4, 13
+31226: 58, 4, 14
+31227: 58, 4, 15
+31228: 58, 4, 16
+31229: 58, 5, 0
+31230: 58, 5, 1
+31231: 58, 5, 2
+31232: 58, 5, 3
+31233: 58, 5, 4
+31234: 58, 5, 5
+31235: 58, 5, 6
+31236: 58, 5, 7
+31237: 58, 5, 8
+31238: 58, 5, 9
+31239: 58, 5, 10
+31240: 58, 5, 11
+31241: 58, 5, 12
+31242: 58, 5, 13
+31243: 58, 5, 14
+31244: 58, 6, 0
+31245: 58, 6, 1
+31246: 58, 6, 2
+31247: 58, 6, 3
+31248: 58, 6, 4
+31249: 58, 6, 5
+31250: 58, 6, 6
+31251: 58, 6, 7
+31252: 58, 6, 8
+31253: 58, 6, 9
+31254: 58, 6, 10
+31255: 58, 6, 11
+31256: 58, 6, 12
+31257: 58, 6, 13
+31258: 58, 6, 14
+31259: 58, 6, 15
+31260: 58, 6, 16
+31261: 58, 6, 17
+31262: 58, 6, 18
+31263: 58, 6, 19
+31264: 58, 6, 20
+31265: 58, 7, 0
+31266: 58, 7, 1
+31267: 58, 7, 2
+31268: 58, 7, 3
+31269: 58, 7, 4
+31270: 58, 7, 5
+31271: 58, 7, 6
+31272: 58, 7, 7
+31273: 58, 7, 8
+31274: 58, 7, 9
+31275: 58, 7, 10
+31276: 58, 7, 11
+31277: 58, 7, 12
+31278: 58, 7, 13
+31279: 58, 7, 14
+31280: 58, 7, 15
+31281: 58, 7, 16
+31282: 58, 7, 17
+31283: 58, 7, 18
+31284: 58, 7, 19
+31285: 58, 7, 20
+31286: 58, 7, 21
+31287: 58, 7, 22
+31288: 58, 7, 23
+31289: 58, 7, 24
+31290: 58, 7, 25
+31291: 58, 7, 26
+31292: 58, 7, 27
+31293: 58, 7, 28
+31294: 58, 8, 0
+31295: 58, 8, 1
+31296: 58, 8, 2
+31297: 58, 8, 3
+31298: 58, 8, 4
+31299: 58, 8, 5
+31300: 58, 8, 6
+31301: 58, 8, 7
+31302: 58, 8, 8
+31303: 58, 8, 9
+31304: 58, 8, 10
+31305: 58, 8, 11
+31306: 58, 8, 12
+31307: 58, 8, 13
+31308: 58, 9, 0
+31309: 58, 9, 1
+31310: 58, 9, 2
+31311: 58, 9, 3
+31312: 58, 9, 4
+31313: 58, 9, 5
+31314: 58, 9, 6
+31315: 58, 9, 7
+31316: 58, 9, 8
+31317: 58, 9, 9
+31318: 58, 9, 10
+31319: 58, 9, 11
+31320: 58, 9, 12
+31321: 58, 9, 13
+31322: 58, 9, 14
+31323: 58, 9, 15
+31324: 58, 9, 16
+31325: 58, 9, 17
+31326: 58, 9, 18
+31327: 58, 9, 19
+31328: 58, 9, 20
+31329: 58, 9, 21
+31330: 58, 9, 22
+31331: 58, 9, 23
+31332: 58, 9, 24
+31333: 58, 9, 25
+31334: 58, 9, 26
+31335: 58, 9, 27
+31336: 58, 9, 28
+31337: 58, 10, 0
+31338: 58, 10, 1
+31339: 58, 10, 2
+31340: 58, 10, 3
+31341: 58, 10, 4
+31342: 58, 10, 5
+31343: 58, 10, 6
+31344: 58, 10, 7
+31345: 58, 10, 8
+31346: 58, 10, 9
+31347: 58, 10, 10
+31348: 58, 10, 11
+31349: 58, 10, 12
+31350: 58, 10, 13
+31351: 58, 10, 14
+31352: 58, 10, 15
+31353: 58, 10, 16
+31354: 58, 10, 17
+31355: 58, 10, 18
+31356: 58, 10, 19
+31357: 58, 10, 20
+31358: 58, 10, 21
+31359: 58, 10, 22
+31360: 58, 10, 23
+31361: 58, 10, 24
+31362: 58, 10, 25
+31363: 58, 10, 26
+31364: 58, 10, 27
+31365: 58, 10, 28
+31366: 58, 10, 29
+31367: 58, 10, 30
+31368: 58, 10, 31
+31369: 58, 10, 32
+31370: 58, 10, 33
+31371: 58, 10, 34
+31372: 58, 10, 35
+31373: 58, 10, 36
+31374: 58, 10, 37
+31375: 58, 10, 38
+31376: 58, 10, 39
+31377: 58, 11, 0
+31378: 58, 11, 1
+31379: 58, 11, 2
+31380: 58, 11, 3
+31381: 58, 11, 4
+31382: 58, 11, 5
+31383: 58, 11, 6
+31384: 58, 11, 7
+31385: 58, 11, 8
+31386: 58, 11, 9
+31387: 58, 11, 10
+31388: 58, 11, 11
+31389: 58, 11, 12
+31390: 58, 11, 13
+31391: 58, 11, 14
+31392: 58, 11, 15
+31393: 58, 11, 16
+31394: 58, 11, 17
+31395: 58, 11, 18
+31396: 58, 11, 19
+31397: 58, 11, 20
+31398: 58, 11, 21
+31399: 58, 11, 22
+31400: 58, 11, 23
+31401: 58, 11, 24
+31402: 58, 11, 25
+31403: 58, 11, 26
+31404: 58, 11, 27
+31405: 58, 11, 28
+31406: 58, 11, 29
+31407: 58, 11, 30
+31408: 58, 11, 31
+31409: 58, 11, 32
+31410: 58, 11, 33
+31411: 58, 11, 34
+31412: 58, 11, 35
+31413: 58, 11, 36
+31414: 58, 11, 37
+31415: 58, 11, 38
+31416: 58, 11, 39
+31417: 58, 11, 40
+31418: 58, 12, 0
+31419: 58, 12, 1
+31420: 58, 12, 2
+31421: 58, 12, 3
+31422: 58, 12, 4
+31423: 58, 12, 5
+31424: 58, 12, 6
+31425: 58, 12, 7
+31426: 58, 12, 8
+31427: 58, 12, 9
+31428: 58, 12, 10
+31429: 58, 12, 11
+31430: 58, 12, 12
+31431: 58, 12, 13
+31432: 58, 12, 14
+31433: 58, 12, 15
+31434: 58, 12, 16
+31435: 58, 12, 17
+31436: 58, 12, 18
+31437: 58, 12, 19
+31438: 58, 12, 20
+31439: 58, 12, 21
+31440: 58, 12, 22
+31441: 58, 12, 23
+31442: 58, 12, 24
+31443: 58, 12, 25
+31444: 58, 12, 26
+31445: 58, 12, 27
+31446: 58, 12, 28
+31447: 58, 12, 29
+31448: 58, 13, 0
+31449: 58, 13, 1
+31450: 58, 13, 2
+31451: 58, 13, 3
+31452: 58, 13, 4
+31453: 58, 13, 5
+31454: 58, 13, 6
+31455: 58, 13, 7
+31456: 58, 13, 8
+31457: 58, 13, 9
+31458: 58, 13, 10
+31459: 58, 13, 11
+31460: 58, 13, 12
+31461: 58, 13, 13
+31462: 58, 13, 14
+31463: 58, 13, 15
+31464: 58, 13, 16
+31465: 58, 13, 17
+31466: 58, 13, 18
+31467: 58, 13, 19
+31468: 58, 13, 20
+31469: 58, 13, 21
+31470: 58, 13, 22
+31471: 58, 13, 23
+31472: 58, 13, 24
+31473: 58, 13, 25
+31474: 59, 0, 0
+31475: 59, 1, 0
+31476: 59, 1, 1
+31477: 59, 1, 2
+31478: 59, 1, 3
+31479: 59, 1, 4
+31480: 59, 1, 5
+31481: 59, 1, 6
+31482: 59, 1, 7
+31483: 59, 1, 8
+31484: 59, 1, 9
+31485: 59, 1, 10
+31486: 59, 1, 11
+31487: 59, 1, 12
+31488: 59, 1, 13
+31489: 59, 1, 14
+31490: 59, 1, 15
+31491: 59, 1, 16
+31492: 59, 1, 17
+31493: 59, 1, 18
+31494: 59, 1, 19
+31495: 59, 1, 20
+31496: 59, 1, 21
+31497: 59, 1, 22
+31498: 59, 1, 23
+31499: 59, 1, 24
+31500: 59, 1, 25
+31501: 59, 1, 26
+31502: 59, 1, 27
+31503: 59, 2, 0
+31504: 59, 2, 1
+31505: 59, 2, 2
+31506: 59, 2, 3
+31507: 59, 2, 4
+31508: 59, 2, 5
+31509: 59, 2, 6
+31510: 59, 2, 7
+31511: 59, 2, 8
+31512: 59, 2, 9
+31513: 59, 2, 10
+31514: 59, 2, 11
+31515: 59, 2, 12
+31516: 59, 2, 13
+31517: 59, 2, 14
+31518: 59, 2, 15
+31519: 59, 2, 16
+31520: 59, 2, 17
+31521: 59, 2, 18
+31522: 59, 2, 19
+31523: 59, 2, 20
+31524: 59, 2, 21
+31525: 59, 2, 22
+31526: 59, 2, 23
+31527: 59, 2, 24
+31528: 59, 2, 25
+31529: 59, 2, 26
+31530: 59, 3, 0
+31531: 59, 3, 1
+31532: 59, 3, 2
+31533: 59, 3, 3
+31534: 59, 3, 4
+31535: 59, 3, 5
+31536: 59, 3, 6
+31537: 59, 3, 7
+31538: 59, 3, 8
+31539: 59, 3, 9
+31540: 59, 3, 10
+31541: 59, 3, 11
+31542: 59, 3, 12
+31543: 59, 3, 13
+31544: 59, 3, 14
+31545: 59, 3, 15
+31546: 59, 3, 16
+31547: 59, 3, 17
+31548: 59, 3, 18
+31549: 59, 4, 0
+31550: 59, 4, 1
+31551: 59, 4, 2
+31552: 59, 4, 3
+31553: 59, 4, 4
+31554: 59, 4, 5
+31555: 59, 4, 6
+31556: 59, 4, 7
+31557: 59, 4, 8
+31558: 59, 4, 9
+31559: 59, 4, 10
+31560: 59, 4, 11
+31561: 59, 4, 12
+31562: 59, 4, 13
+31563: 59, 4, 14
+31564: 59, 4, 15
+31565: 59, 4, 16
+31566: 59, 4, 17
+31567: 59, 5, 0
+31568: 59, 5, 1
+31569: 59, 5, 2
+31570: 59, 5, 3
+31571: 59, 5, 4
+31572: 59, 5, 5
+31573: 59, 5, 6
+31574: 59, 5, 7
+31575: 59, 5, 8
+31576: 59, 5, 9
+31577: 59, 5, 10
+31578: 59, 5, 11
+31579: 59, 5, 12
+31580: 59, 5, 13
+31581: 59, 5, 14
+31582: 59, 5, 15
+31583: 59, 5, 16
+31584: 59, 5, 17
+31585: 59, 5, 18
+31586: 59, 5, 19
+31587: 59, 5, 20
+31588: 60, 0, 0
+31589: 60, 1, 0
+31590: 60, 1, 1
+31591: 60, 1, 2
+31592: 60, 1, 3
+31593: 60, 1, 4
+31594: 60, 1, 5
+31595: 60, 1, 6
+31596: 60, 1, 7
+31597: 60, 1, 8
+31598: 60, 1, 9
+31599: 60, 1, 10
+31600: 60, 1, 11
+31601: 60, 1, 12
+31602: 60, 1, 13
+31603: 60, 1, 14
+31604: 60, 1, 15
+31605: 60, 1, 16
+31606: 60, 1, 17
+31607: 60, 1, 18
+31608: 60, 1, 19
+31609: 60, 1, 20
+31610: 60, 1, 21
+31611: 60, 1, 22
+31612: 60, 1, 23
+31613: 60, 1, 24
+31614: 60, 1, 25
+31615: 60, 2, 0
+31616: 60, 2, 1
+31617: 60, 2, 2
+31618: 60, 2, 3
+31619: 60, 2, 4
+31620: 60, 2, 5
+31621: 60, 2, 6
+31622: 60, 2, 7
+31623: 60, 2, 8
+31624: 60, 2, 9
+31625: 60, 2, 10
+31626: 60, 2, 11
+31627: 60, 2, 12
+31628: 60, 2, 13
+31629: 60, 2, 14
+31630: 60, 2, 15
+31631: 60, 2, 16
+31632: 60, 2, 17
+31633: 60, 2, 18
+31634: 60, 2, 19
+31635: 60, 2, 20
+31636: 60, 2, 21
+31637: 60, 2, 22
+31638: 60, 2, 23
+31639: 60, 2, 24
+31640: 60, 2, 25
+31641: 60, 3, 0
+31642: 60, 3, 1
+31643: 60, 3, 2
+31644: 60, 3, 3
+31645: 60, 3, 4
+31646: 60, 3, 5
+31647: 60, 3, 6
+31648: 60, 3, 7
+31649: 60, 3, 8
+31650: 60, 3, 9
+31651: 60, 3, 10
+31652: 60, 3, 11
+31653: 60, 3, 12
+31654: 60, 3, 13
+31655: 60, 3, 14
+31656: 60, 3, 15
+31657: 60, 3, 16
+31658: 60, 3, 17
+31659: 60, 3, 18
+31660: 60, 3, 19
+31661: 60, 3, 20
+31662: 60, 3, 21
+31663: 60, 3, 22
+31664: 60, 4, 0
+31665: 60, 4, 1
+31666: 60, 4, 2
+31667: 60, 4, 3
+31668: 60, 4, 4
+31669: 60, 4, 5
+31670: 60, 4, 6
+31671: 60, 4, 7
+31672: 60, 4, 8
+31673: 60, 4, 9
+31674: 60, 4, 10
+31675: 60, 4, 11
+31676: 60, 4, 12
+31677: 60, 4, 13
+31678: 60, 4, 14
+31679: 60, 4, 15
+31680: 60, 4, 16
+31681: 60, 4, 17
+31682: 60, 4, 18
+31683: 60, 4, 19
+31684: 60, 5, 0
+31685: 60, 5, 1
+31686: 60, 5, 2
+31687: 60, 5, 3
+31688: 60, 5, 4
+31689: 60, 5, 5
+31690: 60, 5, 6
+31691: 60, 5, 7
+31692: 60, 5, 8
+31693: 60, 5, 9
+31694: 60, 5, 10
+31695: 60, 5, 11
+31696: 60, 5, 12
+31697: 60, 5, 13
+31698: 60, 5, 14
+31699: 61, 0, 0
+31700: 61, 1, 0
+31701: 61, 1, 1
+31702: 61, 1, 2
+31703: 61, 1, 3
+31704: 61, 1, 4
+31705: 61, 1, 5
+31706: 61, 1, 6
+31707: 61, 1, 7
+31708: 61, 1, 8
+31709: 61, 1, 9
+31710: 61, 1, 10
+31711: 61, 1, 11
+31712: 61, 1, 12
+31713: 61, 1, 13
+31714: 61, 1, 14
+31715: 61, 1, 15
+31716: 61, 1, 16
+31717: 61, 1, 17
+31718: 61, 1, 18
+31719: 61, 1, 19
+31720: 61, 1, 20
+31721: 61, 1, 21
+31722: 61, 2, 0
+31723: 61, 2, 1
+31724: 61, 2, 2
+31725: 61, 2, 3
+31726: 61, 2, 4
+31727: 61, 2, 5
+31728: 61, 2, 6
+31729: 61, 2, 7
+31730: 61, 2, 8
+31731: 61, 2, 9
+31732: 61, 2, 10
+31733: 61, 2, 11
+31734: 61, 2, 12
+31735: 61, 2, 13
+31736: 61, 2, 14
+31737: 61, 2, 15
+31738: 61, 2, 16
+31739: 61, 2, 17
+31740: 61, 2, 18
+31741: 61, 2, 19
+31742: 61, 2, 20
+31743: 61, 2, 21
+31744: 61, 2, 22
+31745: 61, 3, 0
+31746: 61, 3, 1
+31747: 61, 3, 2
+31748: 61, 3, 3
+31749: 61, 3, 4
+31750: 61, 3, 5
+31751: 61, 3, 6
+31752: 61, 3, 7
+31753: 61, 3, 8
+31754: 61, 3, 9
+31755: 61, 3, 10
+31756: 61, 3, 11
+31757: 61, 3, 12
+31758: 61, 3, 13
+31759: 61, 3, 14
+31760: 61, 3, 15
+31761: 61, 3, 16
+31762: 61, 3, 17
+31763: 61, 3, 18
+31764: 62, 0, 0
+31765: 62, 1, 0
+31766: 62, 1, 1
+31767: 62, 1, 2
+31768: 62, 1, 3
+31769: 62, 1, 4
+31770: 62, 1, 5
+31771: 62, 1, 6
+31772: 62, 1, 7
+31773: 62, 1, 8
+31774: 62, 1, 9
+31775: 62, 1, 10
+31776: 62, 2, 0
+31777: 62, 2, 1
+31778: 62, 2, 2
+31779: 62, 2, 3
+31780: 62, 2, 4
+31781: 62, 2, 5
+31782: 62, 2, 6
+31783: 62, 2, 7
+31784: 62, 2, 8
+31785: 62, 2, 9
+31786: 62, 2, 10
+31787: 62, 2, 11
+31788: 62, 2, 12
+31789: 62, 2, 13
+31790: 62, 2, 14
+31791: 62, 2, 15
+31792: 62, 2, 16
+31793: 62, 2, 17
+31794: 62, 2, 18
+31795: 62, 2, 19
+31796: 62, 2, 20
+31797: 62, 2, 21
+31798: 62, 2, 22
+31799: 62, 2, 23
+31800: 62, 2, 24
+31801: 62, 2, 25
+31802: 62, 2, 26
+31803: 62, 2, 27
+31804: 62, 2, 28
+31805: 62, 2, 29
+31806: 62, 3, 0
+31807: 62, 3, 1
+31808: 62, 3, 2
+31809: 62, 3, 3
+31810: 62, 3, 4
+31811: 62, 3, 5
+31812: 62, 3, 6
+31813: 62, 3, 7
+31814: 62, 3, 8
+31815: 62, 3, 9
+31816: 62, 3, 10
+31817: 62, 3, 11
+31818: 62, 3, 12
+31819: 62, 3, 13
+31820: 62, 3, 14
+31821: 62, 3, 15
+31822: 62, 3, 16
+31823: 62, 3, 17
+31824: 62, 3, 18
+31825: 62, 3, 19
+31826: 62, 3, 20
+31827: 62, 3, 21
+31828: 62, 3, 22
+31829: 62, 3, 23
+31830: 62, 3, 24
+31831: 62, 4, 0
+31832: 62, 4, 1
+31833: 62, 4, 2
+31834: 62, 4, 3
+31835: 62, 4, 4
+31836: 62, 4, 5
+31837: 62, 4, 6
+31838: 62, 4, 7
+31839: 62, 4, 8
+31840: 62, 4, 9
+31841: 62, 4, 10
+31842: 62, 4, 11
+31843: 62, 4, 12
+31844: 62, 4, 13
+31845: 62, 4, 14
+31846: 62, 4, 15
+31847: 62, 4, 16
+31848: 62, 4, 17
+31849: 62, 4, 18
+31850: 62, 4, 19
+31851: 62, 4, 20
+31852: 62, 4, 21
+31853: 62, 5, 0
+31854: 62, 5, 1
+31855: 62, 5, 2
+31856: 62, 5, 3
+31857: 62, 5, 4
+31858: 62, 5, 5
+31859: 62, 5, 6
+31860: 62, 5, 7
+31861: 62, 5, 8
+31862: 62, 5, 9
+31863: 62, 5, 10
+31864: 62, 5, 11
+31865: 62, 5, 12
+31866: 62, 5, 13
+31867: 62, 5, 14
+31868: 62, 5, 15
+31869: 62, 5, 16
+31870: 62, 5, 17
+31871: 62, 5, 18
+31872: 62, 5, 19
+31873: 62, 5, 20
+31874: 62, 5, 21
+31875: 63, 0, 0
+31876: 63, 1, 0
+31877: 63, 1, 1
+31878: 63, 1, 2
+31879: 63, 1, 3
+31880: 63, 1, 4
+31881: 63, 1, 5
+31882: 63, 1, 6
+31883: 63, 1, 7
+31884: 63, 1, 8
+31885: 63, 1, 9
+31886: 63, 1, 10
+31887: 63, 1, 11
+31888: 63, 1, 12
+31889: 63, 1, 13
+31890: 64, 0, 0
+31891: 64, 1, 0
+31892: 64, 1, 1
+31893: 64, 1, 2
+31894: 64, 1, 3
+31895: 64, 1, 4
+31896: 64, 1, 5
+31897: 64, 1, 6
+31898: 64, 1, 7
+31899: 64, 1, 8
+31900: 64, 1, 9
+31901: 64, 1, 10
+31902: 64, 1, 11
+31903: 64, 1, 12
+31904: 64, 1, 13
+31905: 64, 1, 14
+31906: 65, 0, 0
+31907: 65, 1, 0
+31908: 65, 1, 1
+31909: 65, 1, 2
+31910: 65, 1, 3
+31911: 65, 1, 4
+31912: 65, 1, 5
+31913: 65, 1, 6
+31914: 65, 1, 7
+31915: 65, 1, 8
+31916: 65, 1, 9
+31917: 65, 1, 10
+31918: 65, 1, 11
+31919: 65, 1, 12
+31920: 65, 1, 13
+31921: 65, 1, 14
+31922: 65, 1, 15
+31923: 65, 1, 16
+31924: 65, 1, 17
+31925: 65, 1, 18
+31926: 65, 1, 19
+31927: 65, 1, 20
+31928: 65, 1, 21
+31929: 65, 1, 22
+31930: 65, 1, 23
+31931: 65, 1, 24
+31932: 65, 1, 25
+31933: 66, 0, 0
+31934: 66, 1, 0
+31935: 66, 1, 1
+31936: 66, 1, 2
+31937: 66, 1, 3
+31938: 66, 1, 4
+31939: 66, 1, 5
+31940: 66, 1, 6
+31941: 66, 1, 7
+31942: 66, 1, 8
+31943: 66, 1, 9
+31944: 66, 1, 10
+31945: 66, 1, 11
+31946: 66, 1, 12
+31947: 66, 1, 13
+31948: 66, 1, 14
+31949: 66, 1, 15
+31950: 66, 1, 16
+31951: 66, 1, 17
+31952: 66, 1, 18
+31953: 66, 1, 19
+31954: 66, 1, 20
+31955: 66, 2, 0
+31956: 66, 2, 1
+31957: 66, 2, 2
+31958: 66, 2, 3
+31959: 66, 2, 4
+31960: 66, 2, 5
+31961: 66, 2, 6
+31962: 66, 2, 7
+31963: 66, 2, 8
+31964: 66, 2, 9
+31965: 66, 2, 10
+31966: 66, 2, 11
+31967: 66, 2, 12
+31968: 66, 2, 13
+31969: 66, 2, 14
+31970: 66, 2, 15
+31971: 66, 2, 16
+31972: 66, 2, 17
+31973: 66, 2, 18
+31974: 66, 2, 19
+31975: 66, 2, 20
+31976: 66, 2, 21
+31977: 66, 2, 22
+31978: 66, 2, 23
+31979: 66, 2, 24
+31980: 66, 2, 25
+31981: 66, 2, 26
+31982: 66, 2, 27
+31983: 66, 2, 28
+31984: 66, 2, 29
+31985: 66, 3, 0
+31986: 66, 3, 1
+31987: 66, 3, 2
+31988: 66, 3, 3
+31989: 66, 3, 4
+31990: 66, 3, 5
+31991: 66, 3, 6
+31992: 66, 3, 7
+31993: 66, 3, 8
+31994: 66, 3, 9
+31995: 66, 3, 10
+31996: 66, 3, 11
+31997: 66, 3, 12
+31998: 66, 3, 13
+31999: 66, 3, 14
+32000: 66, 3, 15
+32001: 66, 3, 16
+32002: 66, 3, 17
+32003: 66, 3, 18
+32004: 66, 3, 19
+32005: 66, 3, 20
+32006: 66, 3, 21
+32007: 66, 3, 22
+32008: 66, 4, 0
+32009: 66, 4, 1
+32010: 66, 4, 2
+32011: 66, 4, 3
+32012: 66, 4, 4
+32013: 66, 4, 5
+32014: 66, 4, 6
+32015: 66, 4, 7
+32016: 66, 4, 8
+32017: 66, 4, 9
+32018: 66, 4, 10
+32019: 66, 4, 11
+32020: 66, 5, 0
+32021: 66, 5, 1
+32022: 66, 5, 2
+32023: 66, 5, 3
+32024: 66, 5, 4
+32025: 66, 5, 5
+32026: 66, 5, 6
+32027: 66, 5, 7
+32028: 66, 5, 8
+32029: 66, 5, 9
+32030: 66, 5, 10
+32031: 66, 5, 11
+32032: 66, 5, 12
+32033: 66, 5, 13
+32034: 66, 5, 14
+32035: 66, 6, 0
+32036: 66, 6, 1
+32037: 66, 6, 2
+32038: 66, 6, 3
+32039: 66, 6, 4
+32040: 66, 6, 5
+32041: 66, 6, 6
+32042: 66, 6, 7
+32043: 66, 6, 8
+32044: 66, 6, 9
+32045: 66, 6, 10
+32046: 66, 6, 11
+32047: 66, 6, 12
+32048: 66, 6, 13
+32049: 66, 6, 14
+32050: 66, 6, 15
+32051: 66, 6, 16
+32052: 66, 6, 17
+32053: 66, 7, 0
+32054: 66, 7, 1
+32055: 66, 7, 2
+32056: 66, 7, 3
+32057: 66, 7, 4
+32058: 66, 7, 5
+32059: 66, 7, 6
+32060: 66, 7, 7
+32061: 66, 7, 8
+32062: 66, 7, 9
+32063: 66, 7, 10
+32064: 66, 7, 11
+32065: 66, 7, 12
+32066: 66, 7, 13
+32067: 66, 7, 14
+32068: 66, 7, 15
+32069: 66, 7, 16
+32070: 66, 7, 17
+32071: 66, 8, 0
+32072: 66, 8, 1
+32073: 66, 8, 2
+32074: 66, 8, 3
+32075: 66, 8, 4
+32076: 66, 8, 5
+32077: 66, 8, 6
+32078: 66, 8, 7
+32079: 66, 8, 8
+32080: 66, 8, 9
+32081: 66, 8, 10
+32082: 66, 8, 11
+32083: 66, 8, 12
+32084: 66, 8, 13
+32085: 66, 9, 0
+32086: 66, 9, 1
+32087: 66, 9, 2
+32088: 66, 9, 3
+32089: 66, 9, 4
+32090: 66, 9, 5
+32091: 66, 9, 6
+32092: 66, 9, 7
+32093: 66, 9, 8
+32094: 66, 9, 9
+32095: 66, 9, 10
+32096: 66, 9, 11
+32097: 66, 9, 12
+32098: 66, 9, 13
+32099: 66, 9, 14
+32100: 66, 9, 15
+32101: 66, 9, 16
+32102: 66, 9, 17
+32103: 66, 9, 18
+32104: 66, 9, 19
+32105: 66, 9, 20
+32106: 66, 9, 21
+32107: 66, 10, 0
+32108: 66, 10, 1
+32109: 66, 10, 2
+32110: 66, 10, 3
+32111: 66, 10, 4
+32112: 66, 10, 5
+32113: 66, 10, 6
+32114: 66, 10, 7
+32115: 66, 10, 8
+32116: 66, 10, 9
+32117: 66, 10, 10
+32118: 66, 10, 11
+32119: 66, 11, 0
+32120: 66, 11, 1
+32121: 66, 11, 2
+32122: 66, 11, 3
+32123: 66, 11, 4
+32124: 66, 11, 5
+32125: 66, 11, 6
+32126: 66, 11, 7
+32127: 66, 11, 8
+32128: 66, 11, 9
+32129: 66, 11, 10
+32130: 66, 11, 11
+32131: 66, 11, 12
+32132: 66, 11, 13
+32133: 66, 11, 14
+32134: 66, 11, 15
+32135: 66, 11, 16
+32136: 66, 11, 17
+32137: 66, 11, 18
+32138: 66, 11, 19
+32139: 66, 12, 0
+32140: 66, 12, 1
+32141: 66, 12, 2
+32142: 66, 12, 3
+32143: 66, 12, 4
+32144: 66, 12, 5
+32145: 66, 12, 6
+32146: 66, 12, 7
+32147: 66, 12, 8
+32148: 66, 12, 9
+32149: 66, 12, 10
+32150: 66, 12, 11
+32151: 66, 12, 12
+32152: 66, 12, 13
+32153: 66, 12, 14
+32154: 66, 12, 15
+32155: 66, 12, 16
+32156: 66, 12, 17
+32157: 66, 13, 0
+32158: 66, 13, 1
+32159: 66, 13, 2
+32160: 66, 13, 3
+32161: 66, 13, 4
+32162: 66, 13, 5
+32163: 66, 13, 6
+32164: 66, 13, 7
+32165: 66, 13, 8
+32166: 66, 13, 9
+32167: 66, 13, 10
+32168: 66, 13, 11
+32169: 66, 13, 12
+32170: 66, 13, 13
+32171: 66, 13, 14
+32172: 66, 13, 15
+32173: 66, 13, 16
+32174: 66, 13, 17
+32175: 66, 13, 18
+32176: 66, 14, 0
+32177: 66, 14, 1
+32178: 66, 14, 2
+32179: 66, 14, 3
+32180: 66, 14, 4
+32181: 66, 14, 5
+32182: 66, 14, 6
+32183: 66, 14, 7
+32184: 66, 14, 8
+32185: 66, 14, 9
+32186: 66, 14, 10
+32187: 66, 14, 11
+32188: 66, 14, 12
+32189: 66, 14, 13
+32190: 66, 14, 14
+32191: 66, 14, 15
+32192: 66, 14, 16
+32193: 66, 14, 17
+32194: 66, 14, 18
+32195: 66, 14, 19
+32196: 66, 14, 20
+32197: 66, 15, 0
+32198: 66, 15, 1
+32199: 66, 15, 2
+32200: 66, 15, 3
+32201: 66, 15, 4
+32202: 66, 15, 5
+32203: 66, 15, 6
+32204: 66, 15, 7
+32205: 66, 15, 8
+32206: 66, 16, 0
+32207: 66, 16, 1
+32208: 66, 16, 2
+32209: 66, 16, 3
+32210: 66, 16, 4
+32211: 66, 16, 5
+32212: 66, 16, 6
+32213: 66, 16, 7
+32214: 66, 16, 8
+32215: 66, 16, 9
+32216: 66, 16, 10
+32217: 66, 16, 11
+32218: 66, 16, 12
+32219: 66, 16, 13
+32220: 66, 16, 14
+32221: 66, 16, 15
+32222: 66, 16, 16
+32223: 66, 16, 17
+32224: 66, 16, 18
+32225: 66, 16, 19
+32226: 66, 16, 20
+32227: 66, 16, 21
+32228: 66, 17, 0
+32229: 66, 17, 1
+32230: 66, 17, 2
+32231: 66, 17, 3
+32232: 66, 17, 4
+32233: 66, 17, 5
+32234: 66, 17, 6
+32235: 66, 17, 7
+32236: 66, 17, 8
+32237: 66, 17, 9
+32238: 66, 17, 10
+32239: 66, 17, 11
+32240: 66, 17, 12
+32241: 66, 17, 13
+32242: 66, 17, 14
+32243: 66, 17, 15
+32244: 66, 17, 16
+32245: 66, 17, 17
+32246: 66, 17, 18
+32247: 66, 18, 0
+32248: 66, 18, 1
+32249: 66, 18, 2
+32250: 66, 18, 3
+32251: 66, 18, 4
+32252: 66, 18, 5
+32253: 66, 18, 6
+32254: 66, 18, 7
+32255: 66, 18, 8
+32256: 66, 18, 9
+32257: 66, 18, 10
+32258: 66, 18, 11
+32259: 66, 18, 12
+32260: 66, 18, 13
+32261: 66, 18, 14
+32262: 66, 18, 15
+32263: 66, 18, 16
+32264: 66, 18, 17
+32265: 66, 18, 18
+32266: 66, 18, 19
+32267: 66, 18, 20
+32268: 66, 18, 21
+32269: 66, 18, 22
+32270: 66, 18, 23
+32271: 66, 18, 24
+32272: 66, 19, 0
+32273: 66, 19, 1
+32274: 66, 19, 2
+32275: 66, 19, 3
+32276: 66, 19, 4
+32277: 66, 19, 5
+32278: 66, 19, 6
+32279: 66, 19, 7
+32280: 66, 19, 8
+32281: 66, 19, 9
+32282: 66, 19, 10
+32283: 66, 19, 11
+32284: 66, 19, 12
+32285: 66, 19, 13
+32286: 66, 19, 14
+32287: 66, 19, 15
+32288: 66, 19, 16
+32289: 66, 19, 17
+32290: 66, 19, 18
+32291: 66, 19, 19
+32292: 66, 19, 20
+32293: 66, 19, 21
+32294: 66, 20, 0
+32295: 66, 20, 1
+32296: 66, 20, 2
+32297: 66, 20, 3
+32298: 66, 20, 4
+32299: 66, 20, 5
+32300: 66, 20, 6
+32301: 66, 20, 7
+32302: 66, 20, 8
+32303: 66, 20, 9
+32304: 66, 20, 10
+32305: 66, 20, 11
+32306: 66, 20, 12
+32307: 66, 20, 13
+32308: 66, 20, 14
+32309: 66, 20, 15
+32310: 66, 21, 0
+32311: 66, 21, 1
+32312: 66, 21, 2
+32313: 66, 21, 3
+32314: 66, 21, 4
+32315: 66, 21, 5
+32316: 66, 21, 6
+32317: 66, 21, 7
+32318: 66, 21, 8
+32319: 66, 21, 9
+32320: 66, 21, 10
+32321: 66, 21, 11
+32322: 66, 21, 12
+32323: 66, 21, 13
+32324: 66, 21, 14
+32325: 66, 21, 15
+32326: 66, 21, 16
+32327: 66, 21, 17
+32328: 66, 21, 18
+32329: 66, 21, 19
+32330: 66, 21, 20
+32331: 66, 21, 21
+32332: 66, 21, 22
+32333: 66, 21, 23
+32334: 66, 21, 24
+32335: 66, 21, 25
+32336: 66, 21, 26
+32337: 66, 21, 27
+32338: 66, 22, 0
+32339: 66, 22, 1
+32340: 66, 22, 2
+32341: 66, 22, 3
+32342: 66, 22, 4
+32343: 66, 22, 5
+32344: 66, 22, 6
+32345: 66, 22, 7
+32346: 66, 22, 8
+32347: 66, 22, 9
+32348: 66, 22, 10
+32349: 66, 22, 11
+32350: 66, 22, 12
+32351: 66, 22, 13
+32352: 66, 22, 14
+32353: 66, 22, 15
+32354: 66, 22, 16
+32355: 66, 22, 17
+32356: 66, 22, 18
+32357: 66, 22, 19
+32358: 66, 22, 20
+32359: 66, 22, 21
+
diff --git a/tests/testsuite/versemgrtest.sh b/tests/testsuite/versemgrtest.sh
new file mode 100755
index 0000000..91b1af8
--- /dev/null
+++ b/tests/testsuite/versemgrtest.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+../versemgrtest KJV
diff --git a/tests/testsuite/verseparsing-utf8.good b/tests/testsuite/verseparsing-utf8.good
new file mode 100644
index 0000000..7a1b4e4
--- /dev/null
+++ b/tests/testsuite/verseparsing-utf8.good
@@ -0,0 +1,7 @@
+Matthäus 2:3-12 de KJV ge 1: Matthäus 2:3-Matthäus 2:12
+Römer 2:13 de KJV ge 1: Römer 2:13
+Matthäus 1:2-Röm 3:13 de KJV ge 1: Matthäus 1:2-Römer 3:13
+1. Könige 2 de KJV ge 1: 1. Könige 2:1-1. Könige 2:46
+1. Könige - 2. Könige; Markus 1:1; Matthäus 2:1; Matthäus; 1.Kön de KJV ge 1: 1. Könige 1:1-2. Könige 25:30; Markus 1:1; Matthäus 2:1; Matthäus 1:1-Matthäus 28:20; 1. Könige 1:1-1. Könige 22:53
+1. Könige - 2. Könige; Markus 1:1; Matthäus 2:1; Matthäus; 1.Kön-2.Kön;I Kings-Matthäus de KJV ge 1: 1. Könige 1:1-2. Könige 25:30; Markus 1:1; Matthäus 2:1; Matthäus 1:1-Matthäus 28:20; 1. Könige 1:1-2. Könige 25:30; 1. Könige 1:1-Matthäus 28:20
+Maleachi 1:1 - Matthäus 2:1 de KJV ge 1: Maleachi 1:1-Matthäus 2:1
diff --git a/tests/testsuite/verseparsing-utf8.sh b/tests/testsuite/verseparsing-utf8.sh
new file mode 100755
index 0000000..1d05007
--- /dev/null
+++ b/tests/testsuite/verseparsing-utf8.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+#******************************************************************************
+#
+# This only works if --with-icu was passed to configure 
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+### German test keys
+../parsekey "Matthäus 2:3-12" "de" KJV ge 1
+../parsekey "Römer 2:13" "de" KJV ge 1
+../parsekey "Matthäus 1:2-Röm 3:13" "de" KJV ge 1
+../parsekey "1. Könige 2" "de" KJV ge 1
+
+../parsekey "1. Könige - 2. Könige; Markus 1:1; Matthäus 2:1; Matthäus; 1.Kön" "de" KJV ge 1
+../parsekey "1. Könige - 2. Könige; Markus 1:1; Matthäus 2:1; Matthäus; 1.Kön-2.Kön;I Kings-Matthäus" "de" KJV ge 1
+../parsekey "Maleachi 1:1 - Matthäus 2:1" "de" KJV ge 1
diff --git a/tests/testsuite/verseparsing.good b/tests/testsuite/verseparsing.good
new file mode 100644
index 0000000..ee46d68
--- /dev/null
+++ b/tests/testsuite/verseparsing.good
@@ -0,0 +1,265 @@
+jn.1.1-2.5,9,3;7.9 en KJV ge 1: John 1:1-John 2:5; John 2:9; John 2:3; John 7:9
+jn.1.1-2.5 en KJV ge 1: John 1:1-John 2:5
+1jn.2.3 en KJV ge 1: I John 2:3
+1 jn.2.3 en KJV ge 1: I John 2:3
+Ijn.2.3 en KJV ge 1: I John 2:3
+I jn.2.3 en KJV ge 1: I John 2:3
+1jn 2.3 en KJV ge 1: I John 2:3
+1 jn 2.3 en KJV ge 1: I John 2:3
+Ijn 2.3 en KJV ge 1: I John 2:3
+I jn 2.3 en KJV ge 1: I John 2:3
+1jn.2:3 en KJV ge 1: I John 2:3
+1 jn.2:3 en KJV ge 1: I John 2:3
+Ijn.2:3 en KJV ge 1: I John 2:3
+I jn.2:3 en KJV ge 1: I John 2:3
+1jn 2:3 en KJV ge 1: I John 2:3
+1 jn 2:3 en KJV ge 1: I John 2:3
+Ijn 2:3 en KJV ge 1: I John 2:3
+I jn 2:3 en KJV ge 1: I John 2:3
+1.jn.2.3 en KJV ge 1: I John 2:3
+1. jn.2.3 en KJV ge 1: I John 2:3
+I.jn.2.3 en KJV ge 1: I John 2:3
+I. jn.2.3 en KJV ge 1: I John 2:3
+1.jn 2.3 en KJV ge 1: I John 2:3
+1. jn 2.3 en KJV ge 1: I John 2:3
+I.jn 2.3 en KJV ge 1: I John 2:3
+I. jn 2.3 en KJV ge 1: I John 2:3
+1.jn.2:3 en KJV ge 1: I John 2:3
+1. jn.2:3 en KJV ge 1: I John 2:3
+I.jn.2:3 en KJV ge 1: I John 2:3
+I. jn.2:3 en KJV ge 1: I John 2:3
+1.jn 2:3 en KJV ge 1: I John 2:3
+1. jn 2:3 en KJV ge 1: I John 2:3
+I.jn 2:3 en KJV ge 1: I John 2:3
+I. jn 2:3 en KJV ge 1: I John 2:3
+1. Johannes 2:3 de KJV ge 1: 1. Johannes 2:3
+1. Johannes 1:1-3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1. Joh 1:1-3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1Jn 1:1-3:10 en KJV ge 1: I John 1:1-I John 3:10
+1. Johannes 1:1 - 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1. Joh 1:1 - 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1Jn 1:1 - 3:10 en KJV ge 1: I John 1:1-I John 3:10
+1. Johannes 1:1 -3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1. Joh 1:1 -3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1Jn 1:1 -3:10 en KJV ge 1: I John 1:1-I John 3:10
+1. Johannes 1:1- 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1. Joh 1:1- 3:10 de KJV ge 1: 1. Johannes 1:1-1. Johannes 3:10
+1Jn 1:1- 3:10 en KJV ge 1: I John 1:1-I John 3:10
+1Jn 1:1 3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1  3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1,3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1, 3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1 ,3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1 , 3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1;3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1; 3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1 ;3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1 ; 3:10 en KJV ge 1: I John 1:1; I John 3:10
+1Jn 1:1a ; 3:10b en KJV ge 1: I John 1:1a; I John 3:10b
+1Jn 1:1-2a; 3:10b-11 en KJV ge 1: I John 1:1-I John 1:2a; I John 3:10b-I John 3:11
+1Jn 1:1c;3:10d-12e,13 en KJV ge 1: I John 1:1c; I John 3:10d-I John 3:12e; I John 3:13
+Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a en KJV ge 1: Luke 2:45b-Luke 3:1a; Luke 3:1b-Luke 3:7; Luke 3:8-Luke 3:14; Luke 3:15-Luke 3:21a
+1Jn1.1f; 3:10ff en KJV ge 1: I John 1:1-I John 1:2; I John 3:10-I John 3:24
+1Jn1.1ff;3:10f en KJV ge 1: I John 1:1-I John 1:10; I John 3:10-I John 3:11
+1Jn1.1,8ff; 3:10-12,14f,17ff en KJV ge 1: I John 1:1; I John 1:8-I John 1:10; I John 3:10-I John 3:12; I John 3:14-I John 3:15; I John 3:17-I John 3:24
+1Jn2.3f. en KJV ge 1: I John 2:3-I John 2:4
+1Jn2.3ff. en KJV ge 1: I John 2:3-I John 2:29
+Song of 3:5 en KJV ge 1: Song of Solomon 3:5
+Song of Sol 3:5 en KJV ge 1: Song of Solomon 3:5
+Revelation of John 1:1 en KJV ge 1: Revelation of John 1:1
+Matt.Inscriptio en KJV ge 1 0 1: Matthew 0:0
+Matt.Subscriptio en KJV ge 1 0 1: Matthew 1:0
+Matt Inscriptio en KJV ge 1 0 1: Matthew 0:0
+Matt  Inscriptio en KJV ge 1 0 1: Matthew 0:0
+Matt  subsc en KJV ge 1 0 1: Matthew 1:0
+Gen en KJV ge 1: Genesis 1:1-Genesis 50:26
+Genes en KJV ge 1: Genesis 1:1-Genesis 50:26
+Exod en KJV ge 1: Exodus 1:1-Exodus 40:38
+Ex en KJV ge 1: Exodus 1:1-Exodus 40:38
+Exo en KJV ge 1: Exodus 1:1-Exodus 40:38
+Lev en KJV ge 1: Leviticus 1:1-Leviticus 27:34
+Le en KJV ge 1: Leviticus 1:1-Leviticus 27:34
+Levi en KJV ge 1: Leviticus 1:1-Leviticus 27:34
+Num en KJV ge 1: Numbers 1:1-Numbers 36:13
+Nu en KJV ge 1: Numbers 1:1-Numbers 36:13
+Numb en KJV ge 1: Numbers 1:1-Numbers 36:13
+Deut en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
+Deu en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
+De en KJV ge 1: Deuteronomy 1:1-Deuteronomy 34:12
+Josh en KJV ge 1: Joshua 1:1-Joshua 24:33
+Jos en KJV ge 1: Joshua 1:1-Joshua 24:33
+Joshu en KJV ge 1: Joshua 1:1-Joshua 24:33
+Judg en KJV ge 1: Judges 1:1-Judges 21:25
+Jdg en KJV ge 1: Judges 1:1-Judges 21:25
+Judge en KJV ge 1: Judges 1:1-Judges 21:25
+Ruth en KJV ge 1: Ruth 1:1-Ruth 4:22
+Ru en KJV ge 1: Ruth 1:1-Ruth 4:22
+Rut en KJV ge 1: Ruth 1:1-Ruth 4:22
+1Sam en KJV ge 1: I Samuel 1:1-I Samuel 31:13
+1Sa en KJV ge 1: I Samuel 1:1-I Samuel 31:13
+1Samu en KJV ge 1: I Samuel 1:1-I Samuel 31:13
+2Sam en KJV ge 1: II Samuel 1:1-II Samuel 24:25
+2Sa en KJV ge 1: II Samuel 1:1-II Samuel 24:25
+2Samu en KJV ge 1: II Samuel 1:1-II Samuel 24:25
+1Kgs en KJV ge 1: I Kings 1:1-I Kings 22:53
+1Ki en KJV ge 1: I Kings 1:1-I Kings 22:53
+1King en KJV ge 1: I Kings 1:1-I Kings 22:53
+2Kgs en KJV ge 1: II Kings 1:1-II Kings 25:30
+2Ki en KJV ge 1: II Kings 1:1-II Kings 25:30
+2King en KJV ge 1: II Kings 1:1-II Kings 25:30
+1Chr en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
+1Chron en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
+1Ch en KJV ge 1: I Chronicles 1:1-I Chronicles 29:30
+2Chr en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
+2Chron en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
+2Ch en KJV ge 1: II Chronicles 1:1-II Chronicles 36:23
+Ezra en KJV ge 1: Ezra 1:1-Ezra 10:44
+Ezr en KJV ge 1: Ezra 1:1-Ezra 10:44
+Neh en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
+Ne en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
+Nehe en KJV ge 1: Nehemiah 1:1-Nehemiah 13:31
+Esth en KJV ge 1: Esther 1:1-Esther 10:3
+Es en KJV ge 1: Esther 1:1-Esther 10:3
+Est en KJV ge 1: Esther 1:1-Esther 10:3
+Job en KJV ge 1: Job 1:1-Job 42:17
+Ps en KJV ge 1: Psalms 1:1-Psalms 150:6
+Psa en KJV ge 1: Psalms 1:1-Psalms 150:6
+Psalm en KJV ge 1: Psalms 1:1-Psalms 150:6
+Prov en KJV ge 1: Proverbs 1:1-Proverbs 31:31
+Pr en KJV ge 1: Proverbs 1:1-Proverbs 31:31
+Pro en KJV ge 1: Proverbs 1:1-Proverbs 31:31
+Eccl en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
+Ec en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
+Ecc en KJV ge 1: Ecclesiastes 1:1-Ecclesiastes 12:14
+Song en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
+So en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
+Son en KJV ge 1: Song of Solomon 1:1-Song of Solomon 8:14
+Isa en KJV ge 1: Isaiah 1:1-Isaiah 66:24
+Is en KJV ge 1: Isaiah 1:1-Isaiah 66:24
+Isai en KJV ge 1: Isaiah 1:1-Isaiah 66:24
+Jer en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
+Jere en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
+Je en KJV ge 1: Jeremiah 1:1-Jeremiah 52:34
+Lam en KJV ge 1: Lamentations 1:1-Lamentations 5:22
+La en KJV ge 1: Lamentations 1:1-Lamentations 5:22
+Lament en KJV ge 1: Lamentations 1:1-Lamentations 5:22
+Ezek en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
+Ez en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
+Eze en KJV ge 1: Ezekiel 1:1-Ezekiel 48:35
+Dan en KJV ge 1: Daniel 1:1-Daniel 12:13
+Dan en KJV ge 1: Daniel 1:1-Daniel 12:13
+Da en KJV ge 1: Daniel 1:1-Daniel 12:13
+Hos en KJV ge 1: Hosea 1:1-Hosea 14:9
+Hos en KJV ge 1: Hosea 1:1-Hosea 14:9
+Hose en KJV ge 1: Hosea 1:1-Hosea 14:9
+Joel en KJV ge 1: Joel 1:1-Joel 3:21
+Joe en KJV ge 1: Joel 1:1-Joel 3:21
+Amos en KJV ge 1: Amos 1:1-Amos 9:15
+Am en KJV ge 1: Amos 1:1-Amos 9:15
+Amo en KJV ge 1: Amos 1:1-Amos 9:15
+Obad en KJV ge 1: Obadiah 1:1-Obadiah 1:21
+Ob en KJV ge 1: Obadiah 1:1-Obadiah 1:21
+Oba en KJV ge 1: Obadiah 1:1-Obadiah 1:21
+Jonah en KJV ge 1: Jonah 1:1-Jonah 4:11
+Jon en KJV ge 1: Jonah 1:1-Jonah 4:11
+Jona en KJV ge 1: Jonah 1:1-Jonah 4:11
+Mic en KJV ge 1: Micah 1:1-Micah 7:20
+Mi en KJV ge 1: Micah 1:1-Micah 7:20
+Mica en KJV ge 1: Micah 1:1-Micah 7:20
+Nah en KJV ge 1: Nahum 1:1-Nahum 3:19
+Na en KJV ge 1: Nahum 1:1-Nahum 3:19
+Nahu en KJV ge 1: Nahum 1:1-Nahum 3:19
+Hab en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
+Haba en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
+Ha en KJV ge 1: Habakkuk 1:1-Habakkuk 3:19
+Zeph en KJV ge 1: Zephaniah 1:1-Zephaniah 3:20
+Zep en KJV ge 1: Zephaniah 1:1-Zephaniah 3:20
+Hag en KJV ge 1: Haggai 1:1-Haggai 2:23
+Hagg en KJV ge 1: Haggai 1:1-Haggai 2:23
+Zech en KJV ge 1: Zechariah 1:1-Zechariah 14:21
+Ze en KJV ge 1: Zechariah 1:1-Zechariah 14:21
+Zecha en KJV ge 1: Zechariah 1:1-Zechariah 14:21
+Mal en KJV ge 1: Malachi 1:1-Malachi 4:6
+Mala en KJV ge 1: Malachi 1:1-Malachi 4:6
+Matt en KJV ge 1: Matthew 1:1-Matthew 28:20
+Mt en KJV ge 1: Matthew 1:1-Matthew 28:20
+Mat en KJV ge 1: Matthew 1:1-Matthew 28:20
+Mark en KJV ge 1: Mark 1:1-Mark 16:20
+Mar en KJV ge 1: Mark 1:1-Mark 16:20
+Ma en KJV ge 1: Matthew 1:1-Matthew 28:20
+Luke en KJV ge 1: Luke 1:1-Luke 24:53
+Lk en KJV ge 1: Luke 1:1-Luke 24:53
+Luk en KJV ge 1: Luke 1:1-Luke 24:53
+John en KJV ge 1: John 1:1-John 21:25
+Joh en KJV ge 1: John 1:1-John 21:25
+Jn en KJV ge 1: John 1:1-John 21:25
+Acts en KJV ge 1: Acts 1:1-Acts 28:31
+Ac en KJV ge 1: Acts 1:1-Acts 28:31
+A en KJV ge 1: Acts 1:1-Acts 28:31
+Rom en KJV ge 1: Romans 1:1-Romans 16:27
+Ro en KJV ge 1: Romans 1:1-Romans 16:27
+Roma en KJV ge 1: Romans 1:1-Romans 16:27
+1Cor en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
+1Co en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
+1Cori en KJV ge 1: I Corinthians 1:1-I Corinthians 16:24
+2Cor en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
+2Co en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
+2Cori en KJV ge 1: II Corinthians 1:1-II Corinthians 13:14
+Gal en KJV ge 1: Galatians 1:1-Galatians 6:18
+Ga en KJV ge 1: Galatians 1:1-Galatians 6:18
+Gala en KJV ge 1: Galatians 1:1-Galatians 6:18
+Eph en KJV ge 1: Ephesians 1:1-Ephesians 6:24
+Ep en KJV ge 1: Ephesians 1:1-Ephesians 6:24
+Ephes en KJV ge 1: Ephesians 1:1-Ephesians 6:24
+Ph en KJV ge 1: Philippians 1:1-Philippians 4:23
+Phi en KJV ge 1: Philippians 1:1-Philippians 4:23
+Phil en KJV ge 1: Philippians 1:1-Philippians 4:23
+Phili en KJV ge 1: Philippians 1:1-Philippians 4:23
+Philip en KJV ge 1: Philippians 1:1-Philippians 4:23
+Col en KJV ge 1: Colossians 1:1-Colossians 4:18
+Co en KJV ge 1: Colossians 1:1-Colossians 4:18
+Colo en KJV ge 1: Colossians 1:1-Colossians 4:18
+1Thess en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
+1Th en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
+1Thes en KJV ge 1: I Thessalonians 1:1-I Thessalonians 5:28
+2Thess en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
+2Th en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
+2Thes en KJV ge 1: II Thessalonians 1:1-II Thessalonians 3:18
+1Tim en KJV ge 1: I Timothy 1:1-I Timothy 6:21
+1Ti en KJV ge 1: I Timothy 1:1-I Timothy 6:21
+1Timo en KJV ge 1: I Timothy 1:1-I Timothy 6:21
+2Tim en KJV ge 1: II Timothy 1:1-II Timothy 4:22
+2Ti en KJV ge 1: II Timothy 1:1-II Timothy 4:22
+2Timo en KJV ge 1: II Timothy 1:1-II Timothy 4:22
+Titus en KJV ge 1: Titus 1:1-Titus 3:15
+Tit en KJV ge 1: Titus 1:1-Titus 3:15
+Titu en KJV ge 1: Titus 1:1-Titus 3:15
+Phlm en KJV ge 1: Philemon 1:1-Philemon 1:25
+Phile en KJV ge 1: Philemon 1:1-Philemon 1:25
+Heb en KJV ge 1: Hebrews 1:1-Hebrews 13:25
+Hebrews en KJV ge 1: Hebrews 1:1-Hebrews 13:25
+Hebr en KJV ge 1: Hebrews 1:1-Hebrews 13:25
+Jas en KJV ge 1: James 1:1-James 5:20
+James en KJV ge 1: James 1:1-James 5:20
+Jam en KJV ge 1: James 1:1-James 5:20
+1Pet en KJV ge 1: I Peter 1:1-I Peter 5:14
+1Pe en KJV ge 1: I Peter 1:1-I Peter 5:14
+1Pete en KJV ge 1: I Peter 1:1-I Peter 5:14
+2Pet en KJV ge 1: II Peter 1:1-II Peter 3:18
+2Pe en KJV ge 1: II Peter 1:1-II Peter 3:18
+2Pete en KJV ge 1: II Peter 1:1-II Peter 3:18
+1John en KJV ge 1: I John 1:1-I John 5:21
+1Jn en KJV ge 1: I John 1:1-I John 5:21
+1J en KJV ge 1: I John 1:1-I John 5:21
+2John en KJV ge 1: II John 1:1-II John 1:13
+2Jn en KJV ge 1: II John 1:1-II John 1:13
+2J en KJV ge 1: II John 1:1-II John 1:13
+3John en KJV ge 1: III John 1:1-III John 1:14
+3Jn en KJV ge 1: III John 1:1-III John 1:14
+3J en KJV ge 1: III John 1:1-III John 1:14
+Jude en KJV ge 1: Jude 1:1-Jude 1:25
+Jud en KJV ge 1: Jude 1:1-Jude 1:25
+Ju en KJV ge 1: Jude 1:1-Jude 1:25
+Rev en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
+Re en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
+Reve en KJV ge 1: Revelation of John 1:1-Revelation of John 22:21
diff --git a/tests/testsuite/verseparsing.sh b/tests/testsuite/verseparsing.sh
new file mode 100755
index 0000000..aa6ae25
--- /dev/null
+++ b/tests/testsuite/verseparsing.sh
@@ -0,0 +1,132 @@
+#!/bin/sh
+#******************************************************************************
+#
+# $Id: verseparsing.sh 2796 2013-04-11 16:18:45Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+../parsekey "jn.1.1-2.5,9,3;7.9" en KJV ge 1
+../parsekey "jn.1.1-2.5" en KJV ge 1
+
+../parsekey "1jn.2.3" en KJV ge 1
+../parsekey "1 jn.2.3" en KJV ge 1
+../parsekey "Ijn.2.3" en KJV ge 1
+../parsekey "I jn.2.3" en KJV ge 1
+../parsekey "1jn 2.3" en KJV ge 1
+../parsekey "1 jn 2.3" en KJV ge 1
+../parsekey "Ijn 2.3" en KJV ge 1
+../parsekey "I jn 2.3" en KJV ge 1
+../parsekey "1jn.2:3" en KJV ge 1
+../parsekey "1 jn.2:3" en KJV ge 1
+../parsekey "Ijn.2:3" en KJV ge 1
+../parsekey "I jn.2:3" en KJV ge 1
+../parsekey "1jn 2:3" en KJV ge 1
+../parsekey "1 jn 2:3" en KJV ge 1
+../parsekey "Ijn 2:3" en KJV ge 1
+../parsekey "I jn 2:3" en KJV ge 1
+
+../parsekey "1.jn.2.3" en KJV ge 1
+../parsekey "1. jn.2.3" en KJV ge 1
+../parsekey "I.jn.2.3" en KJV ge 1
+../parsekey "I. jn.2.3" en KJV ge 1
+../parsekey "1.jn 2.3" en KJV ge 1
+../parsekey "1. jn 2.3" en KJV ge 1
+../parsekey "I.jn 2.3" en KJV ge 1
+../parsekey "I. jn 2.3" en KJV ge 1
+../parsekey "1.jn.2:3" en KJV ge 1
+../parsekey "1. jn.2:3" en KJV ge 1
+../parsekey "I.jn.2:3" en KJV ge 1
+../parsekey "I. jn.2:3" en KJV ge 1
+../parsekey "1.jn 2:3" en KJV ge 1
+../parsekey "1. jn 2:3" en KJV ge 1
+../parsekey "I.jn 2:3" en KJV ge 1
+../parsekey "I. jn 2:3" en KJV ge 1
+
+### German test keys
+../parsekey "1. Johannes 2:3" "de" KJV ge 1
+
+### Range parsing tests
+../parsekey "1. Johannes 1:1-3:10" "de" KJV ge 1
+../parsekey "1. Joh 1:1-3:10" "de" KJV ge 1
+../parsekey "1Jn 1:1-3:10" en KJV ge 1
+../parsekey "1. Johannes 1:1 - 3:10" "de" KJV ge 1
+../parsekey "1. Joh 1:1 - 3:10" "de" KJV ge 1
+../parsekey "1Jn 1:1 - 3:10" en KJV ge 1
+../parsekey "1. Johannes 1:1 -3:10" "de" KJV ge 1
+../parsekey "1. Joh 1:1 -3:10" "de" KJV ge 1
+../parsekey "1Jn 1:1 -3:10" en KJV ge 1
+../parsekey "1. Johannes 1:1- 3:10" "de" KJV ge 1
+../parsekey "1. Joh 1:1- 3:10" "de" KJV ge 1
+../parsekey "1Jn 1:1- 3:10" en KJV ge 1
+
+### List parsing tests
+../parsekey "1Jn 1:1 3:10" en KJV ge 1
+../parsekey "1Jn 1:1  3:10" en KJV ge 1
+../parsekey "1Jn 1:1,3:10" en KJV ge 1
+../parsekey "1Jn 1:1, 3:10" en KJV ge 1
+../parsekey "1Jn 1:1 ,3:10" en KJV ge 1
+../parsekey "1Jn 1:1 , 3:10" en KJV ge 1
+../parsekey "1Jn 1:1;3:10" en KJV ge 1
+../parsekey "1Jn 1:1; 3:10" en KJV ge 1
+../parsekey "1Jn 1:1 ;3:10" en KJV ge 1
+../parsekey "1Jn 1:1 ; 3:10" en KJV ge 1
+../parsekey "1Jn 1:1a ; 3:10b" en KJV ge 1
+
+### Suffix parsing
+../parsekey "1Jn 1:1-2a; 3:10b-11" en KJV ge 1
+../parsekey "1Jn 1:1c;3:10d-12e,13" en KJV ge 1
+../parsekey "Luke 2:45b-3:1a;3:1b-7;3:8-14;3:15-21a" en KJV ge 1
+
+../parsekey "1Jn1.1f; 3:10ff" en KJV ge 1
+../parsekey "1Jn1.1ff;3:10f" en KJV ge 1
+../parsekey "1Jn1.1,8ff; 3:10-12,14f,17ff" en KJV ge 1
+../parsekey "1Jn2.3f." en KJV ge 1
+../parsekey "1Jn2.3ff." en KJV ge 1
+
+### check for 'f' in book name which might trigger 'and following'
+../parsekey "Song of 3:5" en KJV ge 1
+../parsekey "Song of Sol 3:5" en KJV ge 1
+../parsekey "Revelation of John 1:1" en KJV ge 1
+
+### check for 'inscriptio' and 'subscriptio' special chapters which parse to Book 0:0 and Book 1:0 respectively (for INTF)
+../parsekey "Matt.Inscriptio" en KJV ge 1 0 1
+../parsekey "Matt.Subscriptio" en KJV ge 1 0 1
+../parsekey "Matt Inscriptio" en KJV ge 1 0 1
+../parsekey "Matt  Inscriptio" en KJV ge 1 0 1
+../parsekey "Matt  subsc" en KJV ge 1 0 1
+
+
+
+en_abbrevs="
+Gen Genes Exod Ex Exo Lev Le Levi Num Nu Numb Deut Deu De Josh Jos Joshu
+Judg Jdg Judge Ruth Ru Rut 1Sam 1Sa 1Samu 2Sam 2Sa 2Samu 1Kgs 1Ki 1King
+2Kgs 2Ki 2King 1Chr 1Chron 1Ch 2Chr 2Chron 2Ch Ezra Ezr Neh Ne Nehe
+Esth Es Est Job  Ps Psa Psalm Prov Pr Pro Eccl Ec Ecc Song So Son
+Isa Is Isai Jer Jere Je Lam La Lament Ezek Ez Eze Dan Dan Da Hos Hos
+Hose Joel Joe Amos Am Amo Obad Ob Oba Jonah Jon Jona Mic Mi Mica Nah Na
+Nahu Hab Haba Ha Zeph Zep Hag Hagg Zech Ze Zecha Mal Mala
+Matt Mt Mat Mark Mar Ma Luke Lk Luk John Joh Jn Acts Ac A Rom Ro Roma
+1Cor 1Co 1Cori 2Cor 2Co 2Cori Gal Ga Gala Eph Ep Ephes Ph Phi Phil Phili Philip
+Col Co Colo 1Thess 1Th 1Thes 2Thess 2Th 2Thes 1Tim 1Ti 1Timo
+2Tim 2Ti 2Timo Titus Tit Titu Phlm Phile Heb Hebrews Hebr
+Jas James Jam 1Pet 1Pe 1Pete 2Pet 2Pe 2Pete 1John 1Jn 1J
+2John 2Jn 2J 3John 3Jn 3J Jude Jud Ju Rev Re Reve
+"
+for i in $en_abbrevs
+do
+  ../parsekey $i en KJV ge 1
+done
+
diff --git a/tests/testsuite/xmltag.good b/tests/testsuite/xmltag.good
new file mode 100644
index 0000000..a14c5d1
--- /dev/null
+++ b/tests/testsuite/xmltag.good
@@ -0,0 +1,136 @@
+<verse osisID="John.1.1" type='test type' yeah = "stuff" />
+<verse osisID="John.1.1" type="test type" yeah="stuff"/>
+<verse addedAttribute='with a " quote' osisID="John.1.1" type="test type" yeah="stuff"/>
+Tag name: [verse]
+ - attribute: [addedAttribute] = [with a " quote]
+	4 parts:
+	with
+	a
+	"
+	quote
+ - attribute: [osisID] = [John.1.1]
+	1 parts:
+	John.1.1
+ - attribute: [type] = [test type]
+	2 parts:
+	test
+	type
+ - attribute: [yeah] = [stuff]
+	1 parts:
+	stuff
+ isEmpty: 1
+ isEndTag: 0
+
+Setting attribute 'multiPart' to: 'ABC D EF GHIJ'
+<verse addedAttribute='with a " quote' multiPart="ABC D EF GHIJ" osisID="John.1.1" type="test type" yeah="stuff"/>
+Setting part 2 to 'MMM'
+<verse addedAttribute='with a " quote' multiPart="ABC D MMM GHIJ" osisID="John.1.1" type="test type" yeah="stuff"/>
+Removing part 1
+<verse addedAttribute='with a " quote' multiPart="ABC MMM GHIJ" osisID="John.1.1" type="test type" yeah="stuff"/>
+Removing part 2
+<verse addedAttribute='with a " quote' multiPart="ABC MMM" osisID="John.1.1" type="test type" yeah="stuff"/>
+<yo mama='stuff' />
+<yo mama="stuff"/>
+<yo addedAttribute='with a " quote' mama="stuff"/>
+Tag name: [yo]
+ - attribute: [addedAttribute] = [with a " quote]
+	4 parts:
+	with
+	a
+	"
+	quote
+ - attribute: [mama] = [stuff]
+	1 parts:
+	stuff
+ isEmpty: 1
+ isEndTag: 0
+
+<yo mama='stuff'>
+<yo mama="stuff">
+<yo addedAttribute='with a " quote' mama="stuff">
+Tag name: [yo]
+ - attribute: [addedAttribute] = [with a " quote]
+	4 parts:
+	with
+	a
+	"
+	quote
+ - attribute: [mama] = [stuff]
+	1 parts:
+	stuff
+ isEmpty: 0
+ isEndTag: 0
+
+<yo mama = 'stuff'>
+<yo mama="stuff">
+<yo addedAttribute='with a " quote' mama="stuff">
+Tag name: [yo]
+ - attribute: [addedAttribute] = [with a " quote]
+	4 parts:
+	with
+	a
+	"
+	quote
+ - attribute: [mama] = [stuff]
+	1 parts:
+	stuff
+ isEmpty: 0
+ isEndTag: 0
+
+<yo mama = 'stuff' yoyoma="hohum">
+<yo mama="stuff" yoyoma="hohum">
+<yo addedAttribute='with a " quote' mama="stuff" yoyoma="hohum">
+Tag name: [yo]
+ - attribute: [addedAttribute] = [with a " quote]
+	4 parts:
+	with
+	a
+	"
+	quote
+ - attribute: [mama] = [stuff]
+	1 parts:
+	stuff
+ - attribute: [yoyoma] = [hohum]
+	1 parts:
+	hohum
+ isEmpty: 0
+ isEndTag: 0
+
+yo mama = 'stuff' yoyoma="hohum"
+<yo mama="stuff" yoyoma="hohum">
+<yo addedAttribute='with a " quote' mama="stuff" yoyoma="hohum">
+Tag name: [yo]
+ - attribute: [addedAttribute] = [with a " quote]
+	4 parts:
+	with
+	a
+	"
+	quote
+ - attribute: [mama] = [stuff]
+	1 parts:
+	stuff
+ - attribute: [yoyoma] = [hohum]
+	1 parts:
+	hohum
+ isEmpty: 0
+ isEndTag: 0
+
+yo mama = 'stuff' yoyoma="hohum"/
+<yo mama="stuff" yoyoma="hohum"/>
+<yo addedAttribute='with a " quote' mama="stuff" yoyoma="hohum"/>
+Tag name: [yo]
+ - attribute: [addedAttribute] = [with a " quote]
+	4 parts:
+	with
+	a
+	"
+	quote
+ - attribute: [mama] = [stuff]
+	1 parts:
+	stuff
+ - attribute: [yoyoma] = [hohum]
+	1 parts:
+	hohum
+ isEmpty: 1
+ isEndTag: 0
+
diff --git a/tests/testsuite/xmltag.sh b/tests/testsuite/xmltag.sh
new file mode 100755
index 0000000..f223b68
--- /dev/null
+++ b/tests/testsuite/xmltag.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+#******************************************************************************
+#
+# $Id: swmgr.h 2321 2009-04-13 01:17:00Z scribe $
+#
+# Copyright 1998-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+# Just let it run the default
+../xmltest
+
+#let's try some crazy stuff
+../xmltest "<yo mama='stuff' />"
+../xmltest "<yo mama='stuff'>"
+../xmltest "<yo mama = 'stuff'>"
+../xmltest "<yo mama = 'stuff' yoyoma=\"hohum\">"
+../xmltest "yo mama = 'stuff' yoyoma=\"hohum\""
+../xmltest "yo mama = 'stuff' yoyoma=\"hohum\"/"
diff --git a/tests/tlitmgrtest.cpp b/tests/tlitmgrtest.cpp
new file mode 100644
index 0000000..d7c0b1b
--- /dev/null
+++ b/tests/tlitmgrtest.cpp
@@ -0,0 +1,737 @@
+/******************************************************************************
+ *
+ *  tlitmgrtest.cpp -	
+ *
+ * $Id: tlitmgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/*
+ * void Transliterator::initializeRegistry(void) {
+    // Lock first, check registry pointer second
+    Mutex lock(&registryMutex);
+    if (registry != 0) {
+        // We were blocked by another thread in initializeRegistry()
+        return;
+    }
+
+    UErrorCode status = U_ZERO_ERROR;
+
+    registry = new TransliteratorRegistry(status);
+    if (registry == 0 || U_FAILURE(status)) {
+        return; // out of memory, no recovery
+    }
+
+     * The following code parses the index table located in
+     * icu/data/translit_index.txt.  The index is an n x 4 table
+     * that follows this format:
+     *
+     *   <id>:file:<resource>:<direction>
+     *   <id>:internal:<resource>:<direction>
+     *   <id>:alias:<getInstanceArg>:
+     *
+     * <id> is the ID of the system transliterator being defined.  These
+     * are public IDs enumerated by Transliterator.getAvailableIDs(),
+     * unless the second field is "internal".
+     *
+     * <resource> is a ResourceReader resource name.  Currently these refer
+     * to file names under com/ibm/text/resources.  This string is passed
+     * directly to ResourceReader, together with <encoding>.
+     *
+     * <direction> is either "FORWARD" or "REVERSE".
+     *
+     * <getInstanceArg> is a string to be passed directly to
+     * Transliterator.getInstance().  The returned Transliterator object
+     * then has its ID changed to <id> and is returned.
+     *
+     * The extra blank field on "alias" lines is to make the array square.
+     *
+    static const char translit_index[] = "translit_index";
+
+    UResourceBundle *bundle, *transIDs, *colBund;
+    bundle = ures_openDirect(0, translit_index, &status);
+    transIDs = ures_getByKey(bundle, RB_RULE_BASED_IDS, 0, &status);
+
+    int32_t row, maxRows;
+    if (U_SUCCESS(status)) {
+        maxRows = ures_getSize(transIDs);
+        for (row = 0; row < maxRows; row++) {
+            colBund = ures_getByIndex(transIDs, row, 0, &status);
+
+            if (U_SUCCESS(status) && ures_getSize(colBund) == 4) {
+                UnicodeString id = ures_getUnicodeStringByIndex(colBund, 0, &status);
+                UChar type = ures_getUnicodeStringByIndex(colBund, 1, &status).charAt(0);
+                UnicodeString resString = ures_getUnicodeStringByIndex(colBund, 2, &status);
+
+                if (U_SUCCESS(status)) {
+                    switch (type) {
+                    case 0x66: // 'f'
+                    case 0x69: // 'i'
+                        // 'file' or 'internal';
+                        // row[2]=resource, row[3]=direction
+                        {
+                            UBool visible = (type == 0x0066 /f/);
+                            UTransDirection dir =
+                                (ures_getUnicodeStringByIndex(colBund, 3, &status).charAt(0) ==
+                                 0x0046 /F/) ?
+                                UTRANS_FORWARD : UTRANS_REVERSE;
+                            registry->put(id, resString, dir, visible);
+                        }
+                        break;
+                    case 0x61: // 'a'
+                        // 'alias'; row[2]=createInstance argument
+                        registry->put(id, resString, TRUE);
+                        break;
+                    }
+                }
+            }
+
+            ures_close(colBund);
+        }
+    }
+
+    ures_close(transIDs);
+    ures_close(bundle);
+
+    specialInverses = new Hashtable(TRUE);
+    specialInverses->setValueDeleter(uhash_deleteUnicodeString);
+    _registerSpecialInverse(NullTransliterator::SHORT_ID,
+                            NullTransliterator::SHORT_ID, FALSE);
+
+    // Manually add prototypes that the system knows about to the
+    // cache.  This is how new non-rule-based transliterators are
+    // added to the system.
+
+    registry->put(new NullTransliterator(), TRUE);
+    registry->put(new LowercaseTransliterator(), TRUE);
+    registry->put(new UppercaseTransliterator(), TRUE);
+    registry->put(new TitlecaseTransliterator(), TRUE);
+    _registerSpecialInverse("Upper", "Lower", TRUE);
+    _registerSpecialInverse("Title", "Lower", FALSE);
+    registry->put(new UnicodeNameTransliterator(), TRUE);
+    registry->put(new NameUnicodeTransliterator(), TRUE);
+    RemoveTransliterator::registerIDs();
+    EscapeTransliterator::registerIDs();
+    UnescapeTransliterator::registerIDs();
+    NormalizationTransliterator::registerIDs();
+    ucln_i18n_registerCleanup();
+}
+*/
+
+
+/*Transliterator* TransliteratorRegistry::instantiateEntry(const UnicodeString& ID,
+                                                         Entry *entry,
+                                                         TransliteratorAlias* &aliasReturn,
+                                                         UParseError& parseError,
+                                                         UErrorCode& status) {
+
+    for (;;) {
+        if (entry->entryType == Entry::RBT_DATA) {
+            return new RuleBasedTransliterator(ID, entry->u.data);
+        } else if (entry->entryType == Entry::PROTOTYPE) {
+            return entry->u.prototype->clone();
+        } else if (entry->entryType == Entry::ALIAS) {
+            aliasReturn = new TransliteratorAlias(entry->stringArg);
+            return 0;
+        } else if (entry->entryType == Entry::FACTORY) {
+            return entry->u.factory.function(ID, entry->u.factory.context);
+        } else if (entry->entryType == Entry::COMPOUND_RBT) {
+            UnicodeString id("_", "");
+            Transliterator *t = new RuleBasedTransliterator(id, entry->u.data);
+            aliasReturn = new TransliteratorAlias(ID, entry->stringArg, t, entry->intArg, entry->compoundFilter);
+            return 0;
+        }
+
+        TransliteratorParser parser;
+
+        if (entry->entryType == Entry::LOCALE_RULES) {
+            parser.parse(entry->stringArg, (UTransDirection) entry->intArg,
+                         parseError, status);
+        } else {
+		{
+			// At this point entry type must be either RULES_FORWARD or
+            // RULES_REVERSE.  We process the rule data into a
+            // TransliteratorRuleData object, and possibly also into an
+            // ::id header and/or footer.  Then we modify the registry with
+            // the parsed data and retry.
+            UBool isReverse = (entry->entryType == Entry::RULES_REVERSE);
+
+            // We use the file name, taken from another resource bundle
+            // 2-d array at static init time, as a locale language.  We're
+            // just using the locale mechanism to map through to a file
+            // name; this in no way represents an actual locale.
+            CharString ch(entry->stringArg);
+            UResourceBundle *bundle = ures_openDirect(0, ch, &status);
+            UnicodeString rules = ures_getUnicodeStringByKey(bundle, RB_RULE, &status);
+            ures_close(bundle);
+
+            // If the status indicates a failure, then we don't have any
+            // rules -- there is probably an installation error.  The list
+            // in the root locale should correspond to all the installed
+            // transliterators; if it lists something that's not
+            // installed, we'll get an error from ResourceBundle.
+
+            parser.parse(rules, isReverse ? UTRANS_REVERSE : UTRANS_FORWARD,
+                         parseError, status);
+        }
+
+        if (U_FAILURE(status)) {
+            // We have a failure of some kind.  Remove the ID from the
+            // registry so we don't keep trying.  NOTE: This will throw off
+            // anyone who is, at the moment, trying to iterate over the
+            // available IDs.  That's acceptable since we should never
+            // really get here except under installation, configuration,
+            // or unrecoverable run time memory failures.
+			remove(ID);
+            break;
+        }
+
+        entry->u.data = parser.orphanData();
+        entry->stringArg = parser.idBlock;
+        entry->intArg = parser.idSplitPoint;
+        entry->compoundFilter = parser.orphanCompoundFilter();
+
+        // Reset entry->entryType to something that we process at the
+        // top of the loop, then loop back to the top.  As long as we
+        // do this, we only loop through twice at most.
+        // NOTE: The logic here matches that in
+        // Transliterator::createFromRules().
+        if (entry->stringArg.length() == 0) {
+            if (entry->u.data == 0) {
+                // No idBlock, no data -- this is just an
+                // alias for Null
+                entry->entryType = Entry::ALIAS;
+                entry->stringArg = NullTransliterator::ID;
+            } else {
+                // No idBlock, data != 0 -- this is an
+                // ordinary RBT_DATA
+                entry->entryType = Entry::RBT_DATA;
+				return new RuleBasedTransliterator(ID, entry->u.data);
+            }
+        } else {
+            if (entry->u.data == 0) {
+                // idBlock, no data -- this is an alias.  The ID has
+                // been munged from reverse into forward mode, if
+                // necessary, so instantiate the ID in the forward
+                // direction.
+                entry->entryType = Entry::ALIAS;
+            } else {
+                // idBlock and data -- this is a compound
+                // RBT
+                entry->entryType = Entry::COMPOUND_RBT;
+            }
+        }
+    }
+
+    return 0; // failed
+}
+*/
+
+//#include "unicode/rbt.h"
+#include "unicode/resbund.h"
+#include "unicode/translit.h"
+#include "unicode/ustream.h"
+#include <iostream>
+
+class SWCharString {
+ public:
+    inline SWCharString(const UnicodeString& str);
+    inline ~SWCharString();
+    inline operator const char*() { return ptr; }
+ private:
+    char buf[128];
+    char* ptr;
+};
+
+inline SWCharString::SWCharString(const UnicodeString& str) {
+    // TODO This isn't quite right -- we should probably do
+    // preflighting here to determine the real length.
+    if (str.length() >= (int32_t)sizeof(buf)) {
+        ptr = new char[str.length() + 8];
+    } else {
+        ptr = buf;
+    }
+    str.extract(0, 0x7FFFFFFF, ptr, "");
+}
+
+inline SWCharString::~SWCharString() {
+    if (ptr != buf) {
+        delete[] ptr;
+    }
+}
+
+
+
+static const char RB_RULE_BASED_IDS[] = "RuleBasedTransliteratorIDs";
+
+static const char RB_RULE[] = "Rule";
+
+static const char SW_RESDATA[] = "/usr/local/lib/sword/";
+
+#include <map>
+
+using namespace std;
+
+struct SWTransData {
+	UnicodeString resource;
+	UTransDirection dir;
+};
+
+typedef map <const UnicodeString, SWTransData> SWTransMap;
+
+typedef pair<UnicodeString, SWTransData> SWTransPair;
+
+SWTransMap *sw_tmap;
+
+Transliterator * instantiateTrans(const UnicodeString& ID, const UnicodeString& resource,
+		UTransDirection dir, UParseError &parseError, UErrorCode &status );
+
+Transliterator *SWTransFactory(const UnicodeString &ID, 
+	Transliterator::Token context)
+{
+	std::cout << "running factory for " << ID << std::endl;
+	SWTransMap::iterator swelement;
+	if ((swelement = sw_tmap->find(ID)) != sw_tmap->end())
+	{
+		std::cout << "found element in map" << std::endl;
+		SWTransData swstuff = (*swelement).second;
+		UParseError parseError;
+		UErrorCode status;
+		std::cout << "unregistering " << ID << std::endl;
+		Transliterator::unregister(ID);
+		std::cout << "resource is " << swstuff.resource << std::endl;
+		Transliterator *trans = instantiateTrans(ID, swstuff.resource, swstuff.dir, parseError, status);
+		return trans;
+	}
+	return NULL;
+}
+
+void  instantiateTransFactory(const UnicodeString& ID, const UnicodeString& resource,
+		UTransDirection dir, UParseError &parseError, UErrorCode &status )
+{
+		std::cout << "making factory for ID " << ID << std::endl;
+		Transliterator::Token context;
+		SWTransData swstuff; 
+		swstuff.resource = resource;
+		swstuff.dir = dir;
+		SWTransPair swpair;
+		swpair.first = ID;
+		swpair.second = swstuff;
+		sw_tmap->insert(swpair);
+		Transliterator::registerFactory(ID, &SWTransFactory, context);
+}
+
+void  registerTrans(const UnicodeString& ID, const UnicodeString& resource,
+		UTransDirection dir, UErrorCode &status )
+{
+		std::cout << "registering ID locally " << ID << std::endl;
+		SWTransData swstuff; 
+		swstuff.resource = resource;
+		swstuff.dir = dir;
+		SWTransPair swpair;
+		swpair.first = ID;
+		swpair.second = swstuff;
+		sw_tmap->insert(swpair);
+}
+
+bool checkTrans(const UnicodeString& ID, UErrorCode &status )
+{
+		Transliterator *trans = Transliterator::createInstance(ID, UTRANS_FORWARD, status);
+		if (!U_FAILURE(status))
+		{
+			// already have it, clean up and return true
+			std::cout << "already have it " << ID << std::endl;
+			delete trans;
+			return true;
+		}
+		status = U_ZERO_ERROR;
+	
+	SWTransMap::iterator swelement;
+	if ((swelement = sw_tmap->find(ID)) != sw_tmap->end())
+	{
+		std::cout << "found element in map" << std::endl;
+		SWTransData swstuff = (*swelement).second;
+		UParseError parseError;
+		//UErrorCode status;
+		//std::cout << "unregistering " << ID << std::endl;
+		//Transliterator::unregister(ID);
+		std::cout << "resource is " << swstuff.resource << std::endl;
+		
+		// Get the rules
+		//std::cout << "importing: " << ID << ", " << resource << std::endl;
+		SWCharString ch(swstuff.resource);
+		UResourceBundle *bundle = ures_openDirect(SW_RESDATA, ch, &status);
+		const UnicodeString rules = ures_getUnicodeStringByKey(bundle, RB_RULE, &status);
+		ures_close(bundle);
+		//parser.parse(rules, isReverse ? UTRANS_REVERSE : UTRANS_FORWARD,
+		//        parseError, status);
+		if (U_FAILURE(status)) {
+			std::cout << "Failed to get rules" << std::endl;
+			std::cout << "status " << u_errorName(status) << std::endl;
+			return false;
+		}
+
+		
+		Transliterator *trans = Transliterator::createFromRules(ID, rules, swstuff.dir,
+			parseError,status);
+		if (U_FAILURE(status)) {
+			std::cout << "Failed to create transliterator" << std::endl;
+			std::cout << "status " << u_errorName(status) << std::endl;
+			std::cout << "Parse error: line " << parseError.line << std::endl;
+			std::cout << "Parse error: offset " << parseError.offset << std::endl;
+			std::cout << "Parse error: preContext " << *parseError.preContext << std::endl;
+			std::cout << "Parse error: postContext " << *parseError.postContext << std::endl;
+			std::cout << "rules were" << std::endl;
+			std::cout << rules << std::endl;
+			return false;
+		}
+
+		Transliterator::registerInstance(trans);
+		return true;
+		
+		//Transliterator *trans = instantiateTrans(ID, swstuff.resource, swstuff.dir, parseError, status);
+		//return trans;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+Transliterator * createTrans(const UnicodeString& preID, const UnicodeString& ID, 
+	const UnicodeString& postID, UTransDirection dir, UErrorCode &status )
+{
+	// extract id to check from ID xxx;id;xxx
+	if (checkTrans(ID, status)) {
+		UnicodeString fullID = preID;
+		fullID += ID;
+		fullID += postID;
+		Transliterator *trans = Transliterator::createInstance(fullID,UTRANS_FORWARD,status);
+		if (U_FAILURE(status)) {
+			delete trans;
+			return NULL;
+		}
+		else {
+			return trans;
+		}
+	}
+	else {
+		return NULL;
+	}
+}
+
+Transliterator * instantiateTrans(const UnicodeString& ID, const UnicodeString& resource,
+		UTransDirection dir, UParseError &parseError, UErrorCode &status )
+{
+	//TransliterationRuleData *ruleData;
+	//TransliteratorParser parser;
+
+	//entry->entryType is 'direction' from translit_index
+	//UBool isReverse = (entry->entryType == Entry::RULES_REVERSE);
+	//entry->stringArg is the 'resource'
+	//CharString ch(entry->stringArg);
+	std::cout << "importing: " << ID << ", " << resource << std::endl;
+	SWCharString ch(resource);
+	UResourceBundle *bundle = ures_openDirect(SW_RESDATA, ch, &status);
+	const UnicodeString rules = ures_getUnicodeStringByKey(bundle, RB_RULE, &status);
+	ures_close(bundle);
+	//parser.parse(rules, isReverse ? UTRANS_REVERSE : UTRANS_FORWARD,
+    //        parseError, status);
+	if (U_FAILURE(status)) {
+		std::cout << "Failed to get rules" << std::endl;
+		return NULL;
+	}
+    //ruleData = parser.orphanData();
+    //entry->stringArg = parser.idBlock;
+    //entry->intArg = parser.idSplitPoint;
+    //entry->compoundFilter = parser.orphanCompoundFilter();
+
+    //entry->entryType = Entry::RBT_DATA;
+	//return new RuleBasedTransliterator(ID, ruleData);
+	Transliterator *trans = Transliterator::createFromRules(ID, rules, dir, parseError, status);
+	if (U_FAILURE(status)) {
+		std::cout << "Failed to create transliterator" << std::endl;
+		std::cout << "status " << u_errorName(status) << std::endl;
+		std::cout << "Parse error: line " << parseError.line << std::endl;
+		std::cout << "Parse error: offset " << parseError.offset << std::endl;
+		std::cout << "Parse error: preContext " << *parseError.preContext << std::endl;
+		std::cout << "Parse error: postContext " << *parseError.postContext << std::endl;
+		std::cout << "rules were" << std::endl;
+		std::cout << rules << std::endl;
+		return NULL;
+	}
+
+	Transliterator::registerInstance(trans);
+	return trans;
+}
+
+void initiateSwordTransliterators(UErrorCode &status)
+{
+    static const char translit_swordindex[] = "translit_swordindex";
+
+    UResourceBundle *bundle, *transIDs, *colBund;
+    bundle = ures_openDirect(SW_RESDATA, translit_swordindex, &status);
+    if (U_FAILURE(status)) {
+		std::cout << "no resource index to load" << std::endl;
+		return;
+	}
+
+    transIDs = ures_getByKey(bundle, RB_RULE_BASED_IDS, 0, &status);
+	UParseError parseError;
+
+    int32_t row, maxRows;
+    if (U_SUCCESS(status)) {
+        maxRows = ures_getSize(transIDs);
+        for (row = 0; row < maxRows; row++) {
+            colBund = ures_getByIndex(transIDs, row, 0, &status);
+
+            if (U_SUCCESS(status) && ures_getSize(colBund) == 4) {
+                UnicodeString id = ures_getUnicodeStringByIndex(colBund, 0, &status);
+                UChar type = ures_getUnicodeStringByIndex(colBund, 1, &status).charAt(0);
+                UnicodeString resString = ures_getUnicodeStringByIndex(colBund, 2, &status);
+
+                if (U_SUCCESS(status)) {
+                    switch (type) {
+                    case 0x66: // 'f'
+                    case 0x69: // 'i'
+                        // 'file' or 'internal';
+                        // row[2]=resource, row[3]=direction
+                        {
+                            //UBool visible = (type == 0x0066 /*f*/);
+                            UTransDirection dir =
+                                (ures_getUnicodeStringByIndex(colBund, 3, &status).charAt(0) ==
+                                 0x0046 /*F*/) ?
+                                UTRANS_FORWARD : UTRANS_REVERSE;
+                            //registry->put(id, resString, dir, visible);
+			    std::cout << "instantiating " << resString << std::endl;
+			    instantiateTrans(id, resString, dir, parseError, status);
+                        }
+                        break;
+                    case 0x61: // 'a'
+                        // 'alias'; row[2]=createInstance argument
+                        //registry->put(id, resString, TRUE);
+                        break;
+                    }
+                }
+		else std::cout << "Failed to get resString" << std:: endl;
+            }
+	    else std::cout << "Failed to get row" << std:: endl;
+
+            ures_close(colBund);
+        }
+    }
+	else
+	{
+		std::cout << "no resource index to load" << std::endl;
+	}
+
+    ures_close(transIDs);
+    ures_close(bundle);
+}
+
+
+
+void initiateSwordTransliteratorsByFactory(UErrorCode &status)
+{
+    static const char translit_swordindexf[] = "translit_swordindex";
+
+    UResourceBundle *bundle, *transIDs, *colBund;
+    bundle = ures_openDirect(SW_RESDATA, translit_swordindexf, &status);
+    if (U_FAILURE(status)) {
+		std::cout << "no resource index to load" << std::endl;
+		std::cout << "status " << u_errorName(status) << std::endl;
+		return;
+	}
+
+    transIDs = ures_getByKey(bundle, RB_RULE_BASED_IDS, 0, &status);
+	UParseError parseError;
+
+    int32_t row, maxRows;
+    if (U_SUCCESS(status)) {
+        maxRows = ures_getSize(transIDs);
+        for (row = 0; row < maxRows; row++) {
+            colBund = ures_getByIndex(transIDs, row, 0, &status);
+
+            if (U_SUCCESS(status) && ures_getSize(colBund) == 4) {
+                UnicodeString id = ures_getUnicodeStringByIndex(colBund, 0, &status);
+                UChar type = ures_getUnicodeStringByIndex(colBund, 1, &status).charAt(0);
+                UnicodeString resString = ures_getUnicodeStringByIndex(colBund, 2, &status);
+				std::cout << "ok so far" << std::endl;
+
+                if (U_SUCCESS(status)) {
+                    switch (type) {
+                    case 0x66: // 'f'
+                    case 0x69: // 'i'
+                        // 'file' or 'internal';
+                        // row[2]=resource, row[3]=direction
+                        {
+                            //UBool visible = (type == 0x0066 /*f*/);
+                            UTransDirection dir =
+                                (ures_getUnicodeStringByIndex(colBund, 3, &status).charAt(0) ==
+                                 0x0046 /*F*/) ?
+                                UTRANS_FORWARD : UTRANS_REVERSE;
+                            //registry->put(id, resString, dir, visible);
+			    std::cout << "instantiating " << resString << " ..." << std::endl;
+			    instantiateTransFactory(id, resString, dir, parseError, status);
+				std::cout << "done." << std::endl;
+                        }
+                        break;
+                    case 0x61: // 'a'
+                        // 'alias'; row[2]=createInstance argument
+                        //registry->put(id, resString, TRUE);
+                        break;
+                    }
+                }
+		else std::cout << "Failed to get resString" << std:: endl;
+            }
+	    else std::cout << "Failed to get row" << std:: endl;
+
+            ures_close(colBund);
+        }
+    }
+	else
+	{
+		std::cout << "no resource index to load" << std::endl;
+		std::cout << "status " << u_errorName(status) << std::endl;
+	}
+
+    ures_close(transIDs);
+    ures_close(bundle);
+}
+
+
+void initiateSwordTransliteratorsToMap(UErrorCode &status)
+{
+    static const char translit_swordindexf[] = "translit_swordindex";
+
+    UResourceBundle *bundle, *transIDs, *colBund;
+    bundle = ures_openDirect(SW_RESDATA, translit_swordindexf, &status);
+    if (U_FAILURE(status)) {
+		std::cout << "no resource index to load" << std::endl;
+		std::cout << "status " << u_errorName(status) << std::endl;
+		return;
+	}
+
+    transIDs = ures_getByKey(bundle, RB_RULE_BASED_IDS, 0, &status);
+	//UParseError parseError;
+
+    int32_t row, maxRows;
+    if (U_SUCCESS(status)) {
+        maxRows = ures_getSize(transIDs);
+        for (row = 0; row < maxRows; row++) {
+            colBund = ures_getByIndex(transIDs, row, 0, &status);
+
+            if (U_SUCCESS(status) && ures_getSize(colBund) == 4) {
+                UnicodeString id = ures_getUnicodeStringByIndex(colBund, 0, &status);
+                UChar type = ures_getUnicodeStringByIndex(colBund, 1, &status).charAt(0);
+                UnicodeString resString = ures_getUnicodeStringByIndex(colBund, 2, &status);
+				std::cout << "ok so far" << std::endl;
+
+                if (U_SUCCESS(status)) {
+                    switch (type) {
+                    case 0x66: // 'f'
+                    case 0x69: // 'i'
+                        // 'file' or 'internal';
+                        // row[2]=resource, row[3]=direction
+                        {
+                            //UBool visible = (type == 0x0066 /*f*/);
+                            UTransDirection dir =
+                                (ures_getUnicodeStringByIndex(colBund, 3, &status).charAt(0) ==
+                                 0x0046 /*F*/) ?
+                                UTRANS_FORWARD : UTRANS_REVERSE;
+                            //registry->put(id, resString, dir, visible);
+			    std::cout << "instantiating " << resString << " ..." << std::endl;
+			    registerTrans(id, resString, dir, status);
+				std::cout << "done." << std::endl;
+                        }
+                        break;
+                    case 0x61: // 'a'
+                        // 'alias'; row[2]=createInstance argument
+                        //registry->put(id, resString, TRUE);
+                        break;
+                    }
+                }
+		else std::cout << "Failed to get resString" << std:: endl;
+            }
+	    else std::cout << "Failed to get row" << std:: endl;
+
+            ures_close(colBund);
+        }
+    }
+	else
+	{
+		std::cout << "no resource index to load" << std::endl;
+		std::cout << "status " << u_errorName(status) << std::endl;
+	}
+
+    ures_close(transIDs);
+    ures_close(bundle);
+}
+
+
+
+
+
+int main()
+{
+	sw_tmap = new SWTransMap();
+	UErrorCode status = U_ZERO_ERROR;
+	std::cout << "Available before: " << Transliterator::countAvailableIDs() << std::endl;
+	//initiateSwordTransliterators(status);
+	//initiateSwordTransliteratorsByFactory(status);
+	initiateSwordTransliteratorsToMap(status);
+	int32_t cids = Transliterator::countAvailableIDs();
+	std::cout << "Available after: " << cids << std::endl;
+
+	//for ( int32_t i=0;i<cids;i++) {
+	//	std::cout << i << ": " << Transliterator::getAvailableID(i) << std::endl;
+	//}
+
+	//Transliterator *trans = Transliterator::createInstance("NFD;Latin-Gothic;NFC", UTRANS_FORWARD,status);
+	Transliterator *trans = createTrans("NFD;", "Latin-Gothic", ";NFC", UTRANS_FORWARD,status);
+    if (U_FAILURE(status)) {
+	std::cout << "Failed to get Latin-Gothic" << std::endl;
+	status = U_ZERO_ERROR;
+	}
+	else
+	{
+	std::cout << "Got Latin-Gothic :)" << std::endl;
+	delete trans;
+	}
+	
+	std::cout << "Available after gothic: " << Transliterator::countAvailableIDs() << std::endl;
+
+	//trans = Transliterator::createInstance("NFD;BGreek-Greek;NFC", UTRANS_FORWARD, status);
+	trans = createTrans("NFD;", "BGreek-Greek", ";NFC", UTRANS_FORWARD, status);
+    if (U_FAILURE(status)) {
+	std::cout << "Failed to get BGreek-Greek" << std::endl;
+	status = U_ZERO_ERROR;
+	}
+	else
+	{
+	std::cout << "Got BGreek-Greek :)" << std::endl;
+	delete trans;
+	}
+	std::cout << "Available after greek: " << Transliterator::countAvailableIDs() << std::endl;
+
+	delete sw_tmap;
+
+	return 1;
+}
+
+//gcc -I../source/i18n -I../source/common  swtest.cpp -L../source/i18n -licui18n -L../source/common -licuuc
+
diff --git a/tests/tmp/Makefile.am b/tests/tmp/Makefile.am
new file mode 100644
index 0000000..07dabd8
--- /dev/null
+++ b/tests/tmp/Makefile.am
@@ -0,0 +1,3 @@
+swtesttmpdir = $(top_srcdir)/tests/tmp
+
+EXTRA_DIST += $(swtesttmpdir)/README
\ No newline at end of file
diff --git a/tests/tmp/README b/tests/tmp/README
new file mode 100644
index 0000000..a53b060
--- /dev/null
+++ b/tests/tmp/README
@@ -0,0 +1,2 @@
+This directory is used for temporary files created by the test files
+
diff --git a/tests/translittest.cpp b/tests/translittest.cpp
new file mode 100644
index 0000000..a0ec9d3
--- /dev/null
+++ b/tests/translittest.cpp
@@ -0,0 +1,164 @@
+/******************************************************************************
+ *
+ *  translittest.cpp -	
+ *
+ * $Id: translittest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <string>
+
+#include "unicode/udata.h"   /* Data structures */
+#include "unicode/ures.h"   /* Data structures */
+#include "unicode/utypes.h"   /* Basic ICU data types */
+#include "unicode/ucnv.h"     /* C   Converter API    */
+#include "unicode/ustring.h"  /* some more string fcns*/
+
+#include "unicode/translit.h"
+
+#include "utf8transliterator.h"
+
+using namespace std;
+
+// Print the given string to stdout
+void uprintf(const UnicodeString &str) {
+    char *buf = 0;
+    int32_t len = str.length();
+    // int32_t bufLen = str.extract(0, len, buf); // Preflight
+    /* Preflighting seems to be broken now, so assume 1-1 conversion,
+       plus some slop. */
+    int32_t bufLen = len + 16;
+        int32_t actualLen;
+    buf = new char[bufLen + 1];
+    actualLen = str.extract(0, len, buf/*, bufLen*/); // Default codepage conversion
+    buf[actualLen] = 0;
+    //printf("%s", buf);
+    std::cout << buf;
+    delete buf;
+}
+
+
+int main() {
+
+
+  UErrorCode status = U_ZERO_ERROR;
+//  UDataMemory *pappData = udata_open("/usr/local/lib/sword/swicu", "res", "root", &status);
+  if (U_FAILURE(status)) 
+  {
+  	std::cout << "error: " << status << ":" << 
+		u_errorName(status) << std::endl;
+	return 0;
+  } 
+  UChar * uBuf;
+  UChar * target;
+  UConverter *conv;
+  //UParseError perr = U_ZERO_ERROR;
+  int32_t uBufSize = 0, uLength = 0;
+//  void * pAppData=NULL;
+  const char * samplestring = "If this compiles and runs without errors, apparently ICU is working.";
+  //ures_open("/usr/local/lib/sword/swicu.dat", 
+ // 	NULL, &status);
+  //UDataMemory *pappData = udata_open("/usr/local/lib/sword/swicu", 
+//	"res", "root", &status);
+  if (U_FAILURE(status)) 
+  {
+  	std::cout << "error: " << status << ":" << 
+		u_errorName(status) << std::endl;
+	return 0;
+  } 
+  //UDataMemory *pappData2 = udata_open("/usr/local/lib/sword/swicu", 
+//	"res", "translit_Latin_Gothic", &status);
+  std::cout << status << std::endl; 
+  if (U_FAILURE(status)) 
+  {
+  	std::cout << "error: " << status << ":" << 
+		u_errorName(status) << std::endl;
+	return 0;
+  } 
+  std::cout << "available " << Transliterator::countAvailableIDs() << std::endl;
+  //udata_setAppData("/usr/local/lib/sword/swicu.dat" , pAppData, &status);
+  //if (U_FAILURE(status)) 
+  //{
+  	//std::cout << "error: " << status << ":" << 
+	//	u_errorName(status) << std::endl;
+	//return 0;
+  //} 
+
+  int32_t i_ids = Transliterator::countAvailableIDs();
+  
+  std::cout << "available " << i_ids << std::endl;
+  for (int i=0; i<i_ids;i++)
+  {
+	std::cout << "id " << i << ": ";
+	uprintf(Transliterator::getAvailableID(i));
+	std::cout << std::endl;
+  } 
+
+
+  //UTF8Transliterator utran = new UTF8Transliterator();
+  std::cout << "creating transliterator 2" << std::endl;
+  Transliterator *btrans = Transliterator::createInstance("NFD;Latin-Greek;NFC", 
+	UTRANS_FORWARD, status);
+  if (U_FAILURE(status)) 
+  {
+  	std::cout << "error: " << status << ":" << 
+		u_errorName(status) << std::endl;
+	return 0;
+  } 
+  std::cout << "creating transliterator 1" << std::endl;
+  Transliterator *trans = Transliterator::createInstance("NFD;Latin-Gothic;NFC", 
+	UTRANS_FORWARD, status);
+  if (U_FAILURE(status)) 
+  {
+	delete btrans;
+  	std::cout << "error: " << status << ":" << 
+		u_errorName(status) << std::endl;
+	return 0;
+  } 
+
+  std::cout << "deleting transliterator 1" << std::endl;
+  delete trans;
+  std::cout << "deleting transliterator 2" << std::endl;
+  delete btrans;
+  std::cout << "the rest" << std::endl;
+  uLength = strlen(samplestring);
+  conv = ucnv_open("utf-8", &status);		
+  if (U_FAILURE(status)) 
+  {
+  	std::cout << "error: " << status << ":" << 
+		u_errorName(status) << std::endl;
+	return 0;
+  } 
+  uBufSize = (uLength/ucnv_getMinCharSize(conv));
+  uBuf = (UChar*)malloc(uBufSize * sizeof(UChar));
+  
+  target = uBuf;
+  
+  ucnv_toUChars(conv, target, uLength, 
+		samplestring, uLength, &status);
+  if (U_FAILURE(status)) 
+  {
+  	std::cout << "error: " << status << ":" << 
+		u_errorName(status) << std::endl;
+	return 0;
+  } 
+
+  cout << samplestring << endl;
+
+  return 0;
+}
diff --git a/tests/utf8norm.cpp b/tests/utf8norm.cpp
new file mode 100644
index 0000000..a992a2e
--- /dev/null
+++ b/tests/utf8norm.cpp
@@ -0,0 +1,38 @@
+/******************************************************************************
+ *
+ *  utf8norm.cpp -	
+ *
+ * $Id: utf8norm.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <utilstr.h>
+#include <swbuf.h>
+
+using namespace sword;
+using namespace std;
+
+int main(int argc, char **argv) {
+	const char *buf = (argc > 1) ? argv[1] : "Description=German Unrevidierte Luther Ãœbersetzung von 1545";
+
+	SWBuf fixed = assureValidUTF8(buf);
+
+	cout << "input / processed:\n" << buf << "\n" << fixed << endl;
+
+	return 0;
+}
diff --git a/tests/versekeytest.cpp b/tests/versekeytest.cpp
new file mode 100644
index 0000000..4ae064e
--- /dev/null
+++ b/tests/versekeytest.cpp
@@ -0,0 +1,281 @@
+/******************************************************************************
+ *
+ *  versekeytest.cpp -	
+ *
+ * $Id: versekeytest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2007-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <versekey.h>
+#include <listkey.h>
+#include <localemgr.h>
+#include <swmgr.h>
+#include <swmodule.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using std::cout;
+using std::endl;
+
+class _System {
+public:
+class Out {
+public:
+	void println(const char *x) { cout << x << endl; }
+	void println(int x) { cout << x << endl; }
+} out;
+} System;
+
+int main(int argc, char **argv) {
+		VerseKey vk;
+/*
+		vk.setTestament(2);
+		vk.setBook(4);
+		vk.setChapter(3);
+		vk.setVerse(1);
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+		vk.setVersificationSystem("KJVA");
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+		System.out.println("decrementing...");
+		vk.setVersificationSystem("KJV");
+		vk.decrement();
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+		vk.setVersificationSystem("KJVA");
+		System.out.println(vk.getText());
+		System.out.println(vk.getIndex());
+		System.out.println(vk.getTestamentIndex());
+*/
+
+
+/*
+VerseKey currentVerse;
+currentVerse.setAutoNormalize(true);
+currentVerse.setIntros(true);
+currentVerse.Persist(1);
+currentVerse = "jn2";
+cout << currentVerse << endl;
+
+	SWMgr mgr;
+	SWModule *mod = mgr.getModule("KJVgb");
+*/
+	VerseKey *parser = new VerseKey(); //(VerseKey *)mod->CreateKey();
+	parser->setIntros(true);
+
+	ListKey result = parser->parseVerseList("[ Testament 1 Heading ]");
+	cout << "Should be: [ Testament 1 Heading ]\n" << result << "\n\n";
+
+	parser->setText("[ Testament 1 Heading ]");
+	cout << "Should be: [ Testament 1 Heading ]\n" << *parser << "\n\n";
+
+	result.clear();
+
+	ListKey scope = parser->parseVerseList("amos 2:2", *parser, true);
+
+	cout << ((scope++ == scope) ? "single" : "multiple") << "\n";
+
+	scope = parser->parseVerseList("amos", *parser, true);
+
+	cout << ((scope++ == scope) ? "single" : "multiple") << "\n";
+
+	scope = parser->parseVerseList("amos", *parser, true);
+
+	scope++;
+	scope++;
+	scope++;
+	scope++;
+
+	VerseKey *x = new VerseKey(); //(VerseKey *)mod->CreateKey();
+	*x = scope;
+	x->clearBound();
+
+	std::cout << "x: " << x->getText() << "\n";
+
+	result << *x;
+
+	std::cout << result.getText() << "\n";
+
+	result = TOP;
+
+	std::cout << result.getText() << "\n";
+
+     const char *bounds = "lk,acts";
+     scope = parser->parseVerseList(bounds, *parser, true);
+
+     VerseKey boundTest("lk", "acts");
+
+     boundTest.setText("Is.1.13");
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
+     boundTest.setText("1Sam.21.1");
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
+     boundTest.setText("acts.5.1");
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
+     boundTest.setText("rom.5.1");
+     std::cout << "Error: " << (int)boundTest.popError() << ": " << boundTest << "\n";
+
+
+     *x = "Is.1.13";
+     scope = *x;
+     if (scope == *x) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+     if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+
+     *x = "1Sam.21.1";
+     scope = *x;
+     if (!scope.popError()) std::cout << "Error restricting bounds: " << x->getText() << " is in " << bounds << "\n";
+
+/*
+	VerseKey *y = (VerseKey *)mod->CreateKey();
+	(*y) = "lev 1.1";
+	cout << (*y) << "\n";
+	(*y)++;
+	cout << (*y) << "\n";
+	(*y)--;
+	cout << (*y) << "\n";
+	(*y)--;
+	cout << (*y) << "\n";
+
+	mod->setKey("Ruth 1.1");
+	cout << mod->getKeyText() << "\n";
+	(*mod)++;
+	cout << mod->getKeyText() << "\n";
+	(*mod)--;
+	cout << mod->getKeyText() << "\n";
+*/
+
+	cout << "\nNormalization on; headings on ====\n\n";
+
+	vk.setAutoNormalize(true);
+	vk.setIntros(true);
+
+	vk = "jn3.50";
+	cout << "jn.3.50: " << vk << "\n";
+	vk++;
+	cout << "++: " << vk << "\n";
+	vk--;
+	cout << "--: " << vk << "\n";
+	vk = MAXVERSE;
+	cout << "MAXVERSE: " << vk << "\n";
+	vk = MAXCHAPTER;
+	cout << "MAXCHAPTER: " << vk << "\n";
+	vk = TOP;
+	cout << "TOP: " << vk << "\n";
+	vk = BOTTOM;
+	cout << "BOTTOM: " << vk << "\n";
+
+	cout << "\nNormalization off; headings on ====\n\n";
+	
+	vk.setAutoNormalize(false);
+	vk.setIntros(true);
+
+	vk = "jn3.50";
+	cout << "jn.3.50: " << vk << "\n";
+	vk++;
+	cout << "++: " << vk << "\n";
+	vk--;
+	cout << "--: " << vk << "\n";
+	vk = MAXVERSE;
+	cout << "MAXVERSE: " << vk << "\n";
+	vk = MAXCHAPTER;
+	cout << "MAXCHAPTER: " << vk << "\n";
+	vk = TOP;
+	cout << "TOP: " << vk << "\n";
+	vk = BOTTOM;
+	cout << "BOTTOM: " << vk << "\n";
+
+	cout << "\nNormalization on; headings off ====\n\n";
+	
+	vk.setAutoNormalize(true);
+	vk.setIntros(false);
+
+	vk = "jn3.50";
+	cout << "jn.3.50: " << vk << "\n";
+	vk++;
+	cout << "++: " << vk << "\n";
+	vk--;
+	cout << "--: " << vk << "\n";
+	vk = MAXVERSE;
+	cout << "MAXVERSE: " << vk << "\n";
+	vk = MAXCHAPTER;
+	cout << "MAXCHAPTER: " << vk << "\n";
+	vk = TOP;
+	cout << "TOP: " << vk << "\n";
+	vk = BOTTOM;
+	cout << "BOTTOM: " << vk << "\n";
+
+	cout << "\nNormalization off; headings off ====\n\n";
+	
+	vk.setAutoNormalize(false);
+	vk.setIntros(false);
+
+	vk = "jn3.50";
+	cout << "jn.3.50: " << vk << "\n";
+	vk++;
+	cout << "++: " << vk << "\n";
+	vk--;
+	cout << "--: " << vk << "\n";
+	vk = MAXVERSE;
+	cout << "MAXVERSE: " << vk << "\n";
+	vk = MAXCHAPTER;
+	cout << "MAXCHAPTER: " << vk << "\n";
+	vk = TOP;
+	cout << "TOP: " << vk << "\n";
+	vk = BOTTOM;
+	cout << "BOTTOM: " << vk << "\n";
+
+	VerseKey yo = "jn.3.16";
+	VerseKey yo2 = yo++;
+	cout << yo2 << ": " << (int)yo2.popError() <<  endl;
+
+	VerseKey vkey;
+	VerseKey tmpkey = "1sam 1:1";
+	vkey.setAutoNormalize(true);
+	vkey = tmpkey;
+	int chapter = (vkey.getChapter()-1);
+	vkey.setChapter(chapter);
+
+	cout << tmpkey << ": getChapter() - 1: " << vkey << endl;
+
+	cout << "\nBook math\n\n";
+
+	vkey = "Mark.1.1";
+	vkey--;
+	cout << "Mark.1.1-- = " << vkey << "\n";
+	vkey++;
+	cout << "++ = " << vkey << "\n";
+	vkey.setChapter(vkey.getChapter() - 1);
+	cout << ".setChapter(.getChapter() - 1) = " << vkey << "\n";
+
+	vkey = "Matthew.1.1";
+	vkey--;
+	cout << "Matthew.1.1-- = " << vkey << "\n";
+	vkey++;
+	cout << "++ = " << vkey << "\n";
+	vkey.setBook(vkey.getBook() - 1);
+	cout << ".setBook(.getBook() - 1) = " << vkey << "\n";
+
+	return 0;
+}
diff --git a/tests/versemgrtest.cpp b/tests/versemgrtest.cpp
new file mode 100644
index 0000000..1b51763
--- /dev/null
+++ b/tests/versemgrtest.cpp
@@ -0,0 +1,64 @@
+/******************************************************************************
+ *
+ *  versemgrtest.cpp -	
+ *
+ * $Id: versemgrtest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <versificationmgr.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using std::cout;
+using std::endl;
+
+int main(int argc, char **argv) {
+
+	const char *v11n = (argc > 1) ? argv[1] : "KJV";
+
+	VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr();
+	const VersificationMgr::System *system = vmgr->getVersificationSystem(v11n);
+	int bookCount = system->getBookCount();
+	const VersificationMgr::Book *lastBook = system->getBook(bookCount-1);
+	int chapMax = lastBook->getChapterMax();
+	int verseMax = lastBook->getVerseMax(chapMax);
+	long offsetMax = system->getOffsetFromVerse(bookCount-1, chapMax, verseMax);
+
+	cout << "Versification System: " << v11n << "\n";
+	cout << "Book Count: " << bookCount << "\n";
+	cout << "Last Book: " << lastBook->getLongName() << " (" << lastBook->getOSISName() << ")\n";
+	cout << "  Chapter Max: " << chapMax << "\n";
+	cout << "    Verse Max: " << verseMax << "\n";
+	cout << "       Offset: " << offsetMax << "\n\n";
+	cout << "Offset, Book, Chapter, Verse\n";
+
+	int book, chapter, verse;
+	for (long offset = 0; offset <= offsetMax; offset++) {
+		system->getVerseFromOffset(offset, &book, &chapter, &verse);
+		cout << offset << ": " << book << ", " << chapter << ", " << verse << "\n";
+	}
+	
+	cout << endl;
+
+	return 0;
+}
diff --git a/tests/vtreekeytest.cpp b/tests/vtreekeytest.cpp
new file mode 100644
index 0000000..3443bd1
--- /dev/null
+++ b/tests/vtreekeytest.cpp
@@ -0,0 +1,96 @@
+/******************************************************************************
+ *
+ *  vtreekeytest.cpp -	
+ *
+ * $Id: vtreekeytest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <versekey.h>
+#include <listkey.h>
+#include <localemgr.h>
+#include <swmgr.h>
+#include <swmodule.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using std::cout;
+using std::endl;
+
+int main(int argc, char **argv) {
+
+	SWMgr mgr;
+	SWModule *mod = mgr.getModule("KJVgb");
+
+	VerseKey *key1 = (VerseKey *)mod->createKey();
+
+	key1->setTestament(2);
+	key1->setBook(4);
+	key1->setChapter(2);
+	key1->setVerse(3);
+
+	cout << "\n" << key1->getText() << ":\n\n";
+
+	ListKey keys;
+	keys << *key1;
+
+	cout << "\n" << keys.getRangeText() << ":\n\n";
+
+	ListKey keys2 = keys;
+
+	cout << "\n" << keys2.getRangeText() << ":\n\n";
+
+	keys = key1->parseVerseList("Lk.4.5");
+
+	cout << "\n" << key1->getText() << ":\n\n";
+
+	key1->setText("jn.6.7");
+
+	cout << "\n" << key1->getText() << ":\n\n";
+	
+
+	mod->setKey("lk.2.3");
+
+	cout << "\n" << mod->getKeyText() << ":\n" << endl;
+	cout << mod->getRawEntry() << endl;
+
+
+	cout << "\nListkey persist key iteration test\n\n";
+	keys = key1->parseVerseList("mat1", 0, true);
+
+	for (keys = TOP; !keys.popError(); keys++) {
+		cout << "\n" << keys.getText() << ":\n" << endl;
+	}
+
+
+	keys.setPersist(true);
+
+	mod->setKey(keys);
+
+	for ((*mod) = TOP; !mod->popError(); (*mod)++) {
+		cout << "\n" << mod->getKeyText() << ":\n" << endl;
+	}
+
+	delete key1;
+
+	return 0;
+}
diff --git a/tests/webiftest.cpp b/tests/webiftest.cpp
new file mode 100644
index 0000000..3e5cba6
--- /dev/null
+++ b/tests/webiftest.cpp
@@ -0,0 +1,78 @@
+/******************************************************************************
+ *
+ *  webiftest.cpp -	
+ *
+ * $Id: webiftest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <errno.h>
+#include <iostream>
+#include <thmlhtmlhref.h>
+#include <unicodertf.h>
+#include <thmlosis.h>
+#include <gbfosis.h>
+#include <thmlosis.h>
+#include <versekey.h>
+#include <swmgr.h>
+#include <swmodule.h>
+#include <markupfiltmgr.h>
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+using namespace std;
+
+#define MAXBUF 30000
+
+int main(int argc, char **argv) {
+
+	const char* modName = (argc >= 2) ? argv[1] : "KJV";
+	const char* keyName = (argc == 3) ? argv[2] : "John 1:1";
+
+	SWMgr mgr(0, 0, true, new MarkupFilterMgr(FMT_WEBIF, ENC_UTF8));
+	mgr.setGlobalOption("Strong's Numbers", "on");
+	mgr.setGlobalOption("Morphological Tags", "on");
+
+	SWModule *module = mgr.Modules[modName];
+	if (!module) {
+		module = mgr.Modules.begin()->second;
+	}
+	module->setKey(keyName);
+	std::cout << module->renderText() << std::endl<< std::endl<< std::endl;
+
+	//------------------------
+
+	SWMgr mgr2(0, 0, true, new MarkupFilterMgr(FMT_HTMLHREF, ENC_UTF8));
+	mgr2.setGlobalOption("Strong's Numbers", "on");
+	mgr2.setGlobalOption("Morphological Tags", "on");
+	module = mgr2.Modules[modName];
+	if (!module) {
+		module = mgr2.Modules.begin()->second;
+	}
+
+	module->setKey(keyName);
+	std::cout << module->renderText() << std::endl;
+
+	return 0;
+}
+
diff --git a/tests/xmltest.cpp b/tests/xmltest.cpp
new file mode 100644
index 0000000..158017d
--- /dev/null
+++ b/tests/xmltest.cpp
@@ -0,0 +1,74 @@
+/******************************************************************************
+ *
+ *  xmltest.cpp -	
+ *
+ * $Id: xmltest.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <utilxml.h>
+#include <iostream>
+
+using namespace sword;
+using namespace std;
+
+int main(int argc, char **argv) {
+
+	const char *xml = "<verse osisID=\"John.1.1\" type=\'test type\' yeah = \"stuff\" />";
+	cout << ((argc > 1) ? argv[1]: xml) << "\n";
+
+	XMLTag x((argc > 1) ? argv[1] : xml);
+
+	cout << x.toString() << "\n";
+	x.setAttribute("addedAttribute", "with a \" quote");
+	cout << x.toString() << "\n";
+	cout << "Tag name: [" << x.getName() << "]\n";
+	StringList attributes = x.getAttributeNames();
+	for (StringList::iterator it = attributes.begin(); it != attributes.end(); it++) {
+		const char *name = it->c_str();
+		cout << " - attribute: [" << name << "] = [";
+		cout << x.getAttribute(name) << "]\n";
+		int count = x.getAttributePartCount(name, ' ');
+		cout << "\t" << count << " parts:\n";
+		int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+		do {
+			cout << "\t" << x.getAttribute(name, i, ' ') << "\n";
+			if (i < 0) i = 0;	// to handle our -1 condition
+		} while (++i < count);
+	}
+	cout << " isEmpty: " << x.isEmpty() << "\n";
+	cout << " isEndTag: " << x.isEndTag() << "\n";
+	cout << "\n";
+
+	
+	if (argc < 2) {  // only run if we're defaulted
+		const char *testParts="ABC D EF GHIJ";
+		cout << "Setting attribute 'multiPart' to: '" << testParts << "'\n";
+		x.setAttribute("multiPart", testParts);
+		cout << x << "\n";
+		cout << "Setting part 2 to 'MMM'\n";
+		x.setAttribute("multiPart", "MMM", 2, ' ');
+		cout << x << "\n";
+		cout << "Removing part 1\n";
+		x.setAttribute("multiPart", 0, 1, ' ');
+		cout << x << "\n";
+		cout << "Removing part 2\n";
+		x.setAttribute("multiPart", 0, 2, ' ');
+		cout << x << "\n";
+	}
+	
+}
diff --git a/usrinst.sh b/usrinst.sh
new file mode 100755
index 0000000..41463eb
--- /dev/null
+++ b/usrinst.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+#******************************************************************************
+#  usrinst.sh -	Convenience script specifying most common development options
+#		to ./configure
+#
+# $Id: usrinst.sh 2986 2013-10-05 12:32:49Z scribe $
+#
+# Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+#
+
+OPTIONS="--prefix=/usr $OPTIONS"
+if [ -d /usr/lib64 ]
+then
+	OPTIONS="--libdir=/usr/lib64 $OPTIONS"
+else
+	OPTIONS="--libdir=/usr/lib $OPTIONS"
+fi
+OPTIONS="--sysconfdir=/etc $OPTIONS"
+OPTIONS="--without-conf $OPTIONS"
+OPTIONS="--disable-shared $OPTIONS"
+#OPTIONS="--enable-debug $OPTIONS"
+#OPTIONS="--enable-profile $OPTIONS"
+
+#OPTIONS="--with-cxx11regex $OPTIONS"
+#OPTIONS="--with-icusword $OPTIONS"
+#OPTIONS="--without-icu $OPTIONS"
+#OPTIONS="--without-clucene $OPTIONS"
+#OPTIONS="--without-curl $OPTIONS"
+
+#OPTIONS="--disable-tests $OPTIONS"
+#OPTIONS="--disable-utilities $OPTIONS"
+
+
+# Use these for Windows DLL build
+#LIBS="-no-undefined"
+#OPTIONS="lt_cv_deplibs_check_method=pass_all $OPTIONS"
+
+LIBS="$LIBS" ./configure $OPTIONS $*
+
+
+echo ""
+echo ""
+echo ""
+echo "Configured to NOT write a global /etc/sword.conf on 'make install'."
+echo "If this is the first time you've installed sword, be sure to run"
+echo "'make install_config' if you would like a basic configuration installed"
+echo ""
+echo "Next you might try something like: "
+echo ""
+echo "make"
+echo "su"
+echo "make install"
+echo "(and optionally)"
+echo "make install_config"
+echo "make register"
+echo ""
+echo ""
+echo ""
diff --git a/utilities/CMakeLists.txt b/utilities/CMakeLists.txt
new file mode 100644
index 0000000..822961d
--- /dev/null
+++ b/utilities/CMakeLists.txt
@@ -0,0 +1,119 @@
+######################################################################
+# Basic utility programs and their joy.
+#
+# The general assumption is that each of these utilities is built from
+# a single source file, which shares its name with the utility itself (appended with .cpp),
+# and then linked against the SWORD library.
+# 
+# This list will be built and installed, if so chosen
+#
+# These are in alphbetical order now - please keep them that way
+# if you edit this list in the future.
+# 
+SET(install_UTILITIES
+	addld
+	imp2gbs
+	imp2ld
+	imp2vs
+	installmgr
+	mkfastmod
+	mod2imp
+	mod2osis
+	mod2vpl
+	tei2mod
+	vpl2mod
+	vs2osisref
+	vs2osisreftxt
+	xml2gbs
+	osis2mod
+)
+
+IF(WITH_ZLIB OR WITH_INTERNAL_ZLIB)
+	SET(install_UTILITIES ${install_UTILITIES} mod2zmod)
+ENDIF(WITH_ZLIB OR WITH_INTERNAL_ZLIB)
+
+######################################################################
+# These utilities will be built, but they will not be installed
+# 
+# Again, I have gone to great lengths of travail to make this list
+# alphabetical.  If you add utilities to this list, please do so in a
+# way that maintains this.
+SET(noinstall_UTILITIES
+	addgb
+	addvs
+	cipherraw
+	emptyvss
+	gbfidx
+	genbookutil
+	modwrite
+	step2vpl
+	stepdump
+	treeidxutil
+)
+
+#####################################################################
+# This will loop over both of the above utility lists and add build targets
+# to the system for each one of them.
+# 
+
+FOREACH(UTIL ${install_UTILITIES} ${noinstall_UTILITIES})
+	ADD_EXECUTABLE("${UTIL}"	"${UTIL}.cpp")
+	IF(BUILDING_SHARED)
+		TARGET_LINK_LIBRARIES("${UTIL}" sword)
+	ELSE(BUILDING_SHARED)
+		TARGET_LINK_LIBRARIES("${UTIL}" sword_static)
+	ENDIF(BUILDING_SHARED)
+ENDFOREACH(UTIL ${install_UTILITIES})
+
+####################################################################
+# Just to be difficult, we have a single C file that is a utility
+# and, therefore, needs its own treatment.
+# 
+
+ADD_EXECUTABLE(lexdump	lexdump.c)
+IF(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(lexdump sword)
+ELSE(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(lexdump sword_static)
+ENDIF(BUILDING_SHARED)
+
+####################################################################
+# Install the utilities
+#
+# We do this here, rather than up in the main install file, because
+# a) it fits more logically and b) the scope of ${install_UTILITIES}
+# is limited to CMake files in this directory and below, so rather than
+# replicate the above list in another place, we'll just handle our
+# own install, since this whole directory is optional, anyway.
+# 
+FOREACH(UTIL ${install_UTILITIES})
+	INSTALL(TARGETS ${UTIL}
+		DESTINATION ${BINDIR}
+		COMPONENT utilities
+	)
+ENDFOREACH(UTIL ${install_UTILITIES})
+
+####################################################################
+# And, of course, diatheke is a beast unto itself
+#
+# Let's go!
+#
+ADD_EXECUTABLE(diatheke
+	diatheke/diatheke.cpp
+	diatheke/corediatheke.cpp
+	diatheke/diathekemgr.cpp
+	diatheke/diafiltmgr.cpp
+	diatheke/thmlcgi.cpp
+	diatheke/gbfcgi.cpp
+	diatheke/osiscgi.cpp
+)
+IF(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(diatheke sword)
+ELSE(BUILDING_SHARED)
+	TARGET_LINK_LIBRARIES(diatheke sword_static)
+ENDIF(BUILDING_SHARED)
+INSTALL(TARGETS diatheke
+	DESTINATION ${BINDIR}
+	COMPONENT utilities
+)
+
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
new file mode 100644
index 0000000..ecebb50
--- /dev/null
+++ b/utilities/Makefile.am
@@ -0,0 +1,61 @@
+AUTOMAKE_OPTIONS = 1.6
+SUBDIRS = diatheke
+AM_CPPFLAGS = -I $(top_srcdir)/include
+if USE_INTERNAL_REGEX
+AM_CPPFLAGS += -I$(top_srcdir)/include/internal/regex
+endif
+LDADD = $(top_builddir)/lib/libsword.la
+noinst_PROGRAMS = cipherraw lexdump \
+	stepdump step2vpl gbfidx modwrite addvs emptyvss \
+	addgb genbookutil treeidxutil addld
+
+bin_PROGRAMS = mod2imp mod2osis osis2mod tei2mod vs2osisref vs2osisreftxt \
+	mod2vpl mkfastmod vpl2mod imp2vs installmgr xml2gbs imp2gbs imp2ld
+
+
+if HAVE_LIBZ
+ZLIBPROG = mod2zmod
+else
+ZLIBPROG =
+endif
+
+bin_PROGRAMS += $(ZLIBPROG) 
+
+
+cipherraw_SOURCES = cipherraw.cpp
+lexdump_SOURCES = lexdump.c
+lexdump_LDADD = -lstdc++
+mkfastmod_SOURCES = mkfastmod.cpp
+mod2vpl_SOURCES = mod2vpl.cpp
+vpl2mod_SOURCES = vpl2mod.cpp
+stepdump_SOURCES = stepdump.cpp
+step2vpl_SOURCES = step2vpl.cpp
+gbfidx_SOURCES = gbfidx.cpp
+modwrite_SOURCES = modwrite.cpp
+addvs_SOURCES = addvs.cpp
+emptyvss_SOURCES = emptyvss.cpp
+addgb_SOURCES = addgb.cpp
+imp2gbs_SOURCES = imp2gbs.cpp
+imp2vs_SOURCES = imp2vs.cpp
+mod2imp_SOURCES = mod2imp.cpp
+mod2osis_SOURCES = mod2osis.cpp
+xml2gbs_SOURCES = xml2gbs.cpp
+osis2mod_SOURCES = osis2mod.cpp
+tei2mod_SOURCES = tei2mod.cpp
+vs2osisref_SOURCES = vs2osisref.cpp
+vs2osisreftxt_SOURCES = vs2osisreftxt.cpp
+genbookutil_SOURCES = genbookutil.cpp
+treeidxutil_SOURCES = treeidxutil.cpp
+addld_SOURCES = addld.cpp
+imp2ld_SOURCES = imp2ld.cpp
+
+installmgr_SOURCES = installmgr.cpp
+
+if HAVE_LIBZ
+mod2zmod_SOURCES = mod2zmod.cpp
+endif
+
+EXTRA_DIST = 
+include bcppmake/Makefile.am
+include kylixmake/Makefile.am
+include perl/Makefile.am
diff --git a/utilities/Makefile.in b/utilities/Makefile.in
new file mode 100644
index 0000000..88e720e
--- /dev/null
+++ b/utilities/Makefile.in
@@ -0,0 +1,1149 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+@USE_INTERNAL_REGEX_TRUE@am__append_1 = -I$(top_srcdir)/include/internal/regex
+noinst_PROGRAMS = cipherraw$(EXEEXT) lexdump$(EXEEXT) \
+	stepdump$(EXEEXT) step2vpl$(EXEEXT) gbfidx$(EXEEXT) \
+	modwrite$(EXEEXT) addvs$(EXEEXT) emptyvss$(EXEEXT) \
+	addgb$(EXEEXT) genbookutil$(EXEEXT) treeidxutil$(EXEEXT) \
+	addld$(EXEEXT)
+bin_PROGRAMS = mod2imp$(EXEEXT) mod2osis$(EXEEXT) osis2mod$(EXEEXT) \
+	tei2mod$(EXEEXT) vs2osisref$(EXEEXT) vs2osisreftxt$(EXEEXT) \
+	mod2vpl$(EXEEXT) mkfastmod$(EXEEXT) vpl2mod$(EXEEXT) \
+	imp2vs$(EXEEXT) installmgr$(EXEEXT) xml2gbs$(EXEEXT) \
+	imp2gbs$(EXEEXT) imp2ld$(EXEEXT) $(am__EXEEXT_1)
+DIST_COMMON = $(srcdir)/bcppmake/Makefile.am \
+	$(srcdir)/kylixmake/Makefile.am $(srcdir)/perl/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp
+subdir = utilities
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@HAVE_LIBZ_TRUE@am__EXEEXT_1 = mod2zmod$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am_addgb_OBJECTS = addgb.$(OBJEXT)
+addgb_OBJECTS = $(am_addgb_OBJECTS)
+addgb_LDADD = $(LDADD)
+addgb_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+am_addld_OBJECTS = addld.$(OBJEXT)
+addld_OBJECTS = $(am_addld_OBJECTS)
+addld_LDADD = $(LDADD)
+addld_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_addvs_OBJECTS = addvs.$(OBJEXT)
+addvs_OBJECTS = $(am_addvs_OBJECTS)
+addvs_LDADD = $(LDADD)
+addvs_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_cipherraw_OBJECTS = cipherraw.$(OBJEXT)
+cipherraw_OBJECTS = $(am_cipherraw_OBJECTS)
+cipherraw_LDADD = $(LDADD)
+cipherraw_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_emptyvss_OBJECTS = emptyvss.$(OBJEXT)
+emptyvss_OBJECTS = $(am_emptyvss_OBJECTS)
+emptyvss_LDADD = $(LDADD)
+emptyvss_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_gbfidx_OBJECTS = gbfidx.$(OBJEXT)
+gbfidx_OBJECTS = $(am_gbfidx_OBJECTS)
+gbfidx_LDADD = $(LDADD)
+gbfidx_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_genbookutil_OBJECTS = genbookutil.$(OBJEXT)
+genbookutil_OBJECTS = $(am_genbookutil_OBJECTS)
+genbookutil_LDADD = $(LDADD)
+genbookutil_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_imp2gbs_OBJECTS = imp2gbs.$(OBJEXT)
+imp2gbs_OBJECTS = $(am_imp2gbs_OBJECTS)
+imp2gbs_LDADD = $(LDADD)
+imp2gbs_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_imp2ld_OBJECTS = imp2ld.$(OBJEXT)
+imp2ld_OBJECTS = $(am_imp2ld_OBJECTS)
+imp2ld_LDADD = $(LDADD)
+imp2ld_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_imp2vs_OBJECTS = imp2vs.$(OBJEXT)
+imp2vs_OBJECTS = $(am_imp2vs_OBJECTS)
+imp2vs_LDADD = $(LDADD)
+imp2vs_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_installmgr_OBJECTS = installmgr.$(OBJEXT)
+installmgr_OBJECTS = $(am_installmgr_OBJECTS)
+installmgr_LDADD = $(LDADD)
+installmgr_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_lexdump_OBJECTS = lexdump.$(OBJEXT)
+lexdump_OBJECTS = $(am_lexdump_OBJECTS)
+lexdump_DEPENDENCIES =
+am_mkfastmod_OBJECTS = mkfastmod.$(OBJEXT)
+mkfastmod_OBJECTS = $(am_mkfastmod_OBJECTS)
+mkfastmod_LDADD = $(LDADD)
+mkfastmod_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_mod2imp_OBJECTS = mod2imp.$(OBJEXT)
+mod2imp_OBJECTS = $(am_mod2imp_OBJECTS)
+mod2imp_LDADD = $(LDADD)
+mod2imp_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_mod2osis_OBJECTS = mod2osis.$(OBJEXT)
+mod2osis_OBJECTS = $(am_mod2osis_OBJECTS)
+mod2osis_LDADD = $(LDADD)
+mod2osis_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_mod2vpl_OBJECTS = mod2vpl.$(OBJEXT)
+mod2vpl_OBJECTS = $(am_mod2vpl_OBJECTS)
+mod2vpl_LDADD = $(LDADD)
+mod2vpl_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am__mod2zmod_SOURCES_DIST = mod2zmod.cpp
+@HAVE_LIBZ_TRUE@am_mod2zmod_OBJECTS = mod2zmod.$(OBJEXT)
+mod2zmod_OBJECTS = $(am_mod2zmod_OBJECTS)
+mod2zmod_LDADD = $(LDADD)
+mod2zmod_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_modwrite_OBJECTS = modwrite.$(OBJEXT)
+modwrite_OBJECTS = $(am_modwrite_OBJECTS)
+modwrite_LDADD = $(LDADD)
+modwrite_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_osis2mod_OBJECTS = osis2mod.$(OBJEXT)
+osis2mod_OBJECTS = $(am_osis2mod_OBJECTS)
+osis2mod_LDADD = $(LDADD)
+osis2mod_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_step2vpl_OBJECTS = step2vpl.$(OBJEXT)
+step2vpl_OBJECTS = $(am_step2vpl_OBJECTS)
+step2vpl_LDADD = $(LDADD)
+step2vpl_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_stepdump_OBJECTS = stepdump.$(OBJEXT)
+stepdump_OBJECTS = $(am_stepdump_OBJECTS)
+stepdump_LDADD = $(LDADD)
+stepdump_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_tei2mod_OBJECTS = tei2mod.$(OBJEXT)
+tei2mod_OBJECTS = $(am_tei2mod_OBJECTS)
+tei2mod_LDADD = $(LDADD)
+tei2mod_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_treeidxutil_OBJECTS = treeidxutil.$(OBJEXT)
+treeidxutil_OBJECTS = $(am_treeidxutil_OBJECTS)
+treeidxutil_LDADD = $(LDADD)
+treeidxutil_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_vpl2mod_OBJECTS = vpl2mod.$(OBJEXT)
+vpl2mod_OBJECTS = $(am_vpl2mod_OBJECTS)
+vpl2mod_LDADD = $(LDADD)
+vpl2mod_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_vs2osisref_OBJECTS = vs2osisref.$(OBJEXT)
+vs2osisref_OBJECTS = $(am_vs2osisref_OBJECTS)
+vs2osisref_LDADD = $(LDADD)
+vs2osisref_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_vs2osisreftxt_OBJECTS = vs2osisreftxt.$(OBJEXT)
+vs2osisreftxt_OBJECTS = $(am_vs2osisreftxt_OBJECTS)
+vs2osisreftxt_LDADD = $(LDADD)
+vs2osisreftxt_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+am_xml2gbs_OBJECTS = xml2gbs.$(OBJEXT)
+xml2gbs_OBJECTS = $(am_xml2gbs_OBJECTS)
+xml2gbs_LDADD = $(LDADD)
+xml2gbs_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \
+	$(cipherraw_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) \
+	$(genbookutil_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) \
+	$(imp2vs_SOURCES) $(installmgr_SOURCES) $(lexdump_SOURCES) \
+	$(mkfastmod_SOURCES) $(mod2imp_SOURCES) $(mod2osis_SOURCES) \
+	$(mod2vpl_SOURCES) $(mod2zmod_SOURCES) $(modwrite_SOURCES) \
+	$(osis2mod_SOURCES) $(step2vpl_SOURCES) $(stepdump_SOURCES) \
+	$(tei2mod_SOURCES) $(treeidxutil_SOURCES) $(vpl2mod_SOURCES) \
+	$(vs2osisref_SOURCES) $(vs2osisreftxt_SOURCES) \
+	$(xml2gbs_SOURCES)
+DIST_SOURCES = $(addgb_SOURCES) $(addld_SOURCES) $(addvs_SOURCES) \
+	$(cipherraw_SOURCES) $(emptyvss_SOURCES) $(gbfidx_SOURCES) \
+	$(genbookutil_SOURCES) $(imp2gbs_SOURCES) $(imp2ld_SOURCES) \
+	$(imp2vs_SOURCES) $(installmgr_SOURCES) $(lexdump_SOURCES) \
+	$(mkfastmod_SOURCES) $(mod2imp_SOURCES) $(mod2osis_SOURCES) \
+	$(mod2vpl_SOURCES) $(am__mod2zmod_SOURCES_DIST) \
+	$(modwrite_SOURCES) $(osis2mod_SOURCES) $(step2vpl_SOURCES) \
+	$(stepdump_SOURCES) $(tei2mod_SOURCES) $(treeidxutil_SOURCES) \
+	$(vpl2mod_SOURCES) $(vs2osisref_SOURCES) \
+	$(vs2osisreftxt_SOURCES) $(xml2gbs_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+AUTOMAKE_OPTIONS = 1.6
+SUBDIRS = diatheke
+AM_CPPFLAGS = -I $(top_srcdir)/include $(am__append_1)
+LDADD = $(top_builddir)/lib/libsword.la
+@HAVE_LIBZ_FALSE@ZLIBPROG = 
+@HAVE_LIBZ_TRUE@ZLIBPROG = mod2zmod
+cipherraw_SOURCES = cipherraw.cpp
+lexdump_SOURCES = lexdump.c
+lexdump_LDADD = -lstdc++
+mkfastmod_SOURCES = mkfastmod.cpp
+mod2vpl_SOURCES = mod2vpl.cpp
+vpl2mod_SOURCES = vpl2mod.cpp
+stepdump_SOURCES = stepdump.cpp
+step2vpl_SOURCES = step2vpl.cpp
+gbfidx_SOURCES = gbfidx.cpp
+modwrite_SOURCES = modwrite.cpp
+addvs_SOURCES = addvs.cpp
+emptyvss_SOURCES = emptyvss.cpp
+addgb_SOURCES = addgb.cpp
+imp2gbs_SOURCES = imp2gbs.cpp
+imp2vs_SOURCES = imp2vs.cpp
+mod2imp_SOURCES = mod2imp.cpp
+mod2osis_SOURCES = mod2osis.cpp
+xml2gbs_SOURCES = xml2gbs.cpp
+osis2mod_SOURCES = osis2mod.cpp
+tei2mod_SOURCES = tei2mod.cpp
+vs2osisref_SOURCES = vs2osisref.cpp
+vs2osisreftxt_SOURCES = vs2osisreftxt.cpp
+genbookutil_SOURCES = genbookutil.cpp
+treeidxutil_SOURCES = treeidxutil.cpp
+addld_SOURCES = addld.cpp
+imp2ld_SOURCES = imp2ld.cpp
+installmgr_SOURCES = installmgr.cpp
+@HAVE_LIBZ_TRUE@mod2zmod_SOURCES = mod2zmod.cpp
+EXTRA_DIST = $(swbcppmakedir)/imp2ld.bpf $(swbcppmakedir)/mod2imp.bpf \
+	$(swbcppmakedir)/osis2mod.bpf $(swbcppmakedir)/utilities.bpg \
+	$(swbcppmakedir)/imp2ld.bpr $(swbcppmakedir)/mod2imp.bpr \
+	$(swbcppmakedir)/osis2mod.bpr $(swbcppmakedir)/vpl2mod.bpf \
+	$(swbcppmakedir)/cipherraw.bpf $(swbcppmakedir)/imp2vs.bpf \
+	$(swbcppmakedir)/mod2osis.bpf $(swbcppmakedir)/step2vpl.bpf \
+	$(swbcppmakedir)/vpl2mod.bpr $(swbcppmakedir)/cipherraw.bpr \
+	$(swbcppmakedir)/imp2vs.bpr $(swbcppmakedir)/mod2osis.bpr \
+	$(swbcppmakedir)/step2vpl.bpr $(swbcppmakedir)/vs2osisref.bpf \
+	$(swbcppmakedir)/diatheke.bpf $(swbcppmakedir)/libsword.bpf \
+	$(swbcppmakedir)/mod2vpl.bpf $(swbcppmakedir)/stepdump.bpf \
+	$(swbcppmakedir)/vs2osisref.bpr $(swbcppmakedir)/diatheke.bpr \
+	$(swbcppmakedir)/libsword.bpr $(swbcppmakedir)/mod2vpl.bpr \
+	$(swbcppmakedir)/stepdump.bpr $(swbcppmakedir)/xml2gbs.bpf \
+	$(swbcppmakedir)/imp2gbs.bpf $(swbcppmakedir)/mkfastmod.bpf \
+	$(swbcppmakedir)/mod2zmod.bpf $(swbcppmakedir)/xml2gbs.bpr \
+	$(swbcppmakedir)/imp2gbs.bpr $(swbcppmakedir)/mkfastmod.bpr \
+	$(swbcppmakedir)/mod2zmod.bpr $(swkylixmakedir)/libsword.bpf \
+	$(swkylixmakedir)/mod2zmod.bpf $(swkylixmakedir)/mod2zmod.res \
+	$(swkylixmakedir)/libsword.bpr $(swkylixmakedir)/mod2zmod.bpr \
+	$(swkylixmakedir)/utilities.bpg \
+	$(swperlutildir)/cipherkeygen.pl $(swperlutildir)/linkvers.pl \
+	$(swperlutildir)/localecap.pl $(swperlutildir)/mkvsmod.pl
+swbcppmakedir = $(top_srcdir)/utilities/bcppmake
+swkylixmakedir = $(top_srcdir)/utilities/kylixmake
+swperlutildir = $(top_srcdir)/utilities/perl
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/bcppmake/Makefile.am $(srcdir)/kylixmake/Makefile.am $(srcdir)/perl/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign utilities/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign utilities/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/bcppmake/Makefile.am $(srcdir)/kylixmake/Makefile.am $(srcdir)/perl/Makefile.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+clean-noinstPROGRAMS:
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+addgb$(EXEEXT): $(addgb_OBJECTS) $(addgb_DEPENDENCIES) $(EXTRA_addgb_DEPENDENCIES) 
+	@rm -f addgb$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(addgb_OBJECTS) $(addgb_LDADD) $(LIBS)
+
+addld$(EXEEXT): $(addld_OBJECTS) $(addld_DEPENDENCIES) $(EXTRA_addld_DEPENDENCIES) 
+	@rm -f addld$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(addld_OBJECTS) $(addld_LDADD) $(LIBS)
+
+addvs$(EXEEXT): $(addvs_OBJECTS) $(addvs_DEPENDENCIES) $(EXTRA_addvs_DEPENDENCIES) 
+	@rm -f addvs$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(addvs_OBJECTS) $(addvs_LDADD) $(LIBS)
+
+cipherraw$(EXEEXT): $(cipherraw_OBJECTS) $(cipherraw_DEPENDENCIES) $(EXTRA_cipherraw_DEPENDENCIES) 
+	@rm -f cipherraw$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(cipherraw_OBJECTS) $(cipherraw_LDADD) $(LIBS)
+
+emptyvss$(EXEEXT): $(emptyvss_OBJECTS) $(emptyvss_DEPENDENCIES) $(EXTRA_emptyvss_DEPENDENCIES) 
+	@rm -f emptyvss$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(emptyvss_OBJECTS) $(emptyvss_LDADD) $(LIBS)
+
+gbfidx$(EXEEXT): $(gbfidx_OBJECTS) $(gbfidx_DEPENDENCIES) $(EXTRA_gbfidx_DEPENDENCIES) 
+	@rm -f gbfidx$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(gbfidx_OBJECTS) $(gbfidx_LDADD) $(LIBS)
+
+genbookutil$(EXEEXT): $(genbookutil_OBJECTS) $(genbookutil_DEPENDENCIES) $(EXTRA_genbookutil_DEPENDENCIES) 
+	@rm -f genbookutil$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(genbookutil_OBJECTS) $(genbookutil_LDADD) $(LIBS)
+
+imp2gbs$(EXEEXT): $(imp2gbs_OBJECTS) $(imp2gbs_DEPENDENCIES) $(EXTRA_imp2gbs_DEPENDENCIES) 
+	@rm -f imp2gbs$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(imp2gbs_OBJECTS) $(imp2gbs_LDADD) $(LIBS)
+
+imp2ld$(EXEEXT): $(imp2ld_OBJECTS) $(imp2ld_DEPENDENCIES) $(EXTRA_imp2ld_DEPENDENCIES) 
+	@rm -f imp2ld$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(imp2ld_OBJECTS) $(imp2ld_LDADD) $(LIBS)
+
+imp2vs$(EXEEXT): $(imp2vs_OBJECTS) $(imp2vs_DEPENDENCIES) $(EXTRA_imp2vs_DEPENDENCIES) 
+	@rm -f imp2vs$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(imp2vs_OBJECTS) $(imp2vs_LDADD) $(LIBS)
+
+installmgr$(EXEEXT): $(installmgr_OBJECTS) $(installmgr_DEPENDENCIES) $(EXTRA_installmgr_DEPENDENCIES) 
+	@rm -f installmgr$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(installmgr_OBJECTS) $(installmgr_LDADD) $(LIBS)
+
+lexdump$(EXEEXT): $(lexdump_OBJECTS) $(lexdump_DEPENDENCIES) $(EXTRA_lexdump_DEPENDENCIES) 
+	@rm -f lexdump$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(lexdump_OBJECTS) $(lexdump_LDADD) $(LIBS)
+
+mkfastmod$(EXEEXT): $(mkfastmod_OBJECTS) $(mkfastmod_DEPENDENCIES) $(EXTRA_mkfastmod_DEPENDENCIES) 
+	@rm -f mkfastmod$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(mkfastmod_OBJECTS) $(mkfastmod_LDADD) $(LIBS)
+
+mod2imp$(EXEEXT): $(mod2imp_OBJECTS) $(mod2imp_DEPENDENCIES) $(EXTRA_mod2imp_DEPENDENCIES) 
+	@rm -f mod2imp$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(mod2imp_OBJECTS) $(mod2imp_LDADD) $(LIBS)
+
+mod2osis$(EXEEXT): $(mod2osis_OBJECTS) $(mod2osis_DEPENDENCIES) $(EXTRA_mod2osis_DEPENDENCIES) 
+	@rm -f mod2osis$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(mod2osis_OBJECTS) $(mod2osis_LDADD) $(LIBS)
+
+mod2vpl$(EXEEXT): $(mod2vpl_OBJECTS) $(mod2vpl_DEPENDENCIES) $(EXTRA_mod2vpl_DEPENDENCIES) 
+	@rm -f mod2vpl$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(mod2vpl_OBJECTS) $(mod2vpl_LDADD) $(LIBS)
+
+mod2zmod$(EXEEXT): $(mod2zmod_OBJECTS) $(mod2zmod_DEPENDENCIES) $(EXTRA_mod2zmod_DEPENDENCIES) 
+	@rm -f mod2zmod$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(mod2zmod_OBJECTS) $(mod2zmod_LDADD) $(LIBS)
+
+modwrite$(EXEEXT): $(modwrite_OBJECTS) $(modwrite_DEPENDENCIES) $(EXTRA_modwrite_DEPENDENCIES) 
+	@rm -f modwrite$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(modwrite_OBJECTS) $(modwrite_LDADD) $(LIBS)
+
+osis2mod$(EXEEXT): $(osis2mod_OBJECTS) $(osis2mod_DEPENDENCIES) $(EXTRA_osis2mod_DEPENDENCIES) 
+	@rm -f osis2mod$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(osis2mod_OBJECTS) $(osis2mod_LDADD) $(LIBS)
+
+step2vpl$(EXEEXT): $(step2vpl_OBJECTS) $(step2vpl_DEPENDENCIES) $(EXTRA_step2vpl_DEPENDENCIES) 
+	@rm -f step2vpl$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(step2vpl_OBJECTS) $(step2vpl_LDADD) $(LIBS)
+
+stepdump$(EXEEXT): $(stepdump_OBJECTS) $(stepdump_DEPENDENCIES) $(EXTRA_stepdump_DEPENDENCIES) 
+	@rm -f stepdump$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(stepdump_OBJECTS) $(stepdump_LDADD) $(LIBS)
+
+tei2mod$(EXEEXT): $(tei2mod_OBJECTS) $(tei2mod_DEPENDENCIES) $(EXTRA_tei2mod_DEPENDENCIES) 
+	@rm -f tei2mod$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(tei2mod_OBJECTS) $(tei2mod_LDADD) $(LIBS)
+
+treeidxutil$(EXEEXT): $(treeidxutil_OBJECTS) $(treeidxutil_DEPENDENCIES) $(EXTRA_treeidxutil_DEPENDENCIES) 
+	@rm -f treeidxutil$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(treeidxutil_OBJECTS) $(treeidxutil_LDADD) $(LIBS)
+
+vpl2mod$(EXEEXT): $(vpl2mod_OBJECTS) $(vpl2mod_DEPENDENCIES) $(EXTRA_vpl2mod_DEPENDENCIES) 
+	@rm -f vpl2mod$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(vpl2mod_OBJECTS) $(vpl2mod_LDADD) $(LIBS)
+
+vs2osisref$(EXEEXT): $(vs2osisref_OBJECTS) $(vs2osisref_DEPENDENCIES) $(EXTRA_vs2osisref_DEPENDENCIES) 
+	@rm -f vs2osisref$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(vs2osisref_OBJECTS) $(vs2osisref_LDADD) $(LIBS)
+
+vs2osisreftxt$(EXEEXT): $(vs2osisreftxt_OBJECTS) $(vs2osisreftxt_DEPENDENCIES) $(EXTRA_vs2osisreftxt_DEPENDENCIES) 
+	@rm -f vs2osisreftxt$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(vs2osisreftxt_OBJECTS) $(vs2osisreftxt_LDADD) $(LIBS)
+
+xml2gbs$(EXEEXT): $(xml2gbs_OBJECTS) $(xml2gbs_DEPENDENCIES) $(EXTRA_xml2gbs_DEPENDENCIES) 
+	@rm -f xml2gbs$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(xml2gbs_OBJECTS) $(xml2gbs_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addgb.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addld.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/addvs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cipherraw.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emptyvss.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfidx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genbookutil.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imp2gbs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imp2ld.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imp2vs.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/installmgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexdump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkfastmod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod2imp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod2osis.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod2vpl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod2zmod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modwrite.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osis2mod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/step2vpl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stepdump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tei2mod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeidxutil.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vpl2mod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vs2osisref.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vs2osisreftxt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml2gbs.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(PROGRAMS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-binPROGRAMS clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/utilities/addcomment.cpp b/utilities/addcomment.cpp
new file mode 100644
index 0000000..46de6a7
--- /dev/null
+++ b/utilities/addcomment.cpp
@@ -0,0 +1,61 @@
+/******************************************************************************
+ *
+ *  addcomment.cpp -	
+ *
+ * $Id: addcomment.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1998-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <iostream>
+#include <versekey.h>
+#include <rawtext.h>
+#include <zcom.h>
+#include <rawcom.h>
+#include <rawfiles.h>
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+	int loop;
+	int max;
+	RawFiles  personal("modules/comments/rawfiles/personal/", "MINE", "Personal Comments");
+	VerseKey mykey;
+
+	if (argc < 3) {
+		fprintf(stderr, "usage: %s <\"comment\"> <\"verse\"> [count] [disable AutoNormalization]\n", argv[0]);
+		exit(-1);
+	}
+
+	if (argc > 4)
+		mykey.AutoNormalize(0);  // Turn off autonormalize if 3 args to allow for intros
+				// This is kludgy but at lease you can try it
+				// with something like: sword "Matthew 1:0" 1 1
+
+	mykey = argv[2];
+	mykey.Persist(1);
+	personal.setKey(mykey);
+
+	max = (argc < 4) ? 1 : atoi(argv[3]);
+
+	for (loop = 0; loop < max; loop++) {
+		personal << argv[1];
+		mykey++;
+	}
+	std::cout << "Added Comment" << std::endl;
+	return 0;
+}
diff --git a/utilities/addgb.cpp b/utilities/addgb.cpp
new file mode 100644
index 0000000..5aef649
--- /dev/null
+++ b/utilities/addgb.cpp
@@ -0,0 +1,144 @@
+/******************************************************************************
+ *
+ *  addgb.cpp -	Utility to create/modify a GenBook module by adding a single
+ *		entry
+ *
+ * $Id: addgb.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <entriesblk.h>
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <treekeyidx.h>
+#include <rawgenbook.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::TreeKeyIdx;
+using sword::RawGenBook;
+using sword::SWKey;
+#endif
+
+
+void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) {
+	if (!target)
+		target = &treeKey;
+	
+	unsigned long currentOffset = target->getOffset();
+       	std::cout << ((currentOffset == treeKey.getOffset()) ? "==>" : "");
+	for (int i = 0; i < level; i++) std::cout << "\t";
+	std::cout << treeKey.getLocalName() << "/\n";
+	if (treeKey.firstChild()) {
+		printTree(treeKey, target, level+1);
+		treeKey.parent();
+	}
+	if (treeKey.nextSibling())
+		printTree(treeKey, target, level);
+
+}
+
+
+int main(int argc, char **argv) {
+  
+  const char * helptext ="addgb 1.0 General Book module creation tool for the SWORD Project\nUse -a to add a new leaf entry from standard input or a file\n  usage:\n   %s -a <filename> <key> [</path/to/file/with/entry>]\n";
+
+  //  const char * helptext ="addgb 1.0 General Book module creation tool for the SWORD Project\nUse -a to add a new leaf entry from standard input or a file, -d to delete an\nentry, -l to link two leaf entries.\n  usage:\n   %s -a <filename> <key> [</path/to/file/with/entry>]\n   %s -d <filename> <key>\n   %s -l <filename> <first key (already assigned)> <second key>\n";
+
+  char mode;
+  unsigned long entrysize;
+    
+  if (argc < 3) {
+    fprintf(stderr, helptext, argv[0]);
+    exit(-1);
+  }
+ 
+  mode = argv[1][1];
+
+  // Do some initialization stuff
+  TreeKeyIdx *treeKey = new TreeKeyIdx(argv[2]);
+  if (treeKey->popError()) {
+    treeKey->create(argv[2]);
+    delete treeKey;
+    treeKey = new TreeKeyIdx(argv[2]);
+    RawGenBook::createModule(argv[2]);
+  }
+  delete treeKey;
+  RawGenBook *book = new RawGenBook(argv[2]);
+
+  if ((mode == 'a') && (argc == 4 || argc == 5)) {	
+    char buffer[1048576];  //this is the max size of any entry
+
+    
+    FILE *infile;
+    // case: add from text file
+    //Open our data file and read its contents into the buffer
+    if (argc == 5) infile = fopen(argv[4], "r");
+    // case: add from stdin
+    else infile = stdin;
+    
+    entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
+    book->setKey(argv[3]);
+    book->setEntry(buffer, entrysize); // save text to module at current position
+  }
+  
+  /*
+    // let's pretend these don't exist for the time being
+
+    // Link 2 verses
+    else if ((mode == 'l') && argc == 5) {
+    *key = argv[3];
+    mod.setKey(*key);
+    
+    SWKey tmpkey = argv[4];
+    mod << &(tmpkey);
+    }
+    
+    // Delete an entry
+    else if ((mode == 'd') && argc == 4) {
+    mod.setKey(argv[3]);
+    mod.deleteEntry();
+    }
+  */
+  // Bad arguments, print usage
+  else {
+    fprintf(stderr, helptext, argv[0]);
+    exit(-1);
+  }
+  
+  //DEBUG  printTree(root, treeKey);
+  
+  delete treeKey;
+  delete book;
+  return 0;
+}
diff --git a/utilities/addld.cpp b/utilities/addld.cpp
new file mode 100644
index 0000000..7e43361
--- /dev/null
+++ b/utilities/addld.cpp
@@ -0,0 +1,231 @@
+/******************************************************************************
+ *
+ *  addld.cpp -	Utility to build/modify an LD module by adding a single entry
+ *
+ * $Id: addld.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <swmgr.h>
+#include <rawld.h>
+#include <rawld4.h>
+#include <zld.h>
+#include <zipcomprs.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWMgr;
+using sword::ZipCompress;
+using sword::RawLD4;
+using sword::SWKey;
+using sword::zLD;
+using sword::RawLD;
+#endif
+
+
+int main(int argc, char **argv) {
+  
+  const char * helptext ="addld 1.0 Lexicon & Dictionary module creation tool for the SWORD Project\nUse -a to add a new LD entry from standard input or a file, -d to delete an\nentry, -l to link two LD entries, -c to create a new module.\n  usage:\n   %s -a <filename> <key> [</path/to/file/with/entry>]\n   %s -d <filename> <key>\n   %s -l <filename> <first key (already assigned)> <second key>\n   %s -c <filename>\nTo use 4-byte LD instead of 2-byte, insert a 4 immediately after the '-'.\nTo use zLD instead of 2-byte, insert a z immediately after the '-'.\n";
+  long entrysize;
+  
+  bool fourbyte = false;
+  bool compress = false;
+  char mode;
+  
+  if (argc < 3) {
+    fprintf(stderr, helptext, argv[0], argv[0], argv[0], argv[0]);
+    exit(-1);
+  }
+  
+  if (argv[1][1] == '4') {
+    fourbyte = false;
+    mode = argv[1][2];
+  }
+  else if (argv[1][1] == 'z') {
+    compress = true;
+    mode = argv[1][2];
+  }
+  else {
+    mode = argv[1][1];
+  }
+  
+  if ((mode == 'a') && (argc == 4 || argc == 5)) {	
+    
+    // Do some initialization stuff
+    if (fourbyte) {
+      char buffer[1048576];  //this is the max size of any entry
+      RawLD4 mod(argv[2]);	// open our datapath with our RawText driver.
+      SWKey* key = mod.createKey();
+      key->setPersist(true);      // the magical setting
+      
+      // Set our VerseKey
+      *key = argv[3];
+	 mod.setKey(*key);
+      FILE *infile;
+      // case: add from text file
+      //Open our data file and read its contents into the buffer
+      if (argc == 5) infile = fopen(argv[4], "r");
+      // case: add from stdin
+      else infile = stdin;
+      
+      entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
+      mod.setEntry(buffer, entrysize);	// save text to module at current position
+    }
+    else if (compress) {
+#ifndef EXCLUDEZLIB
+      char buffer[1048576];  //this is the max size of any entry
+      zLD mod(argv[2], 0, 0, 200, new ZipCompress());	// open our datapath with our RawText driver.
+      SWKey* key = mod.createKey();
+      key->setPersist(true);      // the magical setting
+      
+      // Set our VerseKey
+      *key = argv[3];
+	 mod.setKey(*key);
+      FILE *infile;
+      // case: add from text file
+      //Open our data file and read its contents into the buffer
+      if (argc == 5) infile = fopen(argv[4], "r");
+      // case: add from stdin
+      else infile = stdin;
+      
+      entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
+      mod.setEntry(buffer, entrysize);	// save text to module at current position
+#else
+      fprintf(stderr, "error: %s: SWORD library not built with ZIP compression support.\n", argv[0]);
+      exit(-3);
+#endif
+    }
+    else {
+      char buffer[65536];  //this is the max size of any entry
+      RawLD mod(argv[2]);	// open our datapath with our RawText driver.
+      SWKey* key = mod.createKey();
+      key->setPersist(true);      // the magical setting
+      
+      // Set our VerseKey
+      *key = argv[3];
+	 mod.setKey(*key);
+      FILE *infile;
+      // case: add from text file
+      //Open our data file and read its contents into the buffer
+      if (argc == 5) infile = fopen(argv[4], "r");
+      // case: add from stdin
+      else infile = stdin;
+      
+      entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
+      mod.setEntry(buffer, entrysize);	// save text to module at current position
+    }
+    
+  }
+  // Link 2 verses
+  else if ((mode == 'l') && argc == 5) {
+    // Do some initialization stuff
+    if (fourbyte) {
+      RawLD4 mod(argv[2]);	// open our datapath with our RawText driver.
+      SWKey* key = mod.createKey();
+      key->setPersist(true);      // the magical setting
+      
+      *key = argv[3];
+	 mod.setKey(*key);
+      SWKey tmpkey = argv[4];
+      mod << &(tmpkey);
+    }
+    else if (compress) {
+      zLD mod(argv[2]);	// open our datapath with our RawText driver.
+      SWKey* key = mod.createKey();
+      key->setPersist(true);      // the magical setting
+      
+      *key = argv[3];
+	 mod.setKey(*key);
+      
+      SWKey tmpkey = argv[4];
+      mod << &(tmpkey);
+    }
+    else {
+      RawLD mod(argv[2]);	// open our datapath with our RawText driver.
+      SWKey* key = mod.createKey();
+      key->setPersist(true);      // the magical setting
+      
+      *key = argv[3];
+	 mod.setKey(*key);
+      
+      SWKey tmpkey = argv[4];
+      mod << &(tmpkey);
+    }
+  }
+  else if ((mode == 'd') && argc == 4) {
+    if (fourbyte) {
+      RawLD4 mod(argv[2]);	// open our datapath with our RawText driver.
+	 mod.setKey(argv[3]);
+      mod.deleteEntry();
+    }
+    if (compress) {
+      zLD mod(argv[2]);	// open our datapath with our RawText driver.
+	 mod.setKey(argv[3]);
+      mod.deleteEntry();
+    }
+    else {
+      RawLD mod(argv[2]);	// open our datapath with our RawText driver.
+      mod.setKey(argv[3]);
+      mod.deleteEntry();
+    }
+    
+  }
+  // Make a new module
+  else if ((mode == 'c') && argc == 3) {
+    // Try to initialize a default set of datafiles and indicies at our
+    // datapath location passed to us from the user.
+    if (fourbyte) {
+      if (RawLD4::createModule(argv[2])) {
+	fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[2]);
+	exit(-2);
+      }
+    }
+    if (compress) {
+      if (zLD::createModule(argv[2])) {
+	fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[2]);
+	exit(-2);
+      }
+    }
+    else {
+      if (RawLD::createModule(argv[2])) {
+	fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[2]);
+	exit(-2);
+      }
+    }
+  }   
+  
+  // Bad arguments, print usage
+  else {
+    fprintf(stderr, helptext, argv[0], argv[0], argv[0], argv[0]);
+    exit(-1);
+  }
+}
diff --git a/utilities/addvs.cpp b/utilities/addvs.cpp
new file mode 100644
index 0000000..270154b
--- /dev/null
+++ b/utilities/addvs.cpp
@@ -0,0 +1,213 @@
+/******************************************************************************
+ *
+ *  addvs.cpp -	Utility to create/modify a VerseKey module by adding a single
+ *		entry
+ *
+ * $Id: addvs.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <swmgr.h>
+#include <versekey.h>
+#include <rawtext.h>
+#include <iostream>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWMgr;
+using sword::RawText;
+using sword::SWKey;
+using sword::VerseKey;
+using sword::ListKey;
+using sword::SWModule;
+#endif
+
+int main(int argc, char **argv) {
+  
+  const char * helptext = "addvs 1.1 Bible & Commentary module creation tool for the SWORD Project\nUse -a to add a new verse from standard input or a file, -d to delete a verse,\n-l to link two verses, -c to create a new module.\n  usage:\n   %s -a </path/to/module> <verse> [</path/to/file/with/verse>]\n   %s -d </path/to/module> <key>\n   %s -l </path/to/module> <first verse (already assigned)> <second verse>\n   %s -c </path/to/module>\n";
+  long entrysize;
+
+  if (argc < 3) {
+    fprintf(stderr, helptext, argv[0], argv[0], argv[0], argv[0]);
+    exit(-1);
+  }
+ if (!strcmp(argv[1], "-a") && (argc == 4 || argc == 5)) {	
+    
+    // Do some initialization stuff
+    char buffer[65536];  //this is the max size of any entry
+    RawText * mod = new RawText(argv[2]);	// open our datapath with our RawText driver.
+    VerseKey *vkey = new VerseKey;
+    vkey->setIntros(true);
+    vkey->setAutoNormalize(false);
+    vkey->setPersist(true);      // the magical setting
+    *vkey = argv[3];   
+    // Set our VerseKey
+    mod->setKey(*vkey);
+    if (!vkey->getChapter()) {
+      // bad hack >>
+      // 0:0 is Book intro
+      // (chapter):0 is Chapter intro
+      //
+      // 0:2 is Module intro
+      // 0:1 is Testament intro
+      int backstep = vkey->getVerse();
+      vkey->setVerse(0);
+      *mod -= backstep;       
+      // << bad hack
+
+      FILE *infile;
+      // case: add from text file
+      //Open our data file and read its contents into the buffer
+      if (argc == 5) infile = fopen(argv[4], "r");
+      // case: add from stdin
+      else infile = stdin;
+      
+      entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
+      
+      mod->setEntry(buffer, entrysize);	// save text to module at current position
+    }
+    else {
+      ListKey listkey = vkey->parseVerseList(argv[3], "Gen1:1", true);
+      int i;
+      bool havefirst = false;
+      VerseKey firstverse;
+      for (i = 0; i < listkey.getCount(); i++) {
+	VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.getElement(i));
+	if (element) {
+	  mod->setKey(element->getLowerBound());
+	  VerseKey finalkey = element->getUpperBound();
+	  std::cout << mod->getKeyText() << "-" << (const char*)finalkey << std::endl;
+	  if (!havefirst) {
+	    havefirst = true;
+	    firstverse = *mod->getKey();
+	    FILE *infile;
+	    // case: add from text file
+	    //Open our data file and read its contents into the buffer
+	    if (argc == 5) infile = fopen(argv[4], "r");
+	    // case: add from stdin
+	    else infile = stdin;
+	    
+	    entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
+	    
+	    mod->setEntry(buffer, entrysize);	// save text to module at current position
+	    std::cout << "f" << (const char*)firstverse << std::endl;
+	    (*mod)++;
+	  }
+	  while (*mod->getKey() <= finalkey) {
+	    std::cout << mod->getKeyText() << std::endl;
+	    *(SWModule*)mod << &firstverse;
+	    (*mod)++;
+	  }
+	}
+	else {
+	  if (havefirst) {
+	    mod->setKey(*listkey.getElement(i));
+	    *(SWModule*)mod << &firstverse;
+	    std::cout << mod->getKeyText() << std::endl;
+	  }
+	  else {
+	    mod->setKey(*listkey.getElement(i));
+	    havefirst = true;
+	    firstverse = *mod->getKey();
+	    FILE *infile;
+	    // case: add from text file
+	    //Open our data file and read its contents into the buffer
+	    if (argc == 5) infile = fopen(argv[4], "r");
+	    // case: add from stdin
+	    else infile = stdin;
+	    
+	    entrysize = fread(buffer, sizeof(char), sizeof(buffer), infile);
+	    
+	    mod->setEntry(buffer, entrysize);	// save text to module at current position
+	    std::cout << "f" << (const char*)firstverse << std::endl;
+	  }
+	}
+      }
+    }
+    delete vkey;
+ }
+ // Link 2 verses
+ else if (!strcmp(argv[1], "-l") && argc == 5) {
+   // Do some initialization stuff
+   RawText *mod = new RawText(argv[2]);	// open our datapath with our RawText driver.
+   
+   mod->setKey(argv[4]);    // set key from argument
+   SWKey tmpkey = (SWKey) argv[3];
+   *(SWModule*)mod << &(tmpkey);
+   delete mod;
+ }
+ 
+ else if (!strcmp(argv[1], "-d") && argc == 4) {
+   RawText mod(argv[2]);	// open our datapath with our RawText driver.
+   VerseKey *vkey = new VerseKey;
+   vkey->setIntros(true);
+   vkey->setAutoNormalize(false);
+   vkey->setPersist(true);      // the magical setting
+   
+   // Set our VerseKey
+   mod.setKey(*vkey);
+   *vkey = argv[3];
+
+   if (!vkey->getChapter())
+     {
+       // bad hack >>
+       // 0:0 is Book intro
+       // (chapter):0 is Chapter intro
+       //
+       // 0:2 is Module intro
+       // 0:1 is Testament intro
+       int backstep = vkey->getVerse();
+       vkey->setVerse(0);
+       mod -= backstep;       
+       // << bad hack
+     }
+   
+   mod.deleteEntry();
+   delete vkey;
+ }
+
+  // Make a new module
+  else if (!strcmp(argv[1], "-c") && argc == 3) {
+    // Try to initialize a default set of datafiles and indicies at our
+    // datapath location passed to us from the user.
+    if (RawText::createModule(argv[2])) {
+      fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[2]);
+      exit(-2);
+    }
+  }   
+  
+  // Bad arguments, print usage
+  else {
+    fprintf(stderr, helptext, argv[0], argv[0], argv[0], argv[0]);
+    exit(-1);
+  }
+}
diff --git a/utilities/bcpp6make/cipherraw.bpf b/utilities/bcpp6make/cipherraw.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/cipherraw.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/cipherraw.bpr b/utilities/bcpp6make/cipherraw.bpr
new file mode 100644
index 0000000..25e48f3
--- /dev/null
+++ b/utilities/bcpp6make/cipherraw.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\cipherraw.exe"/>

+    <OBJFILES value="obj\cipherraw.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="cipherraw.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="cipherraw.bpf" FORMNAME="" UNITNAME="cipherraw" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\cipherraw.cpp" FORMNAME="" UNITNAME="cipherraw" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/diatheke.bpf b/utilities/bcpp6make/diatheke.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/diatheke.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/diatheke.bpr b/utilities/bcpp6make/diatheke.bpr
new file mode 100644
index 0000000..d1d25a8
--- /dev/null
+++ b/utilities/bcpp6make/diatheke.bpr
@@ -0,0 +1,159 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\diatheke.exe"/>

+    <OBJFILES value="obj\diatheke.obj obj\thmlcgi.obj obj\corediatheke.obj obj\diafiltmgr.obj 

+      obj\diathekemgr.obj obj\gbfcgi.obj obj\osiscgi.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;..\diatheke"/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="diatheke.bpf"/>

+    <INCLUDEPATH value="..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common;Z:\Biblie\SRC\icu-sword\source\i18n"/>

+    <LIBPATH value="..\diatheke;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\diatheke -I..\. -I.. -I..\..\include -I$(BCB)\include 

+      -I$(BCB)\include\vcl -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY 

+      -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -s -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="diatheke.bpf" FORMNAME="" UNITNAME="diatheke" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\diatheke\diatheke.cpp" FORMNAME="" UNITNAME="diatheke" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\diatheke\thmlcgi.cpp" FORMNAME="" UNITNAME="thmlcgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\diatheke\corediatheke.cpp" FORMNAME="" UNITNAME="corediatheke" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\diatheke\diafiltmgr.cpp" FORMNAME="" UNITNAME="diafiltmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\diatheke\diathekemgr.cpp" FORMNAME="" UNITNAME="diathekemgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\diatheke\gbfcgi.cpp" FORMNAME="" UNITNAME="gbfcgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\diatheke\osiscgi.cpp" FORMNAME="" UNITNAME="osiscgi" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=8

+Item0=..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common;Z:\Biblie\SRC\icu-sword\source\i18n

+Item1=..\diatheke;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common

+Item2=..\diatheke;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;Z:\Biblie\SRC\icu-sword\source\common

+Item3=..\diatheke;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item4=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item5=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item6=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item7=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=7

+Item0=..\diatheke;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..\diatheke;..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item5=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item6=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=-b system -k modulelist

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=Z:\Biblie\SRC\sword\utilities\CBuilder6\stage\diatheke.exe

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/imp2gbs.bpf b/utilities/bcpp6make/imp2gbs.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/imp2gbs.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/imp2gbs.bpr b/utilities/bcpp6make/imp2gbs.bpr
new file mode 100644
index 0000000..095e1a8
--- /dev/null
+++ b/utilities/bcpp6make/imp2gbs.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\imp2gbs.exe"/>

+    <OBJFILES value="obj\imp2gbs.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="imp2gbs.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="imp2gbs.bpf" FORMNAME="" UNITNAME="imp2gbs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\imp2gbs.cpp" FORMNAME="" UNITNAME="imp2gbs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/imp2ld.bpf b/utilities/bcpp6make/imp2ld.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/imp2ld.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/imp2ld.bpr b/utilities/bcpp6make/imp2ld.bpr
new file mode 100644
index 0000000..9d52d2f
--- /dev/null
+++ b/utilities/bcpp6make/imp2ld.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\imp2ld.exe"/>

+    <OBJFILES value="obj\imp2ld.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="imp2ld.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="imp2ld.bpf" FORMNAME="" UNITNAME="imp2ld" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\imp2ld.cpp" FORMNAME="" UNITNAME="imp2ld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/imp2vs.bpf b/utilities/bcpp6make/imp2vs.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/imp2vs.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/imp2vs.bpr b/utilities/bcpp6make/imp2vs.bpr
new file mode 100644
index 0000000..78f3dd8
--- /dev/null
+++ b/utilities/bcpp6make/imp2vs.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\imp2vs.exe"/>

+    <OBJFILES value="obj\imp2vs.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="imp2vs.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="imp2vs.bpf" FORMNAME="" UNITNAME="imp2vs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\imp2vs.cpp" FORMNAME="" UNITNAME="imp2vs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/mkfastmod.bpf b/utilities/bcpp6make/mkfastmod.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/mkfastmod.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/mkfastmod.bpr b/utilities/bcpp6make/mkfastmod.bpr
new file mode 100644
index 0000000..f91620b
--- /dev/null
+++ b/utilities/bcpp6make/mkfastmod.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\mkfastmod.exe"/>

+    <OBJFILES value="obj\mkfastmod.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="mkfastmod.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="mkfastmod.bpf" FORMNAME="" UNITNAME="mkfastmod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\mkfastmod.cpp" FORMNAME="" UNITNAME="mkfastmod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2imp.bpf b/utilities/bcpp6make/mod2imp.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/mod2imp.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2imp.bpr b/utilities/bcpp6make/mod2imp.bpr
new file mode 100644
index 0000000..f5a9f9c
--- /dev/null
+++ b/utilities/bcpp6make/mod2imp.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\mod2imp.exe"/>

+    <OBJFILES value="obj\mod2imp.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="mod2imp.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="mod2imp.bpf" FORMNAME="" UNITNAME="mod2imp" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\mod2imp.cpp" FORMNAME="" UNITNAME="mod2imp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2osis.bpf b/utilities/bcpp6make/mod2osis.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/mod2osis.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2osis.bpr b/utilities/bcpp6make/mod2osis.bpr
new file mode 100644
index 0000000..9755a8d
--- /dev/null
+++ b/utilities/bcpp6make/mod2osis.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\mod2osis.exe"/>

+    <OBJFILES value="obj\mod2osis.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="mod2osis.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="mod2osis.bpf" FORMNAME="" UNITNAME="mod2osis" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\mod2osis.cpp" FORMNAME="" UNITNAME="mod2osis" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=WHAC

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2vpl.bpf b/utilities/bcpp6make/mod2vpl.bpf
new file mode 100644
index 0000000..5da8824
--- /dev/null
+++ b/utilities/bcpp6make/mod2vpl.bpf
@@ -0,0 +1,3 @@
+This file is used by the project manager only and should be treated like the project file

+
+
main 
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2vpl.bpr b/utilities/bcpp6make/mod2vpl.bpr
new file mode 100644
index 0000000..90ca034
--- /dev/null
+++ b/utilities/bcpp6make/mod2vpl.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\mod2vpl.exe"/>

+    <OBJFILES value="obj\mod2vpl.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="mod2vpl.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="mod2vpl.bpf" FORMNAME="" UNITNAME="mod2vpl" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\mod2vpl.cpp" FORMNAME="" UNITNAME="mod2vpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2zmod.bpf b/utilities/bcpp6make/mod2zmod.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/mod2zmod.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/mod2zmod.bpr b/utilities/bcpp6make/mod2zmod.bpr
new file mode 100644
index 0000000..867e102
--- /dev/null
+++ b/utilities/bcpp6make/mod2zmod.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\mod2zmod.exe"/>

+    <OBJFILES value="obj\mod2zmod.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="mod2zmod.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="mod2zmod.bpf" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\mod2zmod.cpp" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/obj/dummy b/utilities/bcpp6make/obj/dummy
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/utilities/bcpp6make/obj/dummy
diff --git a/utilities/bcpp6make/osis2mod.bpf b/utilities/bcpp6make/osis2mod.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/osis2mod.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/osis2mod.bpr b/utilities/bcpp6make/osis2mod.bpr
new file mode 100644
index 0000000..2ba8c78
--- /dev/null
+++ b/utilities/bcpp6make/osis2mod.bpr
@@ -0,0 +1,146 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\osis2mod.exe"/>

+    <OBJFILES value="obj\osis2mod.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="osis2mod.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="osis2mod.bpf" FORMNAME="" UNITNAME="osis2mod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\osis2mod.cpp" FORMNAME="" UNITNAME="osis2mod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=3

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0

+Item2=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=WHAC

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/stage/dummy b/utilities/bcpp6make/stage/dummy
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/utilities/bcpp6make/stage/dummy
diff --git a/utilities/bcpp6make/step2vpl.bpf b/utilities/bcpp6make/step2vpl.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/step2vpl.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/step2vpl.bpr b/utilities/bcpp6make/step2vpl.bpr
new file mode 100644
index 0000000..f29d65e
--- /dev/null
+++ b/utilities/bcpp6make/step2vpl.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\step2vpl.exe"/>

+    <OBJFILES value="obj\step2vpl.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="step2vpl.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="step2vpl.bpf" FORMNAME="" UNITNAME="step2vpl" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\step2vpl.cpp" FORMNAME="" UNITNAME="step2vpl" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/stepdump.bpf b/utilities/bcpp6make/stepdump.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/stepdump.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/stepdump.bpr b/utilities/bcpp6make/stepdump.bpr
new file mode 100644
index 0000000..b3db81c
--- /dev/null
+++ b/utilities/bcpp6make/stepdump.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\stepdump.exe"/>

+    <OBJFILES value="obj\stepdump.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="stepdump.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="stepdump.bpf" FORMNAME="" UNITNAME="stepdump" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\stepdump.cpp" FORMNAME="" UNITNAME="stepdump" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/utils.bpg b/utilities/bcpp6make/utils.bpg
new file mode 100644
index 0000000..258f6bb
--- /dev/null
+++ b/utilities/bcpp6make/utils.bpg
@@ -0,0 +1,89 @@
+#------------------------------------------------------------------------------

+VERSION = BWS.01

+#------------------------------------------------------------------------------

+!ifndef ROOT

+ROOT = $(MAKEDIR)\..

+!endif

+#------------------------------------------------------------------------------

+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**

+DCC = $(ROOT)\bin\dcc32.exe $**

+BRCC = $(ROOT)\bin\brcc32.exe $**

+#------------------------------------------------------------------------------

+PROJECTS = icuinbcb6.lib icuucbcb6.lib libsword6icu.lib cipherraw.exe imp2gbs.exe imp2ld.exe imp2vs.exe mkfastmod.exe mod2imp.exe mod2osis.exe mod2vpl.exe mod2zmod.exe osis2mod.exe step2vpl.exe stepdump.exe vpl2mod.exe vs2osisref.exe xml2gbs.exe

+#------------------------------------------------------------------------------

+default: $(PROJECTS)

+#------------------------------------------------------------------------------

+

+cipherraw.exe: cipherraw.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+imp2gbs.exe: imp2gbs.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+imp2ld.exe: imp2ld.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+imp2vs.exe: imp2vs.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+mkfastmod.exe: mkfastmod.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+mod2imp.exe: mod2imp.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+mod2osis.exe: mod2osis.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+mod2vpl.exe: mod2vpl.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+mod2zmod.exe: mod2zmod.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+osis2mod.exe: osis2mod.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+step2vpl.exe: step2vpl.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+stepdump.exe: stepdump.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+vpl2mod.exe: vpl2mod.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+vs2osisref.exe: vs2osisref.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+xml2gbs.exe: xml2gbs.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+libsword6icu.lib: ..\..\..\sword\lib\bcppmake\libsword6icu.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+icuinbcb6.lib: ..\..\..\icu-sword\as_is\borland\icuinbcb6.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+icuucbcb6.lib: ..\..\..\icu-sword\as_is\borland\icuucbcb6.bpr

+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**

+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak

+

+

diff --git a/utilities/bcpp6make/vpl2mod.bpf b/utilities/bcpp6make/vpl2mod.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/vpl2mod.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/vpl2mod.bpr b/utilities/bcpp6make/vpl2mod.bpr
new file mode 100644
index 0000000..2c135d6
--- /dev/null
+++ b/utilities/bcpp6make/vpl2mod.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\vpl2mod.exe"/>

+    <OBJFILES value="obj\vpl2mod.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="vpl2mod.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="vpl2mod.bpf" FORMNAME="" UNITNAME="vpl2mod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\vpl2mod.cpp" FORMNAME="" UNITNAME="vpl2mod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/vs2osisref.bpf b/utilities/bcpp6make/vs2osisref.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/vs2osisref.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/vs2osisref.bpr b/utilities/bcpp6make/vs2osisref.bpr
new file mode 100644
index 0000000..c2d8334
--- /dev/null
+++ b/utilities/bcpp6make/vs2osisref.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\vs2osisref.exe"/>

+    <OBJFILES value="obj\vs2osisref.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="vs2osisref.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="vs2osisref.bpf" FORMNAME="" UNITNAME="vs2osisref" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\vs2osisref.cpp" FORMNAME="" UNITNAME="vs2osisref" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcpp6make/xml2gbs.bpf b/utilities/bcpp6make/xml2gbs.bpf
new file mode 100644
index 0000000..4c1e949
--- /dev/null
+++ b/utilities/bcpp6make/xml2gbs.bpf
@@ -0,0 +1,6 @@
+

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcpp6make/xml2gbs.bpr b/utilities/bcpp6make/xml2gbs.bpr
new file mode 100644
index 0000000..a15c843
--- /dev/null
+++ b/utilities/bcpp6make/xml2gbs.bpr
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.06.00"/>

+    <PROJECT value="stage\xml2gbs.exe"/>

+    <OBJFILES value="obj\xml2gbs.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuucbcb6.lib ..\..\lib\libsword6icu.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="rtl.bpi vcl.bpi vclx.bpi bcbsmp.bpi qrpt.bpi dbrtl.bpi vcldb.bpi 

+      bdertl.bpi ibsmp.bpi vcldbx.bpi teeui.bpi teedb.bpi tee.bpi teeqr.bpi 

+      ibxpress.bpi bcbie.bpi vclie.bpi inetdb.bpi inet.bpi nmfast.bpi dclocx.bpi 

+      bcb2kaxserver.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="ilink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="xml2gbs.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+    <OTHERFILES value=""/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>

+    <CFLAG1 value="-Od -H=c:\PROGRA~1\borland\CBUILD~1\lib\vcl60.csm -Vx -Ve -X- -r- -a8 -b- 

+      -k -y -v -vi- -c -tW -tWM"/>

+    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -$A8 -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-Iobj -D&quot;&quot; -ap -Tpe -GD -x -Gn -M -v /P512"/>

+    <OTHERFILES value=""/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+    <OTHERFILES value=""/>

+  </LINKER>

+  <FILELIST>

+      <FILE FILENAME="xml2gbs.bpf" FORMNAME="" UNITNAME="xml2gbs" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\xml2gbs.cpp" FORMNAME="" UNITNAME="xml2gbs" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuinbcb6.lib" FORMNAME="" UNITNAME="icuin" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" FORMNAME="" UNITNAME="icudatab" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuucbcb6.lib" FORMNAME="" UNITNAME="icuuc" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+      <FILE FILENAME="..\..\lib\libsword6icu.lib" FORMNAME="" UNITNAME="libsword" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>

+  </FILELIST>

+  <BUILDTOOLS>

+  </BUILDTOOLS>

+

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;_USE_OLD_RW_STL;U_HAVE_PLACEMENT_NEW=0;_DEBUG

+Item1=_DEBUG

+

+[HistoryLists\hlIntOutputDir]

+Count=2

+Item0=obj

+Item1=obj\

+

+[HistoryLists\hlFinalOutputDir]

+Count=1

+Item0=stage\

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=test test.osis.xml 0

+Launcher=

+UseLauncher=0

+DebugCWD=

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteLauncher=

+RemoteCWD=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/Makefile.am b/utilities/bcppmake/Makefile.am
new file mode 100644
index 0000000..91c34d4
--- /dev/null
+++ b/utilities/bcppmake/Makefile.am
@@ -0,0 +1,37 @@
+swbcppmakedir = $(top_srcdir)/utilities/bcppmake
+
+EXTRA_DIST += $(swbcppmakedir)/imp2ld.bpf
+EXTRA_DIST += $(swbcppmakedir)/mod2imp.bpf
+EXTRA_DIST += $(swbcppmakedir)/osis2mod.bpf
+EXTRA_DIST += $(swbcppmakedir)/utilities.bpg
+EXTRA_DIST += $(swbcppmakedir)/imp2ld.bpr
+EXTRA_DIST += $(swbcppmakedir)/mod2imp.bpr
+EXTRA_DIST += $(swbcppmakedir)/osis2mod.bpr
+EXTRA_DIST += $(swbcppmakedir)/vpl2mod.bpf
+EXTRA_DIST += $(swbcppmakedir)/cipherraw.bpf
+EXTRA_DIST += $(swbcppmakedir)/imp2vs.bpf
+EXTRA_DIST += $(swbcppmakedir)/mod2osis.bpf
+EXTRA_DIST += $(swbcppmakedir)/step2vpl.bpf
+EXTRA_DIST += $(swbcppmakedir)/vpl2mod.bpr
+EXTRA_DIST += $(swbcppmakedir)/cipherraw.bpr
+EXTRA_DIST += $(swbcppmakedir)/imp2vs.bpr
+EXTRA_DIST += $(swbcppmakedir)/mod2osis.bpr
+EXTRA_DIST += $(swbcppmakedir)/step2vpl.bpr
+EXTRA_DIST += $(swbcppmakedir)/vs2osisref.bpf
+EXTRA_DIST += $(swbcppmakedir)/diatheke.bpf
+EXTRA_DIST += $(swbcppmakedir)/libsword.bpf
+EXTRA_DIST += $(swbcppmakedir)/mod2vpl.bpf
+EXTRA_DIST += $(swbcppmakedir)/stepdump.bpf
+EXTRA_DIST += $(swbcppmakedir)/vs2osisref.bpr
+EXTRA_DIST += $(swbcppmakedir)/diatheke.bpr
+EXTRA_DIST += $(swbcppmakedir)/libsword.bpr
+EXTRA_DIST += $(swbcppmakedir)/mod2vpl.bpr  
+EXTRA_DIST += $(swbcppmakedir)/stepdump.bpr
+EXTRA_DIST += $(swbcppmakedir)/xml2gbs.bpf
+EXTRA_DIST += $(swbcppmakedir)/imp2gbs.bpf
+EXTRA_DIST += $(swbcppmakedir)/mkfastmod.bpf
+EXTRA_DIST += $(swbcppmakedir)/mod2zmod.bpf
+EXTRA_DIST += $(swbcppmakedir)/xml2gbs.bpr
+EXTRA_DIST += $(swbcppmakedir)/imp2gbs.bpr
+EXTRA_DIST += $(swbcppmakedir)/mkfastmod.bpr
+EXTRA_DIST += $(swbcppmakedir)/mod2zmod.bpr
diff --git a/utilities/bcppmake/addgb.bpf b/utilities/bcppmake/addgb.bpf
new file mode 100644
index 0000000..ef1bf22
--- /dev/null
+++ b/utilities/bcppmake/addgb.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\addgb.cpp");

+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\lib\libsword.lib");

+USELIB("..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcppmake/addgb.bpr b/utilities/bcppmake/addgb.bpr
new file mode 100644
index 0000000..6a6900d
--- /dev/null
+++ b/utilities/bcppmake/addgb.bpr
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="addgb.exe"/>

+    <OBJFILES value="..\addgb.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 

+      ..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="addgb.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=5

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n

+Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING

+Item1=_DEBUG

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+LinkCGLIB=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/addld.bpf b/utilities/bcppmake/addld.bpf
new file mode 100644
index 0000000..229b854
--- /dev/null
+++ b/utilities/bcppmake/addld.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\addld.cpp");

+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\lib\libsword.lib");

+USELIB("..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcppmake/addld.bpr b/utilities/bcppmake/addld.bpr
new file mode 100644
index 0000000..802a76b
--- /dev/null
+++ b/utilities/bcppmake/addld.bpr
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="addld.exe"/>

+    <OBJFILES value="..\addld.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 

+      ..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="addld.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=5

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n

+Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING

+Item1=_DEBUG

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+LinkCGLIB=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/addvs.bpf b/utilities/bcppmake/addvs.bpf
new file mode 100644
index 0000000..f104965
--- /dev/null
+++ b/utilities/bcppmake/addvs.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\addvs.cpp");

+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\lib\libsword.lib");

+USELIB("..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcppmake/addvs.bpr b/utilities/bcppmake/addvs.bpr
new file mode 100644
index 0000000..9b65752
--- /dev/null
+++ b/utilities/bcppmake/addvs.bpr
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="addvs.exe"/>

+    <OBJFILES value="..\addvs.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 

+      ..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="addvs.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -I..\..\..\icu-sword\source\common -I..\..\..\icu-sword\source\i18n 

+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 

+      -DUSELUCENE -D_CL_DISABLE_MULTITHREADING -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=5

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n

+Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING

+Item1=_DEBUG

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+LinkCGLIB=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/cipherraw.bdsproj b/utilities/bcppmake/cipherraw.bdsproj
new file mode 100644
index 0000000..b36d5e5
--- /dev/null
+++ b/utilities/bcppmake/cipherraw.bdsproj
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{8B701034-E9E3-4B73-9D88-2DC067DF3B34}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="cipherraw.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="cipherraw.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="cipherraw" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\cipherraw.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="cipherraw" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">cipherraw.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/cipherraw.bpf b/utilities/bcppmake/cipherraw.bpf
new file mode 100644
index 0000000..5d0b116
--- /dev/null
+++ b/utilities/bcppmake/cipherraw.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\cipherraw.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/cipherraw.bpr b/utilities/bcppmake/cipherraw.bpr
new file mode 100644
index 0000000..6a089de
--- /dev/null
+++ b/utilities/bcppmake/cipherraw.bpr
@@ -0,0 +1,124 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="cipherraw.exe"/>
+    <OBJFILES value="..\cipherraw.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="cipherraw.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -Sc:0x20000 -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=3
+Item0=_ICU_;_ICUSWORD_;USBINARY
+Item1=_ICU_;_ICUSWORD_
+Item2=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/diatheke.bdsproj b/utilities/bcppmake/diatheke.bdsproj
new file mode 100644
index 0000000..18546e6
--- /dev/null
+++ b/utilities/bcppmake/diatheke.bdsproj
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+	<PersonalityInfo>

+		<Option>

+			<Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+			<Option Name="ProjectType">CppConsoleApplication</Option>

+			<Option Name="Version">1.0</Option>

+			<Option Name="GUID">{06777FCC-BCA9-468B-9054-72709495FE83}</Option>

+		</Option>

+	</PersonalityInfo>

+	<CPlusPlusBuilder.Personality>

+		<BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="dontverifylibs" value="0"/>

+        <property category="build.node" name="name" value="diatheke.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="1"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="WIN32"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\diatheke\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.3" value="_RTLDLL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.4" value="USEPACKAGES"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\diatheke\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\diatheke\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\diatheke\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_DEBUG"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mti.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.2" value="$(PACKAGES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\diatheke"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\diatheke\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="diatheke.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="diatheke" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\diatheke\diatheke.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diatheke" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\diatheke\thmlcgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="thmlcgi" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\diatheke\corediatheke.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="corediatheke" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\diatheke\diafiltmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diafiltmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\diatheke\diathekemgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="diathekemgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\diatheke\gbfcgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="gbfcgi" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\diatheke\osiscgi.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osiscgi" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..\diatheke;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">2</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..\diatheke;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+		<Source>

+			<Source Name="MainSource">diatheke.bpf</Source>

+		</Source>  <buildevents/>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/diatheke.bpf b/utilities/bcppmake/diatheke.bpf
new file mode 100644
index 0000000..c17d73c
--- /dev/null
+++ b/utilities/bcppmake/diatheke.bpf
@@ -0,0 +1,17 @@
+USEUNIT("..\diatheke\diatheke.cpp");
+USEUNIT("..\diatheke\thmlcgi.cpp");
+USEUNIT("..\diatheke\corediatheke.cpp");
+USEUNIT("..\diatheke\diafiltmgr.cpp");
+USEUNIT("..\diatheke\diathekemgr.cpp");
+USEUNIT("..\diatheke\gbfcgi.cpp");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USEUNIT("..\diatheke\osiscgi.cpp");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/diatheke.bpr b/utilities/bcppmake/diatheke.bpr
new file mode 100644
index 0000000..5d3e4a6
--- /dev/null
+++ b/utilities/bcppmake/diatheke.bpr
@@ -0,0 +1,121 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="diatheke.exe"/>
+    <OBJFILES value="..\diatheke\diatheke.obj ..\diatheke\thmlcgi.obj 
+      ..\diatheke\corediatheke.obj ..\diatheke\diafiltmgr.obj 
+      ..\diatheke\diathekemgr.obj ..\diatheke\gbfcgi.obj ..\diatheke\osiscgi.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;..\diatheke"/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value=""/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
+    <MAINSOURCE value="diatheke.bpf"/>
+    <INCLUDEPATH value="..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\include\internal\regex"/>
+    <LIBPATH value="..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\diatheke -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\include 
+      -src_suffix cpp -D_DEBUG -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(PACKAGES) $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mti.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\include\internal\regex
+Item1=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include
+Item2=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\
+Item3=..\diatheke;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=2
+Item0=..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\diatheke;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/imp2gbs.bdsproj b/utilities/bcppmake/imp2gbs.bdsproj
new file mode 100644
index 0000000..0db98c5
--- /dev/null
+++ b/utilities/bcppmake/imp2gbs.bdsproj
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+	<PersonalityInfo>

+		<Option>

+			<Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+			<Option Name="ProjectType">CppConsoleApplication</Option>

+			<Option Name="Version">1.0</Option>

+			<Option Name="GUID">{C753C90F-6763-4737-A085-8679D216A2FC}</Option>

+		</Option>

+	</PersonalityInfo>

+	<CPlusPlusBuilder.Personality>

+		<BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="imp2gbs.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="..\..\..\icu-sword\source\i18n"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.8" value="..\..\..\icu-sword\source\common"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="imp2gbs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2gbs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\imp2gbs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2gbs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+		<Source>

+			<Source Name="MainSource">imp2gbs.bpf</Source>

+		</Source>  <buildevents/>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/imp2gbs.bpf b/utilities/bcppmake/imp2gbs.bpf
new file mode 100644
index 0000000..9bd2a3f
--- /dev/null
+++ b/utilities/bcppmake/imp2gbs.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\imp2gbs.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/imp2gbs.bpr b/utilities/bcppmake/imp2gbs.bpr
new file mode 100644
index 0000000..089b6ad
--- /dev/null
+++ b/utilities/bcppmake/imp2gbs.bpr
@@ -0,0 +1,130 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="imp2gbs.exe"/>
+    <OBJFILES value="..\imp2gbs.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="imp2gbs.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\icu-sword\source\common"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -I..\..\..\icu-sword\source\i18n -I..\..\..\icu-sword\source\common 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -Sc:0x20000 -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=5
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\icu-sword\source\common
+Item1=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item4=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/imp2ld.bdsproj b/utilities/bcppmake/imp2ld.bdsproj
new file mode 100644
index 0000000..b02285d
--- /dev/null
+++ b/utilities/bcppmake/imp2ld.bdsproj
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{C9D9EA10-ED0F-4164-95BF-276685D5FEFC}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="imp2ld.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="imp2ld.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2ld" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\imp2ld.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2ld" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">imp2ld.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/imp2ld.bpf b/utilities/bcppmake/imp2ld.bpf
new file mode 100644
index 0000000..e983517
--- /dev/null
+++ b/utilities/bcppmake/imp2ld.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\imp2ld.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/imp2ld.bpr b/utilities/bcppmake/imp2ld.bpr
new file mode 100644
index 0000000..6703191
--- /dev/null
+++ b/utilities/bcppmake/imp2ld.bpr
@@ -0,0 +1,128 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="imp2ld.exe"/>
+    <OBJFILES value="..\imp2ld.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="imp2ld.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/imp2vs.bdsproj b/utilities/bcppmake/imp2vs.bdsproj
new file mode 100644
index 0000000..5eddfb1
--- /dev/null
+++ b/utilities/bcppmake/imp2vs.bdsproj
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{D58B7A37-F286-4252-A3EC-736F261D9021}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="imp2vs.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="imp2vs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="imp2vs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\imp2vs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="imp2vs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">imp2vs.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/imp2vs.bpf b/utilities/bcppmake/imp2vs.bpf
new file mode 100644
index 0000000..d6b81dc
--- /dev/null
+++ b/utilities/bcppmake/imp2vs.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\imp2vs.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/imp2vs.bpr b/utilities/bcppmake/imp2vs.bpr
new file mode 100644
index 0000000..8c4b229
--- /dev/null
+++ b/utilities/bcppmake/imp2vs.bpr
@@ -0,0 +1,128 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="imp2vs.exe"/>
+    <OBJFILES value="..\imp2vs.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="imp2vs.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/installmgr.bdsproj b/utilities/bcppmake/installmgr.bdsproj
new file mode 100644
index 0000000..ef5de9b
--- /dev/null
+++ b/utilities/bcppmake/installmgr.bdsproj
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+	<PersonalityInfo>

+		<Option>

+			<Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+			<Option Name="ProjectType">CppConsoleApplication</Option>

+			<Option Name="Version">1.0</Option>

+			<Option Name="GUID">{1C014927-4D74-41D5-B034-1C5F85DBE9BE}</Option>

+		</Option>

+	</PersonalityInfo>

+	<CPlusPlusBuilder.Personality>

+		<BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="installmgr.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+        <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="UNICODE"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.4" value="USBINARY"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.5" value="U_HAVE_PLACEMENT_NEW=0"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.6" value="USELUCENE"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.7" value="_WIN32"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.8" value="_CL_DISABLE_MULTITHREADING"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.7" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.7" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.7" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.6" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\..\src\mgr"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.7" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="installmgr.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\installmgr.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="installmgr" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\apps\InstallMgr\libcurl.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libcurl" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">RWP ./ 3 2 abc</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+		<Source>

+			<Source Name="MainSource">installmgr.bpf</Source>

+		</Source>  <buildevents/>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/installmgr.bpf b/utilities/bcppmake/installmgr.bpf
new file mode 100644
index 0000000..b9a4c05
--- /dev/null
+++ b/utilities/bcppmake/installmgr.bpf
@@ -0,0 +1,12 @@
+USEUNIT("..\installmgr.cpp");

+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\lib\libsword.lib");

+USELIB("..\..\..\biblecs\clucene\clucene.lib");

+USELIB("..\..\..\biblecs\apps\InstallMgr\libcurl.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcppmake/installmgr.bpr b/utilities/bcppmake/installmgr.bpr
new file mode 100644
index 0000000..a4fa19e
--- /dev/null
+++ b/utilities/bcppmake/installmgr.bpr
@@ -0,0 +1,124 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="installmgr.exe"/>

+    <OBJFILES value="..\installmgr.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 

+      ..\..\..\biblecs\clucene\clucene.lib 

+      ..\..\..\biblecs\apps\InstallMgr\libcurl.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="installmgr.bpf"/>

+    <INCLUDEPATH value="..\..\src\mgr;..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\..\src\mgr;..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\..\src\mgr -I..\. -I.. -I..\..\include -I$(BCB)\include 

+      -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=2

+Item0=_ICU_;_ICUSWORD_

+Item1=_DEBUG

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=RWP ./ 3 2 abc

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+LinkCGLIB=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/libsword.bpf b/utilities/bcppmake/libsword.bpf
new file mode 100644
index 0000000..5d88df9
--- /dev/null
+++ b/utilities/bcppmake/libsword.bpf
@@ -0,0 +1,119 @@
+//---------------------------------------------------------------------------
+
+#include <vcl.h>
+#pragma hdrstop
+USEUNIT("..\..\src\keys\versekey.cpp");
+USEUNIT("..\..\src\keys\strkey.cpp");
+USEUNIT("..\..\src\keys\swkey.cpp");
+USEUNIT("..\..\src\keys\listkey.cpp");
+USEUNIT("..\..\src\mgr\swmgr.cpp");
+USEUNIT("..\..\src\mgr\localemgr.cpp");
+USEUNIT("..\..\src\mgr\swconfig.cpp");
+USEUNIT("..\..\src\mgr\swlocale.cpp");
+USEUNIT("..\..\src\mgr\filemgr.cpp");
+USEUNIT("..\..\src\utilfuns\utilstr.cpp");
+USEUNIT("..\..\src\utilfuns\utilconf.cpp");
+USEUNIT("..\..\src\utilfuns\Greek2Greek.cpp");
+USEUNIT("..\..\src\frontend\swlog.cpp");
+USEUNIT("..\..\src\frontend\swdisp.cpp");
+USEUNIT("..\..\src\modules\swmodule.cpp");
+USEUNIT("..\..\src\modules\comments\swcom.cpp");
+USEUNIT("..\..\src\modules\comments\hrefcom\hrefcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawcom\rawcom.cpp");
+USEUNIT("..\..\src\modules\comments\rawfiles\rawfiles.cpp");
+USEUNIT("..\..\src\modules\common\lzsscomprs.cpp");
+USEUNIT("..\..\src\modules\common\rawstr.cpp");
+USEUNIT("..\..\src\modules\common\rawverse.cpp");
+USEUNIT("..\..\src\modules\common\sapphire.cpp");
+USEUNIT("..\..\src\modules\common\swcipher.cpp");
+USEUNIT("..\..\src\modules\common\swcomprs.cpp");
+USEUNIT("..\..\src\modules\filters\thmlrtf.cpp");
+USEUNIT("..\..\src\modules\filters\gbffootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\gbfplain.cpp");
+USEUNIT("..\..\src\modules\filters\gbfrtf.cpp");
+USEUNIT("..\..\src\modules\filters\gbfstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\gbfthml.cpp");
+USEUNIT("..\..\src\modules\filters\plainfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\plainhtml.cpp");
+USEUNIT("..\..\src\modules\filters\rtfhtml.cpp");
+USEUNIT("..\..\src\modules\filters\rwphtml.cpp");
+USEUNIT("..\..\src\modules\filters\rwprtf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlgbf.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtml.cpp");
+USEUNIT("..\..\src\modules\filters\thmlplain.cpp");
+USEUNIT("..\..\src\modules\filters\cipherfil.cpp");
+USEUNIT("..\..\src\modules\lexdict\swld.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld\rawld.cpp");
+USEUNIT("..\..\src\modules\texts\swtext.cpp");
+USEUNIT("..\..\src\modules\texts\rawtext\rawtext.cpp");
+USEUNIT("..\..\src\modules\texts\ztext\ztext.cpp");
+USEUNIT("..\..\src\modules\common\zverse.cpp");
+USEUNIT("..\..\src\keys\treekey.cpp");
+USEUNIT("..\..\src\keys\treekeyidx.cpp");
+USEUNIT("..\..\src\modules\common\rawstr4.cpp");
+USEUNIT("..\..\src\modules\common\zstr.cpp");
+USEUNIT("..\..\src\modules\genbook\swgenbook.cpp");
+USEUNIT("..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp");
+USEUNIT("..\..\src\mgr\swfiltermgr.cpp");
+USEUNIT("..\..\src\modules\filters\utf8utf16.cpp");
+USEUNIT("..\..\src\modules\filters\gbfheadings.cpp");
+USEUNIT("..\..\src\modules\filters\gbfhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\gbfmorph.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf16.cpp");
+USEUNIT("..\..\src\modules\filters\latin1utf8.cpp");
+USEUNIT("..\..\src\modules\filters\scsuutf8.cpp");
+USEUNIT("..\..\src\modules\filters\swbasicfilter.cpp");
+USEUNIT("..\..\src\modules\filters\thmlfootnotes.cpp");
+USEUNIT("..\..\src\modules\filters\thmlheadings.cpp");
+USEUNIT("..\..\src\modules\filters\thmlhtmlhref.cpp");
+USEUNIT("..\..\src\modules\filters\thmllemma.cpp");
+USEUNIT("..\..\src\modules\filters\thmlmorph.cpp");
+USEUNIT("..\..\src\modules\filters\thmlscripref.cpp");
+USEUNIT("..\..\src\modules\filters\thmlstrongs.cpp");
+USEUNIT("..\..\src\modules\filters\thmlvariants.cpp");
+USEUNIT("..\..\src\modules\filters\unicodertf.cpp");
+USEUNIT("..\..\src\modules\filters\utf16utf8.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arshaping.cpp");
+USEUNIT("..\..\src\modules\filters\utf8bidireorder.cpp");
+USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
+USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
+USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8arabicpoints.cpp");
+USEUNIT("..\..\src\modules\filters\utf8html.cpp");
+USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
+USEUNIT("..\..\src\modules\filters\utf8nfkd.cpp");
+USEUNIT("..\..\src\modules\filters\utf8transliterator.cpp");
+USEUNIT("..\..\src\modules\comments\zcom\zcom.cpp");
+USEUNIT("..\..\src\modules\lexdict\rawld4\rawld4.cpp");
+USEUNIT("..\..\src\modules\common\zipcomprs.cpp");
+USEUNIT("..\..\src\modules\lexdict\zld\zld.cpp");
+USEUNIT("..\..\src\modules\common\entriesblk.cpp");
+USEUNIT("..\..\src\utilfuns\zlib\zutil.c");
+USEUNIT("..\..\src\utilfuns\zlib\compress.c");
+USEUNIT("..\..\src\utilfuns\zlib\crc32.c");
+USEUNIT("..\..\src\utilfuns\zlib\deflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\gzio.c");
+USEUNIT("..\..\src\utilfuns\zlib\infblock.c");
+USEUNIT("..\..\src\utilfuns\zlib\infcodes.c");
+USEUNIT("..\..\src\utilfuns\zlib\inffast.c");
+USEUNIT("..\..\src\utilfuns\zlib\inflate.c");
+USEUNIT("..\..\src\utilfuns\zlib\inftrees.c");
+USEUNIT("..\..\src\utilfuns\zlib\infutil.c");
+USEUNIT("..\..\src\utilfuns\zlib\trees.c");
+USEUNIT("..\..\src\utilfuns\zlib\uncompr.c");
+USEUNIT("..\..\src\utilfuns\zlib\untgz.c");
+USEUNIT("..\..\src\utilfuns\zlib\adler32.c");
+USEUNIT("..\..\src\modules\filters\greeklexattribs.cpp");
+USEUNIT("..\..\src\mgr\swcacher.cpp");
+USEUNIT("..\..\src\modules\filters\gbfosis.cpp");
+USEUNIT("..\..\src\modules\filters\thmlosis.cpp");
+USEUNIT("..\..\src\mgr\encfiltmgr.cpp");
+USEUNIT("..\..\src\mgr\markupfiltmgr.cpp");
+USEUNIT("..\..\src\utilfuns\roman.cpp");
+//---------------------------------------------------------------------------
+#define Library
+
+// To add a file to the library use the Project menu 'Add to Project'.
+
diff --git a/utilities/bcppmake/libsword.bpr b/utilities/bcppmake/libsword.bpr
new file mode 100644
index 0000000..ef0b094
--- /dev/null
+++ b/utilities/bcppmake/libsword.bpr
@@ -0,0 +1,205 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="libsword.lib"/>
+    <OBJFILES value="..\..\src\keys\versekey.obj ..\..\src\keys\strkey.obj 
+      ..\..\src\keys\swkey.obj ..\..\src\keys\listkey.obj 
+      ..\..\src\mgr\swmgr.obj ..\..\src\mgr\localemgr.obj 
+      ..\..\src\mgr\swconfig.obj ..\..\src\mgr\swlocale.obj 
+      ..\..\src\mgr\filemgr.obj ..\..\src\utilfuns\utilstr.obj 
+      ..\..\src\utilfuns\utilconf.obj ..\..\src\utilfuns\Greek2Greek.obj 
+      ..\..\src\frontend\swlog.obj ..\..\src\frontend\swdisp.obj 
+      ..\..\src\modules\swmodule.obj ..\..\src\modules\comments\swcom.obj 
+      ..\..\src\modules\comments\hrefcom\hrefcom.obj 
+      ..\..\src\modules\comments\rawcom\rawcom.obj 
+      ..\..\src\modules\comments\rawfiles\rawfiles.obj 
+      ..\..\src\modules\common\lzsscomprs.obj 
+      ..\..\src\modules\common\rawstr.obj ..\..\src\modules\common\rawverse.obj 
+      ..\..\src\modules\common\sapphire.obj 
+      ..\..\src\modules\common\swcipher.obj ..\..\src\modules\common\swcomprs.obj 
+      ..\..\src\modules\filters\thmlrtf.obj 
+      ..\..\src\modules\filters\gbffootnotes.obj 
+      ..\..\src\modules\filters\gbfhtml.obj 
+      ..\..\src\modules\filters\gbfplain.obj 
+      ..\..\src\modules\filters\gbfrtf.obj ..\..\src\modules\filters\gbfstrongs.obj 
+      ..\..\src\modules\filters\gbfthml.obj 
+      ..\..\src\modules\filters\plainfootnotes.obj 
+      ..\..\src\modules\filters\plainhtml.obj 
+      ..\..\src\modules\filters\rtfhtml.obj 
+      ..\..\src\modules\filters\rwphtml.obj ..\..\src\modules\filters\rwprtf.obj 
+      ..\..\src\modules\filters\thmlgbf.obj 
+      ..\..\src\modules\filters\thmlhtml.obj 
+      ..\..\src\modules\filters\thmlplain.obj 
+      ..\..\src\modules\filters\cipherfil.obj ..\..\src\modules\lexdict\swld.obj 
+      ..\..\src\modules\lexdict\rawld\rawld.obj 
+      ..\..\src\modules\texts\swtext.obj 
+      ..\..\src\modules\texts\rawtext\rawtext.obj 
+      ..\..\src\modules\texts\ztext\ztext.obj 
+      ..\..\src\modules\common\zverse.obj ..\..\src\keys\treekey.obj 
+      ..\..\src\keys\treekeyidx.obj ..\..\src\modules\common\rawstr4.obj 
+      ..\..\src\modules\common\zstr.obj ..\..\src\modules\genbook\swgenbook.obj 
+      ..\..\src\modules\genbook\rawgenbook\rawgenbook.obj 
+      ..\..\src\mgr\swfiltermgr.obj ..\..\src\modules\filters\utf8utf16.obj 
+      ..\..\src\modules\filters\gbfheadings.obj 
+      ..\..\src\modules\filters\gbfhtmlhref.obj 
+      ..\..\src\modules\filters\gbfmorph.obj 
+      ..\..\src\modules\filters\latin1utf16.obj 
+      ..\..\src\modules\filters\latin1utf8.obj 
+      ..\..\src\modules\filters\scsuutf8.obj 
+      ..\..\src\modules\filters\swbasicfilter.obj 
+      ..\..\src\modules\filters\thmlfootnotes.obj 
+      ..\..\src\modules\filters\thmlheadings.obj 
+      ..\..\src\modules\filters\thmlhtmlhref.obj 
+      ..\..\src\modules\filters\thmllemma.obj 
+      ..\..\src\modules\filters\thmlmorph.obj 
+      ..\..\src\modules\filters\thmlscripref.obj 
+      ..\..\src\modules\filters\thmlstrongs.obj 
+      ..\..\src\modules\filters\thmlvariants.obj 
+      ..\..\src\modules\filters\unicodertf.obj 
+      ..\..\src\modules\filters\utf16utf8.obj 
+      ..\..\src\modules\filters\utf8arshaping.obj 
+      ..\..\src\modules\filters\utf8bidireorder.obj 
+      ..\..\src\modules\filters\utf8cantillation.obj 
+      ..\..\src\modules\filters\utf8greekaccents.obj 
+      ..\..\src\modules\filters\utf8hebrewpoints.obj 
+      ..\..\src\modules\filters\utf8arabicpoints.obj 
+      ..\..\src\modules\filters\utf8html.obj 
+      ..\..\src\modules\filters\utf8latin1.obj 
+      ..\..\src\modules\filters\utf8nfc.obj 
+      ..\..\src\modules\filters\utf8nfkd.obj 
+      ..\..\src\modules\filters\utf8transliterator.obj 
+      ..\..\src\modules\comments\zcom\zcom.obj 
+      ..\..\src\modules\lexdict\rawld4\rawld4.obj 
+      ..\..\src\modules\common\zipcomprs.obj 
+      ..\..\src\modules\lexdict\zld\zld.obj 
+      ..\..\src\modules\common\entriesblk.obj ..\..\src\utilfuns\zlib\zutil.obj 
+      ..\..\src\utilfuns\zlib\compress.obj ..\..\src\utilfuns\zlib\crc32.obj 
+      ..\..\src\utilfuns\zlib\deflate.obj ..\..\src\utilfuns\zlib\gzio.obj 
+      ..\..\src\utilfuns\zlib\infblock.obj ..\..\src\utilfuns\zlib\infcodes.obj 
+      ..\..\src\utilfuns\zlib\inffast.obj ..\..\src\utilfuns\zlib\inflate.obj 
+      ..\..\src\utilfuns\zlib\inftrees.obj ..\..\src\utilfuns\zlib\infutil.obj 
+      ..\..\src\utilfuns\zlib\trees.obj ..\..\src\utilfuns\zlib\uncompr.obj 
+      ..\..\src\utilfuns\zlib\untgz.obj ..\..\src\utilfuns\zlib\adler32.obj 
+      ..\..\src\modules\filters\greeklexattribs.obj ..\..\src\mgr\swcacher.obj 
+      ..\..\src\modules\filters\gbfosis.obj 
+      ..\..\src\modules\filters\thmlosis.obj ..\..\src\mgr\encfiltmgr.obj 
+      ..\..\src\mgr\markupfiltmgr.obj ..\..\src\utilfuns\roman.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value=""/>
+    <LIBRARIES value=""/>
+    <PACKAGES value=""/>
+    <PATHCPP value=".;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\frontend;..\..\src\modules;..\..\src\modules\comments;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\lexdict;..\..\src\modules\lexdict\rawld;..\..\src\modules\texts;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\genbook;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\comments\zcom;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\utilfuns\zlib"/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <LINKER value="TLib"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
+    <SYSDEFINES value="NO_STRICT"/>
+    <MAINSOURCE value="libsword.bpf"/>
+    <INCLUDEPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n"/>
+    <LIBPATH value="..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+    <LISTFILE value=""/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="/P512"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="$(OBJFILES)"/>
+    <ALLLIB value="cg32.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=7
+Item0=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common;..\..\..\icu-sword\source\i18n
+Item1=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\common
+Item2=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item4=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item5=..\include;$(BCB)\include;$(BCB)\include\vcl
+Item6=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=4
+Item0=..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\src\modules\texts\rawtext;..\src\modules\texts;..\src\modules\lexdict\rawld;..\src\modules\lexdict;..\src\modules\filters;..\src\modules\common;..\src\modules\comments\rawfiles;..\src\modules\comments\rawcom;..\src\modules\comments\hrefcom;..\src\modules\comments;..\src\modules;..\src\frontend;..\src\utilfuns;..\src\mgr;..\src\keys;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=5
+Item0=_ICU_;_ICUSWORD_;USBINARY
+Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item2=_ICU_;_ICUSWORD_
+Item3=_ICU_;_ICUSWORD_;_DEBUG
+Item4=_DEBUG
+
+[HistoryLists\hlTlibPageSize]
+Count=5
+Item0=0x0200
+Item1=0x0080
+Item2=0x0040
+Item3=0x0020
+Item4=0x0010
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/mkfastmod.bdsproj b/utilities/bcppmake/mkfastmod.bdsproj
new file mode 100644
index 0000000..ffd1675
--- /dev/null
+++ b/utilities/bcppmake/mkfastmod.bdsproj
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{13757126-9ACE-4CF8-9718-890CAFC2FD05}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="mkfastmod.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Od.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.noregistervars.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="_DEBUG"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y+"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.2" value="W"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.v.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.4" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="_DEBUG"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zi.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="mkfastmod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mkfastmod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\mkfastmod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mkfastmod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">KJV</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">mkfastmod.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/mkfastmod.bpf b/utilities/bcppmake/mkfastmod.bpf
new file mode 100644
index 0000000..59da96b
--- /dev/null
+++ b/utilities/bcppmake/mkfastmod.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\mkfastmod.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/mkfastmod.bpr b/utilities/bcppmake/mkfastmod.bpr
new file mode 100644
index 0000000..455ca6c
--- /dev/null
+++ b/utilities/bcppmake/mkfastmod.bpr
@@ -0,0 +1,125 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="mkfastmod.exe"/>
+    <OBJFILES value="..\mkfastmod.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;_DEBUG"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="mkfastmod.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k 
+      -y -v -vi- -tWC -tWM -c"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=3
+Item0=_ICU_;_ICUSWORD_;_DEBUG
+Item1=_ICU_;_ICUSWORD_
+Item2=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=KJV
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2imp.bdsproj b/utilities/bcppmake/mod2imp.bdsproj
new file mode 100644
index 0000000..d6f811b
--- /dev/null
+++ b/utilities/bcppmake/mod2imp.bdsproj
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{6FCCCABA-912D-4BF4-B104-85847C33E994}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="mod2imp.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="mod2imp.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2imp" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\mod2imp.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2imp" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">mod2imp.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/mod2imp.bpf b/utilities/bcppmake/mod2imp.bpf
new file mode 100644
index 0000000..ee00836
--- /dev/null
+++ b/utilities/bcppmake/mod2imp.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\mod2imp.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2imp.bpr b/utilities/bcppmake/mod2imp.bpr
new file mode 100644
index 0000000..b18da0e
--- /dev/null
+++ b/utilities/bcppmake/mod2imp.bpr
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="mod2imp.exe"/>
+    <OBJFILES value="..\mod2imp.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="mod2imp.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2osis.bdsproj b/utilities/bcppmake/mod2osis.bdsproj
new file mode 100644
index 0000000..72c5100
--- /dev/null
+++ b/utilities/bcppmake/mod2osis.bdsproj
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{0699AF27-87FC-42C2-94B7-C5FFBDE04AC9}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="mod2osis.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="mod2osis.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2osis" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\mod2osis.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2osis" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">KJV</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">mod2osis.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/mod2osis.bpf b/utilities/bcppmake/mod2osis.bpf
new file mode 100644
index 0000000..0923831
--- /dev/null
+++ b/utilities/bcppmake/mod2osis.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\mod2osis.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2osis.bpr b/utilities/bcppmake/mod2osis.bpr
new file mode 100644
index 0000000..ef275ef
--- /dev/null
+++ b/utilities/bcppmake/mod2osis.bpr
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="mod2osis.exe"/>
+    <OBJFILES value="..\mod2osis.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value=""/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="mod2osis.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=KJV
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2vpl.bdsproj b/utilities/bcppmake/mod2vpl.bdsproj
new file mode 100644
index 0000000..446bd36
--- /dev/null
+++ b/utilities/bcppmake/mod2vpl.bdsproj
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{31FAB7FF-0030-4558-84D8-0634F85BCE1F}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="mod2vpl.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="mod2vpl.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2vpl" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\mod2vpl.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2vpl" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">RWP ./ 3 2 abc</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">mod2vpl.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/mod2vpl.bpf b/utilities/bcppmake/mod2vpl.bpf
new file mode 100644
index 0000000..512ae0e
--- /dev/null
+++ b/utilities/bcppmake/mod2vpl.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\mod2vpl.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2vpl.bpr b/utilities/bcppmake/mod2vpl.bpr
new file mode 100644
index 0000000..780c5ba
--- /dev/null
+++ b/utilities/bcppmake/mod2vpl.bpr
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="mod2vpl.exe"/>
+    <OBJFILES value="..\mod2vpl.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="mod2vpl.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=RWP ./ 3 2 abc
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2zmod.bdsproj b/utilities/bcppmake/mod2zmod.bdsproj
new file mode 100644
index 0000000..84040df
--- /dev/null
+++ b/utilities/bcppmake/mod2zmod.bdsproj
@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{55779991-2EEA-4AC6-8C30-52012FF06C48}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="mod2zmod.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.3" value="USBINARY"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="mod2zmod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="mod2zmod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\mod2zmod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="mod2zmod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">5</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_;USBINARY</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_;USBINARY;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item2">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item3">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item4">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">KJV ./ 3 2 abc</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">mod2zmod.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/mod2zmod.bpf b/utilities/bcppmake/mod2zmod.bpf
new file mode 100644
index 0000000..4e5b2f5
--- /dev/null
+++ b/utilities/bcppmake/mod2zmod.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\mod2zmod.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/mod2zmod.bpr b/utilities/bcppmake/mod2zmod.bpr
new file mode 100644
index 0000000..67a52b9
--- /dev/null
+++ b/utilities/bcppmake/mod2zmod.bpr
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="mod2zmod.exe"/>
+    <OBJFILES value="..\mod2zmod.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="mod2zmod.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=5
+Item0=_ICU_;_ICUSWORD_;USBINARY
+Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item2=_ICU_;_ICUSWORD_
+Item3=_ICU_;_ICUSWORD_;_DEBUG
+Item4=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=KJV ./ 3 2 abc
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/osis2mod.bdsproj b/utilities/bcppmake/osis2mod.bdsproj
new file mode 100644
index 0000000..33c9e37
--- /dev/null
+++ b/utilities/bcppmake/osis2mod.bdsproj
@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{CC392976-EF1E-4C5D-A4A6-FE412E04B145}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="osis2mod.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.O2.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.k.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.vi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Od.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.noregistervars.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.v.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vGc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vGd.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vGt.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.y.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_DEBUG"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y+"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.2" value="W"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.v.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="cg32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.4" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_DEBUG"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zi.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="osis2mod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="osis2mod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\osis2mod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="osis2mod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">./nasb nasb.xml</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">osis2mod.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/osis2mod.bpf b/utilities/bcppmake/osis2mod.bpf
new file mode 100644
index 0000000..c8a2c8f
--- /dev/null
+++ b/utilities/bcppmake/osis2mod.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\osis2mod.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/osis2mod.bpr b/utilities/bcppmake/osis2mod.bpr
new file mode 100644
index 0000000..457a4a9
--- /dev/null
+++ b/utilities/bcppmake/osis2mod.bpr
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="osis2mod.exe"/>
+    <OBJFILES value="..\osis2mod.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="osis2mod.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -boa"/>
+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k 
+      -y -v -vi- -tWC -tWM -c"/>
+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zi"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=./nasb nasb.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=1
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/step2vpl.bdsproj b/utilities/bcppmake/step2vpl.bdsproj
new file mode 100644
index 0000000..1310329
--- /dev/null
+++ b/utilities/bcppmake/step2vpl.bdsproj
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{847D89F0-DA8A-4F75-AA82-5A9BB2A9D3CD}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="step2vpl.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="step2vpl.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="step2vpl" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\step2vpl.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="step2vpl" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">step2vpl.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/step2vpl.bpf b/utilities/bcppmake/step2vpl.bpf
new file mode 100644
index 0000000..6f6cce3
--- /dev/null
+++ b/utilities/bcppmake/step2vpl.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\step2vpl.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/step2vpl.bpr b/utilities/bcppmake/step2vpl.bpr
new file mode 100644
index 0000000..0c5961c
--- /dev/null
+++ b/utilities/bcppmake/step2vpl.bpr
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="step2vpl.exe"/>
+    <OBJFILES value="..\step2vpl.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="step2vpl.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/stepdump.bdsproj b/utilities/bcppmake/stepdump.bdsproj
new file mode 100644
index 0000000..7f74a93
--- /dev/null
+++ b/utilities/bcppmake/stepdump.bdsproj
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{A012F78B-1EC5-4A4B-84C3-1E5E2080E2EB}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="stepdump.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="stepdump.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="stepdump" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\stepdump.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="stepdump" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">stepdump.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/stepdump.bpf b/utilities/bcppmake/stepdump.bpf
new file mode 100644
index 0000000..5ca67a5
--- /dev/null
+++ b/utilities/bcppmake/stepdump.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\stepdump.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/stepdump.bpr b/utilities/bcppmake/stepdump.bpr
new file mode 100644
index 0000000..62c43b3
--- /dev/null
+++ b/utilities/bcppmake/stepdump.bpr
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="stepdump.exe"/>
+    <OBJFILES value="..\stepdump.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="stepdump.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/tei2mod.bpf b/utilities/bcppmake/tei2mod.bpf
new file mode 100644
index 0000000..9ce2914
--- /dev/null
+++ b/utilities/bcppmake/tei2mod.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\tei2mod.cpp");

+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\lib\libsword.lib");

+USELIB("..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcppmake/tei2mod.bpr b/utilities/bcppmake/tei2mod.bpr
new file mode 100644
index 0000000..bec58cd
--- /dev/null
+++ b/utilities/bcppmake/tei2mod.bpr
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="tei2mod.exe"/>

+    <OBJFILES value="..\tei2mod.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 

+      ..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value="_DEBUG"/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="tei2mod.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa"/>

+    <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k 

+      -y -v -vi- -tWC -tWM -c"/>

+    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zi"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn -v"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=1

+Item0=_DEBUG

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=./nasb nasb.xml

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+LinkCGLIB=1

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/treeidxutil.bpf b/utilities/bcppmake/treeidxutil.bpf
new file mode 100644
index 0000000..88eaef2
--- /dev/null
+++ b/utilities/bcppmake/treeidxutil.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\treeidxutil.cpp");

+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\lib\libsword.lib");

+USELIB("..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcppmake/treeidxutil.bpr b/utilities/bcppmake/treeidxutil.bpr
new file mode 100644
index 0000000..8c3caed
--- /dev/null
+++ b/utilities/bcppmake/treeidxutil.bpr
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="treeidxutil.exe"/>

+    <OBJFILES value="..\treeidxutil.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 

+      ..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value=""/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="treeidxutil.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=1

+Item0=_DEBUG

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=Gen1:1

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+LinkCGLIB=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/utilities.bdsgroup b/utilities/bcppmake/utilities.bdsgroup
new file mode 100644
index 0000000..278a47a
--- /dev/null
+++ b/utilities/bcppmake/utilities.bdsgroup
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">Default.Personality</Option>

+      <Option Name="ProjectType"></Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{9922D349-DBA7-45A7-A547-F2DD34E7E460}</Option>

+    </Option>

+  </PersonalityInfo>

+  <Default.Personality>

+    

+    <Projects>

+      <Projects Name="icuuc.lib">..\..\..\icu-sword\as_is\borland\icuuc.bdsproj</Projects>

+      <Projects Name="icuin.lib">..\..\..\icu-sword\as_is\borland\icuin.bdsproj</Projects>

+      <Projects Name="libcurl.lib">..\..\..\biblecs\apps\InstallMgr\libcurl.bdsproj</Projects>

+      <Projects Name="clucene.lib">..\..\..\biblecs\clucene\clucene.bdsproj</Projects>

+      <Projects Name="libsword.lib">..\..\lib\bcppmake\libsword.bdsproj</Projects>

+      <Projects Name="osis2mod.exe">osis2mod.bdsproj</Projects>

+      <Projects Name="mod2zmod.exe">mod2zmod.bdsproj</Projects>

+      <Projects Name="mod2vpl.exe">mod2vpl.bdsproj</Projects>

+      <Projects Name="mkfastmod.exe">mkfastmod.bdsproj</Projects>

+      <Projects Name="imp2gbs.exe">imp2gbs.bdsproj</Projects>

+      <Projects Name="vpl2mod.exe">vpl2mod.bdsproj</Projects>

+      <Projects Name="imp2ld.exe">imp2ld.bdsproj</Projects>

+      <Projects Name="imp2vs.exe">imp2vs.bdsproj</Projects>

+      <Projects Name="mod2imp.exe">mod2imp.bdsproj</Projects>

+      <Projects Name="cipherraw.exe">cipherraw.bdsproj</Projects>

+      <Projects Name="step2vpl.exe">step2vpl.bdsproj</Projects>

+      <Projects Name="stepdump.exe">stepdump.bdsproj</Projects>

+      <Projects Name="mod2osis.exe">mod2osis.bdsproj</Projects>

+      <Projects Name="vs2osisref.exe">vs2osisref.bdsproj</Projects>

+      <Projects Name="diatheke.exe">diatheke.bdsproj</Projects>

+      <Projects Name="xml2gbs.exe">xml2gbs.bdsproj</Projects>

+      <Projects Name="installmgr.exe">installmgr.bdsproj</Projects>

+      <Projects Name="Targets">icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib osis2mod.exe mod2zmod.exe mod2vpl.exe mkfastmod.exe imp2gbs.exe vpl2mod.exe imp2ld.exe imp2vs.exe mod2imp.exe cipherraw.exe step2vpl.exe stepdump.exe mod2osis.exe vs2osisref.exe diatheke.exe xml2gbs.exe installmgr.exe</Projects>

+    </Projects>

+    <Dependencies/>

+  </Default.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/utilities.bpg b/utilities/bcppmake/utilities.bpg
new file mode 100644
index 0000000..4ce943f
--- /dev/null
+++ b/utilities/bcppmake/utilities.bpg
@@ -0,0 +1,133 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \
+  osis2mod.exe mod2zmod.exe mod2vpl.exe mkfastmod.exe imp2gbs.exe vpl2mod.exe \
+  imp2ld.exe imp2vs.exe mod2imp.exe cipherraw.exe step2vpl.exe stepdump.exe \
+  mod2osis.exe vs2osisref.exe vs2osisreftxt.exe xml2gbs.exe diatheke.exe \
+  installmgr.exe tei2mod.exe addgb.exe addld.exe addvs.exe treeidxutil.exe
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+mod2vpl.exe: mod2vpl.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+vpl2mod.exe: vpl2mod.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+mkfastmod.exe: mkfastmod.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+cipherraw.exe: cipherraw.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+imp2gbs.exe: imp2gbs.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+imp2ld.exe: imp2ld.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+imp2vs.exe: imp2vs.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+mod2zmod.exe: mod2zmod.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+mod2imp.exe: mod2imp.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+stepdump.exe: stepdump.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+step2vpl.exe: step2vpl.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+mod2osis.exe: mod2osis.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+vs2osisref.exe: vs2osisref.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+libsword.lib: ..\..\lib\bcppmake\libsword.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+diatheke.exe: diatheke.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+icuuc.lib: ..\..\..\icu-sword\as_is\borland\icuuc.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+icuin.lib: ..\..\..\icu-sword\as_is\borland\icuin.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+xml2gbs.exe: xml2gbs.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+osis2mod.exe: osis2mod.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+tei2mod.exe: tei2mod.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+installmgr.exe: installmgr.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+clucene.lib: ..\..\..\biblecs\clucene\clucene.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+libcurl.lib: ..\..\..\biblecs\apps\InstallMgr\libcurl.bpr
+  $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+addgb.exe: addgb.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+addld.exe: addld.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+addvs.exe: addvs.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+vs2osisreftxt.exe: vs2osisreftxt.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+treeidxutil.exe: treeidxutil.bpr
+  $(ROOT)\bin\bpr2mak $**
+  $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+
diff --git a/utilities/bcppmake/vpl2mod.bdsproj b/utilities/bcppmake/vpl2mod.bdsproj
new file mode 100644
index 0000000..1c61323
--- /dev/null
+++ b/utilities/bcppmake/vpl2mod.bdsproj
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{DFB41EBE-3AE8-4E04-8037-375F4F5EE782}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="vpl2mod.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="vpl2mod.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="vpl2mod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\vpl2mod.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="vpl2mod" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">2</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams"></Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">vpl2mod.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/vpl2mod.bpf b/utilities/bcppmake/vpl2mod.bpf
new file mode 100644
index 0000000..0eb123e
--- /dev/null
+++ b/utilities/bcppmake/vpl2mod.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\vpl2mod.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/vpl2mod.bpr b/utilities/bcppmake/vpl2mod.bpr
new file mode 100644
index 0000000..4cde253
--- /dev/null
+++ b/utilities/bcppmake/vpl2mod.bpr
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="vpl2mod.exe"/>
+    <OBJFILES value="..\vpl2mod.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="vpl2mod.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_ICU_;_ICUSWORD_
+Item1=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/vs2osisref.bdsproj b/utilities/bcppmake/vs2osisref.bdsproj
new file mode 100644
index 0000000..e8867d6
--- /dev/null
+++ b/utilities/bcppmake/vs2osisref.bdsproj
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{91C55E1D-B813-477E-A8A5-1C3AFDFDEF95}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="vs2osisref.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="vs2osisref.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="vs2osisref" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\vs2osisref.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="vs2osisref" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">1</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">Gen1:1</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">vs2osisref.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/vs2osisref.bpf b/utilities/bcppmake/vs2osisref.bpf
new file mode 100644
index 0000000..24f7f88
--- /dev/null
+++ b/utilities/bcppmake/vs2osisref.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\vs2osisref.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/vs2osisref.bpr b/utilities/bcppmake/vs2osisref.bpr
new file mode 100644
index 0000000..19db71e
--- /dev/null
+++ b/utilities/bcppmake/vs2osisref.bpr
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="vs2osisref.exe"/>
+    <OBJFILES value="..\vs2osisref.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value=""/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="vs2osisref.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=Gen1:1
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/vs2osisreftxt.bpf b/utilities/bcppmake/vs2osisreftxt.bpf
new file mode 100644
index 0000000..fd5c23e
--- /dev/null
+++ b/utilities/bcppmake/vs2osisreftxt.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\vs2osisreftxt.cpp");

+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");

+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");

+USELIB("..\..\lib\libsword.lib");

+USELIB("..\..\..\biblecs\clucene\clucene.lib");

+//---------------------------------------------------------------------------

+This file is used by the project manager only and should be treated like the project file

+

+

+main
\ No newline at end of file
diff --git a/utilities/bcppmake/vs2osisreftxt.bpr b/utilities/bcppmake/vs2osisreftxt.bpr
new file mode 100644
index 0000000..9615797
--- /dev/null
+++ b/utilities/bcppmake/vs2osisreftxt.bpr
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='utf-8' ?>

+<!-- C++Builder XML Project -->

+<PROJECT>

+  <MACROS>

+    <VERSION value="BCB.05.03"/>

+    <PROJECT value="vs2osisreftxt.exe"/>

+    <OBJFILES value="..\vs2osisreftxt.obj"/>

+    <RESFILES value=""/>

+    <IDLFILES value=""/>

+    <IDLGENFILES value=""/>

+    <DEFFILE value=""/>

+    <RESDEPEN value="$(RESFILES)"/>

+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 

+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 

+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 

+      ..\..\..\biblecs\clucene\clucene.lib"/>

+    <LIBRARIES value=""/>

+    <SPARELIBS value=""/>

+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 

+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 

+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 

+      dclocx50.bpi bcb2kaxserver50.bpi"/>

+    <PATHCPP value=".;.."/>

+    <PATHPAS value=".;"/>

+    <PATHRC value=".;"/>

+    <PATHASM value=".;"/>

+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>

+    <RELEASELIBPATH value="$(BCB)\lib\release"/>

+    <LINKER value="tlink32"/>

+    <USERDEFINES value=""/>

+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>

+    <MAINSOURCE value="vs2osisreftxt.bpf"/>

+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>

+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>

+    <WARNINGS value="-w-par"/>

+  </MACROS>

+  <OPTIONS>

+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 

+      -src_suffix cpp -boa"/>

+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -6 -b- -k- -vi -tWC -tWM -c"/>

+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>

+    <RFLAGS value=""/>

+    <AFLAGS value="/mx /w2 /zn"/>

+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn"/>

+  </OPTIONS>

+  <LINKER>

+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>

+    <ALLRES value="$(RESFILES)"/>

+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>

+  </LINKER>

+  <IDEOPTIONS>

+[Version Info]

+IncludeVerInfo=0

+AutoIncBuild=0

+MajorVer=1

+MinorVer=0

+Release=0

+Build=0

+Debug=0

+PreRelease=0

+Special=0

+Private=0

+DLL=0

+Locale=1033

+CodePage=1252

+

+[Version Info Keys]

+CompanyName=

+FileDescription=

+FileVersion=1.0.0.0

+InternalName=

+LegalCopyright=

+LegalTrademarks=

+OriginalFilename=

+ProductName=

+ProductVersion=1.0.0.0

+Comments=

+

+[HistoryLists\hlIncludePath]

+Count=4

+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl

+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl

+

+[HistoryLists\hlLibraryPath]

+Count=5

+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib

+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib

+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib

+

+[HistoryLists\hlDebugSourcePath]

+Count=1

+Item0=$(BCB)\source\vcl

+

+[HistoryLists\hlConditionals]

+Count=1

+Item0=_DEBUG

+

+[Debugging]

+DebugSourceDirs=$(BCB)\source\vcl

+

+[Parameters]

+RunParams=Gen1:1

+HostApplication=

+RemoteHost=

+RemotePath=

+RemoteDebug=0

+

+[Compiler]

+ShowInfoMsgs=0

+LinkDebugVcl=0

+LinkCGLIB=0

+

+[Language]

+ActiveLang=

+ProjectLang=

+RootDir=

+  </IDEOPTIONS>

+</PROJECT>
\ No newline at end of file
diff --git a/utilities/bcppmake/xml2gbs.bdsproj b/utilities/bcppmake/xml2gbs.bdsproj
new file mode 100644
index 0000000..d2d4ea3
--- /dev/null
+++ b/utilities/bcppmake/xml2gbs.bdsproj
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>

+<BorlandProject>

+  <PersonalityInfo>

+    <Option>

+      <Option Name="Personality">CPlusPlusBuilder.Personality</Option>

+      <Option Name="ProjectType">CppConsoleApplication</Option>

+      <Option Name="Version">1.0</Option>

+      <Option Name="GUID">{EF536EAE-FEDD-49D8-B32A-0EB5C911B107}</Option>

+    </Option>

+  </PersonalityInfo>

+  <CPlusPlusBuilder.Personality>

+    <BCBPROJECT>

+      <project version="10.0">

+        <property category="build.config" name="active" value="0"/>

+        <property category="build.config" name="count" value="1"/>

+        <property category="build.config" name="excludedefaultforzero" value="0"/>

+        <property category="build.config.0" name="builddir" value="Debug"/>

+        <property category="build.config.0" name="key" value="Debug_Build"/>

+        <property category="build.config.0" name="name" value="Debug Build"/>

+        <property category="build.config.0" name="settings.win32b" value="default"/>

+        <property category="build.config.0" name="type" value="Toolset"/>

+        <property category="build.config.0" name="win32.win32b.builddir" value="Debug_Build"/>

+        <property category="build.config.1" name="key" value="Release_Build"/>

+        <property category="build.config.1" name="name" value="Release Build"/>

+        <property category="build.config.1" name="settings.win32b" value="default"/>

+        <property category="build.config.1" name="type" value="Toolset"/>

+        <property category="build.config.1" name="win32.win32b.builddir" value="Release_Build"/>

+        <property category="build.node" name="name" value="xml2gbs.exe"/>

+        <property category="build.node" name="packages" value="rtl;vcl;vclx;bcbsmp;dbrtl;vcldb;bdertl;ibsmp;vcldbx;teeui;teedb;tee;ibxpress;bcbie;vclie;inetdb;inet;bcboffice2k"/>

+        <property category="build.node" name="use_packages" value="0"/>

+        <property category="build.platform" name="active" value="win32"/>

+        <property category="build.platform" name="win32.Debug_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.Release_Build.toolset" value="win32b"/>

+        <property category="build.platform" name="win32.default" value="win32b"/>

+        <property category="build.platform" name="win32.enabled" value="1"/>

+        <property category="build.platform" name="win32.win32b.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.1" value="_DEBUG"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.Od.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.k.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.r.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.v.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.vi.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.bcc32" name="option.y.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.$O.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.1" value="DEBUG"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.dcc32" name="option.V.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.D.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\debug"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Debug_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.z.enabled" value="1"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Debug_Build.win32b.tasm32" name="option.zi.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.1" value="NDEBUG"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.D.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.bcc32" name="option.r.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$D.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.$O.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.dcc32" name="option.V.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.1" value="$(BDS)\lib\release"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+        <property category="win32.Release_Build.win32b.ilink32" name="option.L.enabled" value="1"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.z.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zd.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zi.enabled" value="0"/>

+        <property category="win32.Release_Build.win32b.tasm32" name="option.zn.enabled" value="1"/>

+        <optionset name="all_configurations">

+          <property category="node" name="displayname" value="All Configurations"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.1" value="$(BDS)\lib\vcl100.csm"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.arg.merge" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.H=.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Hc.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.2" value=".."/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.O2.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Ve.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.Vx.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.X.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.b.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.k.enabled" value="0"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.1" value="..\"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.n.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.1" value="NO_STRICT"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.2" value="_NO_VCL"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.arg.merge" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.sysdefines.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWC.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.tWM.enabled" value="1"/>

+          <property category="win32.*.win32b.bcc32" name="option.vi.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.D.enabled" value="0"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.2" value=".."/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.INCLUDEPATH.enabled" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.brcc32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.1" value="Y-"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.$D.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.$L.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.I.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.M.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.N0.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.NO.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.O.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.R.enabled" value="0"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.1" value="..\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.2" value=".\"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.3" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.arg.merge" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="option.U.enabled" value="1"/>

+          <property category="win32.*.win32b.dcc32" name="param.filenames.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.3" value="_DEBUG"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.1" value="..\"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.2" value="..\."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.3" value=".."/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.4" value="..\..\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.5" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.6" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.I.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.boa.enabled" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg" value="cpp"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.arg.merge" value="1"/>

+          <property category="win32.*.win32b.idl2cpp" name="option.srcsuffix.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg" value="&quot;&quot;"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.D.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.2" value=".."/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.3" value="..\..\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.4" value="$(BDS)\lib\obj"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.5" value="$(BDS)\lib"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.L.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg" value="0x300000"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.S:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg" value="0x20000"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.arg.merge" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.Sc:xxxx.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.Tpe.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.ap.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.dynamicrtl.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.1" value="..\"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.j.enabled" value="0"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.1" value="."/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.1" value="$(LIBRARIES)"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.2" value="import32.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.3" value="cw32mt.lib"/>

+          <property category="win32.*.win32b.ilink32" name="param.libfiles.merge" value="1"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.1" value="c0x32.obj"/>

+          <property category="win32.*.win32b.ilink32" name="param.objfiles.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.1" value="_ICU_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.2" value="_ICUSWORD_"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.d.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.2" value=".."/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.3" value="..\..\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.4" value="$(BDS)\include"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.5" value="$(BDS)\include\vcl"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.6" value="$(BDS)\include\dinkumware"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.i.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.1" value="..\"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.arg.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.outputdir.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.w2.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="option.zn.enabled" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.listfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.objfile.merge" value="1"/>

+          <property category="win32.*.win32b.tasm32" name="param.xreffile.merge" value="1"/>

+        </optionset>

+      </project>

+      <FILELIST>

+        <FILE FILENAME="xml2gbs.bpf" CONTAINERID="BPF" LOCALCOMMAND="" UNITNAME="xml2gbs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\xml2gbs.cpp" CONTAINERID="CCompiler" LOCALCOMMAND="" UNITNAME="xml2gbs" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuin.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuin" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icudatab.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icudatab" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\icu-sword\as_is\borland\icuuc.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="icuuc" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\lib\libsword.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="libsword" FORMNAME="" DESIGNCLASS=""/>

+        <FILE FILENAME="..\..\..\biblecs\clucene\clucene.lib" CONTAINERID="LibTool" LOCALCOMMAND="" UNITNAME="clucene" FORMNAME="" DESIGNCLASS=""/>

+      </FILELIST>

+      <IDEOPTIONS>

+        <VersionInfo>

+          <VersionInfo Name="IncludeVerInfo">False</VersionInfo>

+          <VersionInfo Name="AutoIncBuild">False</VersionInfo>

+          <VersionInfo Name="MajorVer">1</VersionInfo>

+          <VersionInfo Name="MinorVer">0</VersionInfo>

+          <VersionInfo Name="Release">0</VersionInfo>

+          <VersionInfo Name="Build">0</VersionInfo>

+          <VersionInfo Name="Debug">False</VersionInfo>

+          <VersionInfo Name="PreRelease">False</VersionInfo>

+          <VersionInfo Name="Special">False</VersionInfo>

+          <VersionInfo Name="Private">False</VersionInfo>

+          <VersionInfo Name="DLL">False</VersionInfo>

+          <VersionInfo Name="Locale">1033</VersionInfo>

+          <VersionInfo Name="CodePage">1252</VersionInfo>

+        </VersionInfo>

+        <VersionInfoKeys>

+          <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>

+          <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="InternalName"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>

+          <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>

+          <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductName"></VersionInfoKeys>

+          <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>

+          <VersionInfoKeys Name="Comments"></VersionInfoKeys>

+        </VersionInfoKeys>

+        <HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Count">4</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item0">..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item1">..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item2">..;..\..\include;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+          <HistoryLists_hlIncludePath Name="Item3">..\..\utilities;$(BCB)\include;$(BCB)\include\vcl</HistoryLists_hlIncludePath>

+        </HistoryLists_hlIncludePath>

+        <HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Count">5</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item0">..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item1">..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item2">..\;..;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item3">..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+          <HistoryLists_hlLibraryPath Name="Item4">..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib</HistoryLists_hlLibraryPath>

+        </HistoryLists_hlLibraryPath>

+        <HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Count">1</HistoryLists_hlDebugSourcePath>

+          <HistoryLists_hlDebugSourcePath Name="Item0">$(BCB)\source\vcl</HistoryLists_hlDebugSourcePath>

+        </HistoryLists_hlDebugSourcePath>

+        <HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Count">3</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item0">_ICU_;_ICUSWORD_</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item1">_ICU_;_ICUSWORD_;_DEBUG</HistoryLists_hlConditionals>

+          <HistoryLists_hlConditionals Name="Item2">_DEBUG</HistoryLists_hlConditionals>

+        </HistoryLists_hlConditionals>

+        <Debugging>

+          <Debugging Name="DebugSourceDirs">$(BCB)\source\vcl</Debugging>

+        </Debugging>

+        <Parameters>

+          <Parameters Name="RunParams">summatheologica.xml</Parameters>

+          <Parameters Name="Launcher"></Parameters>

+          <Parameters Name="UseLauncher">False</Parameters>

+          <Parameters Name="DebugCWD"></Parameters>

+          <Parameters Name="HostApplication"></Parameters>

+          <Parameters Name="RemoteHost"></Parameters>

+          <Parameters Name="RemotePath"></Parameters>

+          <Parameters Name="RemoteParams"></Parameters>

+          <Parameters Name="RemoteLauncher"></Parameters>

+          <Parameters Name="UseRemoteLauncher">False</Parameters>

+          <Parameters Name="RemoteCWD"></Parameters>

+          <Parameters Name="RemoteDebug">False</Parameters>

+          <Parameters Name="Debug Symbols Search Path"></Parameters>

+          <Parameters Name="LoadAllSymbols">True</Parameters>

+          <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>

+        </Parameters>

+        <Language>

+          <Language Name="ActiveLang"></Language>

+          <Language Name="ProjectLang">$00000000</Language>

+          <Language Name="RootDir"></Language>

+        </Language>

+        <Linker>

+          <Linker Name="LibPrefix"></Linker>

+          <Linker Name="LibSuffix"></Linker>

+          <Linker Name="LibVersion"></Linker>

+        </Linker>

+      </IDEOPTIONS>

+    </BCBPROJECT>

+    <Source>

+      <Source Name="MainSource">xml2gbs.bpf</Source>

+    </Source>

+  </CPlusPlusBuilder.Personality>

+</BorlandProject>

diff --git a/utilities/bcppmake/xml2gbs.bpf b/utilities/bcppmake/xml2gbs.bpf
new file mode 100644
index 0000000..0f2437d
--- /dev/null
+++ b/utilities/bcppmake/xml2gbs.bpf
@@ -0,0 +1,11 @@
+USEUNIT("..\xml2gbs.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
+This file is used by the project manager only and should be treated like the project file
+
+
+main
\ No newline at end of file
diff --git a/utilities/bcppmake/xml2gbs.bpr b/utilities/bcppmake/xml2gbs.bpr
new file mode 100644
index 0000000..7ba1477
--- /dev/null
+++ b/utilities/bcppmake/xml2gbs.bpr
@@ -0,0 +1,124 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.05.03"/>
+    <PROJECT value="xml2gbs.exe"/>
+    <OBJFILES value="..\xml2gbs.obj"/>
+    <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="..\..\..\icu-sword\as_is\borland\icuin.lib 
+      ..\..\..\icu-sword\as_is\borland\icudatab.lib 
+      ..\..\..\icu-sword\as_is\borland\icuuc.lib ..\..\lib\libsword.lib 
+      ..\..\..\biblecs\clucene\clucene.lib"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi 
+      ibsmp50.bpi VCLDBX50.bpi TEEUI50.bpi TEEDB50.bpi TEE50.bpi TEEQR50.bpi 
+      VCLIB50.bpi bcbie50.bpi VCLIE50.bpi INETDB50.bpi INET50.bpi NMFAST50.bpi 
+      dclocx50.bpi bcb2kaxserver50.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
+    <RELEASELIBPATH value="$(BCB)\lib\release"/>
+    <LINKER value="tlink32"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+    <SYSDEFINES value="NO_STRICT;_NO_VCL"/>
+    <MAINSOURCE value="xml2gbs.bpf"/>
+    <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <WARNINGS value="-w-par"/>
+  </MACROS>
+  <OPTIONS>
+    <IDLCFLAGS value="-I..\. -I.. -I..\..\include -I$(BCB)\include -I$(BCB)\include\vcl 
+      -src_suffix cpp -D_ICU_ -D_ICUSWORD_ -D_DEBUG -boa"/>
+    <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -tWC -tWM -c"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-D&quot;&quot; -S:0x300000 -Sc:0x20000 -ap -Tpe -x -Gn"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="c0x32.obj $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+  </LINKER>
+  <IDEOPTIONS>
+[Version Info]
+IncludeVerInfo=0
+AutoIncBuild=0
+MajorVer=1
+MinorVer=0
+Release=0
+Build=0
+Debug=0
+PreRelease=0
+Special=0
+Private=0
+DLL=0
+Locale=1033
+CodePage=1252
+
+[Version Info Keys]
+CompanyName=
+FileDescription=
+FileVersion=1.0.0.0
+InternalName=
+LegalCopyright=
+LegalTrademarks=
+OriginalFilename=
+ProductName=
+ProductVersion=1.0.0.0
+Comments=
+
+[HistoryLists\hlIncludePath]
+Count=4
+Item0=..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item1=..\;..\..\utilities;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item2=..;..\..\include;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\utilities;$(BCB)\include;$(BCB)\include\vcl
+
+[HistoryLists\hlLibraryPath]
+Count=5
+Item0=..\;..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\;..;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\;..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\utilities;$(BCB)\lib\obj;$(BCB)\lib
+
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=$(BCB)\source\vcl
+
+[HistoryLists\hlConditionals]
+Count=3
+Item0=_ICU_;_ICUSWORD_
+Item1=_ICU_;_ICUSWORD_;_DEBUG
+Item2=_DEBUG
+
+[Debugging]
+DebugSourceDirs=$(BCB)\source\vcl
+
+[Parameters]
+RunParams=summatheologica.xml
+HostApplication=
+RemoteHost=
+RemotePath=
+RemoteDebug=0
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+LinkCGLIB=0
+
+[Language]
+ActiveLang=
+ProjectLang=
+RootDir=
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/cipherraw.cpp b/utilities/cipherraw.cpp
new file mode 100644
index 0000000..d1473c3
--- /dev/null
+++ b/utilities/cipherraw.cpp
@@ -0,0 +1,145 @@
+/******************************************************************************
+ *
+ *  cipherraw.cpp -	Utility to encipher a raw (uncompressed) module
+ *
+ * $Id: cipherraw.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <swcipher.h>
+#include <versekey.h>
+#include <rawverse.h>
+#include <swbuf.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	SWCipher *zobj;
+	VerseKey key;
+	RawVerse *rawdrv;
+	int ofd[2], oxfd[2], w;
+	long tmpoff = 0, offset, loffset = 0, lzoffset = 0;
+	unsigned short size, lsize = 0, lzsize;
+	char *tmpbuf;
+	
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s <datapath> \"<key>\"\n", argv[0]);
+		exit(1);
+	}
+
+	rawdrv = new RawVerse(argv[1]);
+	zobj = new SWCipher((unsigned char *)argv[2]);
+
+	tmpbuf = new char [ strlen(argv[1]) + 11 ];
+	sprintf(tmpbuf, "%sot.zzz", argv[1]);
+	ofd[0] = FileMgr::createPathAndFile(tmpbuf);
+	sprintf(tmpbuf, "%sot.zzz.vss", argv[1]);
+	oxfd[0] = FileMgr::createPathAndFile(tmpbuf);
+	sprintf(tmpbuf, "%snt.zzz", argv[1]);
+	ofd[1] = FileMgr::createPathAndFile(tmpbuf);
+	sprintf(tmpbuf, "%snt.zzz.vss", argv[1]);
+	oxfd[1] = FileMgr::createPathAndFile(tmpbuf);
+
+	delete [] tmpbuf;
+
+	printf("\n");
+	w = write(oxfd[0], &lzoffset, 4);
+	if (w < 0)
+		perror("ERROR: write failed in main");
+	w = write(oxfd[0], &lzsize, 2);
+	if (w < 0)
+		perror("ERROR: write failed in main");
+	w = write(oxfd[1], &lzoffset, 4);
+	if (w < 0)
+		perror("ERROR: write failed in main");
+	w = write(oxfd[1], &lzsize, 2);
+	if (w < 0)
+		perror("ERROR: write failed in main");
+
+	key.setAutoNormalize(false);
+	key.setIntros(true);
+	for (key.setIndex(0); (!key.popError()); key++) {
+		rawdrv->findOffset(key.getTestament(), key.getIndex(), &offset, &size);
+		printf("%s: OLD offset: %ld; size: %d\n", (const char *)key, offset, size);
+
+		if ((offset == loffset) && (size == lsize)) {
+			printf("using previous offset,size %d\n", size);
+			offset = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
+			printf("%ld %ld %d \n", offset, lzoffset, lzsize);
+			if (write(oxfd[key.getTestament() - 1], &lzoffset, 4) < 0)
+                            perror("ERROR: write failed in main");
+			if (write(oxfd[key.getTestament() - 1], &lzsize, 2) < 0)
+                            perror("ERROR: write failed in main");
+		}
+		else {
+			lsize   = size;
+			loffset = offset;
+
+			if (size) {
+				SWBuf tmpbuf;
+				rawdrv->readText(key.getTestament(), offset, size, tmpbuf);
+				zobj->Buf(tmpbuf.c_str(), size);
+				unsigned long ulSize = size;
+				zobj->cipherBuf(&ulSize);
+				size = (unsigned int)ulSize;
+			}
+			offset = lseek(ofd[key.getTestament() - 1], 0, SEEK_CUR);
+			tmpoff = lseek(oxfd[key.getTestament() - 1], 0, SEEK_CUR);
+			printf("%s: (%ld) NEW offset: %ld; size: %d\n", (const char *)key, tmpoff, offset, size);
+			if (write(oxfd[key.getTestament() - 1], &offset, 4) < 0)
+                            perror("ERROR: write failed in main");
+			unsigned long ulSize = size;
+			if (size) {
+                            if (write(ofd[key.getTestament() - 1], zobj->cipherBuf(&ulSize), size) < 0)
+                            perror("ERROR: write failed in main");
+                        }
+			size = (unsigned int)ulSize;
+			lzoffset = offset;
+			if (write(oxfd[key.getTestament() - 1], &size, 2) < 0)
+                            perror("ERROR: write failed in main");
+			lzsize = size;
+		}
+	}
+	delete zobj;
+	close(ofd[0]);
+	close(oxfd[0]);
+	close(ofd[1]);
+	close(oxfd[1]);
+	return 0;
+}
diff --git a/utilities/diatheke/Makefile.am b/utilities/diatheke/Makefile.am
new file mode 100644
index 0000000..8ba34e5
--- /dev/null
+++ b/utilities/diatheke/Makefile.am
@@ -0,0 +1,13 @@
+AUTOMAKE_OPTIONS = 1.6
+
+LDADD = $(top_builddir)/lib/libsword.la
+
+bin_PROGRAMS = diatheke
+
+diatheke_SOURCES = diatheke.cpp corediatheke.cpp diathekemgr.cpp \
+	diafiltmgr.cpp thmlcgi.cpp gbfcgi.cpp osiscgi.cpp
+
+noinst_HEADERS = corediatheke.h diafiltmgr.h diathekemgr.h gbfcgi.h thmlcgi.h \
+	osiscgi.h
+
+include cgi/Makefile.am
diff --git a/utilities/diatheke/Makefile.in b/utilities/diatheke/Makefile.in
new file mode 100644
index 0000000..c76a8c5
--- /dev/null
+++ b/utilities/diatheke/Makefile.in
@@ -0,0 +1,681 @@
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+bin_PROGRAMS = diatheke$(EXEEXT)
+DIST_COMMON = $(srcdir)/cgi/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/depcomp $(noinst_HEADERS) \
+	README
+subdir = utilities/diatheke
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/acx_clucene.m4 \
+	$(top_srcdir)/m4/cppunit.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_diatheke_OBJECTS = diatheke.$(OBJEXT) corediatheke.$(OBJEXT) \
+	diathekemgr.$(OBJEXT) diafiltmgr.$(OBJEXT) thmlcgi.$(OBJEXT) \
+	gbfcgi.$(OBJEXT) osiscgi.$(OBJEXT)
+diatheke_OBJECTS = $(am_diatheke_OBJECTS)
+diatheke_LDADD = $(LDADD)
+diatheke_DEPENDENCIES = $(top_builddir)/lib/libsword.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(diatheke_SOURCES)
+DIST_SOURCES = $(diatheke_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_CFLAGS = @AM_CFLAGS@
+AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CLUCENE2_CFLAGS = @CLUCENE2_CFLAGS@
+CLUCENE2_LIBS = @CLUCENE2_LIBS@
+CLUCENE_CXXFLAGS = @CLUCENE_CXXFLAGS@
+CLUCENE_LIBS = @CLUCENE_LIBS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CURL_CONFIG = @CURL_CONFIG@
+CURL_LIBS = @CURL_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_IOLIBS = @ICU_IOLIBS@
+ICU_LIBS = @ICU_LIBS@
+ICU_VER = @ICU_VER@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SWORD_VERSION_MAJOR = @SWORD_VERSION_MAJOR@
+SWORD_VERSION_MICRO = @SWORD_VERSION_MICRO@
+SWORD_VERSION_MINOR = @SWORD_VERSION_MINOR@
+SWORD_VERSION_NANO = @SWORD_VERSION_NANO@
+SWORD_VERSION_NUM = @SWORD_VERSION_NUM@
+SWORD_VERSION_STR = @SWORD_VERSION_STR@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+dir_confdef = @dir_confdef@
+docdir = @docdir@
+dvidir = @dvidir@
+enable_debug = @enable_debug@
+enable_profile = @enable_profile@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_mingw32 = @target_mingw32@
+target_os = @target_os@
+target_system = @target_system@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+with_conf = @with_conf@
+with_icu = @with_icu@
+with_icusword = @with_icusword@
+with_zlib = @with_zlib@
+AUTOMAKE_OPTIONS = 1.6
+LDADD = $(top_builddir)/lib/libsword.la
+diatheke_SOURCES = diatheke.cpp corediatheke.cpp diathekemgr.cpp \
+	diafiltmgr.cpp thmlcgi.cpp gbfcgi.cpp osiscgi.cpp
+
+noinst_HEADERS = corediatheke.h diafiltmgr.h diathekemgr.h gbfcgi.h thmlcgi.h \
+	osiscgi.h
+
+swcgidir = $(top_srcdir)/utilities/diatheke/cgi
+EXTRA_DIST = $(swcgidir)/dia-def.pl $(swcgidir)/diatheke.pl \
+	$(swcgidir)/index.html
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/cgi/Makefile.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign utilities/diatheke/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign utilities/diatheke/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+$(srcdir)/cgi/Makefile.am:
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+
+diatheke$(EXEEXT): $(diatheke_OBJECTS) $(diatheke_DEPENDENCIES) $(EXTRA_diatheke_DEPENDENCIES) 
+	@rm -f diatheke$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(diatheke_OBJECTS) $(diatheke_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/corediatheke.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diafiltmgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diatheke.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diathekemgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gbfcgi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/osiscgi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thmlcgi.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/utilities/diatheke/README b/utilities/diatheke/README
new file mode 100644
index 0000000..7421a6d
--- /dev/null
+++ b/utilities/diatheke/README
@@ -0,0 +1,83 @@
+Diatheke Suite
+by Chris Little <chrislit@crosswire.org>
+
+This suite is intended for use with libraries and modules from
+the SWORD Project, available at http://www.crosswire.org/
+
+The latest versions of this suite and its components are available
+at http://www.crosswire.org/sword/diatheke
+
+This suite consists of the following components:
+
+Diatheke - a command line utility, good for lots of stuff
+Diatheke/CGI - a PERL CGI module interface to Diatheke 4.0
+
+--------------------------------------------------------------------
+INSTALLING Diatheke/CGI
+
+To install Diatheke/CGI, first install PERL and a webserver such as
+Apache that is capable of running PERL CGIs.  Installing mod_perl is
+recommended for a speed improvement, but is by no means necessary.
+
+Then copy the two .pl files from the ./cgi directory of this
+distribution into your cgi-bin directory.  Modify the top of
+diatheke.pl to reflect the correct location of your your diatheke
+command line utility binary and the default font if necessary. The
+CGI is now installed and ready for access.
+
+diatheke.pl is the main lookup script.  dia-def.pl is a supplemental
+script used to set a default Bible translation (saved on the 
+user's computer as a cookie).
+
+Two sample HTML files are included as sample interfaces for an
+general Web-Bible gateway.  index-public.html includes all currently
+available free texts while index-private.html includes all currently
+available texts, including those which are encrypted because
+of copyright and distribution restrictions.  In any case, you should
+only use these as a guide, adding and subtracting modules depending
+on which modules you have installed and have permission to publish
+on the internet or your intranet.  The bottom section of each file
+includes an example call to the dia-def.pl script to set a default
+Bible version.
+
+You may also direct users directly to your perl script since it will
+present a page with all of your modules.  Or you may wish to use this
+default page to create a custom index.html for your users.
+
+----------------------------------------------------------------------
+VERSION HISTORY
+
+4.6     July 16, 2013
+	Updated for Sword 1.7.0.
+
+4.5
+
+4.0	July 8, 2001
+	Updated to Sword 1.5.2 with innumerable bug fixes.
+	Now builds properly for Win32 using VC++.
+	Diatheke/Tcl and HANDiatheke were omitted, for the moment
+	from this release, but are still available in the CVS.
+
+3.0	March 31, 2001
+	Self-generating HTML page for the lazy (Diatheke/CGI).
+	Localization support. (Diatheke and Diatheke/CGI).
+
+2.5	December 10, 2000
+	Now supports ThML.  Numerous bugfixes.
+	Includes Diatheke 3.0, Diatheke/CGI 3.0, Diatheke/Tcl 3.0,
+	and HANDiatheke 3.0 (initial version, but version-synced)
+
+2.0	October 23, 1999.
+	First public release, including Diatheke 2.0, Diatheke/CGI
+	2.0, and Diatheke/Tcl 2.5.
+
+-----------------------------------------------------------------------
+COPYRIGHT
+
+The Diatheke Suite and its components, Diatheke, Diatheke/CGI, and
+Diatheke/Tcl are Copyright 1999-2013 by CrossWire Bible Society.
+HANDiatheke is Copyright 2000-2001 by CrossWire Bible Society.
+The Diatheke Suite and all of its components are licensed through
+the GNU General Public License and are intended for free distribution.
+See http://www.gnu.org/copyleft/gpl.html for details.
+
diff --git a/utilities/diatheke/cgi/Makefile.am b/utilities/diatheke/cgi/Makefile.am
new file mode 100644
index 0000000..e006304
--- /dev/null
+++ b/utilities/diatheke/cgi/Makefile.am
@@ -0,0 +1,5 @@
+swcgidir = $(top_srcdir)/utilities/diatheke/cgi
+
+EXTRA_DIST = $(swcgidir)/dia-def.pl
+EXTRA_DIST += $(swcgidir)/diatheke.pl
+EXTRA_DIST += $(swcgidir)/index.html
diff --git a/utilities/diatheke/cgi/dia-def.pl b/utilities/diatheke/cgi/dia-def.pl
new file mode 100755
index 0000000..d50ef9b
--- /dev/null
+++ b/utilities/diatheke/cgi/dia-def.pl
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+#******************************************************************************
+#
+#  dia-def.pl -	
+#
+# $Id: dia-def.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+#change this variable to hostname of your server
+@values = split(/\&/,$ENV{'QUERY_STRING'});
+$DOMAIN = $ENV{'REMOTE_ADDR'};
+$EXPIRES = 'Fri Dec 31 23:59:00 GMT 2005';
+
+foreach $i (@values) {
+    ($varname, $mydata) = split(/=/,$i);
+    if ($varname eq "defversion") {
+	$COOKIE = "DEFTRANS=$mydata ; expires=$EXPIRES";
+    }
+    elsif ($varname eq "locale") {
+	$COOKIE = "LOCALE=$mydata ; expires=$EXPIRES";
+    }
+    elsif ($varname eq "settrans") {
+	$COOKIE = "SETTRANS=$mydata ; expires=$EXPIRES";
+    }
+    elsif ($varname eq "setcomm") {
+	$COOKIE = "SETCOMM=$mydata ; expires=$EXPIRES";
+    }
+    elsif ($varname eq "setld") {
+	$COOKIE = "SETLD=$mydata ; expires=$EXPIRES";
+    }
+}
+
+# Set the cookie and send the user the thank you page.
+print "Set-cookie: $COOKIE\n";
+print "Content-type: text/html\n\n";  #Note extra newline to mark
+                                        #end of header.
+
+print "<html><meta http-equiv=\"refresh\" content=\"0\; URL=$ENV{'HTTP_REFERER'}\"></html>";
+
+
+
+
+
+
+
+
+
diff --git a/utilities/diatheke/cgi/diatheke.pl b/utilities/diatheke/cgi/diatheke.pl
new file mode 100755
index 0000000..c15bdf6
--- /dev/null
+++ b/utilities/diatheke/cgi/diatheke.pl
@@ -0,0 +1,541 @@
+#!/usr/bin/perl
+
+#########################################################################
+### WARNING: This is for demonstration purposes only. Do not deploy
+###          this CGI on a live website. There are security issues.
+###          You will likely be hacked if you try to deploy this on a
+###          live site.
+###
+###          For a web Bible interface, please consider using
+###          SwordWeb, which can be also be installed on your
+###          server: http://www.crosswire.org/swordweb/
+########################################################################
+
+#******************************************************************************
+#
+#  diatheke.pl -
+#
+# $Id: diatheke.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+
+# Typical Linux/Unix settings
+$err = "2> /dev/null";
+$sword_path = "/home/sword";  # SWORD_PATH environment variable you want to use
+$diatheke = "nice /usr/bin/diatheke";  # location of diatheke command line program
+
+# Typical Windows settings
+#$err = "";
+#$sword_path = "C:\\Program Files\\CrossWire\\The SWORD Project";  # SWORD_PATH environment variable you want to use
+#$diatheke = "$sword_path\\diatheke.exe";  # location of diatheke command line program
+
+$cgiurl = "http:\/\/www.crosswire.org\/cgi-bin";
+
+$scriptname = "diatheke.pl";
+$defaultfontface = "Times New Roman, Times, Roman, serif"; # default font name
+$maxverses = 50; # maximum number of verses diatheke will return per query (prevents people from asking for Gen1:1-Rev22:21)
+$defaultbook = "KJV"; # book to query when none is selected, but a verse/search is entered
+$deflocale = "abbr";  # this is just the default for cases where user has not selected a locale and his browser does not reveal one -- you can also set locale using locale=<locale> in the GET URL
+
+###############################################################################
+## You should not need to edit anything below this line.
+## Unless you want to modify functionality of course. :)
+###############################################################################
+
+$version = "4.2";
+
+sub shell_escape {
+    my $input = shift;
+    my $result = '';
+
+    foreach my $i (split //, $input) {
+    if ($i eq "'") {
+        $result .= "'\\''";
+    } else {
+        $result .= $i;
+    }
+    }
+    return $result;
+}
+
+
+sub plussifyaddress  {
+    ($p_ver = @_[0]) =~ tr/ /+/; 
+    $p_newline = "<a href=\"$scriptname?verse=$p_ver&@_[1]=on\">";
+    return $p_newline;
+}
+
+sub urlvers {
+    $u_verse = @_[0];
+    $u_version = @_[1];
+    $u_oldverse = $u_verse;
+    $u_verse =~ tr/ /+/;
+    $u_newline = "<a href=\"$scriptname?verse=$u_verse&$u_version=on\">$u_oldverse</a>";
+    return $u_newline;
+}
+
+$ENV{'SWORD_PATH'} = $sword_path;
+
+print "Content-type: text/html\n\n";
+
+
+if ($ENV{'HTTP_COOKIE'}) {
+
+    $cookie = $ENV{'HTTP_COOKIE'};
+    $cookie =~ s/\; /=/g;
+    %cookiedata = split(/=/, $cookie);
+    
+    $defversion = $cookiedata{DEFTRANS};
+    $locale = $cookiedata{LOCALE};
+}
+
+if ($defversion eq "") {
+    $defversion = 'KJV';
+}
+if ($locale eq "") {
+    $locale = $ENV{'HTTP_ACCEPT_LANGUAGE'};
+    $locale =~ s/(..).*/$1/;
+    if ($locale eq "") {
+	$locale = $deflocale;
+    }
+    elsif ($locale eq "en") {
+	$locale = "abbr";
+    }
+}
+
+$locale = shell_escape($locale);
+$hostname = $ENV{'REMOTE_ADDR'};
+@values = split(/\&/,$ENV{'QUERY_STRING'});
+$n = 0;
+$palm = 0;
+
+$latinxlit = "";
+
+$optionfilters = "";
+$debug=1;
+foreach $i (@values) {
+    ($varname, $mydata) = split(/=/,$i);
+    if ($varname ne "Submit" && $varname ne "lookup") {
+	if ($varname eq "verse") {
+	    $verse = $mydata;
+	    $verse =~ tr/+/ /;
+	    $verse =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+            $verse = shell_escape($verse);
+	}
+	elsif ($varname eq "search" && $mydata ne "" && $mydata ne "off") {
+            $search = "-s '" . shell_escape($mydata) . "'";
+	}
+	elsif ($varname eq "range" && $mydata ne "" && $mydata ne "off") {
+	    $range = $mydata;
+	    $range =~ tr/+/ /;
+	    $range =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+	    $range = "-r '" . shell_escape($range) . "'";
+	}
+
+	elsif ($varname eq "strongs") {
+	    $optionfilters .= "n";
+	}
+	elsif ($varname eq "footnotes") {
+	    $optionfilters .= "f";
+	}
+	elsif ($varname eq "headings") {
+	    $optionfilters .= "h";
+	}
+	elsif ($varname eq "morph") {
+	    $optionfilters .= "m";
+	}	
+	elsif ($varname eq "hebcant") {
+	    $optionfilters .= "c";
+	}
+	elsif ($varname eq "hebvowels") {
+	    $optionfilters .= "v";
+	}
+	elsif ($varname eq "grkacc") {
+	    $optionfilters .= "a";
+	}
+	elsif ($varname eq "lemmas") {
+	    $optionfilters .= "l";
+	}	
+	elsif ($varname eq "scriprefs") {
+	    $optionfilters .= "s";
+	}
+	elsif ($varname eq "arshape") {
+	    $optionfilters .= "r";
+	}
+	elsif ($varname eq "bidi") {
+	    $optionfilters .= "b";
+	}
+
+	elsif ($varname eq "latinxlit") {
+	    $latinxlit = "-t Latin";
+	}	
+
+	elsif ($varname eq "palm") {
+	    $palm = 1;
+	}
+	elsif ($varname eq "debug") {
+	    $debug = 1;
+	}
+	elsif ($varname eq "locale") {
+	    $locale = shell_escape($mydata);
+	}
+	elsif ($varname eq "maxverses") {
+	    $maxverses = shell_escape($mydata);
+	}
+	elsif ($mydata eq "on" || $mydata eq "ON") {
+	    $versions[$n] = shell_escape($varname);
+	    $n++;
+	}
+    }
+}
+if ($optionfilters ne "") {
+    $optionfilters = "-o " . $optionfilters;
+}
+
+
+
+if ($n == 0) {
+    $versions[0] = $defaultbook;
+    $n++;
+}
+
+if ($verse eq "") {
+
+    @versionlist = `$diatheke -b system -k modulelist $err`;    
+    @versionlist2 = @versionlist;
+    @localelist = `$diatheke -b system -k localelist $err`;
+
+    print <<DEF1;
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Diatheke Online Bible</title>
+</head>
+
+<body>
+
+<form method="get" action="$scriptname">
+  <p /><input type="radio" name="search" checked value="" /><font face="Arial, Helvetica, sans-serif">Verse/Commentary Lookup&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+  Verse or Search key:</font><input type="text" name="verse" size="20"><input type="submit" name="Submit" value="Submit"><input type="reset" name="Reset" value="Reset"><br />
+  <input type="radio" name="search" value="phrase" /><font face="Arial, Helvetica, sans-serif">Phrase Search</font><br />
+  <input type="radio" name="search" value="multiword" /><font face="Arial, Helvetica, sans-serif">Multiple Word Search</font><br />
+  <input type="radio" name="search" value="regex" /><font face="Arial, Helvetica, sans-serif">Regular Expression Search</font><br />
+<br />
+  <table width="100%" border="0">
+    <tr> 
+      <td colspan="2" width="100%"> 
+
+      <table>
+      <tr>
+        <td> 
+          <font size="-1" face="Arial, Helvetica, sans-serif">Custom Range Restriction</font>
+        </td>
+        <td> 
+          <input type="text" name="range" size="20">
+        </td>
+      </tr>
+      </table>
+
+      </td>
+    </tr>
+
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="strongs" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Strong's Numbers</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="headings" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Section Headings</font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="footnotes" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Footnotes</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="scriprefs" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Scripture Cross-References</font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="morph" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Morphology</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="hebvowels" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Hebrew Vowels</font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="lemmas" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Lemmas</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="hebcant" value="on">
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Hebrew Cantillation 
+        Marks </font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="latinxlit" value="on">
+        <font face="Arial, Helvetica, sans-serif" size="-1">Latin Transliterate</font> 
+      </td>
+      <td width="50%"> 
+        <input type="checkbox" name="grkacc" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Greek Accents</font> 
+      </td>
+    </tr>
+  </table>
+  <br />
+  <table BORDER="0" WIDTH="100%">
+DEF1
+    
+    foreach $line (@versionlist) {
+	chomp($line);
+
+	if ($line eq "Biblical Texts:") {
+	    print "<tr><td><font face=$defaultfontface><b>Biblical Texts:</b></font><br /></td></tr>";
+	}
+	elsif ($line eq "Commentaries:") {
+	    print "<tr><td><font face=$defaultfontface><b>Commentaries:</b></font></td></tr>";
+	}
+	elsif ($line eq "Dictionaries:") {
+	    print "<tr><td><font face=$defaultfontface><b>Dictionaries & Lexica:</b></font></td></tr>";
+	}
+	else {
+	    $line =~ s/([^:]+) : (.+)/<tr><td><input type=\"checkbox\" name=\"$1\" value=\"on\"><font size=\"-1\" face=$defaultfontface>$2 ($1)<\/font><\/td><\/tr>/;
+	    print "$line\n";
+	}
+
+    }
+
+    print <<DEF2;
+        </table>
+</form>
+
+<form method="get" action="dia-def.pl">
+  Select default Bible version for cross-references:&nbsp;<select name="defversion" size="1">
+  
+DEF2
+    
+    $biblesflag = 1;
+    foreach $line (@versionlist2) {
+	if ($biblesflag == 1) {
+	    chomp ($line);
+	    if ($line eq "Biblical Texts:") {
+	    }
+	    elsif ($line eq "Commentaries:") {
+		$biblesflag = 0;
+	    }
+	    else {
+		$line =~ s/([^:]+) : (.+)/<option value=\"$1\">$2 ($1)<\/option>/;
+		print "$line\n";
+	    }
+	}
+    }
+
+    print <<DEF3;
+</select><input type="submit" name="Submit" value="Submit"></form><br/><form method="get" action="dia-def.pl">Select locale:&nbsp;
+<select name="locale" size="1"><option value="">browser default</option>
+<option value="en">en</option>
+DEF3
+    foreach $line (@localelist) {
+	chomp($line);
+	print "<option value=\"$line\">$line<\/option>";
+    }
+print <<DEF4
+</select>
+<input type="submit" name="Submit" value="Submit">
+</form>
+</body>
+</html>
+DEF4
+
+}
+else {
+
+
+
+if ($palm == 0) {
+print <<END;
+
+<html><head>
+<title>Diatheke Interlinear Bible</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="palmcomputingplatform" content="true">
+<meta name="historylisttext" content="Diatheke">
+<style type="text/css">
+#divBottom{position:absolute; visibility:hidden; font-family:arial,helvetica; height:30; width:100; font-size:10pt; font-weight:bold}
+A:link, A:visited, A:active{text-decoration: none}
+</style>
+<script type="text/javascript" language="JavaScript">
+/********************************************************************************
+Copyright (C) 1999 Thomas Brattli
+This script is made by and copyrighted to Thomas Brattli at www.bratta.com
+Visit for more great scripts. This may be used freely as long as this msg is intact!
+I will also appriciate any links you could give me.
+********************************************************************************/
+//Default browsercheck, added to all scripts!
+function checkBrowser(){
+    this.ver=navigator.appVersion;
+    this.dom=document.getElementById?1:0;
+    this.ie5=( (this.ver.indexOf("MSIE 6")>-1 || this.ver.indexOf("MSIE 5")>-1) && this.dom)?1:0;
+    this.ie4=(document.all && !this.dom)?1:0;
+    this.ns5=(this.dom && parseInt(this.ver) >= 5) ?1:0;
+    this.ns4=(document.layers && !this.dom)?1:0;
+    this.bw=(this.ie5 || this.ie4 || this.ns4 || this.ns5);
+    return this;
+}
+bw=new checkBrowser()
+/********************************************************************************
+Remeber to set the look of the divBottom layer in the stylesheet (if you wan't
+another font or something)
+********************************************************************************/
+/*Set these values, gright for how much from the right you wan't the layer to go
+and gbottom for how much from the bottom you want it*/
+var gright=160
+var gbottom=80
+
+
+
+/********************************************************************************
+Constructing the ChangeText object
+********************************************************************************/
+function makeObj(obj,nest){
+    nest=(!nest) ? '':'document.'+nest+'.';
+    this.css=bw.dom? document.getElementById(obj).style:bw.ie4?document.all[obj].style:bw.ns4?eval(nest+"document.layers." +obj):0;
+    this.moveIt=b_moveIt;
+}
+function b_moveIt(x,y){this.x=x; this.y=y; this.css.left=this.x; this.css.top=this.y}
+
+/********************************************************************************
+Initilizing the page, getting height and width to moveto and calls the 
+object constructor
+********************************************************************************/
+    function geoInit(){
+	oGeo=new makeObj('divBottom');
+	pageWidth=(bw.ie4 || bw.ie5)?document.body.offsetWidth-4:innerWidth;
+	pageHeight=(bw.ie4 || bw.ie5)?document.body.offsetHeight-2:innerHeight;
+	checkIt();
+	// sets the resize handler.
+	onresize=resized;
+	if(bw.ie4 || bw.ie5) window.onscroll=checkIt;
+	// shows the div
+	oGeo.css.visibility='visible';
+    }
+/********************************************************************************
+This function executes onscroll in ie and every 30 millisecond in ns
+and checks if the user have scrolled, and if it has it moves the layer.
+********************************************************************************/
+function checkIt(){
+    if(bw.ie4 || bw.ie5) oGeo.moveIt(document.body.scrollLeft +pageWidth-gright,document.body.scrollTop+pageHeight-gbottom);
+    else if(bw.ns4){
+	oGeo.moveIt(window.pageXOffset+pageWidth-gright, window.pageYOffset+pageHeight-gbottom);
+	setTimeout('checkIt()',30);
+    }
+}
+
+//Adds a onresize event handler to handle the resizing of the window.
+function resized(){
+    pageWidth=(bw.ie4 || bw.ie5)?document.body.offsetWidth-4:innerWidth;
+    pageHeight=(bw.ie4 || bw.ie5)?document.body.offsetHeight-2:innerHeight;
+    if(bw.ie4 || bw.ie5) checkIt()
+}
+
+
+//Calls the geoInit onload
+if(bw.bw && !bw.ns5) onload=geoInit;
+
+//Here we will write the div out so that lower browser won't see it.'
+if(bw.bw && !bw.ns5) document.write('<div id="divBottom"><table><tr><td align="center">Powered by<br /><img src="http://www.crosswire.org/sword/pbsword.gif"><br /><a href="http://www.crosswire.org/">www.crosswire.org</td></tr></table></div>')
+</script>
+
+</head>
+
+<body bgcolor="#FFFFFF"><font face="$defaultfontface">
+
+END
+}
+else {
+print <<END
+
+<html><head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="palmcomputingplatform" content="true">
+<meta name="historylisttext" content="HANDiatheke">
+</head>
+<body bgcolor="#FFFFFF"><font face="$defaultfontface">
+END
+}
+for ($i = 0; $i < $n; $i++) {
+    
+    $line = "$diatheke $search $range $optionfilters $latinxlit -l '$locale' -m '$maxverses' -f cgi -b '$versions[$i]' -k '$verse' $err";
+
+    if ($debug) {
+	print "<br /><i>command line: $line\n</i><br /><br />";
+    }
+    $line = `$line`;
+
+    chomp($line);
+
+    $line =~ s/!DIATHEKE_URL!/$scriptname\?/g;
+
+#    Parse and link to Strong's references if present
+    
+    $info = `$diatheke -b info -k '$versions[$i]' $err`;
+    $info =~ /([^\;]+)\;([^\;]+)/;
+    $format = $1;
+    $type = $2;
+    
+    if ($versions[$i] eq "StrongsHebrew") {
+	$line =~ s/(see HEBREW for )([0-9]+)/<a href=\"$scriptname?verse=$2&StrongsHebrew=on\">$1$2\<\/a\>/g;
+    }
+    elsif($versions[$i] eq "StrongsGreek") {
+	$line =~ s/(see GREEK for )([0-9]+)/<a href=\"$scriptname?verse=$2&StrongsGreek=on\">$1$2\<\/a\>/g;
+    }
+    #case for searches
+    elsif($search ne "") {
+	$line =~ s/<entry>([^<]+)<\/entry>/urlvers($1, $versions[$i])/eg;
+    }
+    #case for non-ThML, non-Bible texts
+    elsif($type ne "Biblical Texts") {
+	$book = $verse;
+	$book =~ s/^([A-Za-z0-9]+) [0-9]+:[0-9]+.*/$1/;
+	$chapter = $verse;
+	$chapter =~ s/[A-Za-z0-9]+ ([0-9]+):[0-9]+.*/$1/;
+	$line =~ s/\#*([1-9]*[A-Z][a-z]+\.*) ([0-9]+):([0-9]+-*,*[0-9]*)\|*/<a href=\"$scriptname?verse=$1+$2%3A$3&$defversion=on\">$1 $2:$3\<\/a\>/g;
+	$line =~ s/\#([0-9]+):([0-9]+-*,*[0-9]*)\|*/<a href=\"$scriptname?verse=$book+$1%3A$2&$defversion=on\">$book $1:$2\<\/a\>/g;
+	$line =~ s/\#([0-9]+-*,*[0-9]*)\|*/<a href=\"$scriptname?verse=$book+$chapter%3A$1&$defversion=on\">$book $chapter:$1\<\/a\>/g;
+    }
+
+    if ($locale ne "abbr") {
+	$line =~ s/href=\"$scriptname([^\"]+)\"/href=\"$scriptname$1&locale=$locale\"/g;
+    }
+    if ($palm == 1) {
+	$line =~ s/href=\"$scriptname([^\"]+)\"/href=\"$cgiurl\/$scriptname$1&palm=on\"/g;
+    }
+
+    print "$line <br /><br />\n";
+}
+
+if ($palm == 1) {
+    print "<hr>Powered by Diatheke (http:\/\/www.gotjesus.org\/sword\/diatheke) and the SWORD Project (http:\/\/www.crosswire.org\/sword).";
+}
+
+print "<br /><br /><br /><br /></font></body></html>";
+
+}
+
+
diff --git a/utilities/diatheke/cgi/index.html b/utilities/diatheke/cgi/index.html
new file mode 100644
index 0000000..8406364
--- /dev/null
+++ b/utilities/diatheke/cgi/index.html
@@ -0,0 +1,883 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Diatheke Online Bible</title>
+</head>
+
+<body>
+
+<form method="get" action="cgi-bin/diatheke.pl">
+  <p /> <font face="Arial, Helvetica, sans-serif">Verse or Search key:</font> 
+    <input type="text" name="verse" size="20">
+    <input type="submit" name="Submit" value="Submit">
+    <input type="reset" name="Reset" value="Reset">
+    <br />
+    <br />
+    <input type="radio" name="search" checked value="" />
+    <font face="Arial, Helvetica, sans-serif">Verse/Commentary Lookup</font> <br />
+    <input type="radio" name="search" value="phrase" />
+    <font face="Arial, Helvetica, sans-serif">Phrase Search</font><br />
+    <input type="radio" name="search" value="multiword" />
+    <font face="Arial, Helvetica, sans-serif">Multiple Word Search</font><br />
+    <input type="radio" name="search" value="regex" />
+    <font face="Arial, Helvetica, sans-serif">Regular Expression Search</font> 
+    <br>
+  <p />&nbsp; 
+  <table width="100%" border="0">
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="strongs" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Strong's Numbers</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="headings" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Section Headings</font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="footnotes" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Footnotes</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="scriprefs" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Scripture Cross-References</font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="morph" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Morphology</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="hebvowels" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Hebrew Vowels</font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="lemmas" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Lemmas</font></td>
+      <td width="50%"> 
+        <input type="checkbox" name="hebcant" value="on">
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Hebrew Cantillation 
+        Marks </font></td>
+    </tr>
+    <tr> 
+      <td width="50%"> 
+        <input type="checkbox" name="latinxlit" value="on">
+        <font face="Arial, Helvetica, sans-serif" size="-1">Latin Transliterate</font> 
+      </td>
+      <td width="50%"> 
+        <input type="checkbox" name="grkacc" value="on" checked>
+        <font size="-1" face="Arial, Helvetica, sans-serif">Show Greek Accents</font> 
+      </td>
+    </tr>
+  </table>
+  <br>
+  <table BORDER="0" WIDTH="100%">
+    <tr> 
+      <td width="48%"><font face=Times New Roman, Times, serif><b>English Biblical 
+        Texts:</b></font><br />
+      </td>
+      <td width="51%"><font face=Times New Roman, Times, serif><b>Non-English 
+        Biblical Texts:</b></font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="AKJV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>American King James 
+        Version (AKJV)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="ALB" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Albanian Bible (ALB)</font> 
+      </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="ASV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1901 American Standard 
+        Version (ASV)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="AraSVD" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Smith & Van Dyke Arabic 
+        Bible (AraSVD)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="BBE" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1965 Bible in Basic 
+        English (BBE)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="ChiGU" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Chinese Glory Union 
+        Bible (ChiGU)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Common" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>The Common Edition: 
+        New Testament (Common)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="CzeBKR" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Czech Bible Kralicka 
+        (CzeBKR)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="DR" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Douay-Rheims Bible 
+        (DR)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="CzeCEP" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Czech Ekumenicky Cesky 
+        preklad (CzeCEP)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="DRA" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Douay-Rheims 1899 American 
+        Edition (DRA)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="CzeKMS" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Czech Preklad KMS Nova 
+        smlouva (CzeKMS)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Darby" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1889 Darby Bible (Darby)</font> 
+      </td>
+      <td width="51%"> 
+        <input type="checkbox" name="CzeNKB" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Czech Nova kralicka 
+        Bible (CzeNKB)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="HNV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Hebrew Names Version 
+        of the World English Bible (HNV)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="Dan" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Danske Bibel (Dan)</font> 
+      </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="IGNT" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Interlinear Greek New 
+        Testament (IGNT)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="Esperanto" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Esperanto Bible (Esperanto)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="ISV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>International Standard 
+        Version (ISV)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="FinPR" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Finnish 1938 PhyZ Raamattu 
+        (FinPR)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="JPS" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Jewish Publication 
+        Society Old Testament (JPS)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="FreCrl" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>French Haitian Creole 
+        Version (FreCrl)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="KJV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>King James Version 
+        of 1611 w/ Strongs Numbers (KJV)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="FreLSG" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>French 1910 Louis Segond 
+        (FreLSG)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="LO" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>The Living Oracles 
+        NT (LO)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="GerBen" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>German Bengel NT (GerBen)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Montgomery" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Montgomery New Testament 
+        (Montgomery)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="GerLut" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>German 1912 Luther 
+        (GerLut)</font> </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Murdock" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>James Murdock's Translation 
+        of the Syriac Peshitta (Murdock)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="GerLut1545" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>German 1545 Luther 
+        (GerLut1545)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="ORTHJBC" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>The Orthodox Jewish 
+        Brit Chadasha (ORTHJBC)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="GerSch" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>German 1951 Schlachter 
+        Bibel (GerSch)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="RNKJV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Restored Name King 
+        James Version (RNKJV)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="GothicA" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Gothic Codex Ambr. 
+        A & Mss. (GothicA)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="RWebster" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Revised 1833 Webster 
+        Version (RWebster)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="GothicB" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Gothic Codex Ambr. 
+        B & Car. (GothicB)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Rotherham" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>The Emphasized Bible 
+        by J. B. Rotherham (Rotherham)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="HunKar" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Hungarian Karoli (HunKar)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="WEB" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>World English Bible 
+        (WEB)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Icelandic" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Icelandic Bible (Icelandic)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Websters" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Webster Bible (Websters)</font> 
+      </td>
+      <td width="51%"> 
+        <input type="checkbox" name="IndBIS" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Indonesian Bahasa Indonesia 
+        Sehari-hari (IndBIS)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Weymouth" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1912 Weymouth NT (Weymouth)</font> 
+      </td>
+      <td width="51%"> 
+        <input type="checkbox" name="IndTB" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Indonesian Terjemahan 
+        Baru (IndTB)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="YLT" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1898 Young's Literal 
+        Translation (YLT)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="IndTL" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Indonesian Terjemahan 
+        Baru (IndTL)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%">&nbsp; </td>
+      <td width="51%"> 
+        <input type="checkbox" name="ItaLND" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Italian 1991 La Nuova 
+        Diodati (ItaLND)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"><font face=Times New Roman, Times, serif><b>Unorthodox or 
+        Heretical Biblical Texts:</b></font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="ItaNRV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Italian 1994 La Sacra 
+        Bibbia Nuova Riveduta (ItaNRV)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Diaglott" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>The Emphatic Diaglott 
+        (Diaglott)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="JapKUG" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Japanese JKUG Translation 
+        (JapKUG)</font> </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="JST" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Joseph Smith Translation 
+        (JST)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="JapSNKI" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Japanese JSNKI Translation 
+        (JapSNKI)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%">&nbsp; </td>
+      <td width="51%"> 
+        <input type="checkbox" name="Ketchi" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Ketchi Bible (Ketchi)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"><font face=Times New Roman, Times, serif><b>Original Language 
+        Biblical Texts:</b></font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="Korean" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Korean Bible (Korean)</font></td>
+    </tr>
+    <tr> 
+      <td width="51%"> 
+        <input type="checkbox" name="LXX" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Septuagint (LXX)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Latvian" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Latvian New Testament 
+        (Latvian)</font> </td>
+    </tr>
+    <tr> 
+      <td width="51%"> 
+        <input type="checkbox" name="LXXM" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Septuagint, Morphologically 
+        Tagged Rahlfs' (LXXM)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="ManxGaelic" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Manx Gaelic Scripture 
+        Portions (ManxGaelic)</font></td>
+    </tr>
+    <tr> 
+      <td width="51%"> 
+        <input type="checkbox" name="BHS" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Biblia Hebraica Stuttgartensia 
+        (BHS)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="Maori" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Maori Bible (Maori)</font></td>
+    </tr>
+    <tr> 
+      <td width="51%"> 
+        <input type="checkbox" name="Byz" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1991 Byzantine/Majority 
+        Text (Byz)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Mel" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Melanesian Pidgin Bible 
+        (Mel)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Scrivner" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1894 Scrivener Textus 
+        Receptus (Scrivner)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Norsk" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Norsk Bibelen (Norsk)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Stephanus" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1550 Stephanus Textus 
+        Receptus (Stephanus)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="PorAA" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Portuguese Joao Ferreira 
+        de Almeida Atualizada (PorAA)</font> </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Tisch" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Tischendorf's Eighth 
+        Edition GNT (Tisch)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="RST" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Russian Synodal Translation 
+        (RST)</font></td>
+    </tr>
+    <tr> 
+      <td width="51%"> 
+        <input type="checkbox" name="Vulgate" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Latin Vulgate (Vulgate)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="RomCor" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Romanian Cornilescu 
+        Version (RomCor)</font></td>
+    </tr>
+    <tr> 
+      <td width="51%"> 
+        <input type="checkbox" name="Vulgate_HebPs" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Latin Vulgate Psalms 
+        from Hebrew (Vulgate_HebPs)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="ScotsGaelic" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Scots Gaelic Gospel 
+        of Mark (ScotsGaelic)</font></td>
+    </tr>
+    <tr> 
+      <td width="51%"> 
+        <input type="checkbox" name="WH" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1881 Westcott-Hort 
+        Greek Text (WH)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="SpaRV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Spanish Reina-Valera 
+        (SpaRV)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="WHNU" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Westcott-Hort with 
+        NA27U4 variants (WHNU)</font> </td>
+      <td width="51%"> 
+        <input type="checkbox" name="SpaSEV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Spanish 1569 Sagradas 
+        Escrituras Version Antigua (SpaSEV)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%">&nbsp;</td>
+      <td width="51%"> 
+        <input type="checkbox" name="SpaVNT" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Spanish 1858 Valera 
+        New Testament (SpaVNT)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"><font face=Times New Roman, Times, serif><b>Commentaries:</b></font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Swahili" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Swahili New Testament 
+        (Swahili)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Barnes" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Barnes' New Testament 
+        Notes (Barnes)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="SweSVE" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Swedish Bible 1917 
+        New Testament (SweSVE)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Clarke" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Adam Clarke's Commentary 
+        on the Bible (Clarke)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Tagalog" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Tagalog (John & James) 
+        (Tagalog)</font> </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="DTN" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Darby Translation Notes 
+        (DTN)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="ThaiKJV" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Thai KJV (ThaiKJV)</font> 
+      </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Family" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Family Bible Notes 
+        (Family)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Turkish" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Turkish NT (Turkish)</font> 
+      </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Geneva" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Geneva Bible Translation 
+        Notes (Geneva)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="UMGreek" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Unaccented Modern Greek 
+        Text (UMGreek)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="JFB" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Jamieson Fausset Brown 
+        Bible Commentary (JFB)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Ukrainian" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Ukrainian Bible (Ukrainian)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="MAK" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Matthias Ansorgs Kommentar 
+        (MAK)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Uma" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Uma New Testament (Uma)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="MHC" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Matthew Henry's Complete 
+        Commentary on the Whole Bible (MHC)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Viet" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1934 Vietnamese Bible 
+        (Viet)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="MHCC" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Matthew Henry's Concise 
+        Commentary on the Whole Bible (MHCC)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Xhosa" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Xhosa Bible (Xhosa)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="PNT" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>The People's New Testament 
+        (PNT)</font></td>
+      <td width="51%">&nbsp;</td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Personal" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Personal Commentary 
+        (Personal)</font></td>
+      <td width="51%"><font face=Times New Roman, Times, serif><b>Daily Devotionals:</b></font> 
+      </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="RWP" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Robertson's Word Pictures 
+        (RWP)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="Daily" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Jonathan Bagster's 
+        Daily Light on the Daily Path (Daily)</font> </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Rieger" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Carl Heinrich Riegers 
+        Kommentar (Rieger)</font></td>
+      <td width="51%"> 
+        <input type="checkbox" name="SME" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>C. H. Spurgeon's Morning 
+        and Evening: Daily Readins (SME)</font> </td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="TDavid" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>C. H. Spurgeon's Treasury 
+        of David (TDavid)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_89" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1989 Losung auf deutsch 
+        (losung_de_89)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="TFG" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>The Fourfold Gospel 
+        and Commentary on Acts of Apostles (TFG)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_90" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1990 Losung auf deutsch 
+        (losung_de_90)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="TSK" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Treasury of Scriptural 
+        Knowledge (TSK)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_91" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1991 Losung auf deutsch 
+        (losung_de_91)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Wesley" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>John Wesley's Notes 
+        on the Bible (Wesley)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_92" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1992 Losung auf deutsch 
+        (losung_de_92)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%">&nbsp;</td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_93" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1993 Losung auf deutsch 
+        (losung_de_93)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"><font face=Times New Roman, Times, serif><b>Dictionaries 
+        & Lexica:</b></font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_94" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1994 Losung auf deutsch 
+        (losung_de_94)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="AmTract" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>American Tract Society 
+        Bible Dictionary (AmTract)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_95" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1995 Losung auf deutsch 
+        (losung_de_95)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="BDB" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Brown-Driver-Briggs 
+        Hebrew Lexicon (BDB)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_96" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1996 Losung auf deutsch 
+        (losung_de_96)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Eastons" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Easton's Bible Dictionary 
+        (Eastons)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_97" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1997 Losung auf deutsch 
+        (losung_de_97)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Hitchcocks" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Hitchcock's Bible Names 
+        (Hitchcocks)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_98" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1998 Losung auf deutsch 
+        (losung_de_98)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="ISBE" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>International Standard 
+        Bible Encyclopedia (ISBE)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_de_99" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1999 Losung auf deutsch 
+        (losung_de_99)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Naves" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Nave's Topical Bible 
+        (Naves)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_en_96" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1996 Watchwords (Losung) 
+        in English (losung_en_96)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Packard" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Packard's Morphological 
+        Analysis Codes (Packard)</font></td>
+      <td width="48%" height="23"> 
+        <input type="checkbox" name="losung_en_97" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1997 Watchwords (Losung) 
+        in English (losung_en_97)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Smiths" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Smith's Bible Dictionary 
+        (Smiths)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_en_98" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1998 Watchwords (Losung) 
+        in English (losung_en_98)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="StrongsGreek" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Strong's Greek Bible 
+        Dictionary (StrongsGreek)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_en_99" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1999 Watchwords (Losung) 
+        in English (losung_en_99)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="StrongsHebrew" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Strong's Hebrew Bible 
+        Dictionary (StrongsHebrew)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_es_99" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1999 Watchwords (Losung) 
+        en Castellano (losung_es_99)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Thayer" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Thayer's Greek Lexicon 
+        (Thayer)</font></td>
+      <td width="48%"> 
+        <input type="checkbox" name="losung_nl_99" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>1999 Watchwords (Losung) 
+        in Dutch (losung_nl_99)</font></td>
+    </tr>
+    <tr> 
+      <td width="48%"> 
+        <input type="checkbox" name="Torrey" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>R. A. Torrey's New 
+        Topical Textbook (Torrey)</font></td>
+      <td width="51%">&nbsp;</td>
+    </tr>
+    <tr> 
+      <td width="48%" height="23"> 
+        <input type="checkbox" name="WebstersDict" value="on">
+        <font size="-1" face=Times New Roman, Times, serif>Webster's Revised Unabridged 
+        Dictionary 1913 (WebstersDict)</font> </td>
+      <td width="51%">&nbsp;</td>
+    </tr>
+  </table>
+</form>
+
+<form method="get" action="cgi-bin/dia-def.pl">
+  Select default Bible version for cross-references:&nbsp;<select name="defversion" size="1">
+  
+<option value="AKJV">American King James Version (AKJV)</option>
+<option value="ASV">1901 American Standard Version (ASV)</option>
+<option value="AraSVD">Smith & Van Dyke Arabic Bible (AraSVD)</option>
+<option value="BBE">1965 Bible in Basic English (BBE)</option>
+<option value="BHS">Biblia Hebraica Stuttgartensia (BHS)</option>
+<option value="Byz">1991 Byzantine/Majority Text (Byz)</option>
+<option value="ChiGU">Chinese Glory Union Bible (ChiGU)</option>
+<option value="Common">The Common Edition: New Testament (Common)</option>
+<option value="CzeBKR">Czech Bible Kralicka (CzeBKR)</option>
+<option value="CzeCEP">Czech Ekumenicky Cesky preklad (CzeCEP)</option>
+<option value="CzeKMS">Czech Preklad KMS Nova smlouva (CzeKMS)</option>
+<option value="CzeNKB">Czech Nova kralicka Bible (CzeNKB)</option>
+<option value="DR">Douay-Rheims Bible (DR)</option>
+<option value="DRA">Douay-Rheims 1899 American Edition (DRA)</option>
+<option value="Dan">Danske Bibel (Dan)</option>
+<option value="Darby">1889 Darby Bible (Darby)</option>
+<option value="Diaglott">The Emphatic Diaglott (Diaglott)</option>
+<option value="Esperanto">Esperanto Bible (Esperanto)</option>
+<option value="FinPR">Finnish 1938 PhyZ Raamattu (FinPR)</option>
+<option value="FreCrl">French Haitian Creole Version (FreCrl)</option>
+<option value="FreLSG">1910 Louis Segond (FreLSG)</option>
+<option value="FreNEG">French Nouvelle Edition de Geneve 1979 (FreNEG)</option>
+<option value="FreTOB">French Traduction oecumenique de la Bible (FreTOB)</option>
+<option value="GerBen">German Bengel NT (GerBen)</option>
+<option value="GerLut">German 1912 Luther (GerLut)</option>
+<option value="GerLut1545">German 1545 Luther (GerLut1545)</option>
+<option value="GerSch">German 1951 Schlachter Bibel (GerSch)</option>
+<option value="GothicA">Gothic Codex Ambr. A & Mss. (GothicA)</option>
+<option value="GothicB">Gothic Codex Ambr. B & Car. (GothicB)</option>
+<option value="HNV">Hebrew Names Version of the World English Bible (HNV)</option>
+<option value="HunKar">Hungarian Karoli (HunKar)</option>
+<option value="IGNT">Interlinear Greek New Testament (IGNT)</option>
+<option value="ISV">International Standard Version (ISV)</option>
+<option value="Icelandic">Icelandic Bible (Icelandic)</option>
+<option value="IndBIS">Indonesian Bahasa Indonesia Sehari-hari (IndBIS)</option>
+<option value="IndTB">Indonesian Terjemahan Baru (IndTB)</option>
+<option value="IndTL">Indonesian Terjemahan Baru (IndTL)</option>
+<option value="ItaLND">Italian 1991 La Nuova Diodati (ItaLND)</option>
+<option value="ItaNRV">Italian 1994 La Sacra Bibbia Nuova Riveduta (ItaNRV)</option>
+<option value="JPS">Jewish Publication Society Old Testament (JPS)</option>
+<option value="JST">Joseph Smith Translation (JST)</option>
+<option value="JapKUG">Japanese JKUG Translation (JapKUG)</option>
+<option value="JapSNKI">Japanese JSNKI Translation (JapSNKI)</option>
+<option value="KJV">King James Version of 1611 w/ Strongs Numbers (KJV)</option>
+<option value="Ketchi">Ketchi Bible (Ketchi)</option>
+<option value="Korean">Korean Bible (Korean)</option>
+<option value="LO">The Living Oracles NT (LO)</option>
+<option value="LXX">Septuagint (LXX)</option>
+<option value="LXXM">Septuagint, Morphologically Tagged Rahlfs' (LXXM)</option>
+<option value="Latvian">Latvian New Testament (Latvian)</option>
+<option value="ManxGaelic">Manx Gaelic Scripture Portions (ManxGaelic)</option>
+<option value="Maori">Maori Bible (Maori)</option>
+<option value="Mel">Melanesian Pidgin Bible (Mel)</option>
+<option value="Montgomery">Montgomery New Testament (Montgomery)</option>
+<option value="Murdock">James Murdock's Translation of the Syriac Peshitta (Murdock)</option>
+<option value="Norsk">Norsk Bibelen (Norsk)</option>
+<option value="ORTHJBC">The Orthodox Jewish Brit Chadasha (ORTHJBC)</option>
+<option value="PorAA">Portuguese Joao Ferreira de Almeida Atualizada (PorAA)</option>
+<option value="RNKJV">Restored Name King James Version (RNKJV)</option>
+<option value="RST">Russian Synodal Translation (RST)</option>
+<option value="RWebster">Revised 1833 Webster Version (RWebster)</option>
+<option value="RomCor">Romanian Cornilescu Version (RomCor)</option>
+<option value="Rotherham">The Emphasized Bible by J. B. Rotherham (Rotherham)</option>
+<option value="ScotsGaelic">Scots Gaelic Gospel of Mark (ScotsGaelic)</option>
+<option value="Scrivner">1894 Scrivener Textus Receptus (Scrivner)</option>
+<option value="SpaRV">Spanish Reina-Valera (SpaRV)</option>
+<option value="SpaSEV">Spanish 1569 Sagradas Escrituras Version Antigua (SpaSEV)</option>
+<option value="SpaVNT">Spanish 1858 Valera New Testament (SpaVNT)</option>
+<option value="Stephanus">1550 Stephanus Textus Receptus (Stephanus)</option>
+<option value="Swahili">Swahili New Testament (Swahili)</option>
+<option value="SweSVE">Swedish Bible 1917 New Testament (SweSVE)</option>
+<option value="Tagalog">Tagalog (John & James) (Tagalog)</option>
+<option value="ThaiKJV">Thai KJV (ThaiKJV)</option>
+<option value="Tisch">Tischendorf's Eighth Edition GNT (Tisch)</option>
+<option value="Turkish">Turkish NT (Turkish)</option>
+<option value="UMGreek">Unaccented Modern Greek Text (UMGreek)</option>
+<option value="Ukrainian">Ukrainian Bible (Ukrainian)</option>
+<option value="Uma">Uma New Testament (Uma)</option>
+<option value="Viet">1934 Vietnamese Bible (Viet)</option>
+<option value="Vulgate">Latin Vulgate (Vulgate)</option>
+<option value="Vulgate_HebPs">Latin Vulgate Psalms from Hebrew (Vulgate_HebPs)</option>
+<option value="WEB">World English Bible (WEB)</option>
+<option value="WH">1881 Westcott-Hort Greek Text (WH)</option>
+<option value="WHNU">Westcott-Hort with NA27U4 variants (WHNU)</option>
+<option value="Websters">Webster Bible (Websters)</option>
+<option value="Weymouth">1912 Weymouth NT (Weymouth)</option>
+<option value="Xhosa">Xhosa Bible (Xhosa)</option>
+<option value="YLT">1898 Young's Literal Translation (YLT)</option>
+</select><input type="submit" name="Submit" value="Submit"></form><br/><form method="get" action="cgi-bin/dia-def.pl">Select locale:&nbsp;
+<select name="locale" size="1"><option value="">browser default</option>
+<option value="en">en</option>
+<option value="de">de</option>
+<option value="pt">pt</option>
+<option value="sk">sk</option>
+<option value="cs">cs</option>
+<option value="da">da</option>
+<option value="no">no</option>
+</select>
+<input type="submit" name="Submit" value="Submit">
+</form>
+<font face="Arial, Helvetica, sans-serif">Many of these modules require a browser with good Unicode support such as Internet Explorer 5.0+ and a good Unicode font such as Code 2000 (available at <a href="http://home.att.net/~jameskass/">http://home.att.net/~jameskass/</a>.)</font>
+</body>
+</html>
diff --git a/utilities/diatheke/corediatheke.cpp b/utilities/diatheke/corediatheke.cpp
new file mode 100644
index 0000000..37f9448
--- /dev/null
+++ b/utilities/diatheke/corediatheke.cpp
@@ -0,0 +1,467 @@
+/******************************************************************************
+ *
+ *  corediatheke.cpp -	
+ *
+ * $Id: corediatheke.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/******************************************************************************
+ * Diatheke by Chris Little <chrislit@crosswire.org>
+ * http://www.crosswire.org/sword/diatheke
+ */
+
+#include "corediatheke.h"
+#include <regex.h>
+#include <list>
+#include <utilstr.h>
+#include <versekey.h>
+#include <swmodule.h>
+
+using std::list;
+using std::cout;
+using std::endl;
+using std::ostream;
+
+void systemquery(const char * key, ostream* output){
+	DiathekeMgr manager;
+	ModMap::iterator it;
+
+	SWModule *target;
+	
+	bool types = false, descriptions = false, names = false;
+
+	if (!::stricmp(key, "localelist")) {		
+		LocaleMgr *lm = LocaleMgr::getSystemLocaleMgr();
+		list<SWBuf> loclist =	lm->getAvailableLocales();
+		list<SWBuf>::iterator li = loclist.begin();
+		for (;li != loclist.end(); li++) {
+		  *output << li->c_str() << endl;
+		}
+	}
+	else if (!::stricmp(key, "modulelist")) {
+		types = true;
+		descriptions = true;
+		names = true;
+	}
+	else if (!::stricmp(key, "modulelistnames")) {
+		names = true;
+	}
+	else if (!::stricmp(key, "modulelistdescriptions")) {
+		descriptions = true;
+	}
+	
+	
+	if (types || descriptions || names) {
+		if (types) *output << "Biblical Texts:\n";
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+			target = it->second;
+			if (!strcmp(target->getType(), "Biblical Texts")) {
+				if (names) *output << target->getName();
+				if (names && descriptions) *output << " : ";
+				if (descriptions) *output << target->getDescription();
+				*output << endl;
+			}
+		}
+		if (types) *output << "Commentaries:\n";
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+			target = it->second;
+			if (!strcmp(target->getType(), "Commentaries")) {
+				if (names) *output << target->getName();
+				if (names && descriptions) *output << " : ";
+				if (descriptions) *output << target->getDescription();
+				*output << endl;
+			}
+		}
+		if (types) *output << "Dictionaries:\n";
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+			target = it->second;
+			if (!strcmp(target->getType(), "Lexicons / Dictionaries")) {
+				if (names) *output << target->getName();
+				if (names && descriptions) *output << " : ";
+				if (descriptions) *output << target->getDescription();
+				*output << endl;
+			}
+		}
+		if (types) *output << "Generic books:\n";
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+			target = it->second;
+			if (!strcmp(target->getType(), "Generic Books")) {
+				if (names) *output << target->getName();
+				if (names && descriptions) *output << " : ";
+				if (descriptions) *output << target->getDescription();
+				*output << endl;
+			}
+		}
+
+	}
+}
+
+void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAIN, unsigned char outputencoding = ENC_UTF8, unsigned long optionfilters = 0, unsigned char searchtype = ST_NONE, const char *range = 0, const char *text = 0, const char *locale = 0, const char *ref = 0, ostream* output = &cout, const char *script = 0, signed char variants = 0) {
+	static DiathekeMgr manager(NULL, NULL, false, outputencoding, outputformat,
+		((OP_BIDI & optionfilters) == OP_BIDI),
+		((OP_ARSHAPE & optionfilters) == OP_ARSHAPE));
+
+	ModMap::iterator it;
+	ListKey listkey;
+	SectionMap::iterator sit;
+	ConfigEntMap::iterator eit;
+
+	SWModule *target;
+	char *font = 0;
+	char inputformat = 0;
+	SWBuf encoding;
+	char querytype = 0;
+
+	if (locale) {
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale);
+	}
+
+	//deal with queries to "system"
+	if (!::stricmp(text, "system")) {
+		querytype = QT_SYSTEM;
+		systemquery(ref, output);
+	}
+	if (!strnicmp(text, "info", 4)) {
+	        querytype = QT_INFO;
+		text = ref;
+	}
+	//otherwise, we have a real book
+	it = manager.Modules.find(text);
+	if (it == manager.Modules.end()) { //book not found
+		return;
+	}
+	target = (*it).second;
+	SWKey *p = target->createKey();
+        VerseKey *parser = SWDYNAMIC_CAST(VerseKey, p);
+	if (!parser) {
+        	delete p;
+	        parser = new VerseKey();
+	}
+
+	if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) {
+		if ((eit = (*sit).second.find("SourceType")) != (*sit).second.end()) {
+			if (!::stricmp((char *)(*eit).second.c_str(), "GBF"))
+				inputformat = FMT_GBF;
+			else if (!::stricmp((char *)(*eit).second.c_str(), "ThML"))
+				inputformat = FMT_THML;
+			else if (!::stricmp((char *)(*eit).second.c_str(), "OSIS"))
+				inputformat = FMT_OSIS;
+			else if (!::stricmp((char *)(*eit).second.c_str(), "TEI"))
+				inputformat = FMT_TEI;
+		}
+		encoding = ((eit = (*sit).second.find("Encoding")) != (*sit).second.end()) ? (*eit).second : (SWBuf)"";
+	}
+
+
+	if (querytype == QT_INFO) {
+	  switch (inputformat) {
+	  case FMT_THML :
+	    *output << "ThML";
+	    break;
+	  case FMT_GBF :
+	    *output << "GBF";
+	    break;
+	  case FMT_OSIS :
+	    *output << "OSIS";
+	    break;
+	  case FMT_TEI :
+	    *output << "TEI";
+	    break;
+	  default:
+	    *output << "Other";
+	  }
+	  *output << ";";
+	  *output << target->getType();
+	  *output << ";";
+	  delete parser;
+	  return;
+	}
+
+	if (searchtype)
+		querytype = QT_SEARCH;
+	else if (!strcmp(target->getType(), "Biblical Texts"))
+		querytype = QT_BIBLE;
+	else if (!strcmp(target->getType(), "Commentaries"))
+		querytype = QT_COMM;
+	else if (!strcmp(target->getType(), "Lexicons / Dictionaries"))
+		querytype = QT_LD;
+	else if (!strcmp(target->getType(), "Generic Books"))
+		querytype = QT_LD;
+
+	manager.setGlobalOption("Footnotes", (optionfilters & OP_FOOTNOTES) ? "On": "Off");
+	manager.setGlobalOption("Headings", (optionfilters & OP_HEADINGS) ? "On": "Off");
+	manager.setGlobalOption("Strong's Numbers", (optionfilters & OP_STRONGS) ? "On": "Off");
+	manager.setGlobalOption("Morphological Tags", (optionfilters & OP_MORPH) ? "On": "Off");
+	manager.setGlobalOption("Hebrew Cantillation", (optionfilters & OP_CANTILLATION) ? "On": "Off");
+	manager.setGlobalOption("Hebrew Vowel Points", (optionfilters & OP_HEBREWPOINTS) ? "On": "Off");
+	manager.setGlobalOption("Greek Accents", (optionfilters & OP_GREEKACCENTS) ? "On": "Off");
+	manager.setGlobalOption("Lemmas", (optionfilters & OP_LEMMAS) ? "On": "Off");
+	manager.setGlobalOption("Cross-references", (optionfilters & OP_SCRIPREF) ? "On": "Off");
+	manager.setGlobalOption("Words of Christ in Red", (optionfilters & OP_REDLETTERWORDS) ? "On": "Off");
+	manager.setGlobalOption("Arabic Vowel Points", (optionfilters & OP_ARABICPOINTS) ? "On": "Off");
+	manager.setGlobalOption("Glosses", (optionfilters & OP_GLOSSES) ? "On": "Off");
+	manager.setGlobalOption("Transliterated Forms", (optionfilters & OP_XLIT) ? "On": "Off");
+	manager.setGlobalOption("Enumerations", (optionfilters & OP_ENUM) ? "On": "Off");
+
+	manager.setGlobalOption("Transliteration", (optionfilters & OP_TRANSLITERATOR && script) ? script : "Off");
+	
+
+	if ((optionfilters & OP_VARIANTS) && variants) {
+		if (variants == -1)
+			manager.setGlobalOption("Textual Variants", "All Readings");
+		else if (variants == 1)
+			manager.setGlobalOption("Textual Variants", "Secondary Reading");
+	}
+	else
+		manager.setGlobalOption("Textual Variants", "Primary Reading");
+
+
+	if (querytype == QT_SEARCH) {
+
+	        //this test is just to determine if we've got SWKeys or VerseKeys
+	        if (!strcmp(target->getType(), "Biblical Texts"))
+		  querytype = QT_BIBLE;
+		else if (!strcmp(target->getType(), "Commentaries"))
+		  querytype = QT_BIBLE;
+		else if (!strcmp(target->getType(), "Lexicons / Dictionaries"))
+		  querytype = QT_LD;
+		else if (!strcmp(target->getType(), "Generic Books"))
+		  querytype = QT_LD;
+
+		//do search stuff
+		char st = 1 - searchtype;
+		if (querytype == QT_BIBLE) {
+		  *output << "Verses containing \"";
+		}
+		else *output << "Entries containing \"";
+	        *output << ref;
+		*output << "\"-- ";
+
+ 		if (range) {
+ 			ListKey scope = parser->parseVerseList(range, "Gen 1:1", true);
+ 			listkey = target->search(ref, st, REG_ICASE, &scope);
+ 		}
+ 		else listkey = target->search(ref, st, REG_ICASE);
+
+		if (strlen((const char*)listkey)) {
+		  if (!listkey.popError()) {
+		    if (outputformat == FMT_CGI) *output << "<entry>";
+		    if (querytype == QT_BIBLE) {
+		      *parser = listkey;
+		      *output << (const char *)*parser;
+		    }
+		    else *output << (const char *)listkey;
+		    if (outputformat == FMT_CGI) *output << "</entry>";
+		  }
+		  listkey++;
+		  while (!listkey.popError()) {
+		    *output << " ; ";
+		    if (outputformat == FMT_CGI) *output << "<entry>";
+		    if (querytype == QT_BIBLE) {
+		      *parser = listkey;
+		      *output << (const char *)*parser;
+		    }
+		    else *output << (const char *)listkey;
+		    if (outputformat == FMT_CGI) *output << "</entry>";
+		    listkey++;
+		  }
+		  *output << " -- ";
+
+		  char *temp = new char[10];
+		  sprintf(temp, "%u", listkey.getCount());
+		  *output << temp;
+		  delete [] temp;
+
+		  *output << " matches total (";
+		  *output << target->getName();
+		  *output << ")\n";
+		}
+		else {
+		  *output << "none (";
+		  *output << target->getName();
+		  *output << ")\n";
+		}
+	}
+
+	else if (querytype == QT_LD) {
+		//do dictionary stuff
+
+		target->setKey(ref);
+
+		SWBuf text = target->renderText();
+
+		if (outputformat == FMT_RTF) {
+			*output << "{\\rtf1\\ansi{\\fonttbl{\\f0\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f1\\fdecor\\fprq2 ";
+			if (font)
+				*output << font;
+			else
+				*output << "Times New Roman";
+			*output << ";}}";
+		}
+		else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) {
+			*output << "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">";
+		}
+
+		if (text.length()) {
+			*output << (char*)target->getKeyText();
+			if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+				*output << ": <font face=\"";
+				*output << font;
+				*output << "\">";
+			}
+			else if (outputformat == FMT_RTF) {
+				*output << ": {\\f1 ";
+			}
+			else {
+				*output << ": ";
+			}
+			*output << text;
+			if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+				*output << "</font>";
+			}
+			else if (outputformat == FMT_RTF) {
+				*output << "}";
+			}
+
+			*output << "(";
+			*output << target->getName();
+			*output << ")\n";
+		}
+
+		if (outputformat == FMT_RTF) {
+			*output << "}";
+		}
+
+	}
+
+	else if (querytype == QT_BIBLE || querytype == QT_COMM) {
+		//do commentary/Bible stuff
+
+		if ((sit = manager.config->Sections.find((*it).second->getName())) != manager.config->Sections.end()) {
+			if ((eit = (*sit).second.find("Font")) != (*sit).second.end()) {
+				font = (char *)(*eit).second.c_str();
+				if (strlen(font) == 0) font = 0;
+			}
+		}
+
+ 		listkey = parser->parseVerseList(ref, "Gen1:1", true);
+		int i;
+
+		if (outputformat == FMT_RTF) {
+			*output << "{\\rtf1\\ansi{\\fonttbl{\\f0\\froman\\fcharset0\\fprq2 Times New Roman;}{\\f1\\fdecor\\fprq2 ";
+			if (font)
+				*output << font;
+			else
+				*output << "Times New Roman";
+			*output << ";}{\\f7\\froman\\fcharset2\\fprq2 Symbol;}}";
+		}
+		else if (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML) {
+			*output << "<meta http-equiv=\"content-type\" content=\"text/html; charset=UTF-8\">";
+		}
+
+		for (i = 0; i < listkey.getCount() && maxverses; i++) {
+			VerseKey *element = SWDYNAMIC_CAST(VerseKey, listkey.getElement(i));
+			if (element && element->isBoundSet()) {
+			  target->setKey(element->getLowerBound());
+				*parser = element->getUpperBound();
+				while (maxverses && *target->getKey() <= *parser) {
+					*output << (char*)target->getKeyText();
+					if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+						*output << ": <font face=\"";
+						*output << font;
+						*output << "\">";
+					}
+					else if (outputformat == FMT_RTF) {
+						*output << ": {\\f1 ";
+					}
+					else {
+						*output << ": ";
+					}
+					*output << target->renderText();
+					if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+						*output << "</font>";
+					}
+					else if (outputformat == FMT_RTF) {
+						*output << "}";
+					}
+
+					if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI))
+						*output << "<br />";
+					else if (outputformat == FMT_OSIS)
+						*output << "<milestone type=\"line\"/>";
+					else if (outputformat == FMT_RTF)
+						*output << "\\par ";
+					else if (outputformat == FMT_GBF)
+						*output << "<CM>";
+
+					*output << "\n";
+
+					if (*target->getKey() == *parser)
+					  break;
+					maxverses--;
+					(*target)++;
+				}
+			}
+			else {
+				target->setKey(*listkey.getElement(i));
+				*output << (char*)target->getKeyText();
+				if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+					*output << ": <font face=\"";
+					*output << font;
+					*output << "\">";
+				}
+				else if (outputformat == FMT_RTF) {
+					*output << ": {\\f1 ";
+				}
+				else {
+					*output << ": ";
+				}
+				*output << target->renderText();
+				if (font && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI)) {
+					*output << "</font>";
+				}
+				else if (outputformat == FMT_RTF) {
+					*output << "}";
+				}
+
+				if (inputformat != FMT_THML && (outputformat == FMT_HTML || outputformat == FMT_HTMLHREF || outputformat == FMT_XHTML || outputformat == FMT_THML || outputformat == FMT_CGI))
+					*output << "<br />";
+				else if (outputformat == FMT_OSIS)
+					*output << "<milestone type=\"line\"/>";
+				else if (outputformat == FMT_RTF)
+					*output << "\\par ";
+				else if (outputformat == FMT_GBF)
+					*output << "<CM>";
+
+				*output << "\n";
+				maxverses--;
+			}
+		}
+
+		*output << "(";
+		*output << target->getName();
+		*output << ")\n";
+
+		if (outputformat == FMT_RTF) {
+			*output << "}";
+		}
+
+	}
+	delete parser;
+}
+
diff --git a/utilities/diatheke/corediatheke.h b/utilities/diatheke/corediatheke.h
new file mode 100644
index 0000000..833825e
--- /dev/null
+++ b/utilities/diatheke/corediatheke.h
@@ -0,0 +1,69 @@
+/******************************************************************************
+ *
+ *  corediatheke.h -	
+ *
+ * $Id: corediatheke.h 2900 2013-07-16 07:48:52Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/******************************************************************************
+ * Diatheke 4.5 by Chris Little <chrislit@crosswire.org>
+ * http://www.crosswire.org/sword/diatheke
+ */
+
+#include <stdio.h>
+#include <iostream>
+
+#include "diathekemgr.h"
+#include <localemgr.h>
+
+#define QT_BIBLE 1
+#define QT_COMM 2
+#define QT_LD 3
+#define QT_SEARCH 4
+#define QT_SYSTEM 5
+#define QT_INFO 6
+
+#define OP_NONE 0
+#define OP_STRONGS 1
+#define OP_FOOTNOTES (1<<1)
+#define OP_HEADINGS (1<<2)
+#define OP_MORPH (1<<3)
+#define OP_CANTILLATION (1<<4)
+#define OP_HEBREWPOINTS (1<<5)
+#define OP_GREEKACCENTS (1<<6)
+#define OP_TRANSLITERATOR (1<<7)
+#define OP_LEMMAS (1<<8)
+#define OP_SCRIPREF (1<<9)
+#define OP_ARSHAPE (1<<10)
+#define OP_BIDI (1<<11)
+#define OP_VARIANTS (1<<12)
+#define OP_REDLETTERWORDS (1<<13)
+#define OP_ARABICPOINTS (1<<14)
+#define OP_GLOSSES (1<<15)
+#define OP_XLIT (1<<16)
+#define OP_ENUM (1<<17)
+
+#define ST_NONE 0
+#define ST_REGEX 1     //  0
+#define ST_PHRASE 2    // -1
+#define ST_MULTIWORD 3 // -2
+
+using namespace std;
+
+int hasalpha (char * string);
+void doquery(unsigned long maxverses, unsigned char outputformat, unsigned char outputencoding, unsigned long optionfilters, unsigned char searchtype, const char *range, const char *text, const char *locale, const char *ref, ostream* output, const char* script, signed char variants); 
diff --git a/utilities/diatheke/diafiltmgr.cpp b/utilities/diatheke/diafiltmgr.cpp
new file mode 100644
index 0000000..be091a9
--- /dev/null
+++ b/utilities/diatheke/diafiltmgr.cpp
@@ -0,0 +1,230 @@
+/******************************************************************************
+ *
+ *  diafiltmgr.cpp -	DiathekeFilterMgr
+ *
+ * $Id: diafiltmgr.cpp 2843 2013-06-29 11:22:27Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <thmlplain.h>
+#include <gbfplain.h>
+#include <thmlgbf.h>
+#include <gbfthml.h>
+#include <thmlhtml.h>
+#include <gbfhtml.h>
+#include <thmlhtmlhref.h>
+#include <gbfhtmlhref.h>
+#include <thmlrtf.h>
+#include <gbfrtf.h>
+#include <osisrtf.h>
+#include <osishtmlhref.h>
+#include <swmodule.h>
+#include <osisplain.h>
+#include <thmlosis.h>
+#include <gbfosis.h>
+
+#include <swmgr.h>
+
+#include "diafiltmgr.h"
+#include "thmlcgi.h"
+#include "gbfcgi.h"
+#include "osiscgi.h"
+
+DiathekeFilterMgr::DiathekeFilterMgr (char mark, char enc)
+		   : EncodingFilterMgr(enc) {
+
+        markup = mark;
+
+        CreateFilters(markup);
+}
+
+DiathekeFilterMgr::~DiathekeFilterMgr() {
+        if (fromthml)
+                delete (fromthml);
+        if (fromgbf)
+                delete (fromgbf);
+        if (fromplain)
+                delete (fromplain);
+        if (fromosis)
+                delete (fromosis);
+}
+
+void DiathekeFilterMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section) {
+        switch (module->getMarkup()) {
+        case FMT_THML:
+                if (fromthml)
+                        module->addRenderFilter(fromthml);
+                break;
+        case FMT_GBF:
+                if (fromgbf)
+                        module->addRenderFilter(fromgbf);
+                break;
+        case FMT_PLAIN:
+                if (fromplain)
+                        module->addRenderFilter(fromplain);
+                break;
+        case FMT_OSIS:
+                if (fromosis)
+                        module->addRenderFilter(fromosis);
+                break;
+        }
+	EncodingFilterMgr::AddRenderFilters(module, section);
+}
+
+
+char DiathekeFilterMgr::Markup(char mark) {
+        if (mark && mark != markup) {
+                markup = mark;
+                ModMap::const_iterator module;
+
+                SWFilter * oldplain = fromplain;
+                SWFilter * oldthml = fromthml;
+                SWFilter * oldgbf = fromgbf;
+                SWFilter * oldosis = fromosis;
+
+                CreateFilters(markup);
+
+                for (module = getParentMgr()->Modules.begin(); module != getParentMgr()->Modules.end(); module++)
+                        switch (module->second->getMarkup()) {
+                        case FMT_THML:
+                                if (oldthml != fromthml) {
+                                        if (oldthml) {
+                                                if (!fromthml) {
+                                                        module->second->removeRenderFilter(oldthml);
+                                                }
+                                                else {
+                                                        module->second->replaceRenderFilter(oldthml, fromthml);
+                                                }
+                                        }
+                                        else if (fromthml) {
+                                                module->second->addRenderFilter(fromthml);
+                                        }
+                                }
+                                break;
+                        case FMT_GBF:
+                                if (oldgbf != fromgbf) {
+                                        if (oldgbf) {
+                                                if (!fromgbf) {
+                                                        module->second->removeRenderFilter(oldgbf);
+                                                }
+                                                else {
+                                                        module->second->replaceRenderFilter(oldgbf, fromgbf);
+                                                }
+                                        }
+                                        else if (fromgbf) {
+                                                module->second->addRenderFilter(fromgbf);
+                                        }
+                                        break;
+                                }
+                        case FMT_PLAIN:
+                                if (oldplain != fromplain) {
+                                        if (oldplain) {
+                                                if (!fromplain) {
+                                                        module->second->removeRenderFilter(oldplain);
+                                                }
+                                                else {
+                                                        module->second->replaceRenderFilter(oldplain, fromplain);
+                                                }
+                                        }
+                                        else if (fromplain) {
+                                                module->second->addRenderFilter(fromplain);
+                                        }
+                                        break;
+                                }
+                        case FMT_OSIS:
+                                if (oldosis != fromosis) {
+                                        if (oldosis) {
+                                                if (!fromosis) {
+                                                        module->second->removeRenderFilter(oldosis);
+                                                }
+                                                else {
+                                                        module->second->replaceRenderFilter(oldosis, fromosis);
+                                                }
+                                        }
+                                        else if (fromosis) {
+                                                module->second->addRenderFilter(fromosis);
+                                        }
+                                        break;
+                                }
+                        }
+
+                if (oldthml)
+                        delete oldthml;
+                if (oldgbf)
+                        delete oldgbf;
+                if (oldplain)
+                        delete oldplain;
+                if (oldosis)
+                        delete oldosis;
+        }
+        return markup;
+}
+
+void DiathekeFilterMgr::CreateFilters(char markup) {
+
+                switch (markup) {
+		case FMT_CGI:
+			fromplain = NULL;
+			fromthml = new ThMLCGI();
+			fromgbf = new GBFCGI();
+			fromosis = new OSISCGI();
+			break;
+                case FMT_PLAIN:
+                        fromplain = NULL;
+                        fromthml = new ThMLPlain();
+                        fromgbf = new GBFPlain();
+                        fromosis = new OSISPlain();
+                        break;
+                case FMT_THML:
+                        fromplain = NULL;
+                        fromthml = NULL;
+                        fromgbf = new GBFThML();
+                        fromosis = NULL;
+                        break;
+                case FMT_GBF:
+                        fromplain = NULL;
+                        fromthml = new ThMLGBF();
+                        fromgbf = NULL;
+                        fromosis = NULL;
+                        break;
+                case FMT_HTML:
+                        fromplain = NULL;
+                        fromthml = new ThMLHTML();
+                        fromgbf = new GBFHTML();
+                        fromosis = NULL;
+                        break;
+                case FMT_HTMLHREF:
+                        fromplain = NULL;
+                        fromthml = new ThMLHTMLHREF();
+                        fromgbf = new GBFHTMLHREF();
+                        fromosis = new OSISHTMLHREF();
+                        break;
+                case FMT_RTF:
+                        fromplain = NULL;
+                        fromthml = new ThMLRTF();
+                        fromgbf = new GBFRTF();
+                        fromosis = new OSISRTF();
+                        break;
+                case FMT_OSIS:
+                        fromplain = NULL;
+                        fromthml = new ThMLOSIS();
+                        fromgbf = new GBFOSIS();
+                        fromosis = NULL;
+                        break;
+                }
+
+}
diff --git a/utilities/diatheke/diafiltmgr.h b/utilities/diatheke/diafiltmgr.h
new file mode 100644
index 0000000..120fc6e
--- /dev/null
+++ b/utilities/diatheke/diafiltmgr.h
@@ -0,0 +1,51 @@
+/******************************************************************************
+ *
+ *  diafiltmgr.h -	DiathekeFilterMgr
+ *
+ * $Id: diafiltmgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef DIAFILTMGR_H
+#define DIAFILTMGR_H
+
+#define FMT_CGI 127
+
+#include <encfiltmgr.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+class DiathekeFilterMgr : public EncodingFilterMgr {
+protected:
+        SWFilter* fromthml;
+        SWFilter* fromgbf;
+        SWFilter* fromplain;
+        SWFilter* fromosis;
+
+        char markup;
+
+        void CreateFilters(char markup);
+public:
+        DiathekeFilterMgr(char markup = FMT_THML, char encoding = ENC_UTF8);
+        ~DiathekeFilterMgr();
+        char Markup(char m = FMT_UNKNOWN);
+        virtual void AddRenderFilters(SWModule *module, ConfigEntMap &section);
+};
+
+#endif
diff --git a/utilities/diatheke/diatheke.cpp b/utilities/diatheke/diatheke.cpp
new file mode 100644
index 0000000..159e3a5
--- /dev/null
+++ b/utilities/diatheke/diatheke.cpp
@@ -0,0 +1,269 @@
+/******************************************************************************
+ *
+ *  diatheke.cpp -	
+ *
+ * $Id: diatheke.cpp 2903 2013-07-16 11:11:18Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/******************************************************************************
+ * Diatheke 4.6 by Chris Little <chrislit@crosswire.org>
+ * http://www.crosswire.org/sword/diatheke
+ */
+
+#include "corediatheke.h"
+#include "diathekemgr.h"
+#include "diafiltmgr.h"
+#include <utilstr.h>
+
+using std::cout;
+
+#define RQ_REF 1
+#define RQ_BOOK 2
+
+void printsyntax() { 
+	//if we got this far without exiting, something went wrong, so print syntax
+	fprintf (stderr, "Diatheke command-line SWORD frontend Version 4.6\n");
+	fprintf (stderr, "Copyright 1999-2013 by the CrossWire Bible Society\n");
+	fprintf (stderr, "http://www.crosswire.org/sword/diatheke/\n");
+	fprintf (stderr, "\n");
+	fprintf (stderr, "usage:  diatheke <-b module_name> [-s search_type] [-r search_range]\n");
+	fprintf (stderr, "    [-o option_filters] [-m maximum_verses] [-f output_format]\n");
+	fprintf (stderr, "    [-e output_encoding] [-v variant#(-1=all|0|1)]\n");
+	fprintf (stderr, "    [-l locale] <-k query_key>\n");
+	fprintf (stderr, "\n");
+	fprintf (stderr, "If <book> is \"system\" you may use these system keys: \"modulelist\",\n");
+	fprintf (stderr, "\"modulelistnames\", and \"localelist\".");
+	fprintf (stderr, "\n");
+	fprintf (stderr, "Valid search_type values are: regex, multiword, and phrase(def).\n");
+	fprintf (stderr, "Valid option_filters values are: n (Strong's numbers),\n");
+	fprintf (stderr, "  f (Footnotes), m (Morphology), h (Section Headings),\n");
+	fprintf (stderr, "  c (Cantillation), v (Hebrew Vowels), a (Greek Accents), p (Arabic Vowels)\n");
+	fprintf (stderr, "  l (Lemmas), s (Scripture Crossrefs), r (Arabic Shaping),\n");
+	fprintf (stderr, "  b (Bi-Directional Reordering), w (Red Words of Christ),\n");
+	fprintf (stderr, "  g (Glosses/Ruby), e (Word Enumerations),\n");
+	fprintf (stderr, "  x (Encoded Transliterations), t (Algorithmic Transliterations via ICU)\n");
+
+	fprintf (stderr, "Maximum verses may be any integer value\n");
+	fprintf (stderr, "Valid output_format values are: GBF, ThML, RTF, HTML, HTMLHREF, XHTML, OSIS,\n");
+	fprintf (stderr, "  CGI, and plain (def)\n");
+	fprintf (stderr, "Valid output_encoding values are: Latin1, UTF8 (def), UTF16, HTML, and RTF\n");
+	fprintf (stderr, "Valid locale values depend on installed locales. en is default.\n");
+	fprintf (stderr, "The query_key must be the last argument because all following\n");
+	fprintf (stderr, "  arguments are added to the key.\n");
+	fprintf (stderr, "\n");
+	fprintf (stderr, "Example usage:\n");
+	fprintf (stderr, "  diatheke -b KJV -o fmnx -k Jn 3:16\n");
+	fprintf (stderr, "  diatheke -b WHNU -t Latin -o mn -k Mt 24\n");
+	fprintf (stderr, "  diatheke -b KJV -s phrase -r Mt -k love\n");
+}
+
+int main(int argc, char **argv)
+{
+	int maxverses = -1;
+	unsigned char outputformat = FMT_PLAIN, searchtype = ST_NONE, outputencoding = ENC_UTF8;
+	unsigned long optionfilters = OP_NONE;
+ 	char *text = 0, *locale = 0, *ref = 0, *range = 0;
+	char script[] = "Latin"; // for the moment, only this target script is supported
+	signed short variants = 0;
+
+	char runquery = 0; // used to check that we have enough arguments to perform a legal query
+	// (a querytype & text = 1 and a ref = 2)
+	
+	for (int i = 1; i < argc; i++) {
+		if (!::stricmp("-b", argv[i])) {
+			if (i+1 <= argc) {
+				text = argv[i+1];
+				i++;
+				runquery |= RQ_BOOK;
+			}
+		}
+		else if (!::stricmp("-s", argv[i])) {
+			if (i+1 <= argc) {
+				if (!::stricmp("phrase", argv[i+1])) {
+					searchtype = ST_PHRASE;
+					i++;
+				}
+				else if (!::stricmp("regex", argv[i+1])) {
+					searchtype = ST_REGEX;
+					i++;
+				}
+				else if (!::stricmp("multiword", argv[i+1])) {
+					searchtype = ST_MULTIWORD;
+					i++;
+				}
+				else i++;
+			}
+		}
+ 		else if (!::stricmp("-r", argv[i])) {
+ 			if (i+1 <= argc) {
+ 				range = argv[i+1];
+ 				i++;
+ 			}	
+ 		}
+		else if (!::stricmp("-l", argv[i])) {
+			if (i+1 <= argc) {
+				locale = argv[i+1];
+				i++;
+			}
+		}
+		else if (!::stricmp("-m", argv[i])) {
+			if (i+1 <= argc) {
+				maxverses = atoi(argv[i+1]);
+				i++;
+			}
+		}
+		else if (!::stricmp("-o", argv[i])) {
+			if (i+1 <= argc) {
+				if (strchr(argv[i+1], 'f'))
+					optionfilters |= OP_FOOTNOTES;
+				if (strchr(argv[i+1], 'n'))
+					optionfilters |= OP_STRONGS;
+				if (strchr(argv[i+1], 'h'))
+					optionfilters |= OP_HEADINGS;
+				if (strchr(argv[i+1], 'm'))
+					optionfilters |= OP_MORPH;
+				if (strchr(argv[i+1], 'c'))
+					optionfilters |= OP_CANTILLATION;
+				if (strchr(argv[i+1], 'v'))
+					optionfilters |= OP_HEBREWPOINTS;
+				if (strchr(argv[i+1], 'a'))
+					optionfilters |= OP_GREEKACCENTS;
+				if (strchr(argv[i+1], 'l'))
+					optionfilters |= OP_LEMMAS;
+				if (strchr(argv[i+1], 's'))
+					optionfilters |= OP_SCRIPREF;
+				if (strchr(argv[i+1], 'r'))
+					optionfilters |= OP_ARSHAPE;
+				if (strchr(argv[i+1], 'b'))
+					optionfilters |= OP_BIDI;
+				if (strchr(argv[i+1], 'w'))
+					optionfilters |= OP_REDLETTERWORDS;
+				if (strchr(argv[i+1], 'p'))
+					optionfilters |= OP_ARABICPOINTS;
+				if (strchr(argv[i+1], 'g'))
+					optionfilters |= OP_GLOSSES;
+				if (strchr(argv[i+1], 'x'))
+					optionfilters |= OP_XLIT;
+				if (strchr(argv[i+1], 'e'))
+					optionfilters |= OP_ENUM;
+				if (strchr(argv[i+1], 't'))
+					optionfilters |= OP_TRANSLITERATOR;
+				i++;
+			}
+		}
+		else if (!::stricmp("-f", argv[i])) {
+			if (i+1 <= argc) {
+				if (!::stricmp("thml", argv[i+1])) {
+					outputformat = FMT_THML;
+					i++;
+				}
+				else if (!::stricmp("cgi", argv[i+1])) {
+					outputformat = FMT_CGI;
+					i++;
+				}
+				else if (!::stricmp("gbf", argv[i+1])) {
+					outputformat = FMT_GBF;
+					i++;
+				}
+				else if (!::stricmp("htmlhref", argv[i+1])) {
+					outputformat = FMT_HTMLHREF;
+					i++;
+				}
+				else if (!::stricmp("html", argv[i+1])) {
+					outputformat = FMT_HTML;
+					i++;
+				}
+				else if (!::stricmp("xhtml", argv[i+1])) {
+					outputformat = FMT_XHTML;
+					i++;
+				}
+				else if (!::stricmp("rtf", argv[i+1])) {
+					outputformat = FMT_RTF;
+					i++;
+				}
+				else if (!::stricmp("osis", argv[i+1])) {
+					outputformat = FMT_OSIS;
+					i++;
+				}
+				else i++;
+			}
+		}
+		else if (!::stricmp("-e", argv[i])) {
+			if (i+1 <= argc) {
+				if (!::stricmp("utf8", argv[i+1])) {
+					outputencoding = ENC_UTF8;
+					i++;
+				}
+				else if (!::stricmp("rtf", argv[i+1])) {
+					outputencoding = ENC_RTF;
+					i++;
+				}
+				else if (!::stricmp("html", argv[i+1])) {
+					outputencoding = ENC_HTML;
+					i++;
+				}
+				else if (!::stricmp("latin1", argv[i+1])) {
+					outputencoding = ENC_LATIN1;
+					i++;
+				}
+				else if (!::stricmp("utf16", argv[i+1])) {
+					outputencoding = ENC_UTF16;
+					i++;
+				}
+				else i++;
+			}
+		}
+		else if (!::stricmp("-k", argv[i])) {
+			i++;	
+			if (i < argc) {
+				SWBuf key = argv[i];
+				i++;
+				for (; i < argc; i++)
+					key = key + " " + argv[i];
+				ref = new char[key.length() + 1];
+				strcpy (ref, key.c_str());
+				if (strlen(ref))
+					runquery |= RQ_REF;
+			}
+		}
+		else if (!::stricmp("-v", argv[i])) {
+			if (i+1 <= argc) {
+				variants = atoi(argv[i+1]);
+				optionfilters |= OP_VARIANTS;
+				i++;
+			}
+		}
+		/*
+		else if (!::stricmp("-t", argv[i])) {
+			if (i+1 <= argc) {
+				script = argv[i+1];
+				optionfilters |= OP_TRANSLITERATOR;
+				i++;
+			}
+		}
+		*/
+	}
+	
+	
+	if (runquery == (RQ_BOOK | RQ_REF)) {
+ 	    doquery(maxverses, outputformat, outputencoding, optionfilters, searchtype, range, text, locale, ref, &cout, script, variants);
+	}
+	else printsyntax();
+
+	return 0;
+}
diff --git a/utilities/diatheke/diatheke.sln b/utilities/diatheke/diatheke.sln
new file mode 100644
index 0000000..9d360da
--- /dev/null
+++ b/utilities/diatheke/diatheke.sln
@@ -0,0 +1,20 @@
+

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2012

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/utilities/diatheke/diatheke.vcxproj b/utilities/diatheke/diatheke.vcxproj
new file mode 100644
index 0000000..7f698c1
--- /dev/null
+++ b/utilities/diatheke/diatheke.vcxproj
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{891A765C-5503-4FED-B427-7AE1413DB264}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>

+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    </LinkIncremental>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <TypeLibraryName>.\Debug/diatheke.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <PrecompiledHeaderOutputFile>.\Debug/diatheke.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>

+      <ObjectFileName>.\Debug/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>.\Debug/diatheke.exe</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <ProgramDatabaseFile>.\Debug/diatheke.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

+    </Link>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <OutputFile>.\Debug/diatheke.bsc</OutputFile>

+    </Bscmake>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <TypeLibraryName>.\Release/diatheke.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>MaxSpeed</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;../../include/internal/regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeaderOutputFile>.\Release/diatheke.pch</PrecompiledHeaderOutputFile>

+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

+      <ObjectFileName>.\Release/</ObjectFileName>

+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

+      <BrowseInformation>true</BrowseInformation>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0409</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>icuin.lib;icuuc.lib;icudt.lib;libsword.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>.\Release/diatheke.exe</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ProgramDatabaseFile>.\Release/diatheke.pdb</ProgramDatabaseFile>

+      <SubSystem>Console</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <OutputFile>.\Release/diatheke.bsc</OutputFile>

+    </Bscmake>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="corediatheke.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="diafiltmgr.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="diatheke.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="diathekemgr.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="gbfcgi.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="osiscgi.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <ClCompile Include="thmlcgi.cpp">

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="corediatheke.h" />

+    <ClInclude Include="diafiltmgr.h" />

+    <ClInclude Include="diathekemgr.h" />

+    <ClInclude Include="gbfcgi.h" />

+    <ClInclude Include="osiscgi.h" />

+    <ClInclude Include="thmlcgi.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/diatheke/diathekemgr.cpp b/utilities/diatheke/diathekemgr.cpp
new file mode 100644
index 0000000..a64b570
--- /dev/null
+++ b/utilities/diatheke/diathekemgr.cpp
@@ -0,0 +1,114 @@
+/******************************************************************************
+ *
+ *  diathekemgr.cpp -	DiathekeMgr
+ *
+ * $Id: diathekemgr.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+//---------------------------------------------------------------------------
+#include <swmodule.h>
+
+#ifdef _ICU_
+#include <utf8arshaping.h>
+#include <utf8bidireorder.h>
+#include <utf8transliterator.h>
+#endif
+
+#ifdef WIN32
+#include <windows.h>
+#endif
+
+#include "diathekemgr.h"
+
+//---------------------------------------------------------------------------
+DiathekeMgr::DiathekeMgr (SWConfig * iconfig, SWConfig * isysconfig, bool autoload, char enc, char mark, bool ibidi, bool ishape)
+        : SWMgr(iconfig, isysconfig, autoload, new DiathekeFilterMgr(mark, enc))
+{
+	bidi = ibidi;
+	shape = ishape;
+
+#ifdef _ICU_
+	arshaping = new UTF8arShaping();
+	bidireorder = new UTF8BiDiReorder();
+	transliterator = new UTF8Transliterator();
+#endif
+	Load();
+
+#ifdef WIN32
+	OSVERSIONINFO osvi;
+	memset (&osvi, 0, sizeof(OSVERSIONINFO));
+	osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+	GetVersionEx(&osvi);
+	platformID = osvi.dwPlatformId;
+#endif
+
+}
+
+
+DiathekeMgr::~DiathekeMgr()
+{
+#ifdef _ICU_
+        if (arshaping)
+                delete arshaping;
+        if (bidireorder)
+                delete bidireorder;
+        if (transliterator)
+                delete transliterator;
+#endif
+}
+
+
+void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section)
+{
+	SWBuf lang;
+	bool rtl;
+	ConfigEntMap::iterator entry;
+
+	lang = ((entry = section.find("Lang")) != section.end()) ? (*entry).second : (SWBuf)"en";
+	rtl = ((entry = section.find("Direction")) != section.end()) ? ((*entry).second == "RtoL") : false;
+
+#ifdef _ICU_
+	if (shape) {
+		module->addRenderFilter(arshaping);
+	}
+	if (bidi && rtl) {
+		module->addRenderFilter(bidireorder);
+	}
+#endif
+	SWMgr::AddRenderFilters(module, section);
+}
+
+signed char DiathekeMgr::Load () {
+	signed char retval =  SWMgr::Load();
+#ifdef _ICU_
+	optionFilters["UTF8Transliterator"] = transliterator;
+	options.push_back(transliterator->getOptionName());
+#endif
+	return retval;
+};
+
+void DiathekeMgr::AddGlobalOptions (SWModule * module, ConfigEntMap & section,
+                                   ConfigEntMap::iterator start,
+                                   ConfigEntMap::iterator end) {
+
+        SWMgr::AddGlobalOptions(module, section, start, end);
+#ifdef _ICU_
+        module->addOptionFilter(transliterator);
+#endif
+};
+
diff --git a/utilities/diatheke/diathekemgr.h b/utilities/diatheke/diathekemgr.h
new file mode 100644
index 0000000..4ad7367
--- /dev/null
+++ b/utilities/diatheke/diathekemgr.h
@@ -0,0 +1,57 @@
+/******************************************************************************
+ *
+ *  diathekemgr.h -	DiathekeMgr
+ *
+ * $Id: diathekemgr.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef DIATHEKEMGR_H
+#define DIATHEKEMGR_H
+
+#include <swmgr.h>
+#include "diafiltmgr.h"
+
+//enum PlatformIDs { WIN32S = 0, WIN9X, WINNT, WINCE };
+
+class DiathekeMgr : public SWMgr {
+	SWFilter *arshaping;
+	SWFilter *bidireorder;
+    SWOptionFilter *transliterator;
+
+#ifdef WIN32
+	char platformID;
+#endif
+
+protected:
+	virtual void AddRenderFilters(SWModule *module, ConfigEntMap &section);
+	virtual signed char Load ();
+	virtual void AddGlobalOptions (SWModule * module, ConfigEntMap & section, ConfigEntMap::iterator start, ConfigEntMap::iterator end);
+
+public:
+	bool shape;
+	bool bidi;
+
+	unsigned char Markup(unsigned char m = FMT_UNKNOWN) {return ((DiathekeFilterMgr*)filterMgr)->Markup(m);};
+	unsigned char Encoding(unsigned char e = ENC_UNKNOWN) {return ((EncodingFilterMgr*)filterMgr)->Encoding(e);};
+
+	DiathekeMgr(SWConfig * iconf = NULL, SWConfig * isysconfig = NULL, bool autoload = false, char enc = ENC_UTF8, char mark = FMT_PLAIN, bool bidi = false, bool shape = false);
+	virtual ~DiathekeMgr();
+};
+
+#endif
+ 
diff --git a/utilities/diatheke/gbfcgi.cpp b/utilities/diatheke/gbfcgi.cpp
new file mode 100644
index 0000000..3c8ef00
--- /dev/null
+++ b/utilities/diatheke/gbfcgi.cpp
@@ -0,0 +1,161 @@
+/***************************************************************************
+ *
+ *  gbfcgi.cpp -	GBF to Diatheke/CGI format
+ *
+ * $Id: gbfcgi.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <map>
+#include "gbfcgi.h"
+
+SWORD_NAMESPACE_START
+
+typedef std::map<SWBuf, SWBuf> DualStringMap;
+
+namespace {
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+		DualStringMap properties;
+	};
+}
+
+
+BasicFilterUserData *GBFCGI::createUserData(const SWModule *module, const SWKey *key) {
+	return new MyUserData(module, key);
+}
+
+GBFCGI::GBFCGI() {
+	setTokenStart("<");
+	setTokenEnd(">");
+	
+	setTokenCaseSensitive(true);
+
+	addTokenSubstitute("Rf", ")</small></font>");
+	addTokenSubstitute("FI", "<i>"); // italics begin
+	addTokenSubstitute("Fi", "</i>");
+	addTokenSubstitute("FB", "<n>"); // bold begin
+	addTokenSubstitute("Fb", "</n>");
+	addTokenSubstitute("FR", "<font color=\"#FF0000\">"); // words of Jesus begin
+	addTokenSubstitute("Fr", "</font>");
+	addTokenSubstitute("FU", "<u>"); // underline begin
+	addTokenSubstitute("Fu", "</u>");
+	addTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
+	addTokenSubstitute("Fo", "</cite>");
+	addTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
+	addTokenSubstitute("Fs", "</sup>");
+	addTokenSubstitute("FV", "<sub>"); // Subscript begin
+	addTokenSubstitute("Fv", "</sub>");
+	addTokenSubstitute("TT", "<big>"); // Book title begin
+	addTokenSubstitute("Tt", "</big>");
+	addTokenSubstitute("PP", "<cite>"); //  poetry  begin
+	addTokenSubstitute("Pp", "</cite>");
+	addTokenSubstitute("Fn", "</font>"); //  font  end
+	addTokenSubstitute("CL", "<br />"); //  new line
+	addTokenSubstitute("CM", "<br />"); //  paragraph
+	addTokenSubstitute("CG", "&gt;"); //  ???
+	addTokenSubstitute("CT", "&lt;"); // ???
+	addTokenSubstitute("JR", "<div align=\"right\">"); // right align begin
+	addTokenSubstitute("JC", "<div align=\"center\">"); // center align begin
+	addTokenSubstitute("JL", "</div>"); // align end
+	
+}
+
+
+bool GBFCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) {
+	MyUserData *userData = (MyUserData *) baseUserData;
+	unsigned long i;
+	if (!substituteToken(buf, token)) {
+		if (!strncmp(token, "WG", 2) || !strncmp(token, "WH", 2)) { // strong's numbers
+			buf += " <small><em>&lt;<a href=\"!DIATHEKE_URL!";
+			if (token[1] == 'H') {
+			  buf += "StrongsHebrew";
+			}
+			else if (token[1] == 'G') {
+			  buf += "StrongsGreek";
+			}
+			buf += "=on&verse=";
+			for (i = 2; i < strlen(token); i++)
+			  buf += token[i];
+			buf += "\">";
+			for (i = 2; i < strlen(token); i++)
+			  buf += token[i];
+			buf += "</a>&gt;</em></small>";
+		}
+
+		else if (!strncmp(token, "WTG", 3) || !strncmp(token, "WTH", 3)) { // strong's numbers tense
+			buf += " <small><em>&lt;<a href=\"!DIATHEKE_URL!";
+			if (token[2] == 'H') {
+			  buf += "StrongsHebrew";
+			}
+			else if (token[2] == 'G') {
+			  buf += "StrongsGreek";
+			}
+			buf += "=on&verse=";
+			for (i = 3; i < strlen(token); i++)
+			  buf += token[i];
+			buf += "\">";
+			for (i = 3; i < strlen(token); i++)
+			  buf += token[i];
+			buf += "</a>&gt;</em></small>";
+		}
+
+		else if (!strncmp(token, "WT", 2)) { // morph tags
+			buf += " <small><em>(<a href=\"!DIATHEKE_URL!Packard=on&verse=";
+			for (i = 1; i < strlen(token); i++)
+			  buf += token[i];
+			buf += "\">";
+			for (i = 1; i < strlen(token); i++)
+			  buf += token[i];		
+			buf += "</a>)</em></small>";
+		}
+
+		else if (!strncmp(token, "RB", 2)) {
+			buf += "<i>";
+			userData->properties["hasFootnotePreTag"] = "true";
+		}
+
+		else if (!strncmp(token, "RF", 2)) {
+			if(userData->properties["hasFootnotePreTag"] == "true") {
+				userData->properties["hasFootnotePreTag"] = "false";
+				buf += "</i> ";
+			}
+			buf += "<font color=\"#800000\"><small> (";
+		}
+
+		else if (!strncmp(token, "FN", 2)) {
+			buf += "<font face=\"";
+			for (i = 2; i < strlen(token); i++)		       
+			  buf += token[i];
+			buf += "\">";
+		}
+
+		else if (!strncmp(token, "CA", 2)) {	// ASCII value
+			buf += (char)atoi(&token[2]);
+		}
+		
+		else {
+			return false;
+		}
+	}
+	return true;
+}
+
+SWORD_NAMESPACE_END
diff --git a/utilities/diatheke/gbfcgi.h b/utilities/diatheke/gbfcgi.h
new file mode 100644
index 0000000..3f21dd2
--- /dev/null
+++ b/utilities/diatheke/gbfcgi.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ *
+ *  gbfcgi.h -	GBF to Diatheke/CGI format
+ *
+ * $Id: gbfcgi.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef GBFCGI_H
+#define GBFCGI_H
+
+#include <swbasicfilter.h>
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts GBF text to Diatheke/CGI format
+ */
+class GBFCGI : public SWBasicFilter {
+protected:
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+  GBFCGI ();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/utilities/diatheke/osiscgi.cpp b/utilities/diatheke/osiscgi.cpp
new file mode 100644
index 0000000..90949dd
--- /dev/null
+++ b/utilities/diatheke/osiscgi.cpp
@@ -0,0 +1,331 @@
+/***************************************************************************
+ *
+ *  osiscgi.cpp -	OSISCGI: OSIS to Diatheke/CGI format filter
+ *
+ * $Id: osiscgi.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include "osiscgi.h"
+#include <utilxml.h>
+#include <versekey.h>
+#include <swmodule.h>
+#include <ctype.h>
+
+SWORD_NAMESPACE_START
+
+
+OSISCGI::MyUserData::MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {
+	osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
+}
+
+
+OSISCGI::OSISCGI() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setEscapeStart("&");
+	setEscapeEnd(";");
+
+	setEscapeStringCaseSensitive(true);
+
+	addEscapeStringSubstitute("amp", "&");
+	addEscapeStringSubstitute("apos", "'");
+	addEscapeStringSubstitute("lt", "<");
+	addEscapeStringSubstitute("gt", ">");
+	addEscapeStringSubstitute("quot", "\"");
+	addTokenSubstitute("lg", "<br />");
+	addTokenSubstitute("/lg", "<br />");
+
+	setTokenCaseSensitive(true);
+}
+
+
+bool OSISCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData) {
+  // manually process if it wasn't a simple substitution
+	if (!substituteToken(buf, token)) {
+		MyUserData *u = (MyUserData *)userData;
+		XMLTag tag(token);
+
+		// <w> tag
+		if (!strcmp(tag.getName(), "w")) {
+
+			// start <w> tag
+			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
+				u->w = token;
+			}
+
+			// end or empty <w> tag
+			else {
+				bool endTag = tag.isEndTag();
+				SWBuf lastText;
+				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
+
+				if (endTag) {
+					tag = u->w.c_str();
+					lastText = u->lastTextNode.c_str();
+				}
+				else lastText = "stuff";
+
+				const char *attrib;
+				const char *val;
+				if ((attrib = tag.getAttribute("xlit"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					buf.appendFormatted(" %s", val);
+				}
+				if ((attrib = tag.getAttribute("gloss"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					buf.appendFormatted(" %s", val);
+				}
+				if ((attrib = tag.getAttribute("lemma"))) {
+					int count = tag.getAttributePartCount("lemma");
+					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+					do {
+						attrib = tag.getAttribute("lemma", i);
+						if (i < 0) i = 0;	// to handle our -1 condition
+						val = strchr(attrib, ':');
+						val = (val) ? (val + 1) : attrib;
+						const char *val2 = val;
+						if ((strchr("GH", *val)) && (isdigit(val[1])))
+							val2++;
+						if ((!strcmp(val2, "3588")) && (lastText.length() < 1))
+							show = false;
+						else {
+						  if (!strchr("G", *val)) {
+						        buf.appendFormatted(" <small><em>&lt;<a href=\"!DIATHEKE_URL!StrongsGreek=on&verse=%s\">%s</a>&gt;</em></small> ", val2, val);
+						  }
+						  else {
+						        buf.appendFormatted(" <small><em>&lt;<a href=\"!DIATHEKE_URL!StrongsHebrew=on&verse=%s\">%s</a>&gt;</em></small> ", val2, val);
+						  }
+						}
+					} while (++i < count);
+				}
+				if ((attrib = tag.getAttribute("morph")) && (show)) {
+					SWBuf savelemma = tag.getAttribute("savlm");
+					if ((strstr(savelemma.c_str(), "3588")) && (lastText.length() < 1))
+						show = false;
+					if (show) {
+						int count = tag.getAttributePartCount("morph");
+						int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
+						do {
+							attrib = tag.getAttribute("morph", i);
+							if (i < 0) i = 0;	// to handle our -1 condition
+							val = strchr(attrib, ':');
+							val = (val) ? (val + 1) : attrib;
+							const char *val2 = val;
+							if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
+								val2+=2;
+							if (!strchr("G", *val)) {
+							  buf.appendFormatted(" <small><em>(;<a href=\"!DIATHEKE_URL!StrongsGreek=on&verse=%s\">%s</a>)</em></small> ", val+1, tag.getAttribute("morph"));
+							}
+							else if (!strchr("H", *val)) {
+							  buf.appendFormatted(" <small><em>(<a href=\"!DIATHEKE_URL!StrongsHebrew=on&verse=%s\">%s</a>)</em></small> ", val+1, tag.getAttribute("morph"));
+							}
+							else {
+							  buf.appendFormatted(" <small><em>(<a href=\"!DIATHEKE_URL!Packard=on&verse=%s\">%s</a>)</em></small> ", val, tag.getAttribute("morph"));
+							}
+						} while (++i < count);
+					}
+				}
+				if ((attrib = tag.getAttribute("POS"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					buf.appendFormatted(" %s", val);
+				}
+
+				/*if (endTag)
+					buf += "}";*/
+			}
+		}
+
+		// <note> tag
+		else if (!strcmp(tag.getName(), "note")) {
+			if (!tag.isEndTag()) {
+				if (!tag.isEmpty()) {
+					SWBuf type = tag.getAttribute("type");
+
+					if (type != "x-strongsMarkup" &&	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
+					    type != "strongsMarkup") {	// deprecated
+						SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
+						VerseKey *vkey = NULL;
+						// see if we have a VerseKey * or descendant
+						SWTRY {
+							vkey = SWDYNAMIC_CAST(VerseKey, u->key);
+						}
+						SWCATCH ( ... ) {	}
+						if (vkey) {
+							char ch = ((tag.getAttribute("type") && (!strcmp(tag.getAttribute("type"), "crossReference"))) ? 'x':'n');
+							buf.appendFormatted("<a href=\"noteID=%s.%c.%s\"><small><sup>*%c</sup></small></a> ", vkey->getText(), ch, footnoteNumber.c_str(), ch);
+						}
+					}
+					u->suspendTextPassThru = true;
+				}
+			}
+			if (tag.isEndTag()) {
+				u->suspendTextPassThru = false;
+			}
+		}
+
+		// <p> paragraph tag
+		else if (!strcmp(tag.getName(), "p")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {	// non-empty start tag
+				buf += "<p><br />";
+			}
+			else if (tag.isEndTag()) {	// end tag
+				buf += "</p><br />";
+				userData->supressAdjacentWhitespace = true;
+			}
+			else {					// empty paragraph break marker
+				buf += "<p><br />";
+				userData->supressAdjacentWhitespace = true;
+			}
+		}
+
+		// <reference> tag
+		else if (!strcmp(tag.getName(), "reference")) {
+		        const char *attrib;
+		        const char *val;
+
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+			        buf += "<a href=\"!DIATHEKE_URL!verse=";
+				if ((attrib = tag.getAttribute("osisRef"))) {
+					val = strchr(attrib, ':');
+					val = (val) ? (val + 1) : attrib;
+					buf.appendFormatted("%s", val);
+				}
+				buf += "\">";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</a>";
+			}
+		}
+
+		// <l> poetry, etc
+		else if (!strcmp(tag.getName(), "l")) {
+			if (tag.isEmpty()) {
+				buf += "<br />";
+			}
+			else if (tag.isEndTag()) {
+				buf += "<br />";
+			}
+			else if (tag.getAttribute("sID")) {	// empty line marker
+				buf += "<br />";
+			}
+		}
+
+		// <milestone type="line"/> or <lb.../>
+		else if ((!strcmp(tag.getName(), "lb")) || ((!strcmp(tag.getName(), "milestone")) && (tag.getAttribute("type")) && (!strcmp(tag.getAttribute("type"), "line")))) {
+			buf += "<br />";
+			userData->supressAdjacentWhitespace = true;
+		}
+
+		// <title>
+		else if (!strcmp(tag.getName(), "title")) {
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				buf += "<b>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</b><br />";
+			}
+		}
+
+		// <hi> hi?  hi contrast?
+		else if (!strcmp(tag.getName(), "hi")) {
+			SWBuf type = tag.getAttribute("type");
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				if (type == "bold" || type == "x-b") {
+					buf += "<b> ";
+					u->inBold = true;
+				}
+				else {	// all other types
+					buf += "<i> ";
+					u->inBold = false;
+				}
+			}
+			else if (tag.isEndTag()) {
+				if(u->inBold) {
+					buf += "</b>";
+					u->inBold = false;
+				}
+				else
+				      buf += "</i>";
+			}
+			else {	// empty hi marker
+				// what to do?  is this even valid?
+			}
+		}
+
+		// <q> quote
+		else if (!strcmp(tag.getName(), "q")) {
+			SWBuf type = tag.getAttribute("type");
+			SWBuf who = tag.getAttribute("who");
+			const char *lev = tag.getAttribute("level");
+			int level = (lev) ? atoi(lev) : 1;
+			
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+				/*buf += "{";*/
+
+				//alternate " and '
+				if (u->osisQToTick)
+					buf += (level % 2) ? '\"' : '\'';
+				
+				if (who == "Jesus") {
+					buf += "<font color=\"red\"> ";
+				}
+			}
+			else if (tag.isEndTag()) {
+				//alternate " and '
+				if (u->osisQToTick)
+					buf += (level % 2) ? '\"' : '\'';
+				//buf += "</font>";
+			}
+			else {	// empty quote marker
+				//alternate " and '
+				if (u->osisQToTick)
+					buf += (level % 2) ? '\"' : '\'';
+			}
+		}
+
+		// <transChange>
+		else if (!strcmp(tag.getName(), "transChange")) {
+			SWBuf type = tag.getAttribute("type");
+			
+			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
+
+// just do all transChange tags this way for now
+//				if (type == "supplied")
+					buf += "<i>";
+			}
+			else if (tag.isEndTag()) {
+				buf += "</i>";
+			}
+			else {	// empty transChange marker?
+			}
+		}
+
+		else {
+		      return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+SWORD_NAMESPACE_END
diff --git a/utilities/diatheke/osiscgi.h b/utilities/diatheke/osiscgi.h
new file mode 100644
index 0000000..13925d6
--- /dev/null
+++ b/utilities/diatheke/osiscgi.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *
+ *  osiscgi.h -	OSISCGI: OSIS to Diatheke/CGI format filter
+ *
+ * $Id: osiscgi.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef OSISCGI_H
+#define OSISCGI_H
+
+#include <swbasicfilter.h>
+
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts OSIS text to Diatheke/CGI format
+ */
+class OSISCGI : public SWBasicFilter {
+private:
+protected:
+	class MyUserData : public BasicFilterUserData {
+	public:
+		bool osisQToTick;
+		bool inBold;
+		SWBuf w;
+		SWBuf fn;
+		MyUserData(const SWModule *module, const SWKey *key);
+	};
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key) {
+		return new MyUserData(module, key);
+	}
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	OSISCGI();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/utilities/diatheke/pqa/Diatheke.pqa b/utilities/diatheke/pqa/Diatheke.pqa
new file mode 100644
index 0000000..f357b3d
--- /dev/null
+++ b/utilities/diatheke/pqa/Diatheke.pqa
diff --git a/utilities/diatheke/pqa/src/README b/utilities/diatheke/pqa/src/README
new file mode 100644
index 0000000..277a643
--- /dev/null
+++ b/utilities/diatheke/pqa/src/README
@@ -0,0 +1 @@
+Use Palm's PQA Builder with the contents of this directory (except the README file) to build Diatheke.PQA.
\ No newline at end of file
diff --git a/utilities/diatheke/pqa/src/all.html b/utilities/diatheke/pqa/src/all.html
new file mode 100644
index 0000000..0974033
--- /dev/null
+++ b/utilities/diatheke/pqa/src/all.html
@@ -0,0 +1,170 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p> <b>English Bibles</b><br> 
+<input name=ALT type=checkbox value=on>Analytical-Literal Trans. (ALT)<br>
+<input name=ASV type=checkbox value=on>American Standard Ver. (ASV)<br>
+<input name=BBE type=checkbox value=on>Bible in Basic English (BBE)<br>
+<input name=Brenton type=checkbox value=on>Brenton's English LXX Trans. [OT]<br>
+<input name=Darby type=checkbox value=on>Darby's Bible<br>
+<input name=DR type=checkbox value=on>Douay-Rheims (DR)<br>
+<input name=DRA type=checkbox value=on>Douay-Rheims 1899 American Ed.<br>
+<input name=HNV type=checkbox value=on>Hebrew Names Ver. (HNV)<br>
+<input name=ISV type=checkbox value=on>International Standard Ver. (ISV) [NT]<br>
+<input name=JPS type=checkbox value=on>JPS 1917 Tanakh [OT]<br>
+<input name=KJ21 type=checkbox value=on>21st Century King James Ver. (KJ21)<br>
+<input name=KJV type=checkbox value=on>King James Ver. (KJV/AV) *<br>
+<input name=LITV type=checkbox value=on>Green's Literal Trans. (LitV)<br>
+<input name=LO type=checkbox value=on>The Living Oracles [NT]<br>
+<input name=MKJV type=checkbox value=on>A Modern King James Ver. (MKJV)<br>
+<input name=NASB type=checkbox value=on>New American Standard (NASB) <br>
+<input name=NASB95 type=checkbox value=on>New American Standard, 95 Update<br>
+<input name=NIV type=checkbox value=on>New International Ver. (NIV)<br>
+<input name=NIVBr type=checkbox value=on>New International Ver., British Ed.<br>
+<input name=NJB type=checkbox value=on>New Jerusalem Bible (NJB)<br>
+<input name=NKJV type=checkbox value=on>New King James Ver. (NKJV)<br>
+<input name=NLT type=checkbox value=on>New Living Trans. (NLT)<br>
+<input name=NRSV type=checkbox value=on>New Revised Standard Ver. (NRSV)<br>
+<input name=ORTHJBC type=checkbox value=on>Orthodox Jewish Brit Chadasha [NT]<br>
+<input name=RSV type=checkbox value=on>Revised Standard Ver. (RSV)<br>
+<input name=RWebster type=checkbox value=on>Revised 1833 Webster's Bible *<br>
+<input name=WEB type=checkbox value=on>World English Bible (WEB)<br>
+<input name=Websters type=checkbox value=on>Webster's Bible<br>
+<input name=Weymouth type=checkbox value=on>Weymouth New Testament [NT]<br>
+<input name=YLT type=checkbox value=on>Young's Literal Trans. (YLT)</p>
+<p><b>Ancient Language Bibles</b><br>
+<input name=BHS type=checkbox value=on>Biblia Hebraica Stuttgartensia (BHS)<br>
+<input name=ByzX type=checkbox value=on>1991 Byzantine/Majority Text<br>
+<input name=LXXX type=checkbox value=on>Septuagint (LXX)<br>
+<input name=NA26X type=checkbox value=on>Nestle-Aland 26th Ed. GNT<br>
+<input name=ScrivnerX type=checkbox value=on>1894 Scrivener Textus Receptus<br>
+<input name=StephanusX type=checkbox value=on>1550 Stephanus Textus Receptus<br>
+<input name=TischX type=checkbox value=on>Tischendorf's Eighth Ed. GNT<br>
+<input name=Vulgate type=checkbox value=on>Latin Vulgate<br>
+<input name=WHX type=checkbox value=on>1881 Westcott-Hort GNT<br>
+<input name=WHNUX type=checkbox value=on>Westcott-Hort with NA27U4 variants<br>
+</p><p>
+<b>French Bibles</b><br> 
+<input name=FreCrl type=checkbox value=on>French Haitian Creaole Ver.<br>
+<input name=FreDrb type=checkbox value=on>French Darby Trans.<br>
+<input name=FreLSG type=checkbox value=on>French 1910 Louis Segond (LSG)<br>
+<input name=FreNEG type=checkbox value=on>French Nouvelle Edition de Geneve 1979<br>
+</p>
+<p><b>German Bibles</b><br> 
+<input name=GerBen type=checkbox value=on>German Bengel [NT]<br>
+<input name=GerEin type=checkbox value=on>German Einheitsuebersetzung<br>
+<input name=GerElb type=checkbox value=on>German 1905 Darby Unrev. Elberfelder<br>
+<input name=GerLut type=checkbox value=on>German 1912 Luther<br>
+<input name=GerLut1545 type=checkbox value=on>German 1545 Luther<br>
+<input name=GerRElb type=checkbox value=on>German 1993 Elberfelder, rev. Fassung<br>
+<input name=GerRLut type=checkbox value=on>German 1984 Revised Luther<br>
+<input name=GerSch type=checkbox value=on>German 1951 Schlachter Bibel<br>
+</p>
+<p>
+<b>Spanish Bibles</b><br> 
+<input name=SpaLBA type=checkbox value=on>Spanish La Biblia de Las Americas (LBA)<br>
+<input name=SpaRV type=checkbox value=on>Spanish Reina-Valera<br>
+<input name=SpaRV60 type=checkbox value=on>Spanish 1960 Reina-Valera Revised<br>
+<input name=SpaRV95 type=checkbox value=on>Spanish 1995 Reina-Valera Update<br>
+<input name=SpaRVA type=checkbox value=on>Spanish Ver. Reina-Valera Actualizada<br>
+<input name=SpaSEV type=checkbox value=on>Spanish 1569 Ver. Antigua<br>
+<input name=SpaVNT type=checkbox value=on>Spanish 1858 Valera[NT]<br>
+</p>
+  <p> <b>Other Bibles</b><br> 
+<input name=ALB type=checkbox value=on>Albanian Bible<br>
+<input name=CzeBKR type=checkbox value=on>Czech Bible Kralicka<br>
+<input name=CzeCEP type=checkbox value=on>Czech Ekumenicky Cesky Preklad<br>
+<input name=CzeKMS type=checkbox value=on>Czech Preklad KMS Nova Smlouva<br>
+<input name=CzeNKB type=checkbox value=on>Czech Nova Kralicka Bible<br>
+<input name=Dan type=checkbox value=on>Danish Danske Bibel<br>
+<input name=DutLEI type=checkbox value=on>Dutch Leidse Vertaling<br>
+<input name=DutLU type=checkbox value=on>Dutch Lutherse Vertaling<br>
+<input name=DutNBG type=checkbox value=on>Dutch 1951 Bijbelgenootschap Ver.<br>
+<input name=DutSVV type=checkbox value=on>Dutch Statenvertaling<br>
+<input name=EquShr type=checkbox value=on>Equadoran Shuar [NT]<br>
+<input name=FinPR type=checkbox value=on>Finish 1933 Phy~N Raamattu<br>
+<input name=HunKar type=checkbox value=on>Hungarian Karoli<br>
+<input name=IndBIS type=checkbox value=on>Bahasa Indonesia Sehari-hari (BIS)<br>
+<input name=IndTB type=checkbox value=on>Indonesian Terjemahan Baru (TB)<br>
+<input name=ItaIEP type=checkbox value=on>Italian Nuovissima Ver., San Paolo Ed.<br>
+<input name=ItaLND type=checkbox value=on>Italian 1991 La Nuova Diodati<br>
+<input name=ItaNRV type=checkbox value=on>Italian 1994 La Nuova Riveduta<br>
+<input name=Maori type=checkbox value=on>Maori Bible<br>
+<input name=Mel type=checkbox value=on>Melanesian Pidgin Bible<br>
+<input name=NorBok type=checkbox value=on>Norwegian 1930 Bokmal<br>
+<input name=NorN38 type=checkbox value=on>Norwegian 1938 Bokmal<br>
+<input name=NorNBK type=checkbox value=on>Norwegian Bibel Konkordant<br>
+<input name=NorNyn type=checkbox value=on>Norwegian 1994 Nynorsk<br>
+<input name=Norsk type=checkbox value=on>Norwegian Norsk Bible<br>
+<input name=PhiCEB type=checkbox value=on>Philippine Nga Cebuano<br>
+<input name=PolBTP type=checkbox value=on>Polish 1984 Millenium Bible, 4th Ed.<br>
+<input name=PorACF type=checkbox value=on>Portuguese 1995 Joao Ferreira<br>
+<input name=PorBRP type=checkbox value=on>Portuguese 1994 Almeida Biblia<br>
+<input name=RomCor type=checkbox value=on>Romanian Cornilescu Ver.<br>
+<input name=Swahili type=checkbox value=on>Swahili New Testament [NT]<br>
+<input name=SweSVE type=checkbox value=on>Swedish 1917 New Testament [NT]<br>
+<input name=Turkish type=checkbox value=on>Turkish New Testament [NT]<br>
+<input name=Uma type=checkbox value=on>Uma New Testament [NT]<br>
+<input name=Viet type=checkbox value=on>Vietnamese 1934 Bible<br>
+</p>
+  <p> <b>English Commentaries</b><br>
+<input name=DTN type=checkbox value=on>Darby Translation Notes<br>
+<input name=Family type=checkbox value=on>Family Bible Notes<br>
+<input name=TFG type=checkbox value=on>The Fourfold Gospel<br>
+<input name=Geneva type=checkbox value=on>Geneva Bible Translation Notes<br>
+<input name=Gill type=checkbox value=on>Gill's Expositor<br>
+<input name=MHCC type=checkbox value=on>Matthew Henry's Commentary<br>
+<input name=MHC type=checkbox value=on>Matthew Henry's Concise Commentary<br>
+<input name=PNT type=checkbox value=on>The People's New Testament<br>
+<input name=RWP type=checkbox value=on>Robertson's Word Pictures<br>
+<input name=Scofield type=checkbox value=on>Scofield Reference Notes, 1917 Ed.<br>
+<input name=Wesley type=checkbox value=on>John Wesley's Notes on the Bible<br>
+</p><p>
+<p><b>German Commentaries</b><br>
+<input name=MAK type=checkbox value=on>Matthias Ansorgs Kommentar<br>
+<input name=Rieger type=checkbox value=on>Carl Heinrich Riegers Kommentar<br>
+<input name=GerScof type=checkbox value=on>German Scofield 1917 Ed. (Gen-Eccl)<br>
+</p>
+<p>
+<b>Cross-references</b><br>
+<input name=TSK type=checkbox value=on>Treasury of Scriptural Knowledge<br>
+</p>
+  <p>
+<b>Bible Dictionaries</b><br>
+<input name=Eastons type=checkbox value=on>Easton's Bible Dictionary<br>
+<input name=Hitchcocks type=checkbox value=on>Hitchcock's Bible Names Dictionary<br>
+<input name=ISBE type=checkbox value=on>Int'l Standard Bible Encyclopedia<br>
+<input name=Smiths type=checkbox value=on>Smith's Bible Dictionary<br>
+<input name=Vines type=checkbox value=on>Vine's Bible Dictionary<br>
+</p>
+<p>
+<b>Topical References</b><br>
+<input name=Naves type=checkbox value=on>Naves' Topical Bible<br>
+<input name=Torrey type=checkbox value=on>R. A. Torrey's New Topical Textbook<br>
+</p>
+  <p>
+<b>Greek Lexica</b><br>
+<input name=StrongsGreek type=checkbox value=on>Strong's Greek Lexicon<br>
+<input name=Thayer type=checkbox value=on>Thayer's Greek Lexicon<br>
+</p>
+<p>
+<b>Hebrew Lexica</b><br>
+<input name=StrongsHebrew type=checkbox value=on>Strong's Hebrew Lexicon<br>
+<input name=BDB type=checkbox value=on>Brown-Driver-Briggs Hebrew Lexicon<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/ancient.html b/utilities/diatheke/pqa/src/ancient.html
new file mode 100644
index 0000000..4be0036
--- /dev/null
+++ b/utilities/diatheke/pqa/src/ancient.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Bibles</b><br>
+<input name=BHS type=checkbox value=on>Biblia Hebraica Stuttgartensia (BHS)<br>
+<input name=ByzX type=checkbox value=on>1991 Byzantine/Majority Text<br>
+<input name=LXXX type=checkbox value=on>Septuagint (LXX)<br>
+<input name=NA26X type=checkbox value=on>Nestle-Aland 26th Ed. GNT<br>
+<input name=ScrivnerX type=checkbox value=on>1894 Scrivener Textus Receptus<br>
+<input name=StephanusX type=checkbox value=on>1550 Stephanus Textus Receptus<br>
+<input name=TischX type=checkbox value=on>Tischendorf's Eighth Ed. GNT<br>
+<input name=Vulgate type=checkbox value=on>Latin Vulgate<br>
+<input name=WHX type=checkbox value=on>1881 Westcott-Hort GNT<br>
+<input name=WHNUX type=checkbox value=on>Westcott-Hort with NA27U4 variants<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/dict.html b/utilities/diatheke/pqa/src/dict.html
new file mode 100644
index 0000000..944bce3
--- /dev/null
+++ b/utilities/diatheke/pqa/src/dict.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Bible Dictionaries</b><br>
+<input name=Eastons type=checkbox value=on>Easton's Bible Dictionary<br>
+<input name=Hitchcocks type=checkbox value=on>Hitchcock's Bible Names Dictionary<br>
+<input name=ISBE type=checkbox value=on>Int'l Standard Bible Encyclopedia<br>
+<input name=Smiths type=checkbox value=on>Smith's Bible Dictionary<br>
+<input name=Vines type=checkbox value=on>Vine's Bible Dictionary<br>
+</p>
+<p>
+<b>Topical References</b><br>
+<input name=Naves type=checkbox value=on>Naves' Topical Bible<br>
+<input name=Torrey type=checkbox value=on>R. A. Torrey's New Topical Textbook<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/english.html b/utilities/diatheke/pqa/src/english.html
new file mode 100644
index 0000000..774245c
--- /dev/null
+++ b/utilities/diatheke/pqa/src/english.html
@@ -0,0 +1,68 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Bibles</b><br> 
+<input name=ALT type=checkbox value=on>Analytical-Literal Trans. (ALT)<br>
+<input name=ASV type=checkbox value=on>American Standard Ver. (ASV)<br>
+<input name=BBE type=checkbox value=on>Bible in Basic English (BBE)<br>
+<input name=Brenton type=checkbox value=on>Brenton's English LXX Trans. [OT]<br>
+<input name=Darby type=checkbox value=on>Darby's Bible<br>
+<input name=DR type=checkbox value=on>Douay-Rheims (DR)<br>
+<input name=DRA type=checkbox value=on>Douay-Rheims 1899 American Ed.<br>
+<input name=HNV type=checkbox value=on>Hebrew Names Ver. (HNV)<br>
+<input name=ISV type=checkbox value=on>International Standard Ver. (ISV) [NT]<br>
+<input name=JPS type=checkbox value=on>JPS 1917 Tanakh [OT]<br>
+<input name=KJ21 type=checkbox value=on>21st Century King James Ver. (KJ21)<br>
+<input name=KJV type=checkbox value=on>King James Ver. (KJV/AV) *<br>
+<input name=LITV type=checkbox value=on>Green's Literal Trans. (LitV)<br>
+<input name=LO type=checkbox value=on>The Living Oracles [NT]<br>
+<input name=MKJV type=checkbox value=on>A Modern King James Ver. (MKJV)<br>
+<input name=NASB type=checkbox value=on>New American Standard (NASB) <br>
+<input name=NASB95 type=checkbox value=on>New American Standard, 95 Update<br>
+<input name=NIV type=checkbox value=on>New International Ver. (NIV)<br>
+<input name=NIVBr type=checkbox value=on>New International Ver., British Ed.<br>
+<input name=NJB type=checkbox value=on>New Jerusalem Bible (NJB)<br>
+<input name=NKJV type=checkbox value=on>New King James Ver. (NKJV)<br>
+<input name=NLT type=checkbox value=on>New Living Trans. (NLT)<br>
+<input name=NRSV type=checkbox value=on>New Revised Standard Ver. (NRSV)<br>
+<input name=ORTHJBC type=checkbox value=on>Orthodox Jewish Brit Chadasha [NT]<br>
+<input name=RSV type=checkbox value=on>Revised Standard Ver. (RSV)<br>
+<input name=RWebster type=checkbox value=on>Revised 1833 Webster's Bible *<br>
+<input name=WEB type=checkbox value=on>World English Bible (WEB)<br>
+<input name=Websters type=checkbox value=on>Webster's Bible<br>
+<input name=Weymouth type=checkbox value=on>Weymouth New Testament [NT]<br>
+<input name=YLT type=checkbox value=on>Young's Literal Trans. (YLT)</p>
+<p>
+<b>Commentaries</b><br>
+<input name=DTN type=checkbox value=on>Darby Translation Notes<br>
+<input name=Family type=checkbox value=on>Family Bible Notes<br>
+<input name=TFG type=checkbox value=on>The Fourfold Gospel<br>
+<input name=Geneva type=checkbox value=on>Geneva Bible Translation Notes<br>
+<input name=Gill type=checkbox value=on>Gill's Expositor<br>
+<input name=MHCC type=checkbox value=on>Matthew Henry's Commentary<br>
+<input name=MHC type=checkbox value=on>Matthew Henry's Concise Commentary<br>
+<input name=PNT type=checkbox value=on>The People's New Testament<br>
+<input name=RWP type=checkbox value=on>Robertson's Word Pictures<br>
+<input name=Scofield type=checkbox value=on>Scofield Reference Notes, 1917 Ed.<br>
+<input name=Wesley type=checkbox value=on>John Wesley's Notes on the Bible<br>
+</p><p>
+<b>Cross-references</b><br>
+<input name=TSK type=checkbox value=on>Treasury of Scriptural Knowledge<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/french.html b/utilities/diatheke/pqa/src/french.html
new file mode 100644
index 0000000..4aeea79
--- /dev/null
+++ b/utilities/diatheke/pqa/src/french.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Bibles</b><br> 
+<input name=FreCrl type=checkbox value=on>French Haitian Creaole Ver.<br>
+<input name=FreDrb type=checkbox value=on>French Darby Trans.<br>
+<input name=FreLSG type=checkbox value=on>French 1910 Louis Segond (LSG)<br>
+<input name=FreNEG type=checkbox value=on>French Nouvelle Edition de Geneve 1979<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/german.html b/utilities/diatheke/pqa/src/german.html
new file mode 100644
index 0000000..d772a56
--- /dev/null
+++ b/utilities/diatheke/pqa/src/german.html
@@ -0,0 +1,35 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Bibles</b><br> 
+<input name=GerBen type=checkbox value=on>German Bengel [NT]<br>
+<input name=GerEin type=checkbox value=on>German Einheitsuebersetzung<br>
+<input name=GerElb type=checkbox value=on>German 1905 Darby Unrev. Elberfelder<br>
+<input name=GerLut type=checkbox value=on>German 1912 Luther<br>
+<input name=GerLut1545 type=checkbox value=on>German 1545 Luther<br>
+<input name=GerRElb type=checkbox value=on>German 1993 Elberfelder, rev. Fassung<br>
+<input name=GerRLut type=checkbox value=on>German 1984 Revised Luther<br>
+<input name=GerSch type=checkbox value=on>German 1951 Schlachter Bibel<br>
+</p>
+<p><b>Commentaries</b><br>
+<input name=MAK type=checkbox value=on>Matthias Ansorgs Kommentar<br>
+<input name=Rieger type=checkbox value=on>Carl Heinrich Riegers Kommentar<br>
+<input name=GerScof type=checkbox value=on>German Scofield 1917 Ed. (Gen-Eccl)<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/index.html b/utilities/diatheke/pqa/src/index.html
new file mode 100644
index 0000000..ff7a8c4
--- /dev/null
+++ b/utilities/diatheke/pqa/src/index.html
@@ -0,0 +1,43 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF">
+<center>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    Quick lookup in KJV, NIV, NAS, & WEB:<br> 
+<INPUT name=verse>
+<INPUT name=Submit type=submit value=Lookup>
+<input type=hidden name=KJV value=on>
+<input type=hidden name=NIV value=on>
+<input type=hidden name=NASB value=on>
+<input type=hidden name=WEB value=on>
+<input type=hidden name=palm value=on>
+</form><hr>
+  <a href="all.html">All Books</a><br>
+  <br><br>
+  <table border=0>
+    <tr> 
+      <td width="50%" height="22"> <a href="dict.html">Dictionaries & Topics</a></td>
+      <td width="50%" height="22"> <a href="lex.html">Lexica</a></td>
+    </tr>
+  </table>
+  <br><br>
+  Bibles & Commentaries:<br>
+  <table border=0>
+    <tr> 
+      <td width="33%"> <a href="english.html">English</a></td>
+      <td width="34%"> <a href="french.html">French</a></td>
+      <td width="33%"> <a href="german.html">German</a></td>
+    </tr>
+    <tr> 
+      <td width="33%"> <a href="ancient.html">Ancient</a></td>
+      <td width="34%"> <a href="spanish.html">Spanish</a></td>
+      <td width="33%"> <a href="other.html">Other</a></td>
+    </tr>
+  </table>
+</center>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/lex.html b/utilities/diatheke/pqa/src/lex.html
new file mode 100644
index 0000000..29fe0f7
--- /dev/null
+++ b/utilities/diatheke/pqa/src/lex.html
@@ -0,0 +1,29 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Greek Lexica</b><br>
+<input name=StrongsGreek type=checkbox value=on>Strong's Greek Lexicon<br>
+<input name=Thayer type=checkbox value=on>Thayer's Greek Lexicon<br>
+</p>
+<p>
+<b>Hebrew Lexica</b><br>
+<input name=StrongsHebrew type=checkbox value=on>Strong's Hebrew Lexicon<br>
+<input name=BDB type=checkbox value=on>Brown-Driver-Briggs Hebrew Lexicon<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/other.html b/utilities/diatheke/pqa/src/other.html
new file mode 100644
index 0000000..6184f94
--- /dev/null
+++ b/utilities/diatheke/pqa/src/other.html
@@ -0,0 +1,57 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Bibles</b><br> 
+<input name=ALB type=checkbox value=on>Albanian Bible<br>
+<input name=CzeBKR type=checkbox value=on>Czech Bible Kralicka<br>
+<input name=CzeCEP type=checkbox value=on>Czech Ekumenicky Cesky Preklad<br>
+<input name=CzeKMS type=checkbox value=on>Czech Preklad KMS Nova Smlouva<br>
+<input name=CzeNKB type=checkbox value=on>Czech Nova Kralicka Bible<br>
+<input name=Dan type=checkbox value=on>Danish Danske Bibel<br>
+<input name=DutLEI type=checkbox value=on>Dutch Leidse Vertaling<br>
+<input name=DutLU type=checkbox value=on>Dutch Lutherse Vertaling<br>
+<input name=DutNBG type=checkbox value=on>Dutch 1951 Bijbelgenootschap Ver.<br>
+<input name=DutSVV type=checkbox value=on>Dutch Statenvertaling<br>
+<input name=EquShr type=checkbox value=on>Equadoran Shuar [NT]<br>
+<input name=FinPR type=checkbox value=on>Finish 1933 Phy~N Raamattu<br>
+<input name=HunKar type=checkbox value=on>Hungarian Karoli<br>
+<input name=IndBIS type=checkbox value=on>Bahasa Indonesia Sehari-hari (BIS)<br>
+<input name=IndTB type=checkbox value=on>Indonesian Terjemahan Baru (TB)<br>
+<input name=ItaIEP type=checkbox value=on>Italian Nuovissima Ver., San Paolo Ed.<br>
+<input name=ItaLND type=checkbox value=on>Italian 1991 La Nuova Diodati<br>
+<input name=ItaNRV type=checkbox value=on>Italian 1994 La Nuova Riveduta<br>
+<input name=Maori type=checkbox value=on>Maori Bible<br>
+<input name=Mel type=checkbox value=on>Melanesian Pidgin Bible<br>
+<input name=NorBok type=checkbox value=on>Norwegian 1930 Bokmal<br>
+<input name=NorN38 type=checkbox value=on>Norwegian 1938 Bokmal<br>
+<input name=NorNBK type=checkbox value=on>Norwegian Bibel Konkordant<br>
+<input name=NorNyn type=checkbox value=on>Norwegian 1994 Nynorsk<br>
+<input name=Norsk type=checkbox value=on>Norwegian Norsk Bible<br>
+<input name=PhiCEB type=checkbox value=on>Philippine Nga Cebuano<br>
+<input name=PolBTP type=checkbox value=on>Polish 1984 Millenium Bible, 4th Ed.<br>
+<input name=PorACF type=checkbox value=on>Portuguese 1995 Joao Ferreira<br>
+<input name=PorBRP type=checkbox value=on>Portuguese 1994 Almeida Biblia<br>
+<input name=RomCor type=checkbox value=on>Romanian Cornilescu Ver.<br>
+<input name=Swahili type=checkbox value=on>Swahili New Testament [NT]<br>
+<input name=SweSVE type=checkbox value=on>Swedish 1917 New Testament [NT]<br>
+<input name=Turkish type=checkbox value=on>Turkish New Testament [NT]<br>
+<input name=Uma type=checkbox value=on>Uma New Testament [NT]<br>
+<input name=Viet type=checkbox value=on>Vietnamese 1934 Bible<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/pqa/src/spanish.html b/utilities/diatheke/pqa/src/spanish.html
new file mode 100644
index 0000000..e848003
--- /dev/null
+++ b/utilities/diatheke/pqa/src/spanish.html
@@ -0,0 +1,29 @@
+<html>
+<head>
+<title>HANDiatheke</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+<form action=http://bible.gotjesus.org/cgi-bin/diatheke.pl method=get>
+    <p align=center>Query: 
+      <INPUT name=verse>
+      <INPUT name=Submit type=submit value=Lookup>
+      <input type=hidden name=palm value=on>
+    </p>
+  <font size="-1"> 
+  <p> 
+<input name=strongs type=checkbox value=on>Stong's*| <input name=footnotes type=checkbox value=on>Footnotes| <input name=search type=checkbox value=on>Search</p>
+  <hr>
+  <p>
+<b>Bibles</b><br> 
+<input name=SpaLBA type=checkbox value=on>Spanish La Biblia de Las Americas (LBA)<br>
+<input name=SpaRV type=checkbox value=on>Spanish Reina-Valera<br>
+<input name=SpaRV60 type=checkbox value=on>Spanish 1960 Reina-Valera Revised<br>
+<input name=SpaRV95 type=checkbox value=on>Spanish 1995 Reina-Valera Update<br>
+<input name=SpaRVA type=checkbox value=on>Spanish Ver. Reina-Valera Actualizada<br>
+<input name=SpaSEV type=checkbox value=on>Spanish 1569 Ver. Antigua<br>
+<input name=SpaVNT type=checkbox value=on>Spanish 1858 Valera[NT]<br>
+</p>
+  </font> 
+</form>
+</body>
+</html>
diff --git a/utilities/diatheke/soap/sapouni.cgi b/utilities/diatheke/soap/sapouni.cgi
new file mode 100755
index 0000000..e44d891
--- /dev/null
+++ b/utilities/diatheke/soap/sapouni.cgi
@@ -0,0 +1,119 @@
+#!/usr/bin/perl
+
+# /****************************************************************************
+# *
+# *  sapouni.cgi -	CGI SOAP interface to diatheke
+# *
+# * $Id: sapouni.cgi 2833 2013-06-29 06:40:28Z chrislit $
+# *
+# * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+# *	CrossWire Bible Society
+# *	P. O. Box 2528
+# *	Tempe, AZ  85280-2528
+# *
+# * 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 version 2.
+# *
+# * 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.
+# *
+# */
+
+#version 1.0
+
+package sapouni;
+$sapouni = "nice /usr/bin/diatheke";  # location of diatheke command line program -- if you are using a MS Windows server, you might need to remove the "nice"
+
+$sword_path = "/home/sword";  # SWORD_PATH environment variable you want to use
+$maxverses = 0; # maximum number of verses diatheke will return per query (prevents people from asking for Gen1:1-Rev22:21; 0 for unlim.)
+$defversion = "KJV"; # book to query when none is selected, but a verse/search is entered
+$deflocale = "abbr";  # this is just the default for cases where user has not selected a locale and his browser does not reveal one -- you can also set locale using locael=<locale> in the GET URL
+
+
+###############################################################################
+## You should not need to edit anything below this line.
+## Unless you want to modify functionality of course. :)
+###############################################################################
+
+$ENV{'SWORD_PATH'} = $sword_path;
+
+use SOAP::Transport::HTTP;
+
+SOAP::Transport::HTTP::CGI
+    -> dispatch_to('sapouni')
+    -> handle;
+
+package sapouni;
+
+sub biblequery {
+    my ($class, $books, $key, $options, $encoding, $markup, $searchtype, $locale, $script, $max) = @_;
+
+    if ($key eq "") {
+	$key = "Jn 3:16";
+    }
+
+    @booklist = split ' ', $books;
+    
+    $n = scalar(@booklist);
+    if ($n == 0) {
+	@booklist[0] = $defversion;
+	$n++;
+    }
+
+    $query = "";
+
+    if ($options ne "") {
+	$query .= " -o \"$options\"";
+    }
+
+    if ($encoding ne "") {
+	$query .= " -e \"$encoding\"";
+    }
+    else {
+	$query .= " -e UTF8";
+    }
+
+    if ($markup ne "") {
+	$query .= " -f \"$markup\"";
+    }
+    else {
+	$query .= " -f ThML";
+    }
+
+    if ($searchtype ne "") {
+	$query .= " -s \"$searchtype\"";
+    }
+
+    if ($locale ne "") {
+	$query .= " -l \"$locale\"";
+    }
+    else {
+	$query .= " -l $deflocale";
+    }
+
+    if ($script ne "") {
+	$query .= " -t \"$script\"";
+    }
+    
+    if ($max ne "" && $max ne 0) {
+	$query .= " -m \"$max\"";
+    }
+
+    $rval = "";
+    for ($i = 0; $i < $n; $i++) {   
+	$line = "$sapouni $query -b $booklist[$i] -k \"$key\" 2> /dev/null";
+	
+	# uncomment to print the command line send to Diatheke (for debugging)
+	# $rval .= "$line\n";
+
+	$line = `$line`;
+	chomp($line);
+	
+	$rval .= "$line\n";
+    }	
+
+    return "$rval";
+}
diff --git a/utilities/diatheke/soap/soapatheke.pl b/utilities/diatheke/soap/soapatheke.pl
new file mode 100755
index 0000000..5031feb
--- /dev/null
+++ b/utilities/diatheke/soap/soapatheke.pl
@@ -0,0 +1,35 @@
+#!/usr/bin/perl
+
+#******************************************************************************
+#
+#  soapatheke.pl -	This is a demo SOAP app and has no other purpose.
+#
+# $Id: soapatheke.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+use SOAP::Lite;
+
+my ($books, $key, $options, $encoding, $markup, $searchtype, $locale, $script, $max) = @ARGV;
+
+# uncomment to see parameters being passed to the SOAP server (for debugging)
+# print "$books\n$key\n$options\n$encoding\n$markup\n$searchtype\n$locale\n$script\n$max\n";
+
+print SOAP::Lite
+    -> uri('http://bible.gotjesus.org/sapouni')
+    -> proxy('http://bible.gotjesus.org/cgi-bin/sapouni.cgi')
+    -> biblequery($books, $key, $options, $encoding, $markup, $searchtype, $locale, $script, $max)
+    -> result;
diff --git a/utilities/diatheke/tcl/README b/utilities/diatheke/tcl/README
new file mode 100644
index 0000000..4614422
--- /dev/null
+++ b/utilities/diatheke/tcl/README
@@ -0,0 +1,53 @@
+Diatheke/Tcl by Chris Little <chrislit@crosswire.org>

+Based on code schema of <cking@acy.digex.net>

+

+#######################################################################

+Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)

+	CrossWire Bible Society

+	P. O. Box 2528

+	Tempe, AZ  85280-2528

+

+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 version 2.

+

+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.

+

+#######################################################################

+

+This script is intended for use with libraries and modules from

+The SWORD Project, available at http://www.crosswire.org/

+

+This script requires the Diatheke command line front end to The SWORD

+Project. You should really install this first, including all optional

+components: zlib, CLucene, ICU (preferrably icu-sword), and cURL. Then

+install any modules you want to make available to users.

+

+Modify the file biblebot-diatheke.tcl as necessary so that the two

+variables "diatheke" and "dict" point to the copies of the diatheke

+and dict programs on your system.

+

+Finally, run the Perl script makebooklist.pl, which will

+create/overwrite the file biblebot-diatheke-books.tcl. This includes

+all books installed on the system, so remove any entries you want to

+hide from users, as necessary.

+

+To install Diatheke/Tcl, install an eggdrop IRC bot, copy the

+Diatheke/Tcl .tcl files (biblebot-diatheke.tcl and 

+biblebot-diatheke-books.tcl) to your eggdrop scripts directory, and

+add a line to the end of your bot startup script to load the two

+Diatheke/Tcl scripts, for example:

+ 

+source /usr/share/eggdrop/scripts/biblebot-diatheke.tcl

+source /usr/share/eggdrop/scripts/biblebot-diatheke-books.tcl

+

+This script has been tested with eggdrop 1.3.23 & 1.6.19, but should

+function fine in later versions.

+

+When you get the script loaded, type !biblehelp in a channel where

+the bot is present and it will give you a full list of commands.

+More commands will appear to you depending upon which mode the bot is

+in and whether you are an op on the bot or voiced in the channel.

diff --git a/utilities/diatheke/tcl/biblebot-diatheke-books.tcl b/utilities/diatheke/tcl/biblebot-diatheke-books.tcl
new file mode 100644
index 0000000..f10528b
--- /dev/null
+++ b/utilities/diatheke/tcl/biblebot-diatheke-books.tcl
@@ -0,0 +1,42 @@
+# Diatheke/Tcl 5.0 by Chris Little <chrislit@crosswire.org>
+
+# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+
+bind pub - !KJV setver_KJV
+
+proc setver_KJV {nick uhost hand channel arg} {
+    global botnick chan bibver
+    set bibver KJV
+    pub_lookup $nick $uhost $hand $channel $arg
+}
+
+bind pub - !sKJV setver_sKJV
+
+proc setver_sKJV {nick uhost hand channel arg} {
+    global botnick chan bibver
+    set bibver KJV
+    pub_lookups $nick $uhost $hand $channel $arg
+}
+
+proc printBibles {nick} {
+	putserv "NOTICE $nick :Bibles (1):"
+	putserv "NOTICE $nick :King James Version (1769) with Strongs Numbers and Morphology (!KJV)"
+}
+
+proc printComms {nick} {
+}
+
+proc printDicts {nick} {
+}
diff --git a/utilities/diatheke/tcl/biblebot-diatheke.tcl b/utilities/diatheke/tcl/biblebot-diatheke.tcl
new file mode 100644
index 0000000..6fb196f
--- /dev/null
+++ b/utilities/diatheke/tcl/biblebot-diatheke.tcl
@@ -0,0 +1,426 @@
+# Diatheke/Tcl 5.0 by Chris Little <chrislit@crosswire.org>
+# Based on code schema of <cking@acy.digex.net>
+
+# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)
+# 	CrossWire Bible Society
+# 	P. O. Box 2528
+# 	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+
+# modify this to reflect actual location of diatheke and dict binaries
+set diatheke "/usr/bin/diatheke"
+set dict "/usr/bin/dict"
+
+set diaver 5.0
+
+proc publookupverse {vlookup} {
+    global botnick chan bibver diatheke
+
+    set arg "-b"
+    set n [string first "@" $vlookup]
+    if {$n > -1 && $n < 2} {
+	append arg n
+    }
+
+    set n [string first "#" $vlookup]
+    if {$n > -1 && $n < 2} {
+	append arg f
+    }
+    set vlookup [string trimleft $vlookup "#"]
+    set vlookup [string trimleft $vlookup "@"]
+    set vlookup [string trimleft $vlookup "#"]
+
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
+    catch {exec $diatheke -f plaintext -o $arg -b $bibver -k "$vlookup" >& /tmp/fooout.$botnick}
+    catch {set foofile [open /tmp/fooout.$botnick]}
+    while {[gets $foofile fooverse] >= 0} {
+	set len [string length $fooverse]
+	set i 0
+	set j 255
+	while {$j < $len} {
+	    if {[regexp ">" $fooverse]} {
+		while {[string index $fooverse $j] != ">" && [string index $fooverse $j] != "\n"} {set j [expr $j - 1]}
+	    } else {
+		while {[string index $fooverse $j] != " " && [string index $fooverse $j] != "\n"} {set j [expr $j - 1]}
+	    }
+	    set foo2 [string range $fooverse $i $j]
+	    set foo2 [string trim $foo2]
+	    regsub -all -nocase {(<FI>|<CM>|<FB>)} $foo2 {} foo2
+	    regsub -all {<RF>} $foo2 {(footnote: } foo2
+	    regsub -all {<Rf>} $foo2 {)} foo2
+	    putmsg $chan "$foo2"
+	    set i [expr $j + 1]
+	    set j [expr $j + 256]
+	    if {$j > $len} {set j $len}
+	}
+	set foo2 [string range $fooverse $i end]
+	set foo2 [string trim $foo2]
+	regsub -all -nocase {(<FI>|<CM>|<FB>)} $foo2 {} foo2
+	regsub -all {<RF>} $foo2 {(footnote: } foo2
+	regsub -all {<Rf>} $foo2 {)} foo2
+	putmsg $chan "$foo2"
+    }
+    
+    catch {close $foofile}
+    exec rm /tmp/fooout.$botnick
+    return 1
+}
+
+proc pub_lookup {nick uhost hand channel arg} {
+    global von chan bibver
+    set chan $channel
+    if {$von==0} {
+	putmsg $nick "Verse display is currently off."
+	return 0
+    }
+    if {($von==2) && (![matchattr $hand 3]) && (![matchattr $hand o])} {
+	putmsg $nick "Only ops can display verses at this time."
+	return 0
+    }
+
+    publookupverse $arg
+}
+
+#----------------------------------------------------------------------
+
+proc pubsearchword {vlookup} {
+    global botnick chan bibver diatheke
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
+    catch {exec $diatheke -s $bibver "$vlookup" >& /tmp/fooout.$botnick}
+    catch {set foofile [open /tmp/fooout.$botnick]}
+
+    while {[gets $foofile fooverse] >= 0} {
+	set len [string length $fooverse]
+	set i 0
+	set j 72
+	while {$j < $len} {
+	    while {[string index $fooverse $j] != ";" && [string index $fooverse $j] != ")" && [string index $fooverse $j] != "\n"} {set j [expr $j + 1]}
+	    set foo2 [string range $fooverse $i $j]
+	    set foo2 [string trim $foo2]
+	    putmsg $chan "$foo2"
+	    set i [expr $j + 1]
+	    set j [expr $j + 73]
+	    if {$j > $len} {set j $len}
+	}
+	set foo2 [string range $fooverse $i end]
+	set foo2 [string trim $foo2]
+	putmsg $chan "$foo2"
+    }
+    catch {close $foofile}
+    
+    putmsg $chan "$fooverse"
+    exec rm /tmp/fooout.$botnick
+    return 1
+}
+
+proc pub_lookups {nick uhost hand channel arg} {
+    global von chan bibver
+    set chan $channel
+    if {$von==0} {
+	putmsg $nick "Verse display is currently off."
+	return 0
+    }
+    if {($von==3)  && (![matchattr $hand 3]) && (![matchattr $hand o]) && (![isvoice $nick $chan])} {
+	putmsg $nick "Sorry, only ops and voiced users can do searches right now."
+	return 0
+    }
+    if {($von==2) && (![matchattr $hand 3]) && (![matchattr $hand o])} {
+	putmsg $nick "Sorry, only ops can do searches right now."
+	return 0
+    }
+    
+    pubsearchword $arg
+}
+
+#----------------------------------------------------------------------
+
+proc publookupdict {vlookup} {
+    global botnick chan bibver diatheke
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
+    catch {exec $diatheke -f plaintext -b $bibver -k "$vlookup" >& /tmp/fooout.$botnick}
+    catch {set foofile [open /tmp/fooout.$botnick]}
+
+    while {[gets $foofile fooverse] >= 0} {
+	putmsg $chan "$fooverse"
+    }
+    catch {close $foofile}
+    exec rm /tmp/fooout.$botnick
+    return 1
+}
+
+proc pub_lookupd {nick uhost hand channel arg} {
+    global von chan bibver
+    set chan $channel
+    if {$von==0} {
+	putmsg $nick "Verse display is currently off."
+	return 0
+    }
+    if {($von==3) && (![matchattr $hand 3]) && (![matchattr $hand o]) && (![isvoice $nick $chan])} {
+	putmsg $nick "Sorry, only ops and voiced users can use dictionaries and indices right now."
+	return 0
+    }
+    if {($von==2) && (![matchattr $hand 3]) && (![matchattr $hand o])} {
+	putmsg $nick "Sorry, only ops can use dictionaries and indices right now."
+	return 0
+    }
+
+    publookupdict $arg
+}
+
+# Saving this as an example of some interesting (but now lost) functionality
+# whereby the argument is overridden by the current date for a daily
+# devotional query.
+
+#bind pub - !losung setver_losung
+#proc setver_losung {nick uhost hand channel arg} {
+#    global botnick chan bibver
+#    set bibver losung_en_99
+#    set arg [exec date "+%m.%d"]
+#    pub_lookupd $nick $uhost $hand $channel $arg
+#}
+
+#----------------------------------------------------------------------
+
+proc publookupcomm {vlookup} {
+    global botnick chan bibver diatheke
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $vlookup { } vlookup
+    catch {exec $diatheke -c $bibver "$vlookup" >& /tmp/fooout.$botnick}
+    catch {set foofile [open /tmp/fooout.$botnick]}
+    while {[gets $foofile fooverse] >= 0} {
+	set len [string length $fooverse]
+	set i 0
+	set j 72
+	while {$j < $len} {
+	    while {[string index $fooverse $j] != " " && [string index $fooverse $j] != "\n"} {set j [expr $j + 1]}
+	    set foo2 [string range $fooverse $i $j]
+	    set foo2 [string trim $foo2]
+	    regsub -all -nocase {(<FI>|<CM>|<FB>)} $foo2 {} foo2
+	    regsub -all {<RF>} $foo2 {(footnote: } foo2
+	    regsub -all {<Rf>} $foo2 {)} foo2
+	    putmsg $chan "$foo2"
+	    set i [expr $j + 1]
+	    set j [expr $j + 73]
+	    if {$j > $len} {set j $len}
+	}
+	set foo2 [string range $fooverse $i end]
+	set foo2 [string trim $foo2]
+	regsub -all -nocase {(<FI>|<CM>|<FB>)} $foo2 {} foo2
+	regsub -all {<RF>} $foo2 {(footnote: } foo2
+	regsub -all {<Rf>} $foo2 {)} foo2
+	putmsg $chan "$foo2"
+    }
+    catch {close $foofile}
+    exec rm /tmp/fooout.$botnick
+    return 1
+}
+
+proc pub_lookupc {nick uhost hand channel arg} {
+    global von chan bibver
+    set chan $channel
+    if {$von==0} {
+	putmsg $nick "Verse display is currently off."
+	return 0
+    }
+    if {($von==3) && (![matchattr $hand 3]) && (![matchattr $hand o]) && (![isvoice $nick $chan])} {
+	putmsg $nick "Sorry, only ops and voiced users can use commentaries right now."
+	return 0
+    }
+    if {($von==2) && (![matchattr $hand 3]) && (![matchattr $hand o])} {
+	putmsg $nick "Sorry, only ops can use commentaries right now."
+	return 0
+    }
+
+    publookupcomm $arg
+}
+
+#----------------------------------------------------------------------
+
+bind pub - !dict dictlookup
+
+proc dictlookup {nick uhost hand channel arg} {
+    global botnick von dict
+    
+    if {$von==0} {
+	putmsg $nick "Verse display is currently off."
+	return 0
+    }
+    if {($von==3) && (![matchattr $hand 3]) && (![matchattr $hand o]) && (![isvoice $nick $channel])}  {
+	putmsg $nick "Sorry, only ops and voiced users can use dictionaries and indices right now."
+	return 0
+    }
+    if {($von==2) && (![matchattr $hand 3]) && (![matchattr $hand o])} {
+	putmsg $nick "Only ops can use dictionaries and indices right now."
+	return 0
+    }
+    
+    regsub -all {[\[\]\{\}\#\%\\\$\'\"\/\s]} $arg { } arg
+    catch {exec $dict "$arg" >& /tmp/fooout.$botnick}
+    catch {set foofile [open /tmp/fooout.$botnick]}
+    catch {set fooverse [gets $foofile]}
+    while {[gets $foofile fooverse] >= 0} {
+	set fooverse [string trim $fooverse]
+	putmsg $channel "$fooverse"
+    }
+    catch {close $foofile}
+    exec rm /tmp/fooout.$botnick
+    return 1
+}
+
+#----------------------------------------------------------------------
+
+bind pub - !biblehelp pub_help
+bind msg - biblehelp pub_help
+
+proc pub_help {nick uhost hand channel arg} {
+    global diaver
+    global von
+    putserv "NOTICE $nick :Diatheke/Tcl BibleBot version $diaver"
+
+    if {(($von==0) || ($von==2)) && (![matchattr $hand 3]) && (![matchattr $hand o])} {
+	putserv "NOTICE $nick :BibleBot displays are currently turned off."
+	return 1
+    }
+
+    putserv "NOTICE $nick :Supported commands:"
+    putserv "NOTICE $nick :Help, using \"!biblehelp\""
+    putserv "NOTICE $nick :Book list, using \"!books\" (it's long)"
+    putserv "NOTICE $nick :Check display status, using \"!status\""
+    putserv "NOTICE $nick :Bible lookups, using \"!<bible version> <book> <chapter>:<verse>\""
+    putserv "NOTICE $nick :verse ranges can be specified by adding \"-<last verse>\" to this"
+    putserv "NOTICE $nick :To turn Strong's numbers and/or footnotes on, use @ and/or # respectively before the book name.  For example \"!kjv @#Gen 1:4\" will retrieve Genesis 1:3 with the Strong's numbers and footnotes associated with it."
+
+    if {($von==3) && (![matchattr $hand 3]) && (![matchattr $hand o]) && (![isvoice $nick $channel])}  {
+	return 1
+    }
+
+    putserv "NOTICE $nick :Commentary lookups, using \"!<commentary> <book> <chapter>:<verse>\""
+    putserv "NOTICE $nick :Dictionary/index lookups, using \"!<dictionary> <word or number>\""
+    putserv "NOTICE $nick :Bible searches, using \"!s<bible version> <word>\""
+    putserv "NOTICE $nick :Diatheke/Tcl defaults to PHRASE search mode.  To use MULTI-WORD search mode, preface your search with an @.  To use REGEX mode, preface your search with a #.  For example: \"!skjv @Jesus love\" will print a list of all verses in the KJV containing the words Jesus and love."
+
+    if {(![matchattr $hand 3]) && (![matchattr $hand o])}  {
+	return 1
+    }
+
+    putserv "NOTICE $nick :To turn verse display off, use \"!verseoff\""
+    putserv "NOTICE $nick :To turn all displays on for all users, use \"!verseon\""
+    putserv "NOTICE $nick :To turn all displays on for ops only, use \"!verseon o\""
+    putserv "NOTICE $nick :To turn verse diaplays on for regular users and all other displays on for ops and voiced users only, use \"!verseon v\" (default)"
+}
+
+bind pub - !books pub_books
+bind msg - books pub_books
+
+proc pub_books {nick uhost hand channel arg} {
+    global von
+
+    if {(($von==0) || ($von==2)) && (![matchattr $hand 3]) && (![matchattr $hand o])} {
+	putserv "NOTICE $nick :BibleBot displays are currently turned off."
+	return 1
+    }
+
+    printBibles $nick
+
+    if {($von==3) && (![matchattr $hand 3]) && (![matchattr $hand o]) && (![isvoice $nick $channel])}  {
+	return 1
+    }
+
+    printComms $nick
+    printDicts $nick
+}
+
+#----------------------------------------------------------------------
+
+bind pub - !status pub_status
+bind msg - status pub_status
+
+proc pub_status {nick uhost hand channel arg} {
+    global von
+    
+    if {$von==0} {
+	putserv "NOTICE $nick :All BibleBot displays are currently off."
+    } elseif {$von==1} {
+	putserv "NOTICE $nick :All BibleBot displays are currently on."
+    } elseif {$von==2} {
+	putserv "NOTICE $nick :All BibleBot displays are currently on for ops only."
+    } else {
+	putserv "NOTICE $nick :Verse displays are currently on for all users, but other BibleBot displays are currently restricted to ops and voiced users."
+    }
+    return 1
+}
+
+#---------------------------------------------------------------------
+
+proc pub_verseon {nick uhost hand channel arg} {
+    global von
+    if {![matchattr $hand 3] && ![matchattr $hand o]} {
+	return 0
+    } elseif {$arg=="v"} {
+	set von 3
+#	putserv "NOTICE $nick :Long Text Display is now on for voiced only!"
+    } elseif {$arg=="o"} {
+	set von 2
+#	putserv "NOTICE $nick :Verse Display is now on for ops only!"
+    } else {
+	set von 1
+#	putserv "NOTICE $nick :All Display is now on!"
+    }
+    pub_status $nick $uhost $hand $channel $arg
+    return 1
+}
+bind pub - !verseon pub_verseon
+bind msg - verseon pub_verseon
+
+proc pub_verseoff {nick uhost hand channel arg} {
+    global von
+    
+    if {![matchattr $hand 3] && ![matchattr $hand o]} {
+	return 0
+    }
+    set von 0
+#    putserv "NOTICE $nick :Verse Display is now off!"
+    pub_status $nick $uhost $hand $channel $arg
+    return 1
+}
+bind pub - !verseoff pub_verseoff
+bind msg - verseoff pub_verseoff
+
+proc dcc_verseoff {hand idx arg} {
+    global von
+    global whovoff
+    if {![matchattr $hand 3] && ![matchattr $hand o]} {
+	return 0
+    }
+    set von 0
+    set whovoff $hand
+    return 1
+}
+bind dcc - verseoff dcc_verseoff
+
+proc dcc_verseon {hand idx arg} {
+    global von
+    if {![matchattr $hand 3] && ![matchattr $hand o]} {
+	return 0
+    }
+    elseif {$arg=="v"} {
+	set von 3
+    }
+    elseif {$arg=="o"} {
+	set von 2
+    } else {
+	set von 1
+    }
+    return 1
+}
+bind dcc - verseon dcc_verseon
+
+#sets default von mode
+set von 1
diff --git a/utilities/diatheke/tcl/makebooklist.pl b/utilities/diatheke/tcl/makebooklist.pl
new file mode 100755
index 0000000..5b24258
--- /dev/null
+++ b/utilities/diatheke/tcl/makebooklist.pl
@@ -0,0 +1,114 @@
+#!/bin/perl
+
+#******************************************************************************
+#
+#  makebooklist.pl -
+#
+# $Id: makebooklist.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2009-2013 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+@booklist = `diatheke -b system -k modulelist`;
+
+open TCL, ">:utf8", "biblebot-diatheke-books.tcl";
+
+print TCL "# Diatheke/Tcl 5.0 by Chris Little <chrislit\@crosswire.org>\n\n# Copyright 1999-2009 CrossWire Bible Society (http://www.crosswire.org)\n#	CrossWire Bible Society\n#	P. O. Box 2528\n#	Tempe, AZ  85280-2528\n#\n# This program is free software; you can redistribute it and/or modify it\n# under the terms of the GNU General Public License as published by the\n# Free Software Foundation version 2.\n#\n# This program is distributed in the hope that it will be useful, but\n# WITHOUT ANY WARRANTY; without even the implied warranty of\n# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n# GNU General Public License for more details.\n\n";
+
+foreach $line (@booklist) {
+    $line =~ s/[\r\n]+$//;
+    if ($line =~ /^Biblical Texts:/) {
+	$mode = "bible";
+    }
+    elsif ($line =~ /^Commentaries:/) {
+	$mode = "comm";
+    }
+    elsif ($line =~ /^Dictionaries:/) {
+	$mode = "dict";
+    }
+    elsif ($line =~ /^Generic books:/) {
+	$mode = "genbook";
+    }
+    elsif ($line =~ /^([^:]+) : (.+)/) {
+	$bookid = $1;
+	$bookdesc = $2;
+	if ($mode eq "bible") {
+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookup \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+	    print TCL "bind pub - !s$bookid setver_s$bookid\nproc setver_s$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookups \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+
+	    if ($count_bible != 0) {
+		$putservtext_bible .= ", ";
+	    }
+	    if (($count_bible != 0) && ($count_bible % 5 == 0)) {
+		$putservtext_bible .= "\n";
+	    }
+	    $count_bible++;
+	    $putservtext_bible .= "$bookdesc (!$bookid)";
+	}
+	elsif ($mode eq "comm") {
+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupc \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+
+	    if ($count_comm != 0) {
+		$putservtext_comm .= ", ";
+	    }
+	    if (($count_comm != 0) && ($count_comm % 5 == 0)) {
+		$putservtext_comm .= "\n";
+	    }
+	    $count_comm++;
+	    $putservtext_comm .= "$bookdesc (!$bookid)";
+	}
+	elsif ($mode eq "dict") {
+	    print TCL "bind pub - !$bookid setver_$bookid\nproc setver_$bookid {nick uhost hand channel arg} {\n    global botnick chan bibver\n    set bibver $bookid\n    pub_lookupd \$nick \$uhost \$hand \$channel \$arg\n}\n\n";
+
+	    if ($count_dict != 0) {
+		$putservtext_dict .= ", ";
+	    }
+	    if (($count_dict != 0) && ($count_dict % 5 == 0)) {
+		$putservtext_dict .= "\n";
+	    }
+	    $count_dict++;
+	    $putservtext_dict .= "$bookdesc (!$bookid)";
+	}
+	elsif ($mode eq "genbook") {
+	    # do nothing until diatheke supports genbooks
+	}
+    }
+}
+
+$putservtext_bible = "\n$putservtext_bible";
+$putservtext_bible =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
+$putservtext_bible =~ s/, \"/,\"/gs;
+$putservtext_bible .= "\"\n";
+$putservtext_bible = "\tputserv \"NOTICE \$nick :Bibles ($count_bible):$putservtext_bible";
+$putservtext_bible = "proc printBibles \{nick\} \{\n$putservtext_bible\}\n";
+
+$putservtext_comm = "\n$putservtext_comm";
+$putservtext_comm =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
+$putservtext_comm =~ s/, \"/,\"/gs;
+$putservtext_comm .= "\"\n";
+$putservtext_comm = "\tputserv \"NOTICE \$nick :Commentaries ($count_comm):$putservtext_comm";
+$putservtext_comm = "proc printComms \{nick\} \{\n$putservtext_comm\}\n";
+
+$putservtext_dict = "\n$putservtext_dict";
+$putservtext_dict =~ s/\n/\"\n\tputserv \"NOTICE \$nick :/gs;
+$putservtext_dict =~ s/, \"/,\"/gs;
+$putservtext_dict .= "\"\n";
+$putservtext_dict = "\tputserv \"NOTICE \$nick :Dictionaries, Lexicons, & Daily Devotionals ($count_dict):$putservtext_dict";
+$putservtext_dict = "proc printDicts \{nick\} \{\n$putservtext_dict\}\n";
+
+print TCL $putservtext_bible;
+print TCL $putservtext_comm;
+print TCL $putservtext_dict;
+
diff --git a/utilities/diatheke/thmlcgi.cpp b/utilities/diatheke/thmlcgi.cpp
new file mode 100644
index 0000000..9b85c35
--- /dev/null
+++ b/utilities/diatheke/thmlcgi.cpp
@@ -0,0 +1,215 @@
+/******************************************************************************
+ *
+ *  thmlcgi.cpp -	ThMLCGI: ThML to Diatheke/CGI format filter
+ *
+ * $Id: thmlcgi.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <map>
+#include <utilstr.h>
+#include "thmlcgi.h"
+
+SWORD_NAMESPACE_START
+
+typedef std::map<SWBuf, SWBuf> DualStringMap;
+
+namespace {
+	class MyUserData : public BasicFilterUserData {
+	public:
+		MyUserData(const SWModule *module, const SWKey *key) : BasicFilterUserData(module, key) {}
+		DualStringMap properties;
+	};
+}
+
+BasicFilterUserData *ThMLCGI::createUserData(const SWModule *module, const SWKey *key) {
+	return new MyUserData(module, key);
+}
+
+ThMLCGI::ThMLCGI() {
+	setTokenStart("<");
+	setTokenEnd(">");
+
+	setTokenCaseSensitive(true);
+
+	addTokenSubstitute("note", " <font color=\"#008000\"><small>(");
+	addTokenSubstitute("/note", ")</small></font> ");
+}
+
+
+bool ThMLCGI::handleToken(SWBuf &buf, const char *token, BasicFilterUserData *baseUserData) {
+	MyUserData *userData = (MyUserData *) baseUserData;
+	unsigned long i;
+	if (!substituteToken(buf, token)) {
+	// manually process if it wasn't a simple substitution
+		if (!strncmp(token, "sync ", 5)) {
+			buf += "<a href=\"!DIATHEKE_URL!";
+			char* pbuf;
+			char typ[32]; typ[0] = 0;
+			char val[32]; val[0] = 0;
+			char cls[32]; cls[0] = 0;
+			for (unsigned int j = 5; j < strlen(token); j++) {
+                                if (!strncmp(token+j, "type=\"", 6)) {
+				        pbuf = typ;
+                                        j += 6;
+                                        for (;token[j] != '\"'; j++)
+                				*(pbuf)++ = token[j];
+					*(pbuf) = 0;
+                                }
+                                else if (!strncmp(token+j, "value=\"", 7)) {
+				        pbuf = val;
+                                        j += 7;
+                                        for (;token[j] != '\"'; j++)
+                				*(pbuf)++ = token[j];
+					*(pbuf) = 0;
+                                }
+                                else if (!strncmp(token+j, "class=\"", 7)) {
+				        pbuf = cls;
+                                        j += 7;
+                                        for (;token[j] != '\"'; j++)
+                				*(pbuf)++ = token[j];
+					*(pbuf) = 0;					
+                                }
+                        }
+			if (*cls && *val) {
+			        buf.appendFormatted("%s=on&verse=%s", cls, val);
+			}
+			else if (*typ && *val) {
+			  if (!strnicmp(typ, "Strongs", 7)) {
+			    if (*val == 'G') {
+			      buf.appendFormatted("StrongsGreek=on&verse=%s", val + 1);
+			    }
+			    else if (*val == 'H') {
+			      buf.appendFormatted("StrongsHebrew=on&verse=%s", val + 1);
+			    }
+			  }
+
+			  else if (!strnicmp(typ, "Morph", 5)) {
+			    if (*val == 'G') {
+			      buf.appendFormatted("StrongsGreek=on&verse=%s", val + 1);
+			    }
+			    else if (*val == 'H') {
+			      buf.appendFormatted("StrongsHebrew=on&verse=%s", val + 1);
+			    }
+			    else {
+			      buf.appendFormatted("Packard=on&verse=%s", val);
+			    }
+			  }
+			  else {
+			    buf.appendFormatted("%s=on&verse=%s", typ, val);
+			  }
+			}
+			buf += "\">";
+			
+			if (*val) {
+			        buf += val;
+			}
+			buf += "</a>";
+		}
+
+		else if (!strncmp(token, "scripRef p", 10) || !strncmp(token, "scripRef v", 10)) {
+        		userData->properties["inscriptRef"] = "true";
+			buf += "<a href=\"!DIATHEKE_URL!";
+			for (i = 9; i < strlen(token); i++) {
+			  if (!strncmp(token+i, "version=\"", 9)) {
+			    i += 9;
+			    for (;token[i] != '\"'; i++)
+			      buf += token[i];
+			    buf += "=on&";
+			  }
+			  if (!strncmp(token+i, "passage=\"", 9)) {
+			    i += 9;
+			    buf += "verse=";
+			    for (;token[i] != '\"'; i++) {
+			      if (token[i] == ' ') buf += '+';
+			      else buf += token[i];
+			    }
+			    buf += '&';
+			  }
+			}
+			buf += "\">";
+		} 
+
+		// we're starting a scripRef like "<scripRef>John 3:16</scripRef>"
+		else if (!strcmp(token, "scripRef")) {
+			userData->properties["inscriptRef"] = "false";
+			// let's stop text from going to output
+			userData->properties["suspendTextPassThru"] = "true";
+		}
+
+		// we've ended a scripRef 
+		else if (!strcmp(token, "/scripRef")) {
+			if (userData->properties["inscriptRef"] == "true") { // like  "<scripRef passage="John 3:16">John 3:16</scripRef>"
+				userData->properties["inscriptRef"] = "false";
+				buf += "</a>";
+			}
+			
+			else { // like "<scripRef>John 3:16</scripRef>"
+				buf += "<a href=\"!DIATHEKE_URL!verse=";
+
+				char* vref = (char*)userData->properties["lastTextNode"].c_str();
+				while (*vref) {
+				  if (*vref == ' ') buf += '+';
+				  else buf += *vref;
+				  vref++;
+				}
+				buf += "\">";
+				buf += userData->properties["lastTextNode"].c_str();
+				// let's let text resume to output again
+				userData->properties["suspendTextPassThru"] = "false";	
+				buf += "</a>";
+			}
+		}
+
+		else if (!strncmp(token, "div class=\"sechead\"", 19)) {
+		        userData->properties["SecHead"] = "true";
+			buf += "<br /><b><i>";
+		}
+		else if (!strncmp(token, "div class=\"title\"", 19)) {
+		        userData->properties["SecHead"] = "true";
+			buf += "<br /><b><i>";
+		}
+		else if (!strncmp(token, "/div", 4)) {
+		        if (userData->properties["SecHead"] == "true") {
+			        buf += "</i></b><br />";
+				userData->properties["SecHead"] = "false";
+			}
+		}
+
+                else if(!strncmp(token, "note", 4)) {
+                        buf += " <small><font color=\"#008000\">{";
+                }                
+
+		else {
+			buf += '<';
+			for (i = 0; i < strlen(token); i++)
+				buf += token[i];
+				buf += '>';
+			//return false;  // we still didn't handle token
+		}
+	}
+	return true;
+}
+
+
+
+
+
+
+SWORD_NAMESPACE_END
diff --git a/utilities/diatheke/thmlcgi.h b/utilities/diatheke/thmlcgi.h
new file mode 100644
index 0000000..9380656
--- /dev/null
+++ b/utilities/diatheke/thmlcgi.h
@@ -0,0 +1,42 @@
+/******************************************************************************
+ *
+ *  thmlcgi.h -	ThMLCGI: ThML to Diatheke/CGI format filter
+ *
+ * $Id: thmlcgi.h 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifndef THMLCGI_H
+#define THMLCGI_H
+
+#include <swbasicfilter.h>
+#include <defs.h>
+
+SWORD_NAMESPACE_START
+
+/** this filter converts ThML text to Diatheke/CGI format
+ */
+class ThMLCGI : public SWBasicFilter {
+protected:
+	virtual BasicFilterUserData *createUserData(const SWModule *module, const SWKey *key);
+	virtual bool handleToken(SWBuf &buf, const char *token, BasicFilterUserData *userData);
+public:
+	ThMLCGI();
+};
+
+SWORD_NAMESPACE_END
+#endif
diff --git a/utilities/emptyvss.cpp b/utilities/emptyvss.cpp
new file mode 100644
index 0000000..e4252f9
--- /dev/null
+++ b/utilities/emptyvss.cpp
@@ -0,0 +1,81 @@
+/******************************************************************************
+ *
+ *  emptyvss.cpp -	Utility to list empty verses in a module
+ *
+ * $Id: emptyvss.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+#include <iostream>
+#include <stdio.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWMgr;
+using sword::VerseKey;
+using sword::ModMap;
+using sword::SWKey;
+using sword::SWModule;
+using sword::SW_POSITION;
+#endif
+
+int main(int argc, char **argv) {
+	if (argc < 2) {
+		fprintf(stderr, "usage: %s <Mod Name>\n", argv[0]);
+		exit(-1);
+	}
+
+	SWMgr mgr;
+
+	ModMap::iterator it = mgr.Modules.find(argv[1]);
+	if (it == mgr.Modules.end()) {
+		fprintf(stderr, "error: %s: couldn't find module: %s \n", argv[0], argv[1]);
+		exit(-2);
+	}
+
+	SWModule *mod = it->second;
+
+	SWKey *key = (*mod);
+	VerseKey *vkey = 0;
+	SWTRY {
+		vkey = dynamic_cast<VerseKey *>(key);
+	}
+	SWCATCH (...) {}
+
+	if (!vkey) {
+		fprintf(stderr, "error: %s: %s module is not keyed to verses \n", argv[0], argv[1]);
+		exit(-3);
+	}
+
+	vkey->setIntros(false);	// turn on mod/testmnt/book/chap headings
+
+	(*mod) = TOP;
+
+	while (!mod->popError()) {
+	  
+	if (vkey->getVerse())
+		if (!mod->renderText().length())
+			std::cout << *vkey << std::endl;
+		(*mod)++;
+	}
+}
diff --git a/utilities/gbfidx.cpp b/utilities/gbfidx.cpp
new file mode 100644
index 0000000..e223188
--- /dev/null
+++ b/utilities/gbfidx.cpp
@@ -0,0 +1,342 @@
+/*****************************************************************************
+ *
+ *  gbfidx.cpp -	This code reeks but works (at least for WEB).
+ *			Good luck!
+ *
+ * $Id: gbfidx.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <fcntl.h>
+#include <versekey.h>
+#include <filemgr.h>
+
+using namespace sword;
+
+void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size);
+char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size);
+void openfiles(char *fname);
+void checkparams(int argc, char **argv);
+
+
+VerseKey key1, key2, key3;
+int fp, vfp, cfp, bfp;
+long chapoffset;
+short chapsize;
+char testmnt;
+
+
+int main(int argc, char **argv)
+{
+	long pos, offset;
+	int num1, num2, rangemax, w;
+	char startflag = 0;
+	short size;
+
+	checkparams(argc, argv);
+
+	openfiles(argv[1]);
+
+	testmnt = key1.getTestament();
+	num1 = key1.getChapter();
+	num2 = key1.getVerse();
+	pos  = 0;
+	w = write(bfp, &pos, 4);  /* Book    offset for testament intros */
+	if (w != 4)
+		perror("ERROR: write failed in main");
+	pos = 4;
+	w = write(cfp, &pos, 4);  /* Chapter offset for testament intro */
+	if (w != 4)
+		perror("ERROR: write failed in main");
+
+
+/*	Right now just zero out intros until parsing correctly */
+	pos = 0;
+	size = 0;
+	w = write(vfp, &pos, 4);  /* Module intro */
+	if (w != 4)
+		perror("ERROR: write failed in main");
+	w = write(vfp, &size, 2);
+	if (w != 2)
+		perror("ERROR: write failed in main");
+	w = write(vfp, &pos, 4);  /* Testament intro */
+	if (w != 4)
+		perror("ERROR: write failed in main");
+	w = write(vfp, &size, 2);
+	if (w != 2)
+		perror("ERROR: write failed in main");
+
+	while(!findbreak(fp, &offset, &num1, &num2, &rangemax, &size)) {
+		if (!startflag) {
+			startflag = 1;
+		}
+		else {
+			if (num2 < key2.getVerse()) {            // new chapter
+				if (num1 <= key2.getChapter()) { // new book
+					key2.setVerse(1);
+					key2.setChapter(1);
+					key2.setBook(key2.getBook()+1);
+				}
+				printf("Found Chapter Break: %d ('%s')\n", num1, (const char *)key2);
+				chapoffset = offset;
+				chapsize = size;
+//				continue;
+			}
+		}
+		key2.setVerse(1);
+		key2.setChapter(num1);
+		key2.setVerse(num2);
+
+		key3 = key2;
+//		key3 += (rangemax - key3.getVerse());
+
+		writeidx(key1, key2, key3, offset, size);
+	}
+	close(vfp);
+	close(cfp);
+	close(bfp);
+	close(fp);
+	return 0;
+}
+
+
+/**************************************************************************
+ * ENT:	key1	- current location of index
+ * 	key2	- minimum keyval for which this offset is valid
+ * 	key3	- maximum keyval for which this offset is valid
+ */
+
+void writeidx(VerseKey &key1, VerseKey &key2, VerseKey &key3, long offset, short size)
+{
+	int w;
+	long pos;
+	short tmp;
+
+	for (; ((key1 <= key3) && (key1.popError() != KEYERR_OUTOFBOUNDS) && (key1.getTestament() == testmnt)); key1+=1) {
+		if (key1.getVerse() == 1) {	// new chapter
+			if (key1.getChapter() == 1) {	// new book
+				pos = lseek(cfp, 0, SEEK_CUR);
+				w = write(bfp, &pos, 4);
+				if (w != 2)
+					perror("ERROR: write failed in writeidx");
+				pos = lseek(vfp, 0, SEEK_CUR); /* Book intro (cps) */
+				w = write(cfp, &pos, 4);
+				if (w != 2)
+					perror("ERROR: write failed in writeidx");
+				w = write(vfp, &chapoffset, 4);  /* Book intro (vss)  set to same as chap for now(it should be chap 1 which usually contains the book into anyway)*/
+				if (w != 2)
+					perror("ERROR: write failed in writeidx");
+				w = write(vfp, &chapsize, 2);
+				if (w != 2)
+					perror("ERROR: write failed in writeidx");
+			}
+			pos = lseek(vfp, 0, SEEK_CUR);
+			w = write(cfp, &pos, 4);
+			if (w != 4)
+				perror("ERROR: write failed in writeidx");
+			w = write(vfp, &chapoffset, 4);  /* Chapter intro */
+			if (w != 4)
+				perror("ERROR: write failed in writeidx");
+			w = write(vfp, &chapsize, 2);
+			if (w != 2)
+				perror("ERROR: write failed in writeidx");
+		}
+		if (key1 >= key2) {
+			w = write(vfp, &offset, 4);
+			if (w != 4)
+				perror("ERROR: write failed in writeidx");
+			w = write(vfp, &size, 2);
+			if (w != 2)
+				perror("ERROR: write failed in writeidx");
+		}
+		else	{
+			pos = 0;
+			tmp = 0;
+			w = write(vfp, &pos, 4);
+			if (w != 4)
+				perror("ERROR: write failed in writeidx");
+			w = write(vfp, &tmp, 2);
+			if (w != 2)
+				perror("ERROR: write failed in writeidx");
+		}
+	}
+}
+
+
+char startchap(char *buf)
+{
+	if (buf[0] != '<')
+		return 0;
+	if (buf[1] != 'S')
+		return 0;
+	if (buf[2] != 'C')
+		return 0;
+/*
+	if (!isdigit(buf[2]))
+		return 0;
+	for (loop = 3; loop < 7; loop++) {
+		if (buf[loop] == ' ')
+			break;
+		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
+			return 0;
+	}
+*/
+	return 1;
+}
+
+
+char startentry(char *buf)
+{
+	if (buf[0] != '<')
+		return 0;
+	if (buf[1] != 'S')
+		return 0;
+	if (buf[2] != 'V')
+		return 0;
+/*
+	if (!isdigit(buf[2]))
+		return 0;
+	for (loop = 3; loop < 7; loop++) {
+		if (buf[loop] == ' ')
+			break;
+		if ((!isdigit(buf[loop])) && (buf[loop] != ',') && (buf[loop] != '-'))
+			return 0;
+	}
+*/
+	return 1;
+}
+
+
+char findbreak(int fp, long *offset, int *num1, int *num2, int *rangemax, short *size)
+{
+	char buf[7];
+	int loop;
+	long offset2;
+	int ch2, vs2, rm2;
+	bool flag;
+	long chapstart = 0; 
+	
+	memset(buf, ' ', 7);
+
+	while (1) {
+		if (startchap(buf)) {
+			chapstart = lseek(fp, 0, SEEK_CUR) - 7;
+			memset(buf, ' ', 3);
+			flag = false;
+			for (loop = 3; loop < 6; loop++) {
+				if (isdigit(buf[loop]))
+					flag = true;
+				else {
+					buf[loop] = 0;
+					break;
+				}
+			}
+			if (flag) 
+				*num1 = atoi(buf);
+			else	(*num1)++;
+		}
+		if (startentry(buf)) {
+			memset(buf, ' ', 3);
+			flag = false;
+			for (loop = 3; loop < 6; loop++) {
+				if (isdigit(buf[loop]))
+					flag = true;
+				else {
+					buf[loop] = 0;
+					break;
+				}
+			if (flag)
+				*num2 = atoi(buf);
+			else	(*num2)++;
+			}
+			loop++;
+			if (size)
+				*offset = lseek(fp, 0, SEEK_CUR) - (7 - loop);
+			else	*offset = (chapstart) ? chapstart : lseek(fp, 0, SEEK_CUR) - 7;
+			if (size) {
+				ch2 = *num1;
+				vs2 = *num2;
+				if (findbreak(fp, &offset2, &ch2, &vs2, &rm2, 0)) {
+					*size = (short) (lseek(fp, 0, SEEK_END) - (*offset));
+				}
+				else {
+					if (vs2) {
+						*size = (offset2 - (*offset));
+					}
+				}
+				lseek(fp, *offset, SEEK_SET);
+			}
+			return 0;
+		}
+		memmove(buf, &buf[1], 6);
+		if (read(fp, &buf[6], 1) != 1)
+			return 1;
+	}
+}
+
+
+void openfiles(char *fname)
+{
+	SWBuf buf;
+
+	if ((fp = FileMgr::openFileReadOnly(fname)) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", fname);
+		exit(1);
+	}
+
+	buf.setFormatted("%s.vss", fname);
+	if ((vfp = FileMgr::createPathAndFile(buf.c_str())) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", buf.c_str());
+		exit(1);
+	}
+
+	buf.setFormatted("%s.cps", fname);
+	if ((cfp = FileMgr::createPathAndFile(buf.c_str())) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", buf.c_str());
+		exit(1);
+	}
+
+	buf.setFormatted("%s.bks", fname);
+	if ((bfp = FileMgr::createPathAndFile(buf.c_str())) < 0) {
+		fprintf(stderr, "Couldn't open file: %s\n", buf.c_str());
+		exit(1);
+	}
+}
+
+
+void checkparams(int argc, char **argv)
+{
+	if (argc < 2) {
+		fprintf(stderr, "usage: %s <file to process> [nt - for new testmt file]\n", argv[0]);
+		exit(1);
+	}
+	if (argc == 3)
+		key1 = key2 = key3 = "Matthew 1:1";
+	else	key1 = key2 = key3 = "Genesis 1:1";
+}
diff --git a/utilities/genarray.c b/utilities/genarray.c
new file mode 100644
index 0000000..f6f2097
--- /dev/null
+++ b/utilities/genarray.c
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  genarray.c -	
+ *
+ * $Id: genarray.c 2837 2013-06-29 08:36:36Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <stdlib.h>
+
+main()
+{
+	int fd, l1, l2, l3;
+	char *fnames[] = {"ot.bks", "ot.cps", "nt.bks", "nt.cps"};
+	long val;
+	char buf[64];
+
+#ifndef O_BINARY		// O_BINARY is needed in Borland C++ 4.53
+#define O_BINARY 0		// If it hasn't been defined than we probably
+#endif				// don't need it.
+
+
+	for (l1 = 0; l1 < 2; l1++) {
+		for (l2 = 0; l2 < 2; l2++) {
+			l3 = 1;
+			sprintf(buf, "%s", fnames[(l1*2)+l2]);
+			printf("		// %s\n", fnames[(l1*2)+l2]);
+			fd = open(buf, O_RDONLY|O_BINARY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+			while (read(fd, &val, 4) == 4) {
+				l3++;
+				printf("%ld, ", val/(4 + (l2*2)));
+				if (!(l3%7))
+					printf("\n");
+			}
+			close(fd);
+			printf("}, \n");
+		}
+	}
+}
diff --git a/utilities/genbookutil.cpp b/utilities/genbookutil.cpp
new file mode 100644
index 0000000..d547008
--- /dev/null
+++ b/utilities/genbookutil.cpp
@@ -0,0 +1,242 @@
+/******************************************************************************
+ *
+ *  genbookutil.cpp -	
+ *
+ * $Id: genbookutil.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <entriesblk.h>
+#include <iostream>
+#include <stdio.h>
+#include <treekeyidx.h>
+#include <rawgenbook.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) {
+	if (!target)
+		target = &treeKey;
+	
+	unsigned long currentOffset = target->getOffset();
+	std::cout << ((currentOffset == treeKey.getOffset()) ? "==>" : "");
+	for (int i = 0; i < level; i++) std::cout << "\t";
+	std::cout << treeKey.getLocalName() << "/\n";
+	if (treeKey.firstChild()) {
+		printTree(treeKey, target, level+1);
+		treeKey.parent();
+	}
+	if (treeKey.nextSibling())
+		printTree(treeKey, target, level);
+
+}
+
+
+void printLocalName(TreeKeyIdx *treeKey) {
+	std::cout << "locaName: " << treeKey->getLocalName() << "\n";
+}
+
+
+void setLocalName(TreeKeyIdx *treeKey) {
+  char buf[1023], *c;
+	std::cout << "Enter New Node Name: ";
+	c = fgets(buf, 1000, stdin);
+	if (c == NULL)
+		std::cerr << "ERROR: fgets failed in setLocalName\n";
+	SWBuf name = buf;
+	treeKey->setLocalName(name.trim());
+	treeKey->save();
+}
+
+
+void gotoPath(TreeKeyIdx *treeKey) {
+  char buf[1023], *c;
+	std::cout << "Enter Path: ";
+	c = fgets(buf, 1000, stdin);
+	if (c == NULL)
+		std::cerr << "ERROR: fgets failed in gotoPath\n";
+	SWBuf path = buf;
+	(*treeKey) = path.trim();
+}
+
+
+void assurePath(TreeKeyIdx *treeKey) {
+  char buf[1023], *c;
+	std::cout << "Enter Path: ";
+	c = fgets(buf, 1000, stdin);
+	if (c == NULL)
+		std::cerr << "ERROR: fgets failed in assurePath\n";
+	SWBuf path = buf;
+	treeKey->assureKeyPath(path.trim());
+}
+
+
+void viewEntryText(RawGenBook *book) {
+	std::cout << "\n";
+	std::cout << book->renderText();
+	std::cout << "\n";
+}
+
+
+void setEntryText(RawGenBook *book) {
+	SWBuf body;
+	TreeKeyIdx *treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+	if (treeKey->getOffset()) {
+	  char buf[1023], *c;
+		std::cout << "Enter New Entry Text ('.' on a line by itself to end): \n";
+		do {
+			c = fgets(buf, 1000, stdin);
+			if (c == NULL)
+				std::cerr << "ERROR: fgets failed in setEntryText\n";
+			SWBuf text = buf;
+			text.trim();
+			if ((text[0] == '.') && (text[1] == 0))
+				break;
+			body += text;
+			body += "\n";
+		} while (true);
+
+		(*book) << body.c_str();
+	}
+	else	std::cout << "Can't add entry text to root node\n";
+}
+
+
+void appendSibbling(TreeKeyIdx *treeKey) {
+	if (treeKey->getOffset()) {
+	  char buf[1023], *c;
+		std::cout << "Enter New Sibbling Name: ";
+		c = fgets(buf, 1000, stdin);
+		if (c == NULL)
+			std::cerr << "ERROR: fgets failed in appendSibbling\n";
+		SWBuf name = buf;
+		treeKey->append();
+		treeKey->setLocalName(name.trim());
+		treeKey->save();
+	}
+	else	std::cout << "Can't add sibling to root node\n";
+}
+
+
+void appendChild(TreeKeyIdx *treeKey) {
+  char buf[1023], *c;
+	std::cout << "Enter New Child Name: ";
+	c = fgets(buf, 1000, stdin);
+	if (c == NULL)
+		std::cerr << "ERROR: fgets failed in appendChild\n";
+	SWBuf name = buf;
+	treeKey->appendChild();
+	treeKey->setLocalName(name.trim());
+	treeKey->save();
+}
+
+
+void deleteNode(TreeKeyIdx *treeKey) {
+	std::cout << "Removing entry [" << treeKey->getText() << "]\n";
+	treeKey->remove();
+}
+
+
+void removeEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Removing entry [" << index << "]\n";
+		eb->removeEntry(index);
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <tree/key/data/path>\n", *argv);
+		exit(-1);
+	}
+
+	TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]);
+
+	if (treeKey->popError()) {
+		RawGenBook::createModule(argv[1]);
+	}
+	delete treeKey;
+
+	RawGenBook *book = new RawGenBook(argv[1]);
+	TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book)));
+	treeKey = (TreeKeyIdx *)(SWKey *)(*book);
+
+	SWBuf input;
+	char line[1024], *c;
+
+	do {
+		std::cout << "[" << treeKey->getText() << "] > ";
+		c = fgets(line, 1000, stdin);
+		if (c == NULL)
+			std::cerr << "ERROR: fgets failed in main\n";
+		input = line;
+		input.trim();
+		if (input.length() > 0) {
+			switch (input[0]) {
+				case 'n': printLocalName(treeKey); break;
+				case 's': setLocalName(treeKey); break;
+				case 'g': gotoPath(treeKey); break;
+				case 'G': assurePath(treeKey); break;
+				case 'p':	root.root(); printTree(root, treeKey); break;
+				case 'a':	appendSibbling(treeKey); break;
+				case 'c':	appendChild(treeKey); break;
+				case 'd':	deleteNode(treeKey); break;
+				case 'j':	treeKey->nextSibling(); break;
+				case 'k':	treeKey->previousSibling(); break;
+				case 'h':	treeKey->parent(); break;
+				case 'l':	treeKey->firstChild(); break;
+				case 'r':	treeKey->root(); break;
+				case 't':	setEntryText(book); break;
+				case 'v':	viewEntryText(book); break;
+				case 'q': break;
+				case '?':
+				default:
+					std::cout << "\n p - print tree\n";
+					std::cout << " n - get local name\n";
+					std::cout << " s - set local name\n";
+					std::cout << " j - next sibbling\n";
+					std::cout << " k - previous sibbling\n";
+					std::cout << " h - parent\n";
+					std::cout << " l - first child\n";
+					std::cout << " r - root\n";
+					std::cout << " g - goto path\n";
+					std::cout << " G   goto path; create if it doesn't exist\n";
+					std::cout << " a - append sibbling\n";
+					std::cout << " c - append child\n";
+					std::cout << " d - delete node\n";
+					std::cout << " v - view entry text\n";
+					std::cout << " t - set entry text\n";
+					std::cout << " q - quit\n\n";
+					break;
+			}
+		}
+	}
+	while (input.compare("q"));
+
+	delete treeKey;
+
+	return 0;
+}
diff --git a/utilities/imp2gbs.cpp b/utilities/imp2gbs.cpp
new file mode 100644
index 0000000..dde871f
--- /dev/null
+++ b/utilities/imp2gbs.cpp
@@ -0,0 +1,276 @@
+/******************************************************************************
+ *
+ *  imp2gbs.cpp -	Utility to import GenBooks in IMP format
+ *
+ * $Id: imp2gbs.cpp 2980 2013-09-14 21:51:47Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include <entriesblk.h>
+#include <iostream>
+#include <treekeyidx.h>
+#include <rawgenbook.h>
+#include <utilstr.h>
+#include <filemgr.h>
+#include <utf8greekaccents.h>
+#include <stringmgr.h>
+
+#ifdef _ICU_
+#include <unicode/utypes.h>
+#include <unicode/ucnv.h>
+#include <unicode/ustring.h>
+#include <unicode/uchar.h>
+#include <unicode/unistr.h>
+#include <unicode/translit.h>
+#include <unicode/locid.h>
+#endif
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+SWBuf outPath;
+SWBuf inFile;
+bool  toUpper     = false;
+bool  greekFilter = false;
+bool  augMod      = false;
+bool  augEnt      = true;
+int   lexLevels   = 0;
+UTF8GreekAccents greekAccentsFilter;
+
+
+void usage(const char *app) {
+	fprintf(stderr, "imp2gbs 1.0 General Book module creation tool for the SWORD Project\n\n");
+	fprintf(stderr, "usage: %s <inFile> [OPTIONS]\n", app);
+	fprintf(stderr, "\t-o <outPath>\n\t\tSpecify an output Path other than inFile location.\n");
+	fprintf(stderr, "\t-a\n\t\tAugment Module [default: create new]\n");
+	fprintf(stderr, "\t-O\n\t\tOverwrite entries of same key [default: append to]\n");
+	fprintf(stderr, "\t-U\n\t\tKey filter: Convert toUpper\n");
+	fprintf(stderr, "\t-g\n\t\tKey filter: Strip Greek diacritics\n");
+	fprintf(stderr, "\t-l <levels>\n\t\tKey filter: Pseudo-Lexicon n-level generation using first character\n");
+	fprintf(stderr, "\t\te.g. -l 2 \"Abbey\" -> \"A/AB/Abbey\"\n");
+	fprintf(stderr, "\n");
+	exit (-1);
+}
+
+
+void parseParams(int argc, char **argv) {
+
+	if (argc < 2) {
+		usage(*argv);
+	}
+
+	inFile = argv[1];
+
+	for (int i = 2; i < argc; i++) {
+		if (!strcmp(argv[i], "-o")) {
+			if ((i+1 < argc) && (argv[i+1][0] != '-')) {
+				outPath = argv[i+1];
+				i++;
+			}
+			else usage(*argv);
+		}
+		else if (!strcmp(argv[i], "-U")) {
+			if (StringMgr::hasUTF8Support()) {
+				toUpper = true;
+			}
+			else {
+				fprintf(stderr, "Error: %s.  Cannot reliably toUpper without UTF8 support\n\t(recompile with ICU enabled)\n\n", *argv);
+				usage(*argv);
+			}
+		}
+		else if (!strcmp(argv[i], "-g")) {
+			greekFilter = true;
+		}
+		else if (!strcmp(argv[i], "-O")) {
+			augEnt = false;
+		}
+		else if (!strcmp(argv[i], "-a")) {
+			augMod = true;
+		}
+		else if (!strcmp(argv[i], "-l")) {
+			if (i+1 < argc) {
+				lexLevels = atoi(argv[i+1]);
+				i++;
+			}
+			if (!lexLevels) usage(*argv);
+		}
+	}
+	if (!outPath.size()) {
+		outPath = inFile;
+		unsigned int i;
+		for (i = 0; (i < outPath.size() && outPath[i] != '.'); i++);
+		outPath.size(i);
+	}
+}
+  
+
+void writeEntry(SWModule *book, SWBuf keyBuffer, SWBuf entBuffer) {
+
+
+	if (greekFilter) {
+		greekAccentsFilter.processText(keyBuffer);
+	}
+
+	if (toUpper) {
+		unsigned size = (keyBuffer.size()+5)*3;
+		keyBuffer.setFillByte(0);
+		keyBuffer.resize(size);
+		StringMgr::getSystemStringMgr()->upperUTF8(keyBuffer.getRawData(), size-2);
+	}
+
+// Added for Hesychius, but this stuff should be pushed back into new StringMgr
+// functionality
+#ifdef _ICU_
+//	if (lexLevels) {
+	if (lexLevels && !keyBuffer.startsWith("/Intro")) {
+		unsigned size = (keyBuffer.size()+(lexLevels*2));
+		keyBuffer.setFillByte(0);
+		keyBuffer.resize(size);
+			
+		UErrorCode err = U_ZERO_ERROR;
+		
+		int max = (size+5)*3;
+		UChar *ubuffer = new UChar[max+10];
+		int32_t len;
+		
+		u_strFromUTF8(ubuffer, max+9, &len, keyBuffer.c_str(), -1, &err);
+		if (err == U_ZERO_ERROR) {
+			UChar *upper = new UChar[(lexLevels+1)*3];
+			memcpy(upper, ubuffer, lexLevels*sizeof(UChar));
+			upper[lexLevels] = 0;
+			len = u_strToUpper(upper, (lexLevels+1)*3, upper, -1, 0, &err);
+			memmove(ubuffer+len+1, ubuffer, (max-len)*sizeof(UChar));
+			memcpy(ubuffer, upper, len*sizeof(UChar));
+			ubuffer[len] = '/';
+			delete [] upper;
+
+			int totalShift = 0;
+			for (int i = lexLevels-1; i; i--) {
+				int shift = (i < len)? i : len;
+				memmove(ubuffer+(shift+1), ubuffer, (max-shift)*sizeof(UChar));
+				ubuffer[shift] = '/';
+				totalShift += (shift+1);
+			}
+			u_strToUTF8(keyBuffer.getRawData(), max, 0, ubuffer, -1, &err);
+		}
+		
+/*
+		u_strFromUTF8(ubuffer, max+9, &len, keyBuffer.c_str(), -1, &err);
+		if (err == U_ZERO_ERROR) {
+			int totalShift = 0;
+			for (int i = lexLevels; i; i--) {
+				int shift = (i < len)? i : len;
+				memmove(ubuffer+(shift+1), ubuffer, (max-shift)*sizeof(UChar));
+				ubuffer[shift] = '/';
+				totalShift += (shift+1);
+			}
+			UChar *upper = new UChar[(totalShift+1)*3];
+			memcpy(upper, ubuffer, totalShift*sizeof(UChar));
+			upper[totalShift] = 0;
+			len = u_strToUpper(upper, (totalShift+1)*3, upper, -1, 0, &err);
+			memmove(ubuffer+len, ubuffer+totalShift, (max-totalShift)*sizeof(UChar));
+			memcpy(ubuffer, upper, len*sizeof(UChar));
+			delete [] upper;
+			u_strToUTF8(keyBuffer.getRawData(), max, 0, ubuffer, -1, &err);
+		}
+*/
+		
+		delete [] ubuffer;
+	}
+#endif
+
+	std::cout << keyBuffer << std::endl;
+
+	book->setKey(keyBuffer.c_str());
+
+	// check to see if we already have an entry
+	for (int i = 2; book->getKey()->popError() != KEYERR_OUTOFBOUNDS; i++) {
+		SWBuf key;
+		key.setFormatted("%s {%d}", keyBuffer.c_str(), i);
+		std::cout << "dup key, trying: " << key << std::endl;
+		book->setKey(key.c_str());
+	}
+
+	book->setEntry(entBuffer);
+}
+
+
+int main(int argc, char **argv) {
+	greekAccentsFilter.setOptionValue("Off");		// off = accents off
+	parseParams(argc, argv);
+  
+	// Let's see if we can open our input file
+	FileDesc *fd = FileMgr::getSystemFileMgr()->open(inFile, FileMgr::RDONLY);
+	if (fd->getFd() < 0) {
+		fprintf(stderr, "error: %s: couldn't open input file: %s \n", argv[0], inFile.c_str());
+		exit(-2);
+	}
+  
+	RawGenBook *book;
+  
+	// Do some initialization stuff
+	if (!augMod) {
+		RawGenBook::createModule(outPath);
+	}
+	book = new RawGenBook(outPath);
+  
+	SWBuf lineBuffer;
+	SWBuf keyBuffer;
+	SWBuf entBuffer;
+
+	bool more = true;
+	do {
+		more = FileMgr::getLine(fd, lineBuffer)!=0;
+		if (lineBuffer.startsWith("$$$")) {
+			if ((keyBuffer.size()) && (entBuffer.size())) {
+				writeEntry(book, keyBuffer, entBuffer);
+			}
+			keyBuffer = lineBuffer;
+			keyBuffer << 3;
+			keyBuffer.trim();
+			entBuffer.size(0);
+		}
+		else {
+			if (keyBuffer.size()) {
+				entBuffer += lineBuffer;
+				entBuffer += "\n";
+			}
+		}
+	} while (more);
+	if ((keyBuffer.size()) && (entBuffer.size())) {
+		writeEntry(book, keyBuffer, entBuffer);
+	}
+
+	delete book;
+
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	return 0;
+}
+
+
+
diff --git a/utilities/imp2ld.cpp b/utilities/imp2ld.cpp
new file mode 100644
index 0000000..7d8b604
--- /dev/null
+++ b/utilities/imp2ld.cpp
@@ -0,0 +1,231 @@
+/******************************************************************************
+ *
+ *  imp2ld.cpp -	Utility to import LD modules in IMP format
+ *
+ * $Id: imp2ld.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <string>
+#include <vector>
+#include <fstream>
+#include <iostream>
+#include <rawld.h>
+#include <rawld4.h>
+#include <zld.h>
+#include <zipcomprs.h>
+#include <lzsscomprs.h>
+#include <stdio.h>
+
+using std::string;
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+void usage(const char *progName, const char *error = 0) {
+	if (error) fprintf(stderr, "\n%s: %s\n", progName, error);
+	fprintf(stderr, "\n=== imp2ld (Revision $Rev: 2234 $) SWORD lexicon importer.\n");
+	fprintf(stderr, "\nusage: %s <imp_file> [options]\n", progName);
+	fprintf(stderr, "  -a\t\t\t augment module if exists (default is to create new)\n");
+	fprintf(stderr, "  -z\t\t\t use ZIP compression (default no compression)\n");
+	fprintf(stderr, "  -Z\t\t\t use LZSS compression (default no compression)\n");
+	fprintf(stderr, "  -o <output_path>\t where to write data files.\n");
+	fprintf(stderr, "  -4\t\t\t use 4 byte size entries (default is 2).\n");
+	fprintf(stderr, "  -b <entry_count>\t\t compression block size (default 30 entries)\n");
+	fprintf(stderr, "  -s\t\t\t case sensitive keys (default is not case sensitive)\n");
+	fprintf(stderr, "\n");
+	fprintf(stderr, "'imp' format is a simple standard for importing data into SWORD modules.\n"
+		"Required is a plain text file containing $$$key lines followed by content.\n\n"
+		"$$$Abraham\n"
+		"Abraham was the father of Isaac...\n"
+		"He was called by God to leave his country and journey to the land of Canaan...\n"
+		"$$$Isaac\n"
+		"Isaac was the son of Abraham and Sarah...\n\n");
+	exit(-1);
+}
+
+int main(int argc, char **argv) {
+
+	std::vector<string> linkbuffer;
+	signed long i = 0;
+	string keybuffer;
+	string entbuffer;
+	string linebuffer;
+	char links = 0;
+	string modname;
+	SWBuf outPath          = "";
+	bool append            = false;
+	long blockCount = 30;
+	bool caseSensitive = false;
+	SWCompress *compressor = 0;
+	SWBuf compType         = "";
+	bool fourByteSize      = false;
+
+	if (argc < 2) usage(*argv);
+
+	const char *progName   = argv[0];
+	const char *inFileName = argv[1];
+
+	for (int i = 2; i < argc; i++) {
+		if (!strcmp(argv[i], "-a")) {
+			append = true;
+		}
+		else if (!strcmp(argv[i], "-z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (fourByteSize) usage(*argv, "Cannot specify both -z and -4");
+			compType = "ZIP";
+		}
+		else if (!strcmp(argv[i], "-Z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (fourByteSize) usage(*argv, "Cannot specify both -Z and -4");
+			compType = "LZSS";
+		}
+		else if (!strcmp(argv[i], "-4")) {
+			fourByteSize = true;
+		}
+		else if (!strcmp(argv[i], "-b")) {
+			if (i+1 < argc) {
+				blockCount = atoi(argv[++i]);
+				if (blockCount > 0) continue;
+			}
+			usage(*argv, "-b requires in entry count integer > 0");
+		}
+		else if (!strcmp(argv[i], "-o")) {
+			if (i+1 < argc) outPath = argv[++i];
+			else usage(progName, "-o requires <output_path>");
+		}
+		else if (!strcmp(argv[i], "-s")) {
+			caseSensitive = true;
+		}
+		else usage(progName, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
+	}
+
+
+
+	if (outPath.size() < 1) {
+		for (i = 0; (i < 16) && (inFileName[i]) && (inFileName[i] != '.'); i++) {
+			outPath += inFileName[i];
+		}
+	}
+
+	std::ifstream infile(inFileName);
+
+
+	SWModule *mod = 0;
+	SWKey *key, *linkKey;
+
+	if (compType == "ZIP") {
+#ifndef EXCLUDEZLIB
+		compressor = new ZipCompress();
+#else
+		usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library");
+#endif
+	}
+	else if (compType == "LZSS") {
+		compressor = new LZSSCompress();
+	}
+
+	// setup module
+	if (!append) {
+		if (compressor) {
+			if (zLD::createModule(outPath)) {
+				fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", *argv, outPath.c_str());
+				exit(-1);
+			}
+		}
+		else {
+			if (!fourByteSize)
+				RawLD::createModule(outPath);
+			else	RawLD4::createModule(outPath);
+		}
+	}
+
+	if (compressor) {
+		// Create a compressed text module allowing very large entries
+		// Taking defaults except for first, fourth, fifth and last argument
+		mod = new zLD(outPath, 0, 0, blockCount, compressor, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive);
+	}
+	else {
+		mod = (!fourByteSize)
+			? (SWModule *)new RawLD (outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive)
+			: (SWModule *)new RawLD4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, caseSensitive);
+	}
+
+
+
+
+	key = mod->createKey();
+	linkKey = mod->createKey();
+	key->setPersist(true);
+	mod->setKey(key);
+
+	while (!infile.eof()) {
+		std::getline(infile, linebuffer);
+		if (linebuffer.size() > 3 && linebuffer.substr(0,3) == "$$$") {
+			if (keybuffer.size() && entbuffer.size()) {
+				std::cout << keybuffer << std::endl;
+				*key = keybuffer.c_str();
+
+				mod->setEntry(entbuffer.c_str(), entbuffer.size());
+				for (i = 0; i < links; i++) {
+					std::cout << "Linking: " << linkbuffer[i] << std::endl;
+					*linkKey = linkbuffer[i].c_str();
+					mod->linkEntry(linkKey);
+				}
+			}
+			if (linebuffer.size() > 3)
+				keybuffer = linebuffer.substr(3,linebuffer.size());
+
+			entbuffer.resize(0);
+			linkbuffer.clear();
+			links = 0;
+		}
+		else if (linebuffer.size() > 3 && linebuffer.substr(0,3) == "%%%") {
+			linkbuffer.push_back(linebuffer.substr(3,linebuffer.size()));
+			links++;
+		}
+		else {
+			entbuffer += linebuffer;
+		}
+	}
+
+	//handle final entry
+	if (keybuffer.size() && entbuffer.size()) {
+		std::cout << keybuffer << std::endl;
+		*key = keybuffer.c_str();
+
+		mod->setEntry(entbuffer.c_str(), entbuffer.size());
+		for (i = 0; i < links; i++) {
+			std::cout << "Linking: " << linkbuffer[i] << std::endl;
+			*linkKey = linkbuffer[i].c_str();
+			mod->linkEntry(linkKey);
+		}
+	}
+
+	infile.close();
+
+	delete linkKey;
+	delete key;
+	delete mod;
+
+	return 0;
+}
diff --git a/utilities/imp2vs.cpp b/utilities/imp2vs.cpp
new file mode 100644
index 0000000..cc26f0b
--- /dev/null
+++ b/utilities/imp2vs.cpp
@@ -0,0 +1,304 @@
+/******************************************************************************
+ *
+ *  imp2vs.cpp -	Utility to import IMP formatted VerseKey modules
+ *
+ * $Id: imp2vs.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <stdio.h>
+#include <iostream>
+
+#include <swbuf.h>
+#include <filemgr.h>
+#include <versekey.h>
+#include <rawtext.h>
+#include <rawtext4.h>
+#include <ztext.h>
+#include <lzsscomprs.h>
+#include <zipcomprs.h>
+#include <localemgr.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using namespace std;
+
+void writeEntry(const SWBuf &key, const SWBuf &entry, SWModule *module);
+
+void usage(const char *progName, const char *error = 0) {
+	if (error) fprintf(stderr, "\n%s: %s\n", progName, error);
+	fprintf(stderr, "\n=== imp2vs (Revision $Rev: 2234 $) SWORD Bible/Commentary importer.\n");
+	fprintf(stderr, "\nusage: %s <imp_file> [options]\n", progName);
+	fprintf(stderr, "  -a\t\t\t augment module if exists (default is to create new)\n");
+	fprintf(stderr, "  -z\t\t\t use ZIP compression (default no compression)\n");
+	fprintf(stderr, "  -Z\t\t\t use LZSS compression (default no compression)\n");
+	fprintf(stderr, "  -o <output_path>\t where to write data files.\n");
+	fprintf(stderr, "  -4\t\t\t use 4 byte size entries (default is 2).\n");
+	fprintf(stderr, "  -b <2|3|4>\t\t compression block size (default 4):\n");
+	fprintf(stderr, "\t\t\t\t 2 - verse; 3 - chapter; 4 - book\n");
+	fprintf(stderr, "  -v <v11n>\t\t specify a versification scheme to use (default is KJV)\n");
+	fprintf(stderr, "\t\t\t\t Note: The following are valid values for v11n:\n");
+	VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr();
+	StringList av11n = vmgr->getVersificationSystems();
+	for (StringList::iterator loop = av11n.begin(); loop != av11n.end(); loop++) {
+		fprintf(stderr, "\t\t\t\t\t%s\n", (*loop).c_str());
+        }
+	fprintf(stderr, "  -l <locale>\t\t specify a locale scheme to use (default is en)\n");
+	fprintf(stderr, "\n");
+	fprintf(stderr, "'imp' format is a simple standard for importing data into SWORD modules.\n"
+		"Required is a plain text file containing $$$key lines followed by content.\n\n"
+		"$$$Gen.1.1\n"
+		"In the beginning God created\n"
+		"the heavens and the earth\n"
+		"$$$Gen.1.2\n"
+		"and the earth...\n\n"
+		"Key lines can contain ranges, for example, a commentary entry which discusses\n"
+		"John 1:1-4 might have a key, $$$Jn.1.1-4.  Special keys for intro entries use\n"
+		"standard SWORD notation, e.g. $$$Rom.4.0 for intro of Romans chapter 4,\n"
+		"$$$Rev.0.0 for intro of the Book of Revelation of John.  $$$[ Module Heading ]\n"
+		"for entire module intro.  $$$[ Testament 2 Heading ] for NT intro.\n\n");
+	exit(-1);
+}
+
+
+int main(int argc, char **argv) {
+
+
+	// handle options
+	if (argc < 2) usage(*argv);
+
+	const char *progName   = argv[0];
+	const char *inFileName = argv[1];
+	SWBuf v11n             = "KJV";
+	SWBuf outPath          = "./";
+	SWBuf locale	       = "en";
+	
+	bool fourByteSize      = false;
+	bool append            = false;
+	int iType              = 4;
+	SWCompress *compressor = 0;
+	SWBuf compType         = "";
+
+	for (int i = 2; i < argc; i++) {
+		if (!strcmp(argv[i], "-a")) {
+			append = true;
+		}
+		else if (!strcmp(argv[i], "-z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (fourByteSize) usage(*argv, "Cannot specify both -z and -4");
+			compType = "ZIP";
+		}
+		else if (!strcmp(argv[i], "-Z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (fourByteSize) usage(*argv, "Cannot specify both -Z and -4");
+			compType = "LZSS";
+		}
+		else if (!strcmp(argv[i], "-4")) {
+			fourByteSize = true;
+		}
+		else if (!strcmp(argv[i], "-b")) {
+			if (i+1 < argc) {
+				iType = atoi(argv[++i]);
+				if ((iType >= 2) && (iType <= 4)) continue;
+			}
+			usage(*argv, "-b requires one of <2|3|4>");
+		}
+		else if (!strcmp(argv[i], "-o")) {
+			if (i+1 < argc) outPath = argv[++i];
+			else usage(progName, "-o requires <output_path>");
+		}
+		else if (!strcmp(argv[i], "-v")) {
+			if (i+1 < argc) v11n = argv[++i];
+			else usage(progName, "-v requires <v11n>");
+		}
+		else if (!strcmp(argv[i], "-l")) {
+			if (i+1 < argc) locale = argv[++i];
+			else usage(progName, "-l requires <locale>");
+		}
+		else usage(progName, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
+	}
+	// -----------------------------------------------------
+	const VersificationMgr::System *v = VersificationMgr::getSystemVersificationMgr()->getVersificationSystem(v11n);
+	if (!v) std::cout << "Warning: Versification " << v11n << " not found. Using KJV versification...\n";
+
+	if (compType == "ZIP") {
+#ifndef EXCLUDEZLIB
+		compressor = new ZipCompress();
+#else
+		usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library");
+#endif
+	}
+	else if (compType == "LZSS") {
+		compressor = new LZSSCompress();
+	}
+
+	// setup module
+	if (!append) {
+		if (compressor) {
+			if (zText::createModule(outPath, iType, v11n)) {
+				fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", *argv, outPath.c_str());
+				exit(-1);
+			}
+		}
+		else {
+			if (!fourByteSize)
+				RawText::createModule(outPath, v11n);
+			else	RawText4::createModule(outPath, v11n);
+		}
+	}
+
+	SWModule *module = 0;
+	if (compressor) {
+		// Create a compressed text module allowing very large entries
+		// Taking defaults except for first, fourth, fifth and last argument
+		module = new zText(
+				outPath,		// ipath
+				0,		// iname
+				0,		// idesc
+				iType,		// iblockType
+				compressor,	// icomp
+				0,		// idisp
+				ENC_UNKNOWN,	// enc
+				DIRECTION_LTR,	// dir
+				FMT_UNKNOWN,	// markup
+				0,		// lang
+				v11n		// versification
+		       );
+	}
+	else {
+		module = (!fourByteSize)
+			? (SWModule *)new RawText(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, v11n)
+			: (SWModule *)new RawText4(outPath, 0, 0, 0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0, v11n);
+	}
+	// -----------------------------------------------------
+	
+	// setup locale manager
+	
+	LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(locale);
+			
+
+	// setup module key to allow full range of possible values, and then some
+	
+	VerseKey *vkey = (VerseKey *)module->createKey();
+	vkey->setIntros(true);
+	vkey->setAutoNormalize(false);
+	vkey->setPersist(true);
+	module->setKey(*vkey);
+	// -----------------------------------------------------
+
+
+	// process input file
+	FileDesc *fd = FileMgr::getSystemFileMgr()->open(inFileName, FileMgr::RDONLY);
+
+	SWBuf lineBuffer;
+	SWBuf currentKey;
+	SWBuf currentEntry;
+
+	while (FileMgr::getLine(fd, lineBuffer)) {
+		if (lineBuffer.startsWith("$$$")) {
+			writeEntry(currentKey, currentEntry, module);
+			currentKey = lineBuffer;
+			currentKey << 3;
+			currentKey.trim();
+			currentEntry = "";
+		}
+		else {
+			currentEntry += lineBuffer;
+		}
+	}
+	writeEntry(currentKey, currentEntry, module);
+
+	FileMgr::getSystemFileMgr()->close(fd);
+
+	delete module;
+	delete vkey;
+
+	return 0;
+}
+
+
+
+int page = 0;
+
+
+void writeEntry(const SWBuf &key, const SWBuf &entry, SWModule *module)
+{
+	if (key.size() && entry.size()) {
+		std::cout << "from file: " << key << std::endl;
+		VerseKey *vkey = (VerseKey *)module->getKey();
+		VerseKey *linkMaster = (VerseKey *)module->createKey();
+
+		ListKey listKey = vkey->parseVerseList(key.c_str(), "Gen1:1", true);
+
+		bool first = true;
+		for (listKey = TOP; !listKey.popError(); listKey++) {
+			*vkey = listKey;
+			if (first) {
+				*linkMaster = *vkey;
+				SWBuf text = module->getRawEntry();
+				text += entry;
+
+
+				//------------------------------------------------------------
+				//  Tregelles Page marking special stuff
+				//------------------------------------------------------------
+/*
+				const char *pageMarker = "<seg type=\"page\" subtype=\"";
+				int newPage = page;
+				SWBuf pageData = strstr(text.c_str(), pageMarker);
+				if (pageData.length()) {
+					pageData << strlen(pageMarker);
+					const char *pn = pageData.stripPrefix('"');
+					if (pn) newPage = atoi(pn);
+				}
+				// add page stuff for treg
+				if (text.startsWith(pageMarker)) {
+					// don't add anything cuz we already start with one
+				}
+				else {
+					SWBuf pm = pageMarker;
+					pm.appendFormatted("%d\" />", page);
+					text = pm + text;
+				}
+
+				page = newPage;	// when our line set a new page number
+
+*/
+				//------------------------------------------------------------
+
+
+
+
+				std::cout << "adding entry: " << *vkey << " length " << entry.size() << "/" << (unsigned short)text.size() << std::endl;
+				module->setEntry(text);
+				first = false;
+			}
+			else {
+				std::cout << "linking entry: " << *vkey << " to " << *linkMaster << std::endl;
+				module->linkEntry(linkMaster);
+			}
+		}
+
+		delete linkMaster;
+	}
+}
diff --git a/utilities/installmgr.cpp b/utilities/installmgr.cpp
new file mode 100644
index 0000000..37c15c7
--- /dev/null
+++ b/utilities/installmgr.cpp
@@ -0,0 +1,412 @@
+/******************************************************************************
+ *
+ *  installmgr.cpp -	commandline InstallMgr utility
+ *
+ * $Id: installmgr.cpp 2932 2013-07-31 14:07:01Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <swmgr.h>
+#include <installmgr.h>
+#include <remotetrans.h>
+#include <filemgr.h>
+#include <iostream>
+#include <map>
+#include <swmodule.h>
+#include <stdio.h>
+#include <swlog.h>
+
+using namespace sword;
+using std::cout;
+using std::cerr;
+using std::cin;
+using std::map;
+
+
+SWMgr *mgr = 0;
+InstallMgr *installMgr = 0;
+StatusReporter *statusReporter = 0;
+SWBuf baseDir;
+SWBuf confPath;
+
+void usage(const char *progName = 0, const char *error = 0);
+
+class MyInstallMgr : public InstallMgr {
+public:
+	MyInstallMgr(const char *privatePath = "./", StatusReporter *sr = 0) : InstallMgr(privatePath, sr) {}
+
+virtual bool isUserDisclaimerConfirmed() const {
+	static bool confirmed = false;
+        if (!confirmed) {
+		cout << "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
+		cout << "                -=+* WARNING *+=- -=+* WARNING *+=-\n\n\n";
+		cout << "Although Install Manager provides a convenient way for installing\n";
+		cout << "and upgrading SWORD components, it also uses a systematic method\n";
+		cout << "for accessing sites which gives packet sniffers a target to lock\n";
+		cout << "into for singling out users. \n\n\n";
+		cout << "IF YOU LIVE IN A PERSECUTED COUNTRY AND DO NOT WISH TO RISK DETECTION,\n";
+		cout << "YOU SHOULD *NOT* USE INSTALL MANAGER'S REMOTE SOURCE FEATURES.\n\n\n";
+		cout << "Also, Remote Sources other than CrossWire may contain less than\n";
+		cout << "quality modules, modules with unorthodox content, or even modules\n";
+		cout << "which are not legitimately distributable.  Many repositories\n";
+		cout << "contain wonderfully useful content.  These repositories simply\n";
+		cout << "are not reviewed or maintained by CrossWire and CrossWire\n";
+		cout << "cannot be held responsible for their content. CAVEAT EMPTOR.\n\n\n";
+		cout << "If you understand this and are willing to enable remote source features\n";
+		cout << "then type yes at the prompt\n\n";
+		cout << "enable? [no] ";
+
+		char prompt[10], *c;
+		c = fgets(prompt, 9, stdin);
+		if (c == NULL)
+			std::cerr <<"ERROR: fgets failed in isUserDisclaimerConfirmed\n";
+		confirmed = (!strcmp(prompt, "yes\n"));
+		cout << "\n";
+	}
+	return confirmed;
+}
+
+};
+
+class MyStatusReporter : public StatusReporter {
+	int last;
+        virtual void update(unsigned long totalBytes, unsigned long completedBytes) {
+		int p = (totalBytes > 0) ? (int)(74.0 * ((double)completedBytes / (double)totalBytes)) : 0;
+		for (;last < p; ++last) {
+			if (!last) {
+				SWBuf output;
+				output.setFormatted("[ File Bytes: %ld", totalBytes);
+				while (output.size() < 75) output += " ";
+				output += "]";
+				cout << output.c_str() << "\n ";
+			}
+			cout << "-";
+		}
+		cout.flush();
+	}
+        virtual void preStatus(long totalBytes, long completedBytes, const char *message) {
+		SWBuf output;
+		output.setFormatted("[ Total Bytes: %ld; Completed Bytes: %ld", totalBytes, completedBytes);
+		while (output.size() < 75) output += " ";
+		output += "]";
+		cout << "\n" << output.c_str() << "\n ";
+		int p = (int)(74.0 * (double)completedBytes/totalBytes);
+		for (int i = 0; i < p; ++i) { cout << "="; }
+		cout << "\n\n" << message << "\n";
+		last = 0;
+	}
+};      
+
+
+void init() {
+	if (!mgr) {
+		mgr = new SWMgr();
+
+		if (!mgr->config)
+			usage(0, "ERROR: SWORD configuration not found.  Please configure SWORD before using this program.");
+
+		SWBuf baseDir = mgr->getHomeDir();
+		if (baseDir.length() < 1) baseDir = ".";
+		baseDir += "/.sword/InstallMgr";
+		confPath = baseDir + "/InstallMgr.conf";
+		statusReporter = new MyStatusReporter();
+		installMgr = new MyInstallMgr(baseDir, statusReporter);
+	}
+}
+
+
+// clean up and exit if status is 0 or negative error code
+void finish(int status) {
+	delete statusReporter;
+	delete installMgr;
+	delete mgr;
+
+	installMgr = 0;
+	mgr        = 0;
+
+	if (status < 1) {
+		cout << "\n";
+		exit(status);
+	}
+}
+
+
+void createBasicConfig(bool enableRemote, bool addCrossWire) {
+
+	FileMgr::createParent(confPath.c_str());
+	remove(confPath.c_str());
+
+	InstallSource is("FTP");
+	is.caption = "CrossWire";
+	is.source = "ftp.crosswire.org";
+	is.directory = "/pub/sword/raw";
+
+	SWConfig config(confPath.c_str());
+	config["General"]["PassiveFTP"] = "true";
+	if (enableRemote) {
+		config["Sources"]["FTPSource"] = is.getConfEnt();
+	}
+	config.Save();
+}
+
+
+void initConfig() {
+	init();
+
+	bool enable = installMgr->isUserDisclaimerConfirmed();
+
+	createBasicConfig(enable, true);
+
+	cout << "\n\nInitialized basic config file at [" << confPath << "]\n";
+	cout << "with remote source features " << ((enable) ? "ENABLED" : "DISABLED") << "\n";
+}
+
+
+void syncConfig() {
+	init();
+
+	if (!installMgr->isUserDisclaimerConfirmed()) {  // assert disclaimer is accepted
+		cout << "\n\nDisclaimer not accepted.  Aborting.";
+		return;
+	}
+
+	// be sure we have at least some config file already out there
+	if (!FileMgr::existsFile(confPath.c_str())) {
+		createBasicConfig(true, false);
+		finish(1); // cleanup and don't exit
+		init();    // re-init with InstallMgr which uses our new config
+	}
+
+	if (!installMgr->refreshRemoteSourceConfiguration()) 
+		cout << "\nSync'd config file with master remote source list.\n";
+	else cout << "\nFailed to sync config file with master remote source list.\n";
+}
+
+
+void uninstallModule(const char *modName) {
+	init();
+	SWModule *module;
+	ModMap::iterator it = mgr->Modules.find(modName);
+	if (it == mgr->Modules.end()) {
+		fprintf(stderr, "Couldn't find module [%s] to remove\n", modName);
+		finish(-2);
+	}
+	module = it->second;
+	installMgr->removeModule(mgr, module->getName());
+	cout << "Removed module: [" << modName << "]\n";
+}
+
+
+void listRemoteSources() {
+	init();
+	cout << "Remote Sources:\n\n";
+	for (InstallSourceMap::iterator it = installMgr->sources.begin(); it != installMgr->sources.end(); it++) {
+		cout << "[" << it->second->caption << "]\n";
+		cout << "\tType     : " << it->second->type << "\n";
+		cout << "\tSource   : " << it->second->source << "\n";
+		cout << "\tDirectory: " << it->second->directory << "\n";
+	}
+}
+
+
+void refreshRemoteSource(const char *sourceName) {
+	init();
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
+		finish(-3);
+	}
+
+	if (!installMgr->refreshRemoteSource(source->second))
+		cout << "\nRemote Source Refreshed\n";
+	else	cerr << "\nError Refreshing Remote Source\n";
+}
+
+
+void listModules(SWMgr *otherMgr = 0, bool onlyNewAndUpdates = false) {
+	init();
+	SWModule *module;
+	if (!otherMgr) otherMgr = mgr;
+	std::map<SWModule *, int> mods = InstallMgr::getModuleStatus(*mgr, *otherMgr);
+	for (std::map<SWModule *, int>::iterator it = mods.begin(); it != mods.end(); it++) {
+		module = it->first;
+		SWBuf version = module->getConfigEntry("Version");
+		SWBuf status = " ";
+		if (it->second & InstallMgr::MODSTAT_NEW) status = "*";
+		if (it->second & InstallMgr::MODSTAT_OLDER) status = "-";
+		if (it->second & InstallMgr::MODSTAT_UPDATED) status = "+";
+
+		if (!onlyNewAndUpdates || status == "*" || status == "+") {
+			cout << status << "[" << module->getName() << "]  \t(" << version << ")  \t- " << module->getDescription() << "\n";
+		}
+	}
+}
+
+
+void remoteListModules(const char *sourceName, bool onlyNewAndUpdated = false) {
+	init();
+	cout << "Available Modules:\n(be sure to refresh remote source (-r) first for most current list)\n\n";
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
+		finish(-3);
+	}
+	listModules(source->second->getMgr(), onlyNewAndUpdated);
+}
+
+
+void localDirListModules(const char *dir) {
+	cout << "Available Modules:\n\n";
+	SWMgr mgr(dir);
+	listModules(&mgr);
+}
+
+
+void remoteInstallModule(const char *sourceName, const char *modName) {
+	init();
+	InstallSourceMap::iterator source = installMgr->sources.find(sourceName);
+	if (source == installMgr->sources.end()) {
+		fprintf(stderr, "Couldn't find remote source [%s]\n", sourceName);
+		finish(-3);
+	}
+	InstallSource *is = source->second;
+	SWMgr *rmgr = is->getMgr();
+	SWModule *module;
+	ModMap::iterator it = rmgr->Modules.find(modName);
+	if (it == rmgr->Modules.end()) {
+		fprintf(stderr, "Remote source [%s] does not make available module [%s]\n", sourceName, modName);
+		finish(-4);
+	}
+	module = it->second;
+
+	int error = installMgr->installModule(mgr, 0, module->getName(), is);
+	if (error) {
+		cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n";
+	} else cout << "\nInstalled module: [" << module->getName() << "]\n";
+}
+
+
+void localDirInstallModule(const char *dir, const char *modName) {
+	init();
+	SWMgr lmgr(dir);
+	SWModule *module;
+	ModMap::iterator it = lmgr.Modules.find(modName);
+	if (it == lmgr.Modules.end()) {
+		fprintf(stderr, "Module [%s] not available at path [%s]\n", modName, dir);
+		finish(-4);
+	}
+	module = it->second;
+	int error = installMgr->installModule(mgr, dir, module->getName());
+	if (error) {
+		cout << "\nError installing module: [" << module->getName() << "] (write permissions?)\n";
+	} else cout << "\nInstalled module: [" << module->getName() << "]\n";
+}
+
+
+void usage(const char *progName, const char *error) {
+
+	if (error) fprintf(stderr, "\n%s: %s\n", (progName ? progName : "installmgr"), error);
+
+	fprintf(stderr, "\nusage: %s <command> [command ...]\n"
+		"\n  Commands (run in order they are passed):\n\n"
+		"\t-init\t\t\t\tcreate a basic user config file.\n"
+		"\t\t\t\t\t\tWARNING: overwrites existing.\n"
+		"\t-sc\t\t\t\tsync config with known remote repo list\n"
+		"\t\t\t\t\t\tNOTE: also creates if none exists\n"
+		"\t-s\t\t\t\tlist remote sources\n"
+		"\t-r  <remoteSrcName>\t\trefresh remote source\n"
+		"\t-rl <remoteSrcName>\t\tlist available modules from remote source\n"
+		"\t-rd <remoteSrcName>\t\tlist new/updated modules from remote source\n"
+		"\t-ri <remoteSrcName> <modName>\tinstall module from remote source\n"
+		"\t-l\t\t\t\tlist installed modules\n"
+		"\t-u <modName>\t\t\tuninstall module\n"
+		"\t-ll <path>\t\t\tlist available modules at local path\n"
+		"\t-li <path> <modName>\t\tinstall module from local path\n"
+		"\t-d\t\t\t\tturn debug output on\n"
+		, (progName ? progName : "installmgr"));
+	finish(-1);
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc < 2) usage(*argv);
+
+	for (int i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "-d")) {
+			SWLog::getSystemLog()->setLogLevel(SWLog::LOG_DEBUG);
+		}
+		else if (!strcmp(argv[i], "-init")) {
+			initConfig();
+		}
+		else if (!strcmp(argv[i], "-l")) {	// list installed modules
+			cout << "Installed Modules:\n\n";
+			listModules();
+		}
+		else if (!strcmp(argv[i], "-ll")) {	// list from local directory
+			if (i+1 < argc) localDirListModules(argv[++i]);
+			else usage(*argv, "-ll requires <path>");
+		}
+		else if (!strcmp(argv[i], "-li")) {	// install from local directory
+			if (i+2 < argc) {
+				const char *path = argv[++i];
+				const char *modName = argv[++i];
+				localDirInstallModule(path, modName);
+			}
+			else usage(*argv, "-li requires <path> <modName>");
+		}
+		else if (!strcmp(argv[i], "-u")) {	// uninstall module
+			if (i+1 < argc) uninstallModule(argv[++i]);
+			else usage(*argv, "-u requires <modName>");
+		}
+		else if (!strcmp(argv[i], "-s")) {	// list sources
+			listRemoteSources();
+		}
+		else if (!strcmp(argv[i], "-sc")) {	// sync config with master
+			syncConfig();
+		}
+		else if (!strcmp(argv[i], "-r")) {	// refresh remote source
+			if (i+1 < argc) refreshRemoteSource(argv[++i]);
+			else usage(*argv, "-r requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-rl")) {	// list remote modules
+			if (i+1 < argc) remoteListModules(argv[++i]);
+			else usage(*argv, "-rl requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-rd")) {	// list differences between remote source and installed modules
+			if (i+1 < argc) remoteListModules(argv[++i], true);
+			else usage(*argv, "-rd requires <remoteSrcName>");
+		}
+		else if (!strcmp(argv[i], "-ri")) {	// install from remote directory
+			if (i+2 < argc) {
+				const char *source = argv[++i];
+				const char *modName = argv[++i];
+				remoteInstallModule(source, modName);
+			}
+			else usage(*argv, "-ri requires <remoteSrcName> <modName>");
+		}
+		else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
+	}
+
+	finish(0);
+
+	return 0;
+}
diff --git a/utilities/kylixmake/Makefile.am b/utilities/kylixmake/Makefile.am
new file mode 100644
index 0000000..b0fd873
--- /dev/null
+++ b/utilities/kylixmake/Makefile.am
@@ -0,0 +1,8 @@
+swkylixmakedir = $(top_srcdir)/utilities/kylixmake
+
+EXTRA_DIST += $(swkylixmakedir)/libsword.bpf
+EXTRA_DIST += $(swkylixmakedir)/mod2zmod.bpf
+EXTRA_DIST += $(swkylixmakedir)/mod2zmod.res
+EXTRA_DIST += $(swkylixmakedir)/libsword.bpr
+EXTRA_DIST += $(swkylixmakedir)/mod2zmod.bpr
+EXTRA_DIST += $(swkylixmakedir)/utilities.bpg
diff --git a/utilities/kylixmake/libsword.bpf b/utilities/kylixmake/libsword.bpf
new file mode 100644
index 0000000..f881306
--- /dev/null
+++ b/utilities/kylixmake/libsword.bpf
@@ -0,0 +1,8 @@
+//---------------------------------------------------------------------------
+
+
+#define Library
+
+// To add a file to the library use the Project menu 'Add to Project'.
+
+ 
\ No newline at end of file
diff --git a/utilities/kylixmake/libsword.bpr b/utilities/kylixmake/libsword.bpr
new file mode 100644
index 0000000..0783813
--- /dev/null
+++ b/utilities/kylixmake/libsword.bpr
@@ -0,0 +1,238 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.06.10"/>
+    <PROJECT value="libsword.a"/>
+    <OBJFILES value="../../src/utilfuns/Greek2Greek.o 
+      ../../src/utilfuns/swversion.o ../../src/utilfuns/utilconf.o 
+      ../../src/utilfuns/utilstr.o ../../src/keys/listkey.o 
+      ../../src/keys/strkey.o ../../src/keys/swkey.o ../../src/keys/treekey.o 
+      ../../src/keys/treekeyidx.o ../../src/keys/versekey.o 
+      ../../src/mgr/encfiltmgr.o ../../src/mgr/filemgr.o 
+      ../../src/mgr/localemgr.o ../../src/mgr/markupfiltmgr.o 
+      ../../src/mgr/swcacher.o ../../src/mgr/swconfig.o 
+      ../../src/mgr/swfiltermgr.o ../../src/mgr/swlocale.o ../../src/mgr/swmgr.o 
+      ../../src/frontend/swdisp.o ../../src/frontend/swlog.o 
+      ../../src/modules/swmodule.o ../../src/modules/comments/swcom.o 
+      ../../src/modules/comments/hrefcom/hrefcom.o 
+      ../../src/modules/comments/rawcom/rawcom.o 
+      ../../src/modules/comments/rawfiles/rawfiles.o 
+      ../../src/modules/comments/zcom/zcom.o 
+      ../../src/modules/common/entriesblk.o 
+      ../../src/modules/common/lzsscomprs.o ../../src/modules/common/rawstr4.o 
+      ../../src/modules/common/rawstr.o ../../src/modules/common/rawverse.o 
+      ../../src/modules/common/sapphire.o ../../src/modules/common/swcipher.o 
+      ../../src/modules/common/swcomprs.o ../../src/modules/common/zipcomprs.o 
+      ../../src/modules/common/zstr.o ../../src/modules/common/zverse.o 
+      ../../src/modules/filters/cipherfil.o 
+      ../../src/modules/filters/gbffootnotes.o 
+      ../../src/modules/filters/gbfheadings.o 
+      ../../src/modules/filters/gbfhtml.o 
+      ../../src/modules/filters/gbfhtmlhref.o 
+      ../../src/modules/filters/gbfmorph.o ../../src/modules/filters/gbfosis.o 
+      ../../src/modules/filters/gbfplain.o ../../src/modules/filters/gbfrtf.o 
+      ../../src/modules/filters/gbfstrongs.o ../../src/modules/filters/gbfthml.o 
+      ../../src/modules/filters/greeklexattribs.o 
+      ../../src/modules/filters/latin1utf16.o 
+      ../../src/modules/filters/latin1utf8.o 
+      ../../src/modules/filters/plainfootnotes.o 
+      ../../src/modules/filters/plainhtml.o ../../src/modules/filters/rtfhtml.o 
+      ../../src/modules/filters/rwphtml.o ../../src/modules/filters/rwprtf.o 
+      ../../src/modules/filters/scsuutf8.o 
+      ../../src/modules/filters/swbasicfilter.o 
+      ../../src/modules/filters/thmlfootnotes.o 
+      ../../src/modules/filters/thmlgbf.o 
+      ../../src/modules/filters/thmlheadings.o 
+      ../../src/modules/filters/thmlhtml.o 
+      ../../src/modules/filters/thmlhtmlhref.o 
+      ../../src/modules/filters/thmllemma.o 
+      ../../src/modules/filters/thmlmorph.o
+      ../../src/modules/filters/thmlosis.o ../../src/modules/filters/thmlplain.o 
+      ../../src/modules/filters/thmlrtf.o 
+      ../../src/modules/filters/thmlscripref.o 
+      ../../src/modules/filters/thmlstrongs.o 
+      ../../src/modules/filters/thmlvariants.o 
+      ../../src/modules/filters/unicodertf.o 
+      ../../src/modules/filters/utf16utf8.o 
+      ../../src/modules/filters/utf8arshaping.o 
+      ../../src/modules/filters/utf8bidireorder.o 
+      ../../src/modules/filters/utf8cantillation.o 
+      ../../src/modules/filters/utf8greekaccents.o 
+      ../../src/modules/filters/utf8hebrewpoints.o 
+      ../../src/modules/filters/utf8arabicpoints.o 
+      ../../src/modules/filters/utf8html.o 
+      ../../src/modules/filters/utf8latin1.o ../../src/modules/filters/utf8nfc.o 
+      ../../src/modules/filters/utf8nfkd.o 
+      ../../src/modules/filters/utf8transliterator.o 
+      ../../src/modules/filters/utf8utf16.o 
+      ../../src/modules/genbook/swgenbook.o 
+      ../../src/modules/genbook/rawgenbook/rawgenbook.o 
+      ../../src/modules/lexdict/swld.o ../../src/modules/lexdict/rawld/rawld.o 
+      ../../src/modules/lexdict/rawld4/rawld4.o 
+      ../../src/modules/lexdict/zld/zld.o ../../src/modules/texts/swtext.o 
+      ../../src/modules/texts/rawtext/rawtext.o 
+      ../../src/modules/texts/ztext/ztext.o ../../src/utilfuns/roman.o"/>
+    <RESFILES value=""/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value=""/>
+    <LIBRARIES value=""/>
+    <PACKAGES value="rtl.bpi visualclx.bpi dataclx.bpi visualdbclx.bpi netclx.bpi 
+      netdataclx.bpi xmlrtl.bpi indy.bpi webdsnapclx.bpi websnapclx.bpi 
+      soaprtl.bpi"/>
+    <PATHCPP value=".;../../src/utilfuns:../../src/keys:../../src/mgr:../../src/frontend:../../src/modules:../../src/modules/comments:../../src/modules/comments/hrefcom:../../src/modules/comments/rawcom:../../src/modules/comments/rawfiles:../../src/modules/comments/zcom:../../src/modules/common:../../src/modules/filters:../../src/modules/genbook:../../src/modules/genbook/rawgenbook:../../src/modules/lexdict:../../src/modules/lexdict/rawld:../../src/modules/lexdict/rawld4:../../src/modules/lexdict/zld:../../src/modules/texts:../../src/modules/texts/rawtext:../../src/modules/texts/ztext"/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <LINKER value="ar"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value=""/>
+    <MAINSOURCE value="libsword.bpf"/>
+    <INCLUDEPATH value="../../src/modules/texts/ztext:../../src/modules/texts/rawtext:../../src/modules/texts:../../src/modules/lexdict/zld:../../src/modules/lexdict/rawld4:../../src/modules/lexdict/rawld:../../src/modules/lexdict:../../src/modules/genbook/rawgenbook:../../src/modules/genbook:../../src/modules/filters:../../src/modules/common:../../src/modules/comments/zcom:../../src/modules/comments/rawfiles:../../src/modules/comments/rawcom:../../src/modules/comments/hrefcom:../../src/modules/comments:../../src/modules:../../src/frontend:../../src/mgr:../../src/keys:../../src/utilfuns:../../include:$(BCB)/include/stlport:$(BCB)/include:$(BCB)/include/vcl:/usr/include"/>
+    <LIBPATH value="../../src/modules/texts/ztext:../../src/modules/texts/rawtext:../../src/modules/texts:../../src/modules/lexdict/zld:../../src/modules/lexdict/rawld4:../../src/modules/lexdict/rawld:../../src/modules/lexdict:../../src/modules/genbook/rawgenbook:../../src/modules/genbook:../../src/modules/filters:../../src/modules/common:../../src/modules/comments/zcom:../../src/modules/comments/rawfiles:../../src/modules/comments/rawcom:../../src/modules/comments/hrefcom:../../src/modules/comments:../../src/modules:../../src/frontend:../../src/mgr:../../src/keys:../../src/utilfuns:$(BCB)/lib/obj:$(BCB)/lib:/usr/lib:/lib:/usr/X11R6/lib:$(BCB)/bin"/>
+    <WARNINGS value="-w-par"/>
+    <LISTFILE value=""/>
+    <OTHERFILES value=""/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-Od -H=$(HOME)/.borland/clx69.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v 
+      -vi- -c -t"/>
+    <PFLAGS value="-$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zd"/>
+    <LFLAGS value="-rsc"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="$(OBJFILES)"/>
+    <ALLLIB value=""/>
+  </LINKER>
+  <FILELIST>
+      <FILE FILENAME="libsword.bpf" FORMNAME="" UNITNAME="libsword" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/utilfuns/Greek2Greek.cpp" FORMNAME="" UNITNAME="Greek2Greek.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/utilfuns/swversion.cpp" FORMNAME="" UNITNAME="swversion.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/utilfuns/utilconf.cpp" FORMNAME="" UNITNAME="utilconf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/utilfuns/utilstr.cpp" FORMNAME="" UNITNAME="utilstr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/keys/listkey.cpp" FORMNAME="" UNITNAME="listkey.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/keys/strkey.cpp" FORMNAME="" UNITNAME="strkey.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/keys/swkey.cpp" FORMNAME="" UNITNAME="swkey.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/keys/treekey.cpp" FORMNAME="" UNITNAME="treekey.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/keys/treekeyidx.cpp" FORMNAME="" UNITNAME="treekeyidx.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/keys/versekey.cpp" FORMNAME="" UNITNAME="versekey.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/encfiltmgr.cpp" FORMNAME="" UNITNAME="encfiltmgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/filemgr.cpp" FORMNAME="" UNITNAME="filemgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/localemgr.cpp" FORMNAME="" UNITNAME="localemgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/markupfiltmgr.cpp" FORMNAME="" UNITNAME="markupfiltmgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/swcacher.cpp" FORMNAME="" UNITNAME="swcacher.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/swconfig.cpp" FORMNAME="" UNITNAME="swconfig.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/swfiltermgr.cpp" FORMNAME="" UNITNAME="swfiltermgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/swlocale.cpp" FORMNAME="" UNITNAME="swlocale.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/mgr/swmgr.cpp" FORMNAME="" UNITNAME="swmgr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/frontend/swdisp.cpp" FORMNAME="" UNITNAME="swdisp.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/frontend/swlog.cpp" FORMNAME="" UNITNAME="swlog.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/swmodule.cpp" FORMNAME="" UNITNAME="swmodule" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/comments/swcom.cpp" FORMNAME="" UNITNAME="swcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/comments/hrefcom/hrefcom.cpp" FORMNAME="" UNITNAME="hrefcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/comments/rawcom/rawcom.cpp" FORMNAME="" UNITNAME="rawcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/comments/rawfiles/rawfiles.cpp" FORMNAME="" UNITNAME="rawfiles" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/comments/zcom/zcom.cpp" FORMNAME="" UNITNAME="zcom" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/entriesblk.cpp" FORMNAME="" UNITNAME="entriesblk.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/lzsscomprs.cpp" FORMNAME="" UNITNAME="lzsscomprs.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/rawstr4.cpp" FORMNAME="" UNITNAME="rawstr4.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/rawstr.cpp" FORMNAME="" UNITNAME="rawstr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/rawverse.cpp" FORMNAME="" UNITNAME="rawverse.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/sapphire.cpp" FORMNAME="" UNITNAME="sapphire.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/swcipher.cpp" FORMNAME="" UNITNAME="swcipher.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/swcomprs.cpp" FORMNAME="" UNITNAME="swcomprs.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/zipcomprs.cpp" FORMNAME="" UNITNAME="zipcomprs.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/zstr.cpp" FORMNAME="" UNITNAME="zstr.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/common/zverse.cpp" FORMNAME="" UNITNAME="zverse.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/cipherfil.cpp" FORMNAME="" UNITNAME="cipherfil.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbffootnotes.cpp" FORMNAME="" UNITNAME="gbffootnotes.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfheadings.cpp" FORMNAME="" UNITNAME="gbfheadings.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfhtml.cpp" FORMNAME="" UNITNAME="gbfhtml.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfhtmlhref.cpp" FORMNAME="" UNITNAME="gbfhtmlhref.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfmorph.cpp" FORMNAME="" UNITNAME="gbfmorph.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfosis.cpp" FORMNAME="" UNITNAME="gbfosis.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfplain.cpp" FORMNAME="" UNITNAME="gbfplain.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfrtf.cpp" FORMNAME="" UNITNAME="gbfrtf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfstrongs.cpp" FORMNAME="" UNITNAME="gbfstrongs.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/gbfthml.cpp" FORMNAME="" UNITNAME="gbfthml.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/greeklexattribs.cpp" FORMNAME="" UNITNAME="greeklexattribs.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/latin1utf16.cpp" FORMNAME="" UNITNAME="latin1utf16.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/latin1utf8.cpp" FORMNAME="" UNITNAME="latin1utf8.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/plainfootnotes.cpp" FORMNAME="" UNITNAME="plainfootnotes.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/plainhtml.cpp" FORMNAME="" UNITNAME="plainhtml.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/rtfhtml.cpp" FORMNAME="" UNITNAME="rtfhtml.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/rwphtml.cpp" FORMNAME="" UNITNAME="rwphtml.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/rwprtf.cpp" FORMNAME="" UNITNAME="rwprtf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/scsuutf8.cpp" FORMNAME="" UNITNAME="scsuutf8.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/swbasicfilter.cpp" FORMNAME="" UNITNAME="swbasicfilter.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlfootnotes.cpp" FORMNAME="" UNITNAME="thmlfootnotes.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlgbf.cpp" FORMNAME="" UNITNAME="thmlgbf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlheadings.cpp" FORMNAME="" UNITNAME="thmlheadings.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlhtml.cpp" FORMNAME="" UNITNAME="thmlhtml.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlhtmlhref.cpp" FORMNAME="" UNITNAME="thmlhtmlhref.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmllemma.cpp" FORMNAME="" UNITNAME="thmllemma.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlmorph.cpp" FORMNAME="" UNITNAME="thmlmorph.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlosis.cpp" FORMNAME="" UNITNAME="thmlosis.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlplain.cpp" FORMNAME="" UNITNAME="thmlplain.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlrtf.cpp" FORMNAME="" UNITNAME="thmlrtf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlscripref.cpp" FORMNAME="" UNITNAME="thmlscripref.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlstrongs.cpp" FORMNAME="" UNITNAME="thmlstrongs.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/thmlvariants.cpp" FORMNAME="" UNITNAME="thmlvariants.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/unicodertf.cpp" FORMNAME="" UNITNAME="unicodertf.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf16utf8.cpp" FORMNAME="" UNITNAME="utf16utf8.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8arshaping.cpp" FORMNAME="" UNITNAME="utf8arshaping.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8bidireorder.cpp" FORMNAME="" UNITNAME="utf8bidireorder.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8cantillation.cpp" FORMNAME="" UNITNAME="utf8cantillation.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8greekaccents.cpp" FORMNAME="" UNITNAME="utf8greekaccents.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8hebrewpoints.cpp" FORMNAME="" UNITNAME="utf8hebrewpoints.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8html.cpp" FORMNAME="" UNITNAME="utf8html.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8latin1.cpp" FORMNAME="" UNITNAME="utf8latin1.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8nfc.cpp" FORMNAME="" UNITNAME="utf8nfc.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8nfkd.cpp" FORMNAME="" UNITNAME="utf8nfkd.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8transliterator.cpp" FORMNAME="" UNITNAME="utf8transliterator.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/filters/utf8utf16.cpp" FORMNAME="" UNITNAME="utf8utf16.cpp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/genbook/swgenbook.cpp" FORMNAME="" UNITNAME="swgenbook" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/genbook/rawgenbook/rawgenbook.cpp" FORMNAME="" UNITNAME="rawgenbook" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/lexdict/swld.cpp" FORMNAME="" UNITNAME="swld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/lexdict/rawld/rawld.cpp" FORMNAME="" UNITNAME="rawld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/lexdict/rawld4/rawld4.cpp" FORMNAME="" UNITNAME="rawld4" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/lexdict/zld/zld.cpp" FORMNAME="" UNITNAME="zld" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/texts/swtext.cpp" FORMNAME="" UNITNAME="swtext" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/texts/rawtext/rawtext.cpp" FORMNAME="" UNITNAME="rawtext" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/modules/texts/ztext/ztext.cpp" FORMNAME="" UNITNAME="ztext" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../../src/utilfuns/roman.c" FORMNAME="" UNITNAME="roman" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+  </FILELIST>
+  <BUILDTOOLS>
+  </BUILDTOOLS>
+
+  <IDEOPTIONS>
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=../../include:$(BCB)/include/stlport:$(BCB)/include:$(BCB)/include/vcl:/usr/include
+Item1=../../src/modules/texts/ztext:../../src/modules/texts/rawtext:../../src/modules/texts:../../src/modules/lexdict/zld:../../src/modules/lexdict/rawld4:../../src/modules/lexdict/rawld:../../src/modules/lexdict:../../src/modules/genbook/rawgenbook:../../src/modules/genbook:../../src/modules/filters:../../src/modules/common:../../src/modules/comments/zcom:../../src/modules/comments/rawfiles:../../src/modules/comments/rawcom:../../src/modules/comments/hrefcom:../../src/modules/comments:../../src/modules:../../src/frontend:../../src/mgr:../../src/keys:../../src/utilfuns:$(BCB)/include/stlport:$(BCB)/include:$(BCB)/include/vcl:/usr/include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=../../src/modules/texts/ztext:../../src/modules/texts/rawtext:../../src/modules/texts:../../src/modules/lexdict/zld:../../src/modules/lexdict/rawld4:../../src/modules/lexdict/rawld:../../src/modules/lexdict:../../src/modules/genbook/rawgenbook:../../src/modules/genbook:../../src/modules/filters:../../src/modules/common:../../src/modules/comments/zcom:../../src/modules/comments/rawfiles:../../src/modules/comments/rawcom:../../src/modules/comments/hrefcom:../../src/modules/comments:../../src/modules:../../src/frontend:../../src/mgr:../../src/keys:../../src/utilfuns:$(BCB)/lib/obj:$(BCB)/lib:/usr/lib:/lib:/usr/X11R6/lib:$(BCB)/bin
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=
+Launcher=/usr/X11R6/bin/xterm -T KylixDebuggerOutput -e bash -i -c %debuggee%
+UseLauncher=0
+DebugCWD=
+HostApplication=
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+  </IDEOPTIONS>
+</PROJECT>
diff --git a/utilities/kylixmake/mod2zmod.bpf b/utilities/kylixmake/mod2zmod.bpf
new file mode 100644
index 0000000..32eb16c
--- /dev/null
+++ b/utilities/kylixmake/mod2zmod.bpf
@@ -0,0 +1,5 @@
+This file is used by the project manager only and should be treated like the project file
+
+To add a file to this project use the Project menu 'Add to Project'
+
+main 
\ No newline at end of file
diff --git a/utilities/kylixmake/mod2zmod.bpr b/utilities/kylixmake/mod2zmod.bpr
new file mode 100644
index 0000000..dc399a7
--- /dev/null
+++ b/utilities/kylixmake/mod2zmod.bpr
@@ -0,0 +1,84 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!-- C++Builder XML Project -->
+<PROJECT>
+  <MACROS>
+    <VERSION value="BCB.06.10"/>
+    <PROJECT value="mod2zmod"/>
+    <OBJFILES value="../mod2zmod.o"/>
+    <RESFILES value="mod2zmod.res"/>
+    <DEFFILE value=""/>
+    <RESDEPEN value="$(RESFILES)"/>
+    <LIBFILES value="libsword.a /usr/lib/libz.a"/>
+    <LIBRARIES value=""/>
+    <SPARELIBS value=""/>
+    <PACKAGES value="rtl.bpi visualclx.bpi dataclx.bpi visualdbclx.bpi netclx.bpi 
+      netdataclx.bpi xmlrtl.bpi indy.bpi webdsnapclx.bpi websnapclx.bpi 
+      soaprtl.bpi"/>
+    <PATHCPP value=".;.."/>
+    <PATHPAS value=".;"/>
+    <PATHRC value=".;"/>
+    <PATHASM value=".;"/>
+    <DEBUGLIBPATH value="$(BCB)/lib/debug"/>
+    <RELEASELIBPATH value="$(BCB)/lib/release"/>
+    <LINKER value="ilink"/>
+    <USERDEFINES value="_DEBUG"/>
+    <SYSDEFINES value="_NO_VCL"/>
+    <MAINSOURCE value="mod2zmod.bpf"/>
+    <INCLUDEPATH value="../:..:../../include:$(BCB)/include/stlport:$(BCB)/include:$(BCB)/include/vcl:/usr/include"/>
+    <LIBPATH value="../:..:src/sword/utilities:$(BCB)/lib/obj:$(BCB)/lib:/usr/lib:/lib:/usr/X11R6/lib:$(BCB)/bin"/>
+    <WARNINGS value="-w-par"/>
+    <OTHERFILES value=""/>
+  </MACROS>
+  <OPTIONS>
+    <CFLAG1 value="-tC -Od -H=$(HOME)/.borland/clx69.csm -Hc -Vx -X- -r- -a8 -b- -k -y -v 
+      -vi- -c"/>
+    <PFLAGS value="-$YD -$W -$O- -$A8 -v -JPHNE -M"/>
+    <RFLAGS value=""/>
+    <AFLAGS value="/mx /w2 /zd"/>
+    <LFLAGS value="-D&quot;&quot; -ap -Tpe -x -Gn -v"/>
+  </OPTIONS>
+  <LINKER>
+    <ALLOBJ value="borinit.o crt1.o $(OBJFILES)"/>
+    <ALLRES value="$(RESFILES)"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) libborcrtl.a libborstl.a libborunwind.a 
+      libpthread.so libc.so libm.so libdl.so "/>
+  </LINKER>
+  <FILELIST>
+      <FILE FILENAME="mod2zmod.res" FORMNAME="" UNITNAME="mod2zmod.res" CONTAINERID="ResTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="mod2zmod.bpf" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="BPF" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="../mod2zmod.cpp" FORMNAME="" UNITNAME="mod2zmod" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="libsword.a" FORMNAME="" UNITNAME="libsword.a" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="/usr/lib/libz.a" FORMNAME="" UNITNAME="libz.a" CONTAINERID="LibTool" DESIGNCLASS="" LOCALCOMMAND=""/>
+  </FILELIST>
+  <BUILDTOOLS>
+  </BUILDTOOLS>
+
+  <IDEOPTIONS>
+[HistoryLists\hlIncludePath]
+Count=2
+Item0=../:../../include:$(BCB)/include/stlport:$(BCB)/include:$(BCB)/include/vcl:/usr/include
+Item1=../:src/sword/utilities:$(BCB)/include/stlport:$(BCB)/include:$(BCB)/include/vcl:/usr/include
+
+[HistoryLists\hlLibraryPath]
+Count=1
+Item0=../:src/sword/utilities:$(BCB)/lib/obj:$(BCB)/lib:/usr/lib:/lib:/usr/X11R6/lib:$(BCB)/bin
+
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_DEBUG
+
+[Debugging]
+DebugSourceDirs=
+
+[Parameters]
+RunParams=TEST ~/.sword/ztest/ 3 2
+Launcher=/usr/X11R6/bin/xterm -T KylixDebuggerOutput -e bash -i -c %debuggee%
+UseLauncher=0
+DebugCWD=/space/home/scribe/src/sword/utilities/kylixmake
+HostApplication=
+
+[Compiler]
+ShowInfoMsgs=0
+LinkDebugVcl=0
+  </IDEOPTIONS>
+</PROJECT>
\ No newline at end of file
diff --git a/utilities/kylixmake/mod2zmod.res b/utilities/kylixmake/mod2zmod.res
new file mode 100644
index 0000000..36f26e2
--- /dev/null
+++ b/utilities/kylixmake/mod2zmod.res
diff --git a/utilities/kylixmake/utilities.bpg b/utilities/kylixmake/utilities.bpg
new file mode 100644
index 0000000..4ee3e7e
--- /dev/null
+++ b/utilities/kylixmake/utilities.bpg
@@ -0,0 +1,24 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.02.5
+#------------------------------------------------------------------------------
+ifndef ROOT
+ROOT = /home/scribe/kylix3
+endif
+#------------------------------------------------------------------------------
+MAKE = make -$(MAKEFLAGS) -f$**
+DCC =dcc $<
+#------------------------------------------------------------------------------
+PROJECTS = libsword.a mod2zmod
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+libsword.a: libsword.bpr
+	$(ROOT)/bin/bpr2mak -t$(ROOT)/bin/deflib.gmk $<
+	make -$(MAKEFLAGS) -f$(basename $<).mak
+
+mod2zmod: mod2zmod.bpr
+	$(ROOT)/bin/bpr2mak $<
+	make -$(MAKEFLAGS) -f$(basename $<).mak
+
+
diff --git a/utilities/lexdump.c b/utilities/lexdump.c
new file mode 100644
index 0000000..91d0c2b
--- /dev/null
+++ b/utilities/lexdump.c
@@ -0,0 +1,84 @@
+/******************************************************************************
+ *
+ *  lexdump.c -	This utility outputs a specified ordinal entry from a lex
+ *
+ * $Id: lexdump.c 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1999-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+int main(int argc, char **argv) {
+	char *tmpbuf;
+	int idxfd, datfd, r;
+	long offset;
+	unsigned int size;
+	char datbuf[255];
+
+	if (argc != 3) {
+		fprintf(stderr, "usage: %s <datapath/datafilebasename> <index>\n", argv[0]);
+		exit(1);
+	}
+
+	tmpbuf = calloc(strlen(argv[1]) + 11,1);
+	sprintf(tmpbuf, "%s.idx", argv[1]);
+	idxfd = open(tmpbuf, O_RDONLY|O_BINARY);
+	sprintf(tmpbuf, "%s.dat", argv[1]);
+	datfd = open(tmpbuf, O_RDONLY|O_BINARY);
+	free(tmpbuf);
+
+	offset = atoi(argv[2]) * 6;
+	lseek(idxfd, offset, SEEK_SET);
+	r = read(idxfd, &offset, 4);
+	if (r != 4)
+		perror("ERROR: read failed in main");
+	r = read(idxfd, &size, 2);
+	if (r != 2)
+		perror("ERROR: read failed in main");
+	printf("offset: %ld; size: %d\n", offset, size);
+	lseek(datfd, offset, SEEK_SET);
+	r = read(datfd, datbuf, 40);
+	if (r != 40)
+		perror("ERROR: read failed in main");
+	datbuf[40] = 0;
+	printf("%s\n", datbuf);
+	close(datfd);
+	close(idxfd);
+	return 0;
+
+}
diff --git a/utilities/mkfastmod.cpp b/utilities/mkfastmod.cpp
new file mode 100644
index 0000000..5c1782b
--- /dev/null
+++ b/utilities/mkfastmod.cpp
@@ -0,0 +1,96 @@
+/******************************************************************************
+ *
+ *  mkfastmod.cpp -	
+ *
+ * $Id: mkfastmod.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <stdio.h>
+#include <rawtext.h>
+#include <swmgr.h>
+#include <versekey.h>
+#include <markupfiltmgr.h>
+#include <swbuf.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWMgr;
+using sword::SWModule;
+using sword::ListKey;
+using sword::VerseKey;
+using sword::ModMap;
+using sword::SWBuf;
+#endif
+
+void percentUpdate(char percent, void *userData) {
+	static char printed = 0;
+	char maxHashes = *((char *)userData);
+	
+	while ((((float)percent)/100) * maxHashes > printed) {
+		printf("=");
+		printed++;
+		fflush(stdout);
+	}
+/*
+	std::cout << (int)percent << "% ";
+*/
+	fflush(stdout);
+}
+
+
+int main(int argc, char **argv)
+{
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <modname>\n", argv[0]);
+		exit(-1);
+	}
+
+	SWModule *target;
+	ListKey listkey;
+	ModMap::iterator it;
+
+	SWMgr manager;
+	it = manager.Modules.find(argv[1]);
+	if (it == manager.Modules.end()) {
+		fprintf(stderr, "Could not find module [%s].  Available modules:\n", argv[1]);
+		for (it = manager.Modules.begin(); it != manager.Modules.end(); it++) {
+			fprintf(stderr, "[%s]\t - %s\n", (*it).second->getName(), (*it).second->getDescription());
+		}
+		exit(-1);
+	}
+	target = it->second;
+
+	if (!target->hasSearchFramework()) {
+		fprintf(stderr, "%s: error: %s does not support a search framework.\n", *argv, it->second->getName());
+		exit(-2);
+	}
+
+	printf("Deleting any existing framework...\n");
+	target->deleteSearchFramework();
+	printf("Building framework, please wait...\n");
+	char lineLen = 70;
+	printf("[0=================================50==============================100]\n ");
+	char error = target->createSearchFramework(&percentUpdate, &lineLen);
+	if (error) {
+		fprintf(stderr, "%s: couldn't create search framework (permissions?)\n", *argv);
+	}
+	printf("\n");
+}
diff --git a/utilities/mod2imp.cpp b/utilities/mod2imp.cpp
new file mode 100644
index 0000000..ce382c3
--- /dev/null
+++ b/utilities/mod2imp.cpp
@@ -0,0 +1,126 @@
+/******************************************************************************
+ *
+ *  mod2imp.cpp -	Utility to export a module in IMP format
+ *
+ * $Id: mod2imp.cpp 2921 2013-07-28 17:21:44Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <iostream>
+#include <map>
+#include <stdio.h>
+
+#include <markupfiltmgr.h>
+#include <swmgr.h>
+#include <swmodule.h>
+#include <versekey.h>
+
+using std::map;
+using std::cout;
+using std::endl;
+
+#ifndef NO_SWORD_NAMESPACE
+
+using namespace sword;
+
+#endif
+
+
+void usage(const char *progName, const char *error = 0) {
+	if (error) fprintf(stderr, "\n%s: %s\n", progName, error);
+	fprintf(stderr, "\n=== mod2imp (Revision $Rev: 2234 $) SWORD module exporter.\n");
+	fprintf(stderr, "\nusage: %s <module_name> [options]\n"
+		"\t -r [output_format]  - render content instead of outputting raw native\n"
+		"\t\tdata.  output_format can be: OSIS, HTMLHREF, RTF.\n"
+		"\t -s - strip markup instead of outputting raw native data.\n"
+		"\t -f <option_name> <option_value> - when rendering (-r, above), option\n"
+		"\t\tfilter values can be set with this option.\n\n"
+		, progName);
+	exit(-1);
+}
+
+
+int main(int argc, char **argv)
+{
+	// handle options
+	if (argc < 2) usage(*argv);
+
+	const char *progName   = argv[0];
+	const char *modName    = argv[1];
+	bool render            = false;
+	bool strip             = false;
+	SWBuf renderForm;
+	SWBuf optionName;
+	map<SWBuf, SWBuf> options; // optionName, optionValue;
+
+	for (int i = 2; i < argc; i++) {
+		if (!strcmp(argv[i], "-r")) {
+			if (strip) usage(progName, "-r can't be supplied when using -s");
+			if (i+1 < argc) renderForm = argv[++i];
+			render = true;
+		}
+		else if (!strcmp(argv[i], "-s")) {
+			if (render) usage(progName, "-s can't be supplied when using -r");
+			strip = true;
+		}
+		else if (!strcmp(argv[i], "-f")) {
+			if (i+1 < argc) optionName          = argv[++i];
+			if (i+1 < argc) options[optionName] = argv[++i];
+			else usage(progName, "-f requires <option_name> <option_value>");
+		}
+		else usage(progName, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
+	}
+	// -----------------------------------------------------
+
+	MarkupFilterMgr *markupMgr = 0;
+	if       (renderForm == "HTMLHREF") markupMgr = new MarkupFilterMgr(sword::FMT_HTMLHREF);
+	else if  (renderForm == "OSIS")     markupMgr = new MarkupFilterMgr(sword::FMT_OSIS);
+	else if  (renderForm == "RTF")      markupMgr = new MarkupFilterMgr(sword::FMT_RTF);
+	else if  (renderForm.length())      usage(progName, (((SWBuf) "Unknown output_format for -r (")+renderForm+")").c_str());
+
+	SWMgr *mgr = (markupMgr) ? new SWMgr(markupMgr) : new SWMgr();
+
+	// set any options filters passed with -f
+	for (map<SWBuf, SWBuf>::iterator it = options.begin(); it != options.end(); it++) {
+		mgr->setGlobalOption(it->first, it->second);
+	}
+
+	SWModule *module = mgr->getModule(modName);
+
+	if (!module) usage(progName, (((SWBuf) "Couldn't find module: ") + modName).c_str());
+
+
+	SWKey *key = module->getKey();
+	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+
+	if (vkey)
+		vkey->setIntros(true);
+
+	for ((*module) = TOP; !module->popError(); (*module)++) {
+		std::cout << "$$$" << module->getKeyText() << std::endl;
+		std::cout << ((render) ? module->renderText().c_str() : (strip) ? module->stripText() : module->getRawEntry()) << "\n";
+	}
+
+	cout << endl;
+
+	return 0;
+}
+
diff --git a/utilities/mod2osis.cpp b/utilities/mod2osis.cpp
new file mode 100644
index 0000000..40305c2
--- /dev/null
+++ b/utilities/mod2osis.cpp
@@ -0,0 +1,248 @@
+/******************************************************************************
+ *
+ *  mod2osis.cpp -	Exports a module as an OSIS doc
+ *
+ * $Id: mod2osis.cpp 2972 2013-08-26 22:17:02Z scribe $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <fcntl.h>
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#include <swbuf.h>
+#include <ztext.h>
+#include <zld.h>
+#include <zcom.h>
+#include <swmgr.h>
+#include <lzsscomprs.h>
+#include <zipcomprs.h>
+#include <versekey.h>
+#include <thmlosis.h>
+#include <stdio.h>
+#include <markupfiltmgr.h>
+#include <algorithm>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+using std::endl;
+using std::cerr;
+using std::cout;
+
+void errorOutHelp(char *appName) {
+	cerr << appName << " - a tool to output a SWORD module in OSIS format\n";
+	cerr << "usage: "<< appName << " <modname> \n";
+	cerr << "\n\n";
+	exit(-1);
+}
+
+
+int main(int argc, char **argv)
+{
+	SWModule *inModule = 0;
+	ThMLOSIS filter;
+
+	cerr << "\n\n*** Don't use this utility *** \n\n";
+	cerr << "Its purpose is to prove the engine can do\n";
+	cerr << "lossless import / export, but we are not there yet. \n\n";
+	cerr << "This utility is done, in fact it is already too complex.\n";
+	cerr << "The ENGINE needs more work to assure export as OSIS works\n";
+	cerr << "This utility only gives us occasion to improve the engine.\n";
+	cerr << "Our goal is not to produce an export tool.\n\n";
+	cerr << "In fact, you should never export SWORD modules.\n";
+	cerr << "Many CrossWire modules are licensed for use from publishers\n";
+	cerr << "and you will need to obtain your own permissions.\n";
+	cerr << "We also do not encourage propogating encoding errors\n";
+	cerr << "which you will avoid by obtaining text data from the source.\n\n";
+	cerr << "Please see the TextSource entry in the module's .conf file\n";
+	cerr << "for information where to obtain module data from our source.\n\n";
+	cerr << "If you still must export SWORD module data, use mod2imp.\n";
+	cerr << "It is more lossless; or less lossful, and easier to read.\n\n";
+	
+	if ((argc != 2)) {
+		errorOutHelp(argv[0]);
+	}
+
+	if ((!strcmp(argv[1], "-h")) || (!strcmp(argv[1], "--help")) || (!strcmp(argv[1], "/?")) || (!strcmp(argv[1], "-?")) || (!strcmp(argv[1], "-help"))) {
+		errorOutHelp(argv[0]);
+	}
+
+	SWMgr mgr(new MarkupFilterMgr(FMT_OSIS));
+	StringList options = mgr.getGlobalOptions();
+	for (StringList::iterator it = options.begin(); it != options.end(); it++) {
+		StringList values = mgr.getGlobalOptionValues(it->c_str());
+		if (find(values.begin(), values.end(), "On") != values.end()) {
+			mgr.setGlobalOption(it->c_str(), "On");
+		}
+		if (find(values.begin(), values.end(), "All Readings") != values.end()) {
+			mgr.setGlobalOption(it->c_str(), "All Readings");
+		}
+	}
+
+//	mgr.setGlobalOption("Strong's Numbers", "Off");
+//	mgr.setGlobalOption("Morphological Tags", "Off");
+
+	ModMap::iterator it = mgr.Modules.find(argv[1]);
+	if (it == mgr.Modules.end()) {
+		fprintf(stderr, "error: %s: couldn't find module: %s \n", argv[0], argv[1]);
+		exit(-2);
+	}
+
+	inModule = it->second;
+//	inModule->AddRenderFilter(&filter);
+
+	SWKey *key = (SWKey *)*inModule;
+	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, key);
+
+	char buf[1024];
+	bool opentest = false;
+	bool openbook = false;
+	bool openchap = false;
+	int lastTest = 5;
+	int lastBook = 9999;
+	int lastChap = 9999;
+	if (!vkey) {
+		cerr << "Currently mod2osis only works with verse keyed modules\n\n";
+		exit(-1);
+	}
+
+	vkey->setIntros(false);
+
+	cout << "<?xml version=\"1.0\" ";
+		if (inModule->getConfigEntry("Encoding")) {
+			if (*(inModule->getConfigEntry("Encoding")))
+				cout << "encoding=\"" << inModule->getConfigEntry("Encoding") << "\" ";
+			else cout << "encoding=\"UTF-8\" ";
+		}
+		else cout << "encoding=\"UTF-8\" ";
+		cout << "?>\n\n";
+
+
+	cout << "<osis";
+		cout << " xmlns=\"http://www.bibletechnologies.net/2003/OSIS/namespace\"";
+		cout << " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";
+		cout << " xsi:schemaLocation=\"http://www.bibletechnologies.net/2003/OSIS/namespace http://www.bibletechnologies.net/osisCore.2.1.1.xsd\">\n\n";
+	cout << "<osisText";
+		cout << " osisIDWork=\"";
+		cout << inModule->getName() << "\"";
+		cout << " osisRefWork=\"defaultReferenceScheme\"";
+		if (inModule->getLanguage()) {
+			if (strlen(inModule->getLanguage()))
+				cout << " xml:lang=\"" << inModule->getLanguage() << "\"";
+		}
+		cout << ">\n\n";
+
+	cout << "\t<header>\n";
+	cout << "\t\t<work osisWork=\"";
+	cout << inModule->getName() << "\">\n";
+	cout << "\t\t\t<title>" << inModule->getDescription() << "</title>\n";
+	cout << "\t\t\t<identifier type=\"OSIS\">Bible." << inModule->getName() << "</identifier>\n";
+	cout << "\t\t\t<refSystem>Bible.KJV</refSystem>\n";
+	cout << "\t\t</work>\n";
+	cout << "\t\t<work osisWork=\"defaultReferenceScheme\">\n";
+	cout << "\t\t\t<refSystem>Bible.KJV</refSystem>\n";
+	cout << "\t\t</work>\n";
+	cout << "\t</header>\n\n";
+
+
+	(*inModule) = TOP;
+
+	SWKey *p = inModule->createKey();
+        VerseKey *tmpKey = SWDYNAMIC_CAST(VerseKey, p);
+	if (!tmpKey) {
+        	delete p;
+	        tmpKey = new VerseKey();
+	}
+	*tmpKey = inModule->getKeyText();
+
+	tmpKey->setIntros(true);
+	tmpKey->setAutoNormalize(false);
+
+	for ((*inModule) = TOP; !inModule->popError(); (*inModule)++) {
+		bool newTest = false;
+		bool newBook = false;
+
+		if (!strlen(inModule->renderText())) {
+			continue;
+		}
+
+		if ((vkey->getTestament() != lastTest)) {
+			if (openchap)
+				cout << "\t</chapter>\n";
+			if (openbook)
+				cout << "\t</div>\n";
+			if (opentest)
+				cout << "\t</div>\n";
+			cout << "\t<div type=\"x-testament\">\n";
+			opentest = true;
+			newTest = true;
+		}
+		if ((vkey->getBook() != lastBook) || newTest) {
+			if (!newTest) {
+				if (openchap)
+					cout << "\t</chapter>\n";
+				if (openbook)
+					cout << "\t</div>\n";
+			}
+			*buf = 0;
+			*tmpKey = *vkey;
+			tmpKey->setChapter(0);
+			tmpKey->setVerse(0);
+			sprintf(buf, "\t<div type=\"book\" osisID=\"%s\">\n", tmpKey->getOSISRef());
+//			filter.ProcessText(buf, 200 - 3, &lastHeading, inModule);
+			cout << "" << buf << endl;
+			openbook = true;
+			newBook = true;
+		}
+		if ((vkey->getChapter() != lastChap) || newBook) {
+			if (!newBook) {
+				if (openchap)
+					cout << "\t</chapter>\n";
+			}
+			*buf = 0;
+			*tmpKey = *vkey;
+			tmpKey->setVerse(0);
+			sprintf(buf, "\t<chapter osisID=\"%s\">\n", tmpKey->getOSISRef());
+//			filter.ProcessText(buf, 200 - 3, &lastHeading, inModule);
+			cout << "" << buf;
+			openchap = true;
+		}
+		SWBuf verseText = inModule->getRawEntry();
+		sprintf(buf, "\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
+		cout << buf << verseText.c_str() << "</verse>\n" << endl;
+		lastChap = vkey->getChapter();
+		lastBook = vkey->getBook();
+		lastTest = vkey->getTestament();
+	}
+	if (openchap)
+		cout << "\t</chapter>\n";
+	if (openbook)
+		cout << "\t</div>\n";
+	if (opentest)
+		cout << "\t</div>\n";
+	cout << "\t</osisText>\n";
+	cout << "</osis>\n";
+	return 0;
+}
+
+
diff --git a/utilities/mod2vpl.cpp b/utilities/mod2vpl.cpp
new file mode 100644
index 0000000..0b5ab1b
--- /dev/null
+++ b/utilities/mod2vpl.cpp
@@ -0,0 +1,112 @@
+/******************************************************************************
+ *
+ *  mod2vpl.cpp -	Utility to export a module in VPL format
+ *
+ * $Id: mod2vpl.cpp 2931 2013-07-31 13:07:26Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <swkey.h>
+#include <versekey.h>
+#include <stdio.h>
+#include <iostream>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWMgr;
+using sword::VerseKey;
+using sword::SWModule;
+using sword::SWKey;
+using sword::SW_POSITION;
+using sword::ModMap;
+#endif
+
+void cleanbuf(char *buf) {
+	char *from = buf;
+	char *to = buf;
+
+	while (*from) {
+		if ((*from != 10) && (*from != 13)) {
+			*to++ = *from++;
+		}
+		else {
+			from++;
+		}
+	}
+	*to = 0;
+}
+
+int main(int argc, char **argv) {
+	char *buffer = 0;
+
+	if (argc < 2) {
+		fprintf(stderr, "usage: %s <Mod Name> [0|1 - prepend verse reference to each line]\n", argv[0]);
+		exit(-1);
+	}
+
+	SWMgr mgr;
+
+	ModMap::iterator it = mgr.Modules.find(argv[1]);
+	if (it == mgr.Modules.end()) {
+		fprintf(stderr, "error: %s: couldn't find module: %s \n", argv[0], argv[1]);
+		exit(-2);
+	}
+
+	bool vref = false;
+	if (argc > 2)
+		vref = (argv[2][0] == '0') ? false : true;
+
+
+	SWModule *mod = it->second;
+
+	SWKey *key = (*mod);
+	VerseKey *vkey = 0;
+	SWTRY {
+		vkey = dynamic_cast<VerseKey *>(key);
+	}
+	SWCATCH (...) {}
+
+	if (!vkey) {
+		fprintf(stderr, "error: %s: %s module is not keyed to verses \n", argv[0], argv[1]);
+		exit(-3);
+	}
+
+	vkey->setIntros(true);	// turn on mod/testmnt/book/chap headings
+
+	(*mod) = TOP;
+
+	while (!mod->popError()) {
+		buffer = new char [ mod->renderText().length() + 1 ];
+		strcpy(buffer, mod->renderText());
+		cleanbuf(buffer);
+		if (vref) {
+			if ((strlen(buffer) > 0) && (vref)) {
+				std::cout << (const char *)(*vkey) << " ";
+				std::cout << buffer << std::endl;
+			}
+		}
+		else std::cout << buffer << std::endl;
+
+		delete [] buffer;
+		(*mod)++;
+	}
+}
diff --git a/utilities/mod2zmod.cpp b/utilities/mod2zmod.cpp
new file mode 100644
index 0000000..03fd8c5
--- /dev/null
+++ b/utilities/mod2zmod.cpp
@@ -0,0 +1,209 @@
+/******************************************************************************
+ *
+ *  mod2zmod.cpp -	Compression on variable granularity
+ *
+ * $Id: mod2zmod.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <fcntl.h>
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <swbuf.h>
+#include <ztext.h>
+#include <zld.h>
+#include <zcom.h>
+#include <swtext.h>
+#include <swmgr.h>
+#include <lzsscomprs.h>
+#include <zipcomprs.h>
+#include <versekey.h>
+#include <stdio.h>
+#include <cipherfil.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using std::cerr;
+using std::string;
+using std::cout;
+
+void errorOutHelp(char *appName) {
+	cerr << appName << " - a tool to create compressed Sword modules\n";
+	cerr << "version 0.1\n\n";
+	cerr << "usage: "<< appName << " <modname> <datapath> [blockType [compressType [cipherKey]]]\n\n";
+	cerr << "datapath: the directory in which to write the zModule\n";
+	cerr << "blockType  : (default 4)\n\t2 - verses\n\t3 - chapters\n\t4 - books\n";
+	cerr << "compressType: (default 1):\n\t1 - LZSS\n\t2 - Zip\n";
+	cerr << "\n\n";
+	exit(-1);
+}
+
+
+int main(int argc, char **argv)
+{
+	int iType = 4;
+	int compType = 1;
+	string cipherKey = "";
+	SWCompress *compressor = 0;
+	SWModule *inModule     = 0;
+	SWModule *outModule    = 0;
+	
+
+	if ((argc < 3) || (argc > 6)) {
+		errorOutHelp(argv[0]);
+	}
+
+	if (argc > 3) {
+		iType = atoi(argv[3]);
+		if (argc > 4) {
+			compType = atoi(argv[4]);
+			if (argc > 5) {
+				cipherKey = argv[5];
+			}
+		}
+	}
+
+	if ((iType < 2) || (compType < 1) || (compType > 2) || (!strcmp(argv[1], "-h")) || (!strcmp(argv[1], "--help")) || (!strcmp(argv[1], "/?")) || (!strcmp(argv[1], "-?")) || (!strcmp(argv[1], "-help"))) {
+		errorOutHelp(argv[0]);
+	}
+
+	SWMgr mgr;
+
+	ModMap::iterator it = mgr.Modules.find(argv[1]);
+	if (it == mgr.Modules.end()) {
+		fprintf(stderr, "error: %s: couldn't find module: %s\n", argv[0], argv[1]);
+		exit(-2);
+	}
+
+	inModule = it->second;
+
+	// Try to initialize a default set of datafiles and indicies at our
+	// datapath location passed to us from the user.
+	
+#define BIBLE 1
+#define LEX 2
+#define COM 3
+
+	int modType = 0;
+	if (!strcmp(inModule->getType(), "Biblical Texts")) modType = BIBLE;
+	if (!strcmp(inModule->getType(), "Lexicons / Dictionaries")) modType = LEX;
+	if (!strcmp(inModule->getType(), "Commentaries")) modType = COM;
+
+	switch (compType) {	// these are deleted by zText
+	case 1: compressor = new LZSSCompress(); break;
+	case 2: compressor = new ZipCompress(); break;
+	}
+
+	int result = 0;
+	switch (modType) {
+	case BIBLE:
+	case COM: {
+		SWKey *k = inModule->getKey();
+		VerseKey *vk = SWDYNAMIC_CAST(VerseKey, k);
+		result = zText::createModule(argv[2], iType, vk->getVersificationSystem());
+		break;
+	}
+	case LEX:
+		result = zLD::createModule(argv[2]);
+		break;
+	}
+
+	if (result) {
+		fprintf(stderr, "error: %s: couldn't create module at path: %s\n", argv[0], argv[2]);
+		exit(-3);
+	}
+
+	switch (modType) {
+	case BIBLE:
+	case COM: {
+		SWKey *k = inModule->getKey();
+		VerseKey *vk = SWDYNAMIC_CAST(VerseKey, k);
+		outModule = new zText(argv[2], 0, 0, iType, compressor,
+			0, ENC_UNKNOWN, DIRECTION_LTR, FMT_UNKNOWN, 0,
+			vk->getVersificationSystem());	// open our datapath with our RawText driver.
+		((VerseKey *)(SWKey *)(*inModule))->setIntros(true);
+		break;
+	}
+	case LEX:
+		outModule = new zLD(argv[2], 0, 0, iType, compressor);		// open our datapath with our RawText driver.
+		break;
+	}
+
+	SWFilter *cipherFilter = 0;
+	if (!cipherKey.empty()) {
+		cipherFilter = new CipherFilter(cipherKey.c_str());
+		outModule->addRawFilter(cipherFilter);
+	}
+
+	string lastBuffer = "Something that would never be first module entry";
+	SWKey bufferKey;
+	SWKey lastBufferKey;
+	SWKey *outModuleKey = outModule->createKey();
+	VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, outModuleKey);
+	outModuleKey->setPersist(true);
+	if (vkey) {
+		vkey->setIntros(true);
+		vkey->setAutoNormalize(false);
+	}
+	outModule->setKey(*outModuleKey);
+
+	inModule->setSkipConsecutiveLinks(false);
+	(*inModule) = TOP;
+	while (!inModule->popError()) {
+		bufferKey = *(SWKey *)(*inModule);
+		// pseudo-check for link.  Will get most common links.
+		if ((lastBuffer == inModule->getRawEntry()) &&(lastBuffer.length() > 0)) {
+			*outModuleKey = bufferKey;
+			outModule->linkEntry(&lastBufferKey);	// link to last key
+		cout << "Adding [" << bufferKey << "] link to: [" << lastBufferKey << "]\n";
+		}
+		else {
+			lastBuffer = inModule->getRawEntry();
+			lastBufferKey = inModule->getKeyText();
+			if (lastBuffer.length() > 0) {
+				cout << "Adding [" << bufferKey << "] new text.\n";
+				*outModuleKey = bufferKey;
+//				outModule->getRawEntry();	// snap
+//				outModule->setKey(bufferKey);
+				(*outModule) << lastBuffer.c_str();	// save new text;
+			}
+			else {
+                    cout << "Skipping [" << bufferKey << "] no entry in Module.\n";
+			}
+		}
+		(*inModule)++;
+	}
+	delete outModule;
+	delete outModuleKey;
+	if (cipherFilter)
+		delete cipherFilter;
+}
+
diff --git a/utilities/modwrite.cpp b/utilities/modwrite.cpp
new file mode 100644
index 0000000..b55f034
--- /dev/null
+++ b/utilities/modwrite.cpp
@@ -0,0 +1,87 @@
+/******************************************************************************
+ *
+ *  modwrite.cpp -	
+ *
+ * $Id: modwrite.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <fcntl.h>
+#include <iostream>
+#include <fstream>
+//#include <string>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <swmgr.h>
+#include <swmodule.h>
+#include <stdio.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::SWMgr;
+using sword::SWModule;
+using sword::ModMap;
+using sword::SWKey;
+#endif
+
+using std::cerr;
+
+int main(int argc, char **argv)
+{
+	int action = 0;
+
+	if ((argc < 4) || (argc > 6)) {
+		cerr << "usage: " << argv[0] << " <mod_name> <key> <key|buf|""-delete> [0(deflt) - normal; 1 - link]\n";
+		exit(-1);
+	}
+
+	if (argc > 4)
+		action = atoi(argv[4]);
+
+	SWMgr mgr;
+
+	ModMap::iterator it = mgr.Modules.find(argv[1]);
+	if (it == mgr.Modules.end()) {
+		fprintf(stderr, "error: %s: couldn't find module: %s \n", argv[0], argv[1]);
+		exit(-2);
+	}
+
+	SWModule *module = it->second;
+	module->setKey(argv[2]);
+
+	switch (action) {
+	case 0:
+		if (strlen(argv[3]))
+			(*module) << argv[3];
+		else module->deleteEntry();
+		break;
+	case 1:
+		(*module) << (SWKey)argv[3];
+		break;
+	default:
+		cerr << "Unknown action " << action << "\n";
+		exit(-3);
+	}
+}
diff --git a/utilities/no13.c b/utilities/no13.c
new file mode 100644
index 0000000..ccbcfeb
--- /dev/null
+++ b/utilities/no13.c
@@ -0,0 +1,55 @@
+/******************************************************************************
+ *
+ *  no13.c -	Strips ascii 13 chars out of a file
+ *
+ * $Id: no13.c 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1996-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+#include <fcntl.h>
+#include <stdio.h>
+
+main(int argc, char **argv)
+{
+	int fd, loop;
+	char ch;
+	char breakcnt = 0;
+
+	if (argc != 2) {
+		fprintf(stderr, "This program writes to stdout, so to be useful,\n\tit should be redirected (e.g no13 bla > bla.dat)\nusage: %s <filename>\n", argv[0]);
+		exit(1);
+	}
+	fd = open(argv[1], O_RDONLY, S_IREAD|S_IWRITE|S_IRGRP|S_IROTH);
+	while (read(fd, &ch, 1) == 1) {
+		if (ch == 0x0d) {	// CR
+			breakcnt++;
+			continue;
+		}
+		if (ch == 0x1a)	// Ctrl-Z
+			continue;
+
+		if (ch != 0x0a) {	// LF
+			if (breakcnt > 1) {
+				for (loop = breakcnt; loop > 0; loop--)
+					putchar(0x0d);
+				putchar(0x0a);
+			}
+			breakcnt=0;
+		}
+		putchar(ch);
+	}
+	close(fd);
+}
diff --git a/utilities/osis2mod.cpp b/utilities/osis2mod.cpp
new file mode 100644
index 0000000..eab2ee0
--- /dev/null
+++ b/utilities/osis2mod.cpp
@@ -0,0 +1,1737 @@
+/******************************************************************************
+ *
+ *  osis2mod.cpp -	Utility to import a module in OSIS format
+ *
+ * $Id: osis2mod.cpp 2893 2013-07-16 03:07:02Z scribe $
+ *
+ * Copyright 2003-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <stack>
+#include <vector>
+#include <iostream>
+#include <fstream>
+
+#include <utilstr.h>
+#include <swmgr.h>
+#include <rawtext.h>
+#include <rawtext4.h>
+#include <swbuf.h>
+#include <utilxml.h>
+#include <listkey.h>
+#include <versekey.h>
+
+#include <ztext.h>
+#include <lzsscomprs.h>
+#include <zipcomprs.h>
+#include <cipherfil.h>
+
+#ifdef _ICU_
+#include <utf8nfc.h>
+#include <latin1utf8.h>
+#endif
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using namespace std;
+
+int       debug            =   0; // mask of debug flags
+const int DEBUG_WRITE      =   1; // writing to module
+const int DEBUG_VERSE      =   2; // verse start and end
+const int DEBUG_QUOTE      =   4; // quotes, especially Words of Christ (WOC)
+const int DEBUG_TITLE      =   8; // titles
+const int DEBUG_INTERVERSE =  16; // inter-verse maerial
+const int DEBUG_XFORM      =  32; // transformations
+const int DEBUG_REV11N     =  64; // versification
+const int DEBUG_REF        = 128; // parsing of osisID and osisRef
+const int DEBUG_STACK      = 256; // cleanup of references
+const int DEBUG_OTHER      = 512; // ins and outs of books, chapters and verses
+
+// Exit codes
+const int EXIT_BAD_ARG     =   1; // Bad parameter given for program
+const int EXIT_NO_WRITE    =   2; // Could not open the module for writing
+const int EXIT_NO_CREATE   =   3; // Could not create the module
+const int EXIT_NO_READ     =   4; // Could not open the input file for reading.
+const int EXIT_BAD_NESTING =   5; // BSP or BCV nesting is bad
+
+#ifdef _ICU_
+UTF8NFC    normalizer;
+Latin1UTF8 converter;
+#endif
+int normalized = 0;
+int converted  = 0;
+
+SWText *module = 0;
+VerseKey currentVerse;
+SWBuf v11n     = "KJV";
+char activeOsisID[255];
+char currentOsisID[255];
+
+SWBuf activeVerseText;
+
+ListKey currentKeyIDs = ListKey();
+
+std::vector<ListKey> linkedVerses;
+
+static bool inCanonicalOSISBook = true; // osisID is for a book that is not in Sword's canon
+static bool normalize           = true; // Whether to normalize UTF-8 to NFC
+
+bool isOSISAbbrev(const char *buf) {
+	VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr();
+	const VersificationMgr::System *av11n = vmgr->getVersificationSystem(currentVerse.getVersificationSystem());
+	return av11n->getBookNumberByOSISName(buf) >= 0;
+}
+
+/**
+ * Determine whether the string contains a valid unicode sequence.
+ * The following table give the pattern of a valid UTF-8 character.
+ * Unicode Range               1st       2nd       3rd       4th
+ * U-00000000 - U-0000007F  0nnnnnnn
+ * U-00000080 - U-000007FF  110nnnnn  10nnnnnn
+ * U-00000800 - U-0000FFFF  1110nnnn  10nnnnnn  10nnnnnn
+ * U-00010000 - U-001FFFFF  11110nnn  10nnnnnn  10nnnnnn  10nnnnnn
+ * Note:
+ *   1.  The latest UTF-8 RFC allows for a max of 4 bytes.
+ *       Earlier allowed 6.
+ *   2.  The number of bits of the leading byte before the first 0
+ *       is the total number of bytes.
+ *   3.  The "n" are the bits of the unicode codepoint.
+ * This routine does not check to see if the code point is in the range.
+ * It could.
+ *
+ * param  txt the text to check
+ * return   1 if all high order characters form a valid unicode sequence
+ *         -1 if there are no high order characters.
+ *            Note: this is also a valid unicode sequence
+ *          0 if there are high order characters that do not form
+ *            a valid unicode sequence
+ * author DM Smith
+ */
+int detectUTF8(const char *txt) {
+	unsigned int  countUTF8 = 0;
+	int           count     = 0;
+	
+	// Cast it to make masking and shifting easier
+	const unsigned char *p = (const unsigned char*) txt;
+	while (*p) {
+		// Is the high order bit set?
+		if (*p & 0x80) {
+			// Then count the number of high order bits that are set.
+			// This determines the number of following bytes
+			// that are a part of the unicode character
+			unsigned char i = *p;
+			for (count = 0; i & 0x80; count++) {
+				i <<= 1;
+			}
+
+			// Validate count:
+			// Count 0: bug in code that would cause core walking
+			// Count 1: is a pattern of 10nnnnnn,
+			//          which does not signal the start of a unicode character
+			// Count 5 to 8: 111110nn, 1111110n and 11111110 and 11111111
+			//          are not legal starts, either
+			if (count < 2 || count > 4) return 0;
+
+			// At this point we expect (count - 1) following characters
+			// of the pattern 10nnnnnn
+			while (--count && *++p) {
+				// The pattern of each following character must be: 10nnnnnn
+				// So, compare the top 2 bits.
+				if ((0xc0 & *p) != 0x80) return  0;
+			}
+
+			// Oops, we've run out of bytes too soon: Cannot be UTF-8
+			if (count) return 0;
+
+			// We have a valid UTF-8 character, so count it
+			countUTF8++;
+		}
+
+		// Advance to the next character to examine.
+		p++;
+	}
+	
+	// At this point it is either UTF-8 or 7-bit ascii
+	return countUTF8 ? 1 : -1;
+}
+
+void prepareSWText(const char *osisID, SWBuf &text)
+{
+	// Always check on UTF8 and report on non-UTF8 entries
+	int utf8State = detectUTF8(text.c_str());
+
+	// Trust, but verify.
+	if (!normalize && !utf8State) {
+		cout << "WARNING(UTF8): " << osisID << ": Should be converted to UTF-8 (" << text << ")" << endl;
+	}
+
+#ifdef _ICU_
+	if (normalize) {
+		// Don't need to normalize text that is ASCII
+		// But assume other non-UTF-8 text is Latin1 (cp1252) and convert it to UTF-8
+		if (!utf8State) {
+			cout << "INFO(UTF8): " << osisID << ": Converting to UTF-8 (" << text << ")" << endl;
+			converter.processText(text, (SWKey *)2);  // note the hack of 2 to mimic a real key. TODO: remove all hacks
+			converted++;
+
+			// Prepare for double check. This probably can be removed.
+			// But for now we are running the check again.
+			// This is to determine whether we need to normalize output of the conversion.
+			utf8State = detectUTF8(text.c_str());
+		}
+
+		// Double check. This probably can be removed.
+		if (!utf8State) {
+			cout << "ERROR(UTF8): " << osisID << ": Converting to UTF-8 (" << text << ")" << endl;
+		}
+
+		if (utf8State > 0) {
+			SWBuf before = text;
+			normalizer.processText(text, (SWKey *)2);  // note the hack of 2 to mimic a real key. TODO: remove all hacks
+			if (before != text) {
+				normalized++;
+			}
+		}
+	}
+#endif
+}
+
+// This routine converts an osisID or osisRef into one that SWORD can parse into a verse list
+// An osisRef is made up of:
+// a single osisID
+// an osisID-osisID
+// or
+// an osisRef osisRef
+//
+// An osisID can have a work prefix which is terminated by a : and may have a grain
+// which is started by a !
+//
+// However, SWORD cannot handle work prefixes or grains and expects ranges to be
+// separated with a single;
+void prepareSWVerseKey(SWBuf &buf) {
+	// This routine modifies the buf in place
+	char* s = buf.getRawData();
+	char* p = s;
+	bool inRange = false;
+	while (*p) {
+		if (inRange) {
+			if (debug & DEBUG_REF) {
+				cout << "DEBUG(REF): Copy range marker:" << *p << endl;;
+			}
+
+			// Range markers are copied as is
+			*s++ = *p++;
+		}
+
+		// Look ahead to see if we are in a work prefix
+		// but don't look past an osisID
+		char *n = p;
+		while (*n && *n != ':' && *n != ' ' && *n != '-') {
+			n++;
+		}
+
+		// We have found a work prefix
+		if (*n == ':') {
+			// set p to skip the work prefix
+			p = n + 1;
+
+			if (debug & DEBUG_REF) {
+				cout << "DEBUG(REF): Found a work prefix ";
+				for (char *x = s; x <= n; x++) {
+					cout << *x;
+				}
+				cout << endl;
+			}
+		}
+
+		// Now we are in the meat of an osisID.
+		// Copy it to its end but stop on a grain marker of '!'
+		if (debug & DEBUG_REF) {
+			cout << "DEBUG(REF): Copy osisID:";
+		}
+
+		while (*p && *p != '!' && *p != ' ' && *p != '-') {
+			if (debug & DEBUG_REF) {
+				cout << *p;
+			}
+
+			*s++ = *p++;
+		}
+
+		if (debug & DEBUG_REF) {
+			cout << endl;
+		}
+
+		// The ! and everything following until we hit
+		// the end of the osisID is part of the grain reference
+		if (*p == '!') {
+			n = p;
+			while (*n && *n != ' ' && *n != '-') {
+				n++;
+			}
+
+			if (debug & DEBUG_REF) {
+				cout << "DEBUG(REF): Found a grain suffix ";
+				for (char *x = p; x < n; x++) {
+					cout << *x;
+				}
+				cout << endl;
+			}
+
+			p = n;
+		}
+
+		// At this point we have processed an osisID
+
+		// if we are not in a range and the next characer is a -
+		// then we are entering a range
+		inRange = !inRange && *p == '-';
+
+		if (debug & DEBUG_REF) {
+			if (inRange) {
+				cout << "DEBUG(REF): Found a range" << endl;
+			}
+		}
+
+		// between ranges and stand alone osisIDs we might have whitespace
+		if (!inRange && *p == ' ') {
+			// skip this and subsequent spaces
+			while (*p == ' ') {
+				p++;
+			}
+
+			// replacing them all with a ';'
+			*s++ = ';';
+
+			if (debug & DEBUG_REF) {
+				cout << "DEBUG(REF): replacing space with ;. Remaining: " << p << endl;
+			}
+		}
+	}
+
+	// Determine whether we have modified the buffer
+	// We have modified the buffer if s is not sitting on the null byte of the original
+	if (*s) {
+		// null terminate the reference
+		*s = '\0';
+		// Since we modified the swbuf, we need to tell it what we have done
+		buf.setSize(s - buf.c_str());
+
+		if (debug & DEBUG_REF) {
+			cout << "DEBUG(REF): shortended keyVal to`" << buf.c_str() << "`"<< endl;
+		}
+	}
+}
+
+/**
+ * Determine whether a verse as given is valid for the versification.
+ * This is done by comparing the before and after of normalization.
+ */
+bool isValidRef(const char *buf) {
+	// Create a VerseKey that does not do auto normalization
+	// Note: need to turn on headings so that a heading does not get normalized anyway
+	// And set it to the reference under question
+	VerseKey before;
+	before.setVersificationSystem(currentVerse.getVersificationSystem());
+	before.setAutoNormalize(false);
+	before.setIntros(true);
+	before.setText(buf);
+
+	// If we are a heading we must bail
+	// These will autonormalize to the last verse of the prior chapter
+	if (!before.getTestament() || !before.getBook() || !before.getChapter() || !before.getVerse()) {
+		return true;
+	}
+
+	// Create a VerseKey that does do auto normalization
+	// And set it to the reference under question
+	VerseKey after;
+	after.setVersificationSystem(currentVerse.getVersificationSystem());
+	after.setAutoNormalize(true);
+	after.setText(buf);
+
+	if (before == after)
+	{
+		return true;
+	}
+
+	// If we have gotten here the reference is not in the selected versification.
+	// cout << "INFO(V11N): " << before << " is not in the " << currentVerse.getVersificationSystem() << " versification." << endl;
+	if (debug & DEBUG_REV11N) {
+		cout << "DEBUG(V11N): " << before << " normalizes to "  << after << endl;
+	}
+
+	return false;
+}
+
+/**
+ * This routine is used to ensure that all the text in the input is saved to the module.
+ * Assumption: The input orders all the verses for a chapter in numerical order. Thus, any
+ * verses that are not in the chosen versification (v11n) follow those that are.
+ *
+ * The prior implementation of this adjusted the verse to the last one that is in the chosen v11n.
+ * If it the chapter were extra, then it is appended to the last verse of the last
+ * chapter in the chosen v11n for that book. If it is just extra verses for a chapter, then it is
+ * appended to the last verse of the chapter.
+ *
+ * The problem with this is when a OSIS verse refers to more than one verse, e.g.
+ * osisID="Gen.1.29 Gen.1.30 Gen.1.31" (Gen.1.31 is the last verse of the chapter in the chosen v11n)
+ * and then it is followed by Gen.1.32.
+ *
+ * This routine assumes that linking is postponed to the end so that in the example Gen.1.30-31
+ * are not linked but rather empty. This routine will then find the last verse in the computed
+ * chapter that has content.
+ *
+ * Alternative, we could have done linking as we went, but this routine would have needed
+ * to find the first entry in the link set and elsewhere in the code when appending to a
+ * verse, it would need to be checked for adjacent links and those would have needed to be adjusted.
+ *
+ * param key the key that may need to be adjusted
+ */
+void makeValidRef(VerseKey &key) {
+	VerseKey saveKey;
+	saveKey.setVersificationSystem(currentVerse.getVersificationSystem());
+	saveKey.setAutoNormalize(false);
+	saveKey.setIntros(true);
+	saveKey = currentVerse;
+
+	// Since isValidRef returned false constrain the key to the nearest prior reference.
+	// If we are past the last chapter set the reference to the last chapter
+	int chapterMax = key.getChapterMax();
+	if (key.getChapter() > chapterMax) {
+		key.setChapter(chapterMax);
+	}
+
+	// Either we set the chapter to the last chapter and now need to set to the last verse in the chapter
+	// Or the verse is beyond the end of the chapter.
+	// In any case we need to constrain the verse to it's chapter.
+	int verseMax   = key.getVerseMax();
+	key.setVerse(verseMax);
+
+	if (debug & DEBUG_REV11N) {
+		cout << "DEBUG(V11N) Chapter max:" << chapterMax << ", Verse Max:" << verseMax << endl;
+	}
+
+	// There are three cases we want to handle:
+	// In the examples we are using the KJV versification where the last verse of Matt.7 is Matt.7.29.
+	// In each of these cases the out-of-versification, extra verse is Matt.7.30.
+	// 1) The "extra" verse follows the last verse in the chapter.
+	//      <verse osisID="Matt.7.29">...</verse><verse osisID="Matt.7.30">...</verse>
+	//    In this case re-versify Matt.7.30 as Matt.7.29.
+	//
+	// 2) The "extra" verse follows a range (a set of linked verses).
+	//      <verse osisID="Matt.7.28-Matt.7.29">...</verse><verse osisID="Matt.7.30">...</verse>
+	//    In this case, re-versify Matt.7.30 as Matt.7.28, the first verse in the linked set.
+	//    Since we are post-poning linking, we want to re-reversify to the last entry in the module.
+	//
+	// 3) The last verse in the chapter is not in the input. There may be other verses missing as well.
+	//      <verse osisID="Matt.7.8">...</verse><verse osisID="Matt.7.30">...</verse>
+	//    In this case we should re-versify Matt.7.30 as Matt.7.29.
+	//    However, since this and 2) are ambiguous, we'll re-reversify to the last entry in the module.
+	
+	while (!key.popError() && !module->hasEntry(&key)) {
+		key.decrement(1);
+	}
+
+	cout << "INFO(V11N): " << saveKey.getOSISRef()
+	     << " is not in the " << key.getVersificationSystem()
+	     << " versification. Appending content to " << key.getOSISRef() << endl;
+}
+
+void writeEntry(SWBuf &text, bool force = false) {
+	char keyOsisID[255];
+
+	static const char* revision = "<milestone type=\"x-importer\" subType=\"x-osis2mod\" n=\"$Rev: 2893 $\"/>";
+	static bool firstOT = true;
+	static bool firstNT = true;
+
+	if (!inCanonicalOSISBook) {
+		return;
+	}
+
+	strcpy(keyOsisID, currentVerse.getOSISRef());
+
+	// set keyOsisID to anything that an osisID cannot be.
+	if (force) {
+		strcpy(keyOsisID, "-force");
+	}
+
+	static VerseKey lastKey;
+	lastKey.setVersificationSystem(currentVerse.getVersificationSystem());
+	lastKey.setAutoNormalize(0);
+	lastKey.setIntros(1);
+
+	VerseKey saveKey;
+	saveKey.setVersificationSystem(currentVerse.getVersificationSystem());
+	saveKey.setAutoNormalize(0);
+	saveKey.setIntros(1);
+	saveKey = currentVerse;
+
+	// If we have seen a verse and the supplied one is different then we output the collected one.
+	if (*activeOsisID && strcmp(activeOsisID, keyOsisID)) {
+
+		if (!isValidRef(lastKey)) {
+			makeValidRef(lastKey);
+		}
+
+		currentVerse = lastKey;
+
+		prepareSWText(activeOsisID, activeVerseText);
+
+		// Put the revision into the module
+		int testmt = currentVerse.getTestament();
+		if ((testmt == 1 && firstOT) || (testmt == 2 && firstNT)) {
+			VerseKey t;
+			t.setVersificationSystem(currentVerse.getVersificationSystem());
+			t.setAutoNormalize(0);
+			t.setIntros(1);
+			t = currentVerse;
+			currentVerse.setBook(0);
+			currentVerse.setChapter(0);
+			currentVerse.setVerse(0);
+			module->setEntry(revision);
+			currentVerse = t;
+			switch (testmt) {
+			case 1:
+				firstOT = false;
+				break;
+			case 2:
+				firstNT = false;
+				break;
+			}
+		}
+
+		// If the entry already exists, then append this entry to the text.
+		// This is for verses that are outside the chosen versification. They are appended to the prior verse.
+		// The space should not be needed if we retained verse tags.
+		SWBuf currentText = module->getRawEntry();
+		if (currentText.length()) {
+			cout << "INFO(WRITE): Appending entry: " << currentVerse.getOSISRef() << ": " << activeVerseText << endl;
+			activeVerseText = currentText + " " + activeVerseText;
+		}
+
+		if (debug & DEBUG_WRITE) {
+			cout << "DEBUG(WRITE): " << activeOsisID << ":" << currentVerse.getOSISRef() << ": " << activeVerseText << endl;
+		}
+
+		module->setEntry(activeVerseText);
+		activeVerseText = "";
+	}
+
+	// The following is for initial verse content and for appending interverse content.
+	if (activeVerseText.length()) {
+		activeVerseText += text;
+	}
+	else {
+		// Eliminate leading whitespace on the beginning of each verse
+		text.trimStart();
+		activeVerseText = text;
+	}
+	// text has been consumed so clear it out.
+	text = "";
+
+	currentVerse = saveKey;
+	lastKey = currentVerse;
+	strcpy(activeOsisID, keyOsisID);
+}
+
+void linkToEntry(VerseKey &linkKey, VerseKey &dest) {
+
+	// Only link verses that are in the versification.
+	if (!isValidRef(linkKey)) {
+		return;
+	}
+
+	VerseKey saveKey;
+	saveKey.setVersificationSystem(currentVerse.getVersificationSystem());
+	saveKey.setAutoNormalize(0);
+	saveKey.setIntros(1);
+	saveKey = currentVerse;
+	currentVerse = linkKey;
+
+	cout << "INFO(LINK): Linking " << currentVerse.getOSISRef() << " to " << dest.getOSISRef() << "\n";
+	module->linkEntry(&dest);
+
+	currentVerse = saveKey;
+}
+
+// Return true if the content was handled or is to be ignored.
+//		false if the what has been seen is to be accumulated and considered later.
+bool handleToken(SWBuf &text, XMLTag token) {
+
+	// Everything between the begin book tag and the first begin chapter tag is inBookIntro
+	static bool               inBookIntro     = false;
+
+	// Everything between the begin chapter tag and the first begin verse tag is inChapterIntro
+	static bool               inChapterIntro  = false;
+
+	// Flags indicating whether we are processing the content of a chapter
+	static bool               inChapter       = false;
+
+	// Flags indicating whether we are processing the content of a verse
+	static bool               inVerse         = false;
+
+	// Flags indicating whether we are processing the content of to be prepended to a verse
+	static bool               inPreVerse      = false;
+	static int                genID           = 1;
+
+	// Flag indicating whether we are in "Words of Christ"
+	static bool               inWOC           = false;
+	// Tag for WOC quotes within a verse
+	static XMLTag             wocTag          = "<q who=\"Jesus\" marker=\"\">";
+
+	// Flag used to indicate where useful text begins
+	static bool               firstDiv        = false;
+	static bool               headerEnded     = false;
+
+	// Retain the sID of book, chapter and verse (commentary) divs so that we can find them again.
+	// This relies on transformBSP.
+	static SWBuf              sidBook         = "";
+	static SWBuf              sidChapter      = "";
+	static SWBuf              sidVerse        = "";
+
+	// Stack of quote elements used to handle Words of Christ
+	static std::stack<XMLTag> quoteStack;
+
+	// Stack of elements used to validate that books, chapters and verses are well-formed
+	// This goes beyond simple xml well-formed and also considers milestoned div, chapter and verse
+	// to be begin and end tags, too.
+	// It is an error if books and chapters are not well formed (though not required by OSIS)
+	// It is a warning that verses are not well formed (because some clients are not ready)
+	static std::stack<XMLTag> tagStack;
+
+	// The following are used to validate well-formedness
+	static int                chapterDepth    = 0;
+	static int                bookDepth       = 0;
+	static int                verseDepth      = 0;
+
+	int                       tagDepth        = tagStack.size();
+	SWBuf                     tokenName       = token.getName();
+	bool                      isEndTag        = token.isEndTag() || token.getAttribute("eID");
+	SWBuf                     typeAttr        = token.getAttribute("type");
+	SWBuf                     eidAttr         = token.getAttribute("eID");
+
+	// process start tags
+	if (!isEndTag) {
+
+		// Remember non-empty start tags
+		if (!token.isEmpty()) {
+			tagStack.push(token);
+
+			if (debug & DEBUG_STACK) {
+				cout << "DEBUG(STACK): " << currentOsisID << ": push (" << tagStack.size() << ") " << token.getName() << endl;
+			}
+		}
+
+		// throw away everything up to the first div (that is outside the header)
+		if (!firstDiv) {
+			if (headerEnded && (tokenName == "div")) {
+				if (debug & DEBUG_OTHER) {
+					cout << "DEBUG(FOUND): Found first div and pitching prior material: " << text << endl;
+				}
+
+				// TODO: Save off the content to use it to suggest the module's conf.
+				firstDiv = true;
+				text     = "";
+			}
+			else {
+				// Collect the content so it can be used to suggest the module's conf.
+				return false;
+			}
+		}
+
+		//-- WITH osisID OR annotateRef -------------------------------------------------------------------------
+		// Handle Book, Chapter, and Verse (or commentary equivalent)
+		if (token.getAttribute("osisID") || token.getAttribute("annotateRef")) {
+
+			// BOOK START, <div type="book" ...>
+			if (tokenName == "div" && typeAttr == "book") {
+				if (inBookIntro || inChapterIntro) {	// this one should never happen, but just in case
+
+					if (debug & DEBUG_TITLE) {
+						cout << "DEBUG(TITLE): " << currentOsisID << ": OOPS INTRO " << endl;
+						cout << "\tinChapterIntro = " << inChapterIntro << endl;
+						cout << "\tinBookIntro = " << inBookIntro << endl;
+					}
+
+					currentVerse.setTestament(0);
+					currentVerse.setBook(0);
+					currentVerse.setChapter(0);
+					currentVerse.setVerse(0);
+					writeEntry(text);
+				}
+				currentVerse = token.getAttribute("osisID");
+				currentVerse.setChapter(0);
+				currentVerse.setVerse(0);
+				strcpy(currentOsisID, currentVerse.getOSISRef());
+
+				sidBook         = token.getAttribute("sID");
+				inChapter       = false;
+				inVerse         = false;
+				inPreVerse      = false;
+				inBookIntro     = true;
+				inChapterIntro  = false;
+
+				if (debug & DEBUG_TITLE) {
+					cout << "DEBUG(TITLE): " << currentOsisID << ": Looking for book introduction" << endl;
+				}
+
+				bookDepth       = tagStack.size();
+				chapterDepth    = 0;
+				verseDepth      = 0;
+
+				inCanonicalOSISBook = isOSISAbbrev(token.getAttribute("osisID"));
+				if (!inCanonicalOSISBook) {
+					cout << "WARNING(V11N): New book is " << token.getAttribute("osisID") << " and is not in " << v11n << " versification, ignoring" << endl;
+				}
+				else if (debug & DEBUG_OTHER) {
+					cout << "DEBUG(FOUND): New book is " << currentVerse.getOSISRef() << endl;
+				}
+
+				return false;
+			}
+
+			// CHAPTER START, <chapter> or <div type="chapter" ...>
+			if ((tokenName == "chapter") ||
+			    (tokenName == "div" && typeAttr == "chapter")
+			) {
+				if (inBookIntro) {
+					if (debug & DEBUG_TITLE) {
+						cout << "DEBUG(TITLE): " << currentOsisID << ": BOOK INTRO "<< text << endl;
+					}
+
+					writeEntry(text);
+				}
+
+				currentVerse = token.getAttribute("osisID");
+				currentVerse.setVerse(0);
+
+				if (debug & DEBUG_OTHER) {
+					cout << "DEBUG(FOUND): Current chapter is " << currentVerse.getOSISRef() << " (" << token.getAttribute("osisID") << ")" << endl;
+				}
+
+				strcpy(currentOsisID, currentVerse.getOSISRef());
+
+				sidChapter      = token.getAttribute("sID");
+				inChapter       = true;
+				inVerse         = false;
+				inPreVerse      = false;
+				inBookIntro     = false;
+				inChapterIntro  = true;
+
+				if (debug & DEBUG_TITLE) {
+					cout << "DEBUG(TITLE): " << currentOsisID << ": Looking for chapter introduction" << endl;
+				}
+
+				chapterDepth    = tagStack.size();
+				verseDepth      = 0;
+
+				return false;
+			}
+
+			// VERSE, <verse ...> OR COMMENTARY START, <div annotateType="xxx" ...>
+			if ((tokenName == "verse") ||
+			    (tokenName == "div" && token.getAttribute("annotateType"))
+			) {
+				if (debug & DEBUG_OTHER) {
+					cout << "DEBUG(FOUND): Entering verse" << endl;
+				}
+
+				if (inChapterIntro) {
+					if (debug & DEBUG_TITLE) {
+						cout << "DEBUG(TITLE): " << currentOsisID << ": Done looking for chapter introduction" << endl;
+					}
+
+					if (text.length()) {
+						if (debug & DEBUG_TITLE) {
+							cout << "DEBUG(TITLE): " << currentOsisID << ": CHAPTER INTRO "<< text << endl;
+						}
+
+						writeEntry(text);
+					}
+				}
+
+				// Did we have pre-verse material that needs to be marked?
+				if (inPreVerse) {
+					char genBuf[200];
+					sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" eID=\"pv%d\"/>", genID++);
+					text.append(genBuf);
+				}
+
+				// Get osisID for verse or annotateRef for commentary
+				SWBuf keyVal = token.getAttribute(tokenName == "verse" ? "osisID" : "annotateRef");
+
+				// Massage the key into a form that parseVerseList can accept
+				prepareSWVerseKey(keyVal);
+
+				// The osisID or annotateRef can be more than a single verse
+				// The first or only one is the currentVerse
+				// Use the last verse seen (i.e. the currentVerse) as the basis for recovering from bad parsing.
+				// This should never happen if the references are valid OSIS references
+				ListKey verseKeys = currentVerse.parseVerseList(keyVal, currentVerse, true);
+				int memberKeyCount = verseKeys.getCount();
+				if (memberKeyCount) {
+					currentVerse = verseKeys.getElement(0);
+					// See if this osisID or annotateRef refers to more than one verse.
+					// If it does, save it until all verses have been seen.
+					// At that point we will output links.
+					// This can be done by incrementing, which will produce an error
+					// if there is only one verse.
+					verseKeys.setPosition(TOP);
+					verseKeys.increment(1);
+					if (!verseKeys.popError()) {
+						linkedVerses.push_back(verseKeys);
+					}
+				}
+				else {
+					cout << "ERROR(REF): Invalid osisID/annotateRef: " << token.getAttribute((tokenName == "verse") ? "osisID" : "annotateRef") << endl;
+				}
+
+				strcpy(currentOsisID, currentVerse.getOSISRef());
+
+				if (debug & DEBUG_OTHER) {
+					cout << "DEBUG(FOUND): New current verse is " << currentVerse.getOSISRef() << endl;
+					cout << "DEBUG(FOUND): osisID/annotateRef is adjusted to: " << keyVal << endl;
+				}
+
+				sidVerse        = token.getAttribute("sID");
+				inVerse         = true;
+				inPreVerse      = false;
+				inBookIntro     = false;
+				inChapterIntro  = false;
+				verseDepth      = tagStack.size();
+
+				// Include the token if it is not a verse
+				if (tokenName != "verse") {
+					text.append(token);
+				}
+				else if (debug & DEBUG_VERSE)
+				{
+					// transform the verse into a milestone
+					XMLTag t = "<milestone resp=\"v\" />";
+					// copy all the attributes of the verse element to the milestone
+					StringList attrNames = token.getAttributeNames();
+					for (StringList::iterator loop = attrNames.begin(); loop != attrNames.end(); loop++) {
+						const char* attr = (*loop).c_str();
+						t.setAttribute(attr, token.getAttribute(attr));
+					}
+					text.append(t);
+				}
+
+				if (inWOC) {
+					text.append(wocTag);
+				}
+				return true;
+			}
+		} // done with Handle Book, Chapter, and Verse (or commentary equivalent)
+
+		// Now consider everything else.
+
+		// Handle WOC quotes.
+		// Note this requires transformBSP to make them into milestones
+		// Otherwise have to do it here
+		if (tokenName == "q") {
+			quoteStack.push(token);
+
+			if (debug & DEBUG_QUOTE) {
+				cout << "DEBUG(QUOTE): " << currentOsisID << ": quote top(" << quoteStack.size() << ") " << token << endl;
+			}
+
+			if (token.getAttribute("who") && !strcmp(token.getAttribute("who"), "Jesus")) {
+				inWOC = true;
+
+				// Output per verse WOC markup.
+				text.append(wocTag);
+
+				// Output the quotation mark if appropriate, inside the WOC.
+				// If there is no marker attribute, let the SWORD engine manufacture one.
+				// If there is a marker attribute and it has content, then output that.
+				// If the marker attribute is present and empty, then there is nothing to do.
+				// And have it within the WOC markup
+				if (!token.getAttribute("marker") || token.getAttribute("marker")[0]) {
+					token.setAttribute("who", 0); // remove the who="Jesus"
+					text.append(token);
+				}
+				return true;
+			}
+			return false;
+		}
+
+		// Have we found the start of pre-verse material?
+		// Pre-verse material follows the following rules
+		// 1) Between the opening of a book and the first chapter, all the material is handled as an introduction to the book.
+		// 2) Between the opening of a chapter and the first verse, the material is split between the introduction of the chapter
+		//    and the first verse of the chapter.
+		//    A <div> with a type of section will be taken as surrounding verses.
+		//    A <title> of type other than main, chapter or sub, will be taken as a title for the verse.
+		//    Once one of these conditions is met, the division between chapter introduction and pre-verse is set.
+		// 3) Between verses, the material is split between the prior verse and the next verse.
+		//    Basically, while end and empty tags are found, they belong to the prior verse.
+		//    Once a begin tag is found, it belongs to the next verse.
+		if (!inPreVerse && !inBookIntro) {
+			if (inChapterIntro) {
+				// Determine when we are no longer in a chapter heading, but in pre-verse material:
+				// If we see one of the following:
+				// 	a section div
+				// 	a title that is not main, chapter or sub or unclassified (no type attribute)
+				if ((tokenName == "div" && typeAttr == "section") ||
+				    (tokenName == "title" && typeAttr.length() != 0 && typeAttr != "main" && typeAttr != "chapter" && typeAttr != "sub")
+				) {
+					if (debug & DEBUG_TITLE) {
+						cout << "DEBUG(TITLE): " << currentOsisID << ": Done looking for chapter introduction" << endl;
+					}
+
+					if (text.length()) {
+						if (debug & DEBUG_TITLE) {
+							cout << "DEBUG(TITLE): " << currentOsisID << ": CHAPTER INTRO "<< text << endl;
+						}
+
+						// Since we have found the boundary, we need to write out the chapter heading
+						writeEntry(text);
+					}
+					// And we are no longer in the chapter heading
+					inChapterIntro  = false;
+					// But rather, we are now in pre-verse material
+					inPreVerse      = true;
+				}
+			}
+			else if (!inVerse && inChapter) {
+				inPreVerse = true;
+			}
+
+			if (inPreVerse) {
+				char genBuf[200];
+				sprintf(genBuf, "<div type=\"x-milestone\" subType=\"x-preverse\" sID=\"pv%d\"/>", genID);
+				text.append(genBuf);
+			}
+		}
+
+		if (debug & DEBUG_INTERVERSE) {
+			if (!inVerse && !inBookIntro && !inChapterIntro) {
+				cout << "DEBUG(INTERVERSE): " << currentOsisID << ": interverse start token " << token << ":" << text.c_str() << endl;
+			}
+		}
+
+		return false;
+	} // Done with procesing start and empty tags
+
+	// Process end tags
+	else {
+
+		if (tagStack.empty()) {
+			cout << "FATAL(NESTING): " << currentOsisID << ": tag expected" << endl;
+			exit(EXIT_BAD_NESTING);
+		}
+
+		// Note: empty end tags have the eID attribute
+		if (!token.isEmpty()) {
+			XMLTag topToken = tagStack.top();
+			tagDepth = tagStack.size();
+
+			if (debug & DEBUG_STACK) {
+				cout << "DEBUG(STACK): " << currentOsisID << ": pop(" << tagDepth << ") " << topToken.getName() << endl;
+			}
+
+			tagStack.pop();
+
+			if (tokenName != topToken.getName()) {
+				cout << "FATAL(NESTING): " << currentOsisID << ": Expected " << topToken.getName() << " found " << tokenName << endl;
+//				exit(EXIT_BAD_NESTING);	// (OSK) I'm sure this validity check is a good idea, but there's a but somewhere that's killing the converter here.
+						// So I'm disabling this line. Unvalidated OSIS files shouldn't be run through the converter anyway.
+						// (DM) This has nothing to do with well-form or valid. It checks milestoned elements for proper nesting.
+			}
+		}
+
+		// We haven't seen the first div outside the header so there is little to do.
+		if (!firstDiv) {
+			if (tokenName == "header") {
+				headerEnded = true;
+
+				if (debug & DEBUG_OTHER) {
+					cout << "DEBUG(FOUND): End of header found" << endl;
+				}
+			}
+
+			// Collect the content so it can be used to suggest the module's conf.
+			return false;
+		}
+
+		// VERSE and COMMENTARY END
+		if ((tokenName == "verse") ||
+		    (tokenName == "div" && eidAttr == sidVerse)
+		) {
+
+			if (tagDepth != verseDepth) {
+				cout << "WARNING(NESTING): verse " << currentOsisID << " is not well formed:(" << verseDepth << "," << tagDepth << ")" << endl;
+			}
+
+			// If we are in WOC then we need to terminate the <q who="Jesus" marker=""> that was added earlier in the verse.
+			if (inWOC) {
+				text.append("</q>");
+			}
+
+
+			// Include the token if it is not a verse
+			if (tokenName != "verse") {
+				text.append(token);
+			}
+			else if (debug & DEBUG_VERSE)
+			{
+				// transform the verse into a milestone
+				XMLTag t = "<milestone resp=\"v\" />";
+				// copy all the attributes of the verse element to the milestone
+				StringList attrNames = token.getAttributeNames();
+				for (StringList::iterator loop = attrNames.begin(); loop != attrNames.end(); loop++) {
+					const char* attr = (*loop).c_str();
+					t.setAttribute(attr, token.getAttribute(attr));
+				}
+				text.append(t);
+			}
+
+			writeEntry(text);
+
+			inVerse     = false;
+			inPreVerse  = false;
+			verseDepth  = 0;
+
+			return true;
+		}
+		
+		// Handle WOC quotes.
+		// Note this requires transformBSP to make them into milestones
+		// Otherwise have to manage it here
+		if (tokenName == "q") {
+			XMLTag topToken = quoteStack.top();
+
+			if (debug & DEBUG_QUOTE) {
+				cout << "DEBUG(QUOTE): " << currentOsisID << ": quote pop(" << quoteStack.size() << ") " << topToken << " -- " << token << endl;
+			}
+
+			quoteStack.pop();
+
+			// If we have found an end tag for a <q who="Jesus"> then we are done with the WOC
+			// and we need to terminate the <q who="Jesus" marker=""> that was added earlier in the verse.
+			if (token.getAttribute("who") && !strcmp(token.getAttribute("who"), "Jesus")) {
+
+				if (debug & DEBUG_QUOTE) {
+					cout << "DEBUG(QUOTE): " << currentOsisID << ": (" << quoteStack.size() << ") " << topToken << " -- " << token << endl;
+				}
+
+				inWOC = false;
+				const char *sID = topToken.getAttribute("sID");
+				const char *eID = token.getAttribute("eID");
+				if (!sID) {
+					sID = "";
+				}
+				if (!eID) {
+					eID = "";
+				}
+				if (strcmp(sID, eID)) {
+					cout << "ERROR(NESTING): improper nesting " << currentOsisID << ": matching (sID,eID) not found. Looking at (" << sID << "," << eID << ")" << endl;
+				}
+
+
+				// Output the quotation mark if appropriate, inside the WOC.
+				// If there is no marker attribute, let the SWORD engine manufacture one.
+				// If there is a marker attribute and it has content, then output that.
+				// If the marker attribute is present and empty, then there is nothing to do.
+				// And have it within the WOC markup
+				if (!token.getAttribute("marker") || token.getAttribute("marker")[0]) {
+					token.setAttribute("who", 0); // remove the who="Jesus"
+					text.append(token);
+				}
+
+				// Now close the WOC
+				text.append("</q>");
+				return true;
+			}
+			return false;
+		}
+
+		// Look for the end of document, book and chapter
+		// Also for material that goes with last entry
+		if (!inVerse && !inBookIntro && !inChapterIntro) {
+			// Is this the end of a chapter.
+			if ((tokenName == "chapter") ||
+			    (tokenName == "div" && eidAttr == sidChapter)
+			) {
+				text.append(token);
+				writeEntry(text);
+				inChapter    = false;
+				sidChapter   = "";
+				chapterDepth = 0;
+				verseDepth   = 0;
+				return true;
+			}
+
+			// Is it the end of a book
+			if (tokenName == "div" && eidAttr == sidBook) {
+				text.append(token);
+				writeEntry(text);
+				bookDepth    = 0;
+				chapterDepth = 0;
+				verseDepth   = 0;
+				return true;
+			}
+
+			// Do not include the end of an osis document
+			if (tokenName == "osisText" || tokenName == "osis") {
+				bookDepth    = 0;
+				chapterDepth = 0;
+				verseDepth   = 0;
+				text         = "";
+				return true;
+			}
+
+			// When we are not inPreVerse, the interverse tags get appended to the preceeding verse.
+			if (!inPreVerse) {
+				text.append(token);
+				writeEntry(text);
+
+				if (debug & DEBUG_INTERVERSE) {
+					cout << "DEBUG(INTERVERSE): " << currentOsisID << ": appending interverse end tag: " << tokenName << "(" << tagDepth << "," << chapterDepth << "," << bookDepth << ")" << endl;
+				}
+
+				return true;
+			}
+
+			if (debug & DEBUG_INTERVERSE) {
+				cout << "DEBUG(INTERVERSE): " << currentOsisID << ": interverse end tag: " << tokenName << "(" << tagDepth << "," << chapterDepth << "," << bookDepth << ")" << endl;
+			}
+
+			return false;
+		}
+
+		return false;
+	} // done with Processing end tags
+
+	return false;
+}
+
+/**
+ * Support normalizations necessary for a SWORD module.
+ * OSIS allows for document structure (Book, Section, Paragraph or BSP)
+ * to overlap Bible versification (Book, Chapter, Verse).
+ * Most SWORD applications need to display verses in isolation or in HTML table cells,
+ * requiring each stored entry (i.e. verses) to be well-formed xml.
+ * This routine normalizes container elements which could cross verse boundaries into milestones.
+ * For most of these OSIS elements, there is a milestone form. However, p is not milestoneable.
+ * For this reason, p is transformed into lb elements.
+ * param t the tag to transform
+ * return the transformed tag or the original one
+ */
+XMLTag transformBSP(XMLTag t) {
+	static std::stack<XMLTag> bspTagStack;
+	static int sID = 1;
+	char buf[11];
+
+	// Support simplification transformations
+	if (t.isEmpty()) {
+
+		if (debug & DEBUG_XFORM) {
+			cout << "DEBUG(XFORM): " << currentOsisID << ": xform empty " << t << endl;
+		}
+
+		return t;
+	}
+
+	SWBuf tagName = t.getName();
+	if (!t.isEndTag()) {
+		// Transform <p> into <div type="paragraph"> and milestone it
+		if (tagName == "p") {
+			t.setText("<div type=\"paragraph\" />");
+			sprintf(buf, "gen%d", sID++);
+			t.setAttribute("sID", buf);
+		}
+
+		// Transform <tag> into <tag  sID="">, where tag is a milestoneable element.
+		// The following containers are milestoneable.
+		// abbr, closer, div, foreign, l, lg, salute, signed, speech
+		// Leaving out:
+		//   abbr	When would this ever cross a boundary?
+		//   seg	as it is used for a divineName hack
+		//   foreign	so that it can be easily italicized
+		else if (tagName == "chapter" ||
+			 tagName == "closer"  ||
+			 tagName == "div"     ||
+			 tagName == "l"       ||
+			 tagName == "lg"      ||
+			 tagName == "q"       ||
+			 tagName == "salute"  ||
+			 tagName == "signed"  ||
+			 tagName == "speech"  ||
+			 tagName == "verse"
+		) {
+			t.setEmpty(true);
+			sprintf(buf, "gen%d", sID++);
+			t.setAttribute("sID", buf);
+		}
+		bspTagStack.push(t);
+
+		if (debug & DEBUG_XFORM) {
+			cout << "DEBUG(XFORM): " << currentOsisID << ": xform push (" << bspTagStack.size() << ") " << t << " (tagname=" << tagName << ")" << endl;
+			XMLTag topToken = bspTagStack.top();
+			cout << "DEBUG(XFORM): " << currentOsisID << ": xform top(" << bspTagStack.size() << ") " << topToken << endl;
+		}
+	}
+	else {
+		if (!bspTagStack.empty()) {
+			XMLTag topToken = bspTagStack.top();
+
+			if (debug & DEBUG_XFORM) {
+				cout << "DEBUG(XFORM): " << currentOsisID << ": xform pop(" << bspTagStack.size() << ") " << topToken << endl;
+			}
+
+			bspTagStack.pop();
+
+			// Look for the milestoneable container tags handled above.
+			if (tagName == "chapter" ||
+			    tagName == "closer"  ||
+			    tagName == "div"     ||
+			    tagName == "l"       ||
+			    tagName == "lg"      ||
+			    tagName == "p"       ||
+			    tagName == "q"       ||
+			    tagName == "salute"  ||
+			    tagName == "signed"  ||
+			    tagName == "speech"  ||
+			    tagName == "verse"
+			) {
+				// make this a clone of the start tag with sID changed to eID
+				// Note: in the case of </p> the topToken is a <div type="paragraph">
+				t = topToken;
+				t.setAttribute("eID", t.getAttribute("sID"));
+				t.setAttribute("sID", 0);
+			}
+		}
+		else {
+			cout << "FATAL(TAGSTACK): " << currentOsisID << ": closing tag without opening tag" << endl;
+		}
+	}
+
+	return t;
+}
+
+/**
+ * Write out all links in the module.
+ * Waiting is necessary because writeEntry might ultimately append
+ * text to a verse moving it's offset in the data file.
+ * While we are minimizing it by postponing the write until we have
+ * gathered the next verse, the following scenario is happening:
+ * A module is using linked verses and has some verses that are not
+ * in the chosen versification. If the out-of-canon verse happens following
+ * a linked verse, the out-of-canon verse is appended to the prior
+ * verse. Care has to be taken that the linked verses all point to
+ * the first of the set.
+ */
+void writeLinks()
+{
+	// Link all the verses
+	VerseKey destKey;
+	destKey.setVersificationSystem(currentVerse.getVersificationSystem());
+	destKey.setAutoNormalize(0);
+	destKey.setIntros(1);
+
+	VerseKey linkKey;
+	linkKey.setVersificationSystem(currentVerse.getVersificationSystem());
+	linkKey.setAutoNormalize(0);
+	linkKey.setIntros(1);
+	for (unsigned int i = 0; i < linkedVerses.size(); i++) {
+		// The verseKeys is a list of verses
+		// where the first is the real verse
+		// and the others link to it.
+		ListKey verseKeys = linkedVerses[i];
+		verseKeys.setPosition(TOP);
+		destKey = verseKeys.getElement();
+		verseKeys.increment(1);
+
+		while (!verseKeys.popError()) {
+			linkKey = verseKeys.getElement();
+			verseKeys.increment(1);
+			linkToEntry(linkKey, destKey);
+		}
+	}
+}
+
+void usage(const char *app, const char *error = 0) {
+
+	if (error) fprintf(stderr, "\n%s: %s\n", app, error);
+
+	fprintf(stderr, "OSIS Bible/commentary module creation tool for The SWORD Project\n");
+	fprintf(stderr, "\nusage: %s <output/path> <osisDoc> [OPTIONS]\n", app);
+	fprintf(stderr, "  <output/path>\t\t an existing folder that the module will be written\n");
+	fprintf(stderr, "  <osisDoc>\t\t path to the validated OSIS document, or '-' to\n");
+	fprintf(stderr, "\t\t\t\t read from standard input\n");
+	fprintf(stderr, "  -a\t\t\t augment module if exists (default is to create new)\n");
+	fprintf(stderr, "  -z\t\t\t use ZIP compression (default no compression)\n");
+	fprintf(stderr, "  -Z\t\t\t use LZSS compression (default no compression)\n");
+	fprintf(stderr, "  -b <2|3|4>\t\t compression block size (default 4):\n");
+	fprintf(stderr, "\t\t\t\t 2 - verse; 3 - chapter; 4 - book\n");
+	fprintf(stderr, "  -c <cipher_key>\t encipher module using supplied key\n");
+	fprintf(stderr, "\t\t\t\t (default no enciphering)\n");
+	fprintf(stderr, "  -N\t\t\t do not convert UTF-8 or normalize UTF-8 to NFC\n");
+	fprintf(stderr, "\t\t\t\t (default is to convert to UTF-8, if needed,\n");
+	fprintf(stderr, "\t\t\t\t  and then normalize to NFC)\n");
+	fprintf(stderr, "\t\t\t\t Note: UTF-8 texts should be normalized to NFC.\n");
+	fprintf(stderr, "  -s <2|4>\t\t bytes used to store entry size (default is 2).\n");
+	fprintf(stderr, "\t\t\t\t Note: useful for commentaries with very large\n");
+	fprintf(stderr, "\t\t\t\t entries in uncompressed modules\n");
+	fprintf(stderr, "\t\t\t\t (2 bytes to store size equal 65535 characters)\n");
+	fprintf(stderr, "  -v <v11n>\t\t specify a versification scheme to use (default is KJV)\n");
+	fprintf(stderr, "\t\t\t\t Note: The following are valid values for v11n:\n");
+	VersificationMgr *vmgr = VersificationMgr::getSystemVersificationMgr();
+	StringList av11n = vmgr->getVersificationSystems();
+	for (StringList::iterator loop = av11n.begin(); loop != av11n.end(); loop++) {
+		fprintf(stderr, "\t\t\t\t\t%s\n", (*loop).c_str());
+	}
+	fprintf(stderr, "  -d <flags>\t\t turn on debugging (default is 0)\n");
+	fprintf(stderr, "\t\t\t\t Note: This flag may change in the future.\n");
+	fprintf(stderr, "\t\t\t\t Flags: The following are valid values:\n");
+	fprintf(stderr, "\t\t\t\t\t0   - no debugging\n");
+	fprintf(stderr, "\t\t\t\t\t1   - writes to module, very verbose\n");
+	fprintf(stderr, "\t\t\t\t\t2   - verse start and end\n");
+	fprintf(stderr, "\t\t\t\t\t4   - quotes, esp. Words of Christ\n");
+	fprintf(stderr, "\t\t\t\t\t8   - titles\n");
+	fprintf(stderr, "\t\t\t\t\t16  - inter-verse material\n");
+	fprintf(stderr, "\t\t\t\t\t32  - BSP to BCV transformations\n");
+	fprintf(stderr, "\t\t\t\t\t64  - v11n exceptions\n");
+	fprintf(stderr, "\t\t\t\t\t128 - parsing of osisID and osisRef\n");
+	fprintf(stderr, "\t\t\t\t\t256 - internal stack\n");
+	fprintf(stderr, "\t\t\t\t\t512 - miscellaneous\n");
+	fprintf(stderr, "\t\t\t\t This argument can be used more than once. (Or\n");
+	fprintf(stderr, "\t\t\t\t the flags may be added together.)\n");
+	fprintf(stderr, "\n");
+	fprintf(stderr, "See http://www.crosswire.org/wiki/osis2mod for more details.\n");
+	fprintf(stderr, "\n");
+	exit(EXIT_BAD_ARG);
+}
+
+void processOSIS(istream& infile) {
+	typedef enum {
+		CS_NOT_IN_COMMENT,		// or seen starting "<"
+		CS_SEEN_STARTING_EXCLAMATION,
+		CS_SEEN_STARTING_HYPHEN,
+		CS_IN_COMMENT,
+		CS_SEEN_ENDING_HYPHEN,
+		CS_SEEN_SECOND_ENDING_HYPHEN,
+		CS_SEEN_ENDING_GREATER_THAN
+	} t_commentstate;
+
+	activeOsisID[0] = '\0';
+
+	strcpy(currentOsisID,"N/A");
+
+	currentVerse.setVersificationSystem(v11n);
+	currentVerse.setAutoNormalize(false);
+	currentVerse.setIntros(true);	// turn on mod/testmnt/book/chap headings
+	currentVerse.setPersist(true);
+
+	module->setKey(currentVerse);
+	module->setPosition(TOP);
+
+	SWBuf token;
+	SWBuf text;
+	bool incomment = false;
+	t_commentstate commentstate = CS_NOT_IN_COMMENT;
+	bool intoken = false;
+	bool inWhitespace = false;
+	bool seeingSpace = false;
+	unsigned char curChar = '\0';
+
+	while (infile.good()) {
+
+		int possibleChar = infile.get();
+
+		// skip the character if it is bad. infile.good() will catch the problem
+		if (possibleChar == -1) {
+			continue;
+		}
+
+		curChar = (unsigned char) possibleChar;
+
+		// All newlines are simply whitespace
+		// Does a SWORD module actually require this?
+		if (curChar == '\n') {
+			curChar = ' ';
+		}
+
+		if (!intoken && curChar == '<') {
+			intoken = true;
+			token = "<";
+			continue;
+		}
+
+		// Handle XML comments starting with "<!--", ending with "-->"
+
+		if (intoken && !incomment) {
+			switch (commentstate) {
+				case CS_NOT_IN_COMMENT :
+					if (curChar == '!') {
+						commentstate = CS_SEEN_STARTING_EXCLAMATION;
+						token.append((char) curChar);
+						continue;
+					} else {
+						break;
+					}
+
+				case CS_SEEN_STARTING_EXCLAMATION :
+					if (curChar == '-') {
+						commentstate = CS_SEEN_STARTING_HYPHEN;
+						token.append((char) curChar);
+						continue;
+					} else {
+						commentstate = CS_NOT_IN_COMMENT;
+						break;
+					}
+
+				case CS_SEEN_STARTING_HYPHEN :
+					if (curChar == '-') {
+						incomment = true;
+						commentstate = CS_IN_COMMENT;
+						token.append((char) curChar);
+
+						if (debug & DEBUG_OTHER) {
+							cout << "DEBUG(COMMENTS): in comment" << endl;
+						}
+
+						continue;
+					} else {
+						commentstate = CS_NOT_IN_COMMENT;
+						break;
+					}
+
+				default:
+					cout << "FATAL(COMMENTS): unknown commentstate on comment start: " << commentstate << endl;
+					exit(EXIT_BAD_NESTING);
+			}
+		}
+
+		if (incomment) {
+			switch (commentstate) {
+				case CS_IN_COMMENT:
+					if (curChar == '-') {
+						commentstate = CS_SEEN_ENDING_HYPHEN;
+						continue;
+					} else {
+						// ignore the character
+						continue;
+					}
+
+				case CS_SEEN_ENDING_HYPHEN :
+					if (curChar == '-') {
+						commentstate = CS_SEEN_SECOND_ENDING_HYPHEN;
+						continue;
+					} else {
+						// ignore character
+						commentstate = CS_IN_COMMENT;
+						continue;
+					}
+
+				case CS_SEEN_SECOND_ENDING_HYPHEN :
+					if (curChar == '>') {
+						intoken = false;
+						incomment = false;
+						commentstate = CS_NOT_IN_COMMENT;
+
+						if (debug & DEBUG_OTHER) {
+							cout << "DEBUG(COMMENTS): out of comment" << endl;
+						}
+
+						continue;
+					} else {
+						// ignore character
+						commentstate = CS_IN_COMMENT;
+						continue;
+					}
+
+				default:
+					cout << "FATAL(COMMENTS): unknown commentstate on comment end: " << commentstate << endl;
+					exit(EXIT_BAD_NESTING);
+			}
+		}
+
+		// Outside of tokens merge adjacent whitespace
+		if (!intoken) {
+			seeingSpace = isspace(curChar)!=0;
+			if (seeingSpace) {
+				if (inWhitespace) {
+					continue;
+				}
+				// convert all whitespace to blanks
+				curChar = ' ';
+			}
+			inWhitespace = seeingSpace;
+		}
+
+		if (intoken && curChar == '>') {
+			intoken = false;
+			inWhitespace = false;
+			token.append('>');
+			// take this isalpha if out to check for bugs in text
+			if (isalpha(token[1]) ||
+			    (((token[1] == '/') || (token[1] == '?')) && isalpha(token[2]))) {
+				//cout << "Handle:" << token.c_str() << endl;
+				XMLTag t = transformBSP(token.c_str());
+
+				if (!handleToken(text, t)) {
+					text.append(t);
+				}
+			} else {
+				cout << "WARNING(PARSE): malformed token: " << token << endl;
+			}
+			continue;
+		}
+
+		if (intoken) {
+			token.append((char) curChar);
+		}
+		else {
+			switch (curChar) {
+				case '>' : text.append("&gt;"); break;
+				case '<' : text.append("&lt;"); break;
+				default  : text.append((char) curChar); break;
+			}
+		}
+	}
+
+	// Force the last entry from the text buffer.
+	text = "";
+	writeEntry(text, true);
+	writeLinks();
+
+#ifdef _ICU_
+	if (converted)  fprintf(stderr, "osis2mod converted %d verses to UTF-8\n", converted);
+	if (normalized) fprintf(stderr, "osis2mod normalized %d verses to NFC\n", normalized);
+#endif
+}
+
+int main(int argc, char **argv) {
+
+	fprintf(stderr, "You are running osis2mod: $Rev: 2893 $\n");
+
+	// Let's test our command line arguments
+	if (argc < 3) {
+		usage(*argv);
+	}
+
+	// variables for arguments, holding defaults
+	const char* program    = argv[0];
+	const char* path       = argv[1];
+	const char* osisDoc    = argv[2];
+	int append             = 0;
+	SWBuf compType         = "";
+	bool isCommentary      = false;
+	int iType              = 4;
+	int entrySize          = 0;
+	SWBuf cipherKey        = "";
+	SWCompress *compressor = 0;
+
+	for (int i = 3; i < argc; i++) {
+		if (!strcmp(argv[i], "-a")) {
+			append = 1;
+		}
+		else if (!strcmp(argv[i], "-z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (entrySize) usage(*argv, "Cannot specify both -z and -s");
+			compType = "ZIP";
+		}
+		else if (!strcmp(argv[i], "-Z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (entrySize) usage(*argv, "Cannot specify both -Z and -s");
+			compType = "LZSS";
+		}
+		else if (!strcmp(argv[i], "-b")) {
+			if (i+1 < argc) {
+				iType = atoi(argv[++i]);
+				if ((iType >= 2) && (iType <= 4)) continue;
+			}
+			usage(*argv, "-b requires one of <2|3|4>");
+		}
+		else if (!strcmp(argv[i], "-N")) {
+			normalize = false;
+		}
+		else if (!strcmp(argv[i], "-c")) {
+			if (i+1 < argc) cipherKey = argv[++i];
+			else usage(*argv, "-c requires <cipher_key>");
+		}
+		else if (!strcmp(argv[i], "-v")) {
+			if (i+1 < argc) v11n = argv[++i];
+			else usage(*argv, "-v requires <v11n>");
+		}
+		else if (!strcmp(argv[i], "-s")) {
+			if (compType.size()) usage(*argv, "Cannot specify -s and -z or -Z");
+			if (i+1 < argc) {
+				entrySize = atoi(argv[++i]);
+				if (entrySize == 2 || entrySize == 4) {
+					continue;
+				}
+			}
+			usage(*argv, "-s requires one of <2|4>");
+		}
+		else if (!strcmp(argv[i], "-C")) {
+			isCommentary = true;
+		}
+		else if (!strcmp(argv[i], "-d")) {
+			if (i+1 < argc) debug |= atoi(argv[++i]);
+			else usage(*argv, "-d requires <flags>");
+		}
+		else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
+	}
+
+	if (isCommentary) isCommentary = true;	// avoid unused warning for now
+
+	if (compType == "ZIP") {
+#ifndef EXCLUDEZLIB
+		compressor = new ZipCompress();
+#else
+		usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library");
+#endif
+	}
+	else if (compType == "LZSS") {
+		compressor = new LZSSCompress();
+	}
+
+#ifndef _ICU_
+	if (normalize) {
+		normalize = false;
+		cout << "WARNING(UTF8): " << program << " is not compiled with support for ICU. Assuming -N." << endl;
+	}
+#endif
+
+	if (debug & DEBUG_OTHER) {
+		cout << "DEBUG(ARGS):\n\tpath: " << path << "\n\tosisDoc: " << osisDoc << "\n\tcreate: " << append << "\n\tcompressType: " << compType << "\n\tblockType: " << iType << "\n\tcipherKey: " << cipherKey.c_str() << "\n\tnormalize: " << normalize << endl;
+	}
+
+	if (!append) {	// == 0 then create module
+	// Try to initialize a default set of datafiles and indicies at our
+	// datapath location passed to us from the user.
+		if (compressor) {
+			if (zText::createModule(path, iType, v11n)) {
+				fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", program, path);
+				exit(EXIT_NO_CREATE);
+			}
+		}
+		else if (entrySize == 4) {
+			if (RawText4::createModule(path, v11n)) {
+				fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", program, path);
+				exit(EXIT_NO_CREATE);
+			}
+		}
+		else {
+			if (RawText::createModule(path, v11n)) {
+				fprintf(stderr, "ERROR: %s: couldn't create module at path: %s \n", program, path);
+				exit(EXIT_NO_CREATE);
+			}
+		}
+	}
+
+	// Do some initialization stuff
+	if (compressor) {
+		// Create a compressed text module allowing very large entries
+		// Taking defaults except for first, fourth, fifth and last argument
+		module = new zText(
+				path,		// ipath
+				0,		// iname
+				0,		// idesc
+				iType,		// iblockType
+				compressor,	// icomp
+				0,		// idisp
+				ENC_UNKNOWN,	// enc
+				DIRECTION_LTR,	// dir
+				FMT_UNKNOWN,	// markup
+				0,		// lang
+				v11n		// versification
+		       );
+	}
+	else if (entrySize == 4) {
+		// Create a raw text module allowing very large entries
+		// Taking defaults except for first and last argument
+		module = new RawText4(
+				path,		// ipath
+				0,		// iname
+				0,		// idesc
+				0,		// idisp
+				ENC_UNKNOWN,	// encoding
+				DIRECTION_LTR,	// dir
+				FMT_UNKNOWN,	// markup
+				0,		// ilang
+				v11n		// versification
+			);
+	}
+	else {
+		// Create a raw text module allowing reasonable sized entries
+		// Taking defaults except for first and last argument
+		module = new RawText(
+				path,		// ipath
+				0,		// iname
+				0,		// idesc
+				0,		// idisp
+				ENC_UNKNOWN,	// encoding
+				DIRECTION_LTR,	// dir
+				FMT_UNKNOWN,	// markup
+				0,		// ilang
+				v11n		// versification
+			);
+	}
+
+	SWFilter *cipherFilter = 0;
+
+	if (cipherKey.length()) {
+		fprintf(stderr, "Adding cipher filter with phrase: %s\n", cipherKey.c_str() );
+		cipherFilter = new CipherFilter(cipherKey.c_str());
+		module->addRawFilter(cipherFilter);
+	}
+
+	if (!module->isWritable()) {
+		fprintf(stderr, "The module is not writable. Writing text to it will not work.\nExiting.\n" );
+		exit(EXIT_NO_WRITE);
+	}
+
+	// Either read from std::cin (aka stdin), when the argument is a '-'
+	// or from a specified file.
+	if (!strcmp(osisDoc, "-")) {
+		processOSIS(cin);
+	}
+	else {
+		// Let's see if we can open our input file
+		ifstream infile(osisDoc);
+		if (infile.fail()) {
+			fprintf(stderr, "ERROR: %s: couldn't open input file: %s \n", program, osisDoc);
+			exit(EXIT_NO_READ);
+		}
+		processOSIS(infile);
+		infile.close();
+	}
+
+	delete module;
+	if (cipherFilter)
+		delete cipherFilter;
+
+	fprintf(stderr, "SUCCESS: %s: has finished its work and will now rest\n", program);
+	exit(0); // success
+}
+
diff --git a/utilities/perl/Makefile.am b/utilities/perl/Makefile.am
new file mode 100644
index 0000000..d9c9556
--- /dev/null
+++ b/utilities/perl/Makefile.am
@@ -0,0 +1,6 @@
+swperlutildir = $(top_srcdir)/utilities/perl
+
+EXTRA_DIST += $(swperlutildir)/cipherkeygen.pl 
+EXTRA_DIST += $(swperlutildir)/linkvers.pl
+EXTRA_DIST += $(swperlutildir)/localecap.pl
+EXTRA_DIST += $(swperlutildir)/mkvsmod.pl
diff --git a/utilities/perl/cipherkeygen.pl b/utilities/perl/cipherkeygen.pl
new file mode 100755
index 0000000..84d756c
--- /dev/null
+++ b/utilities/perl/cipherkeygen.pl
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+
+#******************************************************************************
+#
+#  cipherkeygen.pl -	generates a cipher key of the format
+#			\d{4}[a-zA-Z]{4}\d{4}[a-zA-Z]{4}
+#
+# $Id: cipherkeygen.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2001-2013 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+
+# let's get a base key of \d{4}[A-Z]{4}\d{4}[A-Z]{4}
+$key = int(rand() * 10) . int(rand() * 10) . int(rand() * 10) . int(rand() * 10) . chr(int(rand() * 26) + 0x41) . chr(int(rand() * 26) + 0x41) . chr(int(rand() * 26) + 0x41) . chr(int(rand() * 26) + 0x41) . int(rand() * 10) . int(rand() * 10) . int(rand() * 10) . int(rand() * 10) . chr(int(rand() * 26) + 0x41) . chr(int(rand() * 26) + 0x41) . chr(int(rand() * 26) + 0x41) . chr(int(rand() * 26) + 0x41);
+
+# now randomly lowercase the letters, printing as we go
+foreach $c (unpack ("cccccccccccccccc", $key)) {
+    $c = chr($c);
+    if (rand() < 0.5) {
+	$c = lc($c);
+    }
+    print $c;
+}
+print "\n";
+
+
+
diff --git a/utilities/perl/linkvers.pl b/utilities/perl/linkvers.pl
new file mode 100755
index 0000000..529c89d
--- /dev/null
+++ b/utilities/perl/linkvers.pl
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+
+#******************************************************************************
+#
+#  linkvers.pl -	
+#
+# $Id: linkvers.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2001-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+$vplfile = $ARGV[0];
+
+if ($vplfile eq "") {
+    die("linkvers.pl Syntax:\n./linkvers.pl <vpl file> [1 - checking mode on].\nMust be run AFTER vpl2mod is completed.\n");
+}
+
+$check = $ARGV[1];
+
+open(INF,$vplfile) or die;
+while (<INF>) {
+    $line = $_;
+
+    $line =~ /([\w ]+:[\d\-]+)\s+(.*)/;
+    $vref = $1;
+
+    if ($vref =~ /\-/) {
+	$vref =~ /(.*:)(\d+)\-(\d+)/;
+	$ch = $1;
+	$fv = $2;
+	$lv = $3;
+	if ($fv + 1 == $lv) {
+	    $sv = $lv;
+	}
+	else {
+	    $sv = $fv + 1;
+	    $sv .= "-" . $lv;
+	}
+	$first = $ch . $fv;
+	$last = $ch . $sv;
+
+	if ($check ne "") {
+	    print "$first\t\t$last\n";
+	} else {
+	    `addvs -l ./ \"$first\" \"$last\"`;
+	}
+    }
+}
+close(INF);
+
+
+
+
diff --git a/utilities/perl/localecap.pl b/utilities/perl/localecap.pl
new file mode 100755
index 0000000..cf7d250
--- /dev/null
+++ b/utilities/perl/localecap.pl
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+#******************************************************************************
+#
+#  localecap.pl -	This tool is only for locales in Latin-1, not UTF-8
+#
+# $Id: localecap.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2001-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+
+use locale;
+
+$abbrevs = 0;
+
+open (INPUT, "$ARGV[0]") or print "Give the locale file as an argument.\n";
+@loc = <INPUT>;
+close (INPUT);
+open (OUTPUT, ">$ARGV[0]");
+foreach $line (@loc) {
+
+    if ($line =~ /\[Book Abbrevs\]/) {
+	$abbrevs = 1;
+    }
+    elsif ($abbrevs == 1) {
+	$line = uc($line);
+    }
+    print OUTPUT $line;
+}
+close (OUTPUT);
diff --git a/utilities/perl/mkvsmod.pl b/utilities/perl/mkvsmod.pl
new file mode 100755
index 0000000..fa0fd29
--- /dev/null
+++ b/utilities/perl/mkvsmod.pl
@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+#******************************************************************************
+#
+#  mkvsmod.pl -	
+#
+# $Id: mkvsmod.pl 2841 2013-06-29 10:58:08Z chrislit $
+#
+# Copyright 2001-2009 CrossWire Bible Society (http://www.crosswire.org)
+#	CrossWire Bible Society
+#	P. O. Box 2528
+#	Tempe, AZ  85280-2528
+#
+# 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 version 2.
+#
+# 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.
+#
+
+open (INF, $ARGV[0]);
+
+`addvs -c ./`;
+while (<INF>) {
+    
+    $line = $_;
+    $line =~ s/[\r\n]//g;
+    $line =~ /(.+\d+:\d+:?) +(.*)/;
+    $ref = $1;
+    $ver = $2;
+    open (BUF, ">buffer");
+    print BUF "$ver";
+    close (BUF);
+    $x = `addvs -a ./ \"$ref\" buffer`;
+    print "$ref\n";
+
+}
+
+close (INF);
diff --git a/utilities/step2vpl.cpp b/utilities/step2vpl.cpp
new file mode 100644
index 0000000..bb37590
--- /dev/null
+++ b/utilities/step2vpl.cpp
@@ -0,0 +1,580 @@
+/******************************************************************************
+ *
+ *  step2vpl.cpp -	Utility to export a STEP module as VPL
+ *
+ * $Id: step2vpl.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <lzsscomprs.h>
+
+using namespace std;
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+long SECTIONSLEVELSTART = 38;
+long SECTIONSLEVELSIZE = 29;
+
+long VIEWABLEBLOCKSTART = 0;
+long VIEWABLEBLOCKSIZE = 0;
+
+typedef struct {
+	short versionRecordSize;
+	short publisherID;
+	short bookID;
+	short setID;
+	char conversionProgramVerMajor;
+	char conversionProgramVerMinor;
+	char leastCompatSTEPVerMajor;
+	char leastCompatSTEPVerMinor;
+	char encryptionType;
+	char editionID;
+	short modifiedBy;
+} Version;
+
+typedef struct {
+	short sectionsHeaderRecordSize;
+	long levelEntriesCount; // this is listed as nonGlossBlocksCount in spec!
+	long glossEntriesCount;
+	short levelEntriesSize;
+	long reserved;
+} SectionsHeader;
+
+typedef struct {
+	short viewableHeaderRecordSize;
+	long viewableBlocksCount; // this is listed as nonGlossBlocksCount in spec!
+	long glossBlocksCount;
+	char compressionType; // 0 - none; 1 - LZSS
+	char reserved1;
+	short blockEntriesSize;
+	short reserved2;
+} ViewableHeader;
+
+typedef struct {
+	short vSyncHeaderRecordSize;
+	short startBookNumber;
+	short endBookNumber;
+	short bookPointerEntriesSize;
+	short syncPointEntriesSize;
+	long reserved1_1;
+	short reserved1_2;
+} VSyncHeader;
+
+typedef struct {
+	long offset;
+	long uncompressedSize;
+	long size;
+} ViewableBlock;
+		
+typedef struct {
+	long offset;	// offset into VSYNC.IDX to first VSyncPoint
+	short count;	// number of VSyncPoints for this book
+} VSyncBooksInfo;
+		
+typedef struct {
+	short chapter;
+	short verse;
+	long offset;	// offset into SECTIONS.IDX
+} VSyncPoint;
+
+typedef struct {
+	long parentOffset; // many of these are 0 if glossary
+	long previousOffset; 
+	long nextOffset;
+	long viewableOffset;
+	short startLevel;
+	char level;
+	long nameOffset;
+	long outSync_1;
+	short outSync_2;
+} SectionLevelInfo;
+
+void readVersion(int fd, Version *versionRecord);
+void readHeaderControlWordAreaText(int fd, char **buf);
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord);
+void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord);
+void readVSyncBooksInfo(int fd, VSyncHeader *, VSyncBooksInfo **vSyncBooksInfo);
+void readViewableBlock(int fd, ViewableBlock *vb);
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf);
+void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord);
+void readSectionLevelInfo(int fd, SectionLevelInfo *sli);
+void readSectionName(int fd, SectionLevelInfo *sli, char **name);
+void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo);
+void extractVerseText(int fdviewable, int fdbook, SectionLevelInfo *sectionLevelInfo, char **verseText);
+void cleanBuf(char *buf);
+
+SWCompress *compress = 0;
+
+int main(int argc, char **argv) {
+
+	compress = new LZSSCompress();
+	char *buf;
+	Version versionRecord;
+	VSyncHeader vSyncHeaderRecord;
+	VSyncBooksInfo *vSyncBooksInfo;
+	SectionsHeader sectionsHeaderRecord;
+	ViewableHeader viewableHeaderRecord;
+	
+
+	if (argc < 2) {
+		cerr << "usage: "<< *argv << " <database to step module>\n";
+		exit (-1);
+	}
+
+	string bookpath = argv[1];
+	string fileName;
+
+	if ((argv[1][strlen(argv[1])-1] != '/') &&
+		(argv[1][strlen(argv[1])-1] != '\\'))
+		bookpath += "/";
+
+	fileName = bookpath + "Book.dat";
+	int fdbook = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdbook < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-2);
+	}
+
+	readVersion(fdbook, &versionRecord);
+	readHeaderControlWordAreaText(fdbook, &buf);
+	delete [] buf;
+
+
+	fileName = bookpath + "Viewable.idx";
+	int fdviewable = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdviewable < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-3);
+	}
+
+	readVersion(fdviewable, &versionRecord);
+	readViewableHeader(fdviewable, &viewableHeaderRecord);
+
+	VIEWABLEBLOCKSTART = lseek(fdviewable, 0, SEEK_CUR);
+	VIEWABLEBLOCKSIZE = viewableHeaderRecord.blockEntriesSize;
+
+
+	fileName = bookpath + "Vsync.idx";
+	int fdvsync = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdvsync < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-4);
+	}
+
+	fileName = bookpath + "Sections.idx";
+	int fdsections = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdsections < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-4);
+	}
+	readVersion(fdsections, &versionRecord);
+	readSectionsHeader(fdsections, &sectionsHeaderRecord);
+	SECTIONSLEVELSTART = lseek(fdsections, 0, SEEK_CUR);
+	SECTIONSLEVELSIZE = sectionsHeaderRecord.levelEntriesSize;
+
+	readVersion(fdvsync, &versionRecord);
+	readVSyncHeader(fdvsync, &vSyncHeaderRecord);
+	readVSyncBooksInfo(fdvsync, &vSyncHeaderRecord, &vSyncBooksInfo);
+	int bookCount = vSyncHeaderRecord.endBookNumber - vSyncHeaderRecord.startBookNumber;
+	for (int i = 0; i <= bookCount; i++) {
+		displayBook(fdbook, fdviewable, fdvsync, fdsections, &vSyncBooksInfo[i]);
+	}
+		
+	close(fdviewable);
+	close(fdvsync);
+	close(fdsections);
+	close(fdbook);
+
+}
+
+
+
+void readVersion(int fd, Version *versionRecord) {
+	int r;
+
+	r = read(fd, &(versionRecord->versionRecordSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+
+	r = read(fd, &(versionRecord->publisherID), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->bookID), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->setID), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->encryptionType), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->editionID), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	r = read(fd, &(versionRecord->modifiedBy), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+
+	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		r = read(fd, skipbuf, skip);
+		if (r != skip)
+			perror("ERROR: read failed in readVersion");
+		delete [] skipbuf;
+	}
+}
+
+
+void readSectionsHeader(int fd, SectionsHeader *sectionsHeaderRecord) {
+	int r;
+
+	r = read(fd, &(sectionsHeaderRecord->sectionsHeaderRecordSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readSectionsHeader");
+	r = read(fd, &(sectionsHeaderRecord->levelEntriesCount), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionsHeader");
+	r = read(fd, &(sectionsHeaderRecord->glossEntriesCount), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionsHeader");
+	r = read(fd, &(sectionsHeaderRecord->levelEntriesSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readSectionsHeader");
+	r = read(fd, &(sectionsHeaderRecord->reserved), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionsHeader");
+
+	int skip = sectionsHeaderRecord->sectionsHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		r = read(fd, skipbuf, skip);
+		if (r != skip)
+			perror("ERROR: read failed in readSectionsHeader");
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
+	int r;
+
+	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readViewableHeader");
+	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableHeader");
+	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableHeader");
+	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readViewableHeader");
+	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readViewableHeader");
+	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readViewableHeader");
+	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readViewableHeader");
+
+	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		r = read(fd, skipbuf, skip);
+		if (r != skip)
+			perror("ERROR: read failed in readViewableHeader");
+		delete [] skipbuf;
+	}
+}
+
+
+void readVSyncHeader(int fd, VSyncHeader *vSyncHeaderRecord) {
+	int r;
+
+	r = read(fd, &(vSyncHeaderRecord->vSyncHeaderRecordSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVSyncHeader");
+	r = read(fd, &(vSyncHeaderRecord->startBookNumber), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVSyncHeader");
+	r = read(fd, &(vSyncHeaderRecord->endBookNumber), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVSyncHeader");
+	r = read(fd, &(vSyncHeaderRecord->bookPointerEntriesSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVSyncHeader");
+	r = read(fd, &(vSyncHeaderRecord->syncPointEntriesSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVSyncHeader");
+	r = read(fd, &(vSyncHeaderRecord->reserved1_1), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readVSyncHeader");
+	r = read(fd, &(vSyncHeaderRecord->reserved1_2), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVSyncHeader");
+
+	int skip = vSyncHeaderRecord->vSyncHeaderRecordSize - 16/*sizeof(VSyncHeader)*/;
+
+	if (skip) {
+		char *skipbuf = new char[skip];
+		r = read(fd, skipbuf, skip);
+		if (r != skip)
+			perror("ERROR: read failed in readVSyncHeader");
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
+	int r;
+	unsigned long size = vb->size;
+
+	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+	lseek(fd, vb->offset, SEEK_SET);
+	r = read(fd, *buf, vb->size);
+	if (r != vb->size)
+		perror("ERROR: read failed in readViewableBlockText");
+
+	compress->zBuf(&size, *buf);
+	strcpy(*buf, compress->Buf());
+}
+
+
+void readViewableBlock(int fd, ViewableBlock *vb) {
+	int r;
+
+	r = read(fd, &(vb->offset), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableBlock");
+	r = read(fd, &(vb->uncompressedSize), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableBlock");
+	r = read(fd, &(vb->size), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableBlock");
+}
+
+
+void readHeaderControlWordAreaText(int fd, char **buf) {
+	int r;
+	long headerControlWordAreaSize;
+	r = read(fd, &headerControlWordAreaSize, 4);
+	if (r != 4)
+		perror("ERROR: read failed in readHeaderControlWordAreaText");
+
+	*buf = new char [headerControlWordAreaSize + 1];
+
+	r = read(fd, *buf, headerControlWordAreaSize);
+	if (r != headerControlWordAreaSize)
+		perror("ERROR: read failed in readHeaderControlWordAreaText");
+	(*buf)[headerControlWordAreaSize] = 0;
+
+}
+
+void readVSyncBooksInfo(int fd, VSyncHeader *vSyncHeaderRecord, VSyncBooksInfo **vSyncBooksInfo) {
+
+	int r;
+	int bookCount = vSyncHeaderRecord->endBookNumber - vSyncHeaderRecord->startBookNumber;
+	*vSyncBooksInfo = new VSyncBooksInfo[bookCount];
+	for (int i = 0; i <= bookCount; i++) {
+		r = read(fd, &(*vSyncBooksInfo)[i].offset, 4);
+		if (r != 4)
+			perror("ERROR: read failed in readVSyncBooksInfo");
+		r = read(fd, &(*vSyncBooksInfo)[i].count, 2);
+		if (r != 2)
+			perror("ERROR: read failed in readVSyncBooksInfo");
+	}
+}
+
+void displayBook(int fdbook, int fdviewable, int fdvsync, int fdsections, VSyncBooksInfo *vSyncBooksInfo) {
+	int r;
+	VSyncPoint vSyncPoint;
+
+	lseek(fdvsync, vSyncBooksInfo->offset, SEEK_SET);
+
+	for (int i = 0; i < vSyncBooksInfo->count; i++) {
+
+		SectionLevelInfo sectionLevelInfo;
+		char *sectionName;
+		char *verseText;
+
+		r = read(fdvsync, &(vSyncPoint.chapter), 2);
+		if (r != 2)
+			perror("ERROR: read failed in displayBook");
+		r = read(fdvsync, &(vSyncPoint.verse), 2);
+		if (r != 2)
+			perror("ERROR: read failed in displayBook");
+		r = read(fdvsync, &(vSyncPoint.offset), 4);
+		if (r != 4)
+			perror("ERROR: read failed in displayBook");
+		vSyncPoint.offset = SECTIONSLEVELSTART + (vSyncPoint.offset * SECTIONSLEVELSIZE);
+		lseek(fdsections, vSyncPoint.offset, SEEK_SET);
+		readSectionLevelInfo(fdsections, &sectionLevelInfo);
+		readSectionName(fdsections, &sectionLevelInfo, &sectionName);
+		cout << sectionName << " ";
+		delete [] sectionName;
+		extractVerseText(fdviewable, fdbook, &sectionLevelInfo, &verseText);
+		cleanBuf(verseText);
+		cout << verseText << "\n";
+		delete [] verseText;
+	}
+}
+
+
+void extractVerseText(int fdviewable, int fdbook, SectionLevelInfo *sectionLevelInfo, char **verseText) {
+	char numberBuf[16];
+	string startToken;
+	ViewableBlock vb;
+	int len = 0;
+	static long lastEntryOffset = -1;
+	static class FreeCachedEntryText {
+	public:
+		char *entryText;
+		FreeCachedEntryText() { entryText = 0; }
+		~FreeCachedEntryText() { if (entryText) delete [] entryText; }
+	} _freeCachedEntryText;
+
+	if (sectionLevelInfo->viewableOffset != lastEntryOffset) {
+		if (_freeCachedEntryText.entryText)
+			delete [] _freeCachedEntryText.entryText;
+	
+		lseek(fdviewable, sectionLevelInfo->viewableOffset, SEEK_SET);
+		readViewableBlock(fdviewable, &vb);
+		readViewableBlockText(fdbook, &vb, &(_freeCachedEntryText.entryText));
+		lastEntryOffset = sectionLevelInfo->viewableOffset;
+	}
+	sprintf(numberBuf, "%d", sectionLevelInfo->startLevel);
+	startToken = "\\stepstartlevel";
+	startToken += numberBuf;
+	char *start = strstr(_freeCachedEntryText.entryText, startToken.c_str());
+	if (start) {
+		start += strlen(startToken.c_str());
+		char *end = strstr(start, "\\stepstartlevel");
+		if (end)
+			len = end - start;
+		else len = strlen(start);
+	}
+	*verseText = new char [ len + 1 ];
+	strncpy(*verseText, start, len);
+	(*verseText)[len] = 0;
+}
+
+
+void readSectionName(int fd, SectionLevelInfo *sli, char **name) {
+	int r;
+	short size;
+	lseek(fd, sli->nameOffset, SEEK_SET);
+	r = read(fd, &size, 2);
+	if (r != 2)
+		perror("ERROR: read failed in readSectionName");
+	*name = new char [ size + 1 ];
+	r = read(fd, *name, size);
+	if (r != size)
+		perror("ERROR: read failed in readSectionName");
+	(*name)[size] = 0;
+}
+
+void readSectionLevelInfo(int fd, SectionLevelInfo *sli) {
+	int r;
+
+	r = read(fd, &(sli->parentOffset), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	r = read(fd, &(sli->previousOffset), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	r = read(fd, &(sli->nextOffset), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	r = read(fd, &(sli->viewableOffset), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	sli->viewableOffset = VIEWABLEBLOCKSTART + (VIEWABLEBLOCKSIZE * sli->viewableOffset);
+	r = read(fd, &(sli->startLevel), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	r = read(fd, &(sli->level), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	r = read(fd, &(sli->nameOffset), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	r = read(fd, &(sli->outSync_1), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readSectionLevelInfo");
+	r = read(fd, &(sli->outSync_2), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readSectionLevelInfo");
+}
+
+void cleanBuf(char *buf) {
+	char *from = buf;
+	char *to = buf;
+
+	while (*from) {
+		if ((*from != 10) && (*from != 13)) {
+			*to++ = *from++;
+		}
+		else {
+			from++;
+		}
+	}
+	*to = 0;
+}
diff --git a/utilities/stepdump.cpp b/utilities/stepdump.cpp
new file mode 100644
index 0000000..97a4840
--- /dev/null
+++ b/utilities/stepdump.cpp
@@ -0,0 +1,337 @@
+/******************************************************************************
+ *
+ *  stepdump.cpp -	Utility to dump a STEP module
+ *
+ * $Id: stepdump.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+
+#include <iostream>
+#include <string>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <lzsscomprs.h>
+
+using namespace std;
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+typedef struct {
+	short versionRecordSize;
+	short publisherID;
+	short bookID;
+	short setID;
+	char conversionProgramVerMajor;
+	char conversionProgramVerMinor;
+	char leastCompatSTEPVerMajor;
+	char leastCompatSTEPVerMinor;
+	char encryptionType;
+	char editionID;
+	short modifiedBy;
+} Version;
+
+typedef struct {
+	short viewableHeaderRecordSize;
+	long viewableBlocksCount; // this is listed as nonGlossBlocksCount in spec!
+	long glossBlocksCount;
+	char compressionType; // 0 - none; 1 - LZSS
+	char reserved1;
+	short blockEntriesSize;
+	short reserved2;
+} ViewableHeader;
+
+typedef struct {
+	long offset;
+	long uncompressedSize;
+	long size;
+} ViewableBlock;
+		
+void readVersion(int fd, Version *versionRecord);
+void readHeaderControlWordAreaText(int fd, char **buf);
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord);
+void readViewableBlock(int fd, ViewableBlock *vb);
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf);
+
+SWCompress *compress = 0;
+
+int main(int argc, char **argv) {
+
+	compress = new LZSSCompress();
+	char *buf;
+	Version versionRecord;
+	ViewableHeader viewableHeaderRecord;
+
+	if (argc < 2) {
+		cerr << "usage: "<< *argv << " <database to step module>\n";
+		exit (-1);
+	}
+
+	string bookpath = argv[1];
+	string fileName;
+
+	if ((argv[1][strlen(argv[1])-1] != '/') &&
+		(argv[1][strlen(argv[1])-1] != '\\'))
+		bookpath += "/";
+
+	fileName = bookpath + "Book.dat";
+	int fd = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fd < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-2);
+	}
+
+	readVersion(fd, &versionRecord);
+	readHeaderControlWordAreaText(fd, &buf);
+	delete [] buf;
+
+
+	fileName = bookpath + "Viewable.idx";
+	int fdv = FileMgr::openFileReadOnly(fileName.c_str());
+
+	if (fdv < 1) {
+		cerr << "error, couldn't open file: " << fileName << "\n";
+		exit (-3);
+	}
+
+	readVersion(fdv, &versionRecord);
+	readViewableHeader(fdv, &viewableHeaderRecord);
+
+	ViewableBlock vb;
+
+	cout << "\n\nReading special preface viewable BLOCK 0";
+
+	readViewableBlock(fdv, &vb);
+	readViewableBlockText(fd, &vb, &buf);
+	delete [] buf;
+	
+	int nonGlossBlocksCount = viewableHeaderRecord.viewableBlocksCount
+					    - viewableHeaderRecord.glossBlocksCount;
+
+	cout << "\n\nReading " << nonGlossBlocksCount << " non-glossary viewable blocks";
+	// 1 because we already read the first block above
+	for (int i = 1; i < nonGlossBlocksCount; i++) {
+		cout << "\nNon-Glossary viewable block: " << i;
+		readViewableBlock(fdv, &vb);
+		readViewableBlockText(fd, &vb, &buf);
+		delete [] buf;
+	}
+
+	cout << "\n\nReading " << viewableHeaderRecord.glossBlocksCount << " glossary viewable blocks";
+	for (int i = 0; i < viewableHeaderRecord.glossBlocksCount; i++) {
+		cout << "\nGlossary viewable block: " << i;
+		readViewableBlock(fdv, &vb);
+		readViewableBlockText(fd, &vb, &buf);
+		delete [] buf;
+	}
+
+	close(fdv);
+	close(fd);
+
+}
+
+
+
+void readVersion(int fd, Version *versionRecord) {
+	int r;
+
+	cout << "\n\nReading Version Record (" << 16/*sizeof(struct Version)*/ << " bytes)\n\n";
+// DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+//	read(fd, &versionRecord, sizeof(struct Version));
+
+	cout << "Version Record Information\n";
+	r = read(fd, &(versionRecord->versionRecordSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tversionRecordSize: " << versionRecord->versionRecordSize << "\n";
+	r = read(fd, &(versionRecord->publisherID), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tpublisherID: " << versionRecord->publisherID << "\n";
+	r = read(fd, &(versionRecord->bookID), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tbookID: " << versionRecord->bookID << "\n";
+	r = read(fd, &(versionRecord->setID), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tsetID: " << versionRecord->setID << "\n";
+	r = read(fd, &(versionRecord->conversionProgramVerMajor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tconversionProgramVerMajor: " << (int)versionRecord->conversionProgramVerMajor << "\n";
+	r = read(fd, &(versionRecord->conversionProgramVerMinor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tconversionProgramVerMinor: " << (int)versionRecord->conversionProgramVerMinor << "\n";
+	r = read(fd, &(versionRecord->leastCompatSTEPVerMajor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tleastCompatSTEPVerMajor: " << (int)versionRecord->leastCompatSTEPVerMajor << "\n";
+	r = read(fd, &(versionRecord->leastCompatSTEPVerMinor), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tleastCompatSTEPVerMinor: " << (int)versionRecord->leastCompatSTEPVerMinor << "\n";
+	r = read(fd, &(versionRecord->encryptionType), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tencryptionType: " << (int)versionRecord->encryptionType << "\n";
+	r = read(fd, &(versionRecord->editionID), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readVersion");
+	cout << "\teditionID: " << (int)versionRecord->editionID << "\n";
+	r = read(fd, &(versionRecord->modifiedBy), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readVersion");
+	cout << "\tmodifiedBy: " << versionRecord->modifiedBy << "\n";
+
+	int skip = versionRecord->versionRecordSize - 16/*sizeof(struct Version*/;
+
+	if (skip) {
+		cout << "\nSkipping " << skip << " unknown bytes.\n";
+		char *skipbuf = new char[skip];
+		r = read(fd, skipbuf, skip);
+		if (r != skip)
+			perror("ERROR: read failed in readVersion");
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableHeader(int fd, ViewableHeader *viewableHeaderRecord) {
+	int r;
+	cout << "\n\nReading Viewable Header Record (" << 16/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+
+// DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+//	read(fd, &viewableHeaderRecord, sizeof(struct ViewableHeader));
+
+	cout << "Viewable Header Record Information\n";
+	r = read(fd, &(viewableHeaderRecord->viewableHeaderRecordSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readViewableHeader");
+	cout << "\tviewableHeaderRecordSize: " << viewableHeaderRecord->viewableHeaderRecordSize << "\n";
+	r = read(fd, &(viewableHeaderRecord->viewableBlocksCount), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableHeader");
+	cout << "\tviewableBlocksCount: " << viewableHeaderRecord->viewableBlocksCount << "\n";
+	r = read(fd, &(viewableHeaderRecord->glossBlocksCount), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableHeader");
+	cout << "\tglossBlocksCount: " << viewableHeaderRecord->glossBlocksCount << "\n";
+	r = read(fd, &(viewableHeaderRecord->compressionType), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readViewableHeader");
+	cout << "\tcompressionType: " << (int)viewableHeaderRecord->compressionType << "(0 - none; 1 - LZSS)\n";
+	r = read(fd, &(viewableHeaderRecord->reserved1), 1);
+	if (r != 1)
+		perror("ERROR: read failed in readViewableHeader");
+	cout << "\treserved1: " << (int)viewableHeaderRecord->reserved1 << "\n";
+	r = read(fd, &(viewableHeaderRecord->blockEntriesSize), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readViewableHeader");
+	cout << "\tblockEntriesSize: " << viewableHeaderRecord->blockEntriesSize << "\n";
+	r = read(fd, &(viewableHeaderRecord->reserved2), 2);
+	if (r != 2)
+		perror("ERROR: read failed in readViewableHeader");
+	cout << "\treserved2: " << viewableHeaderRecord->reserved2 << "\n";
+
+	int skip = viewableHeaderRecord->viewableHeaderRecordSize - 16/*sizeof(struct ViewableHeader)*/;
+
+	if (skip) {
+		cout << "\nSkipping " << skip << " unknown bytes.\n";
+		char *skipbuf = new char[skip];
+		r = read(fd, skipbuf, skip);
+		if (r != skip)
+			perror("ERROR: read failed in readViewableHeader");
+		delete [] skipbuf;
+	}
+}
+
+
+void readViewableBlockText(int fd, ViewableBlock *vb, char **buf) {
+	int r;
+	unsigned long size = vb->size;
+
+	*buf = new char [ ((vb->size > vb->uncompressedSize) ? vb->size : vb->uncompressedSize) + 1 ];
+	lseek(fd, vb->offset, SEEK_SET);
+	r = read(fd, *buf, vb->size);
+	if (r != vb->size)
+		perror("ERROR: read failed in readViewableBlocktext");
+
+	compress->zBuf(&size, *buf);
+	strcpy(*buf, compress->Buf());
+	cout << "Viewable Block Text:\n";
+	cout << *buf << "\n\n";
+}
+
+
+void readViewableBlock(int fd, ViewableBlock *vb) {
+	int r;
+	cout << "\n\nReading Viewable Block (" << 12/*sizeof(struct ViewableHeader)*/ << " bytes)\n\n";
+
+// DO NOT USE BECAUSE OF RECORD BYTE ALIGNMENT PROBLEMS
+//	read(fd, &vb, sizeof(struct ViewableBlock));
+
+	cout << "Viewable Block Information\n";
+	r = read(fd, &(vb->offset), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableBlock");
+	cout << "\toffset: " << vb->offset << "\n";
+	r = read(fd, &(vb->uncompressedSize), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableBlock");
+	cout << "\tuncompressedSize: " << vb->uncompressedSize << "\n";
+	r = read(fd, &(vb->size), 4);
+	if (r != 4)
+		perror("ERROR: read failed in readViewableBlock");
+	cout << "\tsize: " << vb->size << "\n";
+}
+
+
+void readHeaderControlWordAreaText(int fd, char **buf) {
+	int r;
+	long headerControlWordAreaSize;
+	r = read(fd, &headerControlWordAreaSize, 4);
+	if (r != 4)
+		perror("ERROR: read failed in readHeaderControlWordAreaText");
+	cout << "Reading Header Control Word Area (" << headerControlWordAreaSize << " bytes)\n\n";
+
+	*buf = new char [headerControlWordAreaSize + 1];
+
+	r = read(fd, *buf, headerControlWordAreaSize);
+	if (r != headerControlWordAreaSize)
+		perror("ERROR: read failed in readHeaderControlWordAreaText");
+	(*buf)[headerControlWordAreaSize] = 0;
+
+	cout << "headerControlWordArea:\n" << *buf << "\n";
+}
diff --git a/utilities/sub.c b/utilities/sub.c
new file mode 100644
index 0000000..76c340f
--- /dev/null
+++ b/utilities/sub.c
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ *  sub.c -	This little utility substitutes all occurances of a string
+ *		with another string.  Is this useful?  Maybe not.  But it's
+ *		been here since r2 so it seems a shame to remove it :)
+ *		Currently not built by build system
+ *
+ * $Id: sub.c 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 1997-2009 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+main(int argc, char **argv)
+{
+	FILE *fp;
+	char *buf;
+	int size;
+
+	if ((argc < 3) || (argc > 4)) {
+		fprintf(stderr, "usage: %s <string> <substitute string> [filename]\n", *argv);
+		exit(-1);
+	}
+
+	if (argc > 3)
+		fp = fopen(argv[3], "r");
+	else	fp = stdin;
+
+	size = strlen(argv[1]);
+	buf = (char *)calloc(size + 1, 1);
+
+	while ((buf[size - 1] = fgetc(fp)) != EOF) {
+		if (!strcmp(buf, argv[1])) {
+			printf("\n%s", argv[2]);
+			memset(buf, 0, size);
+			continue;
+		}
+		if (*buf) {
+			printf("%c", *buf);
+		}
+		memmove(buf, &buf[1], size);
+	}
+	buf[size - 1] = 0;
+	printf("%s", buf);
+}
diff --git a/utilities/tei2mod.cpp b/utilities/tei2mod.cpp
new file mode 100644
index 0000000..575d882
--- /dev/null
+++ b/utilities/tei2mod.cpp
@@ -0,0 +1,623 @@
+/******************************************************************************
+ *
+ *  tei2mod.cpp -	Utility to import documents encoded as TEI
+ *
+ * $Id: tei2mod.cpp 2978 2013-09-10 14:39:31Z scribe $
+ *
+ * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+/******************************************************************************
+ * This program handles xml files of the form:
+ * <TEI.2>
+ *   <text>
+ *     <body>
+ *       <entry      key="xxx">...</entry>
+ *       <entryFree  key="yyy">...</entryFree>
+ *       <superentry key="zzz">...</superentry>
+ *     </body>
+ *   </text>
+ * </TEI.2>
+ * The document is assumed to be well-formed and valid.
+ * Three kinds of entries are allowed,
+ *    <entry> - a very restricted form of a dictionary entry.
+ *    <entryFree> - a very unrestricted form of a dictionary entry.
+ *    <superentry> - an entry which can have other entries.
+ * The value of the key attribute is used as the key for the entry in the module.
+ * Note, for a <superentry> only it's key becomes a SWORD key.
+ * Keys of entries internal to it are not used.
+ *
+ * The entries must be sorted according to an ASCII collation of their bytes.
+ * This should be the same for Latin-1 and for UTF-8
+ *
+ * Sword will allow for any tags, but only a few have any styling.
+ *
+ * author DM Smith
+ */
+
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <string>
+#include <vector>
+#include <fstream>
+#include <iostream>
+#include <swbuf.h>
+#include <utilxml.h>
+#include <rawld.h>
+#include <rawld4.h>
+#include <zld.h>
+#include <zipcomprs.h>
+#include <lzsscomprs.h>
+#include <stdio.h>
+#include <cipherfil.h>
+
+#ifdef _ICU_
+#include <utf8nfc.h>
+#include <latin1utf8.h>
+#endif
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using namespace std;
+
+#ifdef _ICU_
+UTF8NFC *normalizer = 0;
+int normalized = 0;
+
+Latin1UTF8 converter;
+int converted = 0;
+#endif
+
+#define DEBUG
+
+SWLD  *module       = NULL;
+SWKey *currentKey   = NULL;
+bool   normalize    = true;
+SWBuf keyStr;
+
+unsigned long entryCount = 0;
+
+/**
+ * Determine whether the string contains a valid unicode sequence.
+ * The following table give the pattern of a valid UTF-8 character.
+ * Unicode Range               1st       2nd       3rd       4th
+ * U-00000000 - U-0000007F  0nnnnnnn
+ * U-00000080 - U-000007FF  110nnnnn  10nnnnnn
+ * U-00000800 - U-0000FFFF  1110nnnn  10nnnnnn  10nnnnnn
+ * U-00010000 - U-001FFFFF  11110nnn  10nnnnnn  10nnnnnn  10nnnnnn
+ * Note:
+ *   1.  The latest UTF-8 RFC allows for a max of 4 bytes.
+ *       Earlier allowed 6.
+ *   2.  The number of bits of the leading byte before the first 0
+ *       is the total number of bytes.
+ *   3.  The "n" are the bits of the unicode codepoint.
+ * This routine does not check to see if the code point is in the range.
+ * It could.
+ *
+ * param  txt the text to check
+ * return   1 if all high order characters form a valid unicode sequence
+ *         -1 if there are no high order characters.
+ *            Note: this is also a valid unicode sequence
+ *          0 if there are high order characters that do not form
+ *            a valid unicode sequence
+ * author DM Smith
+ */
+int detectUTF8(const char *txt) {
+    unsigned int  countUTF8 = 0;
+    int count = 0;
+
+    // Cast it to make masking and shifting easier
+    const unsigned char *p = (const unsigned char*) txt;
+    while (*p) {
+        // Is the high order bit set?
+        if (*p & 0x80) {
+            // Then count the number of high order bits that are set.
+            // This determines the number of following bytes
+            // that are a part of the unicode character
+            unsigned char i = *p;
+            for (count = 0; i & 0x80; count++) {
+                i <<= 1;
+            }
+
+            // Validate count:
+            // Count 0: bug in code that would cause core walking
+            // Count 1: is a pattern of 10nnnnnn,
+            //          which does not signal the start of a unicode character
+            // Count 5 to 8: 111110nn, 1111110n and 11111110 and 11111111
+            //          are not legal starts, either
+            if (count < 2 || count > 4) return 0;
+
+            // At this point we expect (count - 1) following characters
+            // of the pattern 10nnnnnn
+            while (--count && *++p) {
+                // The pattern of each following character must be: 10nnnnnn
+                // So, compare the top 2 bits.
+                if ((0xc0 & *p) != 0x80) return  0;
+            }
+
+            // Oops, we've run out of bytes too soon: Cannot be UTF-8
+            if (count) return 0;
+
+            // We have a valid UTF-8 character, so count it
+            countUTF8++;
+        }
+
+        // Advance to the next character to examine.
+        p++;
+    }
+
+    // At this point it is either UTF-8 or 7-bit ascii
+    return countUTF8 ? 1 : -1;
+}
+
+void normalizeInput(SWKey &key, SWBuf &text) {
+#ifdef _ICU_
+	int utf8State = detectUTF8(text.c_str());
+	if (normalize) {
+		// Don't need to normalize text that is ASCII
+		// But assume other non-UTF-8 text is Latin1 (cp1252) and convert it to UTF-8
+		if (!utf8State) {
+			cout << "Warning: " << key << ": Converting to UTF-8 (" << text << ")" << endl;
+			converter.processText(text, (SWKey *)2);  // note the hack of 2 to mimic a real key. TODO: remove all hacks
+			converted++;
+
+			// Prepare for double check. This probably can be removed.
+			// But for now we are running the check again.
+			// This is to determine whether we need to normalize output of the conversion.
+			utf8State = detectUTF8(text.c_str());
+		}
+
+		// Double check. This probably can be removed.
+		if (!utf8State) {
+			cout << "Error: " << key << ": Converting to UTF-8 (" << text << ")" << endl;
+		}
+
+		if (utf8State > 0) {
+			SWBuf before = text;
+			normalizer->processText(text, (SWKey *)2);  // note the hack of 2 to mimic a real key. TODO: remove all hacks
+			if (before != text) {
+				normalized++;
+			}
+		}
+	}
+#endif
+}
+
+void writeEntry(SWKey &key, SWBuf &text) {
+#ifdef DEBUG
+	cout << "(" << entryCount << ") " << key << endl;
+#endif
+
+	module->setKey(key);
+
+	normalizeInput(key, text);
+
+	module->setEntry(text);
+}
+
+void linkToEntry(const SWBuf &keyBuf, const SWBuf &linkBuf) {
+       	SWKey tmpkey = linkBuf.c_str();
+	module->linkEntry(&tmpkey);
+#ifdef DEBUG
+	cout << "(" << entryCount << ") " << "Linking: " << linkBuf << endl;
+#endif
+}
+
+// Return true if the content was handled or is to be ignored.
+//	  false if the what has been seen is to be accumulated and considered later.
+bool handleToken(SWBuf &text, XMLTag *token) {
+        // The start token for the current entry;
+	static XMLTag startTag;
+
+        // Flags to indicate whether we are in a entry, entryFree or superentry
+        static bool inEntry      = false;
+        static bool inEntryFree  = false;
+        static bool inSuperEntry = false;
+
+	const char *tokenName = token->getName();
+
+        static const char *splitPtr, *splitPtr2 = NULL;
+        static char *splitBuffer	= new char[4096];
+	static SWKey tmpKey;
+//-- START TAG -------------------------------------------------------------------------
+	if (!token->isEndTag()) {
+
+		// If we are not in an "entry" and we see one, then enter it.
+		if (!inEntry && !inEntryFree && !inSuperEntry) {
+			inEntry      = !strcmp(tokenName, "entry");
+			inEntryFree  = !strcmp(tokenName, "entryFree");
+			inSuperEntry = !strcmp(tokenName, "superentry");
+                        if (inEntry || inEntryFree || inSuperEntry) {
+#ifdef DEBUG
+				cout << "Entering " << tokenName << endl;
+#endif
+				startTag    = *token;
+				text        = "";
+
+                                keyStr = token->getAttribute("n"); // P5 with linking and/or non-URI chars
+                                if (!strlen(keyStr)) {
+	                                keyStr = token->getAttribute("sortKey"); // P5 otherwise
+	                                if (!strlen(keyStr)) {
+        					keyStr = token->getAttribute("key"); // P4
+                                        }
+                                }
+
+				return false; // make tag be part of the output
+			}
+		}
+	}
+
+//-- EMPTY and END TAG ---------------------------------------------------------------------------------------------
+	else {
+
+		// ENTRY end
+		// If we see the end of an entry that we are in, then leave it
+		if ((inEntry      && !strcmp(tokenName, "entry"     )) ||
+		    (inEntryFree  && !strcmp(tokenName, "entryFree" )) ||
+		    (inSuperEntry && !strcmp(tokenName, "superentry"))) {
+#ifdef DEBUG
+			cout << "Leaving " << tokenName << endl;
+#endif
+			// Only one is false coming into here,
+			// but all must be on leaving.
+			inEntry       = false;
+			inEntryFree   = false;
+			inSuperEntry  = false;
+			text         += token->toString();
+
+                        entryCount++;
+#ifdef DEBUG
+			cout << "keyStr: " << keyStr << endl;
+#endif
+                        splitPtr = strstr(keyStr, "|");
+                        if (splitPtr) {
+                                strncpy (splitBuffer, keyStr.c_str(), splitPtr - keyStr.c_str());
+                                splitBuffer[splitPtr - keyStr.c_str()] = 0;
+				*currentKey = splitBuffer;
+#ifdef DEBUG
+				cout << "splitBuffer: " << splitBuffer << endl;
+				cout << "currentKey: " << *currentKey << endl;
+#endif
+				writeEntry(*currentKey, text);
+#if 1
+                                while (splitPtr) {
+                                	splitPtr += 1;
+                                	splitPtr2 = strstr(splitPtr, "|");
+                                        entryCount++;
+                                        if (splitPtr2) {
+						strncpy (splitBuffer, splitPtr, splitPtr2 - splitPtr);
+                                                splitBuffer[splitPtr2 - splitPtr] = 0;
+#ifdef DEBUG
+						cout << "splitBuffer: " << splitBuffer << endl;
+						cout << "currentKey: " << *currentKey << endl;
+#endif
+						linkToEntry(currentKey->getText(), splitBuffer);
+                        	                splitPtr = splitPtr2;
+                                        }
+                                        else {
+						strcpy (splitBuffer, splitPtr);
+#ifdef DEBUG
+       	       					cout << "splitBuffer: " << splitBuffer << endl;
+						cout << "currentKey: " << *currentKey << endl;
+#endif
+						linkToEntry(currentKey->getText(), splitBuffer);
+                                                splitPtr = 0;
+                                        }
+                                }
+#endif
+                        }
+                        else {
+				*currentKey = keyStr;
+				writeEntry(*currentKey, text);
+                        }
+
+			// Since we consumed the text, clear it
+			// and tell the caller that the tag was consumed.
+			text = "";
+			return true;
+		}
+	}
+	return false;
+}
+
+void usage(const char *app, const char *error = 0) {
+			
+	if (error) fprintf(stderr, "\n%s: %s\n", app, error);
+		
+	fprintf(stderr, "TEI Lexicon/Dictionary/Daily Devotional/Glossary module creation tool for\n\tThe SWORD Project\n");
+	fprintf(stderr, "\nusage: %s <output/path> <teiDoc> [OPTIONS]\n", app);
+	fprintf(stderr, "  -z\t\t\t use ZIP compression (default no compression)\n");
+	fprintf(stderr, "  -Z\t\t\t use LZSS compression (default no compression)\n");
+	fprintf(stderr, "  -s <2|4>\t\t max text size per entry(default 4):\n");
+	fprintf(stderr, "  -c <cipher_key>\t encipher module using supplied key\n");
+	fprintf(stderr, "\t\t\t\t (default no enciphering)\n");
+        fprintf(stderr, "  -N\t\t\t Do not convert UTF-8 or normalize UTF-8 to NFC\n");
+        fprintf(stderr, "\t\t\t\t (default is to convert to UTF-8, if needed,\n");
+        fprintf(stderr, "\t\t\t\t  and then normalize to NFC. Note: all UTF-8\n");
+	fprintf(stderr, "\t\t\t\t  texts should be normalized to NFC.)\n");
+	fprintf(stderr, "\n\tThe options -z, -Z, and -s are mutually exclusive.\n");
+	exit(-1);
+}
+
+int main(int argc, char **argv) {
+#ifdef _ICU_
+	UTF8NFC normalizr;
+	normalizer = &normalizr;
+#endif
+
+	SWBuf program = argv[0];
+	fprintf(stderr, "You are running %s: $Rev: 2138 $\n", argv[0]);
+
+	// Let's test our command line arguments
+	if (argc < 3) {
+		usage(*argv);
+	}
+
+	// variables for arguments, holding defaults
+	SWBuf path             = argv[1];
+	SWBuf teiDoc           = argv[2];
+	SWBuf compType	       = "";
+	SWBuf modDrv           = "";
+	SWBuf recommendedPath  = "./modules/lexdict/";
+	SWBuf cipherKey        = "";
+	SWCompress *compressor = 0;
+
+	for (int i = 3; i < argc; i++) {
+		if (!strcmp(argv[i], "-z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (modDrv.size()) usage(*argv, "Cannot specify both -z and -s");
+			compType = "ZIP";
+			modDrv = "zLD";
+			recommendedPath += "zld/";
+		}
+		else if (!strcmp(argv[i], "-Z")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -z and -Z");
+			if (modDrv.size()) usage(*argv, "Cannot specify both -Z and -s");
+			compType = "LZSS";
+			recommendedPath += "zld/";
+		}
+		else if (!strcmp(argv[i], "-s")) {
+			if (compType.size()) usage(*argv, "Cannot specify both -s and -z or -Z");
+			if (i+1 < argc) {
+				int size = atoi(argv[++i]);
+				if (size == 2) {
+					modDrv           = "RawLD";
+					recommendedPath += "rawld/";
+					continue;
+				}
+				if (size == 4) {
+					modDrv           = "RawLD4";
+					recommendedPath += "rawld4/";
+					continue;
+				}
+			}
+			usage(*argv, "-s requires one of <2|4>");
+		}
+		else if (!strcmp(argv[i], "-N")) {
+			normalize = false;
+		}
+		else if (!strcmp(argv[i], "-c")) {
+			if (i+1 < argc) cipherKey = argv[++i];
+			else usage(*argv, "-c requires <cipher_key>");
+		}
+		else usage(*argv, (((SWBuf)"Unknown argument: ")+ argv[i]).c_str());
+	}
+	if (!modDrv.size()) {
+		modDrv           = "RawLD4";
+		recommendedPath += "rawld4/";
+	}
+
+#ifndef _ICU_
+	if (normalize) {
+		normalize = false;
+		cout << program << " is not compiled with support for ICU. Setting -N flag." << endl;
+	}
+#endif
+
+	if (compType == "ZIP") {
+#ifndef EXCLUDEZLIB
+		compressor = new ZipCompress();
+#else
+		usage(*argv, "ERROR: SWORD library not compiled with ZIP compression support.\n\tBe sure libzip is available when compiling SWORD library");
+#endif
+	}
+	else if (compType == "LZSS") {
+		compressor = new LZSSCompress();
+	}
+
+#ifdef DEBUG
+	// cout << "path: " << path << " teiDoc: " << teiDoc << " compressType: " << compType << " ldType: " << modDrv << " cipherKey: " << cipherKey.c_str() << " normalize: " << normalize << "\n";
+	cout << "path: " << path << " teiDoc: " << teiDoc << " compressType: " << compType << " ldType: " << modDrv << " normalize: " << normalize << "\n";
+	cout << "";
+//      exit(-3);
+#endif
+
+	SWBuf modName = path;
+	int pathlen   = path.length();
+	char lastChar = path[pathlen - 1];
+	if (lastChar != '/' && lastChar != '\\') {
+		modName += "/";
+	}
+	modName += "dict";
+
+	SWBuf keyBuf;
+	SWBuf entBuf;
+	SWBuf lineBuf;
+	vector<string> linkBuf;
+
+	if (modDrv == "zLD") {
+		if (zLD::createModule(modName)) {
+			fprintf(stderr, "error: %s: couldn't create module at path: %s \n", program.c_str(), modName.c_str()); 
+			exit(-3);
+		}
+		module = new zLD(modName, 0, 0, 30, compressor);
+	}
+	else if (modDrv == "RawLD") {
+		if (RawLD::createModule(modName)) {
+			fprintf(stderr, "error: %s: couldn't create module at path: %s \n", program.c_str(), modName.c_str()); 
+			exit(-3);
+		}
+		module = new RawLD(modName);
+	}
+	else {
+		if (RawLD4::createModule(modName)) {
+			fprintf(stderr, "error: %s: couldn't create module at path: %s \n", program.c_str(), modName.c_str()); 
+			exit(-3);
+		}
+		module = new RawLD4(modName);
+	}
+
+	SWFilter *cipherFilter = 0;
+
+	if (cipherKey.size()) {
+		fprintf(stderr, "Adding cipher filter with phrase: %s\n", cipherKey.c_str() );
+		cipherFilter = new CipherFilter(cipherKey.c_str());
+		module->addRawFilter(cipherFilter);
+	}
+
+        if (!module->isWritable()) {
+                fprintf(stderr, "The module is not writable. Writing text to it will not work.\nExiting.\n" );
+                exit(-1);
+        }
+
+	// Let's see if we can open our input file
+	ifstream infile(teiDoc);
+	if (infile.fail()) {
+		fprintf(stderr, "error: %s: couldn't open input file: %s \n", program.c_str(), teiDoc.c_str());
+		exit(-2);
+	}
+
+	currentKey = module->createKey();
+	currentKey->setPersist(true);
+	module->setKey(*currentKey);
+
+	(*module) = TOP;
+
+	SWBuf token;
+	SWBuf text;
+	bool intoken = false;
+	char curChar = '\0';
+
+	while (infile.good()) {
+
+		curChar = infile.get();
+
+		// skip the character if it is bad. infile.good() will catch the problem
+		if (curChar == -1) {
+			continue;
+		}
+
+		if (!intoken && curChar == '<') {
+			intoken = true;
+			token = "<";
+			continue;
+		}
+
+		if (intoken && curChar == '>') {
+			intoken = false;
+			token.append('>');
+
+			XMLTag *t = new XMLTag(token.c_str());
+			if (!handleToken(text, t)) {
+				text.append(*t);
+			}
+                        delete t;
+			continue;
+		}
+
+		if (intoken)
+			token.append(curChar);
+		else
+			switch (curChar) {
+				case '>' : text.append("&gt;"); break;
+				case '<' : text.append("&lt;"); break;
+				default  : text.append(curChar); break;
+			}
+	}
+
+	// Force the last entry from the text buffer.
+	//text = "";
+	//writeEntry(*currentKey, text);
+
+	delete module;
+	delete currentKey;
+	if (cipherFilter)
+		delete cipherFilter;
+	infile.close();
+
+#ifdef _ICU_
+	if (converted)  fprintf(stderr, "tei2mod converted %d verses to UTF-8\n", converted);
+	if (normalized) fprintf(stderr, "tei2mod normalized %d verses to NFC\n", normalized);
+#endif
+
+	/*
+	 * Suggested module name detection.
+	 * Only used for suggesting a conf.
+	 *
+	 * Various forms of path.
+	 * . and .. - no module name given, use "dict".
+	 * Or one of the following where z is the module name
+	 * and x may be . or ..
+	 * z 
+	 * x/y/z
+	 * x/y/z/
+	 * x/y/z/z
+	 */
+	SWBuf suggestedModuleName = path;
+	if (lastChar == '/' || lastChar == '\\') {
+		suggestedModuleName.setSize(--pathlen);
+	}
+
+	lastChar = suggestedModuleName[pathlen - 1];
+	if (lastChar == '.') {
+		suggestedModuleName = "???";
+	}
+	else {
+		/* At this point the suggestion is either
+		 * what follows the last / or \
+		 * or the entire string
+		 */
+		const char *m = strrchr(suggestedModuleName.c_str(), '/');
+		if (!m) {
+			m = strrchr(suggestedModuleName.c_str(), '\\');
+		}
+		if (m) {
+			suggestedModuleName = m+1;
+		}
+	}
+
+	recommendedPath += suggestedModuleName;
+	recommendedPath += "/dict";
+
+	fprintf(stderr, "\nSuggested conf (replace ??? with appropriate values)\n\n");
+	fprintf(stderr, "[%s]\n", suggestedModuleName.c_str());
+	fprintf(stderr, "DataPath=%s\n", recommendedPath.c_str());
+	fprintf(stderr, "Description=???\n");
+	fprintf(stderr, "SourceType=TEI\n");
+	fprintf(stderr, "Encoding=%s\n", (normalize ? "UTF-8" : "???"));
+	fprintf(stderr, "ModDrv=%s\n", modDrv.c_str());
+	if (compressor) {
+		fprintf(stderr, "CompressType=%s\n", compType.c_str());
+	}
+	if (cipherKey.size()) {
+		fprintf(stderr, "CipherKey=%s\n", cipherKey.c_str());
+	}
+}
diff --git a/utilities/treeidxutil.cpp b/utilities/treeidxutil.cpp
new file mode 100644
index 0000000..d622dfa
--- /dev/null
+++ b/utilities/treeidxutil.cpp
@@ -0,0 +1,181 @@
+/******************************************************************************
+ *
+ *  treeidxutil.cpp -	
+ *
+ * $Id: treeidxutil.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2002-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <entriesblk.h>
+#include <iostream>
+#include <string>
+#include <stdio.h>
+#include <treekeyidx.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+void printTree(TreeKeyIdx treeKey, TreeKeyIdx *target = 0, int level = 1) {
+	if (!target)
+		target = &treeKey;
+	
+	unsigned long currentOffset = target->getOffset();
+	std::cout << ((currentOffset == treeKey.getOffset()) ? "==>" : "");
+	for (int i = 0; i < level; i++) std::cout << "\t";
+	std::cout << treeKey.getLocalName() << std::endl;
+	if (treeKey.firstChild()) {
+		printTree(treeKey, target, level+1);
+		treeKey.parent();
+	}
+	if (treeKey.nextSibling())
+		printTree(treeKey, target, level);
+
+}
+
+
+void printLocalName(TreeKeyIdx *treeKey) {
+	std::cout << "locaName: " << treeKey->getLocalName() << std::endl;
+}
+
+
+void setLocalName(TreeKeyIdx *treeKey) {
+  char buf[1023], *c;
+	std::cout << "Enter New Node Name: ";
+	c = fgets(buf, 1000, stdin);
+	if (c == NULL)
+		std::cerr << "ERROR: fgets failed in setLocalName\n";
+	treeKey->setLocalName(buf);
+	treeKey->save();
+}
+
+
+void assurePath(TreeKeyIdx *treeKey) {
+  char buf[1023], *c;
+	std::cout << "Enter path: ";
+	c = fgets(buf, 1000, stdin);
+	if (c == NULL)
+		std::cerr << "ERROR: fgets failed in assurePath\n";
+	treeKey->assureKeyPath(buf);
+}
+
+
+void appendSibbling(TreeKeyIdx *treeKey) {
+	if (treeKey->getOffset()) {
+	  char buf[1023], *c;
+		std::cout << "Enter New Sibbling Name: ";
+		c = fgets(buf, 1000, stdin);
+		if (c == NULL)
+			std::cerr << "ERROR: fgets failed in appendSibbling\n";
+		treeKey->append();
+		treeKey->setLocalName(buf);
+		treeKey->save();
+	}
+	else	std::cout << "Can't add sibling to root node\n";
+}
+
+
+void appendChild(TreeKeyIdx *treeKey) {
+  char buf[1023], *c;
+	std::cout << "Enter New Child Name: ";
+	c = fgets(buf, 1000, stdin);
+	if (c == NULL)
+		std::cerr << "ERROR: fgets failed in appendChild\n";
+	treeKey->appendChild();
+	treeKey->setLocalName(buf);
+	treeKey->save();
+}
+
+
+void removeEntry(EntriesBlock *eb, int index) {
+	if (index < eb->getCount()) {
+		std::cout << "Removing entry [" << index << "]\n";
+		eb->removeEntry(index);
+	}
+	else std::cout << "Invalid entry number\n\n";
+}
+
+
+int main(int argc, char **argv) {
+
+	if (argc != 2) {
+		fprintf(stderr, "usage: %s <tree/key/data/path>\n", *argv);
+		exit(-1);
+	}
+
+	TreeKeyIdx *treeKey = new TreeKeyIdx(argv[1]);
+
+	if (treeKey->popError()) {
+		treeKey->create(argv[1]);
+		delete treeKey;
+		treeKey = new TreeKeyIdx(argv[1]);
+	}
+	TreeKeyIdx root = *treeKey;
+
+	std::string input;
+	char line[1024], *c;
+
+	do {
+		std::cout << "[" << treeKey->getText() << "] > ";
+		c = fgets(line, 1000, stdin);
+		if (c == NULL)
+			std::cerr << "ERROR: fgets failed in main\n";
+		input = line;
+		if (input.length() > 0) {
+			switch (input[0]) {
+				case 'n': printLocalName(treeKey); break;
+				case 's': setLocalName(treeKey); break;
+				case 'p':	root.root(); printTree(root, treeKey); break;
+				case 'a':	appendSibbling(treeKey); break;
+				case 'c':	appendChild(treeKey); break;
+				case 'j':	treeKey->nextSibling(); break;
+				case 'g': assurePath(treeKey); break;
+				case 'k':	treeKey->previousSibling(); break;
+				case 'h':	treeKey->parent(); break;
+				case 'l':	treeKey->firstChild(); break;
+				case 'r':	treeKey->root(); break;
+				case 'q': break;
+				case '?':
+				default:
+					std::cout << "\n p - print tree\n";
+					std::cout << " n - get local name\n";
+					std::cout << " s - set local name\n";
+					std::cout << " j - next sibbling\n";
+					std::cout << " k - previous sibbling\n";
+					std::cout << " h - parent\n";
+					std::cout << " l - first child\n";
+					std::cout << " r - root\n";
+					std::cout << " a - append sibbling\n";
+					std::cout << " c - append child\n";
+					std::cout << " u - get user data\n";
+					std::cout << " d - set user data\n";
+					std::cout << " g - goto path; create if it doesn't exist\n";
+					std::cout << " q - quit\n\n";
+					break;
+			}
+		}
+	}
+	while (input.compare("q"));
+
+	delete treeKey;
+
+	return 0;
+}
diff --git a/utilities/vcppmake/addgb.vcxproj b/utilities/vcppmake/addgb.vcxproj
new file mode 100644
index 0000000..6f54f23
--- /dev/null
+++ b/utilities/vcppmake/addgb.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{76895767-61D0-41E6-B92D-FD541BB26D32}</ProjectGuid>

+    <RootNamespace>addgb</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\addgb.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/addld.vcxproj b/utilities/vcppmake/addld.vcxproj
new file mode 100644
index 0000000..f9e614c
--- /dev/null
+++ b/utilities/vcppmake/addld.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}</ProjectGuid>

+    <RootNamespace>addld</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\addld.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/addvs.vcxproj b/utilities/vcppmake/addvs.vcxproj
new file mode 100644
index 0000000..bef2d4d
--- /dev/null
+++ b/utilities/vcppmake/addvs.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{CFF1021E-B878-481A-851B-2B226701D525}</ProjectGuid>

+    <RootNamespace>addvs</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\addvs.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/cipherraw.vcxproj b/utilities/vcppmake/cipherraw.vcxproj
new file mode 100644
index 0000000..cc9491c
--- /dev/null
+++ b/utilities/vcppmake/cipherraw.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}</ProjectGuid>

+    <RootNamespace>cipherraw</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\cipherraw.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/emptyvss.vcxproj b/utilities/vcppmake/emptyvss.vcxproj
new file mode 100644
index 0000000..cb4ee1d
--- /dev/null
+++ b/utilities/vcppmake/emptyvss.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{A55BEE98-25BB-463D-9016-14CA4567DFBF}</ProjectGuid>

+    <RootNamespace>emptyvss</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\emptyvss.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/genbookutil.vcxproj b/utilities/vcppmake/genbookutil.vcxproj
new file mode 100644
index 0000000..7dac210
--- /dev/null
+++ b/utilities/vcppmake/genbookutil.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}</ProjectGuid>

+    <RootNamespace>genbookutil</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\genbookutil.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/imp2gbs.vcxproj b/utilities/vcppmake/imp2gbs.vcxproj
new file mode 100644
index 0000000..1e81347
--- /dev/null
+++ b/utilities/vcppmake/imp2gbs.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{2066EC0D-98CC-43E7-8405-5156AF111B38}</ProjectGuid>

+    <RootNamespace>imp2gbs</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\imp2gbs.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/imp2ld.vcxproj b/utilities/vcppmake/imp2ld.vcxproj
new file mode 100644
index 0000000..f186ad6
--- /dev/null
+++ b/utilities/vcppmake/imp2ld.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}</ProjectGuid>

+    <RootNamespace>imp2ld</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\imp2ld.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/imp2vs.vcxproj b/utilities/vcppmake/imp2vs.vcxproj
new file mode 100644
index 0000000..d6b1860
--- /dev/null
+++ b/utilities/vcppmake/imp2vs.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{5637456D-5B83-4C12-A129-708FC8CF0B33}</ProjectGuid>

+    <RootNamespace>imp2vs</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\imp2vs.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/installmgr.vcxproj b/utilities/vcppmake/installmgr.vcxproj
new file mode 100644
index 0000000..17d505c
--- /dev/null
+++ b/utilities/vcppmake/installmgr.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}</ProjectGuid>

+    <RootNamespace>installmgr</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\installmgr.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/lexdump.vcxproj b/utilities/vcppmake/lexdump.vcxproj
new file mode 100644
index 0000000..f69e383
--- /dev/null
+++ b/utilities/vcppmake/lexdump.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{D1115CD8-3810-48B0-8A21-F695016C3557}</ProjectGuid>

+    <RootNamespace>lexdump</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\lexdump.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/mkfastmod.vcxproj b/utilities/vcppmake/mkfastmod.vcxproj
new file mode 100644
index 0000000..4095a29
--- /dev/null
+++ b/utilities/vcppmake/mkfastmod.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{DB592F77-25DC-4005-BD49-6D0E50303844}</ProjectGuid>

+    <RootNamespace>mkfastmod</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\mkfastmod.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/mod2imp.vcxproj b/utilities/vcppmake/mod2imp.vcxproj
new file mode 100644
index 0000000..3c1be95
--- /dev/null
+++ b/utilities/vcppmake/mod2imp.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}</ProjectGuid>

+    <RootNamespace>mod2imp</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\mod2imp.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/mod2osis.vcxproj b/utilities/vcppmake/mod2osis.vcxproj
new file mode 100644
index 0000000..7227c88
--- /dev/null
+++ b/utilities/vcppmake/mod2osis.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{B5D19969-5285-4B0E-B798-496A0B8DCA61}</ProjectGuid>

+    <RootNamespace>mod2osis</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\mod2osis.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/mod2vpl.vcxproj b/utilities/vcppmake/mod2vpl.vcxproj
new file mode 100644
index 0000000..8c952a4
--- /dev/null
+++ b/utilities/vcppmake/mod2vpl.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{0C43604F-08D6-490C-BDFD-1B6CACB59740}</ProjectGuid>

+    <RootNamespace>mod2vpl</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\mod2vpl.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/mod2zmod.vcxproj b/utilities/vcppmake/mod2zmod.vcxproj
new file mode 100644
index 0000000..33c6161
--- /dev/null
+++ b/utilities/vcppmake/mod2zmod.vcxproj
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}</ProjectGuid>

+    <RootNamespace>mod2zmod</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\mod2zmod.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/modwrite.vcxproj b/utilities/vcppmake/modwrite.vcxproj
new file mode 100644
index 0000000..8f36476
--- /dev/null
+++ b/utilities/vcppmake/modwrite.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}</ProjectGuid>

+    <RootNamespace>modwrite</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\modwrite.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/osis2mod.vcxproj b/utilities/vcppmake/osis2mod.vcxproj
new file mode 100644
index 0000000..28a1178
--- /dev/null
+++ b/utilities/vcppmake/osis2mod.vcxproj
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}</ProjectGuid>

+    <RootNamespace>osis2mod</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+      <WholeProgramOptimization>

+      </WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>

+      </OptimizeReferences>

+      <EnableCOMDATFolding>

+      </EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>

+      </LinkTimeCodeGeneration>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\osis2mod.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/step2vpl.vcxproj b/utilities/vcppmake/step2vpl.vcxproj
new file mode 100644
index 0000000..44321ba
--- /dev/null
+++ b/utilities/vcppmake/step2vpl.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{43B53430-3C91-4A11-8A1F-5873AEEE0926}</ProjectGuid>

+    <RootNamespace>step2vpl</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\step2vpl.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/stepdump.vcxproj b/utilities/vcppmake/stepdump.vcxproj
new file mode 100644
index 0000000..88b05e2
--- /dev/null
+++ b/utilities/vcppmake/stepdump.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}</ProjectGuid>

+    <RootNamespace>stepdump</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\stepdump.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/tei2mod.vcxproj b/utilities/vcppmake/tei2mod.vcxproj
new file mode 100644
index 0000000..b6784cb
--- /dev/null
+++ b/utilities/vcppmake/tei2mod.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}</ProjectGuid>

+    <RootNamespace>tei2mod</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\tei2mod.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/treeidxutil.vcxproj b/utilities/vcppmake/treeidxutil.vcxproj
new file mode 100644
index 0000000..2e1026c
--- /dev/null
+++ b/utilities/vcppmake/treeidxutil.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}</ProjectGuid>

+    <RootNamespace>treeidxutil</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\treeidxutil.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/utilities.sln b/utilities/vcppmake/utilities.sln
new file mode 100644
index 0000000..a79f0ae
--- /dev/null
+++ b/utilities/vcppmake/utilities.sln
@@ -0,0 +1,261 @@
+

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2012

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsword", "..\..\lib\vcppmake\libsword.vcxproj", "{97449E5E-F880-4D22-933A-0D2FC32034D4}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osis2mod", "osis2mod.vcxproj", "{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}"

+	ProjectSection(ProjectDependencies) = postProject

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0} = {45C674C0-193D-47AF-B9E0-61A4DE57D3E0}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addgb", "addgb.vcxproj", "{76895767-61D0-41E6-B92D-FD541BB26D32}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addld", "addld.vcxproj", "{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}"

+	ProjectSection(ProjectDependencies) = postProject

+		{76895767-61D0-41E6-B92D-FD541BB26D32} = {76895767-61D0-41E6-B92D-FD541BB26D32}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "addvs", "addvs.vcxproj", "{CFF1021E-B878-481A-851B-2B226701D525}"

+	ProjectSection(ProjectDependencies) = postProject

+		{BBB6D2DE-D890-4758-85CF-8057B93CF6C2} = {BBB6D2DE-D890-4758-85CF-8057B93CF6C2}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cipherraw", "cipherraw.vcxproj", "{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}"

+	ProjectSection(ProjectDependencies) = postProject

+		{CFF1021E-B878-481A-851B-2B226701D525} = {CFF1021E-B878-481A-851B-2B226701D525}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emptyvss", "emptyvss.vcxproj", "{A55BEE98-25BB-463D-9016-14CA4567DFBF}"

+	ProjectSection(ProjectDependencies) = postProject

+		{891A765C-5503-4FED-B427-7AE1413DB264} = {891A765C-5503-4FED-B427-7AE1413DB264}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2gbs", "imp2gbs.vcxproj", "{2066EC0D-98CC-43E7-8405-5156AF111B38}"

+	ProjectSection(ProjectDependencies) = postProject

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA} = {5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2ld", "imp2ld.vcxproj", "{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}"

+	ProjectSection(ProjectDependencies) = postProject

+		{2066EC0D-98CC-43E7-8405-5156AF111B38} = {2066EC0D-98CC-43E7-8405-5156AF111B38}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imp2vs", "imp2vs.vcxproj", "{5637456D-5B83-4C12-A129-708FC8CF0B33}"

+	ProjectSection(ProjectDependencies) = postProject

+		{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78} = {BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installmgr", "installmgr.vcxproj", "{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}"

+	ProjectSection(ProjectDependencies) = postProject

+		{5637456D-5B83-4C12-A129-708FC8CF0B33} = {5637456D-5B83-4C12-A129-708FC8CF0B33}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkfastmod", "mkfastmod.vcxproj", "{DB592F77-25DC-4005-BD49-6D0E50303844}"

+	ProjectSection(ProjectDependencies) = postProject

+		{D1115CD8-3810-48B0-8A21-F695016C3557} = {D1115CD8-3810-48B0-8A21-F695016C3557}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2imp", "mod2imp.vcxproj", "{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}"

+	ProjectSection(ProjectDependencies) = postProject

+		{DB592F77-25DC-4005-BD49-6D0E50303844} = {DB592F77-25DC-4005-BD49-6D0E50303844}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2osis", "mod2osis.vcxproj", "{B5D19969-5285-4B0E-B798-496A0B8DCA61}"

+	ProjectSection(ProjectDependencies) = postProject

+		{95B74350-2DAB-4CA9-BAFB-A5EB264765A1} = {95B74350-2DAB-4CA9-BAFB-A5EB264765A1}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2vpl", "mod2vpl.vcxproj", "{0C43604F-08D6-490C-BDFD-1B6CACB59740}"

+	ProjectSection(ProjectDependencies) = postProject

+		{B5D19969-5285-4B0E-B798-496A0B8DCA61} = {B5D19969-5285-4B0E-B798-496A0B8DCA61}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod2zmod", "mod2zmod.vcxproj", "{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}"

+	ProjectSection(ProjectDependencies) = postProject

+		{0C43604F-08D6-490C-BDFD-1B6CACB59740} = {0C43604F-08D6-490C-BDFD-1B6CACB59740}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "step2vpl", "step2vpl.vcxproj", "{43B53430-3C91-4A11-8A1F-5873AEEE0926}"

+	ProjectSection(ProjectDependencies) = postProject

+		{3D885A23-DA8F-43C1-B241-7F44CA7AAF75} = {3D885A23-DA8F-43C1-B241-7F44CA7AAF75}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stepdump", "stepdump.vcxproj", "{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}"

+	ProjectSection(ProjectDependencies) = postProject

+		{43B53430-3C91-4A11-8A1F-5873AEEE0926} = {43B53430-3C91-4A11-8A1F-5873AEEE0926}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tei2mod", "tei2mod.vcxproj", "{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}"

+	ProjectSection(ProjectDependencies) = postProject

+		{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9} = {D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "treeidxutil", "treeidxutil.vcxproj", "{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}"

+	ProjectSection(ProjectDependencies) = postProject

+		{86D28D9A-2D6A-49A3-A790-275C0CAE14C9} = {86D28D9A-2D6A-49A3-A790-275C0CAE14C9}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisref", "vs2osisref.vcxproj", "{DFDB8804-5D6C-448F-A935-DD85629E0554}"

+	ProjectSection(ProjectDependencies) = postProject

+		{7192CF83-B08C-4387-A869-FD1970167115} = {7192CF83-B08C-4387-A869-FD1970167115}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vs2osisreftxt", "vs2osisreftxt.vcxproj", "{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}"

+	ProjectSection(ProjectDependencies) = postProject

+		{DFDB8804-5D6C-448F-A935-DD85629E0554} = {DFDB8804-5D6C-448F-A935-DD85629E0554}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2gbs", "xml2gbs.vcxproj", "{87116D0C-E498-4193-9F2D-301A8771B77D}"

+	ProjectSection(ProjectDependencies) = postProject

+		{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0} = {B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genbookutil", "genbookutil.vcxproj", "{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}"

+	ProjectSection(ProjectDependencies) = postProject

+		{891A765C-5503-4FED-B427-7AE1413DB264} = {891A765C-5503-4FED-B427-7AE1413DB264}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modwrite", "modwrite.vcxproj", "{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}"

+	ProjectSection(ProjectDependencies) = postProject

+		{4E58EE7D-2B4B-42F0-8578-A23883CA6C31} = {4E58EE7D-2B4B-42F0-8578-A23883CA6C31}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpl2mod", "vpl2mod.vcxproj", "{7192CF83-B08C-4387-A869-FD1970167115}"

+	ProjectSection(ProjectDependencies) = postProject

+		{5638CD25-87F7-4A22-AF6D-EBECCD26B35B} = {5638CD25-87F7-4A22-AF6D-EBECCD26B35B}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lexdump", "lexdump.vcxproj", "{D1115CD8-3810-48B0-8A21-F695016C3557}"

+	ProjectSection(ProjectDependencies) = postProject

+		{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332} = {8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diatheke", "..\diatheke\diatheke.vcxproj", "{891A765C-5503-4FED-B427-7AE1413DB264}"

+	ProjectSection(ProjectDependencies) = postProject

+		{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A} = {7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}

+		{97449E5E-F880-4D22-933A-0D2FC32034D4} = {97449E5E-F880-4D22-933A-0D2FC32034D4}

+	EndProjectSection

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Debug|Win32.Build.0 = Debug|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.ActiveCfg = Release|Win32

+		{97449E5E-F880-4D22-933A-0D2FC32034D4}.Release|Win32.Build.0 = Release|Win32

+		{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.ActiveCfg = Debug|Win32

+		{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Debug|Win32.Build.0 = Debug|Win32

+		{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.ActiveCfg = Release|Win32

+		{3D885A23-DA8F-43C1-B241-7F44CA7AAF75}.Release|Win32.Build.0 = Release|Win32

+		{76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.ActiveCfg = Debug|Win32

+		{76895767-61D0-41E6-B92D-FD541BB26D32}.Debug|Win32.Build.0 = Debug|Win32

+		{76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.ActiveCfg = Release|Win32

+		{76895767-61D0-41E6-B92D-FD541BB26D32}.Release|Win32.Build.0 = Release|Win32

+		{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.ActiveCfg = Debug|Win32

+		{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Debug|Win32.Build.0 = Debug|Win32

+		{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.ActiveCfg = Release|Win32

+		{BBB6D2DE-D890-4758-85CF-8057B93CF6C2}.Release|Win32.Build.0 = Release|Win32

+		{CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.ActiveCfg = Debug|Win32

+		{CFF1021E-B878-481A-851B-2B226701D525}.Debug|Win32.Build.0 = Debug|Win32

+		{CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.ActiveCfg = Release|Win32

+		{CFF1021E-B878-481A-851B-2B226701D525}.Release|Win32.Build.0 = Release|Win32

+		{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Debug|Win32.Build.0 = Debug|Win32

+		{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.ActiveCfg = Release|Win32

+		{7A8F6247-7450-4BDF-A9FF-1BFA675EC83A}.Release|Win32.Build.0 = Release|Win32

+		{A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A55BEE98-25BB-463D-9016-14CA4567DFBF}.Debug|Win32.Build.0 = Debug|Win32

+		{A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.ActiveCfg = Release|Win32

+		{A55BEE98-25BB-463D-9016-14CA4567DFBF}.Release|Win32.Build.0 = Release|Win32

+		{2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.ActiveCfg = Debug|Win32

+		{2066EC0D-98CC-43E7-8405-5156AF111B38}.Debug|Win32.Build.0 = Debug|Win32

+		{2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.ActiveCfg = Release|Win32

+		{2066EC0D-98CC-43E7-8405-5156AF111B38}.Release|Win32.Build.0 = Release|Win32

+		{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.ActiveCfg = Debug|Win32

+		{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Debug|Win32.Build.0 = Debug|Win32

+		{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.ActiveCfg = Release|Win32

+		{BD50701C-6BD3-4A02-9A2C-E9A3D5CC6A78}.Release|Win32.Build.0 = Release|Win32

+		{5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5637456D-5B83-4C12-A129-708FC8CF0B33}.Debug|Win32.Build.0 = Debug|Win32

+		{5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.ActiveCfg = Release|Win32

+		{5637456D-5B83-4C12-A129-708FC8CF0B33}.Release|Win32.Build.0 = Release|Win32

+		{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.ActiveCfg = Debug|Win32

+		{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Debug|Win32.Build.0 = Debug|Win32

+		{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.ActiveCfg = Release|Win32

+		{8EBC3D0A-F056-42BB-B18A-2FE18EAE5332}.Release|Win32.Build.0 = Release|Win32

+		{DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DB592F77-25DC-4005-BD49-6D0E50303844}.Debug|Win32.Build.0 = Debug|Win32

+		{DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.ActiveCfg = Release|Win32

+		{DB592F77-25DC-4005-BD49-6D0E50303844}.Release|Win32.Build.0 = Release|Win32

+		{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Debug|Win32.Build.0 = Debug|Win32

+		{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.ActiveCfg = Release|Win32

+		{95B74350-2DAB-4CA9-BAFB-A5EB264765A1}.Release|Win32.Build.0 = Release|Win32

+		{B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B5D19969-5285-4B0E-B798-496A0B8DCA61}.Debug|Win32.Build.0 = Debug|Win32

+		{B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.ActiveCfg = Release|Win32

+		{B5D19969-5285-4B0E-B798-496A0B8DCA61}.Release|Win32.Build.0 = Release|Win32

+		{0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.ActiveCfg = Debug|Win32

+		{0C43604F-08D6-490C-BDFD-1B6CACB59740}.Debug|Win32.Build.0 = Debug|Win32

+		{0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.ActiveCfg = Release|Win32

+		{0C43604F-08D6-490C-BDFD-1B6CACB59740}.Release|Win32.Build.0 = Release|Win32

+		{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.ActiveCfg = Debug|Win32

+		{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Debug|Win32.Build.0 = Debug|Win32

+		{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.ActiveCfg = Release|Win32

+		{4E58EE7D-2B4B-42F0-8578-A23883CA6C31}.Release|Win32.Build.0 = Release|Win32

+		{43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.ActiveCfg = Debug|Win32

+		{43B53430-3C91-4A11-8A1F-5873AEEE0926}.Debug|Win32.Build.0 = Debug|Win32

+		{43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.ActiveCfg = Release|Win32

+		{43B53430-3C91-4A11-8A1F-5873AEEE0926}.Release|Win32.Build.0 = Release|Win32

+		{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Debug|Win32.Build.0 = Debug|Win32

+		{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.ActiveCfg = Release|Win32

+		{D37BC2BB-E54F-4CA2-8CED-C8FCED4E57B9}.Release|Win32.Build.0 = Release|Win32

+		{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Debug|Win32.Build.0 = Debug|Win32

+		{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.ActiveCfg = Release|Win32

+		{86D28D9A-2D6A-49A3-A790-275C0CAE14C9}.Release|Win32.Build.0 = Release|Win32

+		{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Debug|Win32.Build.0 = Debug|Win32

+		{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.ActiveCfg = Release|Win32

+		{5638CD25-87F7-4A22-AF6D-EBECCD26B35B}.Release|Win32.Build.0 = Release|Win32

+		{DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.ActiveCfg = Debug|Win32

+		{DFDB8804-5D6C-448F-A935-DD85629E0554}.Debug|Win32.Build.0 = Debug|Win32

+		{DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.ActiveCfg = Release|Win32

+		{DFDB8804-5D6C-448F-A935-DD85629E0554}.Release|Win32.Build.0 = Release|Win32

+		{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Debug|Win32.Build.0 = Debug|Win32

+		{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.ActiveCfg = Release|Win32

+		{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}.Release|Win32.Build.0 = Release|Win32

+		{87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{87116D0C-E498-4193-9F2D-301A8771B77D}.Debug|Win32.Build.0 = Debug|Win32

+		{87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.ActiveCfg = Release|Win32

+		{87116D0C-E498-4193-9F2D-301A8771B77D}.Release|Win32.Build.0 = Release|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Debug|Win32.Build.0 = Debug|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.ActiveCfg = Release|Win32

+		{5C28B5F4-0523-4811-920D-3DB1D3D8CAAA}.Release|Win32.Build.0 = Release|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.ActiveCfg = Debug|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Debug|Win32.Build.0 = Debug|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.ActiveCfg = Release|Win32

+		{45C674C0-193D-47AF-B9E0-61A4DE57D3E0}.Release|Win32.Build.0 = Release|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.ActiveCfg = Debug|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Debug|Win32.Build.0 = Debug|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.ActiveCfg = Release|Win32

+		{7192CF83-B08C-4387-A869-FD1970167115}.Release|Win32.Build.0 = Release|Win32

+		{D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D1115CD8-3810-48B0-8A21-F695016C3557}.Debug|Win32.Build.0 = Debug|Win32

+		{D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.ActiveCfg = Release|Win32

+		{D1115CD8-3810-48B0-8A21-F695016C3557}.Release|Win32.Build.0 = Release|Win32

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.ActiveCfg = Debug|Win32

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Debug|Win32.Build.0 = Debug|Win32

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.ActiveCfg = Release|Win32

+		{891A765C-5503-4FED-B427-7AE1413DB264}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/utilities/vcppmake/vpl2mod.vcxproj b/utilities/vcppmake/vpl2mod.vcxproj
new file mode 100644
index 0000000..cd59a72
--- /dev/null
+++ b/utilities/vcppmake/vpl2mod.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{7192CF83-B08C-4387-A869-FD1970167115}</ProjectGuid>

+    <RootNamespace>vpl2mod</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\vpl2mod.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/vs2osisref.vcxproj b/utilities/vcppmake/vs2osisref.vcxproj
new file mode 100644
index 0000000..837e68b
--- /dev/null
+++ b/utilities/vcppmake/vs2osisref.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{DFDB8804-5D6C-448F-A935-DD85629E0554}</ProjectGuid>

+    <RootNamespace>vs2osisref</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\vs2osisref.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/vs2osisreftxt.vcxproj b/utilities/vcppmake/vs2osisreftxt.vcxproj
new file mode 100644
index 0000000..d5d1a18
--- /dev/null
+++ b/utilities/vcppmake/vs2osisreftxt.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{B3EB374E-A3C5-4C69-BAE5-B1030288E3B0}</ProjectGuid>

+    <RootNamespace>vs2osisreftxt</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\vs2osisreftxt.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vcppmake/xml2gbs.vcxproj b/utilities/vcppmake/xml2gbs.vcxproj
new file mode 100644
index 0000000..c53459a
--- /dev/null
+++ b/utilities/vcppmake/xml2gbs.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectGuid>{87116D0C-E498-4193-9F2D-301A8771B77D}</ProjectGuid>

+    <RootNamespace>xml2gbs</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>Application</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)Debug\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <LinkIncremental>

+    </LinkIncremental>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <LinkIncremental>true</LinkIncremental>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Debug\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <TargetMachine>MachineX86</TargetMachine>

+      <ImageHasSafeExceptionHandlers>

+      </ImageHasSafeExceptionHandlers>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <AdditionalIncludeDirectories>../../include;../../src/utilfuns/win32;../../../icu-sword/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_ICU_;_ICUSWORD_;SWUSINGDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <MultiProcessorCompilation>true</MultiProcessorCompilation>

+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>

+    </ClCompile>

+    <Link>

+      <AdditionalDependencies>libsword.lib;icuuc.lib;icuin.lib;icudt.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>Release\$(ProjectName).exe</OutputFile>

+      <AdditionalLibraryDirectories>../../../icu-sword/lib;../../lib/vcppmake/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\xml2gbs.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\lib\vcppmake\libsword.vcxproj">

+      <Project>{97449e5e-f880-4d22-933a-0d2fc32034d4}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/utilities/vpl2mod.cpp b/utilities/vpl2mod.cpp
new file mode 100644
index 0000000..8bd172c
--- /dev/null
+++ b/utilities/vpl2mod.cpp
@@ -0,0 +1,294 @@
+/******************************************************************************
+ *
+ *  vpl2mod.cpp -	Utility to import VPL formatted modules
+ *
+ * $Id: vpl2mod.cpp 2921 2013-07-28 17:21:44Z scribe $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+	#pragma warning( disable: 4996 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+
+#ifndef __GNUC__
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+#include <filemgr.h>
+#include <swmgr.h>
+#include <rawtext.h>
+#include <swbuf.h>
+#include <versekey.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::FileMgr;
+using sword::SWMgr;
+using sword::RawText;
+using sword::VerseKey;
+using sword::SWBuf;
+using sword::SW_POSITION;
+#endif
+
+
+char readline(int fd, char **buf) {
+	char ch;
+	if (*buf)
+		delete [] *buf;
+	*buf = 0;
+	int len;
+
+
+	long index = lseek(fd, 0, SEEK_CUR);
+	// clean up any preceding white space
+	while ((len = read(fd, &ch, 1)) == 1) {
+		if ((ch != 13) && (ch != ' ') && (ch != '\t'))
+			break;
+		else index++;
+	}
+
+
+	while (ch != 10) {
+        if ((len = read(fd, &ch, 1)) != 1)
+			break;
+	}
+	
+	int r, size = (lseek(fd, 0, SEEK_CUR) - index) - 1;
+
+	*buf = new char [ size + 1 ];
+
+	if (size > 0) {
+		lseek(fd, index, SEEK_SET);
+		r = read(fd, *buf, size);
+		if (r != size)
+			std::cerr <<"ERROR: short read in readline\n";
+		r = read(fd, &ch, 1);   //pop terminating char
+		if (r != size)
+			std::cerr <<"ERROR: short read of terminating char in readline\n";
+		(*buf)[size] = 0;
+
+		// clean up any trailing junk on buf
+		for (char *it = *buf+(strlen(*buf)-1); it > *buf; it--) {
+			if ((*it != 10) && (*it != 13) && (*it != ' ') && (*it != '\t'))
+				break;
+			else *it = 0;
+		}
+	}
+	else **buf = 0;
+	return !len;
+}
+
+
+char *parseVReg(char *buf) {
+	char stage = 0;
+
+	while (*buf) {
+		switch (stage) {
+		case 0:
+			if (isalpha(*buf))
+				stage++;
+			break;
+		case 1:
+			if (isdigit(*buf))
+				stage++;
+			break;
+		case 2:
+			if (*buf == ':')
+				stage++;
+			break;
+		case 3:
+			if (isdigit(*buf))
+				stage++;
+			break;
+	   case 4:
+			if (*buf == ' ') {
+				*buf = 0;
+				return ++buf;
+			}
+			break;
+		}
+		buf++;
+	}
+	return (stage == 4) ? buf : 0;  // if we got to stage 4 return after key buf, else return 0;
+}
+
+
+bool isKJVRef(const char *buf) {
+	VerseKey vk, test;
+	vk.setAutoNormalize(false);
+	vk.setIntros(true);	// turn on mod/testmnt/book/chap headings
+	vk.setPersist(true);
+	// lets do some tests on the verse --------------
+	vk = buf;
+	test = buf;
+
+	if (vk.getTestament() && vk.getBook() && vk.getChapter() && vk.getVerse()) { // if we're not a heading
+//		std::cerr << (const char*)vk << " == "  << (const char*)test << std::endl;
+		return (vk == test);
+	}
+	else return true;	// no check if we're a heading... Probably bad.
+}
+
+
+void fixText(char *text) {
+	char *to = text;
+	while(*text) {
+		*to++ = *text++;
+		*to++ = *text++;
+		if (!*text)
+			break;
+		if (*text != ' ')
+			std::cerr << "problem\n";
+		else	text++;
+	}
+	*to = 0;
+}
+
+int main(int argc, char **argv) {
+
+	// Let's test our command line arguments
+	if (argc < 2) {
+//		fprintf(stderr, "usage: %s <vpl_file> </path/to/mod> [0|1 - file includes prepended verse references]\n", argv[0]);
+		fprintf(stderr, "usage: %s <source_vpl_file> </path/to/output/mod/> [0|1 - prepended verse refs] [0|1 - NT only]\n\n", argv[0]);
+		fprintf(stderr, "\tWARNING: THIS IS CURRENTLY A KJV-VERSIFICATION-ONLY UTILITY\n");
+		fprintf(stderr, "\tWith no verse refs, source file must contain exactly 31102 lines.\n");
+		fprintf(stderr, "\tThis is KJV verse count plus headings for MODULE,\n");
+		fprintf(stderr, "\tTESTAMENT, BOOK, CHAPTER. An example snippet follows:\n\n");
+		fprintf(stderr, "\t\tMODULE HEADER\n");
+		fprintf(stderr, "\t\tOLD TESTAMENT HEADER\n");
+		fprintf(stderr, "\t\tGENESIS HEADER\n");
+		fprintf(stderr, "\t\tCHAPTER 1 HEADER\n");
+		fprintf(stderr, "\t\tIn the beginning...\n\n");
+		fprintf(stderr, "\t... implying there must also be a CHAPTER2 HEADER,\n");
+		fprintf(stderr, "\tEXODUS HEADER, NEW TESTAMENT HEADER, etc.  If there is no text for\n");
+		fprintf(stderr, "\tthe header, a blank line must, at least, hold place.\n\n");
+		fprintf(stderr, "\tWith verse refs, source file must simply contain any number of lines,\n");
+		fprintf(stderr, "\tthat begin with the verse reference for which it is an entry.  e.g.:\n\n");
+		fprintf(stderr, "\t\tgen 1:0 CHAPTER 1 HEADER\n");
+		fprintf(stderr, "\t\tgen 1:1 In the beginning...\n\n");
+		exit(-1);
+	}
+
+	// Let's see if we can open our input file
+	int fd = FileMgr::openFileReadOnly(argv[1]);
+	if (fd < 0) {
+		fprintf(stderr, "error: %s: couldn't open input file: %s \n", argv[0], argv[1]);
+		exit(-2);
+	}
+
+	// Try to initialize a default set of datafiles and indicies at our
+	// datapath location passed to us from the user.
+	if (RawText::createModule(argv[2])) {
+		fprintf(stderr, "error: %s: couldn't create module at path: %s \n", argv[0], argv[2]);
+		exit(-3);
+	}
+
+	// not used yet, but for future support of a vpl file with each line
+	// prepended with verse reference, eg. "Gen 1:1 In the beginning..."
+	bool vref = false;
+	if (argc > 3)
+		vref = (argv[3][0] == '0') ? false : true;
+
+	// if 'nt' is the 4th arg, our vpl file only has the NT
+	bool ntonly = false;
+	if (argc > 4)
+                ntonly = (argv[4][0] == '0') ? false : true;
+	
+	// Do some initialization stuff
+	char *buffer = 0;
+	RawText mod(argv[2]);	// open our datapath with our RawText driver.
+	VerseKey vk;
+	vk.setAutoNormalize(false);
+	vk.setIntros(true);	// turn on mod/testmnt/book/chap headings
+	vk.setPersist(true);
+
+	mod.setKey(vk);
+
+	// Loop through module from TOP to BOTTOM and set next line from
+	// input file as text for this entry in the module
+	mod = TOP;
+	if (ntonly) vk = "Matthew 1:1";
+	  
+	int successive = 0;  //part of hack below
+	while ((!mod.popError()) && (!readline(fd, &buffer))) {
+		if (*buffer == '|')	// comments, ignore line
+			continue;
+		if (vref) {
+			const char *verseText = parseVReg(buffer);
+			if (!verseText) {	// if we didn't find a valid verse ref
+				std::cerr << "No valid verse ref found on line: " << buffer << "\n";
+				exit(-4);
+			}
+
+			vk = buffer;
+			if (vk.popError()) {
+				std::cerr << "Error parsing key: " << buffer << "\n";
+				exit(-5);
+			}
+			SWBuf orig = mod.getRawEntry();
+
+			if (!isKJVRef(buffer)) {
+				VerseKey origVK = vk;
+				/* This block is functioning improperly -- problem with AutoNormalize???
+				do {
+					vk--;
+				}
+				while (!vk.popError() && !isKJVRef(vk)); */
+				//hack to replace above:
+				successive++;
+				vk -= successive;
+				orig = mod.getRawEntry();
+
+				std::cerr << "Not a valid KJV ref: " << origVK << "\n";
+				std::cerr << "appending to ref: " << vk << "\n";
+				orig += " [ (";
+				orig += origVK;
+				orig += ") ";
+				orig += verseText;
+				orig += " ] ";
+				verseText = orig;
+			}
+			else {
+			  successive = 0;
+			}
+
+			if (orig.length() > 1)
+				   std::cerr << "Warning, overwriting verse: " << vk << std::endl;
+			  
+			// ------------- End verse tests -----------------
+			mod << verseText;	// save text to module at current position
+		}
+		else {
+			fixText(buffer);
+			mod << buffer;	// save text to module at current position
+			mod++;	// increment module position
+		}
+	}
+
+	// clear up our buffer that readline might have allocated
+	if (buffer)
+		delete [] buffer;
+}
diff --git a/utilities/vs2osisref.cpp b/utilities/vs2osisref.cpp
new file mode 100644
index 0000000..d283944
--- /dev/null
+++ b/utilities/vs2osisref.cpp
@@ -0,0 +1,60 @@
+/******************************************************************************
+ *
+ *  vs2osisref.cpp -	Utility to translate a verse reference to an osisRef
+ *
+ * $Id: vs2osisref.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <iostream>
+#include <versekey.h>
+#include <localemgr.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+using std::endl;
+using std::cerr;
+using std::cout;
+
+
+int main(int argc, char **argv)
+{
+        if (argc < 2) {
+        	cerr << argv[0] << " - parse verse reference to OSISRef markup\n";
+	        cerr << "usage: "<< argv[0] << " <verse ref> [verse context] [locale]\n";
+        	cerr << "\n\n";
+	        exit(-1);
+        }
+
+
+	if (argc > 3) {
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(argv[3]);
+	}
+
+        VerseKey verseKey = (argc > 2) ? argv[2] : "Gen 1:1";
+
+        std::cout << VerseKey::convertToOSIS(argv[1], &verseKey) << "\n";
+
+	return 0;
+}
+
diff --git a/utilities/vs2osisreftxt.cpp b/utilities/vs2osisreftxt.cpp
new file mode 100644
index 0000000..cd52789
--- /dev/null
+++ b/utilities/vs2osisreftxt.cpp
@@ -0,0 +1,61 @@
+/******************************************************************************
+ *
+ *  vs2osisreftext.cpp -	Utility to translate a verse reference to an
+ *				osisRef
+ *
+ * $Id: vs2osisreftxt.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2008-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <iostream>
+#include <stdio.h>
+
+#include <versekey.h>
+#include <localemgr.h>
+
+#ifndef NO_SWORD_NAMESPACE
+using namespace sword;
+#endif
+
+int main(int argc, char **argv) {
+	if ((argc < 2) || (argc > 4)) {
+		fprintf(stderr, "usage: %s <\"string to parse\"> [locale_name] [test-in-set-verse]\n", *argv);
+		exit(-1);
+	}
+
+	if (argc > 2)
+		LocaleMgr::getSystemLocaleMgr()->setDefaultLocaleName(argv[2]);
+
+	VerseKey DefaultVSKey;
+
+	DefaultVSKey = "jas3:1";
+	
+	ListKey verses = DefaultVSKey.parseVerseList(argv[1], DefaultVSKey, true);
+
+	std::cout << verses.getOSISRefRangeText() << "\n";
+
+	if (argc > 3) {
+		verses.setText(argv[3]);
+		std::cout << "Verse is" << ((verses.popError()) ? " NOT" : "") << " in set.\n\n";
+	}
+	
+	return 0;
+}
diff --git a/utilities/xml2gbs.cpp b/utilities/xml2gbs.cpp
new file mode 100644
index 0000000..d49b536
--- /dev/null
+++ b/utilities/xml2gbs.cpp
@@ -0,0 +1,392 @@
+/******************************************************************************
+ *
+ *  xml2gbs.cpp -	Importer for GenBooks formatted as OSIS, ThML, or TEI
+ *
+ * $Id: xml2gbs.cpp 2833 2013-06-29 06:40:28Z chrislit $
+ *
+ * Copyright 2003-2012 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * 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 version 2.
+ *
+ * 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.
+ *
+ */
+
+#ifdef _MSC_VER
+	#pragma warning( disable: 4251 )
+#endif
+
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+
+#include <entriesblk.h>
+#include <iostream>
+#include <string>
+#include <fstream>
+#include <treekeyidx.h>
+#include <rawgenbook.h>
+
+
+#ifndef NO_SWORD_NAMESPACE
+using sword::TreeKeyIdx;
+using sword::RawGenBook;
+using sword::SWKey;
+#endif
+
+//#define DEBUG
+
+
+enum XML_FORMATS { F_AUTODETECT, F_OSIS, F_THML, F_TEI };
+
+#define HELPTEXT "xml2gbs 1.0 OSIS/ThML/TEI General Book module creation tool for the SWORD Project\n  usage:\n   xml2gbs [-l] [-i] [-fT|-fO|-fE] <filename> [modname]\n  -l uses long div names in ThML files\n  -i exports to IMP format instead of creating a module\n  -fO, -fT, and -fE will set the importer to expect OSIS, ThML, or TEI format respectively\n    (otherwise it attempts to autodetect)\n"
+
+unsigned char detectFormat(char* filename) {
+
+  unsigned char format = F_AUTODETECT;
+
+  std::ifstream infile(filename);
+  std::string entbuffer;
+  
+  if (!infile.is_open()) {
+        std::cerr << HELPTEXT;
+        std::cerr << std::endl << std::endl << "Could not open file \"" << filename << "\"" << std::endl;
+  }
+  else {
+	while (std::getline(infile, entbuffer) && format == F_AUTODETECT) {
+                if (strstr(entbuffer.c_str(), "<osis")) {
+                        format = F_OSIS;
+                }
+                else if (strstr(entbuffer.c_str(), "<ThML")) {
+                        format = F_THML;
+                }
+		else if (strstr(entbuffer.c_str(), "<TEI")) {
+                        format = F_TEI;
+		}
+        }
+        infile.close();
+  }
+
+  return format;
+}
+
+int processXML(const char* filename, char* modname, bool longnames, bool exportfile, unsigned char format) {
+  signed long i = 0;
+  char* strtmp;
+  std::string entbuffer;
+
+#ifdef DEBUG
+  printf ("%s :%s :%d :%d :%d\n\n", filename, modname, longnames, exportfile, format);
+#endif
+
+  std::ifstream infile(filename);
+  if (!infile.is_open()) {
+        std::cerr << HELPTEXT;
+        std::cerr << std::endl << std::endl << "Could not open file \"" << filename << "\"" << std::endl;
+        return -1;
+  }
+  std::ofstream outfile;
+  if (exportfile) {
+    strcat (modname, ".imp");
+    outfile.open(modname);
+  }
+
+  TreeKeyIdx * treeKey;
+  RawGenBook * book = NULL;
+
+  std::string divs[32];
+
+  int level = 0;
+  std::string keybuffer = "";
+  std::string keybuffer2;
+  std::string n;
+  std::string type;
+  std::string title;
+  unsigned long entrysize = 0;
+  unsigned long keysize = 0;
+  bool closer = false;
+
+  if (!exportfile) {
+    // Do some initialization stuff
+    TreeKeyIdx::create(modname);
+    treeKey = new TreeKeyIdx(modname);
+    RawGenBook::createModule(modname);
+    delete treeKey;
+    book = new RawGenBook(modname);
+  }
+
+#ifdef DEBUG
+//  TreeKeyIdx root = *((TreeKeyIdx *)((SWKey *)(*book)));
+#endif
+
+  int c;
+  while ((c = infile.get()) != EOF) {
+    if (c == '<') {
+	    {
+		    keybuffer = "";
+		    while ((c = infile.get()) != '>')
+			    keybuffer += c;
+		    keybuffer += c;
+	    }
+
+      if (keybuffer.length()) {
+	if (((format == F_OSIS) && ((!strncmp(keybuffer.c_str(), "/div>", 5)) || (!strncmp(keybuffer.c_str(), "/verse>", 7)) || (!strncmp(keybuffer.c_str(), "/chapter>", 9)))) ||
+           ((format == F_THML) && ((!strncmp(keybuffer.c_str(), "/div", 4)) && (keybuffer[4] > '0' && keybuffer[4] < '7')))) {
+	  if (!closer) {
+       	    keysize = 0;
+            keybuffer2 = "";
+       	    for (i = 0; i < level; i++) {
+              keybuffer2 += '/';
+       	      keysize++;
+       	      keybuffer2 += divs[i];
+              keysize += divs[i].length();
+	      std::cout << keybuffer2 << std::endl;
+       	    }
+
+	    if (level) {
+	      std::cout << keybuffer2 << std::endl;
+	      if (exportfile) {
+		outfile << "$$$" << keybuffer2 << std::endl << entbuffer << std::endl;
+	      }
+	      else {
+		book->setKey(keybuffer2.c_str());
+		book->setEntry(entbuffer.c_str(), entrysize); // save text to module at current position
+	      }
+	    }
+	  }
+	  level--;
+	  entbuffer = "";
+	  entrysize = 0;
+
+	  closer = true;
+	}
+	else if (((format == F_OSIS) && !((!strncmp(keybuffer.c_str(), "div>", 4) || !strncmp(keybuffer.c_str(), "div ", 4)) || (!strncmp(keybuffer.c_str(), "verse>", 6) || !strncmp(keybuffer.c_str(), "verse ", 6)) || (!strncmp(keybuffer.c_str(), "chapter>", 8) || !strncmp(keybuffer.c_str(), "chapter ", 8)))) ||
+                ((format == F_THML) && !((!strncmp(keybuffer.c_str(), "div", 3)) && (keybuffer[3] > '0' && keybuffer[3] < '7')))) {
+	  entbuffer += '<';
+	  entrysize++;
+	  entrysize += keybuffer.length();
+	  entbuffer += keybuffer;
+	}
+	else {
+	  //we have a divN...
+       	  if (!closer) {
+            keysize = 0;
+       	    keybuffer2= "";
+       	    for (i = 0; i < level; i++) {
+              keybuffer2 += '/';
+       	      keysize++;
+       	      keybuffer2 += divs[i];
+              keysize += divs[i].length();
+	      std::cout << keybuffer2 << std::endl;
+       	    }
+
+	    if (level) {
+	      std::cout << keybuffer2 << std::endl;
+	      if (exportfile) {
+		outfile << "$$$" << keybuffer2 << std::endl << entbuffer << std::endl;
+	      }
+	      else {
+		book->setKey(keybuffer2.c_str());
+		book->setEntry(entbuffer.c_str(), entrysize); // save text to module at current position
+	      }
+	    }
+	  }
+
+	  entbuffer= "";
+	  entrysize = 0;
+
+	  level++;
+          keysize = keybuffer.length()-1;
+
+          type = "";
+      	  n = "";
+       	  title = "";
+
+          if (format == F_OSIS && longnames == false) {
+               	  strtmp = (char*)strstr(keybuffer.c_str(), "osisID=\"");
+               	  if (strtmp) {
+               	    strtmp += 8;
+               	    for (;*strtmp != '\"'; strtmp++) {
+               	      if (*strtmp == 10) {
+               		title += ' ';
+               	      }
+               	      else if (*strtmp == '.') {
+                        title = "";
+               	      }
+               	      else if (*strtmp != 13) {
+               		title += *strtmp;
+               	      }
+               	    }
+               	  }
+                  keybuffer = title;
+          }
+          else {
+               	  strtmp = (char*)strstr(keybuffer.c_str(), "type=\"");
+               	  if (strtmp) {
+               	    strtmp += 6;
+               	    for (;*strtmp != '\"'; strtmp++) {
+               	      if (*strtmp == 10) {
+               		type+= ' ';
+               	      }
+               	      else if (*strtmp != 13) {
+               		type+= *strtmp;
+               	      }
+               	    }
+               	  }
+
+               	  strtmp = (char*)strstr(keybuffer.c_str(), "n=\"");
+               	  if (strtmp) {
+               	    strtmp += 3;
+               	    for (;*strtmp != '\"'; strtmp++) {
+               	      if (*strtmp == 10) {
+               		n += ' ';
+               	      }
+               	      else if (*strtmp != 13) {
+               		n += *strtmp;
+               	      }
+               	    }
+               	  }
+
+                  if (format == F_OSIS) {
+                       	  strtmp = (char*)strstr(keybuffer.c_str(), "title=\"");
+                	  if (strtmp) {
+                	    strtmp += 7;
+                	    for (;*strtmp != '\"'; strtmp++) {
+                	      if (*strtmp == 10) {
+                		title += ' ';
+                	      }
+                	      else if (*strtmp != 13) {
+                		title += *strtmp;
+                	      }
+                	    }
+                	  }
+                  }
+                  else if (format == F_THML) {
+                	  strtmp = (char*)strstr(keybuffer.c_str(), "title=\"");
+                	  if (strtmp) {
+                	    strtmp += 7;
+                	    for (;*strtmp != '\"'; strtmp++) {
+                	      if (*strtmp == 10) {
+                		title += ' ';
+                	      }
+                	      else if (*strtmp != 13) {
+                		title += *strtmp;
+                	      }
+                	    }
+                	  }
+                  }
+
+        	  keybuffer = type;
+        	  if (keybuffer.length() && n.length())
+        	    keybuffer += " ";
+        	  keybuffer += n;
+
+        	  if (longnames && keybuffer.length())
+        	    keybuffer += ": ";
+        	  if (longnames || !keybuffer.length())
+        	    keybuffer += title;
+          }
+          divs[level-1] = keybuffer;
+
+	  closer = false;
+	}
+      }
+    }
+    else if (c != 13) {
+      entbuffer += c;
+      entrysize++;
+    }
+  }
+
+#ifdef DEBUG
+//  printTree(root, treeKey);
+#endif
+
+//  delete book;  //causes nasty-bad errors upon execution
+	return 0;
+}
+
+int main(int argc, char **argv) {
+  int i = 0;
+
+  char modname[256];
+  *modname = 0;
+  char filename[256];
+  *filename = 0;
+
+  bool longnames = false;
+  bool exportfile = false;
+  unsigned char format = F_AUTODETECT;
+
+  if (argc > 2) {
+        for (i = 1; i < argc; i++) {
+                if (argv[i][0] == '-') {
+                        switch (argv[i][1]) {
+                                case 'l':
+                                        longnames = true;
+                                        continue;
+                                case 'i':
+                                        exportfile = true;
+                                        continue;
+                                case 'f':
+                                        if (argv[i][2] == 'O') {
+                                                format = F_OSIS;
+                                        }
+                                        else if (argv[i][2] == 'T') {
+                                                format = F_OSIS;
+                                        }
+                                        else {
+                                                format = F_AUTODETECT;
+                                        }
+                                        continue;
+                        }
+                }
+                else if (*filename == 0) {
+                        strncpy (filename, argv[i], 200);
+                }
+                else if (*modname == 0) {
+                        strncpy (modname, argv[i], 200);
+                }
+        }
+  }
+  else if (argc > 1) {
+    strncpy (filename, argv[1], 200);
+  }
+
+  if (!*filename) {
+    std::cerr << HELPTEXT << std::endl;
+    return -1;
+  }
+  else {
+        if (!*modname) {
+                for (i = 0; (i < 256) && (filename[i]) && (filename[i] != '.'); i++) {
+                        modname[i] = filename[i];
+                }
+                modname[i] = 0;
+        }
+
+        format = (format == F_AUTODETECT) ? detectFormat(filename) : format;
+        if (format == F_AUTODETECT) {
+                fprintf(stderr, HELPTEXT);
+                fprintf(stderr, "\n\nCould not detect file format for file \"%s\", please specify.\n", filename);
+                return -1;
+        }
+
+        int retCode =  processXML (filename, modname, longnames, exportfile, format);
+
+        return retCode;
+  }
+}
+
+
+